<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/6b718b6a684b144d127223bf2c2a08efe1c080f0">https://github.com/macports/macports-ports/commit/6b718b6a684b144d127223bf2c2a08efe1c080f0</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 6b718b6 lilypond: Synchronize Portfile with 'lilypond-devel' Portfile.
</span>6b718b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b718b6a684b144d127223bf2c2a08efe1c080f0
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Mon Mar 30 17:17:07 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> lilypond: Synchronize Portfile with 'lilypond-devel' Portfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add variant 'mactex', add 'notes' block.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Other, minor adjustments.
</span>---
textproc/lilypond/Portfile | 81 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 77 insertions(+), 4 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 7d6bb06..df86b16 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,10 +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:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name lilypond
version 2.20.0
<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;'>@@ -26,7 +27,8 @@ checksums rmd160 030ebe2074ad647269c7f8aca40eaee671ddb77f \
</span> platforms darwin
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span> port:bison \
port:dblatex \
port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +52,7 @@ depends_build port:autoconf \
</span> port:texlive-xetex \
port:urw-core35-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:extractpdfmark \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:extractpdfmark \
</span> port:ghostscript \
port:guile18 \
port:python38
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +61,80 @@ build.type gnu
</span> configure.cmd autoconf -f && ./configure
configure.python ${prefix}/bin/python3.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilypond.texgyredir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilypond.mactex_bin ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilypond.temp ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilypond.have_texgyre false
</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;'>+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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find the binary directory of the external TeX distribution by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # searching the kpsewhich program in the path. We assume that all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # other binaries of the distribution are in this directory, too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[auto_execok kpsewhich] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilypond.temp {*}[auto_execok kpsewhich]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilypond.mactex_bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file dirname [file normalize ${lilypond.temp}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${lilypond.mactex_bin} eq "."} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Cannot find MacTeX or external TeXLive\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installation; aborting. Have you added the path to\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ your TeX distribution's binary directory to 'binpath'\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in 'macports.conf'?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${lilypond.mactex_bin} eq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file dirname [file normalize "${prefix}/bin/kpsewhich"]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Variant 'mactex' doesn't work with\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed MacPorts TeXLive packages. Either\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall them or don't use the 'mactex' variant of\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lilypond."
</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;'>+ set lilypond.have_texgyre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [regexp -line {installed: *Yes} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [exec ${lilypond.mactex_bin}/tlmgr info --only-installed tex-gyre]]
</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 {${lilypond.have_texgyre}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilypond.texgyredir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file dirname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [exec ${lilypond.mactex_bin}/kpsewhich texgyreschola-regular.otf]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "TeXLive package 'tex-gyre' not\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed; aborting. Please install it, then\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try again"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:texlive-fonts-recommended \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-lang-cyrillic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-metapost \
</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;'>+ configure.args-append --with-texgyre-dir=${lilypond.texgyredir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --disable-documentation
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-texgyre-dir=${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre
</span> configure.args-append --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-texgyre-dir=${lilypond.texgyredir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.env-append GUILE=${prefix}/bin/guile18
configure.env-append GUILE_CONFIG=${prefix}/bin/guile18-config
</pre><pre style='margin:0'>
</pre>