<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/e48111c3f0bef3c36a3c35f745b53d2c50d04358">https://github.com/macports/macports-ports/commit/e48111c3f0bef3c36a3c35f745b53d2c50d04358</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 e48111c3f0b nodejs{16,17}: Use MacPorts' newly upgraded ICU 71.1
</span>e48111c3f0b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e48111c3f0bef3c36a3c35f745b53d2c50d04358
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Sat Sep 24 16:09:36 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> nodejs{16,17}: Use MacPorts' newly upgraded ICU 71.1
</span>---
devel/nodejs16/Portfile | 13 +++++--------
devel/nodejs17/Portfile | 13 +++++--------
2 files changed, 10 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs16/Portfile b/devel/nodejs16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04bbac2839f..0ceda6d2232 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ compiler.cxx_standard 2014
</span>
name nodejs16
version 16.17.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories devel net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,16 +44,14 @@ depends_build-append port:pkgconfig
</span> set py_ver 3.10
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span> port:zlib
if {![variant_isset openssl3]} {
openssl.branch 1.1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: when icu is upgraded to v68.x, use MacPorts'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # error: 'atomic_load<v8::internal::OwnedVector<const unsigned char> >' is unavailable: introduced in macOS 10.9
set min_darwin 13
if { ${os.major} < ${min_darwin} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,15 +100,14 @@ post-patch {
</span> pre-configure {
# Copy zlib headers here because we do not want to prepend the entire
# ${prefix}/include to the include path (the build will then attempt to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU 67 headers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU headers)
</span> file mkdir ${workpath}/zlib-inc
file copy ${prefix}/include/zconf.h ${prefix}/include/zlib.h \
${workpath}/zlib-inc/
}
configure.args-append --without-npm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: when icu is upgraded to v68.x, use MacPorts'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --with-intl=system-icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-intl=system-icu
</span> configure.args-append --shared-openssl
configure.args-append --shared-openssl-includes=[openssl::include_dir]/openssl
configure.args-append --shared-openssl-libpath=[openssl::lib_dir]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs17/Portfile b/devel/nodejs17/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0059c9818cf..909313d576a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ compiler.cxx_standard 2014
</span>
name nodejs17
version 17.9.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories devel net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,12 +43,10 @@ depends_build-append port:pkgconfig
</span> set py_ver 3.10
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: when icu is upgraded to v68.x, use MacPorts'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # error: 'atomic_load<v8::internal::OwnedVector<const unsigned char> >' is unavailable: introduced in macOS 10.9
set min_darwin 13
if { ${os.major} < ${min_darwin} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,15 +94,14 @@ post-patch {
</span> pre-configure {
# Copy zlib headers here because we do not want to prepend the entire
# ${prefix}/include to the include path (the build will then attempt to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU 67 headers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU headers)
</span> file mkdir ${workpath}/zlib-inc
file copy ${prefix}/include/zconf.h ${prefix}/include/zlib.h \
${workpath}/zlib-inc/
}
configure.args-append --without-npm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: when icu is upgraded to v68.x, use MacPorts'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --with-intl=system-icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-intl=system-icu
</span> configure.args-append --shared-zlib
configure.args-append --shared-zlib-includes=${workpath}/zlib-inc
configure.args-append --shared-zlib-libpath=${prefix}/lib
</pre><pre style='margin:0'>
</pre>