<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/965e878c7beb446f724689f05a625123b7da6776">https://github.com/macports/macports-ports/commit/965e878c7beb446f724689f05a625123b7da6776</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 965e878c7be icu: whitespace
</span>965e878c7be is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 965e878c7beb446f724689f05a625123b7da6776
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Apr 6 18:11:10 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu: whitespace
</span>---
devel/icu/Portfile | 103 ++++++++++++++++++++++++++---------------------------
1 file changed, 51 insertions(+), 52 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 bc5ea5f1d2d..000aebcf8bc 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;'>@@ -1,24 +1,28 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name icu4c
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name icu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name icu4c
</span> # Don't forget to increase the revision number of the dependents (e.g. boost)
# whenever the library version number changes. Thanks.
# To find dependencies, use:
# port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | sort -u
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 67.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 67.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "${name}58"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 58.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 58.3
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel textproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {kencu @kencu} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Permissive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description International Components for Unicode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel textproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kencu @kencu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Permissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description International Components for Unicode
</span>
long_description \
The International Components for Unicode (ICU) libraries provide robust \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,16 +30,16 @@ long_description \
</span> supports the most current version of the Unicode standard, and they provide \
support for supplementary Unicode characters (needed for GB 18030 repertoire support).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://site.icu-project.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://github.com/unicode-org/icu/releases/download/release-[string map {. -} ${version}]/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://site.icu-project.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/unicode-org/icu/releases/download/release-[string map {. -} ${version}]/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-[string map {. _} ${version}]-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-[string map {. _} ${version}]-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}/source
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c4a84ef7d2e18d6d1374b5ed6449227b94550e14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24518055
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c4a84ef7d2e18d6d1374b5ed6449227b94550e14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24518055
</span>
if {${os.major} >= 11 || ${subport} eq "${name}58"} {
configure.python /usr/bin/python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,32 +64,29 @@ if { [vercmp ${version} 59] >= 0 } {
</span> compiler.cxx_standard 2011
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-layoutex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-samples \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-layoutex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-samples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-static
</span>
subport ${name}-docs {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}-doxygen-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}-doxygen-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description-append (documentation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (documentation)
</span> long_description-append Documentation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_zip yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_zip yes
</span> distname ${my_name}-[string map {. _} ${version}]-docs
checksums rmd160 5132c05255a982017540088fa5a133237f22510e \
sha256 d5a2b188a3bd55252d5fbcce75d563ec1ab574e31de626b40dc7b797f03d89b4 \
size 7913999
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.dir ${worksrcpath}/doc/html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.dir ${worksrcpath}/doc/html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span> build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
xinstall -m 755 -d ${destroot}${docdir}
copy ${worksrcpath}/doc/html ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,16 +95,16 @@ subport ${name}-docs {
</span>
subport ${name}-doxygen-docs {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span>
depends_build-append port:doxygen
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description-append (build documentation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (build documentation)
</span> long_description-append Build documentation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install-doc
</span> }
subport ${name}-lx {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +128,8 @@ if {${subport} eq ${name}} {
</span>
if { ${subport} ne "${name}-docs" } {
if { ${supported_archs} ne "noarch" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
if { [vercmp ${version} 59] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,6 +161,7 @@ if { ${subport} ne "${name}-docs" } {
</span> # for upstream reports and discussion, see
# http://bugs.icu-project.org/trac/ticket/10308
# http://bugs.icu-project.org/trac/ticket/6102
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${supported_archs} ne "noarch"} {
post-build {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,27 +173,22 @@ if { ${subport} ne "${name}-docs" } {
</span> set dirs ${worksrcpath}
}
foreach dir ${dirs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Removing architecture-specific differences is necessary to facilitate merging.
# This should not be a problem for projects using icu-config because we do not
# believe icu-config uses SIZEOF_VOID_P anyway. Projects using the Makefile
# include files may experience problems. The developers of ICU suggest using
# pkg-config over both icu-config and the Makefile includes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s| -DSIZEOF_VOID_P=[48]||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s| -arch +[^ ]+||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/pkgdata.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove architecture-specific host information
</span> # calling icu-config for the host information is not mentioned in any
# icu man pages as an option, differs between architectures, and can't be merged
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/45268
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|host=\".*\"|host=\"\"|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|host_alias=\".*\"|host_alias=\"\"|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|host_cpu=\".*\"|host_cpu=\"\"|g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}/config/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s| -arch +[^ ]+||g} ${dir}/config/pkgdata.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host=\".*\"|host=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host_alias=\".*\"|host_alias=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host_cpu=\".*\"|host_cpu=\"\"|g} ${dir}/config/icu-config
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,6 +198,7 @@ if { ${subport} ne "${name}-docs" } {
</span>
if {${supported_archs} ne "noarch"} {
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ICU detects cross compiling by trying to run binaries.
# r73849 and #29904 indicate that cross compiling is a problem.
# Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
</pre><pre style='margin:0'>
</pre>