Update to 2.12.2. The list of upstream changes is too massive to put it

here (almost two years of development).

http://lilypond.org/doc/v2.12/Documentation/topdocs/NEWS.html has nice list
of new features.

6 files changed, 114 insertions, 117 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 306ec8856c8..5e7e8a54010 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2009/05/20 00:58:26 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2009/06/03 19:52:33 hasso Exp $
 #
 
-DISTNAME=	lilypond-2.10.33
-PKGREVISION=	3
+DISTNAME=	lilypond-2.12.2
 CATEGORIES=	print
-MASTER_SITES=	http://lilypond.org/download/sources/v2.10/
+MASTER_SITES=	http://lilypond.org/download/sources/v2.12/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://lilypond.org/web/
@@ -24,7 +23,7 @@ MAKE_FILE=		GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
 
-TEXINFO_REQD=		4.8
+TEXINFO_REQD=		4.11
 GCC_REQD+=		3.0.5
 
 GNU_CONFIGURE_INFODIR=	${PREFIX}/${PKGINFODIR}
diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST
index 26f47fa08e0..9ba8208c9a1 100644
--- a/print/lilypond/PLIST
+++ b/print/lilypond/PLIST
@@ -1,22 +1,39 @@
-@comment $NetBSD: PLIST,v 1.13 2008/06/18 20:29:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/06/03 19:52:33 hasso Exp $
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly
+bin/lilymidi
 bin/lilypond
 bin/lilypond-book
 bin/lilypond-invoke-editor
+bin/lilysong
 bin/midi2ly
 bin/musicxml2ly
-info/lilypond/lilypond-internals.info
-info/lilypond/lilypond.info
-info/lilypond/music-glossary.info
+info/lilypond-internals.info
+info/lilypond-internals.info-1
+info/lilypond-internals.info-2
+info/lilypond-internals.info-3
+info/lilypond-internals.info-4
+info/lilypond-learning.info
+info/lilypond-learning.info-1
+info/lilypond-learning.info-2
+info/lilypond-program.info
+info/lilypond.info
+info/lilypond.info-1
+info/lilypond.info-2
+info/lilypond.info-3
+info/lilypond.info-4
+info/lilypond.info-5
+info/music-glossary.info
 lib/lilypond/${PKGVERSION}/python/midi.so
 man/man1/abc2ly.1
 man/man1/convert-ly.1
 man/man1/etf2ly.1
+man/man1/lilymidi.1
 man/man1/lilypond-book.1
 man/man1/lilypond-invoke-editor.1
 man/man1/lilypond.1
+man/man1/lilysong.1
 man/man1/midi2ly.1
 man/man1/musicxml2ly.1
 share/lilypond/${PKGVERSION}/dvips/ps
@@ -93,6 +110,7 @@ share/lilypond/${PKGVERSION}/fonts/source/parmesan-dots.mf
 share/lilypond/${PKGVERSION}/fonts/source/parmesan-flags.mf
 share/lilypond/${PKGVERSION}/fonts/source/parmesan-generic.mf
 share/lilypond/${PKGVERSION}/fonts/source/parmesan-heads.mf
+share/lilypond/${PKGVERSION}/fonts/source/parmesan-macros.mf
 share/lilypond/${PKGVERSION}/fonts/source/parmesan-rests.mf
 share/lilypond/${PKGVERSION}/fonts/source/parmesan-scripts.mf
 share/lilypond/${PKGVERSION}/fonts/source/parmesan-timesig.mf
@@ -113,75 +131,42 @@ share/lilypond/${PKGVERSION}/fonts/svg/emmentaler-18.svg
 share/lilypond/${PKGVERSION}/fonts/svg/emmentaler-20.svg
 share/lilypond/${PKGVERSION}/fonts/svg/emmentaler-23.svg
 share/lilypond/${PKGVERSION}/fonts/svg/emmentaler-26.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet11.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet13.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet14.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet16.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet18.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet20.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet23.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-alphabet26.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-a.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-b.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-c.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-d.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-e.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-f.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-g.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-h.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta-braces-i.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta11.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta13.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta14.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta16.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta18.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta20.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta23.svg
