<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/59f30e18f6c3d97ece386ec298594c16defa67ab">https://github.com/macports/macports-ports/commit/59f30e18f6c3d97ece386ec298594c16defa67ab</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 59f30e18f6c icu: rearrange sections to natural order
</span>59f30e18f6c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 59f30e18f6c3d97ece386ec298594c16defa67ab
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Apr 8 21:44:18 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu: rearrange sections to natural order
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> but leave the ancient legacy support out of the
</span><span style='display:block; white-space:pre;color:#404040;'> natural flow, near the bottom
</span>---
devel/icu/Portfile | 66 +++++++++++++++++++++++++++---------------------------
1 file changed, 33 insertions(+), 33 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 2ee9240521c..82d4e5bb6a3 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;'>@@ -35,6 +35,8 @@ set docdir ${prefix}/share/doc/${name}
</span>
if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distname ${my_name}-[string map {. _} ${version}]-src
extract.suffix .tgz
worksrcdir ${name}/source
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +45,14 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> sha256 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc \
size 24518055
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use full pathnames to libraries in tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (#60325)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-declspec-conflict.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-i18n-formatted_string_builder.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.major} >= 11} {
configure.python /usr/bin/python
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,20 +61,27 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> configure.python ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevent ICU from finding installed icu when upgrading (#11981).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ./runConfigureICU ${platform}
</span>
configure.args --disable-layoutex \
--disable-samples \
--enable-static
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args-delete --disable-dependency-tracking
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-declspec-conflict.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (#60325)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU detects cross compiling by trying to run binaries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # r73849 and #29904 indicate that cross compiling is a problem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ merger_must_run_binaries yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-i18n-formatted_string_builder.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.type gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args VERBOSE=1
</span>
# ICU has three mechanisms to aid other projects in building properly
# 1) .pc files for pkg-config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,24 +130,6 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd ./runConfigureICU ${platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU detects cross compiling by trying to run binaries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # r73849 and #29904 indicate that cross compiling is a problem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merger_must_run_binaries yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # prevent ICU from finding installed icu when upgrading (#11981).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.type gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args VERBOSE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.target check
test.args VERBOSE=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,21 +141,22 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform freebsd {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env MAKE=/usr/local/bin/gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env MAKE=/usr/local/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (#59514) TODO: still needed?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/data/out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin 8 {
patchfiles-append patch-common-putil.cpp.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (#59514)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${worksrcpath}/data/out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform freebsd {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env MAKE=/usr/local/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env MAKE=/usr/local/bin/gmake
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
if {${subport} eq "${name}-lx"} {
</pre><pre style='margin:0'>
</pre>