Upgrade from version 3.96 to version T64 (!)

3 files changed, 85 insertions, 32 deletions

diff --git a/print/musixtex/Makefile b/print/musixtex/Makefile
index 4cfafb1fd706..5ab9d90daab6 100644
--- a/print/musixtex/Makefile
+++ b/print/musixtex/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    musixtex
-# Version required:     ?
+# Version required:     T64
 # Date created:         9 july 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.4 1996/11/17 08:44:59 obrien Exp $
+# $Id: Makefile,v 1.5 1996/11/26 08:05:07 asami Exp $
 #
 
-DISTNAME=       musixtex-3.96
+DISTNAME=       musixtex-T64
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.tex.ac.uk//tex-archive/macros/musixtex/taupin/
-DISTFILES=      musixtex-T396.tar.gz musixexa-0375.tar.gz
+DISTFILES=      musixtex-T64.tar.gz musixexa-T64.tar.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/print/musixtex/pkg-plist b/print/musixtex/pkg-plist
index 22601b6e8b69..677a294ca7c8 100644
--- a/print/musixtex/pkg-plist
+++ b/print/musixtex/pkg-plist
@@ -6,68 +6,124 @@ 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/musixdoc.sty
+lib/texmf/documentation/backgrnd.sty
 lib/texmf/documentation/musixdoc.tex
-lib/texmf/documentation/musixtex.examples/adagio.tex
+lib/texmf/documentation/musixdoc.tex
+lib/texmf/documentation/musixtex.examples/angescam.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/carillon.tex
-lib/texmf/documentation/musixtex.examples/carillox.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/havemari.tex
-lib/texmf/documentation/musixtex.examples/havemaro.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/marcellx.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/xavemari.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
@@ -75,12 +131,15 @@ 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/musixd35.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
@@ -97,9 +156,7 @@ lib/texmf/tex/musixste.tex
 lib/texmf/tex/musixstf.tex
 lib/texmf/tex/musixstr.tex
 lib/texmf/tex/musixsty.tex
-lib/texmf/tex/musixt43.tex
+lib/texmf/tex/musixtex.ins
+lib/texmf/tex/musixtex.sty
 lib/texmf/tex/musixtex.tex
 lib/texmf/tex/musixtri.tex
-lib/texmf/tex/musixcpt.sty
-lib/texmf/tex/musixd35.sty
-lib/texmf/tex/musixtex.sty
diff --git a/print/musixtex/scripts/configure b/print/musixtex/scripts/configure
index f906d1ef296b..b309bf737a66 100644
--- a/print/musixtex/scripts/configure
+++ b/print/musixtex/scripts/configure
@@ -1,21 +1,17 @@
 #!/bin/sh
-
+set +x
 cd $WRKSRC || exit 1
 
-examples="adagio.tex avemario.tex avemarix.tex carillon.tex \
-carillox.tex gymnoman.tex  havemari.tex \
-havemaro.tex marcello.tex marcellx.tex traeumer.tex xavemari.tex"
-
-for i in $examples; do
-  mv $i $i.old
-  sed -e 's:\(^\\input\).*/\(.*\):\1 \2:' <$i.old >$i
-done
-
+examples="angescao.tex angescax.tex avemaria.tex avemario.tex avemarix.tex \
+         canticor.tex canticox.tex fantaisc.tex fantaisd.tex fantaisi.tex \
+         gloriab.tex glorias.tex gloriax.tex gymnoman.tex ilestne.tex \
+         ilestnex.tex marcello.tex onuitbri.tex parnasum.tex souvenir.tex \
+         souvenix.tex traeumer.tex widor.tex widor_16.tex widor_20.tex"
+              
 cat > Makefile <<END
-
 all:
 	(cd systems/c-source; cc -O2 -o ../../musixflx musixflx.c)
-	(cd tex; export TEXFONTS=${WRKSRC}/tfm:; \
+	(cd tex; export TEXFONTS=${WRKSRC}/tfm:; \\
 		initex '&tex musixtex.ins \dump')
 
 install:
@@ -25,11 +21,11 @@ install:
 	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 doc/musixdoc.tex  doc/musixdoc.sty \
+	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
-	install -c -o bin -g bin  $examples \
-		$PREFIX/lib/texmf/documentation/musixtex.examples/
+	for f in $examples; do install -c -o bin -g bin  examples/\$\$f \\
+		$PREFIX/lib/texmf/documentation/musixtex.examples/; done
 END
 
 exit 0