- Update to 2.7.2

PR:		179597
Submitted by:	Ports Fury

2 files changed, 30 insertions, 24 deletions

diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 14db9c4fbb41..6eb3246ff2e9 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -1,8 +1,8 @@
 # Created by: Yinghong Liu <relaxbsd@gmail.com>
 # $FreeBSD$
- 
+
 PORTNAME=	roxterm
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
@@ -15,12 +15,13 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
 		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 OPTIONS_DEFINE=	DOCS
 
 USE_BZIP2=	yes
 USES=		gettext pkgconfig
-USE_GNOME=	libglade2 vte
+USE_GNOME=	libglade2 librsvg2 vte
 USE_PYTHON_BUILD=	yes
 USE_AUTOTOOLS=	libtool:env
 INSTALLS_ICONS=	yes
@@ -37,42 +38,47 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|' ${WRKSRC}/maitch.py
 	@${REINPLACE_CMD} -e \
-		's|= "-T"|= ""|' ${WRKSRC}/mscript.py
+		's|x-www-browser|xdg-open|' ${WRKSRC}/src/uri.c
 
 do-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAITCHFLAGS="${MAITCHFLAGS}" \
 		${PYTHON_CMD} mscript.py configure --prefix=${PREFIX} \
-		--disable-gtk3 --disable-po4a --disable-git)
+		--disable-gtk3 --disable-gettext --disable-po4a --disable-git)
 
 do-build:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} mscript.py build \
-		&& ${PYTHON_CMD} mscript.py install)
+	@(cd ${WRKSRC} && ${PYTHON_CMD} mscript.py build)
+	@${MKDIR} ${WRKSRC}/build/po
+.for i in es fr pt_BR ru uk
+	@(cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt \
+		-o ${WRKSRC}/build/po/${i}.mo ${i}.po)
+.endfor
 
 do-install:
-	(cd ${WRKSRC}/build/usr/local/bin \
-		&& ${INSTALL_PROGRAM} * ${PREFIX}/bin)
-	(cd ${WRKSRC}/build/usr/local/share/man/man1 \
-		&& ${INSTALL_MAN} * ${MANPREFIX}/man/man1)
-	@${MKDIR} ${DATADIR}
-	@(cd ${WRKSRC}/build/usr/local/share/roxterm \
-		&& ${COPYTREE_SHARE} . ${DATADIR})
+	(cd ${WRKSRC}/build && ${INSTALL_PROGRAM} roxterm ${PREFIX}/bin)
+	(cd ${WRKSRC}/build && ${INSTALL_SCRIPT} roxterm-config ${PREFIX}/bin)
+	(cd ${WRKSRC}/build && ${INSTALL_MAN} *.1 ${MANPREFIX}/man/man1)
 	@${MKDIR} ${DESKTOPDIR}
-	(cd ${WRKSRC}/build/usr/local/share/applications \
-		&& ${INSTALL_DATA} * ${DESKTOPDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} roxterm.desktop ${DESKTOPDIR})
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
-	(cd ${WRKSRC}/build/usr/local/share/icons/hicolor/scalable/apps \
-		&& ${INSTALL_DATA} * \
+	(cd ${WRKSRC} && ${INSTALL_DATA} roxterm.svg \
 		${PREFIX}/share/icons/hicolor/scalable/apps)
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/src && ${INSTALL_DATA} roxterm-config.ui ${DATADIR})
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} Config ${DATADIR})
 .for i in es fr pt_BR ru uk
 	@${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
-	(cd ${WRKSRC}/build/usr/local/share/locale/${i}/LC_MESSAGES/roxterm.mo \
-		&& ${INSTALL_DATA} ${i}.mo \
+	(cd ${WRKSRC}/build/po && ${INSTALL_DATA} ${i}.mo \
 		${PREFIX}/share/locale/${i}/LC_MESSAGES/roxterm.mo)
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/build/usr/local/share/doc/roxterm \
-		&& ${COPYTREE_SHARE} . ${DOCSDIR})
+.for i in AUTHORS ChangeLog README
+	@(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
+	@${MKDIR} ${DOCSDIR}/en
+	@(cd ${WRKSRC}/Help/en && ${INSTALL_DATA} * ${DOCSDIR}/en)
+	@${MKDIR} ${DOCSDIR}/lib
+	@(cd ${WRKSRC}/Help/lib && ${INSTALL_DATA} * ${DOCSDIR}/lib)
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/roxterm/distinfo b/x11/roxterm/distinfo
index 937fa41a12b0..ce3a72109f8b 100644
--- a/x11/roxterm/distinfo
+++ b/x11/roxterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roxterm-2.7.1.tar.bz2) = 24d6d5523d47f32bdf787b70d7d78463df079d644047214982b825403fac99b3
-SIZE (roxterm-2.7.1.tar.bz2) = 349478
+SHA256 (roxterm-2.7.2.tar.bz2) = 94db6be85abe7f0b8f216ee48bded178800e88cc5dfeb308520d7b03875749ce
+SIZE (roxterm-2.7.2.tar.bz2) = 376920