diff options
| author | wiz <wiz> | 2014-01-05 22:29:47 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-01-05 22:29:47 +0000 |
| commit | 84cd14ef72002b221bd6536bf4d923d641bdc0f4 (patch) | |
| tree | 5b2ecefb748c8868538e1ecd817dcefcfbd9f163 /print | |
| parent | 32d9aad51a579c63e15f6994ea1be919f7b772fa (diff) | |
| download | pkgsrc-84cd14ef72002b221bd6536bf4d923d641bdc0f4.tar.gz | |
Update to 2.18.0:
New features in 2.18 since 2.16
*******************************
* There is now a new context type called `NullVoice' which, while not
appearing in the printed output, can be used to align lyrics.
This can be particularly convenient when used in parallel with a
`\partcombine' construct.
* Several articulations can be put into a single variable or
returned from an event function.
* The baseline of score markups is now taken from the reference
point (usually the middle of the staff) of the first bottom system
rather than the top of the bounding rectangle.
* LilyPond no longer automatically infers a `\defaultchild' context
in a context definition with `\accepts' clauses. Any context
definition without an explicit or inherited `\defaultchild'
definition counts as a `Bottom' context and will be eligible for
rhythmic events and overrides without causing the implicit
creation of other contexts. Be sure to specify a `\defaultchild'
for non-`Bottom' contexts when defining them from scratch.
* There is now extensive support for both discant and bass accordion
register symbols in the `scm accreg' module.
* New commands `markLengthOn' and `markLengthOff' control the
allowance of horizontal space for tempo and rehearsal marks.
* Rehearsal marks at the beginning of a line are now placed to the
right of the clef and key signature by default. As in previous
versions, the `break-alignable-interface' controls the behavior.
* Decimal numbers can now be written directly in music, without a
hash sign. Together with the previous change in the way object
properties are specified, the code to change the length of stems
has changed from this:
\override Stem #'length = #5.6
e' f' g' a'
to this:
\override Stem.length = 5.6
e' f' g' a'
One has to write a digit on both sides of the dot - values like
`4.' or `-.3' are not allowed.
Decimal fractions are also not accepted in `\chordmode'.
* A number of shorthands like `(', `)', `|', `[', `]', `~', `\(',
`\)' and others can now freely be redefined like normal commands.
* The articulation shorthand for `\staccatissimo' has been renamed
from `-|' to `-!'.
* Tempo change ranges are now written as `\tempo 4 = 60 - 68' rather
than `\tempo 4 = 60 ~ 68'.
* Grob `OctavateEight' was renamed to `ClefModifier'. Related
context properties were renamed from `xxxOctavationyyy' to
`xxxTranspositionyyy'.
* There is a new `\absolute' command explicitly marking music as
being entered in absolute pitch. While this has been the default
previously, an explicit `\absolute' also prevents reinterpretation
when the passage is placed inside of `\relative'.
* When `\relative' is used without an explicit reference pitch, the
reference pitch now is the middle of the first octave, making the
first entered pitch indistinguishable from absolute pitch.
Previously, omitting the reference pitch would have lead to a
default of `c''. Since that choice was somewhat arbitrary,
recommended usage was to always specify the reference pitch.
* A new command `\single' can be used for converting a property
override into a tweak to be applied on a single music expression.
* Two ways of letting graphical objects not appear in the output are
overriding its `transparent' property with `#t' (retaining the
original spacing) or overriding its `stencil' property with `#f'
(not using any space at all). Those two operations now have the
shorthands `\hide' and `\omit', respectively.
* A new command `\temporary' can be applied to overrides in order to
not have them replace previous property settings. If a `\revert'
is applied to the same property subsequently, the previous setting
reappears.
This is mainly useful for writing music functions that need to
have some property changed just for the duration of the function.
* `\tag', `\removeWithTag', and `\keepWithTag' can now accept a list
of symbols rather than just a single symbol for marking, removing,
and keeping music with any of multiple tags. This is particularly
important for `\keepWithTag' since one cannot achieve the same
effect by using multiple consecutive `\keepWithTag' commands.
* The `-d old-relative' option has been removed. Not actually
accessible from the command line any more, its remaining use was
for interpretating `\relative' in LilyPond files converted
automatically from version 1.8 or older. It is unclear how much
of this was actually still operative.
* The meaning of `instrumentTransposition' has been reversed. After
\set instrumentTransposition = #{ b #}
a written `c'' now sounds like `b'. Previously, this would have
been the other way round. This and the following change should
make dealing with transposing instruments more straightforward.
* The music generated by `\set' and `\override' commands is no
longer affected by `\transpose'. The main consequence is that
`\transpose' will transpose audible/concert pitch and printed
pitch by the same amount even when the transposed music contains
`\transposition'. Previously,
\transpose c' f' \transposition bes'
was equivalent to `\transposition f''. Now it stays equivalent to
`\transposition bes''.
* When checking for collisions, LilyPond no longer treats objects as
rectangles. Instead, the actual shape of objects is approximated
using an integral-like approach. This generally results in more
even and snug positioning of objects and systems.
Affected objects include `Accidentals', `Beams', `Clefs',
`Dynamics', `FiguredBass', `Flags', `Glissandos', `Lyrics',
`MetronomeMarks', `OttavaBrackets', `Pedals', `RehearsalMarks',
`Rests', `Scripts', `TextScripts', `Ties', `Tuplets' and
`VoltaBrackets'.
* Tuplets are now created with the `\tuplet' command, which takes a
fraction `T/N' to specify that T notes are played in the time
usually allowed for N. One `\tuplet' command can create several
tuplet groups if their duration is typed after the fraction.
The `\times' command with its inverted fraction order `N/T' is
still available.
* Introducing two new markup-commands; `\draw-dashed-line' and
`\draw-dotted-line'.
The dashed-line extends to the whole length given by DEST, if
`full-length' is set to `#t' (this is the default) without any
space at the beginning or end. `off' will then be altered to fit.
To insist on the given (or default) values of `on', `off' use
`\override #'(full-length . #f)'. Manual settings for `on', `off'
and `phase' are possible.
The dotted-line always extends to the whole length given by DEST,
without any space at the beginning or end. Manual settings for
`off' are possible to get larger or smaller space between the dots.
The given (or default) value of `off' will be altered to fit the
line-length.
* Starting with version 2.17.10, error messages or the `textedit'
URI used for point-and-click functionality specify column numbers
starting with 1 rather than 0. The byte offset (also part of
`textedit' URIs) still starts at 0.
* The `\clef' command supports optional transposition.
* The LilyPond syntax of dot-separated words `Voice.Accidental' has
been made interchangeable with `#'(Voice Accidental)', a Scheme
list of symbols.
* Grob and grob property path no longer need to be specified as two
separate arguments to commands like `\override' and `\revert',
allowing for the syntax
\override Voice.TextSpanner.bound-details.left.text = "rit."
Since complementary music functions like `\overrideProperty'
cannot support forms with and without separating space at the same
time, using a single dotted path is now the preferred form.
Specifying grob path and grob property path separately, currently
still supported with `\override' and `\revert' for compatibility
reasons, is deprecated.
* Due to words now being accepted as symbol function arguments, the
interfaces of `\accidentalStyle', `\alterBroken', `\footnote' and
`\tweak' had to be redesigned where optional symbol arguments were
involved. Please check the respective music function
documentation for details.
* Several commands now accept symbol lists (conveniently entered as
dot-separated words) for various kinds of arguments. These
include `\accidentalStyle', `\alterBroken', `\footnote', `\hide',
`\omit', `\overrideProperty', `\shape', and `\tweak'.
* The bar line user interface has changed. Bar glyphs now resemble
the appearance of the bar line, so a left repeat sign has to be
coded as `.|:'. The command `\defineBarLine' provides an easy way
to define additional bar line styles.
* Accidentals in the key signature may be printed in octaves other
than their traditional positions, or in multiple octaves.
Diffstat (limited to 'print')
131 files changed, 43 insertions, 1950 deletions
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 9991ef2ba0e..a45f075ef5c 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.95 2013/10/10 14:42:30 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.96 2014/01/05 22:29:47 wiz Exp $ -DISTNAME= lilypond-2.16.2 -PKGREVISION= 8 +DISTNAME= lilypond-2.18.0 CATEGORIES= print -MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.16/ +MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.18/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://lilypond.org/ @@ -30,11 +28,13 @@ 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 +# 1.7 coredumps when generating eps files +DEPENDS+= potrace>=1.8:../../graphics/potrace GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_LANGUAGES= c c++ -USE_TOOLS+= bison gmake gs:run makeinfo perl pkg-config msgfmt +USE_TOOLS+= bison flex gmake gs:run makeinfo perl pkg-config msgfmt USE_TOOLS+= texi2html zip MAKE_FILE= GNUmakefile @@ -54,16 +54,8 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} REPLACE_PYTHON+= scripts/build/yyout2grammar.py PLIST_SUBST+= PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//} -# 1.7 coredumps when generating eps files -DEPENDS+= potrace>=1.8:../../graphics/potrace - -.if ${OPSYS} == "DragonFly" -CONFIGURE_ENV+= LEX="${PREFIX}/bin/flex" +# needs FlexLexer.h .include "../../devel/flex/buildlink3.mk" -.else -USE_TOOLS+= flex -.endif - .include "../../devel/pango/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST index 4a7fa6c5302..b91dcdb6393 100644 --- a/print/lilypond/PLIST +++ b/print/lilypond/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2013/01/25 11:32:07 wiz Exp $ +@comment $NetBSD: PLIST,v 1.18 2014/01/05 22:29:47 wiz Exp $ bin/abc2ly bin/convert-ly bin/etf2ly @@ -243,6 +243,7 @@ share/lilypond/${PKGVERSION}/python/rational.py share/lilypond/${PKGVERSION}/python/rational.pyc share/lilypond/${PKGVERSION}/python/safeeval.py share/lilypond/${PKGVERSION}/python/safeeval.pyc +share/lilypond/${PKGVERSION}/scm/accreg.scm share/lilypond/${PKGVERSION}/scm/auto-beam.scm share/lilypond/${PKGVERSION}/scm/autochange.scm share/lilypond/${PKGVERSION}/scm/backend-library.scm @@ -321,7 +322,9 @@ 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/scheme-engravers.scm share/lilypond/${PKGVERSION}/scm/script.scm +share/lilypond/${PKGVERSION}/scm/skyline.scm share/lilypond/${PKGVERSION}/scm/song-util.scm share/lilypond/${PKGVERSION}/scm/song.scm share/lilypond/${PKGVERSION}/scm/standalone.scm @@ -341,6 +344,7 @@ share/lilypond/${PKGVERSION}/vim/indent/lilypond.vim share/lilypond/${PKGVERSION}/vim/syntax/lilypond-words share/lilypond/${PKGVERSION}/vim/syntax/lilypond-words.vim share/lilypond/${PKGVERSION}/vim/syntax/lilypond.vim +share/locale/ca/LC_MESSAGES/lilypond.mo share/locale/cs/LC_MESSAGES/lilypond.mo share/locale/da/LC_MESSAGES/lilypond.mo share/locale/de/LC_MESSAGES/lilypond.mo diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo index 4900ccd1605..d130f9361e5 100644 --- a/print/lilypond/distinfo +++ b/print/lilypond/distinfo @@ -1,133 +1,7 @@ -$NetBSD: distinfo,v 1.21 2013/11/08 21:17:56 joerg Exp $ +$NetBSD: distinfo,v 1.22 2014/01/05 22:29:47 wiz Exp $ -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-Documentation_changes.tely) = 0a3ac0e406ba7fd555f5f527e599fc07a6e8cd67 -SHA1 (patch-Documentation_contributor_quick-start.itexi) = e2925b8bdc45f7b84ce8aa66a96262f9351b664e -SHA1 (patch-Documentation_included_compile.itexi) = b7f55dd2f794ce1e03c952b23a03da4d0febf1ba -SHA1 (patch-Documentation_topdocs_INSTALL.texi) = 801ab4f9656cd551084119ec185a0e0ef8acb594 -SHA1 (patch-Documentation_usage_lilypond-book.itely) = b9a4d7c83d3d1bc98fb1d1c1106cbe081a0f3b66 -SHA1 (patch-aa) = 99dc3ecc7df664fba71d850e6c0b253fc451ec61 -SHA1 (patch-ab) = 08bf158aed8f6cbaf11d054716069486cf393d6b -SHA1 (patch-ac) = ca7a8671885a40201f201431d2eb8a3377993c67 -SHA1 (patch-configure) = b0c73d828f26fb8db895ace55a678a6d7b09db0e -SHA1 (patch-flower_file-name.cc) = 1f321bdf3bf3097bd6cc641231c42bfe2adddf82 -SHA1 (patch-flower_file-path.cc) = ac2d9dda58cddf39e604cbd37af0e052ed3b4d97 -SHA1 (patch-flower_interval-set.cc) = 1365d075abde2bc597a7fc76ad66f0efff20f353 -SHA1 (patch-flower_polynomial.cc) = 835aa9cc3e0344f1cf36008fd754af0a0bbf2156 -SHA1 (patch-flower_std-string.cc) = 7351f3a9a87848259e3423b214179baa62f9cdf8 -SHA1 (patch-flower_string-convert.cc) = 15a7c1237a7883ee3cc364e01f490763d07b7c8c -SHA1 (patch-flower_warn.cc) = e7e83d5c64103a587536aa12479050565be8268d -SHA1 (patch-lily_GNUmakefile) = b5ee1b8a307b8d1118e603a995d7645536c71dc4 -SHA1 (patch-lily_accidental.cc) = 70bfb4d5459d3a718eb5715094d95ea78b44e145 -SHA1 (patch-lily_align-interface.cc) = e82a03ec8a1f927e69448310957c913c415c1c38 -SHA1 (patch-lily_all-font-metrics-scheme.cc) = 9ce4f0e0b1fb81fe41c862cae57c17474652e93f -SHA1 (patch-lily_all-font-metrics.cc) = 907ceb6caf7edab5cb709af5b20c4f89f61200ed -SHA1 (patch-lily_arpeggio.cc) = b6f8574d51ddef26f6591af3430c705726525dee -SHA1 (patch-lily_audio-element-info.cc) = 27393aa6deb6020b49a777614030372a79fc49d1 -SHA1 (patch-lily_audio-staff.cc) = aa3b864bbfc02a1f756a91a6869ad89bbdbe84f5 -SHA1 (patch-lily_auto-beam-engraver.cc) = 7dd069220a3a2c39f22d3f2cf98bf4659642c8fa -SHA1 (patch-lily_axis-group-interface-scheme.cc) = 763400b12ed96ff55e52bbd1e2b469dbb7f12746 -SHA1 (patch-lily_axis-group-interface.cc) = ada3b7aa16cd26fd398456845980403566b36c58 -SHA1 (patch-lily_beam-performer.cc) = cb1a93b6e914b8bc6125473fa7805d9e1e8d4d72 -SHA1 (patch-lily_bezier-bow.cc) = 20de8ef921238fe81487f148c5cd7f414ca8cc66 -SHA1 (patch-lily_bezier.cc) = aa525fc9cbef9c1d54bc1ec8c08fa21a3b401434 -SHA1 (patch-lily_book-scheme.cc) = 7f7a6f9761c55c071f30190c46f23eca5b57b364 -SHA1 (patch-lily_book.cc) = 9236100adcba689cf3b0654b29fe729ba1f3ce39 -SHA1 (patch-lily_change-iterator.cc) = cfee55dbca8269453ad7bd35f75f684ee6bc8f3c -SHA1 (patch-lily_chord-tremolo-iterator.cc) = 2efd68ad97353e3ac28c1fb4a5e2824d8e794332 -SHA1 (patch-lily_column-x-positions.cc) = 31547faa94487d4150d0c89fd3b49f5cbdc69260 -SHA1 (patch-lily_context-def.cc) = 76cbf8980efb8c5fba2527dbe92ef8b0a2994927 -SHA1 (patch-lily_context-specced-music-iterator.cc) = eb4943616459862a08a7c23bd87bb0520f2f6cc4 -SHA1 (patch-lily_drum-note-performer.cc) = da590791d34b6942f0da6ee54fcb83b4c48638a9 -SHA1 (patch-lily_dynamic-engraver.cc) = 737b88584139a172be94c890b6e0076821c8af72 -SHA1 (patch-lily_dynamic-performer.cc) = d1bbb9df39593eabcf49d726f9ec17e8b15513c0 -SHA1 (patch-lily_event-chord-iterator.cc) = 94e3d39b4c591e33676bd6eace519d296f566d03 -SHA1 (patch-lily_event-iterator.cc) = c09b915989def11e88ff0cd91cbaacf98a6eb3ee -SHA1 (patch-lily_flag.cc) = 711b1306badd4fc27bbe981b67482867bc8fe5cf -SHA1 (patch-lily_font-select.cc) = c76ad25a1ba14d214e5800fc9f6a80f1b71f1fe1 -SHA1 (patch-lily_global-ctor.cc) = 94e0337e096b1674e19bfe580c70f558bb113c61 -SHA1 (patch-lily_grace-iterator.cc) = 4efd84a1b8af7fb143efacf70596b4c2e046410f -SHA1 (patch-lily_grob-property.cc) = a392b3e8157b037c7b902fd78a560ce6a19f2648 -SHA1 (patch-lily_grob.cc) = d6f12a99f3a517fb635e64d564821873f7f6b78f -SHA1 (patch-lily_horizontal-bracket.cc) = 10d4c58579632dda738732a179ac53b04367e103 -SHA1 (patch-lily_includable-lexer.cc) = 39c414fe9f914f42a4fd2ff6499eda1ce8f67dd0 -SHA1 (patch-lily_include_lily-proto.hh) = a472898ad4c3adb8b31aec8009f1d04845b9ddb3 -SHA1 (patch-lily_include_translator-group.hh) = c2fb449562288ecf097fefae7527c5f89f1f527c -SHA1 (patch-lily_input.cc) = 0c291ecc88d4f16a1f0c2b62f308d4b80665b2b3 -SHA1 (patch-lily_instrument-name-engraver.cc) = 59033b0df4b8ffca356ae11f216165ee2a766a09 -SHA1 (patch-lily_interval-minefield.cc) = c8310882e83f6d9c5bc9f318ab77402d0c0363fe -SHA1 (patch-lily_key-signature-interface.cc) = 949bae8fd69ca89f11448549d24a76af7b98f621 -SHA1 (patch-lily_keyword.cc) = 5f73a35502756fdbd1bd5c297356177439f424ad -SHA1 (patch-lily_least-squares.cc) = b5605b0b0da712bc2177b3ee83b58fabea55d4ea -SHA1 (patch-lily_ledger-line-engraver.cc) = 0bab263cfa0e6b38fc8e0a4eebca8f07a10075a8 -SHA1 (patch-lily_lexer.ll) = c806a4dcbbfd3349901ac62b6cc1bc917c9fe4a2 -SHA1 (patch-lily_lily-lexer-scheme.cc) = 0cce067ed78561f364da4932aeadcc8714912f78 -SHA1 (patch-lily_lily-lexer.cc) = 11b3df667301b5acdd56513975c0750c6f6c83f5 -SHA1 (patch-lily_lilypond-version.cc) = 0a5159d40e1840e19f68ad01fa65425442864ff9 -SHA1 (patch-lily_line-spanner.cc) = 8a725f44d9d93bfa1827ab9200c087c357afaf47 -SHA1 (patch-lily_main.cc) = f76e5065fa5658ac123e99ebb866088b2d8be5d8 -SHA1 (patch-lily_mensural-ligature.cc) = 91519515a65f12e990bf701c6248ea353e98a351 -SHA1 (patch-lily_midi-chunk.cc) = d8e607020a5661d1eb07c1f7081b61903af823ef -SHA1 (patch-lily_midi-stream.cc) = 4df239c12396f1e76093922b89577135e1d023c5 -SHA1 (patch-lily_midi-walker.cc) = 8edbe0bbbc41aaa0aa725662ea4b1c2a9224c8fc -SHA1 (patch-lily_misc.cc) = 689a5c251c36a27d1569347a643917962a029bb3 -SHA1 (patch-lily_music-wrapper-iterator.cc) = b4f0f142165d0765ca54a387ef5ea6a8d056a293 -SHA1 (patch-lily_note-collision.cc) = fd59654bf35688ab8de9fdc8535e263d34915d0d -SHA1 (patch-lily_note-head.cc) = 9814a05c4e730ffb07aa6e46b2352b29cae7b2b9 -SHA1 (patch-lily_note-performer.cc) = 608e630d70141a2f65c6fb69929732182303b8a5 -SHA1 (patch-lily_ottava-bracket.cc) = e3f4581d13eaa14c88523cbf0e550fe0586e376b -SHA1 (patch-lily_page-breaking-scheme.cc) = 49957521bb8bda897aa59ed54befacd49652569e -SHA1 (patch-lily_page-layout-problem.cc) = 5debc03851c0390dda861c0d326a8c6c483ba37f -SHA1 (patch-lily_page-spacing-result.cc) = 0d8e3be8d85ef27230c92f8c6bf05acbff1486b8 -SHA1 (patch-lily_page-turn-page-breaking.cc) = 62256aecc481ac7ec1fab87be81b04d709819145 -SHA1 (patch-lily_pango-font-scheme.cc) = 54e47095a9375595d7d6889bf8f5a3fcae310611 -SHA1 (patch-lily_pango-select.cc) = da9603983d4478d7d93e3c5928b15a8db1dff452 -SHA1 (patch-lily_paper-book-scheme.cc) = 7c8bb1142304728c21a1728d21b180f80ad150f5 -SHA1 (patch-lily_paper-book.cc) = ecff2ac56bc2a760d3446432d2378ece72ba7f4d -SHA1 (patch-lily_paper-column-engraver.cc) = 4e7dafaf44a149d5787b7c2225b56378dcffc321 -SHA1 (patch-lily_paper-column.cc) = df760725de834901c8709ff8846b8e90dd41a8b3 -SHA1 (patch-lily_paper-outputter-scheme.cc) = f367bf8b92d71e77a8684feee7c36a2cc50e47d1 -SHA1 (patch-lily_paper-outputter.cc) = ab31467616005c48f91d99d18ccc17e319f57684 -SHA1 (patch-lily_paper-score-scheme.cc) = d594b707174c52d7cf53f6d66ad4674630442733 -SHA1 (patch-lily_paper-score.cc) = 3de40fdc4a7f2b47b5a1e18d77085031a28da192 -SHA1 (patch-lily_parser.yy) = 3314a19713680f4e0b1449c86d2b60c58931a49a -SHA1 (patch-lily_performance-scheme.cc) = 51e20914d8dd4e79d165d9d2d7fd7688a972d328 -SHA1 (patch-lily_performance.cc) = c0e798ce519b991809a508fdb80bf9ca03f4a94f -SHA1 (patch-lily_performer-group.cc) = b7d3cd889a781907aebcbecf9e84eeefbc30bf64 -SHA1 (patch-lily_piano-pedal-performer.cc) = 26c565b27adca19e79c447315de1f6d4e24e9fca -SHA1 (patch-lily_pointer-group-interface-scheme.cc) = 27ec279e056684f01d6a9709137cf61c06cf38f0 -SHA1 (patch-lily_pointer-group-interface.cc) = 34914258ca9d777d36dbe3cf56870a339dfc5391 -SHA1 (patch-lily_property-iterator.cc) = 8366a9cfe89faf6b32926780dc83e14e010db0ec -SHA1 (patch-lily_pure-from-neighbor-interface.cc) = 8e22322a4476be195975506b57cc66d4595be376 -SHA1 (patch-lily_quote-iterator.cc) = 1cff848362c7b709524d47c8f91527096e314a69 -SHA1 (patch-lily_rest.cc) = 4e9151f7d53852a2a7cda7d5f60a424a58148180 -SHA1 (patch-lily_rhythmic-music-iterator.cc) = 890b392844b5f7dd852c926fe0170a1638a800c0 -SHA1 (patch-lily_sequential-iterator.cc) = 9d908b1e2dcab4d8bb90af479c9ae00c8b0bea28 -SHA1 (patch-lily_simple-music-iterator.cc) = 571d7d3586e4ab2e3600878e4ac9c699ee4c3de3 -SHA1 (patch-lily_simple-spacer.cc) = 352550bf4cefa4d03d076fc4329122146efc9d54 -SHA1 (patch-lily_simultaneous-music-iterator.cc) = e63de78f441f0811fba162aafc87c14a97ff7388 -SHA1 (patch-lily_slur-configuration.cc) = de748134493d14d322bd77583e8155c010ccfab6 -SHA1 (patch-lily_slur-performer.cc) = daad8d244defdb547b5e95a790d7206d8345e015 -SHA1 (patch-lily_slur.cc) = 8ad560e902bfc8b7de52bc331f12765e6270e9dd -SHA1 (patch-lily_source-file.cc) = a80cbd2e6590dad5eeca440726d9e2ce0dd97d3e -SHA1 (patch-lily_sources.cc) = 754f8ec713ab0fea21f9655b3b0d688636420215 -SHA1 (patch-lily_spacing-basic.cc) = 107c723842abb213e3d601bfa43c243e67ae465a -SHA1 (patch-lily_spacing-loose-columns.cc) = ac83e706b7d088d39328ed62124b831a432cb617 -SHA1 (patch-lily_spacing-options.cc) = 5c7e3b2ff381f02b6c346527cc9aa62623f1a60f -SHA1 (patch-lily_spacing-spanner.cc) = 80d80750ef4e4726008c7db237a4a0c2aec7d829 -SHA1 (patch-lily_span-bar-stub-engraver.cc) = 02a66397cd4b8500cb2c26a8cf37c6b5ac1b0dfc -SHA1 (patch-lily_stem.cc) = ab413430c05031b92f638c9b22c7364d3b824206 -SHA1 (patch-lily_system-start-delimiter.cc) = c58a0271bbca80222e8ba68263b424b5fe189dfa -SHA1 (patch-lily_system.cc) = 788e6c1607ffc8392b492ee93f0fefd7fb112494 -SHA1 (patch-lily_tempo-performer.cc) = 1f8c9b1877416bb147cbbad79e63a670dd1d0aa9 -SHA1 (patch-lily_tie-configuration.cc) = 422f35f2fa954d73986c38ece08d196368787b9c -SHA1 (patch-lily_tie-performer.cc) = 1ccc52b8e3caacc5c947a800cb189f66d33f5663 -SHA1 (patch-lily_time-signature.cc) = bbf6524fc4a5b2c07741abc01ece0e9d22b23969 -SHA1 (patch-lily_translator-dispatch-list.cc) = 3f66d794c0f441587a9739bfdcd2d04f0224643c -SHA1 (patch-lily_tuplet-bracket.cc) = 10e72655b79ebd82d18a3d1a4712f3265aed06e0 -SHA1 (patch-lily_tuplet-number.cc) = 0658c115e193d47dffeb33cdef0390ccf6f2104c -SHA1 (patch-lily_volta-repeat-iterator.cc) = f4a5f34736e11611070c54b9ed7d3935d1f3d2c2 -SHA1 (patch-scripts_auxiliar_cg-section.sh) = c6838a358ae1ea2f8ddd0791e72eb3c25ac2019b -SHA1 (patch-stepmake_stepmake_po-targets.make) = d3ee9c192a2f6b02a3b35c5d937803c8bc33bed3 +SHA1 (lilypond-2.18.0.tar.gz) = 8bf2637b27351b999c535a219fe20407d359910a +RMD160 (lilypond-2.18.0.tar.gz) = 2f33ce20c6c1a82f9291482786c22d403d8949f4 +Size (lilypond-2.18.0.tar.gz) = 16013863 bytes +SHA1 (patch-ab) = a1d327ab900cca18b9306846f137e1bbcfdca945 +SHA1 (patch-configure) = 7ff9100e72f9683b933f0765b86805c0bb8fdcba diff --git a/print/lilypond/patches/patch-Documentation_changes.tely b/print/lilypond/patches/patch-Documentation_changes.tely deleted file mode 100644 index 3e664cb10f5..00000000000 --- a/print/lilypond/patches/patch-Documentation_changes.tely +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Documentation_changes.tely,v 1.1 2013/07/05 14:51:43 wiz Exp $ - -Fix for texinfo-5.x, from Don Armstrong <don@debian.org>. - ---- Documentation/changes.tely.orig 2013-01-04 13:41:57.000000000 +0000 -+++ Documentation/changes.tely -@@ -36,7 +36,7 @@ See user manual, \NAME\ - @finalout - - @node Top, Fixes and changes after 2.16.0, (dir), (dir) --@top New features in 2.16 -+@chapter New features in 2.16 - - @menu - * Fixes and changes after 2.16.0:: diff --git a/print/lilypond/patches/patch-Documentation_contributor_quick-start.itexi b/print/lilypond/patches/patch-Documentation_contributor_quick-start.itexi deleted file mode 100644 index 1343826ecf0..00000000000 --- a/print/lilypond/patches/patch-Documentation_contributor_quick-start.itexi +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Documentation_contributor_quick-start.itexi,v 1.1 2013/07/05 14:51:43 wiz Exp $ - -Fix for texinfo-5.x, from Don Armstrong <don@debian.org>. - ---- Documentation/contributor/quick-start.itexi.orig 2013-01-04 13:41:57.000000000 +0000 -+++ Documentation/contributor/quick-start.itexi -@@ -344,7 +344,7 @@ to @ref{Compiling with LilyDev} before r - @warning{Throughout the rest of this manual, most command-line - input should be entered from @file{~/lilypond-git/}. This is - known as the @emph{top source directory} and is often referred to as --@var{$LILYPOND_GIT}}. -+@var{$LILYPOND_GIT}.} - - @warning{Only work on one set of changes at once. Do not start - work on any new changes until your first set has been accepted.} diff --git a/print/lilypond/patches/patch-Documentation_included_compile.itexi b/print/lilypond/patches/patch-Documentation_included_compile.itexi deleted file mode 100644 index d140029525e..00000000000 --- a/print/lilypond/patches/patch-Documentation_included_compile.itexi +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-Documentation_included_compile.itexi,v 1.1 2013/07/05 14:51:43 wiz Exp $ - -Fix for texinfo-5.x, from Don Armstrong <don@debian.org>. - ---- Documentation/included/compile.itexi.orig 2013-01-04 13:41:57.000000000 +0000 -+++ Documentation/included/compile.itexi -@@ -922,7 +922,7 @@ bug reports to @email{bug-lilypond@@gnu. - - Bugs that are not fault of LilyPond are documented here. - --@unnumberedsubsubsec Bison 1.875 -+@unnumberedsubsec Bison 1.875 - - There is a bug in bison-1.875: compilation fails with "parse error - before `goto'" in line 4922 due to a bug in bison. To fix, please -@@ -937,7 +937,7 @@ $ make - @end example - - --@unnumberedsubsubsec Compiling on MacOS@tie{}X -+@unnumberedsubsec Compiling on MacOS@tie{}X - - Here are special instructions for compiling under MacOS@tie{}X. - These instructions assume that dependencies are installed using -@@ -989,7 +989,7 @@ automatic font detection, add - @end example - - --@unnumberedsubsubsec Solaris -+@unnumberedsubsec Solaris - - Solaris7, ./configure - -@@ -1008,7 +1008,7 @@ or - CONFIG_SHELL=/bin/bash bash -c ./configure - @end example - --@unnumberedsubsubsec FreeBSD -+@unnumberedsubsec FreeBSD - - To use system fonts, dejaview must be installed. With the default - port, the fonts are installed in @file{usr/X11R6/lib/X11/fonts/dejavu}. -@@ -1022,7 +1022,7 @@ for your hierarchy.) - @end example - - --@unnumberedsubsubsec International fonts -+@unnumberedsubsec International fonts - - On Mac OS X, all fonts are installed by default. However, finding all - system fonts requires a bit of configuration; see -@@ -1049,7 +1049,7 @@ Debian GNU/Linux - @end verbatim - - --@unnumberedsubsubsec Using lilypond python libraries -+@unnumberedsubsec Using lilypond python libraries - - If you want to use lilypond's python libraries (either running - certain build scripts manually, or using them in other programs), -@@ -1123,7 +1123,7 @@ We currently use make and stepmake, whic - used by us. Hopefully this will change in the future. - - --@subsubheading Version-specific texinfo macros -+@subheading Version-specific texinfo macros - - @itemize - diff --git a/print/lilypond/patches/patch-Documentation_topdocs_INSTALL.texi b/print/lilypond/patches/patch-Documentation_topdocs_INSTALL.texi deleted file mode 100644 index 9cbfc878588..00000000000 --- a/print/lilypond/patches/patch-Documentation_topdocs_INSTALL.texi +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-Documentation_topdocs_INSTALL.texi,v 1.1 2013/07/05 14:51:43 wiz Exp $ - -Fix for texinfo-5.x, from Don Armstrong <don@debian.org>. - ---- Documentation/topdocs/INSTALL.texi.orig 2013-01-04 13:41:56.000000000 +0000 -+++ Documentation/topdocs/INSTALL.texi -@@ -10,9 +10,18 @@ - @node Top - @top - -+@menu -+* Compile:: -+@end menu -+ -+ - @contents - - @include macros.itexi -+ -+@node Compile -+@chapter Compile -+ - @include included/compile.itexi - - @bye diff --git a/print/lilypond/patches/patch-Documentation_usage_lilypond-book.itely b/print/lilypond/patches/patch-Documentation_usage_lilypond-book.itely deleted file mode 100644 index 40c36b0c665..00000000000 --- a/print/lilypond/patches/patch-Documentation_usage_lilypond-book.itely +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-Documentation_usage_lilypond-book.itely,v 1.1 2013/07/05 14:51:43 wiz Exp $ - -Fix for texinfo-5.x, from Don Armstrong <don@debian.org>. - ---- Documentation/usage/lilypond-book.itely.orig 2013-01-04 13:41:57.000000000 +0000 -+++ Documentation/usage/lilypond-book.itely -@@ -1001,20 +1001,20 @@ cd out - ... - @end example - --@itemx --skip-lily-check -+@item --skip-lily-check - Do not fail if no lilypond output is found. It is used for LilyPond - Info documentation without images. - --@itemx --skip-png-check -+@item --skip-png-check - Do not fail if no PNG images are found for EPS files. It is used for - LilyPond Info documentation without images. - --@itemx --lily-output-dir=@var{dir} -+@item --lily-output-dir=@var{dir} - Write lily-XXX files to directory @var{dir}, link into @option{--output} - directory. Use this option to save building time for documents in - different directories which share a lot of identical snippets. - --@itemx --lily-loglevel=@var{loglevel} -+@item --lily-loglevel=@var{loglevel} - Set the output verbosity of the invoked @command{lilypond} calls to - @var{loglevel}. Possible values are @code{NONE}, @code{ERROR}, - @code{WARNING}, @code{BASIC_PROGRESS}, @code{PROGRESS}, @code{INFO} -@@ -1023,16 +1023,16 @@ environment variable @code{LILYPOND_LOGL - as the loglevel. - - --@itemx --info-images-dir=@var{dir} -+@item --info-images-dir=@var{dir} - Format Texinfo output so that Info will look for images of music in - @var{dir}. - --@itemx --latex-program=@var{prog} -+@item --latex-program=@var{prog} - Run executable @command{prog} instead of @command{latex}. This is - useful if your document is processed with @command{xelatex}, for - example. - --@itemx --left-padding=@var{amount} -+@item --left-padding=@var{amount} - Pad EPS boxes by this much. @var{amount} is measured in millimeters, - and is 3.0 by default. This option should be used if the lines of - music stick out of the right margin. -@@ -1055,7 +1055,7 @@ Create PDF files for use with PDF@LaTeX{ - By default, output is displayed on the terminal. This option redirects - all output to log files in the same directory as the source files. - --@itemx --use-source-file-names -+@item --use-source-file-names - Write snippet output files with the same base name as their source file. - This option works only for snippets included with @code{lilypondfile} - and only if directories implied by @option{--output-dir} and diff --git a/print/lilypond/patches/patch-aa b/print/lilypond/patches/patch-aa deleted file mode 100644 index d57fa2ee425..00000000000 --- a/print/lilypond/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$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 -@@ -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-ab b/print/lilypond/patches/patch-ab index a78b995342f..f3c1859eb7c 100644 --- a/print/lilypond/patches/patch-ab +++ b/print/lilypond/patches/patch-ab @@ -1,15 +1,15 @@ -$NetBSD: patch-ab,v 1.4 2013/01/25 11:32:08 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2014/01/05 22:29:47 wiz Exp $ Do not install emacs lisp files. ---- GNUmakefile.in.orig 2013-01-04 13:41:57.000000000 +0000 +--- GNUmakefile.in.orig 2013-01-12 14:15:07.000000000 +0000 +++ GNUmakefile.in @@ -7,7 +7,7 @@ SUBDIRS = python scripts \ mf ly \ tex ps scm \ - po make \ + po \ - elisp vim \ + vim \ input \ - stepmake $(documentation-dir) + $(documentation-dir) diff --git a/print/lilypond/patches/patch-ac b/print/lilypond/patches/patch-ac deleted file mode 100644 index 55e6c6ffeb6..00000000000 --- a/print/lilypond/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$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 -@@ -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-configure b/print/lilypond/patches/patch-configure index deec1dde84e..163b03c5c9d 100644 --- a/print/lilypond/patches/patch-configure +++ b/print/lilypond/patches/patch-configure @@ -1,10 +1,12 @@ -$NetBSD: patch-configure,v 1.1 2012/12/25 15:30:14 wiz Exp $ +$NetBSD: patch-configure,v 1.2 2014/01/05 22:29:47 wiz Exp $ Disable c/c++ version check; it fails e.g. with clang emulating gcc. +Allow more metapost versions than upstream until pkgsrc contains +a new enough metapost. ---- configure.orig 2012-12-25 15:26:16.000000000 +0000 +--- configure.orig 2013-11-24 12:24:16.000000000 +0000 +++ configure -@@ -4485,7 +4485,7 @@ $as_echo_n "checking $r version... " >&6 +@@ -5297,7 +5297,7 @@ $as_echo_n "checking $r version... " >&6 ` { $as_echo "$as_me:$LINENO: result: $ver" >&5 $as_echo "$ver" >&6; } @@ -13,7 +15,7 @@ Disable c/c++ version check; it fails e.g. with clang emulating gcc. eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 3.4 (installed: $ver)"\"`\" -@@ -4978,7 +4978,7 @@ $as_echo_n "checking $r version... " >&6 +@@ -5814,7 +5814,7 @@ $as_echo_n "checking $r version... " >&6 ` { $as_echo "$as_me:$LINENO: result: $ver" >&5 $as_echo "$ver" >&6; } @@ -22,3 +24,18 @@ Disable c/c++ version check; it fails e.g. with clang emulating gcc. eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 3.4 (installed: $ver)"\"`\" +@@ -8087,11 +8087,11 @@ $as_echo "$ver" >&6; } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' + ` + # Avoid buggy metapost versions: 1.600 <= x < 1.803 +- if test "$num" -ge "1600000" -a "$num" -lt "1803000"; then ++ #if test "$num" -ge "1600000" -a "$num" -lt "1803000"; then + +- eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"\"`\" ++ #eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"\"`\" + +- fi ++ #fi + fi + + { $as_echo "$as_me:$LINENO: checking for working metafont mode" >&5 diff --git a/print/lilypond/patches/patch-flower_file-name.cc b/print/lilypond/patches/patch-flower_file-name.cc deleted file mode 100644 index c0ff67fffb8..00000000000 --- a/print/lilypond/patches/patch-flower_file-name.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-flower_file-name.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/file-name.cc.orig 2013-06-16 18:41:41.000000000 +0000 -+++ flower/file-name.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "file-name.hh" - - #include <cstdio> diff --git a/print/lilypond/patches/patch-flower_file-path.cc b/print/lilypond/patches/patch-flower_file-path.cc deleted file mode 100644 index e4b3497891b..00000000000 --- a/print/lilypond/patches/patch-flower_file-path.cc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-flower_file-path.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/file-path.cc.orig 2013-06-16 18:36:33.000000000 +0000 -+++ flower/file-path.cc -@@ -18,12 +18,12 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "file-path.hh" - - #include <cstdio> - #include <cerrno> - --#include "config.hh" - #if HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif diff --git a/print/lilypond/patches/patch-flower_interval-set.cc b/print/lilypond/patches/patch-flower_interval-set.cc deleted file mode 100644 index 09ff0251d3e..00000000000 --- a/print/lilypond/patches/patch-flower_interval-set.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-flower_interval-set.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/interval-set.cc.orig 2013-06-16 18:41:26.000000000 +0000 -+++ flower/interval-set.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "interval-set.hh" - - /* diff --git a/print/lilypond/patches/patch-flower_polynomial.cc b/print/lilypond/patches/patch-flower_polynomial.cc deleted file mode 100644 index 835f4503833..00000000000 --- a/print/lilypond/patches/patch-flower_polynomial.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-flower_polynomial.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/polynomial.cc.orig 2013-06-16 18:38:24.000000000 +0000 -+++ flower/polynomial.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "polynomial.hh" - - #include "warn.hh" diff --git a/print/lilypond/patches/patch-flower_std-string.cc b/print/lilypond/patches/patch-flower_std-string.cc deleted file mode 100644 index b90683df28c..00000000000 --- a/print/lilypond/patches/patch-flower_std-string.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-flower_std-string.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/std-string.cc.orig 2013-06-16 18:38:42.000000000 +0000 -+++ flower/std-string.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "std-string.hh" - #include "string-convert.hh" - diff --git a/print/lilypond/patches/patch-flower_string-convert.cc b/print/lilypond/patches/patch-flower_string-convert.cc deleted file mode 100644 index 2f2bbcc4fa1..00000000000 --- a/print/lilypond/patches/patch-flower_string-convert.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-flower_string-convert.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/string-convert.cc.orig 2013-06-16 18:39:57.000000000 +0000 -+++ flower/string-convert.cc -@@ -165,7 +165,7 @@ String_convert::int2dec (int i, size_t l - fill_char = '0'; - - // ugh -- string dec_string = to_string (i); -+ string dec_string = ::to_string (i); - - // ugh - return to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string; -@@ -299,7 +299,7 @@ String_convert::pointer_string (void con - string - String_convert::precision_string (double x, int n) - { -- string format = "%." + to_string (max (0, n - 1)) + "e"; -+ string format = "%." + ::to_string (max (0, n - 1)) + "e"; - string str = double_string (abs (x), format.c_str ()); - - int exp = dec2int (str.substr (str.length () - 3)); diff --git a/print/lilypond/patches/patch-flower_warn.cc b/print/lilypond/patches/patch-flower_warn.cc deleted file mode 100644 index afdd133bc7d..00000000000 --- a/print/lilypond/patches/patch-flower_warn.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-flower_warn.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- flower/warn.cc.orig 2013-06-16 18:37:26.000000000 +0000 -+++ flower/warn.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "warn.hh" - - #include <cstdlib> diff --git a/print/lilypond/patches/patch-lily_GNUmakefile b/print/lilypond/patches/patch-lily_GNUmakefile deleted file mode 100644 index f994d9cedb9..00000000000 --- a/print/lilypond/patches/patch-lily_GNUmakefile +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-lily_GNUmakefile,v 1.1 2013/04/01 12:20:47 joerg Exp $ - -Issue 2208. - ---- lily/GNUmakefile.orig 2013-03-31 15:01:52.000000000 +0000 -+++ lily/GNUmakefile -@@ -7,10 +7,6 @@ SUBDIRS = include - MODULE_LIBS=$(depth)/flower - MODULE_INCLUDES= $(depth)/flower/include - --# need this to convert between function pointers and member function pointers. --MODULE_CXXFLAGS= -Wno-pmf-conversions -- -- - HELP2MAN_EXECS = lilypond - STEPMAKE_TEMPLATES=c c++ executable po help2man - diff --git a/print/lilypond/patches/patch-lily_accidental.cc b/print/lilypond/patches/patch-lily_accidental.cc deleted file mode 100644 index 794f9b80f73..00000000000 --- a/print/lilypond/patches/patch-lily_accidental.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_accidental.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/accidental.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/accidental.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "accidental-interface.hh" - #include "font-interface.hh" - #include "international.hh" diff --git a/print/lilypond/patches/patch-lily_align-interface.cc b/print/lilypond/patches/patch-lily_align-interface.cc deleted file mode 100644 index abb8f24d234..00000000000 --- a/print/lilypond/patches/patch-lily_align-interface.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_align-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/align-interface.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/align-interface.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "align-interface.hh" - #include "axis-group-interface.hh" - #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_all-font-metrics-scheme.cc b/print/lilypond/patches/patch-lily_all-font-metrics-scheme.cc deleted file mode 100644 index 55e8a5c0ac8..00000000000 --- a/print/lilypond/patches/patch-lily_all-font-metrics-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_all-font-metrics-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/all-font-metrics-scheme.cc.orig 2013-06-16 19:19:52.000000000 +0000 -+++ lily/all-font-metrics-scheme.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "all-font-metrics.hh" - #include "main.hh" - diff --git a/print/lilypond/patches/patch-lily_all-font-metrics.cc b/print/lilypond/patches/patch-lily_all-font-metrics.cc deleted file mode 100644 index 982b4cad0f0..00000000000 --- a/print/lilypond/patches/patch-lily_all-font-metrics.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_all-font-metrics.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/all-font-metrics.cc.orig 2013-06-16 19:12:28.000000000 +0000 -+++ lily/all-font-metrics.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "all-font-metrics.hh" - - #include "string-convert.hh" diff --git a/print/lilypond/patches/patch-lily_arpeggio.cc b/print/lilypond/patches/patch-lily_arpeggio.cc deleted file mode 100644 index 4b7f1966a67..00000000000 --- a/print/lilypond/patches/patch-lily_arpeggio.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_arpeggio.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/arpeggio.cc.orig 2013-06-16 19:09:07.000000000 +0000 -+++ lily/arpeggio.cc -@@ -140,7 +140,7 @@ Arpeggio::print (SCM smob) - if (dir) - { - Font_metric *fm = Font_interface::get_default_font (me); -- arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir)); -+ arrow = fm->find_by_name ("scripts.arpeggio.arrow." + ::to_string (dir)); - heads[dir] -= dir * arrow.extent (Y_AXIS).length (); - } - diff --git a/print/lilypond/patches/patch-lily_audio-element-info.cc b/print/lilypond/patches/patch-lily_audio-element-info.cc deleted file mode 100644 index 56929a87621..00000000000 --- a/print/lilypond/patches/patch-lily_audio-element-info.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_audio-element-info.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/audio-element-info.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/audio-element-info.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "audio-element-info.hh" - - #include "translator-group.hh" diff --git a/print/lilypond/patches/patch-lily_audio-staff.cc b/print/lilypond/patches/patch-lily_audio-staff.cc deleted file mode 100644 index cf4bea4dcaa..00000000000 --- a/print/lilypond/patches/patch-lily_audio-staff.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_audio-staff.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/audio-staff.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/audio-staff.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "audio-staff.hh" - - #include "midi-chunk.hh" diff --git a/print/lilypond/patches/patch-lily_auto-beam-engraver.cc b/print/lilypond/patches/patch-lily_auto-beam-engraver.cc deleted file mode 100644 index ed7d923e800..00000000000 --- a/print/lilypond/patches/patch-lily_auto-beam-engraver.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_auto-beam-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/auto-beam-engraver.cc.orig 2013-06-16 19:20:34.000000000 +0000 -+++ lily/auto-beam-engraver.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "beaming-pattern.hh" - #include "beam.hh" - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_axis-group-interface-scheme.cc b/print/lilypond/patches/patch-lily_axis-group-interface-scheme.cc deleted file mode 100644 index 51f9e9eb4a9..00000000000 --- a/print/lilypond/patches/patch-lily_axis-group-interface-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_axis-group-interface-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/axis-group-interface-scheme.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/axis-group-interface-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "axis-group-interface.hh" - #include "lily-guile.hh" - #include "grob.hh" diff --git a/print/lilypond/patches/patch-lily_axis-group-interface.cc b/print/lilypond/patches/patch-lily_axis-group-interface.cc deleted file mode 100644 index 6466504f0b1..00000000000 --- a/print/lilypond/patches/patch-lily_axis-group-interface.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_axis-group-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/axis-group-interface.cc.orig 2013-06-16 19:13:48.000000000 +0000 -+++ lily/axis-group-interface.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "axis-group-interface.hh" - - #include "align-interface.hh" diff --git a/print/lilypond/patches/patch-lily_beam-performer.cc b/print/lilypond/patches/patch-lily_beam-performer.cc deleted file mode 100644 index dce994cd33e..00000000000 --- a/print/lilypond/patches/patch-lily_beam-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_beam-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/beam-performer.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/beam-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - #include "audio-item.hh" - #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_bezier-bow.cc b/print/lilypond/patches/patch-lily_bezier-bow.cc deleted file mode 100644 index 1ee9089c5e6..00000000000 --- a/print/lilypond/patches/patch-lily_bezier-bow.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_bezier-bow.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/bezier-bow.cc.orig 2013-06-16 18:45:49.000000000 +0000 -+++ lily/bezier-bow.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "misc.hh" - #include "bezier.hh" - diff --git a/print/lilypond/patches/patch-lily_bezier.cc b/print/lilypond/patches/patch-lily_bezier.cc deleted file mode 100644 index 906cd6e811e..00000000000 --- a/print/lilypond/patches/patch-lily_bezier.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_bezier.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/bezier.cc.orig 2013-06-16 19:02:18.000000000 +0000 -+++ lily/bezier.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "bezier.hh" - #include "warn.hh" - #include "libc-extension.hh" diff --git a/print/lilypond/patches/patch-lily_book-scheme.cc b/print/lilypond/patches/patch-lily_book-scheme.cc deleted file mode 100644 index 482b3cc233f..00000000000 --- a/print/lilypond/patches/patch-lily_book-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_book-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/book-scheme.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/book-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "book.hh" - - #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_book.cc b/print/lilypond/patches/patch-lily_book.cc deleted file mode 100644 index 02bfad4cf5e..00000000000 --- a/print/lilypond/patches/patch-lily_book.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_book.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/book.cc.orig 2013-06-16 19:01:16.000000000 +0000 -+++ lily/book.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "book.hh" - - #include <cstdio> diff --git a/print/lilypond/patches/patch-lily_change-iterator.cc b/print/lilypond/patches/patch-lily_change-iterator.cc deleted file mode 100644 index 3981707d925..00000000000 --- a/print/lilypond/patches/patch-lily_change-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_change-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/change-iterator.cc.orig 2013-06-16 19:11:14.000000000 +0000 -+++ lily/change-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "change-iterator.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_chord-tremolo-iterator.cc b/print/lilypond/patches/patch-lily_chord-tremolo-iterator.cc deleted file mode 100644 index 2013d498131..00000000000 --- a/print/lilypond/patches/patch-lily_chord-tremolo-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_chord-tremolo-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/chord-tremolo-iterator.cc.orig 2013-06-16 19:27:35.000000000 +0000 -+++ lily/chord-tremolo-iterator.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "chord-tremolo-iterator.hh" - - #include "input.hh" diff --git a/print/lilypond/patches/patch-lily_column-x-positions.cc b/print/lilypond/patches/patch-lily_column-x-positions.cc deleted file mode 100644 index 1fdb604b975..00000000000 --- a/print/lilypond/patches/patch-lily_column-x-positions.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_column-x-positions.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/column-x-positions.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/column-x-positions.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "column-x-positions.hh" - - Column_x_positions::Column_x_positions () diff --git a/print/lilypond/patches/patch-lily_context-def.cc b/print/lilypond/patches/patch-lily_context-def.cc deleted file mode 100644 index 4cecaf70c0e..00000000000 --- a/print/lilypond/patches/patch-lily_context-def.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_context-def.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/context-def.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/context-def.cc -@@ -20,6 +20,7 @@ - /* TODO: should junk this class an replace by - a single list of context modifications? */ - -+#include "config.hh" - #include "context-def.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_context-specced-music-iterator.cc b/print/lilypond/patches/patch-lily_context-specced-music-iterator.cc deleted file mode 100644 index ff8051b3175..00000000000 --- a/print/lilypond/patches/patch-lily_context-specced-music-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_context-specced-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/context-specced-music-iterator.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/context-specced-music-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "music-wrapper-iterator.hh" - #include "context.hh" - #include "music.hh" diff --git a/print/lilypond/patches/patch-lily_drum-note-performer.cc b/print/lilypond/patches/patch-lily_drum-note-performer.cc deleted file mode 100644 index be4df18c7ea..00000000000 --- a/print/lilypond/patches/patch-lily_drum-note-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_drum-note-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/drum-note-performer.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/drum-note-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - #include "audio-item.hh" - #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_dynamic-engraver.cc b/print/lilypond/patches/patch-lily_dynamic-engraver.cc deleted file mode 100644 index bfdf5c9a0c5..00000000000 --- a/print/lilypond/patches/patch-lily_dynamic-engraver.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_dynamic-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/dynamic-engraver.cc.orig 2013-06-16 19:18:47.000000000 +0000 -+++ lily/dynamic-engraver.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "axis-group-interface.hh" - #include "context.hh" - #include "engraver.hh" diff --git a/print/lilypond/patches/patch-lily_dynamic-performer.cc b/print/lilypond/patches/patch-lily_dynamic-performer.cc deleted file mode 100644 index b6754750d99..00000000000 --- a/print/lilypond/patches/patch-lily_dynamic-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_dynamic-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/dynamic-performer.cc.orig 2013-06-16 18:48:59.000000000 +0000 -+++ lily/dynamic-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - #include "audio-item.hh" - #include "stream-event.hh" diff --git a/print/lilypond/patches/patch-lily_event-chord-iterator.cc b/print/lilypond/patches/patch-lily_event-chord-iterator.cc deleted file mode 100644 index 8bc14937b9b..00000000000 --- a/print/lilypond/patches/patch-lily_event-chord-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_event-chord-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/event-chord-iterator.cc.orig 2013-06-16 19:25:55.000000000 +0000 -+++ lily/event-chord-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "event-chord-iterator.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_event-iterator.cc b/print/lilypond/patches/patch-lily_event-iterator.cc deleted file mode 100644 index a1278cd6d18..00000000000 --- a/print/lilypond/patches/patch-lily_event-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_event-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/event-iterator.cc.orig 2013-06-16 19:11:41.000000000 +0000 -+++ lily/event-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "event-iterator.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_flag.cc b/print/lilypond/patches/patch-lily_flag.cc deleted file mode 100644 index 352c7bc3639..00000000000 --- a/print/lilypond/patches/patch-lily_flag.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lily_flag.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/flag.cc.orig 2013-06-16 19:24:59.000000000 +0000 -+++ lily/flag.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "stem.hh" - - #include "directional-element-interface.hh" -@@ -106,7 +107,7 @@ Flag::print (SCM smob) - - char dir = (d == UP) ? 'u' : 'd'; - string font_char = flag_style -- + to_string (dir) + staffline_offs + to_string (log); -+ + ::to_string (dir) + staffline_offs + ::to_string (log); - Font_metric *fm = Font_interface::get_default_font (me); - Stencil flag = fm->find_by_name ("flags." + font_char); - if (flag.is_empty ()) diff --git a/print/lilypond/patches/patch-lily_font-select.cc b/print/lilypond/patches/patch-lily_font-select.cc deleted file mode 100644 index 97b73a2f868..00000000000 --- a/print/lilypond/patches/patch-lily_font-select.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_font-select.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/font-select.cc.orig 2013-06-16 18:56:07.000000000 +0000 -+++ lily/font-select.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "dimensions.hh" - #include "all-font-metrics.hh" - #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_global-ctor.cc b/print/lilypond/patches/patch-lily_global-ctor.cc deleted file mode 100644 index d27b8555fb3..00000000000 --- a/print/lilypond/patches/patch-lily_global-ctor.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_global-ctor.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/global-ctor.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/global-ctor.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "global-ctor.hh" - - #include "std-vector.hh" diff --git a/print/lilypond/patches/patch-lily_grace-iterator.cc b/print/lilypond/patches/patch-lily_grace-iterator.cc deleted file mode 100644 index 107fdd557d3..00000000000 --- a/print/lilypond/patches/patch-lily_grace-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_grace-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/grace-iterator.cc.orig 2013-06-16 19:04:30.000000000 +0000 -+++ lily/grace-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "grace-iterator.hh" - #include "global-context.hh" - #include "warn.hh" diff --git a/print/lilypond/patches/patch-lily_grob-property.cc b/print/lilypond/patches/patch-lily_grob-property.cc deleted file mode 100644 index 046309f5eb6..00000000000 --- a/print/lilypond/patches/patch-lily_grob-property.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_grob-property.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/grob-property.cc.orig 2013-06-16 19:15:44.000000000 +0000 -+++ lily/grob-property.cc -@@ -2,6 +2,7 @@ - Implement storage and manipulation of grob properties. - */ - -+#include "config.hh" - #include <cstring> - - #include "main.hh" diff --git a/print/lilypond/patches/patch-lily_grob.cc b/print/lilypond/patches/patch-lily_grob.cc deleted file mode 100644 index 450cdc6273c..00000000000 --- a/print/lilypond/patches/patch-lily_grob.cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-lily_grob.cc,v 1.1 2013/04/01 12:20:47 joerg Exp $ - -Issue 3201. - ---- lily/grob.cc.orig 2013-03-31 15:06:04.000000000 +0000 -+++ lily/grob.cc -@@ -82,13 +82,16 @@ Grob::Grob (SCM basicprops) - } - - Grob::Grob (Grob const &s) -- : dim_cache_ (s.dim_cache_) - { - original_ = (Grob *) & s; - self_scm_ = SCM_EOL; - - immutable_property_alist_ = s.immutable_property_alist_; - mutable_property_alist_ = SCM_EOL; -+ -+ for (Axis a = X_AXIS; a < NO_AXES; incr (a)) -+ dim_cache_ [a] = s.dim_cache_ [a]; -+ - interfaces_ = s.interfaces_; - object_alist_ = SCM_EOL; - diff --git a/print/lilypond/patches/patch-lily_horizontal-bracket.cc b/print/lilypond/patches/patch-lily_horizontal-bracket.cc deleted file mode 100644 index a54963ba578..00000000000 --- a/print/lilypond/patches/patch-lily_horizontal-bracket.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_horizontal-bracket.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/horizontal-bracket.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/horizontal-bracket.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "horizontal-bracket.hh" - - #include "lookup.hh" diff --git a/print/lilypond/patches/patch-lily_includable-lexer.cc b/print/lilypond/patches/patch-lily_includable-lexer.cc deleted file mode 100644 index e5d8bd9fc76..00000000000 --- a/print/lilypond/patches/patch-lily_includable-lexer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_includable-lexer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/includable-lexer.cc.orig 2013-06-16 19:23:45.000000000 +0000 -+++ lily/includable-lexer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "includable-lexer.hh" - - #include <sstream> diff --git a/print/lilypond/patches/patch-lily_include_lily-proto.hh b/print/lilypond/patches/patch-lily_include_lily-proto.hh deleted file mode 100644 index 56acfdc29b9..00000000000 --- a/print/lilypond/patches/patch-lily_include_lily-proto.hh +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-lily_include_lily-proto.hh,v 1.1 2013/04/01 12:20:47 joerg Exp $ - -Issue 2208. - ---- lily/include/lily-proto.hh.orig 2013-03-31 14:59:54.000000000 +0000 -+++ lily/include/lily-proto.hh -@@ -198,9 +198,6 @@ class Translator_change; - class Translator_group; - class Transposed_music; - class yyFlexLexer; -- --typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *, -- Grob_info); --typedef void (*Translator_void_method_ptr) (Translator *); -- -+typedef void (Engraver::*Engraver_void_function_engraver_grob_info) (Grob_info); -+typedef void (Translator::*Translator_void_method_ptr) (); - #endif /* LILY_PROTO_HH */ diff --git a/print/lilypond/patches/patch-lily_include_translator-group.hh b/print/lilypond/patches/patch-lily_include_translator-group.hh deleted file mode 100644 index 5778190956e..00000000000 --- a/print/lilypond/patches/patch-lily_include_translator-group.hh +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lily_include_translator-group.hh,v 1.1 2013/04/01 12:20:47 joerg Exp $ - -Issue 2208. - ---- lily/include/translator-group.hh.orig 2013-03-31 15:00:25.000000000 +0000 -+++ lily/include/translator-group.hh -@@ -43,7 +43,7 @@ struct Translator_method_binding - void invoke () - { - if (method_) -- (*method_) (translator_); -+ (translator_->*method_)(); - } - }; - diff --git a/print/lilypond/patches/patch-lily_input.cc b/print/lilypond/patches/patch-lily_input.cc deleted file mode 100644 index 1f18f90c4f7..00000000000 --- a/print/lilypond/patches/patch-lily_input.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_input.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/input.cc.orig 2013-06-16 18:50:37.000000000 +0000 -+++ lily/input.cc -@@ -142,7 +142,7 @@ string - Input::line_number_string () const - { - if (source_file_) -- return to_string (source_file_->get_line (start_)); -+ return ::to_string (source_file_->get_line (start_)); - return "?"; - } - diff --git a/print/lilypond/patches/patch-lily_instrument-name-engraver.cc b/print/lilypond/patches/patch-lily_instrument-name-engraver.cc deleted file mode 100644 index deefe90e471..00000000000 --- a/print/lilypond/patches/patch-lily_instrument-name-engraver.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_instrument-name-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/instrument-name-engraver.cc.orig 2013-06-16 18:49:53.000000000 +0000 -+++ lily/instrument-name-engraver.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "align-interface.hh" - #include "axis-group-interface.hh" - #include "engraver.hh" diff --git a/print/lilypond/patches/patch-lily_interval-minefield.cc b/print/lilypond/patches/patch-lily_interval-minefield.cc deleted file mode 100644 index b2c98399efb..00000000000 --- a/print/lilypond/patches/patch-lily_interval-minefield.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_interval-minefield.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/interval-minefield.cc.orig 2013-06-16 18:46:53.000000000 +0000 -+++ lily/interval-minefield.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "interval-minefield.hh" - #include "grob.hh" - Interval_minefield::Interval_minefield (Interval feasible_placements, Real bulk) diff --git a/print/lilypond/patches/patch-lily_key-signature-interface.cc b/print/lilypond/patches/patch-lily_key-signature-interface.cc deleted file mode 100644 index b98c15ae6ca..00000000000 --- a/print/lilypond/patches/patch-lily_key-signature-interface.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_key-signature-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/key-signature-interface.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/key-signature-interface.cc -@@ -19,6 +19,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "accidental-interface.hh" - #include "font-interface.hh" - #include "international.hh" diff --git a/print/lilypond/patches/patch-lily_keyword.cc b/print/lilypond/patches/patch-lily_keyword.cc deleted file mode 100644 index 95472028706..00000000000 --- a/print/lilypond/patches/patch-lily_keyword.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_keyword.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/keyword.cc.orig 2013-06-16 19:26:46.000000000 +0000 -+++ lily/keyword.cc -@@ -2,6 +2,7 @@ - keyword.cc -- keywords and identifiers - */ - -+#include "config.hh" - #include "keyword.hh" - - #include <cstring> diff --git a/print/lilypond/patches/patch-lily_least-squares.cc b/print/lilypond/patches/patch-lily_least-squares.cc deleted file mode 100644 index e4a690dff48..00000000000 --- a/print/lilypond/patches/patch-lily_least-squares.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_least-squares.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/least-squares.cc.orig 2013-06-16 19:19:17.000000000 +0000 -+++ lily/least-squares.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "least-squares.hh" - - #include "warn.hh" diff --git a/print/lilypond/patches/patch-lily_ledger-line-engraver.cc b/print/lilypond/patches/patch-lily_ledger-line-engraver.cc deleted file mode 100644 index eba37d52d72..00000000000 --- a/print/lilypond/patches/patch-lily_ledger-line-engraver.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_ledger-line-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/ledger-line-engraver.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/ledger-line-engraver.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "pointer-group-interface.hh" - #include "spanner.hh" - #include "engraver.hh" diff --git a/print/lilypond/patches/patch-lily_lexer.ll b/print/lilypond/patches/patch-lily_lexer.ll deleted file mode 100644 index 64e15f7d87b..00000000000 --- a/print/lilypond/patches/patch-lily_lexer.ll +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_lexer.ll,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/lexer.ll.orig 2013-06-16 19:42:27.000000000 +0000 -+++ lily/lexer.ll -@@ -41,6 +41,7 @@ - - - -+#include "config.hh" - #include <cstdio> - #include <cctype> - #include <cerrno> diff --git a/print/lilypond/patches/patch-lily_lily-lexer-scheme.cc b/print/lilypond/patches/patch-lily_lily-lexer-scheme.cc deleted file mode 100644 index ce21e1436b0..00000000000 --- a/print/lilypond/patches/patch-lily_lily-lexer-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_lily-lexer-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/lily-lexer-scheme.cc.orig 2013-06-16 19:27:04.000000000 +0000 -+++ lily/lily-lexer-scheme.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "lily-lexer.hh" - - LY_DEFINE (ly_lexer_keywords, "ly:lexer-keywords", diff --git a/print/lilypond/patches/patch-lily_lily-lexer.cc b/print/lilypond/patches/patch-lily_lily-lexer.cc deleted file mode 100644 index 810af681e7e..00000000000 --- a/print/lilypond/patches/patch-lily_lily-lexer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_lily-lexer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/lily-lexer.cc.orig 2013-06-16 18:55:24.000000000 +0000 -+++ lily/lily-lexer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "lily-lexer.hh" - - #include <cctype> diff --git a/print/lilypond/patches/patch-lily_lilypond-version.cc b/print/lilypond/patches/patch-lily_lilypond-version.cc deleted file mode 100644 index 13160afe79a..00000000000 --- a/print/lilypond/patches/patch-lily_lilypond-version.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_lilypond-version.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/lilypond-version.cc.orig 2013-06-16 19:22:55.000000000 +0000 -+++ lily/lilypond-version.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include <ctype.h> - - #include "lilypond-version.hh" diff --git a/print/lilypond/patches/patch-lily_line-spanner.cc b/print/lilypond/patches/patch-lily_line-spanner.cc deleted file mode 100644 index 6fd14699ace..00000000000 --- a/print/lilypond/patches/patch-lily_line-spanner.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_line-spanner.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/line-spanner.cc.orig 2013-06-16 19:07:21.000000000 +0000 -+++ lily/line-spanner.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "align-interface.hh" - #include "axis-group-interface.hh" - #include "font-interface.hh" diff --git a/print/lilypond/patches/patch-lily_main.cc b/print/lilypond/patches/patch-lily_main.cc deleted file mode 100644 index 082b2647b58..00000000000 --- a/print/lilypond/patches/patch-lily_main.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_main.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/main.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/main.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "main.hh" - - #include <cassert> diff --git a/print/lilypond/patches/patch-lily_mensural-ligature.cc b/print/lilypond/patches/patch-lily_mensural-ligature.cc deleted file mode 100644 index 007bce7c615..00000000000 --- a/print/lilypond/patches/patch-lily_mensural-ligature.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_mensural-ligature.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/mensural-ligature.cc.orig 2013-06-16 19:09:43.000000000 +0000 -+++ lily/mensural-ligature.cc -@@ -168,7 +168,7 @@ internal_brew_primitive (Grob *me) - duration_log--; - case MLP_BREVIS: - duration_log--; -- suffix = to_string (duration_log) + color -+ suffix = ::to_string (duration_log) + color - + (duration_log < -1 ? "lig" : "") + "mensural"; - index = prefix + "s"; - out = fm->find_by_name (index + "r" + suffix); diff --git a/print/lilypond/patches/patch-lily_midi-chunk.cc b/print/lilypond/patches/patch-lily_midi-chunk.cc deleted file mode 100644 index c9e9e2bc96e..00000000000 --- a/print/lilypond/patches/patch-lily_midi-chunk.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_midi-chunk.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/midi-chunk.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/midi-chunk.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "midi-chunk.hh" - - #include "midi-item.hh" diff --git a/print/lilypond/patches/patch-lily_midi-stream.cc b/print/lilypond/patches/patch-lily_midi-stream.cc deleted file mode 100644 index 3dc551f9a89..00000000000 --- a/print/lilypond/patches/patch-lily_midi-stream.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_midi-stream.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/midi-stream.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/midi-stream.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "midi-stream.hh" - - #include <cerrno> diff --git a/print/lilypond/patches/patch-lily_midi-walker.cc b/print/lilypond/patches/patch-lily_midi-walker.cc deleted file mode 100644 index 106609952fe..00000000000 --- a/print/lilypond/patches/patch-lily_midi-walker.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_midi-walker.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/midi-walker.cc.orig 2013-06-16 19:26:10.000000000 +0000 -+++ lily/midi-walker.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "midi-walker.hh" - - #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_misc.cc b/print/lilypond/patches/patch-lily_misc.cc deleted file mode 100644 index b3536722947..00000000000 --- a/print/lilypond/patches/patch-lily_misc.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_misc.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/misc.cc.orig 2013-06-16 19:28:17.000000000 +0000 -+++ lily/misc.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "misc.hh" - #include "warn.hh" - diff --git a/print/lilypond/patches/patch-lily_music-wrapper-iterator.cc b/print/lilypond/patches/patch-lily_music-wrapper-iterator.cc deleted file mode 100644 index 9ac88572b36..00000000000 --- a/print/lilypond/patches/patch-lily_music-wrapper-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_music-wrapper-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/music-wrapper-iterator.cc.orig 2013-06-16 19:26:26.000000000 +0000 -+++ lily/music-wrapper-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "music-wrapper-iterator.hh" - #include "music-wrapper.hh" - #include "music.hh" diff --git a/print/lilypond/patches/patch-lily_note-collision.cc b/print/lilypond/patches/patch-lily_note-collision.cc deleted file mode 100644 index 9b01a98bfce..00000000000 --- a/print/lilypond/patches/patch-lily_note-collision.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_note-collision.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/note-collision.cc.orig 2013-06-16 19:10:25.000000000 +0000 -+++ lily/note-collision.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "note-collision.hh" - - #include "axis-group-interface.hh" diff --git a/print/lilypond/patches/patch-lily_note-head.cc b/print/lilypond/patches/patch-lily_note-head.cc deleted file mode 100644 index 30696c2c3be..00000000000 --- a/print/lilypond/patches/patch-lily_note-head.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_note-head.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/note-head.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/note-head.cc -@@ -38,7 +38,7 @@ internal_print (Grob *me, string *font_c - { - string style = robust_symbol2string (me->get_property ("style"), "default"); - -- string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); -+ string suffix = ::to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); - if (style != "default") - suffix = robust_scm2string (me->get_property ("glyph-name"), ""); - diff --git a/print/lilypond/patches/patch-lily_note-performer.cc b/print/lilypond/patches/patch-lily_note-performer.cc deleted file mode 100644 index 1ec9ff53cbd..00000000000 --- a/print/lilypond/patches/patch-lily_note-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_note-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/note-performer.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/note-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - #include "audio-item.hh" - #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_ottava-bracket.cc b/print/lilypond/patches/patch-lily_ottava-bracket.cc deleted file mode 100644 index f50d3375db9..00000000000 --- a/print/lilypond/patches/patch-lily_ottava-bracket.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_ottava-bracket.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/ottava-bracket.cc.orig 2013-06-16 19:16:55.000000000 +0000 -+++ lily/ottava-bracket.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "axis-group-interface.hh" - #include "text-interface.hh" - #include "spanner.hh" diff --git a/print/lilypond/patches/patch-lily_page-breaking-scheme.cc b/print/lilypond/patches/patch-lily_page-breaking-scheme.cc deleted file mode 100644 index 6cddfe72723..00000000000 --- a/print/lilypond/patches/patch-lily_page-breaking-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_page-breaking-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/page-breaking-scheme.cc.orig 2013-06-16 18:45:30.000000000 +0000 -+++ lily/page-breaking-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-book.hh" - #include "page-turn-page-breaking.hh" - #include "one-line-page-breaking.hh" diff --git a/print/lilypond/patches/patch-lily_page-layout-problem.cc b/print/lilypond/patches/patch-lily_page-layout-problem.cc deleted file mode 100644 index 36451da19d3..00000000000 --- a/print/lilypond/patches/patch-lily_page-layout-problem.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_page-layout-problem.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/page-layout-problem.cc.orig 2013-06-16 18:52:33.000000000 +0000 -+++ lily/page-layout-problem.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "page-layout-problem.hh" - - #include "align-interface.hh" diff --git a/print/lilypond/patches/patch-lily_page-spacing-result.cc b/print/lilypond/patches/patch-lily_page-spacing-result.cc deleted file mode 100644 index fdfdfbfd05b..00000000000 --- a/print/lilypond/patches/patch-lily_page-spacing-result.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_page-spacing-result.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/page-spacing-result.cc.orig 2013-06-16 19:12:54.000000000 +0000 -+++ lily/page-spacing-result.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "page-spacing-result.hh" - #include <cstdio> - diff --git a/print/lilypond/patches/patch-lily_page-turn-page-breaking.cc b/print/lilypond/patches/patch-lily_page-turn-page-breaking.cc deleted file mode 100644 index 7940127301e..00000000000 --- a/print/lilypond/patches/patch-lily_page-turn-page-breaking.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_page-turn-page-breaking.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/page-turn-page-breaking.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/page-turn-page-breaking.cc -@@ -232,7 +232,7 @@ Page_turn_page_breaking::solve () - for (vsize i = 0; i < last_break_position (); i++) - { - calc_subproblem (i); -- progress_indication (string ("[") + to_string (i + 1) + "]"); -+ progress_indication (string ("[") + ::to_string (i + 1) + "]"); - } - progress_indication ("\n"); - diff --git a/print/lilypond/patches/patch-lily_pango-font-scheme.cc b/print/lilypond/patches/patch-lily_pango-font-scheme.cc deleted file mode 100644 index cbeb6948095..00000000000 --- a/print/lilypond/patches/patch-lily_pango-font-scheme.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_pango-font-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/pango-font-scheme.cc.orig 2013-06-16 19:18:02.000000000 +0000 -+++ lily/pango-font-scheme.cc -@@ -17,6 +17,8 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" -+ - #define PANGO_ENABLE_BACKEND // ugh, why necessary? - - #include <pango/pangoft2.h> diff --git a/print/lilypond/patches/patch-lily_pango-select.cc b/print/lilypond/patches/patch-lily_pango-select.cc deleted file mode 100644 index fcecbace397..00000000000 --- a/print/lilypond/patches/patch-lily_pango-select.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_pango-select.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/pango-select.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/pango-select.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "dimensions.hh" - #include "all-font-metrics.hh" - #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_paper-book-scheme.cc b/print/lilypond/patches/patch-lily_paper-book-scheme.cc deleted file mode 100644 index b87b5ed7b5b..00000000000 --- a/print/lilypond/patches/patch-lily_paper-book-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_paper-book-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-book-scheme.cc.orig 2013-06-16 19:10:50.000000000 +0000 -+++ lily/paper-book-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-book.hh" - #include "ly-module.hh" - #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_paper-book.cc b/print/lilypond/patches/patch-lily_paper-book.cc deleted file mode 100644 index 288ca17063a..00000000000 --- a/print/lilypond/patches/patch-lily_paper-book.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_paper-book.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-book.cc.orig 2013-06-16 19:22:05.000000000 +0000 -+++ lily/paper-book.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-book.hh" - - #include "grob.hh" diff --git a/print/lilypond/patches/patch-lily_paper-column-engraver.cc b/print/lilypond/patches/patch-lily_paper-column-engraver.cc deleted file mode 100644 index b489626675b..00000000000 --- a/print/lilypond/patches/patch-lily_paper-column-engraver.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-lily_paper-column-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-column-engraver.cc.orig 2013-06-16 19:08:16.000000000 +0000 -+++ lily/paper-column-engraver.cc -@@ -49,7 +49,7 @@ void - Paper_column_engraver::finalize () - { - if (! (breaks_ % 8)) -- progress_indication ("[" + to_string (breaks_) + "]"); -+ progress_indication ("[" + ::to_string (breaks_) + "]"); - - if (!made_columns_) - { -@@ -267,7 +267,7 @@ Paper_column_engraver::stop_translation_ - breaks_++; - - if (! (breaks_ % 8)) -- progress_indication ("[" + to_string (breaks_) + "]"); -+ progress_indication ("[" + ::to_string (breaks_) + "]"); - } - - context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak")); diff --git a/print/lilypond/patches/patch-lily_paper-column.cc b/print/lilypond/patches/patch-lily_paper-column.cc deleted file mode 100644 index 1e2b0d67267..00000000000 --- a/print/lilypond/patches/patch-lily_paper-column.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_paper-column.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-column.cc.orig 2013-06-16 19:06:43.000000000 +0000 -+++ lily/paper-column.cc -@@ -227,7 +227,7 @@ Paper_column::print (SCM p) - { - Paper_column *me = dynamic_cast<Paper_column *> (unsmob_grob (p)); - -- string r = to_string (Paper_column::get_rank (me)); -+ string r = ::to_string (Paper_column::get_rank (me)); - - Moment *mom = unsmob_moment (me->get_property ("when")); - string when = mom ? mom->to_string () : "?/?"; diff --git a/print/lilypond/patches/patch-lily_paper-outputter-scheme.cc b/print/lilypond/patches/patch-lily_paper-outputter-scheme.cc deleted file mode 100644 index dba7b8a6f19..00000000000 --- a/print/lilypond/patches/patch-lily_paper-outputter-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_paper-outputter-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-outputter-scheme.cc.orig 2013-06-16 19:27:50.000000000 +0000 -+++ lily/paper-outputter-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-outputter.hh" - - #include "international.hh" diff --git a/print/lilypond/patches/patch-lily_paper-outputter.cc b/print/lilypond/patches/patch-lily_paper-outputter.cc deleted file mode 100644 index e19f218dbb5..00000000000 --- a/print/lilypond/patches/patch-lily_paper-outputter.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_paper-outputter.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-outputter.cc.orig 2013-06-16 18:44:44.000000000 +0000 -+++ lily/paper-outputter.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-outputter.hh" - - #include <cmath> diff --git a/print/lilypond/patches/patch-lily_paper-score-scheme.cc b/print/lilypond/patches/patch-lily_paper-score-scheme.cc deleted file mode 100644 index 461bdff92c8..00000000000 --- a/print/lilypond/patches/patch-lily_paper-score-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_paper-score-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-score-scheme.cc.orig 2013-06-16 19:56:35.000000000 +0000 -+++ lily/paper-score-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-score.hh" - - LY_DEFINE (ly_paper_score_paper_systems, "ly:paper-score-paper-systems", diff --git a/print/lilypond/patches/patch-lily_paper-score.cc b/print/lilypond/patches/patch-lily_paper-score.cc deleted file mode 100644 index a4789aba609..00000000000 --- a/print/lilypond/patches/patch-lily_paper-score.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_paper-score.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/paper-score.cc.orig 2013-06-16 18:58:54.000000000 +0000 -+++ lily/paper-score.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "paper-score.hh" - - #include "all-font-metrics.hh" diff --git a/print/lilypond/patches/patch-lily_parser.yy b/print/lilypond/patches/patch-lily_parser.yy deleted file mode 100644 index d15df39741f..00000000000 --- a/print/lilypond/patches/patch-lily_parser.yy +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lily_parser.yy,v 1.1 2013/07/31 14:11:57 wiz Exp $ - -Fix for bison-3.0. - ---- lily/parser.yy.orig 2013-01-04 13:41:57.000000000 +0000 -+++ lily/parser.yy -@@ -100,7 +100,7 @@ or - - - --%pure_parser -+%pure-parser - %locations - - diff --git a/print/lilypond/patches/patch-lily_performance-scheme.cc b/print/lilypond/patches/patch-lily_performance-scheme.cc deleted file mode 100644 index 3ddd51ee782..00000000000 --- a/print/lilypond/patches/patch-lily_performance-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_performance-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/performance-scheme.cc.orig 2013-06-16 18:43:44.000000000 +0000 -+++ lily/performance-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performance.hh" - - LY_DEFINE (ly_performance_write, "ly:performance-write", diff --git a/print/lilypond/patches/patch-lily_performance.cc b/print/lilypond/patches/patch-lily_performance.cc deleted file mode 100644 index c97c74a7338..00000000000 --- a/print/lilypond/patches/patch-lily_performance.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lily_performance.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/performance.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/performance.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performance.hh" - - #include <ctime> -@@ -56,7 +57,7 @@ Performance::output (Midi_stream &midi_s - for (vsize i = 0; i < audio_staffs_.size (); i++) - { - Audio_staff *s = audio_staffs_[i]; -- debug_output ("[" + to_string (i), true); -+ debug_output ("[" + ::to_string (i), true); - s->output (midi_stream, i, ports_); - debug_output ("]", false); - } diff --git a/print/lilypond/patches/patch-lily_performer-group.cc b/print/lilypond/patches/patch-lily_performer-group.cc deleted file mode 100644 index d4d470b899a..00000000000 --- a/print/lilypond/patches/patch-lily_performer-group.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_performer-group.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/performer-group.cc.orig 2013-06-16 18:53:39.000000000 +0000 -+++ lily/performer-group.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer-group.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_piano-pedal-performer.cc b/print/lilypond/patches/patch-lily_piano-pedal-performer.cc deleted file mode 100644 index a8cdbbf5d5e..00000000000 --- a/print/lilypond/patches/patch-lily_piano-pedal-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_piano-pedal-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/piano-pedal-performer.cc.orig 2013-06-16 18:48:08.000000000 +0000 -+++ lily/piano-pedal-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - - #include "audio-item.hh" diff --git a/print/lilypond/patches/patch-lily_pointer-group-interface-scheme.cc b/print/lilypond/patches/patch-lily_pointer-group-interface-scheme.cc deleted file mode 100644 index 2e8390d8ecc..00000000000 --- a/print/lilypond/patches/patch-lily_pointer-group-interface-scheme.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_pointer-group-interface-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/pointer-group-interface-scheme.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/pointer-group-interface-scheme.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "pointer-group-interface.hh" - #include "grob.hh" - diff --git a/print/lilypond/patches/patch-lily_pointer-group-interface.cc b/print/lilypond/patches/patch-lily_pointer-group-interface.cc deleted file mode 100644 index b59e190b7cc..00000000000 --- a/print/lilypond/patches/patch-lily_pointer-group-interface.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_pointer-group-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/pointer-group-interface.cc.orig 2013-06-16 19:23:13.000000000 +0000 -+++ lily/pointer-group-interface.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "pointer-group-interface.hh" - - #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_property-iterator.cc b/print/lilypond/patches/patch-lily_property-iterator.cc deleted file mode 100644 index a69b225f1a6..00000000000 --- a/print/lilypond/patches/patch-lily_property-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_property-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/property-iterator.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/property-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "property-iterator.hh" - - #include "context-def.hh" diff --git a/print/lilypond/patches/patch-lily_pure-from-neighbor-interface.cc b/print/lilypond/patches/patch-lily_pure-from-neighbor-interface.cc deleted file mode 100644 index 311266c4329..00000000000 --- a/print/lilypond/patches/patch-lily_pure-from-neighbor-interface.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_pure-from-neighbor-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/pure-from-neighbor-interface.cc.orig 2013-06-16 19:22:25.000000000 +0000 -+++ lily/pure-from-neighbor-interface.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "axis-group-interface.hh" - #include "grob.hh" - #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_quote-iterator.cc b/print/lilypond/patches/patch-lily_quote-iterator.cc deleted file mode 100644 index ebe473ae049..00000000000 --- a/print/lilypond/patches/patch-lily_quote-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_quote-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/quote-iterator.cc.orig 2013-06-16 19:20:57.000000000 +0000 -+++ lily/quote-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "music-wrapper-iterator.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_rest.cc b/print/lilypond/patches/patch-lily_rest.cc deleted file mode 100644 index 7ee1e9519b7..00000000000 --- a/print/lilypond/patches/patch-lily_rest.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_rest.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/rest.cc.orig 2013-06-16 19:00:53.000000000 +0000 -+++ lily/rest.cc -@@ -169,7 +169,7 @@ Rest::glyph_name (Grob *me, int durlog, - actual_style = ""; - } - -- return ("rests." + to_string (durlog) + (is_ledgered ? "o" : "") -+ return ("rests." + ::to_string (durlog) + (is_ledgered ? "o" : "") - + actual_style); - } - diff --git a/print/lilypond/patches/patch-lily_rhythmic-music-iterator.cc b/print/lilypond/patches/patch-lily_rhythmic-music-iterator.cc deleted file mode 100644 index cf53c2ecba5..00000000000 --- a/print/lilypond/patches/patch-lily_rhythmic-music-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_rhythmic-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/rhythmic-music-iterator.cc.orig 2013-06-16 18:51:27.000000000 +0000 -+++ lily/rhythmic-music-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "rhythmic-music-iterator.hh" - - #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_sequential-iterator.cc b/print/lilypond/patches/patch-lily_sequential-iterator.cc deleted file mode 100644 index b905785daa4..00000000000 --- a/print/lilypond/patches/patch-lily_sequential-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_sequential-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/sequential-iterator.cc.orig 2013-06-16 18:49:30.000000000 +0000 -+++ lily/sequential-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "sequential-iterator.hh" - #include "music.hh" - #include "translator-group.hh" diff --git a/print/lilypond/patches/patch-lily_simple-music-iterator.cc b/print/lilypond/patches/patch-lily_simple-music-iterator.cc deleted file mode 100644 index 1fe45c9684c..00000000000 --- a/print/lilypond/patches/patch-lily_simple-music-iterator.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_simple-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/simple-music-iterator.cc.orig 2013-06-16 19:07:39.000000000 +0000 -+++ lily/simple-music-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "simple-music-iterator.hh" - - #include "music.hh" diff --git a/print/lilypond/patches/patch-lily_simple-spacer.cc b/print/lilypond/patches/patch-lily_simple-spacer.cc deleted file mode 100644 index cda751f9067..00000000000 --- a/print/lilypond/patches/patch-lily_simple-spacer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_simple-spacer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/simple-spacer.cc.orig 2013-06-16 19:01:36.000000000 +0000 -+++ lily/simple-spacer.cc -@@ -20,6 +20,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include <cstdio> - - #include "column-x-positions.hh" diff --git a/print/lilypond/patches/patch-lily_simultaneous-music-iterator.cc b/print/lilypond/patches/patch-lily_simultaneous-music-iterator.cc deleted file mode 100644 index 44d08242f76..00000000000 --- a/print/lilypond/patches/patch-lily_simultaneous-music-iterator.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lily_simultaneous-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/simultaneous-music-iterator.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/simultaneous-music-iterator.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "simultaneous-music-iterator.hh" - #include "music.hh" - #include "context.hh" -@@ -63,7 +64,7 @@ Simultaneous_music_iterator::construct_c - - SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); - Context *c = (j && create_separate_contexts_) -- ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL) -+ ? get_outlet ()->find_create_context (name, ::to_string (j), SCM_EOL) - : get_outlet (); - - if (!c) diff --git a/print/lilypond/patches/patch-lily_slur-configuration.cc b/print/lilypond/patches/patch-lily_slur-configuration.cc deleted file mode 100644 index ad6cb914fa3..00000000000 --- a/print/lilypond/patches/patch-lily_slur-configuration.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_slur-configuration.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/slur-configuration.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/slur-configuration.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "slur-configuration.hh" - - #include "item.hh" diff --git a/print/lilypond/patches/patch-lily_slur-performer.cc b/print/lilypond/patches/patch-lily_slur-performer.cc deleted file mode 100644 index 3af0fd4edcf..00000000000 --- a/print/lilypond/patches/patch-lily_slur-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_slur-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/slur-performer.cc.orig 2013-06-16 19:24:05.000000000 +0000 -+++ lily/slur-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - #include "audio-item.hh" - #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_slur.cc b/print/lilypond/patches/patch-lily_slur.cc deleted file mode 100644 index bd009e702e2..00000000000 --- a/print/lilypond/patches/patch-lily_slur.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_slur.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/slur.cc.orig 2013-06-16 18:48:41.000000000 +0000 -+++ lily/slur.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "slur.hh" - #include "grob-info.hh" - #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_source-file.cc b/print/lilypond/patches/patch-lily_source-file.cc deleted file mode 100644 index 2424d75de4e..00000000000 --- a/print/lilypond/patches/patch-lily_source-file.cc +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-lily_source-file.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/source-file.cc.orig 2013-06-16 19:14:53.000000000 +0000 -+++ lily/source-file.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #if GCC_MAJOR < 4 - #define _GLIBCXX_HAVE_MBSTATE_T - #include <wchar.h> -@@ -181,8 +182,8 @@ Source_file::file_line_column_string (ch - int l, ch, col, offset; - get_counts (context_str0, &l, &ch, &col, &offset); - -- return name_string () + ":" + to_string (l) -- + ":" + to_string (col); -+ return name_string () + ":" + ::to_string (l) -+ + ":" + ::to_string (col); - } - } - diff --git a/print/lilypond/patches/patch-lily_sources.cc b/print/lilypond/patches/patch-lily_sources.cc deleted file mode 100644 index 726cb83dfaf..00000000000 --- a/print/lilypond/patches/patch-lily_sources.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_sources.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/sources.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/sources.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "sources.hh" - - #include "config.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-basic.cc b/print/lilypond/patches/patch-lily_spacing-basic.cc deleted file mode 100644 index 09ac871a56f..00000000000 --- a/print/lilypond/patches/patch-lily_spacing-basic.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_spacing-basic.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/spacing-basic.cc.orig 2013-06-16 18:45:13.000000000 +0000 -+++ lily/spacing-basic.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "spacing-spanner.hh" - - #include "spacing-options.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-loose-columns.cc b/print/lilypond/patches/patch-lily_spacing-loose-columns.cc deleted file mode 100644 index d8325c84e63..00000000000 --- a/print/lilypond/patches/patch-lily_spacing-loose-columns.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_spacing-loose-columns.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/spacing-loose-columns.cc.orig 2013-06-16 18:57:45.000000000 +0000 -+++ lily/spacing-loose-columns.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "system.hh" - #include "paper-column.hh" - #include "column-x-positions.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-options.cc b/print/lilypond/patches/patch-lily_spacing-options.cc deleted file mode 100644 index b7bf6d9884e..00000000000 --- a/print/lilypond/patches/patch-lily_spacing-options.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_spacing-options.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/spacing-options.cc.orig 2013-06-16 19:02:52.000000000 +0000 -+++ lily/spacing-options.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "spacing-options.hh" - #include "spacing-spanner.hh" - #include "grob.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-spanner.cc b/print/lilypond/patches/patch-lily_spacing-spanner.cc deleted file mode 100644 index fea5b18bf0d..00000000000 --- a/print/lilypond/patches/patch-lily_spacing-spanner.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_spacing-spanner.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/spacing-spanner.cc.orig 2013-06-16 19:05:36.000000000 +0000 -+++ lily/spacing-spanner.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "spacing-spanner.hh" - - #include <math.h> diff --git a/print/lilypond/patches/patch-lily_span-bar-stub-engraver.cc b/print/lilypond/patches/patch-lily_span-bar-stub-engraver.cc deleted file mode 100644 index 1491ab846da..00000000000 --- a/print/lilypond/patches/patch-lily_span-bar-stub-engraver.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_span-bar-stub-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/span-bar-stub-engraver.cc.orig 2013-06-16 19:21:44.000000000 +0000 -+++ lily/span-bar-stub-engraver.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include <algorithm> - - #include "align-interface.hh" diff --git a/print/lilypond/patches/patch-lily_stem.cc b/print/lilypond/patches/patch-lily_stem.cc deleted file mode 100644 index 72548a941d5..00000000000 --- a/print/lilypond/patches/patch-lily_stem.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_stem.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/stem.cc.orig 2013-06-16 19:03:50.000000000 +0000 -+++ lily/stem.cc -@@ -37,6 +37,7 @@ - internal_height and internal_pure_height for all subsequent iterations. - */ - -+#include "config.hh" - #include "stem.hh" - #include "spanner.hh" - diff --git a/print/lilypond/patches/patch-lily_system-start-delimiter.cc b/print/lilypond/patches/patch-lily_system-start-delimiter.cc deleted file mode 100644 index 6048215981a..00000000000 --- a/print/lilypond/patches/patch-lily_system-start-delimiter.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lily_system-start-delimiter.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/system-start-delimiter.cc.orig 2013-06-16 18:42:09.000000000 +0000 -+++ lily/system-start-delimiter.cc -@@ -169,7 +169,7 @@ System_start_delimiter::staff_brace (Gro - } - while (hi - lo > 1); - -- Stencil stil (fm->find_by_name ("brace" + to_string (lo))); -+ Stencil stil (fm->find_by_name ("brace" + ::to_string (lo))); - stil.translate_axis (-b[X_AXIS].length () / 2, X_AXIS); - - stil.translate_axis (-0.2, X_AXIS); diff --git a/print/lilypond/patches/patch-lily_system.cc b/print/lilypond/patches/patch-lily_system.cc deleted file mode 100644 index 5826bd25c3a..00000000000 --- a/print/lilypond/patches/patch-lily_system.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lily_system.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/system.cc.orig 2013-06-16 18:54:24.000000000 +0000 -+++ lily/system.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "system.hh" - - #include "align-interface.hh" -@@ -222,7 +223,7 @@ System::get_paper_systems () - scm_vector_set_x (lines, scm_from_int (i), - system->get_paper_system ()); - -- debug_output (to_string (i) + "]", false); -+ debug_output (::to_string (i) + "]", false); - } - return lines; - } diff --git a/print/lilypond/patches/patch-lily_tempo-performer.cc b/print/lilypond/patches/patch-lily_tempo-performer.cc deleted file mode 100644 index ce96e39267e..00000000000 --- a/print/lilypond/patches/patch-lily_tempo-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_tempo-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/tempo-performer.cc.orig 2013-06-16 19:10:03.000000000 +0000 -+++ lily/tempo-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - - #include "audio-item.hh" diff --git a/print/lilypond/patches/patch-lily_tie-configuration.cc b/print/lilypond/patches/patch-lily_tie-configuration.cc deleted file mode 100644 index 254d2622484..00000000000 --- a/print/lilypond/patches/patch-lily_tie-configuration.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_tie-configuration.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/tie-configuration.cc.orig 2013-06-16 18:59:33.000000000 +0000 -+++ lily/tie-configuration.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "tie-configuration.hh" - - #include "warn.hh" diff --git a/print/lilypond/patches/patch-lily_tie-performer.cc b/print/lilypond/patches/patch-lily_tie-performer.cc deleted file mode 100644 index 20094c9aef3..00000000000 --- a/print/lilypond/patches/patch-lily_tie-performer.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_tie-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/tie-performer.cc.orig 2013-06-16 19:28:18.000000000 +0000 -+++ lily/tie-performer.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "performer.hh" - - #include "audio-item.hh" diff --git a/print/lilypond/patches/patch-lily_time-signature.cc b/print/lilypond/patches/patch-lily_time-signature.cc deleted file mode 100644 index 55780ef6b5d..00000000000 --- a/print/lilypond/patches/patch-lily_time-signature.cc +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-lily_time-signature.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/time-signature.cc.orig 2013-06-16 18:56:50.000000000 +0000 -+++ lily/time-signature.cc -@@ -77,7 +77,7 @@ Time_signature::special_time_signature ( - return numbered_time_signature (me, n, d); - } - -- string char_name = style + to_string (n) + to_string (d); -+ string char_name = style + ::to_string (n) + ::to_string (d); - me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic")); - Stencil out = Font_interface::get_default_font (me) - ->find_by_name ("timesig." + char_name); -@@ -100,9 +100,9 @@ Time_signature::numbered_time_signature - chain); - - SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, -- ly_string2scm (to_string (num))); -+ ly_string2scm (::to_string (num))); - SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, -- ly_string2scm (to_string (den))); -+ ly_string2scm (::to_string (den))); - - Stencil n = *unsmob_stencil (sn); - Stencil d = *unsmob_stencil (sd); diff --git a/print/lilypond/patches/patch-lily_translator-dispatch-list.cc b/print/lilypond/patches/patch-lily_translator-dispatch-list.cc deleted file mode 100644 index dea161805cc..00000000000 --- a/print/lilypond/patches/patch-lily_translator-dispatch-list.cc +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-lily_translator-dispatch-list.cc,v 1.2 2013/06/16 20:46:52 joerg Exp $ - -Issue 2208. - ---- lily/translator-dispatch-list.cc.orig 2013-01-04 13:41:56.000000000 +0000 -+++ lily/translator-dispatch-list.cc -@@ -17,6 +17,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "translator-dispatch-list.hh" - #include "engraver.hh" - -@@ -32,7 +33,7 @@ Engraver_dispatch_list::apply (Grob_info - if (e.engraver_ == origin) - continue; - -- (*e.function_) (e.engraver_, gi); -+ (e.engraver_->*e.function_)(gi); - } - } - diff --git a/print/lilypond/patches/patch-lily_tuplet-bracket.cc b/print/lilypond/patches/patch-lily_tuplet-bracket.cc deleted file mode 100644 index 94537d4b63b..00000000000 --- a/print/lilypond/patches/patch-lily_tuplet-bracket.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_tuplet-bracket.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/tuplet-bracket.cc.orig 2013-06-16 19:17:24.000000000 +0000 -+++ lily/tuplet-bracket.cc -@@ -40,6 +40,7 @@ - todo: handle breaking elegantly. - */ - -+#include "config.hh" - #include "tuplet-bracket.hh" - #include "axis-group-interface.hh" - #include "line-interface.hh" diff --git a/print/lilypond/patches/patch-lily_tuplet-number.cc b/print/lilypond/patches/patch-lily_tuplet-number.cc deleted file mode 100644 index 75f48cd63d1..00000000000 --- a/print/lilypond/patches/patch-lily_tuplet-number.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-lily_tuplet-number.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/tuplet-number.cc.orig 2013-06-16 19:03:29.000000000 +0000 -+++ lily/tuplet-number.cc -@@ -18,6 +18,7 @@ - along with LilyPond. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.hh" - #include "tuplet-bracket.hh" - #include "moment.hh" - #include "paper-column.hh" diff --git a/print/lilypond/patches/patch-lily_volta-repeat-iterator.cc b/print/lilypond/patches/patch-lily_volta-repeat-iterator.cc deleted file mode 100644 index bfa37724f13..00000000000 --- a/print/lilypond/patches/patch-lily_volta-repeat-iterator.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-lily_volta-repeat-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ - ---- lily/volta-repeat-iterator.cc.orig 2013-06-16 19:24:27.000000000 +0000 -+++ lily/volta-repeat-iterator.cc -@@ -94,7 +94,7 @@ Volta_repeat_iterator::next_element (boo - { - if (alt_count_) - { -- string repstr = to_string (rep_count_ - alt_count_ + done_count_) + "."; -+ string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + "."; - if (done_count_ > 1) - { - add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); -@@ -104,7 +104,7 @@ Volta_repeat_iterator::next_element (boo - } - - if (done_count_ == 1 && alt_count_ < rep_count_) -- repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + "."; -+ repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + "."; - - if (done_count_ <= alt_count_) - add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), diff --git a/print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh b/print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh deleted file mode 100644 index db23dd08a71..00000000000 --- a/print/lilypond/patches/patch-scripts_auxiliar_cg-section.sh +++ /dev/null @@ -1,15 +0,0 @@ -$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 - diff --git a/print/lilypond/patches/patch-stepmake_stepmake_po-targets.make b/print/lilypond/patches/patch-stepmake_stepmake_po-targets.make deleted file mode 100644 index aa13d350715..00000000000 --- a/print/lilypond/patches/patch-stepmake_stepmake_po-targets.make +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-stepmake_stepmake_po-targets.make,v 1.1 2013/11/08 21:17:56 joerg Exp $ - ---- stepmake/stepmake/po-targets.make.orig 2013-11-08 12:08:25.000000000 +0000 -+++ stepmake/stepmake/po-targets.make -@@ -36,11 +36,11 @@ ifneq ($(strip $(ALL_PO_SOURCES)),) - xgettext $(XGETTEXT_OPTIONS) --output-dir=$(po-outdir) \ - --keyword=_ --keyword=_f --keyword=_i \ - $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES) --endif --endif - sed -i '1,2d' $(po-outdir)/$(package).po - sed -i -e 's/^\# This file is distributed.*/$(sed-header)/' $(po-outdir)/$(package).po - sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/' $(po-outdir)/$(package).po -+endif -+endif - - - po-update: po |