- Update to 2.8.3

PR:		187061

3 files changed, 25 insertions, 17 deletions

diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index f9771878a3ee..f969ed9117bb 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	roxterm
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.3
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTK+ 2.0 terminal emulator with tabs
+COMMENT=	GTK+ terminal emulator with tabs
 
 LICENSE=	GPLv3
 
@@ -17,19 +17,28 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-OPTIONS_DEFINE=	DOCS
-
 USE_BZIP2=	yes
 USES=		gettext pkgconfig
-USE_GNOME=	libglade2 librsvg2 vte
+USE_GNOME=	librsvg2
 USE_PYTHON_BUILD=	yes
 USE_AUTOTOOLS=	libtool:env
 INSTALLS_ICONS=	yes
 
-MAITCHFLAGS=	CC=${CC};GCC=${CC};CPP=${CC};CFLAGS=${CFLAGS};PARALLEL=${MAKE_JOBS_NUMBER}
+OPTIONS_DEFINE=		DOCS GTK3
+
+MAITCHFLAGS=	DISABLE_GTK3=${DISABLE_GTK3};DISABLE_GIT=True;DISABLE_PO4A=True;
+MAITCHFLAGS+=	CC=${CC};GCC=${CC};CPP=${CC};CFLAGS=${CFLAGS};
+MAITCHFLAGS+=	PARALLEL=${MAKE_JOBS_NUMBER};PREFIX=${PREFIX};
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MGTK3}
+USE_GNOME+=	vte3
+.else
+USE_GNOME+=	vte
+DISABLE_GTK3=	True
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|' ${WRKSRC}/maitch.py
@@ -38,17 +47,16 @@ post-patch:
 
 do-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAITCHFLAGS="${MAITCHFLAGS}" \
-		${PYTHON_CMD} mscript.py configure --prefix=${PREFIX} \
-		--disable-gtk3 --disable-po4a --disable-git)
+		${PYTHON_CMD} mscript.py configure)
 
 do-build:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} mscript.py build)
 
 do-install:
-	(cd ${WRKSRC}/build && ${INSTALL_PROGRAM} roxterm \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC}/build && ${INSTALL_SCRIPT} roxterm-config \
+.for i in roxterm roxterm-config
+	(cd ${WRKSRC}/build && ${INSTALL_PROGRAM} ${i} \
 		${STAGEDIR}${PREFIX}/bin)
+.endfor
 	(cd ${WRKSRC}/build && ${INSTALL_MAN} *.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 	(cd ${WRKSRC} && ${INSTALL_DATA} roxterm.desktop \
diff --git a/x11/roxterm/distinfo b/x11/roxterm/distinfo
index 0a10baa2dd4c..a60eb93edb5d 100644
--- a/x11/roxterm/distinfo
+++ b/x11/roxterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roxterm-2.8.1.tar.bz2) = b8b9660917c6a036d71a55b841143b8e9291a12e8f5748a2406c2d1ba5879b04
-SIZE (roxterm-2.8.1.tar.bz2) = 388352
+SHA256 (roxterm-2.8.3.tar.bz2) = 58498f2d5e155a70b503fcc3da28b40d064745390c39a21aabb097455037e9f7
+SIZE (roxterm-2.8.3.tar.bz2) = 387032
diff --git a/x11/roxterm/pkg-plist b/x11/roxterm/pkg-plist
index 743ebe54c8ec..0948d9059dde 100644
--- a/x11/roxterm/pkg-plist
+++ b/x11/roxterm/pkg-plist
@@ -19,15 +19,15 @@ share/applications/roxterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/lib/roxterm_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/lib/sprites.png
 share/icons/hicolor/scalable/apps/roxterm.svg
-%%DATADIR%%/Config/Colours/GTK
-%%DATADIR%%/Config/Colours/Tango
-%%DATADIR%%/Config/Shortcuts/Default
-%%DATADIR%%/roxterm-config.ui
 share/locale/es/LC_MESSAGES/roxterm.mo
 share/locale/fr/LC_MESSAGES/roxterm.mo
 share/locale/pt_BR/LC_MESSAGES/roxterm.mo
 share/locale/ru/LC_MESSAGES/roxterm.mo
 share/locale/uk/LC_MESSAGES/roxterm.mo
+%%DATADIR%%/Config/Colours/GTK
+%%DATADIR%%/Config/Colours/Tango
+%%DATADIR%%/Config/Shortcuts/Default
+%%DATADIR%%/roxterm-config.ui
 @dirrm %%DATADIR%%/Config/Shortcuts
 @dirrm %%DATADIR%%/Config/Colours
 @dirrm %%DATADIR%%/Config