Update tex-musixtex{,-doc} to 1.16

latest texlive version.  changes unknown.

7 files changed, 81 insertions, 43 deletions

diff --git a/print/tex-musixtex-doc/Makefile b/print/tex-musixtex-doc/Makefile
index 010837765c3..ee30e7f6c95 100644
--- a/print/tex-musixtex-doc/Makefile
+++ b/print/tex-musixtex-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/12/04 02:42:07 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/23 12:33:29 markd Exp $
 
 DISTNAME=	musixtex.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-1.15pl29752
-TEXLIVE_REV=	29752
+PKGNAME=	tex-${DISTNAME:S/./-/}-1.16
+TEXLIVE_REV=	36401
 
 MAINTAINER=	dgriffi@cs.csubak.edu
 COMMENT=	Documentation for tex-musixtex
diff --git a/print/tex-musixtex-doc/PLIST b/print/tex-musixtex-doc/PLIST
index de0328b2812..3a8e518807e 100644
--- a/print/tex-musixtex-doc/PLIST
+++ b/print/tex-musixtex-doc/PLIST
@@ -1,14 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/04 02:42:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/23 12:33:29 markd Exp $
 man/man1/musixflx.1
 man/man1/musixtex.1
+share/texmf-dist/doc/generic/musixtex/ChangeLog-114.txt
 share/texmf-dist/doc/generic/musixtex/ChangeLog-115.txt
-share/texmf-dist/doc/generic/musixtex/ChangeLog-T114.txt
-share/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc-115.txt
+share/texmf-dist/doc/generic/musixtex/ChangeLog-116.txt
+share/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
 share/texmf-dist/doc/generic/musixtex/README
-share/texmf-dist/doc/generic/musixtex/addons/README.underbracket
-share/texmf-dist/doc/generic/musixtex/addons/curly.tex
-share/texmf-dist/doc/generic/musixtex/addons/tuplet.tex
-share/texmf-dist/doc/generic/musixtex/addons/underbracket.sty
 share/texmf-dist/doc/generic/musixtex/examples/8bitchar.tex
 share/texmf-dist/doc/generic/musixtex/examples/adagio.tex
 share/texmf-dist/doc/generic/musixtex/examples/albinoni.tex
@@ -28,7 +25,6 @@ share/texmf-dist/doc/generic/musixtex/examples/aveverud.tex
 share/texmf-dist/doc/generic/musixtex/examples/aveverum.tex
 share/texmf-dist/doc/generic/musixtex/examples/changecontext.tex
 share/texmf-dist/doc/generic/musixtex/examples/chanson.tex
-share/texmf-dist/doc/generic/musixtex/examples/coulhack.tex
 share/texmf-dist/doc/generic/musixtex/examples/dissonan.tex
 share/texmf-dist/doc/generic/musixtex/examples/fantaisc.tex
 share/texmf-dist/doc/generic/musixtex/examples/fantaisd.tex
@@ -45,6 +41,9 @@ share/texmf-dist/doc/generic/musixtex/examples/ilestne.tex
 share/texmf-dist/doc/generic/musixtex/examples/ilestnex.tex
 share/texmf-dist/doc/generic/musixtex/examples/ilfaitda.tex
 share/texmf-dist/doc/generic/musixtex/examples/ilfaitdx.tex
+share/texmf-dist/doc/generic/musixtex/examples/kinder.log
+share/texmf-dist/doc/generic/musixtex/examples/kinder.pdf
+share/texmf-dist/doc/generic/musixtex/examples/kinder.tex
 share/texmf-dist/doc/generic/musixtex/examples/kv315.tex
 share/texmf-dist/doc/generic/musixtex/examples/kv315f.tex
 share/texmf-dist/doc/generic/musixtex/examples/kv315h.tex
@@ -89,8 +88,38 @@ share/texmf-dist/doc/generic/musixtex/examples/widor_20.tex
 share/texmf-dist/doc/generic/musixtex/musixcrd/README.musixcrd
 share/texmf-dist/doc/generic/musixtex/musixcrd/doc.pdf
 share/texmf-dist/doc/generic/musixtex/musixdoc.pdf
-share/texmf-dist/doc/generic/musixtex/musixdoc.sty
-share/texmf-dist/doc/generic/musixtex/musixdoc.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/barnumbering.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/changing.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/embedding.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/examples.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/extracting.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/fonts.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/index.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/lyrics.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
+share/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/rests.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesfont.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/staffsize.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/summary.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/texput.log
+share/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex
+share/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex
 share/texmf-dist/doc/generic/musixtex/musixlyr/README.musixlyr
 share/texmf-dist/doc/generic/musixtex/musixlyr/examples/nonmoriar.dvi
 share/texmf-dist/doc/generic/musixtex/musixlyr/examples/nonmoriar.pdf
@@ -111,6 +140,5 @@ share/texmf-dist/doc/generic/musixtex/psslurs/README.psslurs
 share/texmf-dist/doc/generic/musixtex/psslurs/slurs.pdf
 share/texmf-dist/doc/generic/musixtex/psslurs/slurs.tex
 share/texmf-dist/doc/generic/musixtex/reference/musixre1.pdf
