update to 0.4.7

PR:		ports/156207
Submitted by:	Olivier Duchateau <duchateau.olivier@gmail.com>

3 files changed, 36 insertions, 113 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index acafbfe3df99..afe3b42d60fb 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.4.6
+PORTVERSION=	0.4.7
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME:L}/${PORTVERSION:R}
@@ -20,15 +20,18 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 glib20 intltool intlhack pkgconfig vte
+USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack pkgconfig vte \
+		desktopfileutils
 USE_XFCE=	configenv libexo
 USE_XORG=	x11
 
+CONFIGURE_ARGS=	--without-gnome-default-appsdir
+
 OPTIONS=	DBUS	"Enable D-BUS 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
+MANLANG=	"" ca da el es fr gl id it ja pt ru sv ug zh_CN
 
 .include  <bsd.port.pre.mk>
 
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 3e8be6e72fe9..7acc835b91d5 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/Terminal-0.4.6.tar.bz2) = 3a8d55d3b1bf3454ac7a695bec46e0aa3a957af2232f8f1d7f2c3c71806f897f
-SIZE (xfce4/Terminal-0.4.6.tar.bz2) = 1577616
+SHA256 (xfce4/Terminal-0.4.7.tar.bz2) = 12ab46043ebf2de07e5a1c6826c6b0a677eb3ba58cc1c883a1a906b83ac6fd01
+SIZE (xfce4/Terminal-0.4.7.tar.bz2) = 1582320
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index 959edae50232..db7153ebefbb 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -1,8 +1,8 @@
 bin/Terminal
 bin/terminal
-share/Terminal/Terminal-toolbars.ui
-share/Terminal/Terminal.glade
-%%NLS%%share/applications/Terminal.desktop
+%%DATADIR%%/Terminal-toolbars.ui
+%%DATADIR%%/Terminal.glade
+share/applications/Terminal.desktop
 %%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/C/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/C/copyright.html
@@ -43,6 +43,16 @@ share/Terminal/Terminal.glade
 %%PORTDOCS%%%%DOCSDIR%%/da/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/da/support.html
 %%PORTDOCS%%%%DOCSDIR%%/da/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/el/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/el/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/el/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/el/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/el/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/el/images
+%%PORTDOCS%%%%DOCSDIR%%/el/index.html
+%%PORTDOCS%%%%DOCSDIR%%/el/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/el/support.html
+%%PORTDOCS%%%%DOCSDIR%%/el/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/es/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/es/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/es/copyright.html
@@ -73,26 +83,6 @@ share/Terminal/Terminal.glade
 %%PORTDOCS%%%%DOCSDIR%%/gl/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/support.html
 %%PORTDOCS%%%%DOCSDIR%%/gl/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/el/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/el/command-line.html
-%%PORTDOCS%%%%DOCSDIR%%/el/copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/el/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/el/getting-started.html
-%%PORTDOCS%%%%DOCSDIR%%/el/index.html
-%%PORTDOCS%%%%DOCSDIR%%/el/preferences.html
-%%PORTDOCS%%%%DOCSDIR%%/el/support.html
-%%PORTDOCS%%%%DOCSDIR%%/el/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/el/images
-%%PORTDOCS%%%%DOCSDIR%%/sv/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/command-line.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/getting-started.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/index.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/preferences.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/support.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/sv/images
 %%PORTDOCS%%%%DOCSDIR%%/id/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/id/command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/id/copyright.html
@@ -153,6 +143,16 @@ share/Terminal/Terminal.glade
 %%PORTDOCS%%%%DOCSDIR%%/ru/preferences.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/support.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/images
+%%PORTDOCS%%%%DOCSDIR%%/sv/index.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/support.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/terminal.css
 %%PORTDOCS%%%%DOCSDIR%%/ug/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/ug/command-line.html
@@ -174,7 +174,6 @@ share/Terminal/Terminal.glade
 %%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
@@ -237,102 +236,24 @@ share/icons/hicolor/scalable/apps/Terminal.svg
 %%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
+@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/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/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
@@ -351,21 +272,20 @@ share/pixmaps/terminal.xpm
 @dirrmtry share/gnome-control-center
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ug
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sv
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
 %%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%%/el
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/da
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/el
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sv
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/Terminal
+@dirrm %%DATADIR%%