<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82a77e3018be563c5892225b0eeb6c274379a1bd">https://github.com/macports/macports-ports/commit/82a77e3018be563c5892225b0eeb6c274379a1bd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 82a77e3018be563c5892225b0eeb6c274379a1bd
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Sep 17 11:47:52 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> icu-devel: new port for testing
</span>---
devel/{icu => icu-devel}/Portfile | 23 +++++++++++++---------
devel/icu-devel/files/patch-common-putil.cpp.diff | 17 ++++++++++++++++
devel/icu-devel/files/patch-config-mh-darwin.diff | 14 +++++++++++++
.../patch-i18n-formatted_string_builder.h.diff | 11 +++++++++++
devel/icu/Portfile | 18 +++++++++++------
5 files changed, 68 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu-devel/Portfile
</span>similarity index 94%
copy from devel/icu/Portfile
copy to devel/icu-devel/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 9d23b3a858e..9858665078a 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-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup clang_dependency 1.0
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+name icu-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please keep the icu and icu-devel ports as similar as possible.
</span>
#===============================================================================
# *** IMPORTANT NOTE ***
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +28,8 @@ epoch 1
</span> subport ${name}-docs { revision 0 }
subport ${name}-lx { revision 0 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts icu icu-lx icu-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel textproc
platforms darwin freebsd
maintainers {@catap korins.ky:kirill} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +45,8 @@ long_description \
</span>
homepage https://icu.unicode.org/
master_sites https://github.com/unicode-org/icu/releases/download/release-[string map {. -} ${version}]/
<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;'>+dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${my_name}
</span>
if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +61,9 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> merger_must_run_binaries yes
}
<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:#e0ffe0;'>+ distname icu4c-[string map {. _} ${version}]-src
</span> extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${name}/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir icu/source
</span>
# please also update the icu-docs checksums at the bottom of the Portfile
checksums rmd160 e2cdd18bb849514081a541ec7b580ed652473554 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +154,7 @@ if {${subport} eq "${name}-lx"} {
</span> long_description {*}${description}
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name} \
</span> port:icu-le-hb
configure.args-replace --disable-layoutex --enable-layoutex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +169,7 @@ if {${subport} eq "${name}-docs"} {
</span> long_description-append Documentation.
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${my_name}-[string map {. _} ${version}]-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname icu4c-[string map {. _} ${version}]-docs
</span> checksums rmd160 06c9db2c6dfc989e65426e9e671188c69b713464 \
sha256 b2b6ec8bc5234d0ebe47aaee3d1f80dcf3dba4fda666588531b07f5b0d9cffc8 \
size 8136508
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,9 +184,10 @@ if {${subport} eq "${name}-docs"} {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.name ${my_name}
</span> livecheck.version [string map {. -} ${version}]
livecheck.url https://api.github.com/repos/unicode-org/icu/releases?per_page=100
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex \".+releases/tag/release-(\\d+\-\\d+)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex \".+releases/tag/release-(\\d+(?:\-\\d+)?)(?:-rc)?\"
</span> } else {
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu-devel/files/patch-common-putil.cpp.diff b/devel/icu-devel/files/patch-common-putil.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f8f8b708817
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu-devel/files/patch-common-putil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.icu-project.org/trac/ticket/9367
</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;'>+@@ -124,6 +124,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</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;'>++ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++U_CFUNC struct tm *localtime_r(const time_t *, struct tm *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ * Only include langinfo.h if we have a way to get the codeset. If we later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu-devel/files/patch-config-mh-darwin.diff b/devel/icu-devel/files/patch-config-mh-darwin.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3db62d799dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu-devel/files/patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Compiler switches to embed a library name and version information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(ENABLE_RPATH),YES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Compiler switch to embed a runtime search path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RPATH=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu-devel/files/patch-i18n-formatted_string_builder.h.diff b/devel/icu-devel/files/patch-i18n-formatted_string_builder.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3c7ef5a6530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu-devel/files/patch-i18n-formatted_string_builder.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- i18n/formatted_string_builder.h.orig 2020-04-22 13:04:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ i18n/formatted_string_builder.h 2020-08-02 15:55:24.296030000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,8 +224,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr FormattedStringBuilder::Field::Field(uint8_t category, uint8_t field)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : bits((
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U_ASSERT(category <= 0xf),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U_ASSERT(field <= 0xf),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static_cast<uint8_t>((category << 4) | field)
</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;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d23b3a858e..ea0f22ca61e 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;'>@@ -4,7 +4,9 @@ PortSystem 1.0
</span> PortGroup clang_dependency 1.0
name icu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name icu4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please keep the icu and icu-devel ports as similar as possible.
</span>
#===============================================================================
# *** IMPORTANT NOTE ***
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +29,8 @@ epoch 1
</span> subport ${name}-docs { revision 0 }
subport ${name}-lx { revision 0 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts icu-devel icu-devel-lx icu-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel textproc
platforms darwin freebsd
maintainers {@catap korins.ky:kirill} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +46,8 @@ long_description \
</span>
homepage https://icu.unicode.org/
master_sites https://github.com/unicode-org/icu/releases/download/release-[string map {. -} ${version}]/
<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;'>+dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${my_name}
</span>
if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +62,9 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> merger_must_run_binaries yes
}
<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:#e0ffe0;'>+ distname icu4c-[string map {. _} ${version}]-src
</span> extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${name}/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir icu/source
</span>
# please also update the icu-docs checksums at the bottom of the Portfile
checksums rmd160 e2cdd18bb849514081a541ec7b580ed652473554 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +155,7 @@ if {${subport} eq "${name}-lx"} {
</span> long_description {*}${description}
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name} \
</span> port:icu-le-hb
configure.args-replace --disable-layoutex --enable-layoutex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +170,7 @@ if {${subport} eq "${name}-docs"} {
</span> long_description-append Documentation.
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${my_name}-[string map {. _} ${version}]-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname icu4c-[string map {. _} ${version}]-docs
</span> checksums rmd160 06c9db2c6dfc989e65426e9e671188c69b713464 \
sha256 b2b6ec8bc5234d0ebe47aaee3d1f80dcf3dba4fda666588531b07f5b0d9cffc8 \
size 8136508
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,6 +185,7 @@ if {${subport} eq "${name}-docs"} {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.name ${my_name}
</span> livecheck.version [string map {. -} ${version}]
livecheck.url https://api.github.com/repos/unicode-org/icu/releases?per_page=100
livecheck.regex \".+releases/tag/release-(\\d+\-\\d+)\"
</pre><pre style='margin:0'>
</pre>