Update to take account of the changes in TeX (some paths have changed)

6 files changed, 525 insertions, 522 deletions

diff --git a/print/dvips/Makefile b/print/dvips/Makefile
index 3f2ac8fa41d1..8076392a9e42 100644
--- a/print/dvips/Makefile
+++ b/print/dvips/Makefile
@@ -3,7 +3,7 @@
 # Date created:         30 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.13 1996/11/18 14:11:09 asami Exp $
+# $Id: Makefile,v 1.14 1996/12/25 18:01:20 jmz Exp $
 #
 
 DISTNAME=	dvips562
@@ -18,13 +18,13 @@ IS_INTERACTIVE=	yes
 MAN1=		dvips.1 afm2tfm.1
 
 pre-install:
-	@${MKDIR} ${PREFIX}/lib/texmf
+	@${MKDIR} ${PREFIX}/share/texmf
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/texmf/fonts/vf
-	@install -c  -m 644 ${WRKDIR}/dvips562/PSlatex/*.sty ${PREFIX}/lib/texmf/tex
-	@install -c  -m 644 ${WRKDIR}/dvips562/PStfms/*.tfm ${PREFIX}/lib/texmf/fonts/tfm
-	@install -c  -m 644 ${WRKDIR}/dvips562/PSvfs/*.vf ${PREFIX}/lib/texmf/fonts/vf
+	@${MKDIR} ${PREFIX}/share/texmf/fonts/vf  ${PREFIX}/share/texmf/tex/latex
+	@install -c  -m 644 ${WRKDIR}/dvips562/PSlatex/*.sty ${PREFIX}/share/texmf/tex/latex
+	@install -c  -m 644 ${WRKDIR}/dvips562/PStfms/*.tfm ${PREFIX}/share/texmf/fonts/tfm
+	@install -c  -m 644 ${WRKDIR}/dvips562/PSvfs/*.vf ${PREFIX}/share/texmf/fonts/vf
 
 pre-clean:
 	@rm -f ${SCRIPTDIR}/post-install
diff --git a/print/dvips/pkg-plist b/print/dvips/pkg-plist
index 8fb78fe25571..6e3e99580753 100644
--- a/print/dvips/pkg-plist
+++ b/print/dvips/pkg-plist
@@ -1,178 +1,178 @@
 bin/afm2tfm
 bin/dvips
 bin/MakeTeXPK
-lib/texmf/fonts/tfm/pagd.tfm
-lib/texmf/fonts/tfm/pagdo.tfm
-lib/texmf/fonts/tfm/pagk.tfm
-lib/texmf/fonts/tfm/pagkc.tfm
-lib/texmf/fonts/tfm/pagko.tfm
-lib/texmf/fonts/tfm/pbkd.tfm
-lib/texmf/fonts/tfm/pbkdi.tfm
-lib/texmf/fonts/tfm/pbkl.tfm
-lib/texmf/fonts/tfm/pbklc.tfm
-lib/texmf/fonts/tfm/pbkli.tfm
-lib/texmf/fonts/tfm/pcrb.tfm
-lib/texmf/fonts/tfm/pcrbo.tfm
-lib/texmf/fonts/tfm/pcrr.tfm
-lib/texmf/fonts/tfm/pcrro.tfm
-lib/texmf/fonts/tfm/phvb.tfm
-lib/texmf/fonts/tfm/phvbo.tfm
-lib/texmf/fonts/tfm/phvbon.tfm
-lib/texmf/fonts/tfm/phvbrn.tfm
-lib/texmf/fonts/tfm/phvr.tfm
-lib/texmf/fonts/tfm/phvrc.tfm
-lib/texmf/fonts/tfm/phvro.tfm
-lib/texmf/fonts/tfm/phvron.tfm
-lib/texmf/fonts/tfm/phvrrn.tfm
-lib/texmf/fonts/tfm/pncb.tfm
-lib/texmf/fonts/tfm/pncbi.tfm
-lib/texmf/fonts/tfm/pncr.tfm
-lib/texmf/fonts/tfm/pncrc.tfm
-lib/texmf/fonts/tfm/pncri.tfm
-lib/texmf/fonts/tfm/pplb.tfm
-lib/texmf/fonts/tfm/pplbi.tfm
-lib/texmf/fonts/tfm/pplbu.tfm
-lib/texmf/fonts/tfm/pplr.tfm
-lib/texmf/fonts/tfm/pplrc.tfm
-lib/texmf/fonts/tfm/pplri.tfm
-lib/texmf/fonts/tfm/pplro.tfm
-lib/texmf/fonts/tfm/pplrre.tfm
-lib/texmf/fonts/tfm/pplrrn.tfm
-lib/texmf/fonts/tfm/pplru.tfm
-lib/texmf/fonts/tfm/psyr.tfm
-lib/texmf/fonts/tfm/psyro.tfm
-lib/texmf/fonts/tfm/ptmb.tfm
-lib/texmf/fonts/tfm/ptmbi.tfm
-lib/texmf/fonts/tfm/ptmbo.tfm
-lib/texmf/fonts/tfm/ptmr.tfm
-lib/texmf/fonts/tfm/ptmrc.tfm
-lib/texmf/fonts/tfm/ptmri.tfm
-lib/texmf/fonts/tfm/ptmro.tfm
-lib/texmf/fonts/tfm/ptmrre.tfm
-lib/texmf/fonts/tfm/ptmrrn.tfm
-lib/texmf/fonts/tfm/pzcmi.tfm
-lib/texmf/fonts/tfm/pzdr.tfm
-lib/texmf/fonts/tfm/rpagd.tfm
-lib/texmf/fonts/tfm/rpagdo.tfm
-lib/texmf/fonts/tfm/rpagk.tfm
-lib/texmf/fonts/tfm/rpagko.tfm
-lib/texmf/fonts/tfm/rpbkd.tfm
-lib/texmf/fonts/tfm/rpbkdi.tfm
-lib/texmf/fonts/tfm/rpbkl.tfm
-lib/texmf/fonts/tfm/rpbkli.tfm
-lib/texmf/fonts/tfm/rpcrb.tfm
-lib/texmf/fonts/tfm/rpcrbo.tfm
-lib/texmf/fonts/tfm/rpcrr.tfm
-lib/texmf/fonts/tfm/rpcrro.tfm
-lib/texmf/fonts/tfm/rphvb.tfm
-lib/texmf/fonts/tfm/rphvbo.tfm
-lib/texmf/fonts/tfm/rphvbon.tfm
-lib/texmf/fonts/tfm/rphvbrn.tfm
-lib/texmf/fonts/tfm/rphvr.tfm
-lib/texmf/fonts/tfm/rphvro.tfm
-lib/texmf/fonts/tfm/rphvron.tfm
-lib/texmf/fonts/tfm/rphvrrn.tfm
-lib/texmf/fonts/tfm/rpncb.tfm
-lib/texmf/fonts/tfm/rpncbi.tfm
-lib/texmf/fonts/tfm/rpncr.tfm
-lib/texmf/fonts/tfm/rpncri.tfm
-lib/texmf/fonts/tfm/rpplb.tfm
-lib/texmf/fonts/tfm/rpplbi.tfm
-lib/texmf/fonts/tfm/rpplbu.tfm
-lib/texmf/fonts/tfm/rpplr.tfm
-lib/texmf/fonts/tfm/rpplri.tfm
-lib/texmf/fonts/tfm/rpplro.tfm
-lib/texmf/fonts/tfm/rpplrre.tfm
-lib/texmf/fonts/tfm/rpplrrn.tfm
-lib/texmf/fonts/tfm/rpplru.tfm
-lib/texmf/fonts/tfm/rpsyr.tfm
-lib/texmf/fonts/tfm/rpsyro.tfm
-lib/texmf/fonts/tfm/rptmb.tfm
-lib/texmf/fonts/tfm/rptmbi.tfm
-lib/texmf/fonts/tfm/rptmbo.tfm
-lib/texmf/fonts/tfm/rptmr.tfm
-lib/texmf/fonts/tfm/rptmri.tfm
-lib/texmf/fonts/tfm/rptmro.tfm
-lib/texmf/fonts/tfm/rptmrre.tfm
-lib/texmf/fonts/tfm/rptmrrn.tfm
-lib/texmf/fonts/tfm/rpzcmi.tfm
-lib/texmf/fonts/tfm/rpzdr.tfm
-lib/texmf/fonts/vf/pagd.vf
-lib/texmf/fonts/vf/pagdo.vf
-lib/texmf/fonts/vf/pagk.vf
-lib/texmf/fonts/vf/pagkc.vf
-lib/texmf/fonts/vf/pagko.vf
-lib/texmf/fonts/vf/pbkd.vf
-lib/texmf/fonts/vf/pbkdi.vf
-lib/texmf/fonts/vf/pbkl.vf
-lib/texmf/fonts/vf/pbklc.vf
-lib/texmf/fonts/vf/pbkli.vf
-lib/texmf/fonts/vf/pcrb.vf
-lib/texmf/fonts/vf/pcrbo.vf
-lib/texmf/fonts/vf/pcrr.vf
-lib/texmf/fonts/vf/pcrro.vf
-lib/texmf/fonts/vf/phvb.vf
-lib/texmf/fonts/vf/phvbo.vf
-lib/texmf/fonts/vf/phvbon.vf
-lib/texmf/fonts/vf/phvbrn.vf
-lib/texmf/fonts/vf/phvr.vf
-lib/texmf/fonts/vf/phvrc.vf
-lib/texmf/fonts/vf/phvro.vf
-lib/texmf/fonts/vf/phvron.vf
-lib/texmf/fonts/vf/phvrrn.vf
-lib/texmf/fonts/vf/pncb.vf
-lib/texmf/fonts/vf/pncbi.vf
-lib/texmf/fonts/vf/pncr.vf
-lib/texmf/fonts/vf/pncrc.vf
-lib/texmf/fonts/vf/pncri.vf
-lib/texmf/fonts/vf/pplb.vf
-lib/texmf/fonts/vf/pplbi.vf
-lib/texmf/fonts/vf/pplbu.vf
-lib/texmf/fonts/vf/pplr.vf
-lib/texmf/fonts/vf/pplrc.vf
-lib/texmf/fonts/vf/pplri.vf
-lib/texmf/fonts/vf/pplro.vf
-lib/texmf/fonts/vf/pplrre.vf
-lib/texmf/fonts/vf/pplrrn.vf
-lib/texmf/fonts/vf/pplru.vf
-lib/texmf/fonts/vf/ptmb.vf
-lib/texmf/fonts/vf/ptmbi.vf
-lib/texmf/fonts/vf/ptmbo.vf
-lib/texmf/fonts/vf/ptmr.vf
-lib/texmf/fonts/vf/ptmrc.vf
-lib/texmf/fonts/vf/ptmri.vf
-lib/texmf/fonts/vf/ptmro.vf
-lib/texmf/fonts/vf/ptmrre.vf
-lib/texmf/fonts/vf/ptmrrn.vf
-lib/texmf/fonts/vf/pzcmi.vf
-lib/texmf/ps/tex.pro
-lib/texmf/ps/texc.pro
-lib/texmf/ps/texps.pro
-lib/texmf/ps/special.pro
-lib/texmf/ps/finclude.pro
-lib/texmf/ps/color.pro
-lib/texmf/ps/crop.pro
-lib/texmf/ps/config.ps
-lib/texmf/ps/psfonts.map
-lib/texmf/tex/epsf.tex
-lib/texmf/tex/epsf.sty
-lib/texmf/tex/rotate.tex
-lib/texmf/tex/rotate.sty
-lib/texmf/tex/colordvi.sty
-lib/texmf/tex/colordvi.tex
-lib/texmf/tex/blackdvi.sty
-lib/texmf/tex/blackdvi.tex
-lib/texmf/tex/dvips.tex
-lib/texmf/tex/dvipsmac.tex
-lib/texmf/tex/avantgarde.sty
-lib/texmf/tex/bookman.sty
-lib/texmf/tex/chancery.sty
-lib/texmf/tex/lucida.sty
-lib/texmf/tex/ncs.sty
-lib/texmf/tex/palatino.sty
-lib/texmf/tex/psfonts.sty
-lib/texmf/tex/psgreek.sty
-lib/texmf/tex/times.sty
-lib/texmf/fonts/vf/
+share/texmf/fonts/tfm/pagd.tfm
+share/texmf/fonts/tfm/pagdo.tfm
+share/texmf/fonts/tfm/pagk.tfm
+share/texmf/fonts/tfm/pagkc.tfm
+share/texmf/fonts/tfm/pagko.tfm
+share/texmf/fonts/tfm/pbkd.tfm
+share/texmf/fonts/tfm/pbkdi.tfm
+share/texmf/fonts/tfm/pbkl.tfm
+share/texmf/fonts/tfm/pbklc.tfm
+share/texmf/fonts/tfm/pbkli.tfm
+share/texmf/fonts/tfm/pcrb.tfm
+share/texmf/fonts/tfm/pcrbo.tfm
+share/texmf/fonts/tfm/pcrr.tfm
+share/texmf/fonts/tfm/pcrro.tfm
+share/texmf/fonts/tfm/phvb.tfm
+share/texmf/fonts/tfm/phvbo.tfm
+share/texmf/fonts/tfm/phvbon.tfm
+share/texmf/fonts/tfm/phvbrn.tfm
+share/texmf/fonts/tfm/phvr.tfm
+share/texmf/fonts/tfm/phvrc.tfm
+share/texmf/fonts/tfm/phvro.tfm
+share/texmf/fonts/tfm/phvron.tfm
+share/texmf/fonts/tfm/phvrrn.tfm
+share/texmf/fonts/tfm/pncb.tfm
+share/texmf/fonts/tfm/pncbi.tfm
+share/texmf/fonts/tfm/pncr.tfm
+share/texmf/fonts/tfm/pncrc.tfm
+share/texmf/fonts/tfm/pncri.tfm
+share/texmf/fonts/tfm/pplb.tfm
+share/texmf/fonts/tfm/pplbi.tfm
+share/texmf/fonts/tfm/pplbu.tfm
+share/texmf/fonts/tfm/pplr.tfm
+share/texmf/fonts/tfm/pplrc.tfm
+share/texmf/fonts/tfm/pplri.tfm
+share/texmf/fonts/tfm/pplro.tfm
+share/texmf/fonts/tfm/pplrre.tfm
+share/texmf/fonts/tfm/pplrrn.tfm
+share/texmf/fonts/tfm/pplru.tfm
+share/texmf/fonts/tfm/psyr.tfm
+share/texmf/fonts/tfm/psyro.tfm
+share/texmf/fonts/tfm/ptmb.tfm
+share/texmf/fonts/tfm/ptmbi.tfm
+share/texmf/fonts/tfm/ptmbo.tfm
+share/texmf/fonts/tfm/ptmr.tfm
+share/texmf/fonts/tfm/ptmrc.tfm
+share/texmf/fonts/tfm/ptmri.tfm
+share/texmf/fonts/tfm/ptmro.tfm
+share/texmf/fonts/tfm/ptmrre.tfm
+share/texmf/fonts/tfm/ptmrrn.tfm
+share/texmf/fonts/tfm/pzcmi.tfm
+share/texmf/fonts/tfm/pzdr.tfm
+share/texmf/fonts/tfm/rpagd.tfm
+share/texmf/fonts/tfm/rpagdo.tfm
+share/texmf/fonts/tfm/rpagk.tfm
+share/texmf/fonts/tfm/rpagko.tfm
+share/texmf/fonts/tfm/rpbkd.tfm
+share/texmf/fonts/tfm/rpbkdi.tfm
+share/texmf/fonts/tfm/rpbkl.tfm
+share/texmf/fonts/tfm/rpbkli.tfm
+share/texmf/fonts/tfm/rpcrb.tfm
+share/texmf/fonts/tfm/rpcrbo.tfm
+share/texmf/fonts/tfm/rpcrr.tfm
+share/texmf/fonts/tfm/rpcrro.tfm
+share/texmf/fonts/tfm/rphvb.tfm
+share/texmf/fonts/tfm/rphvbo.tfm
+share/texmf/fonts/tfm/rphvbon.tfm
+share/texmf/fonts/tfm/rphvbrn.tfm
+share/texmf/fonts/tfm/rphvr.tfm
+share/texmf/fonts/tfm/rphvro.tfm
+share/texmf/fonts/tfm/rphvron.tfm
+share/texmf/fonts/tfm/rphvrrn.tfm
+share/texmf/fonts/tfm/rpncb.tfm
+share/texmf/fonts/tfm/rpncbi.tfm
+share/texmf/fonts/tfm/rpncr.tfm
+share/texmf/fonts/tfm/rpncri.tfm
+share/texmf/fonts/tfm/rpplb.tfm
+share/texmf/fonts/tfm/rpplbi.tfm
+share/texmf/fonts/tfm/rpplbu.tfm
+share/texmf/fonts/tfm/rpplr.tfm
+share/texmf/fonts/tfm/rpplri.tfm
+share/texmf/fonts/tfm/rpplro.tfm
+share/texmf/fonts/tfm/rpplrre.tfm
+share/texmf/fonts/tfm/rpplrrn.tfm
+share/texmf/fonts/tfm/rpplru.tfm
+share/texmf/fonts/tfm/rpsyr.tfm
+share/texmf/fonts/tfm/rpsyro.tfm
+share/texmf/fonts/tfm/rptmb.tfm
+share/texmf/fonts/tfm/rptmbi.tfm
+share/texmf/fonts/tfm/rptmbo.tfm
+share/texmf/fonts/tfm/rptmr.tfm
+share/texmf/fonts/tfm/rptmri.tfm
+share/texmf/fonts/tfm/rptmro.tfm
+share/texmf/fonts/tfm/rptmrre.tfm
+share/texmf/fonts/tfm/rptmrrn.tfm
+share/texmf/fonts/tfm/rpzcmi.tfm
+share/texmf/fonts/tfm/rpzdr.tfm
+share/texmf/fonts/vf/pagd.vf
+share/texmf/fonts/vf/pagdo.vf
+share/texmf/fonts/vf/pagk.vf
+share/texmf/fonts/vf/pagkc.vf
+share/texmf/fonts/vf/pagko.vf
+share/texmf/fonts/vf/pbkd.vf
+share/texmf/fonts/vf/pbkdi.vf
+share/texmf/fonts/vf/pbkl.vf
+share/texmf/fonts/vf/pbklc.vf
+share/texmf/fonts/vf/pbkli.vf
+share/texmf/fonts/vf/pcrb.vf
+share/texmf/fonts/vf/pcrbo.vf
+share/texmf/fonts/vf/pcrr.vf
+share/texmf/fonts/vf/pcrro.vf
+share/texmf/fonts/vf/phvb.vf
+share/texmf/fonts/vf/phvbo.vf
+share/texmf/fonts/vf/phvbon.vf
+share/texmf/fonts/vf/phvbrn.vf
+share/texmf/fonts/vf/phvr.vf
+share/texmf/fonts/vf/phvrc.vf
+share/texmf/fonts/vf/phvro.vf
+share/texmf/fonts/vf/phvron.vf
+share/texmf/fonts/vf/phvrrn.vf
+share/texmf/fonts/vf/pncb.vf
+share/texmf/fonts/vf/pncbi.vf
+share/texmf/fonts/vf/pncr.vf
+share/texmf/fonts/vf/pncrc.vf
+share/texmf/fonts/vf/pncri.vf
+share/texmf/fonts/vf/pplb.vf
+share/texmf/fonts/vf/pplbi.vf
+share/texmf/fonts/vf/pplbu.vf
+share/texmf/fonts/vf/pplr.vf
+share/texmf/fonts/vf/pplrc.vf
+share/texmf/fonts/vf/pplri.vf
+share/texmf/fonts/vf/pplro.vf
+share/texmf/fonts/vf/pplrre.vf
+share/texmf/fonts/vf/pplrrn.vf
+share/texmf/fonts/vf/pplru.vf
+share/texmf/fonts/vf/ptmb.vf
+share/texmf/fonts/vf/ptmbi.vf
+share/texmf/fonts/vf/ptmbo.vf
+share/texmf/fonts/vf/ptmr.vf
+share/texmf/fonts/vf/ptmrc.vf
+share/texmf/fonts/vf/ptmri.vf
+share/texmf/fonts/vf/ptmro.vf
+share/texmf/fonts/vf/ptmrre.vf
+share/texmf/fonts/vf/ptmrrn.vf
+share/texmf/fonts/vf/pzcmi.vf
+share/texmf/ps/tex.pro
+share/texmf/ps/texc.pro
+share/texmf/ps/texps.pro
+share/texmf/ps/special.pro
+share/texmf/ps/finclude.pro
+share/texmf/ps/color.pro
+share/texmf/ps/crop.pro
+share/texmf/ps/config.ps
+share/texmf/ps/psfonts.map
+share/texmf/tex/epsf.tex
+share/texmf/tex/epsf.sty
+share/texmf/tex/rotate.tex
+share/texmf/tex/rotate.sty
+share/texmf/tex/colordvi.sty
+share/texmf/tex/colordvi.tex
+share/texmf/tex/blackdvi.sty
+share/texmf/tex/blackdvi.tex
+share/texmf/tex/dvips.tex
+share/texmf/tex/dvipsmac.tex
+share/texmf/tex/avantgarde.sty
+share/texmf/tex/bookman.sty
+share/texmf/tex/chancery.sty
+share/texmf/tex/lucida.sty
+share/texmf/tex/ncs.sty
+share/texmf/tex/palatino.sty
+share/texmf/tex/psfonts.sty
+share/texmf/tex/psgreek.sty
+share/texmf/tex/times.sty
+share/texmf/fonts/vf/
 man/man1/dvips.1.gz
 man/man1/afm2tfm.1.gz
diff --git a/print/dvips/scripts/configure b/print/dvips/scripts/configure
index 8410af4b69e7..ca438289ede7 100644
--- a/print/dvips/scripts/configure
+++ b/print/dvips/scripts/configure
@@ -7,7 +7,7 @@ prefix=$PREFIX;
 if `echo $PREFIX |grep -q X11` ; then
   prefix=/usr/local
 fi
-CACHE=$prefix/lib/texmf/fonts
+CACHE=$prefix/share/texmf/fonts
 
 if [ -f $prefix/bin/MakeTeXPK ]; then
   echo
@@ -50,8 +50,9 @@ else
   echo "mkdir -p $CACHE/pk; chmod 1777 $CACHE/pk" > $SCRIPTDIR/post-install
 fi
   
-sed -e s:/usr/lib/tex:$PREFIX/lib/texmf: \
+sed -e s:/usr/lib/tex:$PREFIX/share/texmf: \
     -e s:/common/rokicki/cmps/dvips:$CACHE: \
+    -e s:-v:-verbose: \
      $SUBST <${WRKSRC}/MakeTeXPK.orig >${WRKSRC}/MakeTeXPK
 
 #configure config.ps
@@ -72,7 +73,7 @@ else
 fi
 
 #makefile
-echo "TEXDIR=$PREFIX/lib/texmf" >> ${WRKSRC}/Makefile || exit 1;
+echo "TEXDIR=$PREFIX/share/texmf" >> ${WRKSRC}/Makefile || exit 1;
 echo "LOCALDIR=$CACHE" >> ${WRKSRC}/Makefile
 echo "TEXMACRODIR=\$(TEXDIR)/tex" >> ${WRKSRC}/Makefile
 echo "FIGPATH = .:..:\$(TEXDIR)/tex" >> ${WRKSRC}/Makefile
diff --git a/print/latex/Makefile b/print/latex/Makefile
index 01dd10ba8ceb..36bb80d18ff6 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.25 1996/12/17 12:33:39 asami Exp $
+# $Id: Makefile,v 1.26 1997/01/23 03:35:37 jmz Exp $
 #
 VERSION=	96.12
 DISTNAME=	latex
@@ -33,32 +33,33 @@ latex_tools-${VERSION}.tar.gz:
 	@${FETCH_CMD} -h ${CTAN} -c /tex-archive/macros -f latex/packages/tools.tar.gz -o ${DISTDIR}/$@
 
 do-build:
-	@(cd ${WRKSRC}/base; yes | initex unpack.ins)
-	@(cd ${WRKSRC}/base; TEXFONTS=${WRKSRC}/tfm:; export TEXFONTS; \
-		yes | initex latex.ltx)
-	@(cd ${WRKSRC}/packages/tools; TEXFORMATS=${WRKSRC}/base:; \
+	(cd ${WRKSRC}/base; tex --ini unpack.ins)
+	(cd ${WRKSRC}/base; TEXFONTS=${WRKSRC}/tfm:; export TEXFONTS; \
+		tex --ini latex.ltx </dev/null)
+	(cd ${WRKSRC}/packages/tools; TEXFORMATS=${WRKSRC}/base:; \
 		TEXINPUTS=${WRKSRC}/base: export TEXFORMATS TEXINPUTS;\
-		 ln -sf /usr/local/bin/virtex latex; yes | ./latex tools.ins)
+		 ln -sf /usr/local/bin/tex latex; ./latex tools.ins)
 
 do-install: 
 	@(/usr/bin/install -c -m 644 ${WRKSRC}/base/latex.fmt \
-				${PREFIX}/lib/texmf/ini/)
-	@(cd ${WRKSRC}/tfm; install -c -m 644 *.tfm ${PREFIX}/lib/texmf/fonts/tfm)
-	@(cd ${WRKSRC}/mf; install -c -m 644 *.mf ${PREFIX}/lib/texmf/mf)
+				${PREFIX}/share/texmf/web2c/)
+	@(cd ${WRKSRC}/tfm; install -c -m 644 *.tfm ${PREFIX}/share/texmf/fonts/tfm)
+	@(cd ${WRKSRC}/mf; install -c -m 644 *.mf ${PREFIX}/share/texmf/metafont)
+	@mkdir -p ${PREFIX}/share/texmf/tex/latex
 	@(cd ${WRKSRC}/base; for f in latexbug.tex testpage.tex \
 	   lablst.tex idx.tex nfssfont.tex small2e.tex sample2e.tex docstrip.tex \
 	   hyphen.tex *.cls *.clo *.sty *.fd *.def *.cfg ; do \
-	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/lib/texmf/tex; fi; done)
-	@mkdir -p ${PREFIX}/lib/texmf/makeindx;
-	@(cd ${WRKSRC}/base; install -c -m 644 *.ist ${PREFIX}/lib/texmf/makeindx)
+	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/share/texmf/tex/latex; fi; done)
+	@mkdir -p ${PREFIX}/share/texmf/makeindx;
+	@(cd ${WRKSRC}/base; install -c -m 644 *.ist ${PREFIX}/share/texmf/makeindx)
 	@(cd ${WRKSRC}/packages/tools; for f in *.sty *.tex; do \
-	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/lib/texmf/tex; fi; done)
-	@(cd ${PREFIX}/bin; rm -f latex; ln -s virtex latex)
-	@(mkdir -p ${PREFIX}/lib/texmf/documentation)
+	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/share/texmf/tex/latex; fi; done)
+	@(cd ${PREFIX}/bin; rm -f latex; ln -s tex latex)
+	@(mkdir -p ${PREFIX}/share/texmf/documentation)
 	@(cd ${WRKSRC}/base; for f in *.dtx ltx3info.tex source2e.tex *.fdd ltnews*.tex *guide.tex; do \
-	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/lib/texmf/documentation; fi; done)
+	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/share/texmf/documentation; fi; done)
 	@(cd ${WRKSRC}/packages/tools; for f in *.dtx; do \
-	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/lib/texmf/documentation; fi; done)
+	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/share/texmf/documentation; fi; done)
 
 .include "Makefile.inc"
 
diff --git a/print/latex/pkg-plist b/print/latex/pkg-plist
index fae6e7214bab..609a9ce9f074 100644
--- a/print/latex/pkg-plist
+++ b/print/latex/pkg-plist
@@ -1,320 +1,320 @@
 bin/latex
-lib/texmf/documentation/alltt.dtx
-lib/texmf/documentation/classes.dtx
-lib/texmf/documentation/doc.dtx
-lib/texmf/documentation/docstrip.dtx
-lib/texmf/documentation/exscale.dtx
-lib/texmf/documentation/fontdef.dtx
-lib/texmf/documentation/graphpap.dtx
-lib/texmf/documentation/ifthen.dtx
-lib/texmf/documentation/inputenc.dtx
-lib/texmf/documentation/latex209.dtx
-lib/texmf/documentation/latexsym.dtx
-lib/texmf/documentation/letter.dtx
-lib/texmf/documentation/ltalloc.dtx
-lib/texmf/documentation/ltbibl.dtx
-lib/texmf/documentation/ltboxes.dtx
-lib/texmf/documentation/ltclass.dtx
-lib/texmf/documentation/ltcntrl.dtx
-lib/texmf/documentation/ltcounts.dtx
-lib/texmf/documentation/ltdefns.dtx
-lib/texmf/documentation/ltdirchk.dtx
-lib/texmf/documentation/lterror.dtx
-lib/texmf/documentation/ltfiles.dtx
-lib/texmf/documentation/ltfinal.dtx
-lib/texmf/documentation/ltfloat.dtx
-lib/texmf/documentation/ltfntcmd.dtx
-lib/texmf/documentation/ltfssbas.dtx
-lib/texmf/documentation/ltfsscmp.dtx
-lib/texmf/documentation/ltfssdcl.dtx
-lib/texmf/documentation/ltfssini.dtx
-lib/texmf/documentation/ltfsstrc.dtx
-lib/texmf/documentation/lthyphen.dtx
-lib/texmf/documentation/ltidxglo.dtx
-lib/texmf/documentation/ltlength.dtx
-lib/texmf/documentation/ltlists.dtx
-lib/texmf/documentation/ltlogos.dtx
-lib/texmf/documentation/ltmath.dtx
-lib/texmf/documentation/ltmiscen.dtx
-lib/texmf/documentation/ltoutenc.dtx
-lib/texmf/documentation/ltoutput.dtx
-lib/texmf/documentation/ltpage.dtx
-lib/texmf/documentation/ltpageno.dtx
-lib/texmf/documentation/ltpar.dtx
-lib/texmf/documentation/ltpictur.dtx
-lib/texmf/documentation/ltplain.dtx
-lib/texmf/documentation/ltsect.dtx
-lib/texmf/documentation/xr.dtx
-lib/texmf/documentation/ltspace.dtx
-lib/texmf/documentation/lttab.dtx
-lib/texmf/documentation/ltthm.dtx
-lib/texmf/documentation/ltvers.dtx
-lib/texmf/documentation/ltxdoc.dtx
-lib/texmf/documentation/ltxref.dtx
-lib/texmf/documentation/makeindx.dtx
-lib/texmf/documentation/newlfont.dtx
-lib/texmf/documentation/oldlfont.dtx
-lib/texmf/documentation/pict2e.dtx
-lib/texmf/documentation/preload.dtx
-lib/texmf/documentation/proc.dtx
-lib/texmf/documentation/slides.dtx
-lib/texmf/documentation/syntonly.dtx
-lib/texmf/documentation/ltx3info.tex
-lib/texmf/documentation/source2e.tex
-lib/texmf/documentation/cmfonts.fdd
-lib/texmf/documentation/slides.fdd
-lib/texmf/documentation/ltnews01.tex
-lib/texmf/documentation/ltnews02.tex
-lib/texmf/documentation/ltnews03.tex
-lib/texmf/documentation/ltnews04.tex
-lib/texmf/documentation/ltnews05.tex
-lib/texmf/documentation/ltnews06.tex
-lib/texmf/documentation/cfgguide.tex
-lib/texmf/documentation/clsguide.tex
-lib/texmf/documentation/fntguide.tex
-lib/texmf/documentation/modguide.tex
-lib/texmf/documentation/usrguide.tex
-lib/texmf/documentation/afterpage.dtx
-lib/texmf/documentation/array.dtx
-lib/texmf/documentation/dcolumn.dtx
-lib/texmf/documentation/delarray.dtx
-lib/texmf/documentation/enumerate.dtx
-lib/texmf/documentation/fileerr.dtx
-lib/texmf/documentation/fontsmpl.dtx
-lib/texmf/documentation/ftnright.dtx
-lib/texmf/documentation/hhline.dtx
-lib/texmf/documentation/indentfirst.dtx
-lib/texmf/documentation/layout.dtx
-lib/texmf/documentation/longtable.dtx
-lib/texmf/documentation/multicol.dtx
-lib/texmf/documentation/rawfonts.dtx
-lib/texmf/documentation/showkeys.dtx
-lib/texmf/documentation/somedefs.dtx
-lib/texmf/documentation/tabularx.dtx
-lib/texmf/documentation/theorem.dtx
-lib/texmf/documentation/varioref.dtx
-lib/texmf/documentation/verbatim.dtx
-lib/texmf/documentation/xspace.dtx
-lib/texmf/makeindx/gglo.ist
-lib/texmf/makeindx/gind.ist
-lib/texmf/tex/latexbug.tex
-lib/texmf/tex/testpage.tex
-lib/texmf/tex/lablst.tex
-lib/texmf/tex/idx.tex
-lib/texmf/tex/nfssfont.tex
-lib/texmf/tex/small2e.tex
-lib/texmf/tex/sample2e.tex
-lib/texmf/tex/docstrip.tex
-lib/texmf/tex/article.cls
-lib/texmf/tex/book.cls
-lib/texmf/tex/letter.cls
-lib/texmf/tex/ltnews.cls
-lib/texmf/tex/ltxdoc.cls
-lib/texmf/tex/ltxguide.cls
-lib/texmf/tex/minimal.cls
-lib/texmf/tex/proc.cls
-lib/texmf/tex/report.cls
-lib/texmf/tex/slides.cls
-lib/texmf/tex/bk10.clo
-lib/texmf/tex/bk11.clo
-lib/texmf/tex/bk12.clo
-lib/texmf/tex/fleqn.clo
-lib/texmf/tex/leqno.clo
-lib/texmf/tex/size10.clo
-lib/texmf/tex/size11.clo
-lib/texmf/tex/size12.clo
-lib/texmf/tex/alltt.sty
-lib/texmf/tex/article.sty
-lib/texmf/tex/bezier.sty
-lib/texmf/tex/book.sty
-lib/texmf/tex/doc.sty
-lib/texmf/tex/exscale.sty
-lib/texmf/tex/flafter.sty
-lib/texmf/tex/fleqn.sty
-lib/texmf/tex/fontenc.sty
-lib/texmf/tex/graphpap.sty
-lib/texmf/tex/ifthen.sty
-lib/texmf/tex/inputenc.sty
-lib/texmf/tex/latexsym.sty
-lib/texmf/tex/leqno.sty
-lib/texmf/tex/letter.sty
-lib/texmf/tex/makeidx.sty
-lib/texmf/tex/newlfont.sty
-lib/texmf/tex/oldlfont.sty
-lib/texmf/tex/openbib.sty
-lib/texmf/tex/pict2e.sty
-lib/texmf/tex/proc.sty
-lib/texmf/tex/ucmr.fd
-lib/texmf/tex/report.sty
-lib/texmf/tex/shortvrb.sty
-lib/texmf/tex/showidx.sty
-lib/texmf/tex/slides.sty
-lib/texmf/tex/syntonly.sty
-lib/texmf/tex/t1enc.sty
-lib/texmf/tex/tracefnt.sty
-lib/texmf/tex/omlcmm.fd
-lib/texmf/tex/omlcmr.fd
-lib/texmf/tex/omllcmm.fd
-lib/texmf/tex/omscmr.fd
-lib/texmf/tex/omscmsy.fd
-lib/texmf/tex/omslcmsy.fd
-lib/texmf/tex/omxcmex.fd
-lib/texmf/tex/omxlcmex.fd
-lib/texmf/tex/ot1cmdh.fd
-lib/texmf/tex/ot1cmfib.fd
-lib/texmf/tex/ot1cmfr.fd
-lib/texmf/tex/ot1cmr.fd
-lib/texmf/tex/ot1cmss.fd
-lib/texmf/tex/ot1cmtt.fd
-lib/texmf/tex/ot1cmvtt.fd
-lib/texmf/tex/ot1lcmss.fd
-lib/texmf/tex/ot1lcmtt.fd
-lib/texmf/tex/t1cmdh.fd
-lib/texmf/tex/t1cmfib.fd
-lib/texmf/tex/t1cmfr.fd
-lib/texmf/tex/t1cmr.fd
-lib/texmf/tex/t1cmss.fd
-lib/texmf/tex/t1cmtt.fd
-lib/texmf/tex/t1cmvtt.fd
-lib/texmf/tex/ts1cmr.fd
-lib/texmf/tex/ts1cmss.fd
-lib/texmf/tex/ts1cmtt.fd
-lib/texmf/tex/ts1cmvtt.fd
-lib/texmf/tex/ucmss.fd
-lib/texmf/tex/ucmtt.fd
-lib/texmf/tex/ulasy.fd
-lib/texmf/tex/ullasy.fd
-lib/texmf/tex/ansinew.def
-lib/texmf/tex/applemac.def
-lib/texmf/tex/ascii.def
-lib/texmf/tex/cp437.def
-lib/texmf/tex/cp437de.def
-lib/texmf/tex/cp850.def
-lib/texmf/tex/cp852.def
-lib/texmf/tex/cp865.def
-lib/texmf/tex/latex209.def
-lib/texmf/tex/latin1.def
-lib/texmf/tex/latin2.def
-lib/texmf/tex/next.def
-lib/texmf/tex/omlenc.def
-lib/texmf/tex/omsenc.def
-lib/texmf/tex/ot1enc.def
-lib/texmf/tex/sfonts.def
-lib/texmf/tex/slides.def
-lib/texmf/tex/t1enc.def
-lib/texmf/tex/afterpage.sty
-lib/texmf/tex/array.sty
-lib/texmf/tex/dcolumn.sty
-lib/texmf/tex/delarray.sty
-lib/texmf/tex/enumerate.sty
-lib/texmf/tex/fontsmpl.sty
-lib/texmf/tex/ftnright.sty
-lib/texmf/tex/hhline.sty
-lib/texmf/tex/indentfirst.sty
-lib/texmf/tex/layout.sty
-lib/texmf/tex/longtable.sty
-lib/texmf/tex/multicol.sty
-lib/texmf/tex/rawfonts.sty
-lib/texmf/tex/showkeys.sty
-lib/texmf/tex/somedefs.sty
-lib/texmf/tex/tabularx.sty
-lib/texmf/tex/thb.sty
-lib/texmf/tex/thc.sty
-lib/texmf/tex/thcb.sty
-lib/texmf/tex/theorem.sty
-lib/texmf/tex/thm.sty
-lib/texmf/tex/thmb.sty
-lib/texmf/tex/thp.sty
-lib/texmf/tex/varioref.sty
-lib/texmf/tex/verbatim.sty
-lib/texmf/tex/xr.sty
-lib/texmf/tex/xspace.sty
-lib/texmf/tex/e.tex
-lib/texmf/tex/fontsmpl.tex
-lib/texmf/tex/h.tex
-lib/texmf/tex/s.tex
-lib/texmf/tex/verbtest.tex
-lib/texmf/tex/x.tex
-lib/texmf/ini/latex.fmt
-lib/texmf/mf/circle.mf
-lib/texmf/mf/cmbsy5.mf
-lib/texmf/mf/cmbsy6.mf
-lib/texmf/mf/cmbsy7.mf
-lib/texmf/mf/cmbsy8.mf
-lib/texmf/mf/cmbsy9.mf
-lib/texmf/mf/cmcsc8.mf
-lib/texmf/mf/cmcsc9.mf
-lib/texmf/mf/cmex7.mf
-lib/texmf/mf/cmex8.mf
-lib/texmf/mf/cmex9.mf
-lib/texmf/mf/cmmib5.mf
-lib/texmf/mf/cmmib6.mf
-lib/texmf/mf/cmmib7.mf
-lib/texmf/mf/cmmib8.mf
-lib/texmf/mf/cmmib9.mf
-lib/texmf/mf/icmcsc10.mf
-lib/texmf/mf/icmex10.mf
-lib/texmf/mf/icmmi8.mf
-lib/texmf/mf/icmsy8.mf
-lib/texmf/mf/icmtt8.mf
-lib/texmf/mf/ilasy8.mf
-lib/texmf/mf/ilcmss8.mf
-lib/texmf/mf/ilcmssb8.mf
-lib/texmf/mf/ilcmssi8.mf
-lib/texmf/mf/lasy.mf
-lib/texmf/mf/lasy10.mf
-lib/texmf/mf/lasy5.mf
-lib/texmf/mf/lasy6.mf
-lib/texmf/mf/lasy7.mf
-lib/texmf/mf/lasy8.mf
-lib/texmf/mf/lasy9.mf
-lib/texmf/mf/lasyb10.mf
-lib/texmf/mf/lcircle10.mf
-lib/texmf/mf/lcirclew10.mf
-lib/texmf/mf/lcmss8.mf
-lib/texmf/mf/lcmssb8.mf
-lib/texmf/mf/lcmssi8.mf
-lib/texmf/mf/line.mf
-lib/texmf/mf/line10.mf
-lib/texmf/mf/linew10.mf
-lib/texmf/mf/sroman.mf
-lib/texmf/mf/sromanu.mf
-lib/texmf/fonts/tfm/cmbsy5.tfm
-lib/texmf/fonts/tfm/cmbsy6.tfm
-lib/texmf/fonts/tfm/cmbsy7.tfm
-lib/texmf/fonts/tfm/cmbsy8.tfm
-lib/texmf/fonts/tfm/cmbsy9.tfm
-lib/texmf/fonts/tfm/cmcsc8.tfm
-lib/texmf/fonts/tfm/cmcsc9.tfm
-lib/texmf/fonts/tfm/cmex7.tfm
-lib/texmf/fonts/tfm/cmex8.tfm
-lib/texmf/fonts/tfm/cmex9.tfm
-lib/texmf/fonts/tfm/cmmib5.tfm
-lib/texmf/fonts/tfm/cmmib6.tfm
-lib/texmf/fonts/tfm/cmmib7.tfm
-lib/texmf/fonts/tfm/cmmib8.tfm
-lib/texmf/fonts/tfm/cmmib9.tfm
-lib/texmf/fonts/tfm/dummy.tfm
-lib/texmf/fonts/tfm/icmcsc10.tfm
-lib/texmf/fonts/tfm/icmex10.tfm
-lib/texmf/fonts/tfm/icmmi8.tfm
-lib/texmf/fonts/tfm/icmsy8.tfm
-lib/texmf/fonts/tfm/icmtt8.tfm
-lib/texmf/fonts/tfm/ilasy8.tfm
-lib/texmf/fonts/tfm/ilcmss8.tfm
-lib/texmf/fonts/tfm/ilcmssb8.tfm
-lib/texmf/fonts/tfm/ilcmssi8.tfm
-lib/texmf/fonts/tfm/lasy10.tfm
-lib/texmf/fonts/tfm/lasy5.tfm
-lib/texmf/fonts/tfm/lasy6.tfm
-lib/texmf/fonts/tfm/lasy7.tfm
-lib/texmf/fonts/tfm/lasy8.tfm
-lib/texmf/fonts/tfm/lasy9.tfm
-lib/texmf/fonts/tfm/lasyb10.tfm
-lib/texmf/fonts/tfm/lcircle10.tfm
-lib/texmf/fonts/tfm/lcirclew10.tfm
-lib/texmf/fonts/tfm/lcmss8.tfm
-lib/texmf/fonts/tfm/lcmssb8.tfm
-lib/texmf/fonts/tfm/lcmssi8.tfm
-lib/texmf/fonts/tfm/line10.tfm
-lib/texmf/fonts/tfm/linew10.tfm
+share/texmf/documentation/alltt.dtx
+share/texmf/documentation/classes.dtx
+share/texmf/documentation/doc.dtx
+share/texmf/documentation/docstrip.dtx
+share/texmf/documentation/exscale.dtx
+share/texmf/documentation/fontdef.dtx
+share/texmf/documentation/graphpap.dtx
+share/texmf/documentation/ifthen.dtx
+share/texmf/documentation/inputenc.dtx
+share/texmf/documentation/latex209.dtx
+share/texmf/documentation/latexsym.dtx
+share/texmf/documentation/letter.dtx
+share/texmf/documentation/ltalloc.dtx
+share/texmf/documentation/ltbibl.dtx
+share/texmf/documentation/ltboxes.dtx
+share/texmf/documentation/ltclass.dtx
+share/texmf/documentation/ltcntrl.dtx
+share/texmf/documentation/ltcounts.dtx
+share/texmf/documentation/ltdefns.dtx
+share/texmf/documentation/ltdirchk.dtx
+share/texmf/documentation/lterror.dtx
+share/texmf/documentation/ltfiles.dtx
+share/texmf/documentation/ltfinal.dtx
+share/texmf/documentation/ltfloat.dtx
+share/texmf/documentation/ltfntcmd.dtx
+share/texmf/documentation/ltfssbas.dtx
+share/texmf/documentation/ltfsscmp.dtx
+share/texmf/documentation/ltfssdcl.dtx
+share/texmf/documentation/ltfssini.dtx
+share/texmf/documentation/ltfsstrc.dtx
+share/texmf/documentation/lthyphen.dtx
+share/texmf/documentation/ltidxglo.dtx
+share/texmf/documentation/ltlength.dtx
+share/texmf/documentation/ltlists.dtx
+share/texmf/documentation/ltlogos.dtx
+share/texmf/documentation/ltmath.dtx
+share/texmf/documentation/ltmiscen.dtx
+share/texmf/documentation/ltoutenc.dtx
+share/texmf/documentation/ltoutput.dtx
+share/texmf/documentation/ltpage.dtx
+share/texmf/documentation/ltpageno.dtx
+share/texmf/documentation/ltpar.dtx
+share/texmf/documentation/ltpictur.dtx
+share/texmf/documentation/ltplain.dtx
+share/texmf/documentation/ltsect.dtx
+share/texmf/documentation/xr.dtx
+share/texmf/documentation/ltspace.dtx
+share/texmf/documentation/lttab.dtx
+share/texmf/documentation/ltthm.dtx
+share/texmf/documentation/ltvers.dtx
+share/texmf/documentation/ltxdoc.dtx
+share/texmf/documentation/ltxref.dtx
+share/texmf/documentation/makeindx.dtx
+share/texmf/documentation/newlfont.dtx
+share/texmf/documentation/oldlfont.dtx
+share/texmf/documentation/pict2e.dtx
+share/texmf/documentation/preload.dtx
+share/texmf/documentation/proc.dtx
+share/texmf/documentation/slides.dtx
+share/texmf/documentation/syntonly.dtx
+share/texmf/documentation/ltx3info.tex
+share/texmf/documentation/source2e.tex
+share/texmf/documentation/cmfonts.fdd
+share/texmf/documentation/slides.fdd
+share/texmf/documentation/ltnews01.tex
+share/texmf/documentation/ltnews02.tex
+share/texmf/documentation/ltnews03.tex
+share/texmf/documentation/ltnews04.tex
+share/texmf/documentation/ltnews05.tex
+share/texmf/documentation/ltnews06.tex
+share/texmf/documentation/cfgguide.tex
+share/texmf/documentation/clsguide.tex
+share/texmf/documentation/fntguide.tex
+share/texmf/documentation/modguide.tex
+share/texmf/documentation/usrguide.tex
+share/texmf/documentation/afterpage.dtx
+share/texmf/documentation/array.dtx
+share/texmf/documentation/dcolumn.dtx
+share/texmf/documentation/delarray.dtx
+share/texmf/documentation/enumerate.dtx
+share/texmf/documentation/fileerr.dtx
+share/texmf/documentation/fontsmpl.dtx
+share/texmf/documentation/ftnright.dtx
+share/texmf/documentation/hhline.dtx
+share/texmf/documentation/indentfirst.dtx
+share/texmf/documentation/layout.dtx
+share/texmf/documentation/longtable.dtx
+share/texmf/documentation/multicol.dtx
+share/texmf/documentation/rawfonts.dtx
+share/texmf/documentation/showkeys.dtx
+share/texmf/documentation/somedefs.dtx
+share/texmf/documentation/tabularx.dtx
+share/texmf/documentation/theorem.dtx
+share/texmf/documentation/varioref.dtx
+share/texmf/documentation/verbatim.dtx
+share/texmf/documentation/xspace.dtx
+share/texmf/makeindx/gglo.ist
+share/texmf/makeindx/gind.ist
+share/texmf/tex/latexbug.tex
+share/texmf/tex/testpage.tex
+share/texmf/tex/lablst.tex
+share/texmf/tex/idx.tex
+share/texmf/tex/nfssfont.tex
+share/texmf/tex/small2e.tex
+share/texmf/tex/sample2e.tex
+share/texmf/tex/docstrip.tex
+share/texmf/tex/article.cls
+share/texmf/tex/book.cls
+share/texmf/tex/letter.cls
+share/texmf/tex/ltnews.cls
+share/texmf/tex/ltxdoc.cls
+share/texmf/tex/ltxguide.cls
+share/texmf/tex/minimal.cls
+share/texmf/tex/proc.cls
+share/texmf/tex/report.cls
+share/texmf/tex/slides.cls
+share/texmf/tex/bk10.clo
+share/texmf/tex/bk11.clo
+share/texmf/tex/bk12.clo
+share/texmf/tex/fleqn.clo
+share/texmf/tex/leqno.clo
+share/texmf/tex/size10.clo
+share/texmf/tex/size11.clo
+share/texmf/tex/size12.clo
+share/texmf/tex/alltt.sty
+share/texmf/tex/article.sty
+share/texmf/tex/bezier.sty
+share/texmf/tex/book.sty
+share/texmf/tex/doc.sty
+share/texmf/tex/exscale.sty
+share/texmf/tex/flafter.sty
+share/texmf/tex/fleqn.sty
+share/texmf/tex/fontenc.sty
+share/texmf/tex/graphpap.sty
+share/texmf/tex/ifthen.sty
+share/texmf/tex/inputenc.sty
+share/texmf/tex/latexsym.sty
+share/texmf/tex/leqno.sty
+share/texmf/tex/letter.sty
+share/texmf/tex/makeidx.sty
+share/texmf/tex/newlfont.sty
+share/texmf/tex/oldlfont.sty
+share/texmf/tex/openbib.sty
+share/texmf/tex/pict2e.sty
+share/texmf/tex/proc.sty
+share/texmf/tex/ucmr.fd
+share/texmf/tex/report.sty
+share/texmf/tex/shortvrb.sty
+share/texmf/tex/showidx.sty
+share/texmf/tex/slides.sty
+share/texmf/tex/syntonly.sty
+share/texmf/tex/t1enc.sty
+share/texmf/tex/tracefnt.sty
+share/texmf/tex/omlcmm.fd
+share/texmf/tex/omlcmr.fd
+share/texmf/tex/omllcmm.fd
+share/texmf/tex/omscmr.fd
+share/texmf/tex/omscmsy.fd
+share/texmf/tex/omslcmsy.fd
+share/texmf/tex/omxcmex.fd
+share/texmf/tex/omxlcmex.fd
+share/texmf/tex/ot1cmdh.fd
+share/texmf/tex/ot1cmfib.fd
+share/texmf/tex/ot1cmfr.fd
+share/texmf/tex/ot1cmr.fd
+share/texmf/tex/ot1cmss.fd
+share/texmf/tex/ot1cmtt.fd
+share/texmf/tex/ot1cmvtt.fd
+share/texmf/tex/ot1lcmss.fd
+share/texmf/tex/ot1lcmtt.fd
+share/texmf/tex/t1cmdh.fd
+share/texmf/tex/t1cmfib.fd
+share/texmf/tex/t1cmfr.fd
+share/texmf/tex/t1cmr.fd
+share/texmf/tex/t1cmss.fd
+share/texmf/tex/t1cmtt.fd
+share/texmf/tex/t1cmvtt.fd
+share/texmf/tex/ts1cmr.fd
+share/texmf/tex/ts1cmss.fd
+share/texmf/tex/ts1cmtt.fd
+share/texmf/tex/ts1cmvtt.fd
+share/texmf/tex/ucmss.fd
+share/texmf/tex/ucmtt.fd
+share/texmf/tex/ulasy.fd
+share/texmf/tex/ullasy.fd
+share/texmf/tex/ansinew.def
+share/texmf/tex/applemac.def
+share/texmf/tex/ascii.def
+share/texmf/tex/cp437.def
+share/texmf/tex/cp437de.def
+share/texmf/tex/cp850.def
+share/texmf/tex/cp852.def
+share/texmf/tex/cp865.def
+share/texmf/tex/latex209.def
+share/texmf/tex/latin1.def
+share/texmf/tex/latin2.def
+share/texmf/tex/next.def
+share/texmf/tex/omlenc.def
+share/texmf/tex/omsenc.def
+share/texmf/tex/ot1enc.def
+share/texmf/tex/sfonts.def
+share/texmf/tex/slides.def
+share/texmf/tex/t1enc.def
+share/texmf/tex/afterpage.sty
+share/texmf/tex/array.sty
+share/texmf/tex/dcolumn.sty
+share/texmf/tex/delarray.sty
+share/texmf/tex/enumerate.sty
+share/texmf/tex/fontsmpl.sty
+share/texmf/tex/ftnright.sty
+share/texmf/tex/hhline.sty
+share/texmf/tex/indentfirst.sty
+share/texmf/tex/layout.sty
+share/texmf/tex/longtable.sty
+share/texmf/tex/multicol.sty
+share/texmf/tex/rawfonts.sty
+share/texmf/tex/showkeys.sty
+share/texmf/tex/somedefs.sty
+share/texmf/tex/tabularx.sty
+share/texmf/tex/thb.sty
+share/texmf/tex/thc.sty
+share/texmf/tex/thcb.sty
+share/texmf/tex/theorem.sty
+share/texmf/tex/thm.sty
+share/texmf/tex/thmb.sty
+share/texmf/tex/thp.sty
+share/texmf/tex/varioref.sty
+share/texmf/tex/verbatim.sty
+share/texmf/tex/xr.sty
+share/texmf/tex/xspace.sty
+share/texmf/tex/e.tex
+share/texmf/tex/fontsmpl.tex
+share/texmf/tex/h.tex
+share/texmf/tex/s.tex
+share/texmf/tex/verbtest.tex
+share/texmf/tex/x.tex
+share/texmf/ini/latex.fmt
+share/texmf/metafont/circle.mf
+share/texmf/metafont/cmbsy5.mf
+share/texmf/metafont/cmbsy6.mf
+share/texmf/metafont/cmbsy7.mf
+share/texmf/metafont/cmbsy8.mf
+share/texmf/metafont/cmbsy9.mf
+share/texmf/metafont/cmcsc8.mf
+share/texmf/metafont/cmcsc9.mf
+share/texmf/metafont/cmex7.mf
+share/texmf/metafont/cmex8.mf
+share/texmf/metafont/cmex9.mf
+share/texmf/metafont/cmmib5.mf
+share/texmf/metafont/cmmib6.mf
+share/texmf/metafont/cmmib7.mf
+share/texmf/metafont/cmmib8.mf
+share/texmf/metafont/cmmib9.mf
+share/texmf/metafont/icmcsc10.mf
+share/texmf/metafont/icmex10.mf
+share/texmf/metafont/icmmi8.mf
+share/texmf/metafont/icmsy8.mf
+share/texmf/metafont/icmtt8.mf
+share/texmf/metafont/ilasy8.mf
+share/texmf/metafont/ilcmss8.mf
+share/texmf/metafont/ilcmssb8.mf
+share/texmf/metafont/ilcmssi8.mf
+share/texmf/metafont/lasy.mf
+share/texmf/metafont/lasy10.mf
+share/texmf/metafont/lasy5.mf
+share/texmf/metafont/lasy6.mf
+share/texmf/metafont/lasy7.mf
+share/texmf/metafont/lasy8.mf
+share/texmf/metafont/lasy9.mf
+share/texmf/metafont/lasyb10.mf
+share/texmf/metafont/lcircle10.mf
+share/texmf/metafont/lcirclew10.mf
+share/texmf/metafont/lcmss8.mf
+share/texmf/metafont/lcmssb8.mf
+share/texmf/metafont/lcmssi8.mf
+share/texmf/metafont/line.mf
+share/texmf/metafont/line10.mf
+share/texmf/metafont/linew10.mf
+share/texmf/metafont/sroman.mf
+share/texmf/metafont/sromanu.mf
+share/texmf/fonts/tfm/cmbsy5.tfm
+share/texmf/fonts/tfm/cmbsy6.tfm
+share/texmf/fonts/tfm/cmbsy7.tfm
+share/texmf/fonts/tfm/cmbsy8.tfm
+share/texmf/fonts/tfm/cmbsy9.tfm
+share/texmf/fonts/tfm/cmcsc8.tfm
+share/texmf/fonts/tfm/cmcsc9.tfm
+share/texmf/fonts/tfm/cmex7.tfm
+share/texmf/fonts/tfm/cmex8.tfm
+share/texmf/fonts/tfm/cmex9.tfm
+share/texmf/fonts/tfm/cmmib5.tfm
+share/texmf/fonts/tfm/cmmib6.tfm
+share/texmf/fonts/tfm/cmmib7.tfm
+share/texmf/fonts/tfm/cmmib8.tfm
+share/texmf/fonts/tfm/cmmib9.tfm
+share/texmf/fonts/tfm/dummy.tfm
+share/texmf/fonts/tfm/icmcsc10.tfm
+share/texmf/fonts/tfm/icmex10.tfm
+share/texmf/fonts/tfm/icmmi8.tfm
+share/texmf/fonts/tfm/icmsy8.tfm
+share/texmf/fonts/tfm/icmtt8.tfm
+share/texmf/fonts/tfm/ilasy8.tfm
+share/texmf/fonts/tfm/ilcmss8.tfm
+share/texmf/fonts/tfm/ilcmssb8.tfm
+share/texmf/fonts/tfm/ilcmssi8.tfm
+share/texmf/fonts/tfm/lasy10.tfm
+share/texmf/fonts/tfm/lasy5.tfm
+share/texmf/fonts/tfm/lasy6.tfm
+share/texmf/fonts/tfm/lasy7.tfm
+share/texmf/fonts/tfm/lasy8.tfm
+share/texmf/fonts/tfm/lasy9.tfm
+share/texmf/fonts/tfm/lasyb10.tfm
+share/texmf/fonts/tfm/lcircle10.tfm
+share/texmf/fonts/tfm/lcirclew10.tfm
+share/texmf/fonts/tfm/lcmss8.tfm
+share/texmf/fonts/tfm/lcmssb8.tfm
+share/texmf/fonts/tfm/lcmssi8.tfm
+share/texmf/fonts/tfm/line10.tfm
+share/texmf/fonts/tfm/linew10.tfm
diff --git a/print/xdvi/scripts/configure b/print/xdvi/scripts/configure
index 944370bc327c..9e64bc431f27 100644
--- a/print/xdvi/scripts/configure
+++ b/print/xdvi/scripts/configure
@@ -7,7 +7,7 @@ prefix=$PREFIX;
 if `echo $PREFIX |grep -q X11` ; then
   prefix=/usr/local
 fi
-CACHE=$prefix/lib/texmf/fonts
+CACHE=$prefix/share/texmf/fonts
 
 if [ -f $PREFIX/bin/MakeTeXPK ]; then
   echo "**WARNING** MakeTeXPK already exists in $PREFIX/bin"
@@ -50,8 +50,9 @@ else
   echo "mkdir -p $CACHE/pk; chmod 1777 $CACHE/pk" > $SCRIPTDIR/post-install
 fi
   
-sed -e s:/usr/lib/tex:$prefix/lib/texmf: \
+sed -e s:/usr/lib/tex:$prefix/share/texmf: \
     -e s:/LocalLibrary/Fonts/TeXFonts:$CACHE: \
+    -e s:-v:-verbose: \
      $SUBST <${WRKSRC}/MakeTeXPK.orig >${WRKSRC}/MakeTeXPK
 
 
@@ -59,6 +60,6 @@ sed -e s:/usr/lib/tex:$prefix/lib/texmf: \
 chmod +w  ${WRKSRC}/Imakefile 
 echo "OSDEFS=" >> ${WRKSRC}/Imakefile || exit 1;
 echo "OPTIONDEFS=-DUSE_PK -DGREY -DPS_GS -DMAKEPK -DBUTTONS" >> ${WRKSRC}/Imakefile
-echo "DEFAULT_FONT_PATH=$prefix/lib/texmf/fonts/pk:$CACHE/pk:/tmp/pk"  >> ${WRKSRC}/Imakefile
-echo "DEFAULT_VF_PATH=$prefix/lib/texmf/fonts/vf" >> ${WRKSRC}/Imakefile
+echo "DEFAULT_FONT_PATH=$prefix/share/texmf/fonts/pk:$CACHE/pk:/tmp/pk"  >> ${WRKSRC}/Imakefile
+echo "DEFAULT_VF_PATH=$prefix/share/texmf/fonts/vf" >> ${WRKSRC}/Imakefile
 exit 0;