<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/30b46109ce995e26f7c35befa146de8aa4f37d59">https://github.com/macports/macports-ports/commit/30b46109ce995e26f7c35befa146de8aa4f37d59</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 30b46109 lilypond-devel: fix assignments in `depends_build` vs. `depends_lib`
</span>30b46109 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 30b46109ce995e26f7c35befa146de8aa4f37d59
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Mon Sep 2 18:02:23 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: fix assignments in `depends_build` vs. `depends_lib`
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Replace compiler whitelist with fallback list.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also do some formatting.
</span>---
textproc/lilypond-devel/Portfile | 92 +++++++++++++++++++++-------------------
1 file changed, 48 insertions(+), 44 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 7d6a8d2..9a3bbb3 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;'>@@ -7,7 +7,7 @@ PortGroup cxx11 1.1
</span> name lilypond-devel
set my_name lilypond
version 2.19.83
<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;'>@@ -29,33 +29,33 @@ checksums rmd160 6250667c2a2799ec404e10e3e141101d043ab7f6 \
</span> sha256 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3 \
size 17996428
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:t1utils \
</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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texi2html \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:netpbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dblatex \
</span> port:flex \
port:fontforge \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghostscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:guile18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netpbm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:texinfo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texi2html \
</span> port:texlive \
port:texlive-fonts-recommended \
port:texlive-lang-cyrillic \
port:texlive-metapost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dblatex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:t1utils \
</span> port:urw-core35-fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ghostscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:guile18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd autoconf -f && ./configure
configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,10 +111,10 @@ variant mactex description {Allow lilypond-devel to use MacTeX or another\
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:texlive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-fonts-recommended \
</span><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:#e0ffe0;'>+ depends_build-delete port:texlive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>
configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,32 +145,36 @@ post-patch {
</span> # possible to circumvent this issue without rewriting a considerable
# amount of code.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# g++ uses libstdc++; setting this prevents the application from being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# flagged as broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxx_stdlib macports-libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # blacklist any clang compiler and any old gcc (a better expression is needed)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *clang* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *llvm-gcc* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *apple-gcc* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-3.3 gcc-4.0 gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_stdlib macports-libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *clang* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *llvm-gcc* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *apple-gcc* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-3.3 gcc-4.0 gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-documentation
</span> if {![variant_isset mactex]} {
configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_CONFIG=${configure.python}-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE=${prefix}/bin/guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_CONFIG=${prefix}/bin/guile18-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_CONFIG=${configure.python}-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE=${prefix}/bin/guile18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE_CONFIG=${prefix}/bin/guile18-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE_TOOLS=${prefix}/bin/guile18-tools
</span>
build.env LTDL_LIBRARY_PATH=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,6 +186,6 @@ post-destroot {
</span> reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/bin/lilypond
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/development.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}/development.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)
</span></pre><pre style='margin:0'>
</pre>