Subject: pkg/34758: Update MusiXTeX (print/tex-musixtex) from 112 to 113
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <mki_open@yahoo.co.jp>
List: pkgsrc-bugs
Date: 10/08/2006 14:20:01
>Number:         34758
>Category:       pkg
>Synopsis:       Update MusiXTeX (print/tex-musixtex) from 112 to 113
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 08 14:20:00 +0000 2006
>Originator:     KIRIHARA Masaharu
>Release:        NetBSD 2.1
>Organization:
>Environment:
NetBSD planck.taniken.eie.eng.osaka-u.ac.jp 2.1 NetBSD 2.1 (TP570_0) #2: Mon Aug 21 17:03:40 JST 2006  kirihara@planck.taniken.eie.eng.osaka-u.ac.jp:/usr/src21/sys/arch/i386/compile/TP570_0 i386

>Description:
I know the modification below is dirty;
  i.e. "${WRKSRC}/doc/musixlyr/*.*", "${WRKSRC}/doc/musixlyr/copying", 
       "${WRKSRC}/doc/musixlyr/xmpl/*" and near parts in Makefile.
But I don't know a better way...

I tested "make", "make install" and "pkg_delete", 
but I'm afraid whether the modification is enough or not.

################################################################
--- print/tex-musixtex/Makefile.orig	2006-08-10 16:02:24.000000000 +0900
+++ print/tex-musixtex/Makefile	2006-10-08 22:54:37.000000000 +0900
@@ -1,12 +1,11 @@
 # $NetBSD: Makefile,v 1.18 2006/08/10 03:21:40 minskim Exp $
 #
 
-DISTNAME=	musixtex-112
+DISTNAME=	musixtex-113
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/musixtex/taupin/}
-DISTFILES=	musixtex-T112.tar.gz
+DISTFILES=	musixtex-t113.zip
 
 MAINTAINER=	dgriffi@cs.csubak.edu
 HOMEPAGE=	http://icking-music-archive.sunsite.dk/
@@ -14,7 +13,7 @@
 
 TEX_ACCEPTED=	teTeX3
 
-WRKSRC=		${WRKDIR}/musixtex-T112
+WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 USE_DIRS+=	texmf-1.0
 
@@ -25,7 +24,7 @@
 INITEX= 	tex -ini	# teTeX3
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../print/teTeX/module.mk"
 
@@ -36,16 +35,36 @@
 	cd ${WRKSRC}/tex ; \
 		(TEXFONTS=${WRKSRC}/tfm ${INITEX} '&tex musixtex.ins \dump')
 	@${ECHO} "======> Building musixflx executable"
-	cd ${WRKSRC}/system/c-source; ${CC} -o musixflx musixflx.c
+	cd ${WRKSRC}/system/musixflx/c-source; ${CC} -o musixflx musixflx.c
 
 do-install:
 	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/musixtex
+	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr
+	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/xmpl
+	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-postscript-slurs
+	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-type1-fonts
+	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex
 	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex
 	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex
 	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex
 
