<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a4c3703f5d6f350687dc372ec60b5b9b8cfd84d1">https://github.com/macports/macports-ports/commit/a4c3703f5d6f350687dc372ec60b5b9b8cfd84d1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a4c3703f5d6f350687dc372ec60b5b9b8cfd84d1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Apr 8 22:02:55 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> icu: Update to 58.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/49614
</span>---
devel/icu/Portfile | 64 ++++++++++++++---------------
devel/icu/files/patch-Makefile.in.diff | 10 -----
devel/icu/files/patch-common-putil.cpp.diff | 6 +--
devel/icu/files/patch-config-mh-darwin.diff | 6 +--
4 files changed, 38 insertions(+), 48 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 5e3ee20..b8bd286 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;'>@@ -7,12 +7,12 @@ 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:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# port file all | sort -u | xargs grep -E ':icu( |$)' | cut -d / -f 12 | sort -u
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 55.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | sort -u
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 58.2
</span> categories devel textproc
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Permissive
</span>
description International Components for Unicode
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,14 +22,22 @@ 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://www.icu-project.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://site.icu-project.org/
</span> master_sites http://download.icu-project.org/files/${my_name}/${version}/
distname ${my_name}-[join [split ${version} .] _]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}-src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 df06e7b18a87e383d3762564f2e9a59fd75865f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c
</span>
worksrcdir ${name}/source
set docdir ${prefix}/share/doc/${name}
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport ${name}-docs {
conflicts ${name}-doxygen-docs
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +45,11 @@ subport ${name}-docs {
</span> description-append (documentation)
long_description-append Documentation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles ${distname}-docs.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d5ee9d13b90516c1722e25fd75b62119dbe99f12 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1c70c2283655e1d502baa32e4d087f8ce8f07b6230e6baed3567e74c42e5ffcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.suffix .zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles ${distname}-docs${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 64c9385c43f994d283a38980c77638dc061bfe84 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc17983debc1f23f1bd1ac1ba053f2df5b07858f5af9bd48eeb3b8044c8d3146
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> extract.dir ${worksrcpath}/doc/html
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +66,7 @@ subport ${name}-doxygen-docs {
</span> conflicts ${name}-docs
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:doxygen
</span>
description-append (build documentation)
long_description-append Build documentation.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,18 +75,25 @@ subport ${name}-doxygen-docs {
</span> destroot.target install-doc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-lx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://userguide.icu-project.org/layoutengine/paragraph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description ICU paragraph layout library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu-le-hb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-layoutex --enable-layoutex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${worksrcpath}/layoutex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${subport} ne "${name}-docs" } {
if { ${supported_archs} ne "noarch" } {
PortGroup muniversal 1.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles ${distname}-src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 94dcaaac13b41de3588b01f39febe1b1cbd5765d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Makefile.in.diff
</span> patchfiles-append patch-config-mh-darwin.diff
# ICU has three mechanisms to aid other projects in building properly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,9 +142,6 @@ if { ${subport} ne "${name}-docs" } {
</span> set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
configure.cmd ./runConfigureICU ${platform}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --enable-static \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-samples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.universal_args-delete --disable-dependency-tracking
if {[variant_isset universal]} {
# ICU detects cross compiling by trying to run binaries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,8 +160,6 @@ if { ${subport} ne "${name}-docs" } {
</span> build.type gnu
build.args VERBOSE=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_parallel_build yes
</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;'>@@ -160,15 +169,6 @@ if { ${subport} ne "${name}-docs" } {
</span> xinstall -d ${destroot}${docdir}
xinstall -m 0644 {*}[glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset doc] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "You have requested an obsolete variant. Replaced by port ${name}-docs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:${name}-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset doxygen] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "You have requested an obsolete variant. Replaced by port ${name}-doxygen-docs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:${name}-doxygen-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
platform freebsd {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/patch-Makefile.in.diff b/devel/icu/files/patch-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6083536..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2015-03-22 17:32:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2015-03-22 17:33:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,7 +335,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat $(top_srcdir)/config/icu-config-bottom >> $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "# Rebuilt on "`date` >> $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod u-w $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/patch-common-putil.cpp.diff b/devel/icu/files/patch-common-putil.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d55eaf7..323f7e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/files/patch-common-putil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/files/patch-common-putil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> http://bugs.icu-project.org/trac/ticket/9367
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- common/putil.cpp.orig 2015-03-18 13:40:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common/putil.cpp 2015-03-22 16:55:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,6 +117,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/putil.cpp.orig 2016-10-19 12:20:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/putil.cpp 2017-02-11 10:01:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,6 +119,13 @@
</span> #endif
/*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/patch-config-mh-darwin.diff b/devel/icu/files/patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 875297c..f25d965 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/files/patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/files/patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/mh-darwin.orig 2012-09-10 19:00:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/mh-darwin 2014-08-13 17:12:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,11 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/mh-darwin.orig 2016-06-15 13:58:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/mh-darwin 2017-02-11 09:37:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,11 +30,7 @@
</span> SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
## Compiler switches to embed a library name and version information
</pre><pre style='margin:0'>
</pre>