-share/lilypond/${PKGVERSION}/fonts/svg/feta26.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan11.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan13.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan14.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan16.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan18.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan20.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan23.svg
-share/lilypond/${PKGVERSION}/fonts/svg/parmesan26.svg
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet11.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet13.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet14.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet16.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet18.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet20.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet23.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet26.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-a.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-b.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-c.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-d.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-e.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-f.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-g.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-h.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-i.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta11.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta13.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta14.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta16.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta18.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta20.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta23.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/feta26.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan11.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan13.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan14.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan16.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan18.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan20.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan23.pfa
-share/lilypond/${PKGVERSION}/fonts/type1/parmesan26.pfa
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet11.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet13.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet14.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet16.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet18.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet20.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet23.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-alphabet26.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-a.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-b.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-c.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-d.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-e.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-f.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-g.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-h.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta-braces-i.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta11.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta13.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta14.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta16.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta18.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta20.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta23.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/feta26.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan11.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan13.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan14.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan16.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan18.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan20.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan23.pfb
+share/lilypond/${PKGVERSION}/fonts/type1/parmesan26.pfb
 share/lilypond/${PKGVERSION}/ly/Welcome-to-LilyPond-MacOS.ly
 share/lilypond/${PKGVERSION}/ly/Welcome_to_LilyPond.ly
-share/lilypond/${PKGVERSION}/ly/accordion-defs-init.ly
+share/lilypond/${PKGVERSION}/ly/arabic.ly
 share/lilypond/${PKGVERSION}/ly/bagpipe.ly
 share/lilypond/${PKGVERSION}/ly/catalan.ly
 share/lilypond/${PKGVERSION}/ly/chord-modifiers-init.ly
@@ -192,21 +177,28 @@ share/lilypond/${PKGVERSION}/ly/dynamic-scripts-init.ly
 share/lilypond/${PKGVERSION}/ly/english.ly
 share/lilypond/${PKGVERSION}/ly/engraver-init.ly
 share/lilypond/${PKGVERSION}/ly/espanol.ly
+share/lilypond/${PKGVERSION}/ly/festival.ly
 share/lilypond/${PKGVERSION}/ly/generate-documentation.ly
 share/lilypond/${PKGVERSION}/ly/generate-interface-doc-init.ly
 share/lilypond/${PKGVERSION}/ly/grace-init.ly
-share/lilypond/${PKGVERSION}/ly/gregorian-init.ly
+share/lilypond/${PKGVERSION}/ly/graphviz-init.ly
+share/lilypond/${PKGVERSION}/ly/gregorian.ly
 share/lilypond/${PKGVERSION}/ly/init.ly
 share/lilypond/${PKGVERSION}/ly/italiano.ly
 share/lilypond/${PKGVERSION}/ly/lilypond-book-preamble.ly
+share/lilypond/${PKGVERSION}/ly/makam.ly
+share/lilypond/${PKGVERSION}/ly/markup-init.ly
 share/lilypond/${PKGVERSION}/ly/midi-init.ly
 share/lilypond/${PKGVERSION}/ly/music-functions-init.ly
 share/lilypond/${PKGVERSION}/ly/nederlands.ly
 share/lilypond/${PKGVERSION}/ly/norsk.ly
-share/lilypond/${PKGVERSION}/ly/paper-defaults.ly
+share/lilypond/${PKGVERSION}/ly/paper-defaults-init.ly
 share/lilypond/${PKGVERSION}/ly/params-init.ly
 share/lilypond/${PKGVERSION}/ly/performer-init.ly
 share/lilypond/${PKGVERSION}/ly/portugues.ly
+share/lilypond/${PKGVERSION}/ly/predefined-fretboards-init.ly
+share/lilypond/${PKGVERSION}/ly/predefined-guitar-fretboards.ly
+share/lilypond/${PKGVERSION}/ly/predefined-guitar-ninth-fretboards.ly
 share/lilypond/${PKGVERSION}/ly/property-init.ly
 share/lilypond/${PKGVERSION}/ly/scale-definitions-init.ly
 share/lilypond/${PKGVERSION}/ly/script-init.ly
@@ -214,6 +206,7 @@ share/lilypond/${PKGVERSION}/ly/spanners-init.ly
 share/lilypond/${PKGVERSION}/ly/suomi.ly
 share/lilypond/${PKGVERSION}/ly/svenska.ly
 share/lilypond/${PKGVERSION}/ly/titling-init.ly
+share/lilypond/${PKGVERSION}/ly/toc-init.ly
 share/lilypond/${PKGVERSION}/ly/vlaams.ly
 share/lilypond/${PKGVERSION}/ps/lilyponddefs.ps
 share/lilypond/${PKGVERSION}/ps/music-drawing-routines.ps
@@ -221,6 +214,8 @@ share/lilypond/${PKGVERSION}/python/convertrules.py
 share/lilypond/${PKGVERSION}/python/convertrules.pyc
 share/lilypond/${PKGVERSION}/python/fontextract.py
 share/lilypond/${PKGVERSION}/python/fontextract.pyc
+share/lilypond/${PKGVERSION}/python/langdefs.py
+share/lilypond/${PKGVERSION}/python/langdefs.pyc
 share/lilypond/${PKGVERSION}/python/lilylib.py
 share/lilypond/${PKGVERSION}/python/lilylib.pyc
 share/lilypond/${PKGVERSION}/python/musicexp.py
@@ -240,6 +235,7 @@ share/lilypond/${PKGVERSION}/scm/chord-generic-names.scm
 share/lilypond/${PKGVERSION}/scm/chord-ignatzek-names.scm
 share/lilypond/${PKGVERSION}/scm/chord-name.scm
 share/lilypond/${PKGVERSION}/scm/clip-region.scm
+share/lilypond/${PKGVERSION}/scm/coverage.scm
 share/lilypond/${PKGVERSION}/scm/define-context-properties.scm
 share/lilypond/${PKGVERSION}/scm/define-event-classes.scm
 share/lilypond/${PKGVERSION}/scm/define-grob-interfaces.scm
@@ -253,6 +249,7 @@ share/lilypond/${PKGVERSION}/scm/define-stencil-commands.scm
 share/lilypond/${PKGVERSION}/scm/display-lily.scm
 share/lilypond/${PKGVERSION}/scm/document-backend.scm
 share/lilypond/${PKGVERSION}/scm/document-functions.scm
+share/lilypond/${PKGVERSION}/scm/document-identifiers.scm
 share/lilypond/${PKGVERSION}/scm/document-markup.scm
 share/lilypond/${PKGVERSION}/scm/document-music.scm
 share/lilypond/${PKGVERSION}/scm/document-translation.scm
@@ -261,17 +258,17 @@ share/lilypond/${PKGVERSION}/scm/documentation-lib.scm
 share/lilypond/${PKGVERSION}/scm/editor.scm
 share/lilypond/${PKGVERSION}/scm/encoding.scm
 share/lilypond/${PKGVERSION}/scm/file-cache.scm
+share/lilypond/${PKGVERSION}/scm/flag-styles.scm
 share/lilypond/${PKGVERSION}/scm/font.scm
 share/lilypond/${PKGVERSION}/scm/framework-eps.scm
-share/lilypond/${PKGVERSION}/scm/framework-gnome.scm
 share/lilypond/${PKGVERSION}/scm/framework-null.scm
 share/lilypond/${PKGVERSION}/scm/framework-ps.scm
 share/lilypond/${PKGVERSION}/scm/framework-scm.scm
 share/lilypond/${PKGVERSION}/scm/framework-socket.scm
 share/lilypond/${PKGVERSION}/scm/framework-svg.scm
-share/lilypond/${PKGVERSION}/scm/framework-tex.scm
-share/lilypond/${PKGVERSION}/scm/framework-texstr.scm
 share/lilypond/${PKGVERSION}/scm/fret-diagrams.scm
+share/lilypond/${PKGVERSION}/scm/graphviz.scm
+share/lilypond/${PKGVERSION}/scm/harp-pedals.scm
 share/lilypond/${PKGVERSION}/scm/kpathsea.scm
 share/lilypond/${PKGVERSION}/scm/layout-beam.scm
 share/lilypond/${PKGVERSION}/scm/layout-page-dump.scm
