Update to take into account the changes in the tex port (mainly ${PREFIX}/lib

-> ${PREFIX}/share)

9 files changed, 196 insertions, 196 deletions

diff --git a/print/dvi2xx/scripts/configure b/print/dvi2xx/scripts/configure
index 1e667640720d..cb24e29faa5f 100644
--- a/print/dvi2xx/scripts/configure
+++ b/print/dvi2xx/scripts/configure
@@ -8,8 +8,8 @@ sed -e s:/usr/local/bin/perl:/usr/bin/perl: \
     -e s:/usr/local:$PREFIX:   <lj3-filter.orig >lj3-filter
 
 mv config.h config.h.orig || exit 1;
-sed -e s+/usr/local/lib/tex/pk300+$PREFIX/lib/texmf/fonts/pk:/tmp/pk+ \
-    -e s+/usr/local/lib/tex/+$PREFIX/lib/texmf/+ < config.h.orig > config.h
+sed -e s+/usr/local/lib/tex/pk300+$PREFIX/share/texmf/fonts/pk:/tmp/pk+ \
+    -e s+/usr/local/lib/tex/+$PREFIX/share/texmf/+ < config.h.orig > config.h
 
 chmod +w Makefile || exit 1;
 echo "FONTAREA=" >> Makefile || exit 1;
@@ -41,7 +41,7 @@ cat >>MakeTeXPK <<'EOF'
 #
 #   Of course, it needs to be set up for your site.
 #
-TEXDIR=$PREFIX/lib/texmf
+TEXDIR=$PREFIX/share/texmf
 LOCALDIR=/tmp
 DESTDIR=$LOCALDIR/pk
 #
@@ -105,7 +105,7 @@ then
 fi
 
 #  Something like the following is useful at some sites.
-# DESTDIR=/usr/local/lib/tex/fonts/pk.$MODE
+# DESTDIR=/usr/local/share/tex/fonts/pk.$MODE
 GFNAME=$NAME.$DPI'gf'
 PKNAME=$NAME.$DPI'pk'
 
diff --git a/print/makeindex/Makefile b/print/makeindex/Makefile
index 310e1e746760..ca9e5a594a91 100644
--- a/print/makeindex/Makefile
+++ b/print/makeindex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         12 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1996/11/17 08:44:51 obrien Exp $
+# $Id: Makefile,v 1.10 1996/11/22 11:11:38 asami Exp $
 #
 
 DISTNAME=	makeindex-3.0.8
@@ -21,11 +21,11 @@ do-build:
 	@(cd ${WRKSRC}/src-3.0; make)
 
 do-install: 
-	@${MKDIR} ${PREFIX}/lib/texmf/makeindx
+	@${MKDIR} ${PREFIX}/share/texmf/makeindx
 	@(cd ${WRKSRC}/src-3.0/regexp; make)
 	@(cd ${WRKSRC}/src-3.0; make install)
 	@(cd ${WRKSRC}/doc; \
-	  sed -e s:/usr/local/lib/tex/macros/:${PREFIX}/lib/texmf/makeindx/: \
+	  sed -e s:/usr/local/lib/tex/macros/:${PREFIX}/share/texmf/makeindx/: \
 	      <makeindex.l >makeindex.1; \
 	  ${INSTALL_DATA} makeindex.1 ${PREFIX}/man/man1/)
 
diff --git a/print/makeindex/pkg-plist b/print/makeindex/pkg-plist
index 2e22ea58b1d8..6ea4c74c7450 100644
--- a/print/makeindex/pkg-plist
+++ b/print/makeindex/pkg-plist
@@ -1,16 +1,16 @@
 bin/makeindex
