4 files changed, 59 insertions, 35 deletions

diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index bfb31d1bfb60..5f5e4415a5f5 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -6,23 +6,54 @@
 #
 
 PORTNAME=	roxterm
-PORTVERSION=	1.17.1
-PORTREVISION=	1
+PORTVERSION=	1.21.4
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ 2.0 terminal emulator with tabs
 
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-INSTALLS_ICONS=	yes
-USE_GNOME=	vte libglade2
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/Help/COPYING
+
+USE_XORG=	sm ice
+USE_GNOME=	libglade2 vte
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_prog_HAVE_XMLTO=no ac_cv_prog_HAVE_PO4A=no
+INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
+MANLANG=	"" es
+MAN1=		roxterm.1 roxterm-config.1
+
+post-patch:
+.for file in Makefile.in po4a/Makefile.in
+	@${REINPLACE_CMD} -e '/^install-data-am:/s|install-data-local||g' \
+		${WRKSRC}/${file}
+.endfor
+
+post-install:
+	@${MKDIR} ${MANPREFIX}/man/es/man1
+.for file in roxterm.1 roxterm-config.1
+	${INSTALL_MAN} ${WRKSRC}/po4a/es/${file} ${MANPREFIX}/man/es/man1
+.endfor
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/roxterm.svg \
+		${PREFIX}/share/icons/hicolor/scalable/apps
 .if !defined(NOPORTDOCS)
-INSTALL_TARGET+=install install-doc-local
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS Changes README
+	${INSTALL_DATA} ${WRKSRC}/Help/${file} ${DOCSDIR}
+.endfor
+.for dir in en es lib
+	@(cd ${WRKSRC}/Help && ${COPYTREE_SHARE} ${dir} ${DOCSDIR})
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/roxterm/distinfo b/x11/roxterm/distinfo
index b621c1358a15..825677069a72 100644
--- a/x11/roxterm/distinfo
+++ b/x11/roxterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roxterm-1.17.1.tar.gz) = b9a80e8de4724bfbcca19f06c9778c87647c36301c67c4f8acdc06129f98ac25
-SIZE (roxterm-1.17.1.tar.gz) = 761168
+SHA256 (roxterm-1.21.4.tar.gz) = 50dd5500d5f3079c12e37b942271270f8ba56bbead78dbe5402c9b560d1d0db6
+SIZE (roxterm-1.21.4.tar.gz) = 939860
diff --git a/x11/roxterm/files/patch-Makefile.in b/x11/roxterm/files/patch-Makefile.in
deleted file mode 100644
index da6e20fd625f..000000000000
--- a/x11/roxterm/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Tue Jun 19 22:25:48 2007
-+++ Makefile.in	Tue Jun 19 22:32:44 2007
-@@ -721,12 +721,13 @@
- 	uninstall-local uninstall-nobase_pkgdataDATA
- 
- 
--install-data-local:
-+install-doc-local:
- 	$(top_srcdir)/install-sh -d $(DESTDIR)/$(pkgdocdir)/imgs
- 	$(top_srcdir)/install-sh -m 0644 -t $(DESTDIR)/$(pkgdocdir) \
- 		$(HELPFILES)
- 	$(top_srcdir)/install-sh -m 0644 -t $(DESTDIR)/$(pkgdocdir)/imgs \
- 		$(HELPIMGS)
-+install-data-local:
- 	$(top_srcdir)/install-sh -m 0644 $(top_srcdir)/.DirIcon \
- 		$(DESTDIR)/$(pkgicondir)/roxterm.svg
- 
diff --git a/x11/roxterm/pkg-plist b/x11/roxterm/pkg-plist
index 5cb33060a013..c6278290c639 100644
--- a/x11/roxterm/pkg-plist
+++ b/x11/roxterm/pkg-plist
@@ -2,26 +2,36 @@ bin/roxterm
 bin/roxterm-config
 share/applications/roxterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Changes
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/imgs/project-support.jpg
-%%PORTDOCS%%%%DOCSDIR%%/imgs/roxterm_logo.png
-%%PORTDOCS%%%%DOCSDIR%%/imgs/sflogo.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-share/locale/en/LC_MESSAGES/roxterm.mo
-share/locale/en_GB/LC_MESSAGES/roxterm.mo
+%%PORTDOCS%%%%DOCSDIR%%/en/guide.html
+%%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%%/lib/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/lib/header.png
+%%PORTDOCS%%%%DOCSDIR%%/lib/logo_text.png
+%%PORTDOCS%%%%DOCSDIR%%/lib/logo_text_only.png
+%%PORTDOCS%%%%DOCSDIR%%/lib/roxterm.css
+%%PORTDOCS%%%%DOCSDIR%%/lib/roxterm_ie.css
+%%PORTDOCS%%%%DOCSDIR%%/lib/roxterm_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/lib/sprites.png
 share/icons/hicolor/scalable/apps/roxterm.svg
+share/locale/es/LC_MESSAGES/roxterm.mo
 %%DATADIR%%/Config/Colours/GTK
 %%DATADIR%%/Config/Colours/Tango
 %%DATADIR%%/Config/Shortcuts/Default
 %%DATADIR%%/roxterm-config.glade
-@dirrmtry share/applications
 @dirrm %%DATADIR%%/Config/Shortcuts
 @dirrm %%DATADIR%%/Config/Colours
 @dirrm %%DATADIR%%/Config
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/imgs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/lib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications