diff options
| -rw-r--r-- | print/lilypond/Makefile | 33 | ||||
| -rw-r--r-- | print/lilypond/PLIST | 32 | ||||
| -rw-r--r-- | print/lilypond/distinfo | 16 | ||||
| -rw-r--r-- | print/lilypond/patches/patch-aa | 4 | ||||
| -rw-r--r-- | print/lilypond/patches/patch-ab | 8 | ||||
| -rw-r--r-- | print/lilypond/patches/patch-ac | 4 | ||||
| -rw-r--r-- | print/lilypond/patches/patch-lily_music-sequence.cc | 29 | ||||
| -rw-r--r-- | print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh | 15 |
8 files changed, 86 insertions, 55 deletions
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 5e0751a53b1..205dc4f947f 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.86 2012/12/15 10:01:20 marino Exp $ +# $NetBSD: Makefile,v 1.87 2013/01/25 11:32:07 wiz Exp $ # -DISTNAME= lilypond-2.14.2 -PKGREVISION= 11 +DISTNAME= lilypond-2.16.2 CATEGORIES= print -MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.14/ +MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.16/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://lilypond.org/ @@ -13,14 +12,29 @@ LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= tex-metafont-[0-9]*:../../fonts/tex-metafont BUILD_DEPENDS+= tex-metapost-[0-9]*:../../graphics/tex-metapost +BUILD_DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts +BUILD_DEPENDS+= intlfonts-[0-9]*:../../fonts/intlfonts +BUILD_DEPENDS+= font-cronyx-cyrillic-[0-9]*:../../fonts/font-cronyx-cyrillic +BUILD_DEPENDS+= kochi-ttf-[0-9]*:../../fonts/kochi-ttf +BUILD_DEPENDS+= fontforge>=20060125:../../fonts/fontforge +BUILD_DEPENDS+= t1utils>=1.33:../../fonts/t1utils +BUILD_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex +BUILD_DEPENDS+= rsync-[0-9]*:../../net/rsync +# pngtopnm +BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm +# convert +BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick + +DEPENDS+= tex-cyrillic-[0-9]*:../../print/tex-cyrillic +DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss +DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics -DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_LANGUAGES= c c++ USE_TOOLS+= bison gmake gs:run makeinfo perl pkg-config msgfmt -USE_TOOLS+= texi2html +USE_TOOLS+= texi2html zip MAKE_FILE= GNUmakefile .include "../../mk/bsd.prefs.mk" @@ -32,14 +46,11 @@ GNU_CONFIGURE_INFODIR= ${PREFIX}/${PKGINFODIR} INFO_DIR= ${GNU_CONFIGURE_INFODIR} INFO_FILES= YES -BUILD_DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts -BUILD_DEPENDS+= fontforge>=20060125:../../fonts/fontforge -BUILD_DEPENDS+= t1utils>=1.33:../../fonts/t1utils -CONFIGURE_ARGS+= --with-ncsb-dir=${LOCALBASE}/share/fonts/urw CONFIGURE_ARGS+= --disable-optimising +CONFIGURE_ARGS+= --with-ncsb-dir=${PREFIX}/share/fonts/urw CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -REPLACE_PYTHON+= scripts/auxiliar/yyout2grammar.py +REPLACE_PYTHON+= scripts/build/yyout2grammar.py PLIST_SUBST+= PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//} # 1.7 coredumps when generating eps files diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST index 39702f21bfa..4a7fa6c5302 100644 --- a/print/lilypond/PLIST +++ b/print/lilypond/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2011/07/31 09:12:46 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.17 2013/01/25 11:32:07 wiz Exp $ bin/abc2ly bin/convert-ly bin/etf2ly @@ -70,11 +70,19 @@ share/lilypond/${PKGVERSION}/fonts/source/feta-brackettips.mf share/lilypond/${PKGVERSION}/fonts/source/feta-clefs.mf share/lilypond/${PKGVERSION}/fonts/source/feta-dots.mf share/lilypond/${PKGVERSION}/fonts/source/feta-dynamics.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags-generic.mf share/lilypond/${PKGVERSION}/fonts/source/feta-flags.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags11.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags13.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags14.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags16.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags18.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags20.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags23.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-flags26.mf share/lilypond/${PKGVERSION}/fonts/source/feta-generic.mf share/lilypond/${PKGVERSION}/fonts/source/feta-macros.mf share/lilypond/${PKGVERSION}/fonts/source/feta-noteheads-generic.mf -share/lilypond/${PKGVERSION}/fonts/source/feta-noteheads-test-generic.mf share/lilypond/${PKGVERSION}/fonts/source/feta-noteheads.mf share/lilypond/${PKGVERSION}/fonts/source/feta-noteheads11.mf share/lilypond/${PKGVERSION}/fonts/source/feta-noteheads13.mf @@ -96,6 +104,7 @@ share/lilypond/${PKGVERSION}/fonts/source/feta-test16.mf share/lilypond/${PKGVERSION}/fonts/source/feta-test20.mf share/lilypond/${PKGVERSION}/fonts/source/feta-test23.mf share/lilypond/${PKGVERSION}/fonts/source/feta-test26.mf +share/lilypond/${PKGVERSION}/fonts/source/feta-ties.mf share/lilypond/${PKGVERSION}/fonts/source/feta-timesignatures.mf share/lilypond/${PKGVERSION}/fonts/source/feta-trills.mf share/lilypond/${PKGVERSION}/fonts/source/feta11.mf @@ -113,7 +122,16 @@ 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-macros.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads-generic.mf share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads11.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads13.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads14.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads16.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads18.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads20.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads23.mf +share/lilypond/${PKGVERSION}/fonts/source/parmesan-noteheads26.mf share/lilypond/${PKGVERSION}/fonts/source/parmesan-rests.mf share/lilypond/${PKGVERSION}/fonts/source/parmesan-scripts.mf share/lilypond/${PKGVERSION}/fonts/source/parmesan-timesignatures.mf @@ -151,6 +169,7 @@ share/lilypond/${PKGVERSION}/ly/bagpipe.ly share/lilypond/${PKGVERSION}/ly/catalan.ly share/lilypond/${PKGVERSION}/ly/chord-modifiers-init.ly share/lilypond/${PKGVERSION}/ly/chord-repetition-init.ly +share/lilypond/${PKGVERSION}/ly/context-mods-init.ly share/lilypond/${PKGVERSION}/ly/declarations-init.ly share/lilypond/${PKGVERSION}/ly/deutsch.ly share/lilypond/${PKGVERSION}/ly/drumpitch-init.ly @@ -158,6 +177,7 @@ 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/event-listener.ly share/lilypond/${PKGVERSION}/ly/festival.ly share/lilypond/${PKGVERSION}/ly/generate-documentation.ly share/lilypond/${PKGVERSION}/ly/generate-interface-doc-init.ly @@ -183,11 +203,13 @@ share/lilypond/${PKGVERSION}/ly/predefined-mandolin-fretboards.ly share/lilypond/${PKGVERSION}/ly/predefined-ukulele-fretboards.ly share/lilypond/${PKGVERSION}/ly/property-init.ly share/lilypond/${PKGVERSION}/ly/scale-definitions-init.ly +share/lilypond/${PKGVERSION}/ly/scheme-sandbox.ly share/lilypond/${PKGVERSION}/ly/script-init.ly share/lilypond/${PKGVERSION}/ly/spanners-init.ly share/lilypond/${PKGVERSION}/ly/string-tunings-init.ly share/lilypond/${PKGVERSION}/ly/suomi.ly share/lilypond/${PKGVERSION}/ly/svenska.ly +share/lilypond/${PKGVERSION}/ly/text-replacements.ly share/lilypond/${PKGVERSION}/ly/titling-init.ly share/lilypond/${PKGVERSION}/ly/toc-init.ly share/lilypond/${PKGVERSION}/ly/vlaams.ly @@ -224,6 +246,7 @@ share/lilypond/${PKGVERSION}/python/safeeval.pyc share/lilypond/${PKGVERSION}/scm/auto-beam.scm share/lilypond/${PKGVERSION}/scm/autochange.scm share/lilypond/${PKGVERSION}/scm/backend-library.scm +share/lilypond/${PKGVERSION}/scm/bar-line.scm share/lilypond/${PKGVERSION}/scm/bezier-tools.scm share/lilypond/${PKGVERSION}/scm/c++.scm share/lilypond/${PKGVERSION}/scm/chord-entry.scm @@ -248,6 +271,7 @@ share/lilypond/${PKGVERSION}/scm/define-woodwind-diagrams.scm share/lilypond/${PKGVERSION}/scm/display-lily.scm share/lilypond/${PKGVERSION}/scm/display-woodwind-diagrams.scm share/lilypond/${PKGVERSION}/scm/document-backend.scm +share/lilypond/${PKGVERSION}/scm/document-context-mods.scm share/lilypond/${PKGVERSION}/scm/document-functions.scm share/lilypond/${PKGVERSION}/scm/document-identifiers.scm share/lilypond/${PKGVERSION}/scm/document-markup.scm @@ -277,6 +301,7 @@ share/lilypond/${PKGVERSION}/scm/lily-library.scm share/lilypond/${PKGVERSION}/scm/lily-sort.scm share/lilypond/${PKGVERSION}/scm/lily.scm share/lilypond/${PKGVERSION}/scm/ly-syntax-constructors.scm +share/lilypond/${PKGVERSION}/scm/markup-macros.scm share/lilypond/${PKGVERSION}/scm/markup.scm share/lilypond/${PKGVERSION}/scm/memory-trace.scm share/lilypond/${PKGVERSION}/scm/midi.scm @@ -295,12 +320,14 @@ 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/safe-utility-defs.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/tablature.scm +share/lilypond/${PKGVERSION}/scm/text.scm share/lilypond/${PKGVERSION}/scm/time-signature-settings.scm share/lilypond/${PKGVERSION}/scm/titling.scm share/lilypond/${PKGVERSION}/scm/to-xml.scm @@ -318,6 +345,7 @@ share/locale/cs/LC_MESSAGES/lilypond.mo share/locale/da/LC_MESSAGES/lilypond.mo share/locale/de/LC_MESSAGES/lilypond.mo share/locale/el/LC_MESSAGES/lilypond.mo +share/locale/eo/LC_MESSAGES/lilypond.mo share/locale/es/LC_MESSAGES/lilypond.mo share/locale/fi/LC_MESSAGES/lilypond.mo share/locale/fr/LC_MESSAGES/lilypond.mo diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo index 3556d55834a..57277699acf 100644 --- a/print/lilypond/distinfo +++ b/print/lilypond/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2012/12/25 15:30:14 wiz Exp $ +$NetBSD: distinfo,v 1.16 2013/01/25 11:32:07 wiz Exp $ -SHA1 (lilypond-2.14.2.tar.gz) = 0ea657bb184d9d6a2e3f6bca91e6b0d62a3a013e -RMD160 (lilypond-2.14.2.tar.gz) = 74123b2db40519feaf8144fd19becf3ad81738e7 -Size (lilypond-2.14.2.tar.gz) = 15224418 bytes -SHA1 (patch-aa) = 50b9029a067b3f324da497465c7b2e6a2384f3f0 -SHA1 (patch-ab) = 5f210ada53a5062da1173c257095ebddf407d67d -SHA1 (patch-ac) = d9565da9b315f2867882052d57394132d7e824a4 +SHA1 (lilypond-2.16.2.tar.gz) = 1eb3b0e5c117a8669dba19ab28f933351e51e39a +RMD160 (lilypond-2.16.2.tar.gz) = bbb68ef05e81d8d9f5cf7ac26cffb5ab3935c61a +Size (lilypond-2.16.2.tar.gz) = 16062982 bytes +SHA1 (patch-aa) = 99dc3ecc7df664fba71d850e6c0b253fc451ec61 +SHA1 (patch-ab) = 08bf158aed8f6cbaf11d054716069486cf393d6b +SHA1 (patch-ac) = ca7a8671885a40201f201431d2eb8a3377993c67 SHA1 (patch-configure) = b0c73d828f26fb8db895ace55a678a6d7b09db0e -SHA1 (patch-lily_music-sequence.cc) = 8f8c8ce78ae5a420065f7d084a9bcecfc707f322 +SHA1 (patch-scripts_auxiliar_cg-section.sh) = c6838a358ae1ea2f8ddd0791e72eb3c25ac2019b diff --git a/print/lilypond/patches/patch-aa b/print/lilypond/patches/patch-aa index 83587518661..d57fa2ee425 100644 --- a/print/lilypond/patches/patch-aa +++ b/print/lilypond/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2009/06/03 19:52:33 hasso Exp $ +$NetBSD: patch-aa,v 1.9 2013/01/25 11:32:08 wiz Exp $ + +Fix unportable test(1) construct. --- scripts/auxiliar/build-profile.sh.orig +++ scripts/auxiliar/build-profile.sh diff --git a/print/lilypond/patches/patch-ab b/print/lilypond/patches/patch-ab index 77c8dc91b31..a78b995342f 100644 --- a/print/lilypond/patches/patch-ab +++ b/print/lilypond/patches/patch-ab @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.3 2008/06/18 20:29:32 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2013/01/25 11:32:08 wiz Exp $ ---- GNUmakefile.in.orig 2007-09-19 16:21:55.000000000 +0200 +Do not install emacs lisp files. + +--- GNUmakefile.in.orig 2013-01-04 13:41:57.000000000 +0000 +++ GNUmakefile.in -@@ -7,7 +7,7 @@ SUBDIRS = buildscripts python scripts \ +@@ -7,7 +7,7 @@ SUBDIRS = python scripts \ mf ly \ tex ps scm \ po make \ diff --git a/print/lilypond/patches/patch-ac b/print/lilypond/patches/patch-ac index 524b92731b2..55e6c6ffeb6 100644 --- a/print/lilypond/patches/patch-ac +++ b/print/lilypond/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2009/06/03 19:52:33 hasso Exp $ +$NetBSD: patch-ac,v 1.4 2013/01/25 11:32:08 wiz Exp $ + +Fix unportable test(1) construct. --- scripts/auxiliar/build-coverage.sh.orig +++ scripts/auxiliar/build-coverage.sh diff --git a/print/lilypond/patches/patch-lily_music-sequence.cc b/print/lilypond/patches/patch-lily_music-sequence.cc deleted file mode 100644 index 5d7a406a70c..00000000000 --- a/print/lilypond/patches/patch-lily_music-sequence.cc +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-lily_music-sequence.cc,v 1.1 2012/12/15 10:01:20 marino Exp $ - -Broken on gcc4.6+, patch taken from upstream (2011-12-09): - Fix issue 2089: dangerous redefinition of SCM s / Moment s - ---- lily/music-sequence.cc.orig 2011-07-25 22:42:15.000000000 +0000 -+++ lily/music-sequence.cc -@@ -143,17 +143,15 @@ Music_sequence::minimum_start (SCM l) - Moment - Music_sequence::first_start (SCM l) - { -- Moment m; - - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) - { - Music *mus = unsmob_music (scm_car (s)); -- Moment l = mus->get_length (); -- Moment s = mus->start_mom (); -- if (l.to_bool () || s.to_bool ()) -- return s; -+ Moment start = mus->start_mom (); -+ if (mus->get_length ().to_bool() || start.to_bool()) -+ return start; - } -- return m; -+ return Moment (); - } - - MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); diff --git a/print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh b/print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh new file mode 100644 index 00000000000..db23dd08a71 --- /dev/null +++ b/print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-scripts_auxiliar_cg-section.sh,v 1.1 2013/01/25 11:32:08 wiz Exp $ + +Fix unportable test(1) construct. + +--- scripts/auxiliar/cg-section.sh.orig 2013-01-04 13:41:56.000000000 +0000 ++++ scripts/auxiliar/cg-section.sh +@@ -31,7 +31,7 @@ EOF + exit "$1" + } + +-if [ "$1" == '-h' ] || [ "$1" == '--help' ]; then ++if [ "$1" = '-h' ] || [ "$1" = '--help' ]; then + usage 0 + fi + |