<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9cd1b25a9380c01c9c3f85c772ef26151138fb68">https://github.com/macports/macports-ports/commit/9cd1b25a9380c01c9c3f85c772ef26151138fb68</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 9cd1b25a938 lilypond/lilypond-devel: upgrade to 2.24/2.25
</span>9cd1b25a938 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9cd1b25a9380c01c9c3f85c772ef26151138fb68
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Mon Dec 26 08:53:01 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> lilypond/lilypond-devel: upgrade to 2.24/2.25
</span>---
textproc/lilypond/Portfile | 89 ++++++----------------
.../files/patch-add-flex-to-include-devel.diff | 13 ----
.../lilypond/files/patch-add-flex-to-include.diff | 14 ++--
3 files changed, 29 insertions(+), 87 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 96aff3e6977..5e5025c1261 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;'>@@ -44,30 +44,23 @@ notes-append "\
</span> compiler.cxx_standard 2014
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.22.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts lilypond-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 571de8313f90be3a41b0f7f0bd82a48f67e4f245 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dde90854fa7de1012f4e1304a68617aea9ab322932ec0ce76984f60d26aa23be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18034586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ec38b59dcb99312a6aa66fd09bd01e7003ce0035 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3cedbe3b92b02569e3a6f2f0674858967b3da278d70aa3e98aef5bdcd7f78b69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19430807
</span>
set livecheck_url "source.html"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not needed for lilypond > 2.20.x ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.23.82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.25.0
</span> revision 0
conflicts lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 797f29331d98b0894028aad7da434c3e5a1361e8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 043c736ffe4e783dbb3b134d38192f87fe78d2bd2a8287c7cbbdfd7acc5a22c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19417020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7381b09bf437a3216905d4c7df7a27b5af766ed3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6ea9272c5fcc2ad663f120163e208b14fe59743d40f2578ec016c178ecf1826 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19502312
</span>
set livecheck_url "development.html"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #depends_test-append port:ImageMagick port:tidy
</span> }
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,26 +109,19 @@ 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:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:guile18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:guile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:guile
</span>
build.type gnu
configure.cmd autoconf -f && ./configure
configure.python ${prefix}/bin/python${py_ver}
configure.perl ${perl5.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These targets also build and install compiled Scheme files (with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # extension '.go'). This is essential to make LilyPond run with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # an acceptable speed while using Guile 2.2.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target bytecode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install-bytecode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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>
set lilypond.texgyredir \
"${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,23 +173,16 @@ if {[variant_isset mactex]} {
</span> }
if {[variant_isset docs]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Currently, +docs only builds the info files. For a complete
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # documentation build a texi2html 1.82 bundle is necessary,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which doesn't exist yet in MacPorts.
</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:#e0ffe0;'>+ # Currently, +docs only builds the info files. For a complete
</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> } else {
configure.args-append --disable-documentation
}
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;'>-if {${subport} eq ${name}} {
</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_FLAVOR=guile-1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.env-append PYTHON=${configure.python}
build.env-append PYTHON=${configure.python}
destroot.env-append PYTHON=${configure.python}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,23 +198,10 @@ pre-patch {
</span> copy ${prefix}/include/FlexLexer.h ${worksrcpath}/flex/FlexLexer.h
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-fix-missing-override.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-add-flex-to-include.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-add-flex-to-include-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-missing-override.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-add-flex-to-include.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</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;'>-
</span> # Correct mf2pt1 binary location.
reinplace -W ${worksrcpath} \
s|"-mem=mf2pt1"|"-mem=../../mf2pt1"|g \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,17 +230,6 @@ post-patch {
</span> {s|if test "$TEX_FIKPARM" = ""|if false|g} \
configure.ac
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Currently, +docs only builds the info files. For a complete
</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> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/files/patch-add-flex-to-include-devel.diff b/textproc/lilypond/files/patch-add-flex-to-include-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b79c5f95407..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond/files/patch-add-flex-to-include-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac 2022-07-31 07:03:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2022-07-31 07:07:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,6 +52,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [FLEXLEXER_DIR=$withval],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [FLEXLEXER_DIR=""])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test -n "$FLEXLEXER_DIR"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS="-I$FLEXLEXER_DIR $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINK_GXX_STATICALLY=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE(static-gxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--enable-static-gxx],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/files/patch-add-flex-to-include.diff b/textproc/lilypond/files/patch-add-flex-to-include.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a27031a91a..b79c5f95407 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond/files/patch-add-flex-to-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond/files/patch-add-flex-to-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac 2021-04-24 15:47:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2021-05-30 17:17:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2022-07-31 07:03:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2022-07-31 07:07:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +52,10 @@
</span> [FLEXLEXER_DIR=$withval],
[FLEXLEXER_DIR=""])
+if test -n "$FLEXLEXER_DIR"; then
+ CPPFLAGS="-I$FLEXLEXER_DIR $CPPFLAGS"
+fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_WITH(texgyre-dir,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--with-texgyre-dir=DIR],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [location of TeX Gyre fonts.])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK_GXX_STATICALLY=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE(static-gxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([--enable-static-gxx],
</span></pre><pre style='margin:0'>
</pre>