4 files changed, 61 insertions, 25 deletions

diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 63b7a15f7fe1..880e4224aae5 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	roxterm
-PORTVERSION=	2.9.1
+PORTVERSION=	2.9.3
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
@@ -14,15 +14,12 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
 		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		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
 
-USES=		gettext pkgconfig tar:bzip2
-USE_GNOME=	librsvg2
-USE_PYTHON_BUILD=	yes
-USE_AUTOTOOLS=	libtool:env
+USES=		gettext libtool:build pkgconfig python:build tar:bzip2
+USE_GNOME=	librsvg2:run libxslt:build
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		DOCS GTK3
@@ -60,8 +57,13 @@ do-install:
 .endfor
 	(cd ${WRKSRC}/build && ${INSTALL_MAN} *.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
+.for i in es fr pt_BR ru uk
+	@${MKDIR} ${STAGEDIR}${MANPREFIX}/man/${i}/man1
+	(cd ${WRKSRC}/build/po4a/${i} && ${INSTALL_MAN} *.1 \
+		${STAGEDIR}${MANPREFIX}/man/${i}/man1)
+.endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
-	(cd ${WRKSRC}/poxml && ${INSTALL_DATA} roxterm.appdata.xml \
+	(cd ${WRKSRC}/build && ${INSTALL_DATA} roxterm.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/appdata)
 	(cd ${WRKSRC} && ${INSTALL_DATA} roxterm.desktop \
 		${STAGEDIR}${DESKTOPDIR})
@@ -74,16 +76,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}/po && ${INSTALL_DATA} ${i}.mo \
+	(cd ${WRKSRC}/build/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})
 .endfor
-	@${MKDIR} ${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)
+.for i in en es fr lib pt_BR ru uk
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
+	(cd ${WRKSRC}/Help/${i} && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/${i})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/roxterm/distinfo b/x11/roxterm/distinfo
index 714ba176f726..e5796fe541ac 100644
--- a/x11/roxterm/distinfo
+++ b/x11/roxterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roxterm-2.9.1.tar.bz2) = a16fac013f8b8e9cb29c79d3ba040b57956c1fe0fc56b3ae988d1705fa0c809a
-SIZE (roxterm-2.9.1.tar.bz2) = 362912
+SHA256 (roxterm-2.9.3.tar.bz2) = 36131decfe79fa7d4c8fd325d4feaa843f348532a3871b173e6712fcde5cbda7
+SIZE (roxterm-2.9.3.tar.bz2) = 364120
diff --git a/x11/roxterm/files/patch-shortcuts.c b/x11/roxterm/files/patch-shortcuts.c
deleted file mode 100644
index 41d9e157e2d9..000000000000
--- a/x11/roxterm/files/patch-shortcuts.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 8aeb4b62c57d..fd3a0258df65 100644
--- a/x11/roxterm/pkg-plist
+++ b/x11/roxterm/pkg-plist
@@ -1,7 +1,17 @@
 bin/roxterm
 bin/roxterm-config
+man/es/man1/roxterm.1.gz
+man/es/man1/roxterm-config.1.gz
+man/fr/man1/roxterm.1.gz
+man/fr/man1/roxterm-config.1.gz
 man/man1/roxterm.1.gz
 man/man1/roxterm-config.1.gz
+man/pt_BR/man1/roxterm.1.gz
+man/pt_BR/man1/roxterm-config.1.gz
+man/ru/man1/roxterm.1.gz
+man/ru/man1/roxterm-config.1.gz
+man/uk/man1/roxterm.1.gz
+man/uk/man1/roxterm-config.1.gz
 share/appdata/roxterm.appdata.xml
 share/applications/roxterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -11,6 +21,14 @@ share/applications/roxterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/en/index.html
 %%PORTDOCS%%%%DOCSDIR%%/en/installation.html
 %%PORTDOCS%%%%DOCSDIR%%/en/news.html
+%%PORTDOCS%%%%DOCSDIR%%/es/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/es/index.html
+%%PORTDOCS%%%%DOCSDIR%%/es/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/es/news.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/index.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/news.html
 %%PORTDOCS%%%%DOCSDIR%%/lib/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/lib/header.png
 %%PORTDOCS%%%%DOCSDIR%%/lib/logo_text.png
@@ -19,6 +37,18 @@ share/applications/roxterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/lib/roxterm_ie.css
 %%PORTDOCS%%%%DOCSDIR%%/lib/roxterm_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/lib/sprites.png
+%%PORTDOCS%%%%DOCSDIR%%/pt_BR/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/pt_BR/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pt_BR/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/pt_BR/news.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/news.html
+%%PORTDOCS%%%%DOCSDIR%%/uk/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/uk/index.html
+%%PORTDOCS%%%%DOCSDIR%%/uk/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/uk/news.html
 share/icons/hicolor/scalable/apps/roxterm.svg
 share/locale/es/LC_MESSAGES/roxterm.mo
 share/locale/fr/LC_MESSAGES/roxterm.mo
@@ -33,7 +63,22 @@ share/locale/uk/LC_MESSAGES/roxterm.mo
 @dirrm %%DATADIR%%/Config/Colours
 @dirrm %%DATADIR%%/Config
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/uk
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pt_BR
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/appdata
+@dirrmtry man/uk/man1
+@dirrmtry man/uk
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
+@dirrmtry man/pt_BR/man1
+@dirrmtry man/pt_BR
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/es/man1
+@dirrmtry man/es