@@ -282,32 +279,31 @@ share/lilypond/${PKGVERSION}/scm/lily.scm
 share/lilypond/${PKGVERSION}/scm/ly-syntax-constructors.scm
 share/lilypond/${PKGVERSION}/scm/markup.scm
 share/lilypond/${PKGVERSION}/scm/midi.scm
+share/lilypond/${PKGVERSION}/scm/memory-trace.scm
 share/lilypond/${PKGVERSION}/scm/music-functions.scm
-share/lilypond/${PKGVERSION}/scm/output-gnome.scm
 share/lilypond/${PKGVERSION}/scm/output-lib.scm
 share/lilypond/${PKGVERSION}/scm/output-ps.scm
 share/lilypond/${PKGVERSION}/scm/output-socket.scm
 share/lilypond/${PKGVERSION}/scm/output-svg.scm
-share/lilypond/${PKGVERSION}/scm/output-tex.scm
-share/lilypond/${PKGVERSION}/scm/output-texstr.scm
 share/lilypond/${PKGVERSION}/scm/page.scm
 share/lilypond/${PKGVERSION}/scm/paper-system.scm
 share/lilypond/${PKGVERSION}/scm/paper.scm
 share/lilypond/${PKGVERSION}/scm/parser-clef.scm
 share/lilypond/${PKGVERSION}/scm/parser-ly-from-scheme.scm
 share/lilypond/${PKGVERSION}/scm/part-combiner.scm
+share/lilypond/${PKGVERSION}/scm/predefined-fretboards.scm
 share/lilypond/${PKGVERSION}/scm/ps-to-png.scm
 share/lilypond/${PKGVERSION}/scm/safe-lily.scm
 share/lilypond/${PKGVERSION}/scm/script.scm
+share/lilypond/${PKGVERSION}/scm/song-util.scm
+share/lilypond/${PKGVERSION}/scm/song.scm
 share/lilypond/${PKGVERSION}/scm/standalone.scm
 share/lilypond/${PKGVERSION}/scm/stencil.scm
 share/lilypond/${PKGVERSION}/scm/titling.scm
 share/lilypond/${PKGVERSION}/scm/to-xml.scm
 share/lilypond/${PKGVERSION}/scm/translation-functions.scm
 share/lilypond/${PKGVERSION}/scm/x11-color.scm
-share/lilypond/${PKGVERSION}/tex/lily-ps-defs.tex
 share/lilypond/${PKGVERSION}/tex/lilypond-tex-metrics.tex
-share/lilypond/${PKGVERSION}/tex/lilyponddefs.tex
 share/lilypond/${PKGVERSION}/vim/compiler/lilypond.vim
 share/lilypond/${PKGVERSION}/vim/ftdetect/lilypond.vim
 share/lilypond/${PKGVERSION}/vim/ftplugin/lilypond.vim
@@ -325,11 +321,16 @@ share/locale/it/LC_MESSAGES/lilypond.mo
 share/locale/ja/LC_MESSAGES/lilypond.mo
 share/locale/nl/LC_MESSAGES/lilypond.mo
 share/locale/ru/LC_MESSAGES/lilypond.mo
-share/locale/rw/LC_MESSAGES/lilypond.mo
 share/locale/sv/LC_MESSAGES/lilypond.mo
 share/locale/tr/LC_MESSAGES/lilypond.mo
+share/locale/uk/LC_MESSAGES/lilypond.mo
+share/locale/vi/LC_MESSAGES/lilypond.mo
 share/locale/zh_TW/LC_MESSAGES/lilypond.mo
 share/omf/lilypond/${PKGVERSION}/lilypond-internals.html.omf
+share/omf/lilypond/${PKGVERSION}/lilypond-learning.html.omf
+share/omf/lilypond/${PKGVERSION}/lilypond-learning.pdf.omf
+share/omf/lilypond/${PKGVERSION}/lilypond-program.html.omf
+share/omf/lilypond/${PKGVERSION}/lilypond-program.pdf.omf
 share/omf/lilypond/${PKGVERSION}/lilypond.html.omf
 share/omf/lilypond/${PKGVERSION}/lilypond.pdf.omf
 share/omf/lilypond/${PKGVERSION}/music-glossary.html.omf
