3 files changed, 39 insertions, 34 deletions

diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index 6f7c8e854aff..272875b1409d 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -6,32 +6,36 @@
 #
 
 PORTNAME=	xmlto
-PORTVERSION=	0.0.21
+PORTVERSION=	0.0.23
 CATEGORIES=	textproc
 MASTER_SITES=	https://fedorahosted.org/releases/x/m/xmlto/
 
-MAINTAINER=	matthias.andree@gmx.de
+MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Front-end to an XSL toolchain
 
 BUILD_DEPENDS=	${BASH_CMD}:${PORTSDIR}/shells/bash \
 		${GETOPT_CMD}:${PORTSDIR}/misc/getopt \
 		xmllint:${PORTSDIR}/textproc/libxml2 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${XSL_DIR}:${PORTSDIR}/textproc/docbook-xsl
+		${XSL_DIR}:${PORTSDIR}/textproc/docbook-xsl \
+		paperconf:${PORTSDIR}/print/libpaper \
+		w3m:${PORTSDIR}/www/w3m
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-OPTIONS=	PASSIVETEX "Enable PassiveTeX support for DVI/PS/PDF" OFF \
-		FOP "Add dependency on FOP" OFF \
-		LIBPAPER "Add dependency on libpaper" OFF \
-		DBLATEX "Add dependency on Dblatex (EXPERIMENTAL)" OFF
+MAKE_JOBS_UNSAFE=	yes
+
+OPTIONS=	DBLATEX "Add dependency on Dblatex" OFF \
+		FOP "Add dependency on FOP (needs Java)" OFF \
+		PASSIVETEX "Add dependency on PassiveTeX" OFF
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-bash=${BASH_CMD} --with-getopt=${GETOPT_CMD}
+CONFIGURE_ARGS=	BASH=${BASH_CMD} GETOPT=${GETOPT_CMD} PDFXMLTEX=${PDFXMLTEX_CMD}
 
 BASH_CMD=	${LOCALBASE}/bin/bash
 GETOPT_CMD=	${LOCALBASE}/bin/getopt
 XSL_DIR=	${LOCALBASE}/share/xsl/docbook
+PDFXMLTEX_CMD=	${LOCALBASE}/bin/pdftex
 
 MAN1=		xmlif.1 xmlto.1
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS THANKS
@@ -43,31 +47,22 @@ PORTDOCS=	AUTHORS COPYING ChangeLog NEWS THANKS
 
 .if defined(WITH_PASSIVETEX)
 BUILD_DEPENDS+=	${LOCALBASE}/share/texmf-local/tex/passivetex/fotex.sty:${PORTSDIR}/print/passivetex
-RUN_DEPENDS+=	${LOCALBASE}/share/texmf-local/tex/passivetex/fotex.sty:${PORTSDIR}/print/passivetex
-PLIST_SUB=	PASSIVETEX=""
-.else
-PLIST_SUB=	PASSIVETEX="@comment "
 .endif
 
 .if defined(WITH_FOP)
 RUN_DEPENDS+=	${LOCALBASE}/bin/fop:${PORTSDIR}/textproc/fop
-.endif
-
-.if defined(WITH_LIBPAPER)
-RUN_DEPENDS+=	${LOCALBASE}/bin/paperconf:${PORTSDIR}/print/libpaper
+CONFIGURE_ARGS+=	--with-backend=fop
 .endif
 
 .if defined(WITH_DBLATEX)
 RUN_DEPENDS+=	${LOCALBASE}/bin/dblatex:${PORTSDIR}/textproc/dblatex
+.if !defined(WITH_FOP)
+CONFIGURE_ARGS+=	--with-backend=dblatex
+.endif
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -e 's,/usr/bin/(dblatex|fop|links|lynx|paperconf|w3m),${LOCALBASE}/bin/\1,g' \
-		${WRKSRC}/xmlto.in \
-		${WRKSRC}/format/docbook/txt
-.if !defined(WITH_PASSIVETEX)
-	@${REINPLACE_CMD} -e '/format\/fo\//d' ${WRKSRC}/Makefile.in
-.endif
+	cd ${WRKSRC} && ${FIND} . -type f -exec ${REINPLACE_CMD} -i '' -e 's/type -t/which/;' '{}' '+'
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/textproc/xmlto/distinfo b/textproc/xmlto/distinfo
index 81befa988359..d9dcb905fe83 100644
--- a/textproc/xmlto/distinfo
+++ b/textproc/xmlto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmlto-0.0.21.tar.bz2) = cc2039dedc81f1a56b06e5fdac6f7570
-SHA256 (xmlto-0.0.21.tar.bz2) = b6435ce111c7578126b6cdcfbd67a229bd27ae3391225d6a1f52dc22b0597049
-SIZE (xmlto-0.0.21.tar.bz2) = 99554
+MD5 (xmlto-0.0.23.tar.bz2) = 3001d6bb2bbc2c8f6c2301f05120f074
+SHA256 (xmlto-0.0.23.tar.bz2) = a9ffb2760ded55924708cf42f575aaa87cf38fce4d9019ad287213303a8cb1c4
+SIZE (xmlto-0.0.23.tar.bz2) = 105201
diff --git a/textproc/xmlto/pkg-plist b/textproc/xmlto/pkg-plist
index 39e390c52778..afea9581eaa5 100644
--- a/textproc/xmlto/pkg-plist
+++ b/textproc/xmlto/pkg-plist
@@ -18,15 +18,25 @@ bin/xmlto
 %%DATADIR%%/format/docbook/htmlhelp
 %%DATADIR%%/format/docbook/javahelp
 @dirrm %%DATADIR%%/format/docbook
-%%PASSIVETEX%%%%DATADIR%%/format/fo/awt
-%%PASSIVETEX%%%%DATADIR%%/format/fo/dvi
-%%PASSIVETEX%%%%DATADIR%%/format/fo/mif
-%%PASSIVETEX%%%%DATADIR%%/format/fo/pcl
-%%PASSIVETEX%%%%DATADIR%%/format/fo/pdf
-%%PASSIVETEX%%%%DATADIR%%/format/fo/ps
-%%PASSIVETEX%%%%DATADIR%%/format/fo/svg
-%%PASSIVETEX%%%%DATADIR%%/format/fo/txt
-%%PASSIVETEX%%@dirrm %%DATADIR%%/format/fo
+%%DATADIR%%/format/xhtml1/dvi
+%%DATADIR%%/format/xhtml1/fo
+%%DATADIR%%/format/xhtml1/pdf
+%%DATADIR%%/format/xhtml1/ps
+%%DATADIR%%/format/xhtml1/txt
+%%DATADIR%%/format/xhtml1/awt
+%%DATADIR%%/format/xhtml1/mif
+%%DATADIR%%/format/xhtml1/pcl
+%%DATADIR%%/format/xhtml1/svg
+@dirrm %%DATADIR%%/format/xhtml1
+%%DATADIR%%/format/fo/awt
+%%DATADIR%%/format/fo/dvi
+%%DATADIR%%/format/fo/mif
+%%DATADIR%%/format/fo/pcl
+%%DATADIR%%/format/fo/pdf
+%%DATADIR%%/format/fo/ps
+%%DATADIR%%/format/fo/svg
+%%DATADIR%%/format/fo/txt
+@dirrm %%DATADIR%%/format/fo
 @dirrm %%DATADIR%%/format
 %%DATADIR%%/xmlto.mak
 @dirrm %%DATADIR%%