<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2301ff67ef91df9dfb02461868b60f0009446e1e">https://github.com/macports/macports-ports/commit/2301ff67ef91df9dfb02461868b60f0009446e1e</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 2301ff67ef9 nodejs16: new port for nodejs 16.0.0, based off nodejs15 port
</span>2301ff67ef9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2301ff67ef91df9dfb02461868b60f0009446e1e
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Tue Apr 20 10:10:41 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> nodejs16: new port for nodejs 16.0.0, based off nodejs15 port
</span>---
devel/nodejs10/Portfile | 2 +-
devel/nodejs12/Portfile | 2 +-
devel/nodejs13/Portfile | 2 +-
devel/nodejs14/Portfile | 2 +-
devel/nodejs15/Portfile | 4 ++--
devel/{nodejs15 => nodejs16}/Portfile | 20 +++++++++--------
devel/nodejs16/files/patch-common.gypi.diff | 10 +++++++++
.../patch-tools-getsharedopensslhasquic.py.diff | 25 ++++++++++++++++++++++
devel/nodejs8/Portfile | 2 +-
9 files changed, 53 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs10/Portfile b/devel/nodejs10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 694e1e79e2f..26e9da9b749 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs8 nodejs12 nodejs13 nodejs14 nodejs15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs8 nodejs12 nodejs13 nodejs14 nodejs15 nodejs16
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs12/Portfile b/devel/nodejs12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6dd76505b18..f01ac6ff643 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs8 nodejs10 nodejs13 nodejs14 nodejs15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs8 nodejs10 nodejs13 nodejs14 nodejs15 nodejs16
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs13/Portfile b/devel/nodejs13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 752011a6ba7..aa0a191bb52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs8 nodejs10 nodejs12 nodejs14 nodejs15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs8 nodejs10 nodejs12 nodejs14 nodejs15 nodejs16
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs14/Portfile b/devel/nodejs14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6991ef3d3e5..553921c388b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs8 nodejs10 nodejs12 nodejs13 nodejs15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs8 nodejs10 nodejs12 nodejs13 nodejs15 nodejs16
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs15/Portfile b/devel/nodejs15/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9276353639e..d1a4c08e830 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs8 nodejs10 nodejs12 nodejs13 nodejs14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs8 nodejs10 nodejs12 nodejs13 nodejs14 nodejs16
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,4 +168,4 @@ destroot {
</span>
livecheck.url ${homepage}dist/
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {v(\d+\.\d+\.\d+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {v(15\.\d+\.\d+)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs15/Portfile b/devel/nodejs16/Portfile
</span>similarity index 90%
copy from devel/nodejs15/Portfile
copy to devel/nodejs16/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 9276353639e..8a78485fc7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs15/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;'>@@ -10,8 +10,8 @@ depends_lib-append port:libcxx
</span> configure.cxx_stdlib libc++
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name nodejs15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 15.14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name nodejs16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 16.0.0
</span> revision 0
categories devel net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,22 +26,23 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs8 nodejs10 nodejs12 nodejs13 nodejs14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs8 nodejs10 nodejs12 nodejs13 nodejs14 nodejs15
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 348603bfba493e8396bd1b85402eed02f6f2d35f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8122dc4eea4f00af32a1d14ca85a1d4d6ca7b2dcffd9a731bda149fc5593a66e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 33324232
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5b675e59a067f5b4092180110a0f07453951f296 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 47cb90111e8c3dc42dc538464789415354f0d933587fc89fff71f9bd816aaa02 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33784448
</span>
distname node-v${version}
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:icu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: when icu is upgraded to v68.x, use MacPorts'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#depends_lib port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:python39 \
</span> path:lib/libssl.dylib:openssl
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +79,8 @@ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span> }
configure.args-append --without-npm
<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;'>+# TODO: when icu is upgraded to v68.x, use MacPorts'.
</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=${prefix}/include/openssl
configure.args-append --shared-openssl-libpath=${prefix}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs16/files/patch-common.gypi.diff b/devel/nodejs16/files/patch-common.gypi.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d31ad5e8dd5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs16/files/patch-common.gypi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common.gypi.orig 2020-01-09 16:27:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common.gypi 2020-01-09 16:28:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -424,7 +424,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'PREBINDING': 'NO', # No -Wl,-prebind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'MACOSX_DEPLOYMENT_TARGET': '10.13', # -mmacosx-version-min=10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'USE_HEADERMAP': 'NO',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'OTHER_CFLAGS': [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-fno-strict-aliasing',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs16/files/patch-tools-getsharedopensslhasquic.py.diff b/devel/nodejs16/files/patch-tools-getsharedopensslhasquic.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..52746591252
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs16/files/patch-tools-getsharedopensslhasquic.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes this configure error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Node.js configure: Found Python 3.9.2...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Traceback (most recent call last):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "/opt/local/var/macports/build/devel_nodejs15/nodejs15/work/node-v15.13.0/./configure", line 26, in <module>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "/opt/local/var/macports/build/devel_nodejs15/nodejs15/work/node-v15.13.0/configure.py", line 1888, in <module>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_openssl(output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "/opt/local/var/macports/build/devel_nodejs15/nodejs15/work/node-v15.13.0/configure.py", line 1455, in configure_openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variables['openssl_quic'] = b(getsharedopensslhasquic.get_has_quic(options.__dict__['shared_openssl_includes']))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "tools/getsharedopensslhasquic.py", line 12, in get_has_quic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f = open(openssl_crypto_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+FileNotFoundError: [Errno 2] No such file or directory: '/opt/local/include/openssl/openssl/crypto.h'
</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;'>+--- tools/getsharedopensslhasquic.py.orig 2021-03-30 21:20:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/getsharedopensslhasquic.py 2021-03-31 12:35:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if include_path:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl_crypto_h = os.path.join(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_path,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'openssl',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'crypto.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f = open(openssl_crypto_h)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs8/Portfile b/devel/nodejs8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24aec3ca0e2..7bb815e8f0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ long_description Node's goal is to provide an easy way to build scalable
</span> Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts nodejs10 nodejs12 nodejs13 nodejs14 nodejs15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts nodejs10 nodejs12 nodejs13 nodejs14 nodejs15 nodejs16
</span>
homepage https://nodejs.org/
master_sites ${homepage}dist/v${version}
</pre><pre style='margin:0'>
</pre>