<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/b476a40e6e94c4b6aa17251337c753aa873db3c7">https://github.com/macports/macports-ports/commit/b476a40e6e94c4b6aa17251337c753aa873db3c7</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 b476a40 lilypond, lilypond-devel: Synchronization and dependency fixes.
</span>b476a40 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b476a40e6e94c4b6aa17251337c753aa873db3c7
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Sun May 24 09:25:02 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> lilypond, lilypond-devel: Synchronization and dependency fixes.
</span>---
textproc/lilypond-devel/Portfile | 38 ++++++++++++++++++++++++-----------
textproc/lilypond/Portfile | 43 +++++++++++++++++++++++++++-------------
2 files changed, 55 insertions(+), 26 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 f6ec958..7f5f297 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;'>@@ -6,7 +6,7 @@ PortGroup active_variants 1.1
</span> name lilypond-devel
set my_name lilypond
version 2.21.1
<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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,6 @@ depends_build-append \
</span> port:p5.28-pod-simple \
port:p5.28-podlators \
port:p5.28-scalar-list-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pango \
</span> port:pkgconfig \
port:t1utils \
port:texinfo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +47,19 @@ depends_build-append \
</span> port:texlive-metapost \
port:urw-core35-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:extractpdfmark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Either 'pango' or 'pango-devel' will do, thus we depend on its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkgconfig file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:extractpdfmark \
</span> port:ghostscript \
port:guile18 \
port:python38
<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 development 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> require_active_variants fontforge python38
build.type gnu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,11 +74,19 @@ set lilyponddevel.mactex_bin ""
</span> set lilyponddevel.temp ""
set lilyponddevel.have_texgyre false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mactex description {Allow lilypond-devel to use MacTeX or another\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external TeXLive installation instead of MacPorts TeXLive tools. To\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install the 'mactex' variant the path to the TeX distribution's\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- binary directory (for example '/Library/TeX/texbin') must be added\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to 'binpath' in 'macports.conf' *before* installing this port.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pre-installation note for 'mactex' variant:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MacTeX or another external TeXLive distribution gets used for\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installation instead of MacPorts's texlive packages; the path to\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the TeX distribution's binary directory (for example\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/Library/TeX/texbin') must be added to 'binpath' in\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'macports.conf' *before* installing this port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that TeX is not needed after installation."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mactex description {Use MacTeX or non-MacPorts TeX; see\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port notes" for more information} {
</span>
# Find the binary directory of the external TeX distribution by
# searching the kpsewhich program in the path. We assume that all
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,9 +130,7 @@ variant mactex description {Allow lilypond-devel to use MacTeX or another\
</span> }
depends_build-delete port:texlive-fonts-recommended \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-lang-cyrillic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-metapost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-xetex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-metapost
</span>
configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,7 +160,8 @@ destroot.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span> patchfiles patch-wcxx11-narrowing.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Backport upstream commit 250d841a51eb.
</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> reinplace -W ${worksrcpath} \
"s|\\(DBLATEX.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
configure.ac
<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 df86b16..300abef 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;'>@@ -1,11 +1,11 @@
</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 cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name lilypond
version 2.20.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers {snc @nerdling} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,37 +30,40 @@ universal_variant no
</span> depends_build-append \
port:autoconf \
port:bison \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dblatex \
</span> port:flex \
port:fontforge \
port:gmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:netpbm \
</span> port:p5.28-encode \
port:p5.28-pod-escapes \
port:p5.28-pod-simple \
port:p5.28-podlators \
port:p5.28-scalar-list-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pango \
</span> port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rsync \
</span> port:t1utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texi2html \
</span> port:texinfo \
port:texlive-fonts-recommended \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-lang-cyrillic \
</span> port:texlive-metapost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-xetex \
</span> port:urw-core35-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:extractpdfmark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Either 'pango' or 'pango-devel' will do, thus we depend on its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkgconfig file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:extractpdfmark \
</span> port:ghostscript \
port:guile18 \
port:python38
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.type gnu
configure.cmd autoconf -f && ./configure
configure.python ${prefix}/bin/python3.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set lilypond.texgyredir \
"${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
set lilypond.mactex_bin ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,9 +126,7 @@ variant mactex description {Use MacTeX or non-MacPorts TeX; see\
</span> }
depends_build-delete port:texlive-fonts-recommended \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-lang-cyrillic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-metapost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-xetex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-metapost
</span>
configure.args-append --with-texgyre-dir=${lilypond.texgyredir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,10 +154,24 @@ 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:#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> # Use guile18 header files.
reinplace -W ${worksrcpath} \
s|libguile\.h|libguile18.h|g \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocal.m4 \
</span> configure.ac \
lily/include/lily-guile.hh
</pre><pre style='margin:0'>
</pre>