-share/texmf-dist/doc/generic/musixtex/reference/musixre1.tex
-share/texmf-dist/doc/generic/musixtex/scripts/musixflx.html
-share/texmf-dist/doc/generic/musixtex/scripts/musixtex.html
+share/texmf-dist/doc/generic/musixtex/scripts/musixflx.pdf
+share/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
diff --git a/print/tex-musixtex-doc/distinfo b/print/tex-musixtex-doc/distinfo
index 0fe8c4ec9b6..93677a24015 100644
--- a/print/tex-musixtex-doc/distinfo
+++ b/print/tex-musixtex-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/12/04 02:42:07 minskim Exp $
+$NetBSD: distinfo,v 1.3 2015/04/23 12:33:29 markd Exp $
 
-SHA1 (tex-musixtex-29752/musixtex.doc.tar.xz) = 80c66751c6649fd5304582f34294da18f9c49364
-RMD160 (tex-musixtex-29752/musixtex.doc.tar.xz) = 9d4a81c0ae3de0ad61ab38dce326fb5093e7122f
-Size (tex-musixtex-29752/musixtex.doc.tar.xz) = 2033888 bytes
+SHA1 (tex-musixtex-36401/musixtex.doc.tar.xz) = 623c7071a8d35b91fd08068f4f2bcbd75aafc283
+RMD160 (tex-musixtex-36401/musixtex.doc.tar.xz) = 7b281b7d2a16d8fa4c098cef63c6e57f1eeca2b9
+Size (tex-musixtex-36401/musixtex.doc.tar.xz) = 1947212 bytes
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 73cccc16b7f..928c9e58705 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2013/12/04 02:42:07 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2015/04/23 12:33:29 markd Exp $
 
 DISTNAME=	musixtex
-PKGNAME=	tex-${DISTNAME}-1.15pl29752
-TEXLIVE_REV=	29752
+PKGNAME=	tex-${DISTNAME}-1.16
+TEXLIVE_REV=	36401
 
 MAINTAINER=	dgriffi@cs.csubak.edu
 COMMENT=	TeX macros for sophisticated music typesetting
diff --git a/print/tex-musixtex/PLIST b/print/tex-musixtex/PLIST
index 2c1dd21323a..186642edc35 100644
--- a/print/tex-musixtex/PLIST
+++ b/print/tex-musixtex/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2013/12/04 02:42:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/04/23 12:33:29 markd Exp $
 bin/musixflx
 bin/musixtex
 share/texmf-dist/dvips/musixtex/psslurs.pro
 share/texmf-dist/tex/generic/musixtex/musixadd.tex
+share/texmf-dist/tex/generic/musixtex/musixadf.tex
 share/texmf-dist/tex/generic/musixtex/musixbar.tex
 share/texmf-dist/tex/generic/musixtex/musixbbm.tex
 share/texmf-dist/tex/generic/musixtex/musixblx.tex
@@ -13,22 +14,25 @@ share/texmf-dist/tex/generic/musixtex/musixcrd.tex
 share/texmf-dist/tex/generic/musixtex/musixdat.tex
 share/texmf-dist/tex/generic/musixtex/musixdbr.tex
 share/texmf-dist/tex/generic/musixtex/musixdia.tex
+share/texmf-dist/tex/generic/musixtex/musixec.tex
 share/texmf-dist/tex/generic/musixtex/musixeng.tex
 share/texmf-dist/tex/generic/musixtex/musixesf.tex
 share/texmf-dist/tex/generic/musixtex/musixevo.tex
 share/texmf-dist/tex/generic/musixtex/musixext.tex
-share/texmf-dist/tex/generic/musixtex/musixfll.sty
 share/texmf-dist/tex/generic/musixtex/musixfll.tex
 share/texmf-dist/tex/generic/musixtex/musixgre.tex
 share/texmf-dist/tex/generic/musixtex/musixgui.tex
 share/texmf-dist/tex/generic/musixtex/musixhor.tex
 share/texmf-dist/tex/generic/musixtex/musixhou.tex
+share/texmf-dist/tex/generic/musixtex/musixhv.tex
 share/texmf-dist/tex/generic/musixtex/musixinv.tex
 share/texmf-dist/tex/generic/musixtex/musixlit.tex
 share/texmf-dist/tex/generic/musixtex/musixlyr.tex
 share/texmf-dist/tex/generic/musixtex/musixmad.tex
 share/texmf-dist/tex/generic/musixtex/musixper.tex
+share/texmf-dist/tex/generic/musixtex/musixplt.tex
 share/texmf-dist/tex/generic/musixtex/musixpoi.tex
+share/texmf-dist/tex/generic/musixtex/musixppff.tex
 share/texmf-dist/tex/generic/musixtex/musixps.tex
 share/texmf-dist/tex/generic/musixtex/musixref.tex
 share/texmf-dist/tex/generic/musixtex/musixslu.tex
