- Update to 2.1.19

PR:		ports/62471
Submitted by:	Patrick Atamaniuk <atamaniuk-ports@frobs.net> (maintainer)

4 files changed, 96 insertions, 85 deletions

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 868bf8a1e5ed..8ed6b40be286 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -4,12 +4,11 @@
 # based on print/lilypond originally by trevor
 #
 # $FreeBSD$
-# $Id: Makefile,v 1.38 2004/01/12 18:00:21 patrick Exp $
+# $$Id: Makefile,v 1.41 2004/02/05 18:29:10 patrick Exp $
 #
 
 PORTNAME=	lilypond
-PORTVERSION=	2.1.8
-PORTREVISION=	1
+PORTVERSION=	2.1.19
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/v2.1/ \
 		http://www.atabersk.de/lilypond/
@@ -23,7 +22,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
-MAN1=	abc2ly.1 as2text.1 convert-ly.1 etf2ly.1 lilypond.1 lilypond-bin.1 \
+MAN1=	abc2ly.1 convert-ly.1 etf2ly.1 lilypond.1 lilypond-bin.1 \
 	lilypond-book.1 midi2ly.1 mup2ly.1 musedata2ly.1 pmx2ly.1
 INFO=		lilypond lilypond-internals music-glossary
 
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index 1bf20f15ff26..cf1d791e5d45 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1 +1 @@
-MD5 (lilypond-2.1.8.tar.gz) = c35bc3a79b4b2358a9b1d93380806f44
+MD5 (lilypond-2.1.19.tar.gz) = d1b9616e6f408c03f7ec74798684a5fe
diff --git a/print/lilypond-devel/files/patch-lily:parser.yy b/print/lilypond-devel/files/patch-lily:parser.yy
new file mode 100644
index 000000000000..0fbf916f4b42
--- /dev/null
+++ b/print/lilypond-devel/files/patch-lily:parser.yy
@@ -0,0 +1,11 @@
+--- lily/parser.yy.orig	Thu Feb  5 19:50:36 2004
++++ lily/parser.yy	Thu Feb  5 19:50:42 2004
+@@ -893,7 +893,7 @@
+ 		scm_gc_unprotect_object ($2->self_scm ());
+ 		$$ = unsmob_music (res);
+ 		scm_gc_protect_object (res);
+-		$$->set_spot (THIS->here_input())
++		$$->set_spot (THIS->here_input());
+ 	}
+ 	| PARTCOMBINE Music Music {
+ 		static SCM proc;
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index 85b1b58bf2b5..5b911f82514c 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -2,7 +2,6 @@ bin/convert-ly
 bin/lilypond-book
 bin/lilypond
 bin/abc2ly
-bin/as2text
 bin/etf2ly
 bin/musedata2ly
 bin/pmx2ly
@@ -90,7 +89,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/figured-bass-alternate.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/fill-a4.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/gourlay.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/test/follow-thread.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/force-hshift.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/gregorian-scripts.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/harmonic.ly
@@ -112,13 +110,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/no-staff.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/nested-groups.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/no-bar-lines.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/test/octave-duplicate.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/ossia.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/part-combine.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/test/part-combine-moments.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/test/part-combine-staff.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/partial-blank.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/test/pedal.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/phrasing-slur-height.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/polymetric-differing-notes.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/test/polymetric.ly
@@ -199,6 +193,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/auto-beam-triplet.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/auto-beam-tuplets.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/auto-change.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/balloon.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/bar-number.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/bar-scripts.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/beam-auto-knee.ly
@@ -301,21 +296,22 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/hairpin-ending.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/hara-kiri-pianostaff.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/instrument-name.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/markup-user.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/mensural.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/instrument-name-markup.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/instrument-name-partial.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/key-clefs.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/key-signature-scordatura.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-combine.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-combine-new.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-combine-polyphonic.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-extender.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-extender-broken.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-hyphen.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-phrasing.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyric-phrasing-new.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyrics-bar.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyrics-extender.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyrics-melisma-beam.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/lyrics-multi-stanza.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/markup-note.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/markup-stack.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/measure-grouping.ly
@@ -334,18 +330,22 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/non-empty-text.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/note-group-bracket.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/note-head-chord.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/note-head-harmonic.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/note-head-style.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/note-line.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rehearsal-mark-letter.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rehearsal-mark-number.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rest.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rest-collision-beam.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/number-staff-lines.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/ottava-broken.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/pc-mmrest.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/pc-switch-slur.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/part-combine-global.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/pedal-bracket.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/pedal-ped.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/phrasing-slur.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/prefatory-empty-spacing.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/prefatory-spacing-matter.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/property-once.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rehearsal-mark.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-fold.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-line-break.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-percent.ly
@@ -354,7 +354,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-unfold-all.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-unfold.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-volta.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/repeat-volta-skip-alternatives.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rest-collision-default.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/rest-collision.ly
@@ -404,6 +403,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/spacing-very-tight.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/span-bar.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/staccato-pos.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/staff-mixed-size.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/staff-tweak.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/stanza-number.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/stem-direction.ly
@@ -412,19 +412,21 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/stem-tremolo.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/system-extents.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/system-start-bracket.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tablature.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tag-filter.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/text-spanner.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-accidental.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-break-accidental.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-busy-grobs.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-chord.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-chord-partial.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-dots.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tie-grace.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplet-beam.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplet-nest.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplet-properties.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplet-rest.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplet-slope.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplets.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/tuplet-staffline-collision.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/regression/voice-follower.ly
@@ -448,7 +450,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/parse4.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/parse5.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/parse.ly
-%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/pc-direction.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/textcresc.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/ascii-art/as1.ly
 %%CONDITIONAL%%%%EXAMPLESDIR%%/ascii-art/as2.ly
@@ -489,7 +490,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/recording.ly
 %%DATADIR%%/%%PORTVERSION%%/python/lilylib.py
 %%DATADIR%%/%%PORTVERSION%%/python/lilylib.pyc
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as-braces9.af
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-accordion.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-autometric.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-banier.mf
@@ -514,12 +514,8 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din14.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din17.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din19.mf
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din4.mf
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din5.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din6.mf
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din7.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din8.mf
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-din9.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-eindelijk.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-generic.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/feta-haak.mf
@@ -586,17 +582,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan14.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan16.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan18.mf
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan19.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan20.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan23.mf
 %%DATADIR%%/%%PORTVERSION%%/fonts/source/parmesan26.mf
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as-braces5.af
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as-dummy.af
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as-dummy1.af
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as-number1.af
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as-number4.af
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as5.af
-%%DATADIR%%/%%PORTVERSION%%/fonts/source/as9.af
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta11.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta13.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta14.afm
@@ -621,12 +609,8 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din14.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din17.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din19.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din4.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din5.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din6.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din7.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din8.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-din9.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer10.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer11.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer12.afm
@@ -636,7 +620,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer23.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer26.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer4.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as5.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer5.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer6.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/feta-nummer7.afm
@@ -646,17 +629,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan14.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan16.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan18.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan19.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan20.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan23.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/afm/parmesan26.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as-braces5.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as-braces9.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as-dummy.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as-dummy1.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as-number1.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as-number4.afm
-%%DATADIR%%/%%PORTVERSION%%/fonts/afm/as9.afm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta11.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta13.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta14.tfm
@@ -681,12 +656,8 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din14.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din17.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din19.tfm
-%%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din4.tfm
-%%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din5.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din6.tfm
-%%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din7.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din8.tfm
-%%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-din9.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-nummer10.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-nummer11.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/feta-nummer12.tfm
@@ -705,7 +676,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan14.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan16.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan18.tfm
-%%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan19.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan20.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan23.tfm
 %%DATADIR%%/%%PORTVERSION%%/fonts/tfm/parmesan26.tfm
@@ -734,12 +704,8 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din14.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din17.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din19.pfa
-%%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din4.pfa
-%%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din5.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din6.pfa
-%%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din7.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din8.pfa
-%%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-din9.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-nummer10.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-nummer11.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/feta-nummer12.pfa
@@ -759,7 +725,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan14.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan16.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan18.pfa
-%%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan19.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan20.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan23.pfa
 %%DATADIR%%/%%PORTVERSION%%/fonts/type1/parmesan26.pfa
@@ -787,12 +752,8 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-din14.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-din17.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-din19.tex
-%%DATADIR%%/%%PORTVERSION%%/tex/feta-din4.tex
-%%DATADIR%%/%%PORTVERSION%%/tex/feta-din5.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-din6.tex
-%%DATADIR%%/%%PORTVERSION%%/tex/feta-din7.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-din8.tex
-%%DATADIR%%/%%PORTVERSION%%/tex/feta-din9.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-nummer10.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-nummer11.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/feta-nummer12.tex
@@ -812,7 +773,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/tex/parmesan14.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/parmesan16.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/parmesan18.tex
-%%DATADIR%%/%%PORTVERSION%%/tex/parmesan19.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/parmesan20.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/parmesan23.tex
 %%DATADIR%%/%%PORTVERSION%%/tex/parmesan26.tex
@@ -852,26 +812,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/ly/midi-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/nederlands.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/norsk.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper-as5-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper-as5.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper-as9-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper-as9.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper11-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper11.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper13-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper13.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper16-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper16.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper19-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper19.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper20-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper20.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper23-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper23.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper26-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/paper26.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/params-as-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/params-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/part-paper-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/performer-init.ly
@@ -907,14 +847,12 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/scm/document-translation.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/documentation-generate.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/documentation-lib.scm
-%%DATADIR%%/%%PORTVERSION%%/scm/drums.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/font.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/lily.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/midi.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/molecule.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/music-functions.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/new-markup.scm
-%%DATADIR%%/%%PORTVERSION%%/scm/output-ascii-script.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/output-lib.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/output-pdf.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/output-pdftex.scm
@@ -922,14 +860,12 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/scm/output-sketch.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/output-sodipodi.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/output-tex.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/paper.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/script.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/slur.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/standalone.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/to-xml.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm
-%%DATADIR%%/%%PORTVERSION%%/make/asciifont-rules.make
-%%DATADIR%%/%%PORTVERSION%%/make/asciifont-targets.make
-%%DATADIR%%/%%PORTVERSION%%/make/asciifont-vars.make
 %%DATADIR%%/%%PORTVERSION%%/make/generic-rules.make
 %%DATADIR%%/%%PORTVERSION%%/make/generic-targets.make
 %%DATADIR%%/%%PORTVERSION%%/make/generic-vars.make
@@ -969,6 +905,71 @@ share/locale/ja/LC_MESSAGES/lilypond.mo
 share/locale/nl/LC_MESSAGES/lilypond.mo
 share/locale/ru/LC_MESSAGES/lilypond.mo
 share/locale/sv/LC_MESSAGES/lilypond.mo
+%%CONDITIONAL%%%%EXAMPLESDIR%%/test/lyrics-skip-notes.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/test/text-rotate.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/collision-dots-move.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/new-markup-scheme.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/dos-guile.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/dos-ps.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/dos-tex.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/safe-guile.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/safe-include.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/safe-ps.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/no-notation/safe-tex.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta11list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta13list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta14list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta16list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta18list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta20list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta23list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta26list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces00list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces10list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces20list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces30list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces40list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces50list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces60list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces70list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-braces80list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din10list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din11list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din12list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din13list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din14list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din17list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din19list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din6list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-din8list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer10list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer11list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer12list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer13list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer16list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer20list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer23list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer26list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer4list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer5list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer6list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer7list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/feta-nummer8list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan11list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan13list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan14list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan16list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan18list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan20list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan23list.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/parmesan26list.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/test/follow-voice.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/part-combine-a2.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/part-combine.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/part-combine-solo-global.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/part-combine-solo.ly
+%%CONDITIONAL%%%%EXAMPLESDIR%%/regression/part-combine-text.ly
+%%DATADIR%%/%%PORTVERSION%%/scm/part-combiner.scm
 @unexec rm -f %D/%%DATADIR%%/%%PORTVERSION%%/ls-R 2>&1 >/dev/null || true
 @dirrm lib/lilypond/%%PORTVERSION%%/python
 @dirrm lib/lilypond/%%PORTVERSION%%