3 files changed, 113 insertions, 17 deletions

diff --git a/print/xmltex/Makefile b/print/xmltex/Makefile
index 2b4c90e74726..5f0cbf3b7990 100644
--- a/print/xmltex/Makefile
+++ b/print/xmltex/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=		xmltex
 PORTVERSION=		1.9
+PORTREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	macros/xmltex/
-DISTNAME=		base
+MASTER_SITE_SUBDIR=	macros/xmltex/base
+DISTFILES=		${DOC_FILES} ${CLASS_FILES}
 DIST_SUBDIR=		${PORTNAME}
 
 MAINTAINER=		hrs@FreeBSD.org
@@ -20,19 +21,53 @@ BUILD_DEPENDS=		latex:${PORTSDIR}/print/teTeX
 LIB_DEPENDS=		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=		tex:${PORTSDIR}/print/teTeX
 
-WRKSRC=			${WRKDIR}/base
-MAKE_ENV=		TEXMFCNF=${FILESDIR}:${LOCALBASE}/share/texmf/web2c
+.include <bsd.port.pre.mk>
+
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} CLASSDIR=${CLASSDIR} WEB2CDIR=${WEB2CDIR}
+
+WRKSRC=		${WRKDIR}/base
+MAKE_ENV=	TEXMFCNF=${FILESDIR}:${PREFIX}/${WEB2CDIR}
+
+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/xmltex
+WEB2CDIR=	${TEXMFDIR:S,^${PREFIX},,:S,^/,,}/web2c
+
+DOC_FILES=	manual.html manual.tex manual.xml manual.xsl
+DOC_FILES+=	readme.txt
+
+CLASS_FILES=	testascii.cfg testascii.tex testascii.xml
+CLASS_FILES+=	testsec.tex testsec.xml
+CLASS_FILES+=	xmltex.cfg xmltex.ini xmltex.tex pdfxmltex.ini
+CLASS_FILES+=	iso-8859-1.xmt iso-8859-2.xmt koi8-r.xmt
+CLASS_FILES+=	sec.xmt tei.xmt utf-16.xmt windows-1250.xmt
+CLASS_FILES+=	langtest.tex langtest.xml langtest.xmt mathml2.xmt
+CLASS_FILES+=	russiankoi8.xml russianutf8.xml portugeselatin1.xml
+CLASS_FILES+=	englishutf16.xml englishutf8.xml
+
+WEB2C_FILES=	xmltex.fmt pdfxmltex.fmt
+
+do-extract:
+	${MKDIR} ${WRKSRC}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${DISTFILES} ${WRKSRC}
 
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	@cd ${WRKSRC}; TEXMFMAIN=$$(kpsewhich -expand-var '$$TEXMFMAIN'); \
-	 ${INSTALL_DATA} xmltex.fmt pdfxmltex.fmt $$TEXMFMAIN/web2c;
-
-post-install: rebuild-tex-database
+	${INSTALL_DATA} ${WEB2C_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${WEB2CDIR}
+	${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}
+.endif
 
-rebuild-tex-database:
-	${LOCALBASE}/bin/mktexlsr
+post-install:
+	${MKTEXLSR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/xmltex/distinfo b/print/xmltex/distinfo
index b672712eb2c3..6df645edce0d 100644
--- a/print/xmltex/distinfo
+++ b/print/xmltex/distinfo
@@ -1 +1,30 @@
-MD5 (xmltex/base.tar.gz) = 9cb3505c3d849b91a44fff6774c02ec6
+MD5 (xmltex/manual.html) = bbc075921cacc1a83bfb988c17e4f966
+MD5 (xmltex/manual.tex) = 71d5e16046f38ce195b3750beee9a182
+MD5 (xmltex/manual.xml) = 3a548670c06a7682f454dbeb34e559ad
+MD5 (xmltex/manual.xsl) = 4ceef2b2892d2fbffc4f6a31309eedd3
+MD5 (xmltex/readme.txt) = 406e5d358a8242c5f0e3c90bd34b1e25
+MD5 (xmltex/testascii.cfg) = 13941e6694234c364a14e8bad5e84df4
+MD5 (xmltex/testascii.tex) = 63ecb718683cf36ad455c5a69b7fdf91
+MD5 (xmltex/testascii.xml) = 2ac13b0521afd2787873a64449ec5036
+MD5 (xmltex/testsec.tex) = d4404ae03425922c6293e8529d79d772
+MD5 (xmltex/testsec.xml) = a5363dbdb1bfbdcfb41cef4309cf3819
+MD5 (xmltex/xmltex.cfg) = 6a5816dfb94a21fde4f5ce3ec4f3682d
+MD5 (xmltex/xmltex.ini) = c3cfed8cd4214dff82c58e1706787900
+MD5 (xmltex/xmltex.tex) = a3ff306e483a39d5234aa4e0ec91d8f7
+MD5 (xmltex/pdfxmltex.ini) = c11c90324ad092d62980536912cb96f1
+MD5 (xmltex/iso-8859-1.xmt) = d36edf9b6763ef9e971edc6f604ea413
+MD5 (xmltex/iso-8859-2.xmt) = e53891dde29991d387ae470a214e31be
+MD5 (xmltex/koi8-r.xmt) = 8e380e2db9a818c4780cbdfea4dc922b
+MD5 (xmltex/sec.xmt) = 499d247bb2937c2299116fecb6b56e9d
+MD5 (xmltex/tei.xmt) = f4e6ecb3c0918b3b86c40e78f798e44c
+MD5 (xmltex/utf-16.xmt) = 2c132dacd60811e981face710f8da42f
+MD5 (xmltex/windows-1250.xmt) = b968201e4a4369ff6f0181e7cb9d98dd
+MD5 (xmltex/langtest.tex) = 54b01ccfd2c55d87172f5e306cbd0cfc
+MD5 (xmltex/langtest.xml) = 0d922e94fda17eaf507ba0bd98f527d8
+MD5 (xmltex/langtest.xmt) = f6233b02391a6878eb1f4df2a1f92125
+MD5 (xmltex/mathml2.xmt) = f26e373a1feeb2a874a4746d63950900
+MD5 (xmltex/russiankoi8.xml) = e9b8a405c3399c6645aee3d09f002313
+MD5 (xmltex/russianutf8.xml) = 53bd7cf77f5855f7fd44f9d077926d59
+MD5 (xmltex/portugeselatin1.xml) = 5e460e705c2dced98591a52b79299ad7
+MD5 (xmltex/englishutf16.xml) = 357795f8cb1ff1715582c7748fe0736e
+MD5 (xmltex/englishutf8.xml) = 2507cf52b50e27c433cfc4c0237da316
diff --git a/print/xmltex/pkg-plist b/print/xmltex/pkg-plist
index 0c2953f63392..cffd3e0141a5 100644
--- a/print/xmltex/pkg-plist
+++ b/print/xmltex/pkg-plist
@@ -1,5 +1,37 @@
-@comment $FreeBSD: /tmp/pcvs/ports/print/xmltex/pkg-plist,v 1.1 2002-05-28 18:11:03 nik Exp $
-share/texmf/web2c/xmltex.fmt
-share/texmf/web2c/pdfxmltex.fmt
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
+@comment $FreeBSD: /tmp/pcvs/ports/print/xmltex/pkg-plist,v 1.2 2004-02-02 16:20:29 nork Exp $
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual.xml
+%%PORTDOCS%%%%DOCSDIR%%/manual.xsl
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%WEB2CDIR%%/xmltex.fmt
+%%WEB2CDIR%%/pdfxmltex.fmt
+%%CLASSDIR%%/testascii.cfg
+%%CLASSDIR%%/testascii.tex
+%%CLASSDIR%%/testascii.xml
+%%CLASSDIR%%/testsec.tex
+%%CLASSDIR%%/testsec.xml
+%%CLASSDIR%%/xmltex.cfg
+%%CLASSDIR%%/xmltex.ini
+%%CLASSDIR%%/xmltex.tex
+%%CLASSDIR%%/pdfxmltex.ini
+%%CLASSDIR%%/iso-8859-1.xmt
+%%CLASSDIR%%/iso-8859-2.xmt
+%%CLASSDIR%%/koi8-r.xmt
+%%CLASSDIR%%/sec.xmt
+%%CLASSDIR%%/tei.xmt
+%%CLASSDIR%%/utf-16.xmt
+%%CLASSDIR%%/windows-1250.xmt
+%%CLASSDIR%%/langtest.tex
+%%CLASSDIR%%/langtest.xml
+%%CLASSDIR%%/langtest.xmt
+%%CLASSDIR%%/mathml2.xmt
+%%CLASSDIR%%/russiankoi8.xml
+%%CLASSDIR%%/russianutf8.xml
+%%CLASSDIR%%/portugeselatin1.xml
+%%CLASSDIR%%/englishutf16.xml
+%%CLASSDIR%%/englishutf8.xml
+@dirrm %%CLASSDIR%%
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%