Update tex-musixtex to 1.15.

Note that the versioning scheme has changed.

Changes:
- \cclp, \zccup, \zcclp are moved from musixpoi.tex to musixtex.tex.
- musixpoi.tex does not work since T.111.
- musixmad.tex is inessential for typesetting musixdoc.tex, thus
  excluded from musixdoc.sty (see the next item)
- the stem length of \metron (at T.113 manual section 2.17.3:
  Metronomic indications) is too short when musixadd.tex/musixmad.tex
  is excluded.
- spacing problem when you change the music size.  (\clef@skip\z@)
- in \ttie and \tleg definition, #1 isn't braced in the expansion
  which causes a problem at ID>9.
  * \def\ttie#1{\let\T@i\@c \t@slur{-\p@ne}{#1}\@ne}
  * \def\tleg#1{\let\T@i\@c \tslur{#1}\@ne}
- Updated musixdoc.pdf and its source code.
- Included the repository of music-notation mistakes, contributed by
  Jean-Pierre Coulon.
- Create an install manual for MiKTeX on Win32: mxinsuse.{pdf|tex}.
- utility: add flip.exe, flip.txt to musixtexadd folder instead of
  former utod.exe and dtou.exe (they don't work in XP).  Run flip.exe
  on musixtex.bat.
- Changing directory structure.  Add-in tex files are located in
  musixtexadd directory.
  * musixlyr (by Rainer Dunker)
  * musixps (by Stanislav Kneifl)
- Added some well-known add-ins to musixtexadd directory.
  * curly.tex (by Mthimkhulu Molekwa,19 May 1999)
  * musixdbr.tex (by Rainer Dunker, 23 February 2002)
  * musixtmr.tex & musixesf.tex (by Hiroaki Morimoto, updated 2009-10-15)
  * tuplet.tex. (by Col. G. L. Sicherman. 2003-05-17)
- Include the contents of following packages.
  * PostScript Type1 fonts. (by Uchiyama)
  * musixlyr ver.2.1c. (by Rainer Dunker)
  * musixps ver.0.92a. (by Stanislav Kneifl)
- \Ioctfin[up | down] do not work when \sepbarrules is assigned.
  musixtex.tex line 2259, \def\rul@sep#1
- Correction of a bug in the definition of choir bracket (l.1688-1698)
- Added following macros.
  * \lwp
  * \rwp
  * \lwpp
  * \rwpp
  * \lhp
  * \rhp
  * \lhpp
  * \rhpp
- all-new registers allocation routines, ready for
    12<n<100 instruments
     6<n<100 128th beams
     6<n<100 256th beams
     4<n<100 groups
    12<n<100 font-based slurs (independent of the number of instruments)
     6<n<100 octlines
     6<n<100 trills (MusiXTeX trills only. MusicTeX's legacy "trilles" are
     out of scope.) with e-TeX.

1 files changed, 28 insertions, 66 deletions

diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index f155d0da374..5b980441bfd 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,71 +1,33 @@
-# $NetBSD: Makefile,v 1.25 2009/10/07 17:34:53 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.26 2011/05/26 23:50:43 minskim Exp $
 
-DISTNAME=	musixtex-112
-PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	3
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/musixtex/taupin/}
-DISTFILES=	musixtex-T112.tar.gz
+DISTNAME=	musixtex
+PKGNAME=	tex-${DISTNAME}-1.15
+TEXLIVE_REV=	22568
 
 MAINTAINER=	dgriffi@cs.csubak.edu
-HOMEPAGE=	http://icking-music-archive.org/
-COMMENT=	TeX macros to typeset music
-
-BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
-
-TEX_ACCEPTED=	teTeX3
-
-WRKSRC=		${WRKDIR}/musixtex-T112
-NO_CONFIGURE=	yes
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 texmf-local/web2c \
-	${PKG_LOCALTEXMFPREFIX}/doc/musixtex \
-	${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex \
-	${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex \
-	${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex \
-	${PKG_LOCALTEXMFPREFIX}/web2c
-
-.include "../../print/teTeX/module.mk"
-
-do-build:
-	@${ECHO} "======> Building musixtex.fmt"
-	${CP} -f ${WRKSRC}/system/dos/musixtex.ins \
-		${WRKSRC}/tex
-	cd ${WRKSRC}/tex ; \
-		(TEXFONTS=${WRKSRC}/tfm tex -ini '&tex musixtex.ins \dump')
-	@${ECHO} "======> Building musixflx executable"
-	cd ${WRKSRC}/system/c-source; ${CC} -o musixflx musixflx.c
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/* \
-		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/doc/musixtex
-	${INSTALL_DATA} ${WRKSRC}/tex/musixtex.fmt \
-		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/web2c
-	${INSTALL_DATA} ${WRKSRC}/tex/* \
-		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex
-	${INSTALL_DATA} ${WRKSRC}/mf/*.mf \
-		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex
-	${INSTALL_DATA} ${WRKSRC}/tfm/*.tfm \
-		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex
-	${INSTALL_PROGRAM} ${WRKSRC}/system/c-source/musixflx \
-		${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/system/c-source/musixflx.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${LN} -s tex ${DESTDIR}${PREFIX}/bin/musixtex
-
-	${LOCALBASE}/bin/mktexlsr ${PKG_LOCALTEXMFPREFIX}
-
-post-install:
-	@${ECHO} "======> Building musixdoc.ps"
-	cd ${PKG_LOCALTEXMFPREFIX}/doc/musixtex ; \
-		latex musixdoc ; \
-		musixflx musixdoc ; \
-		latex  musixdoc ; \
-		makeindex musixdoc.idx ; \
-		latex  musixdoc ; \
-		makeindex musixdoc.idx ; \
-		latex  musixdoc ; \
-		dvips musixdoc.dvi -o musixdoc.ps
+COMMENT=	TeX macros for sophisticated music typesetting
+LICENSE=	gnu-gpl-v2
+
+DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
+DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
+DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
+
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Setting paths to commands.
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	bin/musixtex
+SUBST_SED.paths=	-e 's,@LOCALBASE@,${LOCALBASE},g'
+
+REPLACE_TEXLUA=		bin/musixflx bin/musixtex
+TEX_MIXEDMAP_FILES+=	musix.map
+TEX_TEXMF_DIRS=		${PREFIX}/share/texmf-dist
+
+.include "../../print/texlive/package.mk"
+
+post-extract:
+	${MKDIR} ${WRKSRC}/bin
+.for f in musixflx musixtex
+	${MV} ${WRKSRC}/texmf-dist/scripts/musixtex/${f}.lua ${WRKSRC}/bin/${f}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"