<pre style='margin:0'>
Jeremy L (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/09756722d03ece47ed9f63a86e0f86b1489fe993">https://github.com/macports/macports-ports/commit/09756722d03ece47ed9f63a86e0f86b1489fe993</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 09756722d03 lilypond-devel: Make it a subport of 'lilypond'.
</span>09756722d03 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 09756722d03ece47ed9f63a86e0f86b1489fe993
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Fri Jul 3 19:15:34 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: Make it a subport of 'lilypond'.
</span>---
textproc/lilypond-devel/Portfile | 213 ------------------------------
textproc/lilypond-devel/files/lilypond.in | 8 --
textproc/lilypond/Portfile | 98 +++++++++-----
3 files changed, 65 insertions(+), 254 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/Portfile b/textproc/lilypond-devel/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 48e5559c511..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,213 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name lilypond-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name lilypond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.21.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories textproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {snc @nerdling} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts lilypond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description An automated engraving system for typesetting sheet music.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Lilypond is a unix-based automated engraving system that \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- generates beautiful sheet music from input files. Lilypond \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uses its own input format, .ly, which in many ways is \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- similar to LaTeX. Lilypond can export sheet music to PDF, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EPS, SVG, and PNG formats, and can also create MIDI files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://lilypond.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://lilypond.org/download/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 79a499ea4266358c2e061099e9beaaa023528367 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 af5dd5fce4f7d2850fb07104c1c837f398f336a27032e356306e6a987f86a3a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18103643
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontforge \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.28-encode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.28-pod-escapes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.28-pod-simple \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.28-podlators \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.28-scalar-list-utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:t1utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texinfo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-fonts-recommended \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-metapost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:urw-core35-fonts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Either 'pango' or 'pango-devel' will do, thus we depend on its
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# pkgconfig file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:extractpdfmark \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghostscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants fontforge python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.type gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd autoconf -f && ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lilyponddevel.texgyredir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lilyponddevel.mactex_bin ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lilyponddevel.temp ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lilyponddevel.have_texgyre false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes-append "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Pre-installation note for 'mactex' variant:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacTeX or another external TeXLive distribution gets used for\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installation instead of MacPorts's texlive packages; the path to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the TeX distribution's binary directory (for example\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '/Library/TeX/texbin') must be added to 'binpath' in\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'macports.conf' *before* installing this port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Note that TeX is not needed after installation."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mactex description {Use MacTeX or non-MacPorts TeX; see\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "port notes" for more information} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find the binary directory of the external TeX distribution by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # searching the kpsewhich program in the path. We assume that all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # other binaries of the distribution are in this directory, too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[auto_execok kpsewhich] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lilyponddevel.temp {*}[auto_execok kpsewhich]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lilyponddevel.mactex_bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [file dirname [file normalize ${lilyponddevel.temp}]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${lilyponddevel.mactex_bin} eq "."} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Cannot find MacTeX or external TeXLive\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installation; aborting. Have you added the path to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- your TeX distribution's binary directory to 'binpath'\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in 'macports.conf'?"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${lilyponddevel.mactex_bin} eq \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [file dirname [file normalize "${prefix}/bin/kpsewhich"]]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Variant 'mactex' doesn't work with\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installed MacPorts TeXLive packages. Either\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall them or don't use the 'mactex' variant of\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lilyponddevel."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lilyponddevel.have_texgyre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [regexp -line {installed: *Yes} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [exec ${lilyponddevel.mactex_bin}/tlmgr info --only-installed tex-gyre]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${lilyponddevel.have_texgyre}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lilyponddevel.texgyredir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [file dirname \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [exec ${lilyponddevel.mactex_bin}/kpsewhich texgyreschola-regular.otf]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "TeXLive package 'tex-gyre' not\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installed; aborting. Please install it, then\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try again"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:texlive-fonts-recommended \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-metapost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --disable-documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append GUILE=${prefix}/bin/guile18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append GUILE_CONFIG=${prefix}/bin/guile18-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PYTHON=${configure.python}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PYTHON=${configure.python}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PYTHON=${configure.python}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PYTHON_CONFIG=${configure.python}-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PYTHON_CONFIG=${configure.python}-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PYTHON_CONFIG=${configure.python}-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use guile18 header files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s|libguile\.h|libguile18.h|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lily/include/lily-guile.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Correct mf2pt1 binary location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s|"-mem=mf2pt1"|"-mem=../../mf2pt1"|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/build/mf2pt1.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Correct python shebang.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} -E \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s|/usr/bin/(env\\\ )?python|${configure.python}|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python/auxiliar/manuals_definitions.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/check_texi_refs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/check_translation.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/find-superfluous-includes.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/fixcc.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/makelsr.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/musicxml_generate_intervals.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/musicxml_generate_keys.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/musicxml_generate_timesignatures.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/node-menuify.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/prepare-web-media.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/readlink.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/skyline_viewer.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/strip-whitespace.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/tely-gettext.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/texi-langutils.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/translations-status.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/update-snippets.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/lilypond \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/libexec/lilypond-bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/lilypond.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/lilypond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/lilypond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant docs description {Build documentation files} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # documentation build a texi2html 1.82 bundle is necessary, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't exist yet in MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-texi2html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/development.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/files/lilypond.in b/textproc/lilypond-devel/files/lilypond.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aad03da082a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/files/lilypond.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GUILE_WARN_DEPRECATED="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LTDL_LIBRARY_PATH="@@PREFIX@@/lib:${LTDL_LIBRARY_PATH}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export GUILE_WARN_DEPRECATED LTDL_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec @@PREFIX@@/libexec/lilypond-bin "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/Portfile b/textproc/lilypond/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d005a014c1..17fcb512cf4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,11 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.20.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories textproc
maintainers {snc @nerdling} openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts lilypond-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description An automated engraving system for typesetting sheet music.
long_description Lilypond is a unix-based automated engraving system that \
generates beautiful sheet music from input files. Lilypond \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +16,38 @@ long_description Lilypond is a unix-based automated engraving system that \
</span> similar to LaTeX. Lilypond can export sheet music to PDF, \
EPS, SVG, and PNG formats, and can also create MIDI files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://lilypond.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://lilypond.org/download/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 030ebe2074ad647269c7f8aca40eaee671ddb77f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport lilypond-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description The development version of the LilyPond music typesetter.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lilypond-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 030ebe2074ad647269c7f8aca40eaee671ddb77f \
</span> sha256 595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661 \
size 18100533
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set livecheck_url "source.html"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.21.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lilypond
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 79a499ea4266358c2e061099e9beaaa023528367 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af5dd5fce4f7d2850fb07104c1c837f398f336a27032e356306e6a987f86a3a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18103643
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set livecheck_url "development.html"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://lilypond.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://lilypond.org/download/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\\d+(\\.\\d+)+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}/${livecheck_url}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platforms darwin
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,10 +77,11 @@ depends_lib-append path:lib/pkgconfig/pango.pc:pango \
</span> port:guile18 \
port:python38
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needed for PNG generation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Will no longer be needed for next stable release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:netpbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Needed for PNG generation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Will no longer be needed for next stable release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:netpbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.type gnu
configure.cmd autoconf -f && ./configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +130,7 @@ variant mactex description {Use MacTeX or non-MacPorts TeX; see\
</span> return -code error "Variant 'mactex' doesn't work with\
installed MacPorts TeXLive packages. Either\
uninstall them or don't use the 'mactex' variant of\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lilypond."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport}."
</span> }
} else {
set lilypond.have_texgyre \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,21 +179,6 @@ build.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span> destroot.env-append LTDL_LIBRARY_PATH=${prefix}/lib
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Backport upstream commit 250d841a51eb to make dependency on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dblatex optional.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\\(DBLATEX.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # documentation build a texi2html 1.82 bundle is necessary, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't exist yet in MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\\(TEXI2HTML.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Use guile18 header files.
reinplace -W ${worksrcpath} \
s|libguile\.h|libguile18.h|g \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,7 +196,6 @@ post-patch {
</span> python/auxiliar/manuals_definitions.py \
scripts/auxiliar/check_texi_refs.py \
scripts/auxiliar/check_translation.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/coverage.py \
</span> scripts/auxiliar/find-superfluous-includes.py \
scripts/auxiliar/fixcc.py \
scripts/auxiliar/makelsr.py \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,9 +209,30 @@ post-patch {
</span> scripts/auxiliar/strip-whitespace.py \
scripts/auxiliar/tely-gettext.py \
scripts/auxiliar/texi-langutils.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/texi-skeleton-update.py \
</span> scripts/auxiliar/translations-status.py \
scripts/auxiliar/update-snippets.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Backport upstream commit 250d841a51eb to make dependency on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dblatex optional.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|\\(DBLATEX.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # documentation build a texi2html 1.82 bundle is necessary, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't exist yet in MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|\\(TEXI2HTML.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|/usr/bin/(env\\\ )?python|${configure.python}|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/coverage.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/texi-skeleton-update.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,8 +250,10 @@ post-destroot {
</span> variant docs description {Build documentation files} {
configure.args-delete --disable-documentation
configure.args-append --enable-documentation
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # documentation build a texi2html 1.82 bundle is necessary,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which doesn't exist yet in MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-texi2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/source.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\\d+(\\.\\d+)+)
</span></pre><pre style='margin:0'>
</pre>