Update to node v20.18.0, more simple than usual - v8 seems to be almost
untouched and no npm update, thus no PLIST changes.
Tested on arm64 and amd64 and no indication that it may cause trouble on other
platforms.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/node/Makefile,v
diff -u -p -r1.139 Makefile
--- Makefile 28 Aug 2024 17:44:40 -0000 1.139
+++ Makefile 8 Oct 2024 12:18:20 -0000
@@ -5,7 +5,7 @@ USE_WXNEEDED = Yes
COMMENT = JavaScript runtime built on Chrome's V8 JavaScript engine
-NODE_VERSION = v20.17.0
+NODE_VERSION = v20.18.0
PLEDGE_VER = 1.1.3
DISTFILES = ${DISTNAME}-headers.tar.gz \
${DISTNAME}.tar.xz
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/node/distinfo,v
diff -u -p -r1.80 distinfo
--- distinfo 28 Aug 2024 17:44:40 -0000 1.80
+++ distinfo 8 Oct 2024 12:18:20 -0000
@@ -1,6 +1,6 @@
SHA256 (node-pledge-1.1.3.tar.gz) =
fEaXvLg6hYEJ69K+mgQFizf8DiJY2/DtyFJB/pEanVU=
-SHA256 (node-v20.17.0-headers.tar.gz) =
zNgJhC5QysYMM8Qpbwq4M1GQ4mVkSWEiipgsk5Qgve0=
-SHA256 (node-v20.17.0.tar.xz) = mr8DrCM2LGA4frtjOlFjA2NxRcs8F3vjNIsWiA/Ysow=
+SHA256 (node-v20.18.0-headers.tar.gz) =
+66HqLwAlpx+ieFeUTkjYuLB5Zp+q6PizLoWAXRed6U=
+SHA256 (node-v20.18.0.tar.xz) = fZQz6R/YjYK6jehucR7EGQdjjiJ5k9IulRJrAvbNcUo=
SIZE (node-pledge-1.1.3.tar.gz) = 3167
-SIZE (node-v20.17.0-headers.tar.gz) = 8761389
-SIZE (node-v20.17.0.tar.xz) = 41751520
+SIZE (node-v20.18.0-headers.tar.gz) = 8752401
+SIZE (node-v20.18.0.tar.xz) = 41937144
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-Makefile,v
diff -u -p -r1.23 patch-Makefile
--- patches/patch-Makefile 28 Aug 2024 17:44:42 -0000 1.23
+++ patches/patch-Makefile 8 Oct 2024 12:18:20 -0000
@@ -10,7 +10,7 @@ Index: Makefile
$(PYTHON) tools/install.py $@ --dest-dir '$(DESTDIR)' --prefix
'$(PREFIX)'
.PHONY: uninstall
-@@ -438,6 +438,12 @@ test/addons/.buildstamp: $(ADDONS_PREREQS) \
+@@ -442,6 +442,12 @@ test/addons/.buildstamp: $(ADDONS_PREREQS) \
# Just goes to show that recursive make really is harmful...
# TODO(bnoordhuis) Force rebuild after gyp update.
build-addons: | $(NODE_EXE) test/addons/.buildstamp
Index: patches/patch-common_gypi
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-common_gypi,v
diff -u -p -r1.32 patch-common_gypi
--- patches/patch-common_gypi 28 Aug 2024 17:44:42 -0000 1.32
+++ patches/patch-common_gypi 8 Oct 2024 12:18:20 -0000
@@ -1,7 +1,7 @@
Index: common.gypi
--- common.gypi.orig
+++ common.gypi
-@@ -190,7 +190,6 @@
+@@ -188,7 +188,6 @@
}],
],
},
@@ -9,7 +9,7 @@ Index: common.gypi
'conditions': [
['enable_lto=="true"', {
'cflags': ['<(lto)'],
-@@ -474,7 +473,9 @@
+@@ -472,7 +471,9 @@
}],
['OS=="openbsd"', {
'cflags': [ '-I/usr/local/include' ],
@@ -20,7 +20,7 @@ Index: common.gypi
}],
['_toolset=="host"', {
'conditions': [
-@@ -491,7 +492,7 @@
+@@ -489,7 +490,7 @@
'ldflags': [ '-m32' ],
}],
[ 'host_arch=="ppc64" and OS not in "aix os400"', {
@@ -29,7 +29,7 @@ Index: common.gypi
'ldflags': [ '-m64' ],
}],
[ 'host_arch=="s390x" and OS=="linux"', {
-@@ -515,7 +516,7 @@
+@@ -513,7 +514,7 @@
'ldflags': [ '-m32' ],
}],
[ 'target_arch=="ppc64" and OS not in "aix os400"', {
Index: patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-configure_py,v
diff -u -p -r1.7 patch-configure_py
--- patches/patch-configure_py 28 Aug 2024 17:44:42 -0000 1.7
+++ patches/patch-configure_py 8 Oct 2024 12:18:20 -0000
@@ -1,7 +1,7 @@
Index: configure.py
--- configure.py.orig
+++ configure.py
-@@ -1599,6 +1599,10 @@ def configure_v8(o):
+@@ -1625,6 +1625,10 @@ def configure_v8(o):
raise Exception(
'Only one of the --v8-enable-object-print or
--v8-disable-object-print options '
'can be specified at a time.')
Index: patches/patch-include_node_common_gypi
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-include_node_common_gypi,v
diff -u -p -r1.6 patch-include_node_common_gypi
--- patches/patch-include_node_common_gypi 28 Aug 2024 17:44:42 -0000
1.6
+++ patches/patch-include_node_common_gypi 8 Oct 2024 12:18:20 -0000
@@ -1,7 +1,7 @@
Index: include/node/common.gypi
--- include/node/common.gypi.orig
+++ include/node/common.gypi
-@@ -190,7 +190,6 @@
+@@ -188,7 +188,6 @@
}],
],
},
@@ -9,7 +9,7 @@ Index: include/node/common.gypi
'conditions': [
['enable_lto=="true"', {
'cflags': ['<(lto)'],
-@@ -491,7 +490,7 @@
+@@ -489,7 +488,7 @@
'ldflags': [ '-m32' ],
}],
[ 'host_arch=="ppc64" and OS not in "aix os400"', {
@@ -18,7 +18,7 @@ Index: include/node/common.gypi
'ldflags': [ '-m64' ],
}],
[ 'host_arch=="s390x" and OS=="linux"', {
-@@ -515,7 +514,7 @@
+@@ -513,7 +512,7 @@
'ldflags': [ '-m32' ],
}],
[ 'target_arch=="ppc64" and OS not in "aix os400"', {
Index: patches/patch-node_gyp
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-node_gyp,v
diff -u -p -r1.24 patch-node_gyp
--- patches/patch-node_gyp 27 Jul 2024 15:17:56 -0000 1.24
+++ patches/patch-node_gyp 8 Oct 2024 12:18:20 -0000
@@ -4,7 +4,7 @@ devel/gtest if installed.
Index: node.gyp
--- node.gyp.orig
+++ node.gyp
-@@ -828,7 +828,7 @@
+@@ -831,7 +831,7 @@
],
'dependencies': [
'deps/base64/base64.gyp:base64',
@@ -13,7 +13,7 @@ Index: node.gyp
'deps/histogram/histogram.gyp:histogram',
'deps/uvwasi/uvwasi.gyp:uvwasi',
'deps/simdutf/simdutf.gyp:simdutf',
-@@ -1146,8 +1146,8 @@
+@@ -1149,8 +1149,8 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/base64/base64.gyp:base64',
@@ -24,7 +24,7 @@ Index: node.gyp
'deps/histogram/histogram.gyp:histogram',
'deps/uvwasi/uvwasi.gyp:uvwasi',
'deps/simdutf/simdutf.gyp:simdutf',
-@@ -1195,6 +1195,10 @@
+@@ -1197,6 +1197,10 @@
}],
['OS=="solaris"', {
'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
Index: patches/patch-src_env_cc
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-src_env_cc,v
diff -u -p -r1.10 patch-src_env_cc
--- patches/patch-src_env_cc 27 Jul 2024 15:17:56 -0000 1.10
+++ patches/patch-src_env_cc 8 Oct 2024 12:18:20 -0000
@@ -1,7 +1,7 @@
Index: src/env.cc
--- src/env.cc.orig
+++ src/env.cc
-@@ -757,29 +757,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
+@@ -773,29 +773,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
}
std::string Environment::GetExecPath(const std::vector<std::string>& argv) {
Index: patches/patch-tools_v8_gypfiles_toolchain_gypi
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-tools_v8_gypfiles_toolchain_gypi,v
diff -u -p -r1.2 patch-tools_v8_gypfiles_toolchain_gypi
--- patches/patch-tools_v8_gypfiles_toolchain_gypi 18 May 2024 12:10:22
-0000 1.2
+++ patches/patch-tools_v8_gypfiles_toolchain_gypi 8 Oct 2024 12:18:20
-0000
@@ -1,7 +1,7 @@
Index: tools/v8_gypfiles/toolchain.gypi
--- tools/v8_gypfiles/toolchain.gypi.orig
+++ tools/v8_gypfiles/toolchain.gypi
-@@ -861,11 +861,9 @@
+@@ -865,11 +865,9 @@
# Don't use -O3 with sanitizers.
['asan==0 and msan==0 and lsan==0 \
and tsan==0 and ubsan==0 and ubsan_vptr==0', {