-lib/texmf/makeindx/din.ist
-lib/texmf/makeindx/icase.ist
-lib/texmf/makeindx/latex.ist
-lib/texmf/makeindx/math.ist
-lib/texmf/makeindx/mkind.ist
-lib/texmf/makeindx/puncts.ist
-lib/texmf/makeindx/tex.ist
-lib/texmf/makeindx/english/digit.ist
-lib/texmf/makeindx/english/letter.ist
-lib/texmf/makeindx/english/special.ist
-lib/texmf/makeindx/german/digit.ist
-lib/texmf/makeindx/german/special.ist
-lib/texmf/makeindx/german/umlaut.ist
-lib/texmf/makeindx/german/wb.ist
+share/texmf/makeindx/din.ist
+share/texmf/makeindx/icase.ist
+share/texmf/makeindx/latex.ist
+share/texmf/makeindx/math.ist
+share/texmf/makeindx/mkind.ist
+share/texmf/makeindx/puncts.ist
+share/texmf/makeindx/tex.ist
+share/texmf/makeindx/english/digit.ist
+share/texmf/makeindx/english/letter.ist
+share/texmf/makeindx/english/special.ist
+share/texmf/makeindx/german/digit.ist
+share/texmf/makeindx/german/special.ist
+share/texmf/makeindx/german/umlaut.ist
+share/texmf/makeindx/german/wb.ist
 man/man1/makeindex.1.gz
diff --git a/print/makeindex/scripts/configure b/print/makeindex/scripts/configure
index e1634b5711cc..28c153ddd09a 100644
--- a/print/makeindex/scripts/configure
+++ b/print/makeindex/scripts/configure
@@ -2,7 +2,7 @@
 
 cd $WRKSRC/src-3.0 || exit 1;
 cp Makefile.gen Makefile || exit 1;
-echo "STYDIR=$PREFIX/lib/texmf/makeindx" >> Makefile || exit 1;
+echo "STYDIR=$PREFIX/share/texmf/makeindx" >> Makefile || exit 1;
 echo "BINDIR=$PREFIX/bin"                >> Makefile || exit 1;
 
 mv mkind.h mkind.h.orig || exit 1;
diff --git a/print/musixtex/Makefile b/print/musixtex/Makefile
index 5ab9d90daab6..443fa436b1ce 100644
--- a/print/musixtex/Makefile
+++ b/print/musixtex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 july 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.5 1996/11/26 08:05:07 asami Exp $
+# $Id: Makefile,v 1.6 1996/12/12 01:07:17 jmz Exp $
 #
 
 DISTNAME=       musixtex-T64
@@ -19,7 +19,7 @@ RUN_DEPENDS=	tex:${PORTSDIR}/print/tex
 NO_WRKSUBDIR=	yes
 
 pre-install:
-	${MKDIR} ${PREFIX}/lib/texmf/fonts/tfm
-	${MKDIR} ${PREFIX}/lib/texmf/documentation
+	${MKDIR} ${PREFIX}/share/texmf/fonts/tfm
+	${MKDIR} ${PREFIX}/share/texmf/documentation
 
 .include <bsd.port.mk>
diff --git a/print/musixtex/pkg-plist b/print/musixtex/pkg-plist
index 3bcc1c4b4d7b..fd14a89a7698 100644
--- a/print/musixtex/pkg-plist
+++ b/print/musixtex/pkg-plist
@@ -1,160 +1,160 @@
 bin/musixflx
 bin/musixtex
