3 files changed, 183 insertions, 182 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