@@ -358,4 +359,3 @@ share/omf/lilypond/${PKGVERSION}/music-glossary.pdf.omf
 @dirrm lib/lilypond/${PKGVERSION}/python
 @dirrm lib/lilypond/${PKGVERSION}
 @dirrm lib/lilypond
-@dirrm info/lilypond
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 90c2ce3b347..2f11a1c78c2 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2008/06/18 20:29:32 wiz Exp $
+$NetBSD: distinfo,v 1.11 2009/06/03 19:52:33 hasso Exp $
 
-SHA1 (lilypond-2.10.33.tar.gz) = 22717aa67723067f43208e7e771d6909f8db045f
-RMD160 (lilypond-2.10.33.tar.gz) = 589f9ab572b0a628141681424edebb1608528b86
-Size (lilypond-2.10.33.tar.gz) = 2660315 bytes
-SHA1 (patch-aa) = 6c212779b4b5b2e02280a58b5aed2e10b09f1150
+SHA1 (lilypond-2.12.2.tar.gz) = 92afe4ef926d966e7855f64ae93ee762f1fa5178
+RMD160 (lilypond-2.12.2.tar.gz) = 0ef1e1cbceb4fbf69a31b00a030ee40c4280091d
+Size (lilypond-2.12.2.tar.gz) = 4575983 bytes
+SHA1 (patch-aa) = 50b9029a067b3f324da497465c7b2e6a2384f3f0
 SHA1 (patch-ab) = 5f210ada53a5062da1173c257095ebddf407d67d
-SHA1 (patch-ae) = 7c39ff5b810d09f673e1156afd92da53cfb709f0
+SHA1 (patch-ac) = d9565da9b315f2867882052d57394132d7e824a4
diff --git a/print/lilypond/patches/patch-aa b/print/lilypond/patches/patch-aa
index d974e2a8fe5..83587518661 100644
--- a/print/lilypond/patches/patch-aa
+++ b/print/lilypond/patches/patch-aa
@@ -1,14 +1,12 @@
-$NetBSD: patch-aa,v 1.7 2008/06/18 20:29:32 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2009/06/03 19:52:33 hasso Exp $
 
---- configure.orig	2007-09-19 16:21:59.000000000 +0200
-+++ configure
-@@ -9213,7 +9213,8 @@ echo $ECHO_N "checking $r version... $EC
- echo "${ECHO_T}$ver" >&6; }
-     if test "$num" -lt "$req"; then
+--- scripts/auxiliar/build-profile.sh.orig
++++ scripts/auxiliar/build-profile.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
  
--    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 20050624 (installed: $ver)"\"`\"
-+    :
-+    #eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 20050624 (installed: $ver)"\"`\"
+-if test "$1" == "--fresh"; then
++if test "$1" = "--fresh"; then
+   fresh=yes
+ fi
  
-     fi
-     vervar="`echo FONTFORGE | tr 'a-z' 'A-Z'`_VERSION"
diff --git a/print/lilypond/patches/patch-ac b/print/lilypond/patches/patch-ac
new file mode 100644
index 00000000000..524b92731b2
--- /dev/null
+++ b/print/lilypond/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2009/06/03 19:52:33 hasso Exp $
+
+--- scripts/auxiliar/build-coverage.sh.orig
++++ scripts/auxiliar/build-coverage.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-if test "$1" == "--fresh"; then
++if test "$1" = "--fresh"; then
+   fresh=yes
+ fi
+ 
diff --git a/print/lilypond/patches/patch-ae b/print/lilypond/patches/patch-ae
deleted file mode 100644
index 7134f32e634..00000000000
--- a/print/lilypond/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/05/14 20:26:53 sborrill Exp $
-
---- buildscripts/build-profile.sh.orig	2008-05-13 20:37:59.000000000 +0100
-+++ buildscripts/build-profile.sh	2008-05-13 20:38:07.000000000 +0100
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--if test "$1" == "--fresh"; then
-+if test "$1" = "--fresh"; then
-   fresh=yes
- fi
-