diff --git a/www/node14/Makefile b/www/node14/Makefile index 13ce9ab2d2ea..bb5dba5a1f94 100644 --- a/www/node14/Makefile +++ b/www/node14/Makefile @@ -1,117 +1,117 @@ PORTNAME= node DISTVERSIONPREFIX= v -DISTVERSION= 14.17.0 +DISTVERSION= 14.17.1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/ PKGNAMESUFFIX= 14 MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl libressl-devel BROKEN_SSL_REASON= Node.js 14.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le USES= compiler:c++11-lib gmake python:build pkgconfig \ localbase shebangfix OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE OPTIONS_EXCLUDE_powerpc64le= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu -NLS_BUILD_DEPENDS= icu>=67.1:devel/icu +NLS_BUILD_DEPENDS= icu>=69.1:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace HAS_CONFIGURE= yes CONFLICTS_INSTALL= node10-[0-9]* node12-[0-9]* node-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-brotli \ --shared-cares \ --shared-libuv \ --shared-nghttp2 \ --shared-zlib SHEBANG_FILES= deps/v8/tools/*.py \ deps/v8/third_party/inspector_protocol/*.py \ tools/*.py \ tools/inspector_protocol/*.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CFLAGS.host="${CFLAGS}" \ CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \ LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}" BUILD_DEPENDS+= brotli>=1.0.9,1:archivers/brotli \ c-ares>=1.17.1:dns/c-ares \ libuv>=1.41.0:devel/libuv \ libnghttp2>=1.42.0:www/libnghttp2 \ objdump:devel/binutils LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ libcares.so:dns/c-ares\ libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 .include .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/tools/v8_gypfiles/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include diff --git a/www/node14/distinfo b/www/node14/distinfo index f6657ba1cd24..ddbc57ce8810 100644 --- a/www/node14/distinfo +++ b/www/node14/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621284032 -SHA256 (node-v14.17.0.tar.gz) = 6114e82d3256136dc85a509d835442fbdf2f8430dcd8bfa7c304097344d06fb7 -SIZE (node-v14.17.0.tar.gz) = 63562031 +TIMESTAMP = 1631602049 +SHA256 (node-v14.17.1.tar.gz) = f85297faa15529cf134e9cfd395371fea62e092c3fe2127f2b0fdf8504905cee +SIZE (node-v14.17.1.tar.gz) = 63704704 diff --git a/www/node14/files/patch-deps_v8_src_objects_js-list-format.cc b/www/node14/files/patch-deps_v8_src_objects_js-list-format.cc deleted file mode 100644 index 866327498616..000000000000 --- a/www/node14/files/patch-deps_v8_src_objects_js-list-format.cc +++ /dev/null @@ -1,83 +0,0 @@ -https://github.com/v8/v8/commit/035c305ce7761f51328b45f1bd83e26aef267c9d - -../deps/v8/src/objects/js-list-format.cc:145:55: error: 'createInstance' is a private member of 'icu::ListFormatter' - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( - ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ -/usr/local/include/unicode/listformatter.h:267:27: note: declared private here - static ListFormatter* createInstance(const Locale& locale, const char* style, UErrorCode& errorCode); - ^ - ---- deps/v8/src/objects/js-list-format.cc.orig 2021-04-06 19:42:15 UTC -+++ deps/v8/src/objects/js-list-format.cc -@@ -29,46 +29,27 @@ namespace v8 { - namespace internal { - - namespace { --const char* kStandard = "standard"; --const char* kOr = "or"; --const char* kUnit = "unit"; --const char* kStandardShort = "standard-short"; --const char* kOrShort = "or-short"; --const char* kUnitShort = "unit-short"; --const char* kStandardNarrow = "standard-narrow"; --const char* kOrNarrow = "or-narrow"; --const char* kUnitNarrow = "unit-narrow"; - --const char* GetIcuStyleString(JSListFormat::Style style, -- JSListFormat::Type type) { -+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { -+ switch (style) { -+ case JSListFormat::Style::LONG: -+ return ULISTFMT_WIDTH_WIDE; -+ case JSListFormat::Style::SHORT: -+ return ULISTFMT_WIDTH_SHORT; -+ case JSListFormat::Style::NARROW: -+ return ULISTFMT_WIDTH_NARROW; -+ } -+ UNREACHABLE(); -+} -+ -+UListFormatterType GetIcuType(JSListFormat::Type type) { - switch (type) { - case JSListFormat::Type::CONJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kStandard; -- case JSListFormat::Style::SHORT: -- return kStandardShort; -- case JSListFormat::Style::NARROW: -- return kStandardNarrow; -- } -+ return ULISTFMT_TYPE_AND; - case JSListFormat::Type::DISJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kOr; -- case JSListFormat::Style::SHORT: -- return kOrShort; -- case JSListFormat::Style::NARROW: -- return kOrNarrow; -- } -+ return ULISTFMT_TYPE_OR; - case JSListFormat::Type::UNIT: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kUnit; -- case JSListFormat::Style::SHORT: -- return kUnitShort; -- case JSListFormat::Style::NARROW: -- return kUnitNarrow; -- } -+ return ULISTFMT_TYPE_UNITS; - } - UNREACHABLE(); - } -@@ -143,7 +124,7 @@ MaybeHandle JSListFormat::New(Isolate* i - icu::Locale icu_locale = r.icu_locale; - UErrorCode status = U_ZERO_ERROR; - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( -- icu_locale, GetIcuStyleString(style_enum, type_enum), status); -+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); - if (U_FAILURE(status) || formatter == nullptr) { - delete formatter; - THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),