4 files changed, 27 insertions, 9 deletions

diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 809a9c33ec5d..63b7a15f7fe1 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	roxterm
-PORTVERSION=	2.8.3
+PORTVERSION=	2.9.1
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
@@ -13,7 +13,9 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
 		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+		itstool:${PORTSDIR}/textproc/itstool \
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		po4a:${PORTSDIR}/textproc/po4a
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
@@ -25,7 +27,7 @@ INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		DOCS GTK3
 
-MAITCHFLAGS=	DISABLE_GTK3=${DISABLE_GTK3};DISABLE_GIT=True;DISABLE_PO4A=True;
+MAITCHFLAGS=	DISABLE_GTK3=${DISABLE_GTK3};DISABLE_GIT=True;
 MAITCHFLAGS+=	CC=${CC};GCC=${CC};CPP=${CC};CFLAGS=${CFLAGS};
 MAITCHFLAGS+=	PARALLEL=${MAKE_JOBS_NUMBER};PREFIX=${PREFIX};
 
@@ -58,6 +60,9 @@ do-install:
 .endfor
 	(cd ${WRKSRC}/build && ${INSTALL_MAN} *.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
+	(cd ${WRKSRC}/poxml && ${INSTALL_DATA} roxterm.appdata.xml \
+		${STAGEDIR}${PREFIX}/share/appdata)
 	(cd ${WRKSRC} && ${INSTALL_DATA} roxterm.desktop \
 		${STAGEDIR}${DESKTOPDIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
@@ -69,16 +74,16 @@ do-install:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} Config ${STAGEDIR}${DATADIR})
 .for i in es fr pt_BR ru uk
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
-	(cd ${WRKSRC}/build/po && ${INSTALL_DATA} ${i}.mo \
+	(cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.mo \
 		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/roxterm.mo)
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog README
-	@(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/en
-	@(cd ${WRKSRC}/Help/en && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/en)
+	(cd ${WRKSRC}/Help/en && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/en)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/lib
-	@(cd ${WRKSRC}/Help/lib && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/lib)
+	(cd ${WRKSRC}/Help/lib && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/lib)
 
 .include <bsd.port.mk>
diff --git a/x11/roxterm/distinfo b/x11/roxterm/distinfo
index a60eb93edb5d..714ba176f726 100644
--- a/x11/roxterm/distinfo
+++ b/x11/roxterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roxterm-2.8.3.tar.bz2) = 58498f2d5e155a70b503fcc3da28b40d064745390c39a21aabb097455037e9f7
-SIZE (roxterm-2.8.3.tar.bz2) = 387032
+SHA256 (roxterm-2.9.1.tar.bz2) = a16fac013f8b8e9cb29c79d3ba040b57956c1fe0fc56b3ae988d1705fa0c809a
+SIZE (roxterm-2.9.1.tar.bz2) = 362912
diff --git a/x11/roxterm/files/patch-shortcuts.c b/x11/roxterm/files/patch-shortcuts.c
new file mode 100644
index 000000000000..41d9e157e2d9
--- /dev/null
+++ b/x11/roxterm/files/patch-shortcuts.c
@@ -0,0 +1,11 @@
+--- src/shortcuts.c.orig
++++ src/shortcuts.c
+@@ -485,7 +485,7 @@
+     cmdv[0] = editor;
+     cmdv[1] = filename;
+     cmdv[2] = NULL;
+-    if (g_spawn_async(NULL, (char **) cmdv, NULL, G_SPAWN_DEFAULT, NULL, NULL,
++    if (g_spawn_async(NULL, (char **) cmdv, NULL, 0, NULL, NULL,
+             &pid, &error))
+     {
+         GFile *f = g_file_new_for_path(filename);
diff --git a/x11/roxterm/pkg-plist b/x11/roxterm/pkg-plist
index 0948d9059dde..8aeb4b62c57d 100644
--- a/x11/roxterm/pkg-plist
+++ b/x11/roxterm/pkg-plist
@@ -2,6 +2,7 @@ bin/roxterm
 bin/roxterm-config
 man/man1/roxterm.1.gz
 man/man1/roxterm-config.1.gz
+share/appdata/roxterm.appdata.xml
 share/applications/roxterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -35,3 +36,4 @@ share/locale/uk/LC_MESSAGES/roxterm.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/appdata