-	${INSTALL_DATA} ${WRKSRC}/doc/* \
-		${PKG_LOCALTEXMFPREFIX}/doc/musixtex
+	${INSTALL_DATA} ${WRKSRC}/doc/musixlyr/*.* \
+		${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr
+
+	${INSTALL_DATA} ${WRKSRC}/doc/musixlyr/copying \
+		${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr
+
+	${INSTALL_DATA} ${WRKSRC}/doc/musixlyr/xmpl/* \
+		${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/xmpl
+
+	${INSTALL_DATA} ${WRKSRC}/doc/musixps-postscript-slurs/* \
+		${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-postscript-slurs
+
+	${INSTALL_DATA} ${WRKSRC}/doc/musixps-type1-fonts/* \
+		${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-type1-fonts
+
+	${INSTALL_DATA} ${WRKSRC}/doc/musixtex/* \
+		${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex
 
 	${INSTALL_DATA} ${WRKSRC}/tex/musixtex.fmt \
 		${PKG_LOCALTEXMFPREFIX}/web2c
@@ -53,16 +72,16 @@
 	${INSTALL_DATA} ${WRKSRC}/tex/* \
 		${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex
 
-	${INSTALL_DATA} ${WRKSRC}/mf/*.mf \
+	${INSTALL_DATA} ${WRKSRC}/fonts/mf/*.mf \
 		${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex
 
-	${INSTALL_DATA} ${WRKSRC}/tfm/*.tfm \
+	${INSTALL_DATA} ${WRKSRC}/fonts/tfm/*.tfm \
 		${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex
 
-	${INSTALL_PROGRAM} ${WRKSRC}/system/c-source/musixflx \
+	${INSTALL_PROGRAM} ${WRKSRC}/system/musixflx/c-source/musixflx \
 		${PREFIX}/bin
 
-	${INSTALL_MAN} ${WRKSRC}/system/c-source/musixflx.1 \
+	${INSTALL_MAN} ${WRKSRC}/system/musixflx/c-source/musixflx.1 \
 		${PREFIX}/man/man1
 
 .if exists(${LOCALBASE}/bin/virtex)
@@ -75,7 +94,7 @@
 
 post-install:
 	@${ECHO} "======> Building musixdoc.ps"
-	cd ${PKG_LOCALTEXMFPREFIX}/doc/musixtex ; \
+	cd ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex ; \
 		latex musixdoc ; \
 		musixflx musixdoc ; \
 		latex  musixdoc ; \
################################################################
--- print/tex-musixtex/PLIST.orig	2006-04-07 16:07:13.000000000 +0900
+++ print/tex-musixtex/PLIST	2006-10-08 22:38:52.000000000 +0900
@@ -2,21 +2,34 @@
 bin/musixflx
 bin/musixtex
 man/man1/musixflx.1
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/glossary.eps
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.aux
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.bat
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.cb
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.dvi
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.idx
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.ilg
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.ind
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.lgi
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.log
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.mx1
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.mx2
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.ps
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixdoc.toc
-${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixflx.1
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/copying
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/musixlyr.txt
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/mxlyrdoc.ind
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/mxlyrdoc.pdf
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/mxlyrdoc.tex
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/readme.musixlyr
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/xmpl/nonmoriar.tex
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-postscript-slurs/copying
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-postscript-slurs/psslur_readme.txt
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-postscript-slurs/readme.txt
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-type1-fonts/changes
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-type1-fonts/readme
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/backgrnd.sty
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.aux
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.bat
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.dvi
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.idx
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.ilg
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.ind
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.log
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.mx1
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.mx2
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.out
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.pdf
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.ps
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.sty
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.tex
+${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex/musixdoc.toc
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/musexgen.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/musix11.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/musix13.mf
@@ -28,6 +41,7 @@
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/musixgen.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/musixsps.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/musixspx.mf
+${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/mxsk.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/xdrawsl.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/xdrawzl.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex/xgreg11.mf
@@ -112,6 +126,7 @@
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/musix29.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/musixsps.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/musixspx.tfm
+${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/mxsk.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/xgreg11.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/xgreg13.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/xgreg16.tfm
@@ -176,7 +191,6 @@
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/xslz20.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/xslz20d.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex/xtie20.tfm
-${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/backgrnd.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/multicol.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixadd.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixbar.tex
@@ -188,8 +202,6 @@
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixcpt.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixdat.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixdia.tex
-${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixdoc.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixdoc.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixeng.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixevo.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixext.tex
@@ -203,9 +215,11 @@
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixlex.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixlit.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixltx.tex
+${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixlyr.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixmad.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixper.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixpoi.tex
+${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixps.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixref.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixslu.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixsqr.tex
@@ -219,8 +233,14 @@
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixtex.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixtex.tex
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/musixtri.tex
+${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex/slurs.tex
 ${PKG_LOCALTEXMFPREFIX}/web2c/musixtex.fmt
 @dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/musixtex
 @dirrm ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/musixtex
 @dirrm ${PKG_LOCALTEXMFPREFIX}/fonts/source/musixtex
+@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixtex
+@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-type1-fonts
+@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixps-postscript-slurs
+@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr/xmpl
+@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/musixtex/musixlyr
 @dirrm ${PKG_LOCALTEXMFPREFIX}/doc/musixtex
################################################################
--- print/tex-musixtex/distinfo.orig	2005-02-24 21:51:45.000000000 +0900
+++ print/tex-musixtex/distinfo	2006-10-08 21:41:10.000000000 +0900
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.3 2005/02/24 12:51:45 agc Exp $
 
-SHA1 (musixtex-T112.tar.gz) = d0c3999d11253326ad10479dc7ef3cf8fc51d380
-RMD160 (musixtex-T112.tar.gz) = 5cfe53f5f146767062f8836627687d9b64ae47d2
-Size (musixtex-T112.tar.gz) = 1024322 bytes
+SHA1 (musixtex-t113.zip) = 4e5d63455af3255240fad2feb6a5b4bcccf0a778
+RMD160 (musixtex-t113.zip) = e983962b48e787fa2e43e69e25b7579972521a1a
+Size (musixtex-t113.zip) = 6415180 bytes
################################################################

>How-To-Repeat:

>Fix: