Update to 1.24, and hand maintainership over to hrs.

PR:     ports/48683, ports/62095

4 files changed, 115 insertions, 26 deletions

diff --git a/print/passivetex/Makefile b/print/passivetex/Makefile
index 7464c5cb0272..b7a3a3aefea2 100644
--- a/print/passivetex/Makefile
+++ b/print/passivetex/Makefile
@@ -6,41 +6,79 @@
 #
 
 PORTNAME=		passivetex
-PORTVERSION=		1.21
+PORTVERSION=		1.24
 CATEGORIES=		print
 MASTER_SITES=		http://www.tei-c.org.uk/Software/passivetex/
-DISTFILES=		passivetex.zip
+DISTNAME=		${PORTNAME}
+DIST_SUBDIR=		${PORTNAME}
 
-MAINTAINER=		nik@FreeBSD.org
-COMMENT=	XSL FO processor, written in TeX
+MAINTAINER=		hrs@FreeBSD.org
+COMMENT=		XSL FO processor, written in TeX
 
-BUILD_DEPENDS=		${LOCALBASE}/share/texmf/web2c/xmltex.fmt:${PORTSDIR}/print/xmltex
+BUILD_DEPENDS=		kpsewhich:${PORTSDIR}/print/teTeX \
+			${LOCALBASE}/share/texmf/web2c/xmltex.fmt:${PORTSDIR}/print/xmltex
 
-DIST_SUBDIR=		passivetex
 NO_BUILD=		yes
 USE_ZIP=		yes
-
 WRKSRC=			${WRKDIR}/passivetex
-
 MAKE_ENV=		TEXMFCNF=${FILESDIR}:${LOCALBASE}/share/texmf/web2c
 
 MESSAGE=		${PKGDIR}/pkg-message
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} CLASSDIR=${CLASSDIR}
+
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+.if exists(${LOCALBASE}/bin/kpsewhich)
+TEXMFDIR!=	${LOCALBASE}/bin/kpsewhich -expand-var '$$TEXMFMAIN'
+.else
+TEXMFDIR=	# empty
+.endif
+CLASSDIR=	${TEXMFDIR:S,^${PREFIX},,:S,^/,,}/tex/passivetex
+
+CLASS_FILES=	dummyels.sty fotex.xmt fotex.sty
+CLASS_FILES+=	mlnames.sty ucharacters.sty unicode.sty
+CLASS_FILES+=	dummyels.sty nomulticol.sty
+
+DOC_FILES=	LICENSE README.passivetex index.html index.xml
+
+TEST_FILES=	Makefile
+TEST_FILES+=	chap01.xml chap02.xml chap03.xml chap04.xml
+TEST_FILES+=	check.xsl
+TEST_FILES+=	darkness.fo darkness.pdf darkness.xml darkness.xsl
+TEST_FILES+=	exercise-print.xsl exercise.fo exercise.pdf exercise.xml
+TEST_FILES+=	fezziPic.png fotex.cfg.eg hyperref.cfg
+TEST_FILES+=	mathex.xml mathex.xsl mathml.xsl
+TEST_FILES+=	mathtei.dtd novel.dtd
+TEST_FILES+=	phys332-1.jpg phys332-2.jpg
+TEST_FILES+=	rmsd.xml
+TEST_FILES+=	tei-oucs.dtd tei.sty teimath-print.xsl teimath.aux teimath.fo
+TEST_FILES+=	teimath.log teimath.out teimath.pdf teimath.xml teimath.xsl
+TEST_FILES+=	teimath2.xml teiu5-print.xsl teiu5.fo teiu5.pdf teiu5.xml
+TEST_FILES+=	teixlite.dtd teixml.cfg test1.fot test2.fot
+
 post-patch:
-	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${MESSAGE} > ${PKGMESSAGE}
+	@${SED} -e 's,%%TEXMFDIR%%,${TEXMFDIR},' \
+		${MESSAGE} > ${PKGMESSAGE}
 
 do-install:
