<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0f51c69e5c7c05dc9d0707efe3a44dff91cc5178">https://github.com/macports/macports-ports/commit/0f51c69e5c7c05dc9d0707efe3a44dff91cc5178</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 0f51c69e5c7 lilypond: fix dependencies
</span>0f51c69e5c7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0f51c69e5c7c05dc9d0707efe3a44dff91cc5178
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Fri Aug 21 13:14:58 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> lilypond: fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Commit a3fdc4321b52f98cbb08a78dfffb6194b5239d9b broke the +mactex variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also improve the vertical flow in the Portfile by setting up the variants at
</span><span style='display:block; white-space:pre;color:#404040;'> the top, then using conditionals to avoid scattered information.
</span>---
textproc/lilypond/Portfile | 128 +++++++++++++++++++++++++++++----------------
1 file changed, 82 insertions(+), 46 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 ddaf5cbd3b9..28bec2f0ff6 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;'>@@ -16,13 +16,32 @@ 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:#e0ffe0;'>+
</span> subport lilypond-devel {
long_description The development version of the LilyPond music typesetter.
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}"} {
</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><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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span> version 2.20.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> conflicts lilypond-devel
checksums rmd160 030ebe2074ad647269c7f8aca40eaee671ddb77f \
sha256 595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +50,7 @@ if {${subport} eq "${name}"} {
</span> set livecheck_url "source.html"
} else {
version 2.21.5
<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 fc9107e91a575d0c50fa7dcdb89672a46a0f4c02 \
sha256 09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +59,7 @@ if {${subport} eq "${name}"} {
</span> set livecheck_url "development.html"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set branch [join [lrange [split ${version} .] 0 1] .]
homepage https://lilypond.org
master_sites https://lilypond.org/download/sources/v${branch}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,8 +71,8 @@ livecheck.url ${homepage}/${livecheck_url}
</span> platforms darwin
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ImageMagick \
</span> port:autoconf \
port:bison \
port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,16 +83,27 @@ 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:netpbm \
</span> port:pkgconfig \
port:t1utils \
port:texinfo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:urw-core35-fonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Will be gone in next stable release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netpbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span> 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-latex \
</span> port:texlive-metapost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-xetex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:urw-core35-fonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset docs] && ![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For +docs, only bibtex and xetex are needed right now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-xetex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# Either 'pango' or 'pango-devel' will do, thus we depend on its
# pkgconfig file.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,26 +119,14 @@ configure.python ${prefix}/bin/python3.8
</span>
compiler.cxx_standard 2011
<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 ""
set lilypond.temp ""
set lilypond.have_texgyre false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes-append "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Pre-installation note for 'mactex' variant:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacTeX or another external TeXLive distribution gets used for\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installation instead of MacPorts's texlive packages; the path to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the TeX distribution's binary directory (for example\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '/Library/TeX/texbin') must be added to 'binpath' in\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'macports.conf' *before* installing this port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Note that TeX is not needed after installation."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mactex description {Use MacTeX or non-MacPorts TeX; see\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "port notes" for more information} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset mactex]} {
</span> # Find the binary directory of the external TeX distribution by
# searching the kpsewhich program in the path. We assume that all
# other binaries of the distribution are in this directory, too.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,18 +167,21 @@ variant mactex description {Use MacTeX or non-MacPorts TeX; see\
</span> try again"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:texlive-fonts-recommended \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-metapost
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-texgyre-dir=${lilypond.texgyredir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne ${name}} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-documentation
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --disable-documentation
</span> configure.args-append --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-texgyre-dir=${lilypond.texgyredir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-texgyre-dir=${lilypond.texgyredir}
</span>
configure.env-append GUILE=${prefix}/bin/guile18
configure.env-append GUILE_FLAVOR=guile-1.8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,6 +194,7 @@ configure.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span> build.env-append LTDL_LIBRARY_PATH=${prefix}/lib
destroot.env-append LTDL_LIBRARY_PATH=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# Use guile18 header files.
reinplace -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,19 +229,34 @@ post-patch {
</span> scripts/auxiliar/translations-status.py \
scripts/auxiliar/update-snippets.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ImageMagick and xelatex (or pdflatex) are only needed for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # complete documentation builds, which +docs doesn't do currently.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ditto for Cyrillic stuff (i.e., testing for 'fikparm.mf').
</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|\(IMAGEMAGICK.*\), $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;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {s|\(PDFLATEX.*\), $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;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {s|if test "$TEX_FIKPARM" = ""|if false|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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span> # Backport upstream commit 250d841a51eb to make dependency on
# dblatex optional.
reinplace -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\\(DBLATEX.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {s|\(DBLATEX.*\), $DOCUMENTATION_REQUIRED,|\1, OPTIONAL,|g} \
</span> configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Currently, +docs only builds the info files. For a complete
</span> # documentation build a texi2html 1.82 bundle is necessary, which
# doesn't exist yet in MacPorts.
if {[variant_isset docs]} {
reinplace -W ${worksrcpath} \
<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:#e0ffe0;'>+ {s|\(TEXI2HTML.*\), $DOCUMENTATION_REQUIRED,|\1, OPTIONAL,|g} \
</span> configure.ac
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,6 +264,15 @@ post-patch {
</span> s|/usr/bin/(env\\\ )?python|${configure.python}|g \
scripts/auxiliar/coverage.py \
scripts/auxiliar/texi-skeleton-update.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # netpbm is not needed as a run dependency since 2.21.2; it's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not needed for +docs either, and it will be completely gone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in 2.21.6
</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|\(NETPBM.*\), $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:#e0e0e0;'>@@ -240,14 +287,3 @@ post-destroot {
</span> "s|@@PREFIX@@|${prefix}|g" \
${destroot}${prefix}/bin/lilypond
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant docs description {Build documentation files} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-documentation
</span><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 real
</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:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>