-lib/texmf/ini/musixtex.fmt
-lib/texmf/mf/musexgen.mf
-lib/texmf/mf/musix11.mf
-lib/texmf/mf/musix13.mf
-lib/texmf/mf/musix16.mf
-lib/texmf/mf/musix20.mf
-lib/texmf/mf/musix24.mf
-lib/texmf/mf/musix25.mf
-lib/texmf/mf/musix29.mf
-lib/texmf/mf/musixgen.mf
-lib/texmf/mf/musixsps.mf
-lib/texmf/mf/musixspx.mf
-lib/texmf/mf/xdrawsl.mf
-lib/texmf/mf/xdrawzl.mf
-lib/texmf/mf/xgreg11.mf
-lib/texmf/mf/xgreg13.mf
-lib/texmf/mf/xgreg16.mf
-lib/texmf/mf/xgreg20.mf
-lib/texmf/mf/xgreg24.mf
-lib/texmf/mf/xgreg25.mf
-lib/texmf/mf/xgreg29.mf
-lib/texmf/mf/xgreggen.mf
-lib/texmf/mf/xhsld16.mf
-lib/texmf/mf/xhsld20.mf
-lib/texmf/mf/xhslu16.mf
-lib/texmf/mf/xhslu20.mf
-lib/texmf/mf/xsld11.mf
-lib/texmf/mf/xsld13.mf
-lib/texmf/mf/xsld16.mf
-lib/texmf/mf/xsld20.mf
-lib/texmf/mf/xsld24.mf
-lib/texmf/mf/xsld29.mf
-lib/texmf/mf/xslgen.mf
-lib/texmf/mf/xslhd.mf
-lib/texmf/mf/xslhd11.mf
-lib/texmf/mf/xslhd13.mf
-lib/texmf/mf/xslhd16.mf
-lib/texmf/mf/xslhd20.mf
-lib/texmf/mf/xslhd24.mf
-lib/texmf/mf/xslhd29.mf
-lib/texmf/mf/xslhu.mf
-lib/texmf/mf/xslhu11.mf
-lib/texmf/mf/xslhu13.mf
-lib/texmf/mf/xslhu16.mf
-lib/texmf/mf/xslhu20.mf
-lib/texmf/mf/xslhu24.mf
-lib/texmf/mf/xslhu29.mf
-lib/texmf/mf/xslhz20.mf
-lib/texmf/mf/xslu11.mf
-lib/texmf/mf/xslu13.mf
-lib/texmf/mf/xslu16.mf
-lib/texmf/mf/xslu20.mf
-lib/texmf/mf/xslu24.mf
-lib/texmf/mf/xslu29.mf
-lib/texmf/mf/xslz20.mf
-lib/texmf/mf/xtie20.mf
-lib/texmf/documentation/backgrnd.sty
-lib/texmf/documentation/musixdoc.tex
-lib/texmf/documentation/musixtex.examples/angescax.tex
-lib/texmf/documentation/musixtex.examples/angescao.tex
-lib/texmf/documentation/musixtex.examples/avemaria.tex
-lib/texmf/documentation/musixtex.examples/avemario.tex
-lib/texmf/documentation/musixtex.examples/avemarix.tex
-lib/texmf/documentation/musixtex.examples/canticor.tex
-lib/texmf/documentation/musixtex.examples/canticox.tex
-lib/texmf/documentation/musixtex.examples/fantaisc.tex
-lib/texmf/documentation/musixtex.examples/fantaisd.tex
-lib/texmf/documentation/musixtex.examples/fantaisi.tex
-lib/texmf/documentation/musixtex.examples/gloriab.tex
-lib/texmf/documentation/musixtex.examples/glorias.tex
-lib/texmf/documentation/musixtex.examples/gloriax.tex
-lib/texmf/documentation/musixtex.examples/gymnoman.tex
-lib/texmf/documentation/musixtex.examples/ilestne.tex
-lib/texmf/documentation/musixtex.examples/ilestnex.tex
-lib/texmf/documentation/musixtex.examples/marcello.tex
-lib/texmf/documentation/musixtex.examples/onuitbri.tex
-lib/texmf/documentation/musixtex.examples/parnasum.tex
-lib/texmf/documentation/musixtex.examples/souvenir.tex
-lib/texmf/documentation/musixtex.examples/souvenix.tex
-lib/texmf/documentation/musixtex.examples/traeumer.tex
-lib/texmf/documentation/musixtex.examples/widor.tex
-lib/texmf/documentation/musixtex.examples/widor_16.tex
-lib/texmf/documentation/musixtex.examples/widor_20.tex
-lib/texmf/fonts/tfm/musix11.tfm
-lib/texmf/fonts/tfm/musix13.tfm
-lib/texmf/fonts/tfm/musix16.tfm
-lib/texmf/fonts/tfm/musix20.tfm
-lib/texmf/fonts/tfm/musix24.tfm
-lib/texmf/fonts/tfm/musix25.tfm
-lib/texmf/fonts/tfm/musix29.tfm
-lib/texmf/fonts/tfm/musixsps.tfm
-lib/texmf/fonts/tfm/musixspx.tfm
-lib/texmf/fonts/tfm/xgreg11.tfm
-lib/texmf/fonts/tfm/xgreg13.tfm
-lib/texmf/fonts/tfm/xgreg16.tfm
-lib/texmf/fonts/tfm/xgreg20.tfm
-lib/texmf/fonts/tfm/xgreg24.tfm
-lib/texmf/fonts/tfm/xgreg29.tfm
-lib/texmf/fonts/tfm/xsld11.tfm
-lib/texmf/fonts/tfm/xsld13.tfm
-lib/texmf/fonts/tfm/xsld16.tfm
-lib/texmf/fonts/tfm/xsld20.tfm
-lib/texmf/fonts/tfm/xsld24.tfm
-lib/texmf/fonts/tfm/xsld29.tfm
-lib/texmf/fonts/tfm/xslhd11.tfm
-lib/texmf/fonts/tfm/xslhd13.tfm
-lib/texmf/fonts/tfm/xslhd16.tfm
-lib/texmf/fonts/tfm/xslhd20.tfm
-lib/texmf/fonts/tfm/xslhd24.tfm
-lib/texmf/fonts/tfm/xslhd29.tfm
-lib/texmf/fonts/tfm/xslhu11.tfm
-lib/texmf/fonts/tfm/xslhu13.tfm
-lib/texmf/fonts/tfm/xslhu16.tfm
-lib/texmf/fonts/tfm/xslhu20.tfm
-lib/texmf/fonts/tfm/xslhu24.tfm
-lib/texmf/fonts/tfm/xslhu29.tfm
-lib/texmf/fonts/tfm/xslhz20.tfm
-lib/texmf/fonts/tfm/xslu11.tfm
-lib/texmf/fonts/tfm/xslu13.tfm
-lib/texmf/fonts/tfm/xslu16.tfm
-lib/texmf/fonts/tfm/xslu20.tfm
-lib/texmf/fonts/tfm/xslu24.tfm
-lib/texmf/fonts/tfm/xslu29.tfm
-lib/texmf/fonts/tfm/xslz20.tfm
-lib/texmf/fonts/tfm/xtie20.tfm
-lib/texmf/tex/musixadd.tex
-lib/texmf/tex/musixbbm.tex
-lib/texmf/tex/musixblx.tex
-lib/texmf/tex/musixbm.tex
-lib/texmf/tex/musixcho.tex
-lib/texmf/tex/musixcpt.sty
-lib/texmf/tex/musixcpt.tex
-lib/texmf/tex/musixdat.tex
-lib/texmf/tex/musixdia.tex
-lib/texmf/tex/musixeng.tex
-lib/texmf/tex/musixevo.tex
-lib/texmf/tex/musixext.tex
-lib/texmf/tex/musixfll.sty
-lib/texmf/tex/musixfll.tex
-lib/texmf/tex/musixgre.tex
-lib/texmf/tex/musixgui.tex
-lib/texmf/tex/musixhou.tex
-lib/texmf/tex/musixinv.tex
-lib/texmf/tex/musixlit.tex
-lib/texmf/tex/musixltx.tex
-lib/texmf/tex/musixmad.tex
-lib/texmf/tex/musixper.tex
-lib/texmf/tex/musixpoi.tex
-lib/texmf/tex/musixref.tex
-lib/texmf/tex/musixslu.tex
-lib/texmf/tex/musixsqr.tex
-lib/texmf/tex/musixste.tex
-lib/texmf/tex/musixstf.tex
-lib/texmf/tex/musixstr.tex
-lib/texmf/tex/musixsty.tex
-lib/texmf/tex/musixtex.sty
-lib/texmf/tex/musixtex.tex
-lib/texmf/tex/musixtri.tex
+share/texmf/ini/musixtex.fmt
+share/texmf/mf/musexgen.mf
+share/texmf/mf/musix11.mf
+share/texmf/mf/musix13.mf
+share/texmf/mf/musix16.mf
+share/texmf/mf/musix20.mf
+share/texmf/mf/musix24.mf
+share/texmf/mf/musix25.mf
+share/texmf/mf/musix29.mf
+share/texmf/mf/musixgen.mf
+share/texmf/mf/musixsps.mf
+share/texmf/mf/musixspx.mf
+share/texmf/mf/xdrawsl.mf
+share/texmf/mf/xdrawzl.mf
+share/texmf/mf/xgreg11.mf
+share/texmf/mf/xgreg13.mf
+share/texmf/mf/xgreg16.mf
+share/texmf/mf/xgreg20.mf
+share/texmf/mf/xgreg24.mf
+share/texmf/mf/xgreg25.mf
+share/texmf/mf/xgreg29.mf
+share/texmf/mf/xgreggen.mf
+share/texmf/mf/xhsld16.mf
+share/texmf/mf/xhsld20.mf
+share/texmf/mf/xhslu16.mf
+share/texmf/mf/xhslu20.mf
+share/texmf/mf/xsld11.mf
+share/texmf/mf/xsld13.mf
+share/texmf/mf/xsld16.mf
+share/texmf/mf/xsld20.mf
+share/texmf/mf/xsld24.mf
+share/texmf/mf/xsld29.mf
+share/texmf/mf/xslgen.mf
+share/texmf/mf/xslhd.mf
+share/texmf/mf/xslhd11.mf
+share/texmf/mf/xslhd13.mf
+share/texmf/mf/xslhd16.mf
+share/texmf/mf/xslhd20.mf
+share/texmf/mf/xslhd24.mf
+share/texmf/mf/xslhd29.mf
+share/texmf/mf/xslhu.mf
+share/texmf/mf/xslhu11.mf
+share/texmf/mf/xslhu13.mf
+share/texmf/mf/xslhu16.mf
+share/texmf/mf/xslhu20.mf
+share/texmf/mf/xslhu24.mf
+share/texmf/mf/xslhu29.mf
+share/texmf/mf/xslhz20.mf
+share/texmf/mf/xslu11.mf
+share/texmf/mf/xslu13.mf
+share/texmf/mf/xslu16.mf
+share/texmf/mf/xslu20.mf
+share/texmf/mf/xslu24.mf
+share/texmf/mf/xslu29.mf
+share/texmf/mf/xslz20.mf
+share/texmf/mf/xtie20.mf
+share/texmf/documentation/backgrnd.sty
+share/texmf/documentation/musixdoc.tex
+share/texmf/documentation/musixtex.examples/angescax.tex
+share/texmf/documentation/musixtex.examples/angescao.tex
+share/texmf/documentation/musixtex.examples/avemaria.tex
+share/texmf/documentation/musixtex.examples/avemario.tex
+share/texmf/documentation/musixtex.examples/avemarix.tex
+share/texmf/documentation/musixtex.examples/canticor.tex
+share/texmf/documentation/musixtex.examples/canticox.tex
+share/texmf/documentation/musixtex.examples/fantaisc.tex
+share/texmf/documentation/musixtex.examples/fantaisd.tex
+share/texmf/documentation/musixtex.examples/fantaisi.tex
+share/texmf/documentation/musixtex.examples/gloriab.tex
+share/texmf/documentation/musixtex.examples/glorias.tex
+share/texmf/documentation/musixtex.examples/gloriax.tex
+share/texmf/documentation/musixtex.examples/gymnoman.tex
+share/texmf/documentation/musixtex.examples/ilestne.tex
+share/texmf/documentation/musixtex.examples/ilestnex.tex
+share/texmf/documentation/musixtex.examples/marcello.tex
+share/texmf/documentation/musixtex.examples/onuitbri.tex
+share/texmf/documentation/musixtex.examples/parnasum.tex
+share/texmf/documentation/musixtex.examples/souvenir.tex
+share/texmf/documentation/musixtex.examples/souvenix.tex
+share/texmf/documentation/musixtex.examples/traeumer.tex
+share/texmf/documentation/musixtex.examples/widor.tex
+share/texmf/documentation/musixtex.examples/widor_16.tex
+share/texmf/documentation/musixtex.examples/widor_20.tex
+share/texmf/fonts/tfm/musix11.tfm
+share/texmf/fonts/tfm/musix13.tfm
+share/texmf/fonts/tfm/musix16.tfm
+share/texmf/fonts/tfm/musix20.tfm
+share/texmf/fonts/tfm/musix24.tfm
+share/texmf/fonts/tfm/musix25.tfm
+share/texmf/fonts/tfm/musix29.tfm
+share/texmf/fonts/tfm/musixsps.tfm
+share/texmf/fonts/tfm/musixspx.tfm
+share/texmf/fonts/tfm/xgreg11.tfm
+share/texmf/fonts/tfm/xgreg13.tfm
+share/texmf/fonts/tfm/xgreg16.tfm
+share/texmf/fonts/tfm/xgreg20.tfm
+share/texmf/fonts/tfm/xgreg24.tfm
+share/texmf/fonts/tfm/xgreg29.tfm
+share/texmf/fonts/tfm/xsld11.tfm
+share/texmf/fonts/tfm/xsld13.tfm
+share/texmf/fonts/tfm/xsld16.tfm
+share/texmf/fonts/tfm/xsld20.tfm
+share/texmf/fonts/tfm/xsld24.tfm
+share/texmf/fonts/tfm/xsld29.tfm
+share/texmf/fonts/tfm/xslhd11.tfm
+share/texmf/fonts/tfm/xslhd13.tfm
+share/texmf/fonts/tfm/xslhd16.tfm
+share/texmf/fonts/tfm/xslhd20.tfm
+share/texmf/fonts/tfm/xslhd24.tfm
+share/texmf/fonts/tfm/xslhd29.tfm
+share/texmf/fonts/tfm/xslhu11.tfm
+share/texmf/fonts/tfm/xslhu13.tfm
+share/texmf/fonts/tfm/xslhu16.tfm
+share/texmf/fonts/tfm/xslhu20.tfm
+share/texmf/fonts/tfm/xslhu24.tfm
+share/texmf/fonts/tfm/xslhu29.tfm
+share/texmf/fonts/tfm/xslhz20.tfm
+share/texmf/fonts/tfm/xslu11.tfm
+share/texmf/fonts/tfm/xslu13.tfm
+share/texmf/fonts/tfm/xslu16.tfm
+share/texmf/fonts/tfm/xslu20.tfm
+share/texmf/fonts/tfm/xslu24.tfm
+share/texmf/fonts/tfm/xslu29.tfm
+share/texmf/fonts/tfm/xslz20.tfm
+share/texmf/fonts/tfm/xtie20.tfm
+share/texmf/tex/musixadd.tex
+share/texmf/tex/musixbbm.tex
+share/texmf/tex/musixblx.tex
+share/texmf/tex/musixbm.tex
+share/texmf/tex/musixcho.tex
+share/texmf/tex/musixcpt.sty
+share/texmf/tex/musixcpt.tex
+share/texmf/tex/musixdat.tex
+share/texmf/tex/musixdia.tex
+share/texmf/tex/musixeng.tex
+share/texmf/tex/musixevo.tex
+share/texmf/tex/musixext.tex
+share/texmf/tex/musixfll.sty
+share/texmf/tex/musixfll.tex
+share/texmf/tex/musixgre.tex
+share/texmf/tex/musixgui.tex
+share/texmf/tex/musixhou.tex
+share/texmf/tex/musixinv.tex
+share/texmf/tex/musixlit.tex
+share/texmf/tex/musixltx.tex
+share/texmf/tex/musixmad.tex
+share/texmf/tex/musixper.tex
+share/texmf/tex/musixpoi.tex
+share/texmf/tex/musixref.tex
+share/texmf/tex/musixslu.tex
+share/texmf/tex/musixsqr.tex
+share/texmf/tex/musixste.tex
+share/texmf/tex/musixstf.tex
+share/texmf/tex/musixstr.tex
+share/texmf/tex/musixsty.tex
+share/texmf/tex/musixtex.sty
+share/texmf/tex/musixtex.tex
+share/texmf/tex/musixtri.tex
diff --git a/print/musixtex/scripts/configure b/print/musixtex/scripts/configure
index b309bf737a66..3b1dd0424184 100644
--- a/print/musixtex/scripts/configure
+++ b/print/musixtex/scripts/configure
@@ -17,15 +17,15 @@ all:
 install:
 	install -c -s -o bin -g bin musixflx $PREFIX/bin/
 	(cd $PREFIX/bin; ln -sf virtex musixtex)
