<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/df95d628e31258773d8f360510905f96656b5a65">https://github.com/macports/macports-ports/commit/df95d628e31258773d8f360510905f96656b5a65</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 df95d62 lilypond-devel: Synchronize Portfile with 'lilypond' Portfile.
</span>df95d62 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit df95d628e31258773d8f360510905f96656b5a65
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Sat Mar 28 15:19:39 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: Synchronize Portfile with 'lilypond' Portfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update list of dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'> Use python 3.8.
</span><span style='display:block; white-space:pre;color:#404040;'> Replace patch for `mf2pt1` with solution in Portfile.
</span><span style='display:block; white-space:pre;color:#404040;'> Add `docs` variant. Default is now to not build documentation.
</span><span style='display:block; white-space:pre;color:#404040;'> [Note that this option only builds and installs the info files (to be read
</span><span style='display:block; white-space:pre;color:#404040;'> by the `info` program). Building the complete documentation (with `make
</span><span style='display:block; white-space:pre;color:#404040;'> doc`) currently always fails since it works only with texi2html version
</span><span style='display:block; white-space:pre;color:#404040;'> 1.82, something MacPorts doesn't provide yet.]
</span><span style='display:block; white-space:pre;color:#404040;'> Fix python shebang in scripts.
</span>---
textproc/lilypond-devel/Portfile | 146 ++++++++++++++-------
.../files/patch-scripts-build-mf2pt1.pl.diff | 11 --
2 files changed, 97 insertions(+), 60 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/Portfile b/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3fa51c..33e3eab 100644
</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;'>+++ b/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span> PortGroup cxx11 1.1
name lilypond-devel
set my_name lilypond
version 2.19.84
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers {snc @nerdling} openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts lilypond
</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;'>@@ -19,44 +19,49 @@ 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;'>-conflicts lilypond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://lilypond.org
</span> master_sites https://lilypond.org/download/sources/v${branch}/
distname ${my_name}-${version}
checksums rmd160 3e670a96d4394e00cf0d8a32aa003344beed9702 \
sha256 94dcc66447f24966f28eda72c79e1ec16143b8ea4a537cc9f97d017cc0c0dd11 \
size 18050320
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:autoconf \
port:bison \
port:dblatex \
port:flex \
port:fontforge \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake \
</span> port:netpbm \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p5.28-encode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p5.28-pod-escapes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p5.28-pod-simple \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p5.28-podlators \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p5.28-scalar-list-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pango \
</span> port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texinfo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rsync \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:t1utils \
</span> port:texi2html \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texinfo \
</span> port:texlive-fonts-recommended \
port:texlive-lang-cyrillic \
port:texlive-metapost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:t1utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-xetex \
</span> port:urw-core35-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:extractpdfmark \
</span> port:ghostscript \
port:guile18 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python38
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.type gnu
</span> configure.cmd autoconf -f && ./configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.8
</span>
set lilyponddevel.texgyredir \
"${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,50 +116,93 @@ variant mactex description {Allow lilypond-devel to use MacTeX or another\
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:texlive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-fonts-recommended \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:texlive-fonts-recommended \
</span> port:texlive-lang-cyrillic \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-metapost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-metapost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-xetex
</span>
configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-scripts-build-mf2pt1.pl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-avoid-empty-locale.diff
</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 s|libguile\.h|libguile18.h|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/aclocal.m4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure.ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/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;'>- # help fontforge date calculation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|20110222|2011-02-22|g ${worksrcpath}/configure
</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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts
</span> if {![variant_isset mactex]} {
<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:#e0ffe0;'>+ configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_CONFIG=${configure.python}-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE=${prefix}/bin/guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_CONFIG=${prefix}/bin/guile18-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append GUILE=${prefix}/bin/guile18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append GUILE_CONFIG=${prefix}/bin/guile18-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PYTHON=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PYTHON=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PYTHON=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PYTHON_CONFIG=${configure.python}-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PYTHON_CONFIG=${configure.python}-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PYTHON_CONFIG=${configure.python}-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env LTDL_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-avoid-empty-locale.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use guile18 header files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|libguile\.h|libguile18.h|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aclocal.m4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lily/include/lily-guile.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Correct mf2pt1 binary location.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|"-mem=mf2pt1"|"-mem=../../mf2pt1"|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/build/mf2pt1.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Correct python shebang.
</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;'>+ python/auxiliar/manuals_definitions.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/check_texi_refs.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/check_translation.py \
</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/find-superfluous-includes.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/fixcc.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/makelsr.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/musicxml_generate_intervals.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/musicxml_generate_keys.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/musicxml_generate_timesignatures.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/node-menuify.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/prepare-web-media.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/readlink.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/skyline_viewer.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/strip-whitespace.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/tely-gettext.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/texi-langutils.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;'>+ scripts/auxiliar/translations-status.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/auxiliar/update-snippets.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env LTDL_LIBRARY_PATH=${prefix}/lib
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/lilypond \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/lilypond \
</span> ${destroot}${prefix}/libexec/lilypond-bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/lilypond.in ${destroot}${prefix}/bin/lilypond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/bin/lilypond
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/lilypond.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/lilypond
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/lilypond
</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;'>+variant docs description {Build documentation files} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-documentation
</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;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}/development.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/files/patch-scripts-build-mf2pt1.pl.diff b/textproc/lilypond-devel/files/patch-scripts-build-mf2pt1.pl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8685d10..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/files/patch-scripts-build-mf2pt1.pl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/build/mf2pt1.pl.orig 2012-03-27 19:42:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/build/mf2pt1.pl 2012-03-30 15:16:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,7 +426,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # parameters, too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub get_bboxes ($)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_command 1, ("mpost", "-mem=../../mf2pt1", "-progname=mpost",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; nonstopmode; input $mffile");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @charfiles = sort
</span></pre><pre style='margin:0'>
</pre>