Move gnome3 ports into the place of the gnome2 locations.

Update to new port rules, remove conflicts, latest_link, enable stage support.

gnome-games was skipped because I got a update for that.
gnome-keyring 2 vs 3, needs to be looked at.
zenity 2 vs 3, and libgnomekbd 2 vs 3

Use new lib_depend syntax in bsd.gnome.mk.

Possible lots of broken links.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 184 insertions, 222 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 8958da444..edeb9cf2f 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,27 +1,26 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-terminal/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports/trunk/x11/gnome-terminal3/Makefile 18559 2013-06-17 20:56:34Z kwm $
 
 PORTNAME=	gnome-terminal
-PORTVERSION=	2.32.1
-PORTREVISION=	3
+PORTVERSION=	3.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Terminal component for the GNOME 2 Desktop
+COMMENT=	Terminal component for the GNOME 3 Desktop
 
-LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
+		itstool:${PORTSDIR}/textproc/itstool
+LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-CONFLICTS=	gnome-terminal-3.[0-9]*
-
-NO_STAGE=	yes
 USES=		gettext gmake pathfix pkgconfig
-USE_BZIP2=	yes
+USE_XZ=		yes
 INSTALLS_OMF=	yes
-USE_XORG=	sm
-USE_GNOME=	gnomeprefix intlhack gconf2 vte gnomedocutils libgnome
+USE_XORG=	sm ice
+USE_GNOME=	gconf2 gnomeprefix intlhack vte3 gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 0c439fb39..8cb0ad839 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-terminal-2.32.1.tar.bz2) = 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
-SIZE (gnome2/gnome-terminal-2.32.1.tar.bz2) = 2319315
+SHA256 (gnome3/gnome-terminal-3.6.2.tar.xz) = 2df2f07c5dae9b2bb85ab75be249a285f97197ca954e9b80d8babf65832c416c
+SIZE (gnome3/gnome-terminal-3.6.2.tar.xz) = 1648532
diff --git a/x11/gnome-terminal/files/patch-config.h.in b/x11/gnome-terminal/files/patch-config.h.in
index 1617731fa..a752d5eff 100644
--- a/x11/gnome-terminal/files/patch-config.h.in
+++ b/x11/gnome-terminal/files/patch-config.h.in
@@ -1,6 +1,6 @@
---- config.h.in.orig	2009-05-03 15:26:39.000000000 -0400
-+++ config.h.in	2009-05-03 15:26:55.000000000 -0400
-@@ -24,6 +24,9 @@
+--- config.h.in.orig	2011-01-13 04:05:18.243479000 +0000
++++ config.h.in	2011-01-13 04:05:35.000000000 +0000
+@@ -27,6 +27,9 @@
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
diff --git a/x11/gnome-terminal/files/patch-configure b/x11/gnome-terminal/files/patch-configure
index 45c938236..54434bd97 100644
--- a/x11/gnome-terminal/files/patch-configure
+++ b/x11/gnome-terminal/files/patch-configure
@@ -1,21 +1,17 @@
---- configure.orig	2009-05-03 15:26:45.000000000 -0400
-+++ configure	2009-05-03 15:27:01.000000000 -0400
-@@ -15099,6 +15099,79 @@ GLIB_GENMARSHAL="$($PKG_CONFIG --variabl
- GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
+--- configure.orig	2011-01-13 04:08:02.000000000 +0000
++++ configure	2011-01-13 04:08:30.000000000 +0000
+@@ -14510,6 +13851,52 @@
+  ;;
+ esac
  
- 
-+{ echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
-+echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5
++$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; }
++if ${ac_cv_lib_util_kinfo_getfile+:} false; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
@@ -33,50 +29,27 @@
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_util_kinfo_getfile=yes
 +else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_util_kinfo_getfile=no
++  ac_cv_lib_util_kinfo_getfile=no
 +fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test $ac_cv_lib_util_kinfo_getfile = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5
++$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; }
++if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then :
 +  LIBS="${LIBS} -lutil"
 +
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KINFO_GETFILE 1
-+_ACEOF
++$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
 +
 +else
 +  :
 +fi
 +
 +
