- Update to 0.8.0

- Sort USES
- Remove NLS option

Tested by:	Vladimir Omelchuk (PR 209662)

4 files changed, 71 insertions, 73 deletions

diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 3b2d0735c403..cfb317263473 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-terminal
-PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -17,24 +16,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 glib20 intltool intlhack vte libxml2
+USE_GNOME=	gtk30 glib20 cairo gdkpixbuf2 intltool vte3 libxml2
 USE_XFCE=	libmenu
 USE_XORG=	x11
-USES=		pkgconfig gmake gettext-tools xfce tar:bzip2
+USES=		gettext gmake pkgconfig tar:bzip2 xfce:gk3
+INSTALL_TARGET=	install-strip
+SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--without-gnome-default-appsdir
 
-OPTIONS_DEFINE=	NLS
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext-runtime
-OPTIONS_SUB=	yes
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|	terminal||; \
-		s|po \\|terminal|' ${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo
index 17368c5d66d9..1bc866d3620c 100644
--- a/x11/xfce4-terminal/distinfo
+++ b/x11/xfce4-terminal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-terminal-0.6.3.tar.bz2) = 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08
-SIZE (xfce4/xfce4-terminal-0.6.3.tar.bz2) = 815207
+TIMESTAMP = 1476710906
+SHA256 (xfce4/xfce4-terminal-0.8.0.tar.bz2) = e915c05a3d07b66d153e1ba8614f904f9c12b2dd8372b27d24c0d339743d5b0a
+SIZE (xfce4/xfce4-terminal-0.8.0.tar.bz2) = 868612
diff --git a/x11/xfce4-terminal/files/pkg-message.in b/x11/xfce4-terminal/files/pkg-message.in
new file mode 100644
index 000000000000..f1947f11404a
--- /dev/null
+++ b/x11/xfce4-terminal/files/pkg-message.in
@@ -0,0 +1,7 @@
+To reduce the height of tabs, create ~/.config/gtk-3.0/gtk.css file with
+the following content:
+
+TerminalWindow GtkNotebook.notebook {
+        padding-top: 0;
+        padding-bottom: 0;
+}
diff --git a/x11/xfce4-terminal/pkg-plist b/x11/xfce4-terminal/pkg-plist
index b80a240845f3..2353e9813aaf 100644
--- a/x11/xfce4-terminal/pkg-plist
+++ b/x11/xfce4-terminal/pkg-plist
@@ -24,59 +24,61 @@ man/ug/man1/xfce4-terminal.1.gz
 man/uk/man1/xfce4-terminal.1.gz
 man/zh_CN/man1/xfce4-terminal.1.gz
 share/applications/xfce4-terminal.desktop
-%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/be/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/da/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/de/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/el/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/es/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/et/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/he/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/id/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/is/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/it/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/si/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/te/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/th/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-terminal.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ar/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ast/LC_MESSAGES/xfce4-terminal.mo
+share/locale/be/LC_MESSAGES/xfce4-terminal.mo
+share/locale/bg/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ca/LC_MESSAGES/xfce4-terminal.mo
+share/locale/cs/LC_MESSAGES/xfce4-terminal.mo
+share/locale/da/LC_MESSAGES/xfce4-terminal.mo
+share/locale/de/LC_MESSAGES/xfce4-terminal.mo
+share/locale/el/LC_MESSAGES/xfce4-terminal.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-terminal.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-terminal.mo
+share/locale/eo/LC_MESSAGES/xfce4-terminal.mo
+share/locale/es/LC_MESSAGES/xfce4-terminal.mo
+share/locale/et/LC_MESSAGES/xfce4-terminal.mo
+share/locale/eu/LC_MESSAGES/xfce4-terminal.mo
+share/locale/fi/LC_MESSAGES/xfce4-terminal.mo
+share/locale/fr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/gl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/he/LC_MESSAGES/xfce4-terminal.mo
+share/locale/hr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/hu/LC_MESSAGES/xfce4-terminal.mo
+share/locale/id/LC_MESSAGES/xfce4-terminal.mo
+share/locale/is/LC_MESSAGES/xfce4-terminal.mo
+share/locale/it/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ja/LC_MESSAGES/xfce4-terminal.mo
+share/locale/kk/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ko/LC_MESSAGES/xfce4-terminal.mo
+share/locale/lt/LC_MESSAGES/xfce4-terminal.mo
+share/locale/lv/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ms/LC_MESSAGES/xfce4-terminal.mo
+share/locale/nb/LC_MESSAGES/xfce4-terminal.mo
+share/locale/nl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/oc/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pa/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pt/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ro/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ru/LC_MESSAGES/xfce4-terminal.mo
+share/locale/si/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sk/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sq/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sv/LC_MESSAGES/xfce4-terminal.mo
+share/locale/te/LC_MESSAGES/xfce4-terminal.mo
+share/locale/th/LC_MESSAGES/xfce4-terminal.mo
+share/locale/tr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ug/LC_MESSAGES/xfce4-terminal.mo
+share/locale/uk/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ur/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-terminal.mo
+share/locale/vi/LC_MESSAGES/xfce4-terminal.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-terminal.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-terminal.mo
 share/xfce4/terminal/colorschemes/black-on-white.theme
 share/xfce4/terminal/colorschemes/dark-pastels.theme
 share/xfce4/terminal/colorschemes/green-on-black.theme