Update tex-musixtex to 112. Mostly adapt to teTeX2,

no list of changes available. Updates via wiz from the
pkg's maintainer.

3 files changed, 32 insertions, 23 deletions

diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 2bf018d8628..4e0480ef8d3 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/18 00:08:17 hubertf Exp $
 #
 
-DISTNAME=	musixtex-109
+DISTNAME=	musixtex-112
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	print
-#MASTER_SITES=	ftp://ftp.tex.ac.uk/tex-archive/macros/musixtex/taupin/
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/musixtex/taupin/}
-DISTFILES=	musixtex-T109.tar.gz
+DISTFILES=	musixtex-T112.tar.gz
 
 MAINTAINER=	dgriffi@cs.csubak.edu
 HOMEPAGE=	http://icking-music-archive.sunsite.dk/
 COMMENT=	TeX macros to typeset music
 
-DEPENDS+=       teTeX-1.0*:../../print/teTeX1
+DEPENDS+=       teTeX-2.0*:../../print/teTeX
 
-WRKSRC=		${WRKDIR}/musixtex-T109
+WRKSRC=		${WRKDIR}/musixtex-T112
 NO_CONFIGURE=	yes
 
 TEXMF=		${LOCALBASE}/share/texmf
@@ -23,31 +21,42 @@ TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
 
 do-build:
 	@${ECHO} "======> Building musixtex.fmt"
+	${CP} -f ${WRKSRC}/system/dos/musixtex.ins \
+		${WRKSRC}/tex
 	cd ${WRKSRC}/tex ; \
 		(TEXFONTS=${WRKSRC}/tfm initex '&tex musixtex.ins \dump')
 	@${ECHO} "======> Building musixflx executable"
-	cd ${WRKSRC}/systems/c-source; ${CC} -o musixflx musixflx.c
+	cd ${WRKSRC}/system/c-source; ${CC} -o musixflx musixflx.c
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/doc/musixtex
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/fonts/tfm/musixtex
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/fonts/source/musixtex
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/tex/latex/musixtex
+
 	${INSTALL_DATA} ${WRKSRC}/doc/* \
 		${PREFIX}/share/texmf/doc/musixtex
+
 	${INSTALL_DATA} ${WRKSRC}/tex/musixtex.fmt \
 		${PREFIX}/share/texmf/web2c
+
+	${INSTALL_DATA} ${WRKSRC}/tex/* \
+		${PREFIX}/share/texmf/tex/latex/musixtex
+
 	${INSTALL_DATA} ${WRKSRC}/mf/*.mf \
 		${PREFIX}/share/texmf/fonts/source/musixtex
+
 	${INSTALL_DATA} ${WRKSRC}/tfm/*.tfm \
 		${PREFIX}/share/texmf/fonts/tfm/musixtex
-	${INSTALL_DATA} ${WRKSRC}/tex/* \
-		${PREFIX}/share/texmf/tex/latex/musixtex
-	${INSTALL_PROGRAM} ${WRKSRC}/systems/c-source/musixflx \
+
+	${INSTALL_PROGRAM} ${WRKSRC}/system/c-source/musixflx \
 		${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/systems/c-source/musixflx.1 \
+
+	${INSTALL_MAN} ${WRKSRC}/system/c-source/musixflx.1 \
 		${PREFIX}/man/man1
+
 	cd ${PREFIX}/bin ; ${LN} -sf virtex musixtex
+
 	${LOCALBASE}/bin/texconfig rehash
 
 post-install:
diff --git a/print/tex-musixtex/PLIST b/print/tex-musixtex/PLIST
index 0e77794b9de..14e9a13bb62 100644
--- a/print/tex-musixtex/PLIST
+++ b/print/tex-musixtex/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/25 04:10:42 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/01/18 00:08:17 hubertf Exp $
 bin/musixflx
 bin/musixtex
 man/man1/musixflx.1
-share/texmf/doc/musixtex/backgrnd.sty
+share/texmf/doc/musixtex/musixflx.1
 share/texmf/doc/musixtex/glossary.eps
-share/texmf/doc/musixtex/multicol.sty
 share/texmf/doc/musixtex/musixdoc.aux
 share/texmf/doc/musixtex/musixdoc.bat
 share/texmf/doc/musixtex/musixdoc.cb
@@ -17,9 +16,6 @@ share/texmf/doc/musixtex/musixdoc.log
 share/texmf/doc/musixtex/musixdoc.mx1
 share/texmf/doc/musixtex/musixdoc.mx2
 share/texmf/doc/musixtex/musixdoc.ps
-share/texmf/doc/musixtex/musixdoc.slg
-share/texmf/doc/musixtex/musixdoc.sty
-share/texmf/doc/musixtex/musixdoc.tex
 share/texmf/doc/musixtex/musixdoc.toc
 share/texmf/fonts/source/musixtex/musexgen.mf
 share/texmf/fonts/source/musixtex/musix11.mf
@@ -180,6 +176,10 @@ share/texmf/fonts/tfm/musixtex/xslup20.tfm
 share/texmf/fonts/tfm/musixtex/xslz20.tfm
 share/texmf/fonts/tfm/musixtex/xslz20d.tfm
 share/texmf/fonts/tfm/musixtex/xtie20.tfm
+share/texmf/tex/latex/musixtex/backgrnd.sty
+share/texmf/tex/latex/musixtex/multicol.sty
+share/texmf/tex/latex/musixtex/musixdoc.sty
+share/texmf/tex/latex/musixtex/musixdoc.tex
 share/texmf/tex/latex/musixtex/musixadd.tex
 share/texmf/tex/latex/musixtex/musixbar.tex
 share/texmf/tex/latex/musixtex/musixbbm.tex
@@ -213,11 +213,11 @@ share/texmf/tex/latex/musixtex/musixste.tex
 share/texmf/tex/latex/musixtex/musixstf.tex
 share/texmf/tex/latex/musixtex/musixstr.tex
 share/texmf/tex/latex/musixtex/musixsty.tex
+share/texmf/tex/latex/musixtex/musixtex.sty
+share/texmf/tex/latex/musixtex/musixtex.tex
 share/texmf/tex/latex/musixtex/musixtex.fmt
 share/texmf/tex/latex/musixtex/musixtex.ins
 share/texmf/tex/latex/musixtex/musixtex.log
-share/texmf/tex/latex/musixtex/musixtex.sty
-share/texmf/tex/latex/musixtex/musixtex.tex
 share/texmf/tex/latex/musixtex/musixtri.tex
 share/texmf/web2c/musixtex.fmt
 @exec %D/bin/texconfig rehash
diff --git a/print/tex-musixtex/distinfo b/print/tex-musixtex/distinfo
index 23e986dcecc..8b396b4b108 100644
--- a/print/tex-musixtex/distinfo
+++ b/print/tex-musixtex/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/23 18:11:05 fredb Exp $
+$NetBSD: distinfo,v 1.2 2005/01/18 00:08:17 hubertf Exp $
 
-SHA1 (musixtex-T109.tar.gz) = 646780ee9d87cdf4c7c59dc15a85e2fcf0546a95
-Size (musixtex-T109.tar.gz) = 651661 bytes
+SHA1 (musixtex-T112.tar.gz) = d0c3999d11253326ad10479dc7ef3cf8fc51d380
+Size (musixtex-T112.tar.gz) = 1024322 bytes