-	@cd ${WRKSRC}; TEXMFMAIN=$$(kpsewhich -expand-var '$$TEXMFMAIN'); \
-	 ${MKDIR} -m 555 $$TEXMFMAIN/tex/passivetex; \
-	 ${INSTALL_DATA} dummyels.sty fotex.xmt fotex.sty mlnames.sty ucharacters.sty unicode.sty $$TEXMFMAIN/tex/passivetex;
+	${MKDIR} -m 555 ${PREFIX}/${CLASSDIR}
+	${INSTALL_DATA} ${CLASS_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${CLASSDIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES:S@^@${WRKSRC}/@} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/test
+	${INSTALL_DATA} ${TEST_FILES:S@^@${WRKSRC}/test/@} ${DOCSDIR}/test
+.endif
 
 post-install: rebuild-tex-database display-message
 
 rebuild-tex-database:
-	${LOCALBASE}/bin/mktexlsr
+	${MKTEXLSR}
 
 display-message:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/passivetex/distinfo b/print/passivetex/distinfo
index 1136880065fc..b854b298a220 100644
--- a/print/passivetex/distinfo
+++ b/print/passivetex/distinfo
@@ -1 +1 @@
-MD5 (passivetex/passivetex.zip) = 700c10a716ef14ad9bbc073061ad7307
+MD5 (passivetex/passivetex.zip) = 03e05ab33d3abe1a316c8d9877c315d6
diff --git a/print/passivetex/pkg-message b/print/passivetex/pkg-message
index 409dc8e0bb19..cf3479547ea8 100644
--- a/print/passivetex/pkg-message
+++ b/print/passivetex/pkg-message
@@ -1,8 +1,8 @@
 PassiveTeX uses quite a lot of TeX's resources.  You may find it
 necessary to increase the size of some of TeX's resource pools by
-editing the file %%LOCALBASE%%/share/texmf/web2c/texmf.cnf with any text
+editing the file %%TEXMFDIR%%/web2c/texmf.cnf with any text
 editor.
 
-If you change %%LOCALBASE%%/share/texmf/web2c/texmf.cnf, delete the word
+If you change %%TEXMFDIR%%/web2c/texmf.cnf, delete the word
 "original" on line 1 of the file.  This will prevent future
 installations of TeX from overwriting changes you've made.
diff --git a/print/passivetex/pkg-plist b/print/passivetex/pkg-plist
index d5eab1e43b0e..1762855de882 100644
--- a/print/passivetex/pkg-plist
+++ b/print/passivetex/pkg-plist
@@ -1,10 +1,61 @@
 @comment $FreeBSD$
-share/texmf/tex/passivetex/dummyels.sty
-share/texmf/tex/passivetex/fotex.xmt
-share/texmf/tex/passivetex/fotex.sty
-share/texmf/tex/passivetex/mlnames.sty
-share/texmf/tex/passivetex/ucharacters.sty
-share/texmf/tex/passivetex/unicode.sty
-@dirrm share/texmf/tex/passivetex
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
+%%PORTDOCS%%%%DOCSDIR%%/test/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/test/chap01.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/chap02.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/chap03.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/chap04.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/check.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise-print.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/fezziPic.png
+%%PORTDOCS%%%%DOCSDIR%%/test/fotex.cfg.eg
+%%PORTDOCS%%%%DOCSDIR%%/test/hyperref.cfg
+%%PORTDOCS%%%%DOCSDIR%%/test/mathex.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/mathex.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/mathml.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/mathtei.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/novel.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/phys332-1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/test/phys332-2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/test/rmsd.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/tei-oucs.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/tei.sty
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath-print.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.aux
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.log
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.out
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath2.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5-print.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/teixlite.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/teixml.cfg
+%%PORTDOCS%%%%DOCSDIR%%/test/test1.fot
+%%PORTDOCS%%%%DOCSDIR%%/test/test2.fot
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/test
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.passivetex
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%CLASSDIR%%/dummyels.sty
+%%CLASSDIR%%/fotex.xmt
+%%CLASSDIR%%/fotex.sty
+%%CLASSDIR%%/mlnames.sty
+%%CLASSDIR%%/ucharacters.sty
+%%CLASSDIR%%/unicode.sty
+%%CLASSDIR%%/nomulticol.sty
+@dirrm %%CLASSDIR%%
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%