summaryrefslogtreecommitdiff
path: root/www/node20
diff options
context:
space:
mode:
Diffstat (limited to 'www/node20')
-rw-r--r--www/node20/Makefile30
-rw-r--r--www/node20/Makefile.version2
-rw-r--r--www/node20/distinfo6
-rw-r--r--www/node20/files/patch-libc++19185
-rw-r--r--www/node20/pkg-message2
5 files changed, 25 insertions, 200 deletions
diff --git a/www/node20/Makefile b/www/node20/Makefile
index 4d4ebf08f1d8..bfcd8c796f38 100644
--- a/www/node20/Makefile
+++ b/www/node20/Makefile
@@ -17,24 +17,28 @@ BROKEN_SSL= libressl libressl-devel
BROKEN_SSL_REASON= Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
-BUILD_DEPENDS= brotli>=1.0.9,1:archivers/brotli \
- c-ares>=1.17.2:dns/c-ares \
- libnghttp2>=1.45.1:www/libnghttp2 \
- libuv>=1.42.0:devel/libuv \
- objdump:devel/binutils
+BUILD_DEPENDS= objdump:devel/binutils
LIB_DEPENDS= libbrotlidec.so:archivers/brotli \
libcares.so:dns/c-ares \
+ libicui18n.so:devel/icu \
libnghttp2.so:www/libnghttp2 \
+ libnghttp3.so:www/libnghttp3 \
+ libngtcp2.so:net/libngtcp2 \
+ libsimdjson.so:devel/simdjson \
libuv.so:devel/libuv
-USES= compiler:c++11-lib gmake localbase pkgconfig python:build shebangfix tar:xz
+USES= compiler:c++11-lang gmake localbase pkgconfig python:build shebangfix tar:xz
CONFIGURE_ARGS= --prefix=${PREFIX:S|^${DESTDIR}||} \
--shared-brotli \
--shared-cares \
--shared-libuv \
--shared-nghttp2 \
+ --shared-nghttp3 \
+ --shared-ngtcp2 \
+ --shared-simdjson \
--shared-zlib \
+ --with-intl=system-icu \
--without-npm
HAS_CONFIGURE= yes
MAKE_ENV= CC.host="${CCACHE_BIN} ${CC}" \
@@ -52,7 +56,7 @@ SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \
tools/*.py \
tools/inspector_protocol/*.py
-OPTIONS_DEFINE= BUNDLED_SSL DOCS JIT NLS
+OPTIONS_DEFINE= BUNDLED_SSL DOCS JIT
OPTIONS_DEFAULT=JIT
OPTIONS_SUB= yes
BUNDLED_SSL_DESC= Use bundled OpenSSL implementation from node.js
@@ -62,9 +66,6 @@ BUNDLED_SSL_CONFIGURE_OFF= --openssl-use-def-ca-store --shared-openssl
BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss
BUNDLED_SSL_USES_OFF= ssl
JIT_CONFIGURE_OFF= --v8-lite-mode
-NLS_BUILD_DEPENDS= icu>=69.1:devel/icu
-NLS_CONFIGURE_ON= --with-intl=system-icu
-NLS_LIB_DEPENDS= libicui18n.so:devel/icu
.include "Makefile.version"
.include <bsd.port.options.mk>
@@ -75,6 +76,15 @@ CONFIGURE_ARGS+=--openssl-no-asm
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
+# Clean up bundled libraries
+ @${RM} -r ${WRKSRC}/deps/brotli/
+ @${RM} -r ${WRKSRC}/deps/cares/
+ @${RM} -r ${WRKSRC}/deps/nghttp2/
+ @${RM} -r ${WRKSRC}/deps/ngtcp2/
+ @${RM} -r ${WRKSRC}/deps/npm/
+ @${RM} -r ${WRKSRC}/deps/simdjson/
+ @${RM} -r ${WRKSRC}/deps/uv/
+ @${RM} -r ${WRKSRC}/deps/zlib/
post-configure:
# Post-process Makefile and *.mk files created by node-gyp and remove
diff --git a/www/node20/Makefile.version b/www/node20/Makefile.version
index 0155e27fe930..4a050a24efaa 100644
--- a/www/node20/Makefile.version
+++ b/www/node20/Makefile.version
@@ -1 +1 @@
-NODEJS_PORTVERSION= 20.19.0
+NODEJS_PORTVERSION= 20.19.3
diff --git a/www/node20/distinfo b/www/node20/distinfo
index 3721358d0a01..f0829b77ea26 100644
--- a/www/node20/distinfo
+++ b/www/node20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070284
-SHA256 (node-v20.19.0.tar.xz) = 5ac2516fc905b6a0bc1a33e7302937eac664a820b887cc86bd48c035fba392d7
-SIZE (node-v20.19.0.tar.xz) = 42285100
+TIMESTAMP = 1750954140
+SHA256 (node-v20.19.3.tar.xz) = 99be7b9d268d48b93be568a23240398ceacb0782dc7055b9972305c000b0e292
+SIZE (node-v20.19.3.tar.xz) = 42361704
diff --git a/www/node20/files/patch-libc++19 b/www/node20/files/patch-libc++19
deleted file mode 100644
index 269fbfd19739..000000000000
--- a/www/node20/files/patch-libc++19
+++ /dev/null
@@ -1,185 +0,0 @@
-Obtained from: https://chromium.googlesource.com/v8/v8.git/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f
-
-commit 182d9c05e78b1ddb1cb8242cd3628a7855a0336f
-Author: Andrey Kosyakov <caseq@chromium.org>
-Date: 2023-08-17T13:50:11-07:00
-
- Define UChar as char16_t
-
- We used to have UChar defined as uint16_t which does not go along
- with STL these days if you try to have an std::basic_string<> of it,
- as there are no standard std::char_traits<> specialization for uint16_t.
-
- This switches UChar to char16_t where practical, introducing a few
- compatibility shims to keep CL size small, as (1) this would likely
- have to be back-ported and (2) crdtp extensively uses uint16_t for
- wide chars.
-
- Bug: b:296390693
- Change-Id: I66a32d8f0050915225b187de56896c26dd76163d
- Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4789966
- Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
- Commit-Queue: Jaroslav Sevcik <jarin@chromium.org>
- Auto-Submit: Andrey Kosyakov <caseq@chromium.org>
- Cr-Commit-Position: refs/heads/main@{#89559}
-
-diff --git deps/v8/src/inspector/string-16.cc deps/v8/src/inspector/string-16.cc
-index a8b786a8166..6df9963e970 100644
---- deps/v8/src/inspector/string-16.cc
-+++ deps/v8/src/inspector/string-16.cc
-@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) {
- return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9));
- }
-
--int64_t charactersToInteger(const UChar* characters, size_t length,
-+int64_t charactersToInteger(const uint16_t* characters, size_t length,
- bool* ok = nullptr) {
- std::vector<char> buffer;
- buffer.reserve(length + 1);
-@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* characters, size_t length,
-
- String16::String16(const UChar* characters, size_t size)
- : m_impl(characters, size) {}
-+String16::String16(const uint16_t* characters, size_t size)
-+ : m_impl(reinterpret_cast<const UChar*>(characters), size) {}
-
- String16::String16(const UChar* characters) : m_impl(characters) {}
-
-@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UChar* stringStart, size_t length) {
- #endif // V8_TARGET_BIG_ENDIAN
- }
-
-+String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) {
-+ return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length);
-+}
-+
- std::string String16::utf8() const {
- return UTF16ToUTF8(m_impl.data(), m_impl.size());
- }
-diff --git deps/v8/src/inspector/string-16.h deps/v8/src/inspector/string-16.h
-index 1678ffb2e1e..d9f6c466ab1 100644
---- deps/v8/src/inspector/string-16.h
-+++ deps/v8/src/inspector/string-16.h
-@@ -6,6 +6,7 @@
- #define V8_INSPECTOR_STRING_16_H_
-
- #include <stdint.h>
-+#include <uchar.h>
-
- #include <cctype>
- #include <climits>
-@@ -18,7 +19,7 @@
-
- namespace v8_inspector {
-
--using UChar = uint16_t;
-+using UChar = char16_t;
-
- class String16 {
- public:
-@@ -28,6 +29,7 @@ class String16 {
- String16(const String16&) V8_NOEXCEPT = default;
- String16(String16&&) V8_NOEXCEPT = default;
- String16(const UChar* characters, size_t size);
-+ String16(const uint16_t* characters, size_t size);
- V8_EXPORT String16(const UChar* characters);
- V8_EXPORT String16(const char* characters);
- String16(const char* characters, size_t size);
-@@ -49,7 +51,9 @@ class String16 {
- int toInteger(bool* ok = nullptr) const;
- std::pair<size_t, size_t> getTrimmedOffsetAndLength() const;
- String16 stripWhiteSpace() const;
-- const UChar* characters16() const { return m_impl.c_str(); }
-+ const uint16_t* characters16() const {
-+ return reinterpret_cast<const uint16_t*>(m_impl.c_str());
-+ }
- size_t length() const { return m_impl.length(); }
- bool isEmpty() const { return !m_impl.length(); }
- UChar operator[](size_t index) const { return m_impl[index]; }
-@@ -79,6 +83,8 @@ class String16 {
- // On Big endian architectures, byte order needs to be flipped.
- V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart,
- size_t length);
-+ V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart,
-+ size_t length);
-
- std::size_t hash() const {
- if (!hash_code) {
-diff --git deps/v8/src/inspector/v8-string-conversions.cc deps/v8/src/inspector/v8-string-conversions.cc
-index 0c75e66b972..8cf19be816c 100644
---- deps/v8/src/inspector/v8-string-conversions.cc
-+++ deps/v8/src/inspector/v8-string-conversions.cc
-@@ -12,7 +12,7 @@
-
- namespace v8_inspector {
- namespace {
--using UChar = uint16_t;
-+using UChar = char16_t;
- using UChar32 = uint32_t;
-
- bool isASCII(UChar c) { return !(c & ~0x7F); }
-@@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* stringStart, size_t length) {
-
- std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) {
- if (!stringStart || !length) return std::basic_string<UChar>();
-- std::vector<uint16_t> buffer(length);
-+ std::vector<UChar> buffer(length);
- UChar* bufferStart = buffer.data();
-
- UChar* bufferCurrent = bufferStart;
-@@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) {
- reinterpret_cast<const char*>(stringStart + length),
- &bufferCurrent, bufferCurrent + buffer.size(), nullptr,
- true) != conversionOK)
-- return std::basic_string<uint16_t>();
-+ return std::basic_string<UChar>();
- size_t utf16Length = bufferCurrent - bufferStart;
- return std::basic_string<UChar>(bufferStart, bufferStart + utf16Length);
- }
-diff --git deps/v8/src/inspector/v8-string-conversions.h deps/v8/src/inspector/v8-string-conversions.h
-index eb33c6816a5..1126255dac2 100644
---- deps/v8/src/inspector/v8-string-conversions.h
-+++ deps/v8/src/inspector/v8-string-conversions.h
-@@ -5,14 +5,16 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
-
-+#include <uchar.h>
-+
- #include <cstdint>
- #include <string>
-
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
- // want to use string-16.h directly rather than these.
- namespace v8_inspector {
--std::basic_string<uint16_t> UTF8ToUTF16(const char* stringStart, size_t length);
--std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length);
-+std::basic_string<char16_t> UTF8ToUTF16(const char* stringStart, size_t length);
-+std::string UTF16ToUTF8(const char16_t* stringStart, size_t length);
- } // namespace v8_inspector
-
- #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
-diff --git deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc
-index c9d89eaa42f..1a46d781b89 100644
---- deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc
-+++ deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc
-@@ -11,13 +11,16 @@
- namespace v8_crdtp {
-
- std::string UTF16ToUTF8(span<uint16_t> in) {
-- return v8_inspector::UTF16ToUTF8(in.data(), in.size());
-+ return v8_inspector::UTF16ToUTF8(reinterpret_cast<const char16_t*>(in.data()),
-+ in.size());
- }
-
- std::vector<uint16_t> UTF8ToUTF16(span<uint8_t> in) {
-- std::basic_string<uint16_t> utf16 = v8_inspector::UTF8ToUTF16(
-+ std::basic_string<char16_t> utf16 = v8_inspector::UTF8ToUTF16(
- reinterpret_cast<const char*>(in.data()), in.size());
-- return std::vector<uint16_t>(utf16.begin(), utf16.end());
-+ return std::vector<uint16_t>(
-+ reinterpret_cast<const uint16_t*>(utf16.data()),
-+ reinterpret_cast<const uint16_t*>(utf16.data()) + utf16.size());
- }
-
- } // namespace v8_crdtp
diff --git a/www/node20/pkg-message b/www/node20/pkg-message
index ddea08386149..6c7acf5c034a 100644
--- a/www/node20/pkg-message
+++ b/www/node20/pkg-message
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
-Note: If you need npm (Node Package Manager), please install www/npm.
+Note: If you need npm (Node Package Manager), please install www/npm-node20.
EOM
}
]