<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/655a3e5efef1390673f3aa6b2c81f28abe824690">https://github.com/macports/macports-ports/commit/655a3e5efef1390673f3aa6b2c81f28abe824690</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 655a3e5 lilypond: update to version 2.20.0
</span>655a3e5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 655a3e5efef1390673f3aa6b2c81f28abe824690
</span>Author: Jahrme Risner <github@jahrme.com>
AuthorDate: Sun Mar 1 21:03:18 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> lilypond: update to version 2.20.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 2.20.0
</span><span style='display:block; white-space:pre;color:#404040;'> * update python to version 3.8
</span><span style='display:block; white-space:pre;color:#404040;'> * use https instead of http
</span><span style='display:block; white-space:pre;color:#404040;'> * clean up dependencies as result of changes between 2.18.2 and 2.20
</span><span style='display:block; white-space:pre;color:#404040;'> * do not include docs variant by default
</span><span style='display:block; white-space:pre;color:#404040;'> * it drastically increases build time
</span>---
textproc/lilypond/Portfile | 150 +++++++++++----------
.../files/patch-scripts-build-mf2pt1.pl.diff | 11 --
2 files changed, 79 insertions(+), 82 deletions(-)
<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 c066495..7d6bb06 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.18.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</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 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers {snc @nerdling} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,47 +17,84 @@ 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 http://lilypond.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#dist_subdir ${name}/${version}_${revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a355201334fd0beac36c96f844c75d8e27b4ea9d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07
</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;'>+checksums rmd160 030ebe2074ad647269c7f8aca40eaee671ddb77f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18100533
</span>
<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:#ffe0e0;'>-depends_build port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dblatex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontforge \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netpbm \
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rsync \
</span> port:t1utils \
port:texi2html \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontforge \
</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:#ffe0e0;'>- port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghostscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mftrace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:guile18 \
</span> port:texinfo \
<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:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:t1utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-fonts-recommended \
</span> port:texlive-lang-cyrillic \
port:texlive-metapost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dblatex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:urw-fonts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/Xquartz:xorg-server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-xetex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:urw-core35-fonts
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:extractpdfmark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ghostscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:guile18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.type gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd autoconf -f && ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-texgyre-dir=${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>-patchfiles patch-scripts-build-mf2pt1.pl.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|__vector|lily_vector|g ${worksrcpath}/flower/include/std-vector.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set files {Documentation/contributor/build-notes.itexi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Documentation/cs/usage/setup.itely \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Documentation/de/usage/setup.itely \
</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> python/auxiliar/manuals_definitions.py \
scripts/auxiliar/check_texi_refs.py \
scripts/auxiliar/check_translation.py \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,53 +114,24 @@ post-patch {
</span> scripts/auxiliar/texi-langutils.py \
scripts/auxiliar/texi-skeleton-update.py \
scripts/auxiliar/translations-status.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/update-snippets.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/build/pytt.py }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file ${files} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|/usr/bin/env\\\ python|${configure.python}| ${worksrcpath}/$file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|/usr/bin/python|${configure.python}| ${worksrcpath}/$file
</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;'>- # Use guile18 header files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|libguile\.h|libguile18.h|g ${worksrcpath}/configure \
</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:#e0ffe0;'>+ scripts/auxiliar/update-snippets.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append "-lc++"
</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;'>-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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-default_variants +docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>- depends_lib-append port:netpbm
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/files/patch-scripts-build-mf2pt1.pl.diff b/textproc/lilypond/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/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>