2 files changed, 20 insertions, 50 deletions

diff --git a/print/tex-texmflocal/Makefile b/print/tex-texmflocal/Makefile
index 5e4fecb39643..d65d25d31bcc 100644
--- a/print/tex-texmflocal/Makefile
+++ b/print/tex-texmflocal/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tex-texmflocal
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -17,32 +17,41 @@ BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
 PKGINSTALL=	${WRKDIR}/pkg-install.sh
 PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
+PLIST=		${WRKDIR}/pkg-plist
 
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
-DIRS=	bibtex bibtex/bib bibtex/bst \
+DIRS=	bibtex/bib bibtex/bst bibtex\
 	dvipdfm dvips \
-	fonts fonts/afm fonts/ofm fonts/ovp fonts/ovf \
+	fonts/afm fonts/ofm fonts/ovp fonts/ovf \
 	fonts/ocp fonts/pk fonts/tfm fonts/type1 \
-	fonts/source fonts/source/public fonts/vf \
+	fonts/source/public fonts/source fonts/vf fonts \
 	metafont metapost \
-	jbibtex jbibtex/bib jbibtex/bst \
-	tex tex/generic tex/jadetex tex/latex tex/plain \
-	pdftex pdftex/latex pdftex/platex \
-	ptex ptex/plain ptex/platex \
+	jbibtex/bib jbibtex/bst jbibtex\
+	tex/generic tex/jadetex tex/latex tex/plain tex\
+	pdftex/latex pdftex/platex pdftex\
+	ptex/plain ptex/platex ptex\
 	web2c
 
-do-install:
-	${MKDIR} ${DIRS:S,^,${PREFIX}/${TEXMFLOCAL}/,}
+pre-install:
+	(${ECHO_CMD} '${TEXMFLOCAL}/ls-R'; \
+		for dir in ${DIRS}; do \
+			${ECHO_CMD} "@dirrm ${TEXMFLOCAL}/$${dir}"; \
+			${ECHO_CMD} "@exec ${MKDIR} %D/${TEXMFLOCAL}/$${dir}"; \
+		done; \
+		${ECHO_CMD} '@exec ${MKTEXLSR}'; \
+		${ECHO_CMD} '@unexec ${MKTEXLSR}' ) > ${PLIST}
 	${SED} -e 's,%%TEXMFLOCAL_LSR%%,${TEXMFLOCAL_LSR},' \
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 	${CHMOD} 0555 ${PKGINSTALL}
 
+do-install:
+	${MKDIR} ${DIRS:S,^,${PREFIX}/${TEXMFLOCAL}/,}
+
 post-install:
 	@${MKTEXLSR}
 	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/print/tex-texmflocal/pkg-plist b/print/tex-texmflocal/pkg-plist
deleted file mode 100644
index c03822e01f29..000000000000
--- a/print/tex-texmflocal/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $FreeBSD$
-%%TEXMFLOCAL%%/ls-R
-@dirrm %%TEXMFLOCAL%%/bibtex/bib
-@dirrm %%TEXMFLOCAL%%/bibtex/bst
-@dirrm %%TEXMFLOCAL%%/bibtex
-@dirrm %%TEXMFLOCAL%%/dvipdfm
-@dirrm %%TEXMFLOCAL%%/dvips
-@dirrm %%TEXMFLOCAL%%/fonts/afm
-@dirrm %%TEXMFLOCAL%%/fonts/ofm
-@dirrm %%TEXMFLOCAL%%/fonts/ovp
-@dirrm %%TEXMFLOCAL%%/fonts/ovf
-@dirrm %%TEXMFLOCAL%%/fonts/ocp
-@dirrm %%TEXMFLOCAL%%/fonts/pk
-@dirrm %%TEXMFLOCAL%%/fonts/tfm
-@dirrm %%TEXMFLOCAL%%/fonts/type1
-@dirrm %%TEXMFLOCAL%%/fonts/source/public
-@dirrm %%TEXMFLOCAL%%/fonts/source
-@dirrm %%TEXMFLOCAL%%/fonts/vf
-@dirrm %%TEXMFLOCAL%%/fonts
-@dirrm %%TEXMFLOCAL%%/metafont
-@dirrm %%TEXMFLOCAL%%/metapost
-@dirrm %%TEXMFLOCAL%%/jbibtex/bib
-@dirrm %%TEXMFLOCAL%%/jbibtex/bst
-@dirrm %%TEXMFLOCAL%%/jbibtex
-@dirrm %%TEXMFLOCAL%%/tex/generic
-@dirrm %%TEXMFLOCAL%%/tex/jadetex
-@dirrm %%TEXMFLOCAL%%/tex/latex
-@dirrm %%TEXMFLOCAL%%/tex/plain
-@dirrm %%TEXMFLOCAL%%/tex
-@dirrm %%TEXMFLOCAL%%/pdftex/latex
-@dirrm %%TEXMFLOCAL%%/pdftex/platex
-@dirrm %%TEXMFLOCAL%%/pdftex
-@dirrm %%TEXMFLOCAL%%/ptex/plain
-@dirrm %%TEXMFLOCAL%%/ptex/platex
-@dirrm %%TEXMFLOCAL%%/ptex
-@dirrm %%TEXMFLOCAL%%/web2c
-@dirrm %%TEXMFLOCAL%%
-@exec %%MKTEXLSR%%
-@unexec %%MKTEXLSR%%