<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/10ca18832f1bc4a4ceb2ea72d4c5e4cbbcdcc431">https://github.com/macports/macports-ports/commit/10ca18832f1bc4a4ceb2ea72d4c5e4cbbcdcc431</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 10ca18832f1bc4a4ceb2ea72d4c5e4cbbcdcc431
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Feb 1 13:04:57 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> icu-bootstrap: delete subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No longer needed since removal of libxml2-bootstrap.
</span>---
devel/icu/Portfile | 31 ++++++++-----------------------
1 file changed, 8 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd29e40..fb39bbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ set my_name icu4c
</span> # To find dependencies, use:
# port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | sort -u
version 65.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}-bootstrap" || ${subport} eq "${name}58"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}58"} {
</span> version 58.3
}
categories devel textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ checksums rmd160 4537a0ce1879b24cdee150862615a7a899d6fa05 \
</span> sha256 53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948 \
size 24267934
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 11 || ${subport} eq "${name}-bootstrap" || ${subport} eq "${name}58"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 11 || ${subport} eq "${name}58"} {
</span> configure.python /usr/bin/python
} else {
depends_build-append port:python27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,31 +45,18 @@ if {${os.major} >= 11 || ${subport} eq "${name}-bootstrap" || ${subport} eq "${n
</span> configure.python ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port is used by clang-3.4 to bootstrap libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-bootstrap {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args --prefix=${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also needed by later clangs. 10.8 already has a C++11 compiler if using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Xcode 5.x and so doesn't need this, but there's no guarantee that users
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# upgraded from 4.x.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 12 && ${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang_dependency.extra_versions 3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport ${name}58 {
revision 0
configure.pre_args --prefix=${prefix}/libexec/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { [vercmp ${version} 59] < 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append CVE-2017-7867-CVE-2017-7868.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append CVE-2017-7867-CVE-2017-7868.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bootstrap_config-mh-darwin.diff
</span> checksums rmd160 0b1ad8ea9bccd5d0f96a89bd0cdc12b5751ed46e \
sha256 2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c \
size 22626103
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</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 { [vercmp ${version} 59] >= 0 } {
</span> compiler.cxx_standard 2011
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,9 +130,7 @@ if { ${subport} ne "${name}-docs" } {
</span> PortGroup muniversal 1.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp ${version} 59] < 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-bootstrap_config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${version} 59] >= 0 } {
</span> patchfiles-append patch-config-mh-darwin.diff
# https://trac.macports.org/ticket/59391
patchfiles-append max_align_t.patch
</pre><pre style='margin:0'>
</pre>