- # Extract the first word of "gtk-builder-convert", so it can be a program name with args.
- set dummy gtk-builder-convert; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ if test "$GTK_BUILDER_CONVERT" = "false"; then
+   as_fn_error $? "gtk-builder-convert not found" "$LINENO" 5
+ fi
diff --git a/x11/gnome-terminal/files/patch-configure.ac b/x11/gnome-terminal/files/patch-configure.ac
index 131e4c85b..5e3a59f60 100644
--- a/x11/gnome-terminal/files/patch-configure.ac
+++ b/x11/gnome-terminal/files/patch-configure.ac
@@ -1,13 +1,13 @@
---- configure.ac.orig	2009-05-03 15:25:26.000000000 -0400
-+++ configure.ac	2009-05-03 15:26:34.000000000 -0400
-@@ -96,6 +96,10 @@ AC_SUBST([GLIB_GENMARSHAL])
- GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
- AC_SUBST([GLIB_MKENUMS])
+--- configure.ac.orig	2011-01-11 19:41:06.000000000 +0000
++++ configure.ac	2011-01-13 04:07:54.000000000 +0000
+@@ -136,6 +136,10 @@
+   3.0) AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert gtk-builder-convert-3.0],[false]) ;;
+ esac
  
 +AC_CHECK_LIB(util, kinfo_getfile,
-+	     [LIBS="${LIBS} -lutil"
-+	      AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
++  [LIBS="${LIBS} -lutil"
++  AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
 +
- AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
  if test "$GTK_BUILDER_CONVERT" = "false"; then
    AC_MSG_ERROR([gtk-builder-convert not found])
+ fi
diff --git a/x11/gnome-terminal/files/patch-src-terminal.c b/x11/gnome-terminal/files/patch-src-terminal.c
deleted file mode 100644
index a434ca7ab..000000000
--- a/x11/gnome-terminal/files/patch-src-terminal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/terminal.c.orig	2010-11-10 10:47:14.000000000 -0800
-+++ src/terminal.c	2012-03-23 21:10:08.520503912 -0700
-@@ -579,7 +579,7 @@
-     data = g_new (OwnData, 1);
-     data->factory_name = get_factory_name_for_display (display_name);
-     data->options = options;
--    data->exit_code = -1;
-+    data->exit_code = EXIT_SUCCESS;
-     data->argv = argv_copy;
-     data->argc = argc_copy;
- 
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
index 69c4aa802..096a53103 100644
--- a/x11/gnome-terminal/files/patch-src_terminal-screen.c
+++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c
@@ -1,5 +1,5 @@
---- src/terminal-screen.c.orig	2009-08-13 14:39:24.000000000 +0200
-+++ src/terminal-screen.c	2009-08-20 10:41:58.000000000 +0200
+--- src/terminal-screen.c.orig	2010-12-03 01:12:50.000000000 +0000
++++ src/terminal-screen.c	2011-01-13 04:06:12.000000000 +0000
 @@ -18,6 +18,15 @@
  
  #include <config.h>
@@ -16,7 +16,7 @@
  #include <string.h>
  #include <stdlib.h>
  #include <unistd.h>
-@@ -184,15 +193,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
+@@ -179,15 +188,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
  static char *
  cwd_of_pid (int pid)
  {
@@ -45,7 +45,7 @@
    /* Try to get the working directory using various OS-specific mechanisms */
    for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
      {
-@@ -230,6 +252,49 @@ cwd_of_pid (int pid)
+@@ -225,6 +247,49 @@ cwd_of_pid (int pid)
              return working_dir;
          }
      }
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index ec21cc0a5..1a007282d 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -6,77 +6,84 @@ share/applications/gnome-terminal.desktop
 %%DATADIR%%/profile-manager.ui
 %%DATADIR%%/profile-new-dialog.ui
 %%DATADIR%%/profile-preferences.ui
-%%DATADIR%%/skey-challenge.ui
 %%DATADIR%%/terminal.about
 %%DATADIR%%/terminal.xml
-share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/C/gnome-terminal.xml
-share/gnome/help/gnome-terminal/C/legal.xml
-share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
-share/gnome/help/gnome-terminal/bg/legal.xml
-share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
-share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/cs/gnome-terminal.xml
-share/gnome/help/gnome-terminal/da/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/da/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/da/gnome-terminal.xml
-share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/de/gnome-terminal.xml
-share/gnome/help/gnome-terminal/el/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/el/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/el/gnome-terminal.xml
-share/gnome/help/gnome-terminal/en_GB/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/en_GB/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/en_GB/gnome-terminal.xml
-share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/es/gnome-terminal.xml
-share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
-share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/it/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ja/legal.xml
-share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
-share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/oc/gnome-terminal.xml
-share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/pt_BR/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ro/legal.xml
-share/gnome/help/gnome-terminal/ru/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ru/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ru/gnome-terminal.xml
-share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
-share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_TW/legal.xml
+share/help/C/gnome-terminal/figures/gnome-terminal-default.png
+share/help/C/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/C/gnome-terminal/index.docbook
+share/help/C/gnome-terminal/legal.xml
+share/help/ca/gnome-terminal/figures/gnome-terminal-default.png
+share/help/ca/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/ca/gnome-terminal/index.docbook
+share/help/ca/gnome-terminal/legal.xml
+share/help/cs/gnome-terminal/figures/gnome-terminal-default.png
+share/help/cs/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/cs/gnome-terminal/index.docbook
+share/help/cs/gnome-terminal/legal.xml
+share/help/da/gnome-terminal/figures/gnome-terminal-default.png
+share/help/da/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/da/gnome-terminal/index.docbook
+share/help/da/gnome-terminal/legal.xml
+share/help/de/gnome-terminal/figures/gnome-terminal-default.png
+share/help/de/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/de/gnome-terminal/index.docbook
+share/help/de/gnome-terminal/legal.xml
+share/help/el/gnome-terminal/figures/gnome-terminal-default.png
+share/help/el/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/el/gnome-terminal/index.docbook
+share/help/el/gnome-terminal/legal.xml
+share/help/en_GB/gnome-terminal/figures/gnome-terminal-default.png
+share/help/en_GB/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/en_GB/gnome-terminal/index.docbook
+share/help/en_GB/gnome-terminal/legal.xml
+share/help/es/gnome-terminal/figures/gnome-terminal-default.png
+share/help/es/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/es/gnome-terminal/index.docbook
+share/help/es/gnome-terminal/legal.xml
+share/help/fr/gnome-terminal/figures/gnome-terminal-default.png
+share/help/fr/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/fr/gnome-terminal/index.docbook
+share/help/fr/gnome-terminal/legal.xml
+share/help/gl/gnome-terminal/figures/gnome-terminal-default.png
+share/help/gl/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/gl/gnome-terminal/index.docbook
+share/help/gl/gnome-terminal/legal.xml
+share/help/it/gnome-terminal/figures/gnome-terminal-default.png
+share/help/it/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/it/gnome-terminal/index.docbook
+share/help/it/gnome-terminal/legal.xml
+share/help/ko/gnome-terminal/figures/gnome-terminal-default.png
+share/help/ko/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/ko/gnome-terminal/index.docbook
+share/help/ko/gnome-terminal/legal.xml
+share/help/oc/gnome-terminal/figures/gnome-terminal-default.png
+share/help/oc/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/oc/gnome-terminal/index.docbook
+share/help/oc/gnome-terminal/legal.xml
+share/help/pt_BR/gnome-terminal/figures/gnome-terminal-default.png
+share/help/pt_BR/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/pt_BR/gnome-terminal/index.docbook
+share/help/pt_BR/gnome-terminal/legal.xml
+share/help/ru/gnome-terminal/figures/gnome-terminal-default.png
+share/help/ru/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/ru/gnome-terminal/index.docbook
+share/help/ru/gnome-terminal/legal.xml
+share/help/sl/gnome-terminal/figures/gnome-terminal-default.png
+share/help/sl/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/sl/gnome-terminal/index.docbook
+share/help/sl/gnome-terminal/legal.xml
+share/help/sv/gnome-terminal/figures/gnome-terminal-default.png
+share/help/sv/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/sv/gnome-terminal/index.docbook
+share/help/sv/gnome-terminal/legal.xml
+share/help/uk/gnome-terminal/figures/gnome-terminal-default.png
+share/help/uk/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/uk/gnome-terminal/index.docbook
+share/help/uk/gnome-terminal/legal.xml
+share/help/zh_CN/gnome-terminal/figures/gnome-terminal-default.png
+share/help/zh_CN/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/zh_CN/gnome-terminal/index.docbook
+share/help/zh_CN/gnome-terminal/legal.xml
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
 share/locale/ar/LC_MESSAGES/gnome-terminal.mo
 share/locale/as/LC_MESSAGES/gnome-terminal.mo
@@ -121,6 +128,7 @@ share/locale/it/LC_MESSAGES/gnome-terminal.mo
 share/locale/ja/LC_MESSAGES/gnome-terminal.mo
 share/locale/ka/LC_MESSAGES/gnome-terminal.mo
 share/locale/kk/LC_MESSAGES/gnome-terminal.mo
+share/locale/km/LC_MESSAGES/gnome-terminal.mo
 share/locale/kn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/ku/LC_MESSAGES/gnome-terminal.mo
@@ -167,71 +175,6 @@ share/locale/xh/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-share/omf/gnome-terminal/gnome-terminal-C.omf
-share/omf/gnome-terminal/gnome-terminal-bg.omf
-share/omf/gnome-terminal/gnome-terminal-ca.omf
-share/omf/gnome-terminal/gnome-terminal-cs.omf
-share/omf/gnome-terminal/gnome-terminal-da.omf
-share/omf/gnome-terminal/gnome-terminal-de.omf
-share/omf/gnome-terminal/gnome-terminal-el.omf
-share/omf/gnome-terminal/gnome-terminal-en_GB.omf
-share/omf/gnome-terminal/gnome-terminal-es.omf
-share/omf/gnome-terminal/gnome-terminal-fr.omf
-share/omf/gnome-terminal/gnome-terminal-it.omf
-share/omf/gnome-terminal/gnome-terminal-ja.omf
-share/omf/gnome-terminal/gnome-terminal-ko.omf
-share/omf/gnome-terminal/gnome-terminal-oc.omf
-share/omf/gnome-terminal/gnome-terminal-pt_BR.omf
-share/omf/gnome-terminal/gnome-terminal-ro.omf
-share/omf/gnome-terminal/gnome-terminal-ru.omf
-share/omf/gnome-terminal/gnome-terminal-sv.omf
-share/omf/gnome-terminal/gnome-terminal-uk.omf
-share/omf/gnome-terminal/gnome-terminal-zh_CN.omf
-share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-@dirrm share/omf/gnome-terminal
-@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
-@dirrm share/gnome/help/gnome-terminal/zh_TW
-@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
-@dirrm share/gnome/help/gnome-terminal/zh_CN
-@dirrm share/gnome/help/gnome-terminal/uk/figures
-@dirrm share/gnome/help/gnome-terminal/uk
-@dirrm share/gnome/help/gnome-terminal/sv/figures
-@dirrm share/gnome/help/gnome-terminal/sv
-@dirrm share/gnome/help/gnome-terminal/ru/figures
-@dirrm share/gnome/help/gnome-terminal/ru
-@dirrm share/gnome/help/gnome-terminal/ro/figures
-@dirrm share/gnome/help/gnome-terminal/ro
-@dirrm share/gnome/help/gnome-terminal/pt_BR/figures
-@dirrm share/gnome/help/gnome-terminal/pt_BR
-@dirrm share/gnome/help/gnome-terminal/oc/figures
-@dirrm share/gnome/help/gnome-terminal/oc
-@dirrm share/gnome/help/gnome-terminal/ko/figures
-@dirrm share/gnome/help/gnome-terminal/ko
-@dirrm share/gnome/help/gnome-terminal/ja/figures
-@dirrm share/gnome/help/gnome-terminal/ja
-@dirrm share/gnome/help/gnome-terminal/it/figures
-@dirrm share/gnome/help/gnome-terminal/it
-@dirrm share/gnome/help/gnome-terminal/fr/figures
-@dirrm share/gnome/help/gnome-terminal/fr
-@dirrm share/gnome/help/gnome-terminal/es/figures
-@dirrm share/gnome/help/gnome-terminal/es
-@dirrm share/gnome/help/gnome-terminal/en_GB/figures
-@dirrm share/gnome/help/gnome-terminal/en_GB
-@dirrm share/gnome/help/gnome-terminal/el/figures
-@dirrm share/gnome/help/gnome-terminal/el
-@dirrm share/gnome/help/gnome-terminal/de/figures
-@dirrm share/gnome/help/gnome-terminal/de
-@dirrm share/gnome/help/gnome-terminal/da/figures
-@dirrm share/gnome/help/gnome-terminal/da
-@dirrm share/gnome/help/gnome-terminal/cs/figures
-@dirrm share/gnome/help/gnome-terminal/cs
-@dirrm share/gnome/help/gnome-terminal/ca/figures
-@dirrm share/gnome/help/gnome-terminal/ca
-@dirrm share/gnome/help/gnome-terminal/bg/figures
-@dirrm share/gnome/help/gnome-terminal/bg
-@dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm share/gnome/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -282,3 +225,61 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrmtry share/help/zh_CN/gnome-terminal/figures
+@dirrmtry share/help/zh_CN/gnome-terminal
+@dirrmtry share/help/zh_CN
+@dirrmtry share/help/uk/gnome-terminal/figures
+@dirrmtry share/help/uk/gnome-terminal
+@dirrmtry share/help/uk
+@dirrmtry share/help/sv/gnome-terminal/figures
+@dirrmtry share/help/sv/gnome-terminal
+@dirrmtry share/help/sv
+@dirrmtry share/help/sl/gnome-terminal/figures
+@dirrmtry share/help/sl/gnome-terminal
+@dirrmtry share/help/sl
+@dirrmtry share/help/ru/gnome-terminal/figures
+@dirrmtry share/help/ru/gnome-terminal
+@dirrmtry share/help/ru
+@dirrmtry share/help/pt_BR/gnome-terminal/figures
+@dirrmtry share/help/pt_BR/gnome-terminal
+@dirrmtry share/help/pt_BR
+@dirrmtry share/help/oc/gnome-terminal/figures
+@dirrmtry share/help/oc/gnome-terminal
+@dirrmtry share/help/oc
+@dirrmtry share/help/ko/gnome-terminal/figures
+@dirrmtry share/help/ko/gnome-terminal
+@dirrmtry share/help/ko
+@dirrmtry share/help/it/gnome-terminal/figures
+@dirrmtry share/help/it/gnome-terminal
+@dirrmtry share/help/it
+@dirrmtry share/help/gl/gnome-terminal/figures
+@dirrmtry share/help/gl/gnome-terminal
+@dirrmtry share/help/gl
+@dirrmtry share/help/fr/gnome-terminal/figures
+@dirrmtry share/help/fr/gnome-terminal
+@dirrmtry share/help/fr
+@dirrmtry share/help/es/gnome-terminal/figures
+@dirrmtry share/help/es/gnome-terminal
+@dirrmtry share/help/es
+@dirrmtry share/help/en_GB/gnome-terminal/figures
+@dirrmtry share/help/en_GB/gnome-terminal
+@dirrmtry share/help/en_GB
+@dirrmtry share/help/el/gnome-terminal/figures
+@dirrmtry share/help/el/gnome-terminal
+@dirrmtry share/help/el
+@dirrmtry share/help/de/gnome-terminal/figures
+@dirrmtry share/help/de/gnome-terminal
+@dirrmtry share/help/de
+@dirrmtry share/help/da/gnome-terminal/figures
+@dirrmtry share/help/da/gnome-terminal
+@dirrmtry share/help/da
+@dirrmtry share/help/cs/gnome-terminal/figures
+@dirrmtry share/help/cs/gnome-terminal
+@dirrmtry share/help/cs
+@dirrmtry share/help/ca/gnome-terminal/figures
+@dirrmtry share/help/ca/gnome-terminal
+@dirrmtry share/help/ca
+@dirrmtry share/help/C/gnome-terminal/figures
+@dirrmtry share/help/C/gnome-terminal
+@dirrmtry share/help/C
+@dirrmtry share/help