Index: branches/2019Q3/www/node10/Makefile =================================================================== --- branches/2019Q3/www/node10/Makefile (revision 512228) +++ branches/2019Q3/www/node10/Makefile (revision 512229) @@ -1,110 +1,110 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 10.16.0 +PORTVERSION= 10.16.3 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 10 MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= openssl libressl libressl-devel BROKEN_SSL_REASON= Node.js 10.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 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 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>=64.2:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:2.7,build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node[68]-[0-9]* node-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-cares \ --shared-libuv \ --shared-nghttp2 \ --shared-zlib SHEBANG_FILES= tools/specialize_node_d.py tools/genv8constants.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+= c-ares>=1.15.0:dns/c-ares\ libuv>=1.28.0:devel/libuv \ - libnghttp2>=1.34.0:www/libnghttp2 + libnghttp2>=1.39.2:www/libnghttp2 LIB_DEPENDS+= libcares.so:dns/c-ares\ libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif .include .if ${CHOSEN_COMPILER_TYPE} == gcc # GCC does not expose std::snprintf() without this define CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/deps/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 Index: branches/2019Q3/www/node10/distinfo =================================================================== --- branches/2019Q3/www/node10/distinfo (revision 512228) +++ branches/2019Q3/www/node10/distinfo (revision 512229) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559158058 -SHA256 (node-v10.16.0.tar.gz) = d00f1ffdb0a7413eaaf3afc393fb652ea713db135dcd3ccf6809370a07395713 -SIZE (node-v10.16.0.tar.gz) = 45543679 +TIMESTAMP = 1565994495 +SHA256 (node-v10.16.3.tar.gz) = db5a5e03a815b84a1266a4b48bb6a6d887175705f84fd2472f0d28e5e305a1f8 +SIZE (node-v10.16.3.tar.gz) = 45870800 Index: branches/2019Q3/www/node10/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi =================================================================== --- branches/2019Q3/www/node10/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi (revision 512228) +++ branches/2019Q3/www/node10/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi (revision 512229) @@ -1,17 +1,17 @@ ---- deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi.orig 2019-05-28 21:32:15 UTC +--- deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi.orig 2019-07-31 17:44:59 UTC +++ deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi -@@ -26,12 +26,11 @@ +@@ -25,12 +25,11 @@ ], 'openssl_cflags_linux-elf': [ '-Wa,--noexecstack', - '-Wall -O3 -fomit-frame-pointer', + '-Wall -O3', '-pthread', - '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '', ], 'openssl_cli_srcs_linux-elf': [ 'openssl/apps/asn1pars.c', Index: branches/2019Q3/www/node10/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi =================================================================== --- branches/2019Q3/www/node10/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi (revision 512228) +++ branches/2019Q3/www/node10/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi (revision 512229) @@ -1,17 +1,17 @@ ---- deps/openssl/config/archs/linux-elf/asm/openssl.gypi.orig 2019-05-28 21:32:15 UTC +--- deps/openssl/config/archs/linux-elf/asm/openssl.gypi.orig 2019-07-31 17:44:59 UTC +++ deps/openssl/config/archs/linux-elf/asm/openssl.gypi -@@ -722,12 +722,11 @@ +@@ -721,12 +721,11 @@ ], 'openssl_cflags_linux-elf': [ '-Wa,--noexecstack', - '-Wall -O3 -fomit-frame-pointer', + '-Wall -O3', '-pthread', - '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '', ], }, 'include_dirs': [ Index: branches/2019Q3/www/node10/files/patch-deps_openssl_openssl-cl__no__asm.gypi =================================================================== --- branches/2019Q3/www/node10/files/patch-deps_openssl_openssl-cl__no__asm.gypi (revision 512228) +++ branches/2019Q3/www/node10/files/patch-deps_openssl_openssl-cl__no__asm.gypi (revision 512229) @@ -1,17 +1,17 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2018-05-11 10:11:27 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2019-07-31 17:44:59 UTC +++ deps/openssl/openssl-cl_no_asm.gypi @@ -1,4 +1,5 @@ { + 'defines': ['OPENSSL_NO_ASM'], 'conditions': [ ['target_arch=="ppc" and OS=="aix"', { 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], -@@ -41,7 +42,7 @@ +@@ -43,7 +44,7 @@ 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], + 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], }], ], } Index: branches/2019Q3/www/node10/files/patch-deps_openssl_openssl__no__asm.gypi =================================================================== --- branches/2019Q3/www/node10/files/patch-deps_openssl_openssl__no__asm.gypi (revision 512228) +++ branches/2019Q3/www/node10/files/patch-deps_openssl_openssl__no__asm.gypi (revision 512229) @@ -1,11 +1,11 @@ ---- deps/openssl/openssl_no_asm.gypi.orig 2018-05-11 12:27:27 UTC +--- deps/openssl/openssl_no_asm.gypi.orig 2019-07-31 17:45:01 UTC +++ deps/openssl/openssl_no_asm.gypi -@@ -42,7 +42,7 @@ +@@ -44,7 +44,7 @@ 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], + 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], }], ], } Index: branches/2019Q3/www/node10/files/patch-node.gypi =================================================================== --- branches/2019Q3/www/node10/files/patch-node.gypi (revision 512228) +++ branches/2019Q3/www/node10/files/patch-node.gypi (revision 512229) @@ -1,12 +1,12 @@ ---- node.gypi.orig 2018-06-06 12:52:40 UTC +--- node.gypi.orig 2019-07-31 17:45:05 UTC +++ node.gypi -@@ -294,6 +294,9 @@ +@@ -316,6 +316,9 @@ ['openssl_fips != ""', { 'defines': [ 'NODE_FIPS_MODE' ], }], + ['openssl_no_asm==1', { + 'defines': [ 'OPENSSL_NO_ASM' ], + }], [ 'node_shared_openssl=="false"', { 'dependencies': [ './deps/openssl/openssl.gyp:openssl', Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 512228) +++ branches/2019Q3 (revision 512229) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r507835,509060,509480