4 files changed, 438 insertions, 101 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index bf309c9a363e..e3abab229bed 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,49 +6,53 @@
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.4.3
-PORTREVISION=	3
+PORTVERSION=	0.4.5
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.xfce.org/archive/src/apps/terminal/0.4/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/apps/${PORTNAME:L}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Terminal emulator for the X windowing system
 
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig vte
+USE_GNOME=	gnometarget gtk20 glib20 intltool intlhack pkgconfig vte
 USE_XFCE=	configenv libexo
+USE_XORG=	x11
 
 OPTIONS=	DBUS	"Enable D-BUS support"			on \
-		STARTUP "Enable startup notification support"	on
+		NLS	"Enable Native Language Support"	on
 
 MAN1=		Terminal.1
+MANLANG=	"" ca da es fr gl id it ja pt ru ug zh_CN
 
 .include  <bsd.port.pre.mk>
 
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc-Makefile.in
+.endif
+
 .if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
-PLIST_SUB+=	WITH_DBUS=""
 .else
 CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
-.if !defined(WITHOUT_STARTUP)
-LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=--disable-startup-notification
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|	doc[    ]*||' ${WRKSRC}/Makefile.in
-.endif
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 8f3f175d1a75..c294b0f03b0e 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/Terminal-0.4.3.tar.bz2) = 0ce66b16bcb7ff274d7f93a69993f717
-SHA256 (xfce4/Terminal-0.4.3.tar.bz2) = 270da3e726a782750d392e9d21edc7af2935d1bd08daa254de8b3665115aafbf
-SIZE (xfce4/Terminal-0.4.3.tar.bz2) = 1402717
+MD5 (xfce4/Terminal-0.4.5.tar.bz2) = 3c707628e2e97c6d9566cd74d400036a
+SHA256 (xfce4/Terminal-0.4.5.tar.bz2) = 92fddcbc1422076672d8ec61832793d4ceea2fc0db7d724a6acde0ec2bac8893
+SIZE (xfce4/Terminal-0.4.5.tar.bz2) = 1564662
diff --git a/x11/Terminal/files/extra-patch-doc-Makefile.in b/x11/Terminal/files/extra-patch-doc-Makefile.in
new file mode 100644
index 000000000000..46ba66fbdc8c
--- /dev/null
+++ b/x11/Terminal/files/extra-patch-doc-Makefile.in
@@ -0,0 +1,181 @@
+--- doc/Makefile.in.orig	2010-05-21 22:10:01.000000000 +0200
++++ doc/Makefile.in	2010-05-24 18:36:50.000000000 +0200
+@@ -53,9 +53,9 @@
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
++	info-recursive install-data-recursive \
+ 	install-dvi-recursive install-exec-recursive \
+-	install-html-recursive install-info-recursive \
++	install-info-recursive \
+ 	install-pdf-recursive install-ps-recursive install-recursive \
+ 	installcheck-recursive installdirs-recursive pdf-recursive \
+ 	ps-recursive uninstall-recursive
+@@ -291,7 +291,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+-	images \
+ 	po
+ 
+ HTML_STYLESHEET = $(PACKAGE)-html.xsl
+@@ -359,18 +358,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-install-cssDATA: $(css_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
+-	@list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \
+-	done
+ 
+ uninstall-cssDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -581,9 +568,6 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(cssdir)"; do \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -622,15 +606,11 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+-html-am:
+-
+ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-cssDATA install-data-local
++install-data-am: install-data-local
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -638,10 +618,6 @@
+ 
+ install-exec-am:
+ 
+-install-html: install-html-recursive
+-
+-install-html-am:
+-
+ install-info: install-info-recursive
+ 
+ install-info-am:
+@@ -683,10 +659,10 @@
+ 	all all-am check check-am clean clean-generic clean-libtool \
+ 	clean-local ctags ctags-recursive dist-hook distclean \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-cssDATA install-data install-data-am \
++	dvi-am  info info-am install install-am \
++	install-data install-data-am \
+ 	install-data-local install-dvi install-dvi-am install-exec \
+-	install-exec-am install-html install-html-am install-info \
++	install-exec-am install-info \
+ 	install-info-am install-man install-pdf install-pdf-am \
+ 	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs installdirs-am maintainer-clean \
+@@ -698,19 +674,6 @@
+ # install the html files to the destdir
+ install-data-local:
+ 	for lang in $(ALL_LINGUAS); do \
+-		if test -d $(srcdir)/html/$$lang; then \
+-			dest=$(DESTDIR)$(docdir)/$$lang; \
+-			$(mkinstalldirs) $$dest; \
+-			installfiles=`echo $(srcdir)/html/$$lang/*`; \
+-			for file in $$installfiles; do \
+-				echo "--- Installing "$$file; \
+-				$(INSTALL_DATA) $$file $$dest/; \
+-			done; \
+-			if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
+-				echo "--- Creating symlink to C images for $$lang"; \
+-				ln -sf $(docdir)/C/images $$dest/images; \
+-			fi \
+-		fi; \
+ 		file=$(srcdir)/man/$$lang/$(PACKAGE_NAME).1; \
+ 		if test -f $$file ; then \
+ 			if test x"$$lang" = x"C"; then \
+@@ -728,13 +691,6 @@
+ uninstall-local:
+ 	for lang in $(ALL_LINGUAS); do \
+ 		dest=$(DESTDIR)$(docdir)/$$lang; \
+-		if test -d $$dest; then \
+-			if test -L $$dest/images; then \
+-				rm -rf $$dest; \
+-			else \
+-				rm -f $$dest/*.html; \
+-			fi \
+-		fi; \
+ 		if test x"$$lang" = x"C"; then \
+ 			dest=$(DESTDIR)$(mandir)/man1/$(PACKAGE).1; \
+ 		else \
+@@ -748,7 +704,7 @@
+ 
+ # remove generate html from the srcdir
+ clean-local:
+-	rm -rf $(srcdir)/html $(srcdir)/man
++	rm -rf $(srcdir)/man
+ 
+ # regenerate po(t) files
+ @GENERATE_DOCUMENTATION_TRUE@update-po:
+@@ -760,9 +716,9 @@
+ @GENERATE_DOCUMENTATION_TRUE@	done
+ 
+ # build the translated help files
+-@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(HTML_STYLESHEET) $(srcdir)/$(MAN_STYLESHEET)
++@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(MAN_STYLESHEET)
+ @GENERATE_DOCUMENTATION_TRUE@	@chmod -R u+w $(srcdir); \
+-@GENERATE_DOCUMENTATION_TRUE@	rm -rf $(srcdir)/html $(srcdir)/man; \
++@GENERATE_DOCUMENTATION_TRUE@	rm -rf $(srcdir)/man; \
+ @GENERATE_DOCUMENTATION_TRUE@	echo; \
+ @GENERATE_DOCUMENTATION_TRUE@	echo "*** Generating full XML file ***"; \
+ @GENERATE_DOCUMENTATION_TRUE@	echo "Creating Terminal-options.xml"; \
+@@ -788,11 +744,9 @@
+ @GENERATE_DOCUMENTATION_TRUE@			-i xgen-doc xgen-man; \
+ @GENERATE_DOCUMENTATION_TRUE@		echo "Validating DocBook XML files"; \
+ @GENERATE_DOCUMENTATION_TRUE@		$(XMLLINT) --noout --valid xgen-doc xgen-man; \
+-@GENERATE_DOCUMENTATION_TRUE@		echo "Creating the HTML pages"; \
+-@GENERATE_DOCUMENTATION_TRUE@		$(XSLTPROC) --nonet -o $(srcdir)/html/$$lang/ $(srcdir)/$(HTML_STYLESHEET) xgen-doc; \
+ @GENERATE_DOCUMENTATION_TRUE@		echo "Creating the MAN page"; \
+ @GENERATE_DOCUMENTATION_TRUE@		$(XSLTPROC) --nonet -o $(srcdir)/man/$$lang/$(PACKAGE_NAME).1 $(srcdir)/$(MAN_STYLESHEET) xgen-man; \
+-@GENERATE_DOCUMENTATION_TRUE@		chmod -R u+w $(srcdir)/html/$$lang $(srcdir)/man/$$lang; \
++@GENERATE_DOCUMENTATION_TRUE@		chmod -R u+w $(srcdir)/man/$$lang; \
+ @GENERATE_DOCUMENTATION_TRUE@		rm -f xgen-doc xgen-man; \
+ @GENERATE_DOCUMENTATION_TRUE@		echo; \
+ @GENERATE_DOCUMENTATION_TRUE@	done; \
+@@ -806,7 +760,7 @@
+ @GENERATE_DOCUMENTATION_FALSE@	@false
+ 
+ @GENERATE_DOCUMENTATION_FALSE@doc-build.stamp:
+-@GENERATE_DOCUMENTATION_FALSE@	@if test ! -d $(srcdir)/html -a ! -d $(srcdir)/man; then \
++@GENERATE_DOCUMENTATION_FALSE@	@if test ! -d $(srcdir)/man; then \
+ @GENERATE_DOCUMENTATION_FALSE@		echo; \
+ @GENERATE_DOCUMENTATION_FALSE@		echo "*** No generated documentation found. If you want to"; \
+ @GENERATE_DOCUMENTATION_FALSE@		echo "*** generate the (translated) documentation, run configure"; \
+@@ -825,10 +779,6 @@
+ # include the html and man files in the dist
+ dist-hook: dist-check-doc doc-build.stamp
+ 	for lang in $(ALL_LINGUAS); do \
+-		if test -d $(srcdir)/html/$$lang; then \
+-			mkdir -p $(distdir)/html/$$lang; \
+-			cp $(srcdir)/html/$$lang/* $(distdir)/html/$$lang/; \
+-		fi; \
+ 		if test -d $(srcdir)/man/$$lang; then \
+ 			mkdir -p $(distdir)/man/$$lang; \
+ 			cp $(srcdir)/man/$$lang/* $(distdir)/man/$$lang/; \
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index 082a29e54be3..3ae8989b90e3 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -1,11 +1,10 @@
 bin/Terminal
 bin/terminal
-libexec/TerminalHelp
 share/Terminal/Terminal-toolbars.ui
 share/Terminal/Terminal.glade
-share/applications/Terminal.desktop
-share/gnome-control-center/default-apps/Terminal-default-apps.xml
+%%NLS%%share/applications/Terminal.desktop
 %%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/C/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/C/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/C/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/C/getting-started.html
@@ -25,6 +24,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/C/support.html
 %%PORTDOCS%%%%DOCSDIR%%/C/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/ca/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ca/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/ca/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/ca/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/ca/getting-started.html
@@ -34,6 +34,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/ca/support.html
 %%PORTDOCS%%%%DOCSDIR%%/ca/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/da/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/da/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/da/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/da/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/da/getting-started.html
@@ -42,7 +43,18 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/da/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/da/support.html
 %%PORTDOCS%%%%DOCSDIR%%/da/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/es/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/es/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/es/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/es/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/es/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/es/images
+%%PORTDOCS%%%%DOCSDIR%%/es/index.html
+%%PORTDOCS%%%%DOCSDIR%%/es/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/es/support.html
+%%PORTDOCS%%%%DOCSDIR%%/es/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/getting-started.html
@@ -52,6 +64,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/fr/support.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/gl/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/getting-started.html
@@ -60,7 +73,18 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/gl/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/support.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/images
+%%PORTDOCS%%%%DOCSDIR%%/hr/index.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/support.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/id/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/id/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/id/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/id/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/id/getting-started.html
@@ -70,6 +94,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/id/support.html
 %%PORTDOCS%%%%DOCSDIR%%/id/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/it/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/it/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/it/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/it/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/it/getting-started.html
@@ -79,6 +104,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/it/support.html
 %%PORTDOCS%%%%DOCSDIR%%/it/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/getting-started.html
@@ -97,8 +123,39 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/ja/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/support.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/images
+%%PORTDOCS%%%%DOCSDIR%%/pt/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/support.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/images
+%%PORTDOCS%%%%DOCSDIR%%/ru/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/terminal.css
+%%PORTDOCS%%%%DOCSDIR%%/ug/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/images
+%%PORTDOCS%%%%DOCSDIR%%/ug/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/zh_CN/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/getting-started.html
@@ -107,6 +164,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/support.html
 %%PORTDOCS%%%%DOCSDIR%%/zh_CN/usage.html
+share/gnome-control-center/default-apps/Terminal-default-apps.xml
 share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png
 share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png
 share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
@@ -117,93 +175,187 @@ share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
 share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
 share/icons/hicolor/scalable/apps/Terminal.svg
-share/locale/ar/LC_MESSAGES/Terminal.mo
-share/locale/ast/LC_MESSAGES/Terminal.mo
-share/locale/be/LC_MESSAGES/Terminal.mo
-share/locale/ca/LC_MESSAGES/Terminal.mo
-share/locale/cs/LC_MESSAGES/Terminal.mo
-share/locale/da/LC_MESSAGES/Terminal.mo
-share/locale/de/LC_MESSAGES/Terminal.mo
-share/locale/dz/LC_MESSAGES/Terminal.mo
-share/locale/el/LC_MESSAGES/Terminal.mo
-share/locale/en_GB/LC_MESSAGES/Terminal.mo
-share/locale/eo/LC_MESSAGES/Terminal.mo
-share/locale/et/LC_MESSAGES/Terminal.mo
-share/locale/es/LC_MESSAGES/Terminal.mo
-share/locale/eu/LC_MESSAGES/Terminal.mo
-share/locale/fi/LC_MESSAGES/Terminal.mo
-share/locale/fr/LC_MESSAGES/Terminal.mo
-share/locale/gl/LC_MESSAGES/Terminal.mo
-share/locale/he/LC_MESSAGES/Terminal.mo
-share/locale/hu/LC_MESSAGES/Terminal.mo
-share/locale/id/LC_MESSAGES/Terminal.mo
-share/locale/it/LC_MESSAGES/Terminal.mo
-share/locale/ja/LC_MESSAGES/Terminal.mo
-share/locale/kk/LC_MESSAGES/Terminal.mo
-share/locale/ko/LC_MESSAGES/Terminal.mo
-share/locale/ku/LC_MESSAGES/Terminal.mo
-share/locale/lt/LC_MESSAGES/Terminal.mo
-share/locale/lv/LC_MESSAGES/Terminal.mo
-share/locale/nb/LC_MESSAGES/Terminal.mo
-share/locale/nl/LC_MESSAGES/Terminal.mo
-share/locale/pa/LC_MESSAGES/Terminal.mo
-share/locale/pl/LC_MESSAGES/Terminal.mo
-share/locale/pt_BR/LC_MESSAGES/Terminal.mo
-share/locale/pt/LC_MESSAGES/Terminal.mo
-share/locale/ro/LC_MESSAGES/Terminal.mo
-share/locale/ru/LC_MESSAGES/Terminal.mo
-share/locale/sk/LC_MESSAGES/Terminal.mo
-share/locale/sq/LC_MESSAGES/Terminal.mo
-share/locale/sv/LC_MESSAGES/Terminal.mo
-share/locale/tr/LC_MESSAGES/Terminal.mo
-share/locale/uk/LC_MESSAGES/Terminal.mo
-share/locale/ur/LC_MESSAGES/Terminal.mo
-share/locale/ur_PK/LC_MESSAGES/Terminal.mo
-share/locale/vi/LC_MESSAGES/Terminal.mo
-share/locale/zh_CN/LC_MESSAGES/Terminal.mo
-share/locale/zh_TW/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/be/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/da/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/el/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/et/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/he/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/id/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/si/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/Terminal.mo
 share/pixmaps/terminal.xpm
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/vi
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tr
+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv
+%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sq
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pa
+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl
+%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id
+%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hu
+%%NLS%%@dirrmtry share/locale/hr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hr
+%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eu
+%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eo
+%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_GB
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/da
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
+%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ar
+@dirrmtry man/zh_CN/man1
+@dirrmtry man/zh_CN
+@dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/24x24/stock/navigation
-@dirrmtry share/icons/hicolor/24x24/stock
-@dirrmtry share/icons/hicolor/24x24
 @dirrmtry share/icons/hicolor/48x48/stock/navigation
 @dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/id
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/it
+@dirrmtry share/icons/hicolor/24x24/stock/navigation
+@dirrmtry share/icons/hicolor/24x24/stock
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/16x16/stock/navigation
+@dirrmtry share/icons/hicolor/16x16/stock
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/gnome-control-center/default-apps
+@dirrmtry share/gnome-control-center
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ug
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/it
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/id
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/hr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/gl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm share/Terminal
-@dirrmtry share/gnome-control-center/default-apps
-@dirrmtry share/icons/hicolor/16x16/stock/navigation
-@dirrmtry share/icons/hicolor/16x16/stock
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/48x48/stock/navigation
-@dirrmtry share/icons/hicolor/48x48/stock
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK