Index: head/textproc/dblatex/Makefile
===================================================================
--- head/textproc/dblatex/Makefile	(revision 386629)
+++ head/textproc/dblatex/Makefile	(revision 386630)
@@ -1,36 +1,38 @@
 # Created by: Peter Johnson <johnson.peter@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	dblatex
 PORTVERSION=	0.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	johnson.peter@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook to LaTeX/ConTeXt Publishing
 
 BUILD_DEPENDS=	${LOCALBASE}/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty:${PORTSDIR}/print/texlive-texmf
 RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
 		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 USES=		tar:bzip2 python:2
 USE_PYTHON=	distutils autoplist
 USE_TEX=	tex
 
+PYDISTUTILS_INSTALLARGS+=	--catalogs=${LOCALBASE}/share/xml/catalog.ports
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/pdfdocs),/d' ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e '/htmldoc)/d' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e '/pdfdocs),/d ; /htmldoc)/d' ${WRKSRC}/setup.py
 .endif
 	@${REINPLACE_CMD} -e "s,share/man/man1,man/man1,g" ${WRKSRC}/setup.py
 
-.include <bsd.port.pre.mk>
+post-install:
+	# shebangfix can't be used because dblatex is built from scratch
+	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PREFIX}/bin/python2|' \
+		${STAGEDIR}${PREFIX}/bin/dblatex
 
-PYDISTUTILS_INSTALLARGS+=	--catalogs=${PREFIX}/share/xml/catalog.ports
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/textproc/dblatex/pkg-descr
===================================================================
--- head/textproc/dblatex/pkg-descr	(revision 386629)
+++ head/textproc/dblatex/pkg-descr	(revision 386630)
@@ -1,16 +1,16 @@
 Dblatex started as a DB2LaTeX clone. So, why this project? The purpose
 is a bit different on these points:
 
 (1) The project is end-user oriented, that is, it tries to hide as much
 as possible the latex compiling stuff by providing a single clean
 script to produce directly DVI, PostScript and PDF output.
 
 (2) The actual output rendering is done not only by the XSL stylesheets
 transformation, but also by a dedicated LaTeX package. The purpose is
 to allow a deep LaTeX customisation without changing the XSL
 stylesheets.
 
 (3) Post-processing is done by Python, to make publication faster,
 convert the images if needed, and do the whole compilation.
 
-WWW:	http://dblatex.sourceforge.net/
+WWW: http://dblatex.sourceforge.net/