@@ -42,5 +46,6 @@ share/texmf-dist/tex/generic/musixtex/musixtmr.tex
 share/texmf-dist/tex/generic/musixtex/musixtri.tex
 share/texmf-dist/tex/latex/musixtex/musixcpt.sty
 share/texmf-dist/tex/latex/musixtex/musixcrd.sty
+share/texmf-dist/tex/latex/musixtex/musixfll.sty
 share/texmf-dist/tex/latex/musixtex/musixltx.tex
 share/texmf-dist/tex/latex/musixtex/musixtex.sty
diff --git a/print/tex-musixtex/distinfo b/print/tex-musixtex/distinfo
index 15a2579083a..611ee5bb58c 100644
--- a/print/tex-musixtex/distinfo
+++ b/print/tex-musixtex/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2013/12/04 02:42:07 minskim Exp $
+$NetBSD: distinfo,v 1.6 2015/04/23 12:33:29 markd Exp $
 
-SHA1 (tex-musixtex-29752/musixtex.tar.xz) = 5dd79a96df7eb00d3d46b46fd2f894d74d038148
-RMD160 (tex-musixtex-29752/musixtex.tar.xz) = 8ed01497c7712b7581dbdfec8d9b5cf2df8144d0
-Size (tex-musixtex-29752/musixtex.tar.xz) = 87604 bytes
-SHA1 (patch-bin_musixtex) = df4cbb8c506d7636a50d1fcbde24c6c806727cc4
+SHA1 (tex-musixtex-36401/musixtex.tar.xz) = e4cfac9560d7b4632d56302881a372fffb82a2b4
+RMD160 (tex-musixtex-36401/musixtex.tar.xz) = 8a51d5b8fc585873b1995297a2ac4574e037f5a7
+Size (tex-musixtex-36401/musixtex.tar.xz) = 91588 bytes
+SHA1 (patch-bin_musixtex) = b899f4dc8ccfad3c1020b248a37fd62261a994bb
diff --git a/print/tex-musixtex/patches/patch-bin_musixtex b/print/tex-musixtex/patches/patch-bin_musixtex
index d1fc06e3bf9..2826dcf584d 100644
--- a/print/tex-musixtex/patches/patch-bin_musixtex
+++ b/print/tex-musixtex/patches/patch-bin_musixtex
@@ -1,25 +1,27 @@
-$NetBSD: patch-bin_musixtex,v 1.2 2013/12/04 02:42:07 minskim Exp $
+$NetBSD: patch-bin_musixtex,v 1.3 2015/04/23 12:33:29 markd Exp $
 
 Fix paths to commands.
 
---- bin/musixtex.orig	2013-01-24 23:23:04.000000000 +0000
+--- bin/musixtex.orig	2015-02-28 22:49:36.000000000 +0000
 +++ bin/musixtex
-@@ -71,10 +71,10 @@ if #arg == 0 then
+@@ -84,11 +84,11 @@ if #arg == 0 then
  end
  
  -- defaults:
 -tex = "etex"  
 -musixflx = "musixflx"
--dvi = "dvips"
+-dvips = "dvips -e0 "
+-dvi = dvips
 -ps2pdf = "ps2pdf"
 +tex = "@LOCALBASE@/bin/etex"  
 +musixflx = "@LOCALBASE@/bin/musixflx"
-+dvi = "@LOCALBASE@/bin/dvips"
++dvips = "@LOCALBASE@/bin/dvips -e0 "
++dvi = "@LOCALBASE@/bin/dvips"dvips
 +ps2pdf = "@LOCALBASE@/bin/ps2pdf"
  intermediate = 1
  passes = 2
- 
-@@ -89,19 +89,19 @@ repeat
+ index = 0
+@@ -104,19 +104,19 @@ repeat
      os.exit(0)
    elseif this_arg == "-l" then
      if tex == "pdfetex" then
@@ -44,12 +46,15 @@ Fix paths to commands.
    elseif this_arg == "-s" then
      dvi = ""; ps2pdf = ""
    elseif this_arg == "-i" then
-@@ -109,7 +109,7 @@ repeat
+@@ -124,9 +124,9 @@ repeat
    elseif this_arg == "-1" then
      passes = 1
    elseif this_arg == "-f" then
--    tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2
-+    tex = "@LOCALBASE@/bin/etex"; dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = "@LOCALBASE@/bin/ps2pdf"; intermediate = 1; passes = 2
-   else
-     filename = this_arg 
-     if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then
+-    tex = "etex"; dvi = dvips; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2; index = 0
++    tex = "@LOCALBASE@/bin/etex"; dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = "@LOCALBASE@/bin/ps2pdf"; intermediate = 1; passes = 2; index = 0
+   elseif this_arg == "-g" then
+-    dvi = dvips; ps2pdf = ""
++    dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = ""
+   elseif this_arg == "-x" then
+     index = 1
+   elseif this_arg == "-F" then