<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5cd0f537c712e7762139afbd770cb310092115d2">https://github.com/macports/macports-ports/commit/5cd0f537c712e7762139afbd770cb310092115d2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5cd0f537c712e7762139afbd770cb310092115d2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 16 00:16:06 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> ncurses-bootstrap: revert prefix change, use known_fail
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reverts part of 8e08962.
</span>---
devel/ncurses/Portfile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ncurses/Portfile b/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84373e1..7c82738 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +23,15 @@ checksums rmd160 938235f3922f9c6ef0f1081d643ecb2da1347a17 \
</span> # hex.diff from https://opensource.apple.com/source/ncurses/ncurses-44/patches.applied/
patchfiles hex.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set myprefix $prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args --prefix=${myprefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix ${prefix}/libexec/libcxx-bootstrap
</span> configure.cxx_stdlib libstdc++
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libstdc++ can't be used on Mojave and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +49,7 @@ configure.args --enable-widec \
</span> --without-ada \
--with-manpage-format=normal \
--enable-pc-files \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pkg-config-libdir="${myprefix}/lib/pkgconfig" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pkg-config-libdir="${prefix}/lib/pkgconfig" \
</span> --disable-mixed-case
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,13 +67,13 @@ if {[variant_isset universal]} {
</span> post-destroot {
set major [lindex [split $version .] 0]
foreach f {form menu ncurses ncurses++ panel} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib${f}.${major}.dylib ${destroot}${myprefix}/lib/lib${f}w.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib${f}.${major}.dylib ${destroot}${myprefix}/lib/lib${f}w.${major}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib${f}.a ${destroot}${myprefix}/lib/lib${f}w.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${f}.pc ${destroot}${myprefix}/lib/pkgconfig/${f}w.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib${f}.${major}.dylib ${destroot}${prefix}/lib/lib${f}w.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib${f}.${major}.dylib ${destroot}${prefix}/lib/lib${f}w.${major}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib${f}.a ${destroot}${prefix}/lib/lib${f}w.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${f}.pc ${destroot}${prefix}/lib/pkgconfig/${f}w.pc
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s libncurses.${major}.dylib ${destroot}${myprefix}/lib/libtermcap.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ncurses6-config ${destroot}${myprefix}/bin/ncursesw6-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libncurses.${major}.dylib ${destroot}${prefix}/lib/libtermcap.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ncurses6-config ${destroot}${prefix}/bin/ncursesw6-config
</span> }
livecheck.regex ${name}-(\[\\d.-\]+)${extract.suffix}
</pre><pre style='margin:0'>
</pre>