-	install -c -o bin -g bin mf/*.mf $PREFIX/lib/texmf/mf/
-	install -c -o bin -g bin tfm/*.tfm $PREFIX/lib/texmf/fonts/tfm/
-	install -c -o bin -g bin tex/musixtex.fmt $PREFIX/lib/texmf/ini/
-	install -c -o bin -g bin tex/*.tex tex/*.sty $PREFIX/lib/texmf/tex/
+	install -c -o bin -g bin mf/*.mf $PREFIX/share/texmf/mf/
+	install -c -o bin -g bin tfm/*.tfm $PREFIX/share/texmf/fonts/tfm/
+	install -c -o bin -g bin tex/musixtex.fmt $PREFIX/share/texmf/ini/
+	install -c -o bin -g bin tex/*.tex tex/*.sty $PREFIX/share/texmf/tex/
 	install -c -o bin -g bin doc/musixdoc.tex  doc/musixdoc.sty doc/backgrnd.sty \\
-		$PREFIX/lib/texmf/documentation/
-	mkdir -p $PREFIX/lib/texmf/documentation/musixtex.examples
+		$PREFIX/share/texmf/documentation/
+	mkdir -p $PREFIX/share/texmf/documentation/musixtex.examples
 	for f in $examples; do install -c -o bin -g bin  examples/\$\$f \\
-		$PREFIX/lib/texmf/documentation/musixtex.examples/; done
+		$PREFIX/share/texmf/documentation/musixtex.examples/; done
 END
 
 exit 0
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 66ff99a67c72..d32444dc7b61 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1996/11/17 08:45:13 obrien Exp $
+# $Id: Makefile,v 1.10 1996/12/17 12:33:49 asami Exp $
 #
 
 DISTNAME=	texinfo
@@ -41,10 +41,10 @@ do-build:
 
 do-install: 
 	@${INSTALL_DATA} ${WRKDIR}/texinfo.fmt \
-				${PREFIX}/lib/texmf/ini/
-	@if [ ! -f ${PREFIX}/lib/texmf/fonts/tfm/lcircle10.tfm ]; then \
+				${PREFIX}/share/texmf/web2c/
+	@if [ ! -f ${PREFIX}/share/texmf/fonts/tfm/lcircle10.tfm ]; then \
 	  ${INSTALL_DATA} ${WRKDIR}/lcircle10.tfm \
-				${PREFIX}/lib/texmf/fonts/tfm/;\
+				${PREFIX}/share/texmf/fonts/tfm/;\
 	 fi
 	@(cd ${PREFIX}/bin/; rm -f texinfo; ln -s virtex texinfo)
 
diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist
index ff82ea321fef..02d34bb6f141 100644
--- a/print/texinfo/pkg-plist
+++ b/print/texinfo/pkg-plist
@@ -1,3 +1,3 @@
 bin/texinfo
-lib/texmf/fonts/tfm/lcircle10.tfm
-lib/texmf/ini/texinfo.fmt
+share/texmf/fonts/tfm/lcircle10.tfm
+share/texmf/web2c/texinfo.fmt