<pre style='margin:0'>
Jeremy Lavergne (nerdling) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50810eb9e5fab43c979c6a9502aaaa15d4fc9510">https://github.com/macports/macports-ports/commit/50810eb9e5fab43c979c6a9502aaaa15d4fc9510</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 50810eb9e5f lilypond: make devel version use Guile 2; remove dependency on netpbm
</span>50810eb9e5f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 50810eb9e5fab43c979c6a9502aaaa15d4fc9510
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Sun Apr 17 08:58:13 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    lilypond: make devel version use Guile 2; remove dependency on netpbm
</span>---
 textproc/lilypond/Portfile | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 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 a2b81093e31..6d0bbd256fb 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;'>@@ -43,7 +43,7 @@ compiler.cxx_standard 2011
</span> 
 if {${subport} eq ${name}} {
     version         2.22.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span>     conflicts       lilypond-devel
     checksums       rmd160  571de8313f90be3a41b0f7f0bd82a48f67e4f245 \
                     sha256  dde90854fa7de1012f4e1304a68617aea9ab322932ec0ce76984f60d26aa23be \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ if {${subport} eq ${name}} {
</span>     }
 } else {
     version         2.23.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span>     conflicts       lilypond
     checksums       rmd160  41a82e8b411581b0dd4c9476edf60ce6be41f726 \
                     sha256  b5674df4c2371cb6d59a06ea54eaba6c87f2e7c503c9f17ec3db3facd61807c0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,6 @@ livecheck.url       ${homepage}/${livecheck_url}
</span> platforms           darwin
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
                     port:autoconf \
                     port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,11 +94,6 @@ depends_build-append \
</span>                     port:texinfo \
                     port:urw-core35-fonts
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Will be gone in next stable release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:netpbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {![variant_isset mactex]} {
     depends_build-append \
                     port:texlive-fonts-recommended \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,13 +113,25 @@ set py_ver_nodot    [string map {. {}} ${py_ver}]
</span> depends_lib-append  path:lib/pkgconfig/pango.pc:pango \
                     port:extractpdfmark \
                     port:ghostscript \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:guile18 \
</span>                     port:python${py_ver_nodot}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:guile18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:guile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.type          gnu
 configure.cmd       autoconf -f && ./configure
 configure.python    ${prefix}/bin/python${py_ver}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # These targets also build and install compiled Scheme files (with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # extension '.go').  This is essential to make LilyPond run with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # an acceptable speed while using Guile 2.2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.target        bytecode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.target     install-bytecode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 set lilypond.texgyredir \
     "${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +182,6 @@ if {[variant_isset mactex]} {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[variant_isset docs]} {
     if {${subport} ne ${name}} {
         # Currently, +docs only builds the info files.  For a complete
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,8 +195,10 @@ if {[variant_isset docs]} {
</span> configure.args-append   --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts
 configure.args-append   --with-texgyre-dir=${lilypond.texgyredir}
 
<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_FLAVOR=guile-1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</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_FLAVOR=guile-1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 configure.env-append    PYTHON=${configure.python}
 build.env-append        PYTHON=${configure.python}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,11 +224,13 @@ if {${subport} eq ${name}} {
</span> }
 
 post-patch {
<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:#e0ffe0;'>+    if {${subport} eq ${name}} {
</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;'>+            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> 
     # Correct mf2pt1 binary location.
     reinplace -W ${worksrcpath} \
</pre><pre style='margin:0'>

</pre>