Index: head/www/node/Makefile =================================================================== --- head/www/node/Makefile (revision 472017) +++ head/www/node/Makefile (revision 472018) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 10.3.0 +PORTVERSION= 10.4.0 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to build: KeyError: 'action' ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= BUNDLED_SSL DTRACE OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_10= DTRACE 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 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_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[4568]-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-cares \ --shared-libuv \ --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} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LIB_DEPENDS+= libcares.so:dns/c-ares\ libuv.so:devel/libuv .include .if empty(PORT_OPTIONS:MBUNDLED_SSL) .if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl-devel IGNORE= node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl-devel to /etc/make.conf or enable BUNDLED_SSL option .endif .if !empty(SSL_DEFAULT:Mlibressl*) IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL .endif .endif .include .if ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif .if ${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: head/www/node/distinfo =================================================================== --- head/www/node/distinfo (revision 472017) +++ head/www/node/distinfo (revision 472018) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527624306 -SHA256 (node-v10.3.0.tar.gz) = e9f79ebe7181a63c39a986506e515cbea2a010c7ee7f5e1f108bb2203712aa0d -SIZE (node-v10.3.0.tar.gz) = 35193426 +TIMESTAMP = 1528347983 +SHA256 (node-v10.4.0.tar.gz) = 88d9c8179bde19e057cd1d8b835b50726e4c94f8418c91472001e212da96d290 +SIZE (node-v10.4.0.tar.gz) = 35357659 Index: head/www/node/files/patch-deps_v8_src_base_cpu.cc =================================================================== --- head/www/node/files/patch-deps_v8_src_base_cpu.cc (revision 472017) +++ head/www/node/files/patch-deps_v8_src_base_cpu.cc (nonexistent) @@ -1,19 +0,0 @@ ---- deps/v8/src/base/cpu.cc.orig 2018-04-23 19:19:12 UTC -+++ deps/v8/src/base/cpu.cc -@@ -424,6 +424,7 @@ CPU::CPU() - - #if V8_OS_LINUX - -+#if V8_OS_LINUX - CPUInfo cpu_info; - - // Extract implementor from the "CPU implementer" field. -@@ -457,6 +458,8 @@ CPU::CPU() - } - delete[] part; - } -+ -+#endif // V8_OS_LINUX - - // Extract architecture from the "CPU Architecture" field. - // The list is well-known, unlike the the output of Property changes on: head/www/node/files/patch-deps_v8_src_base_cpu.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/node/files/patch-node.gypi =================================================================== --- head/www/node/files/patch-node.gypi (revision 472017) +++ head/www/node/files/patch-node.gypi (revision 472018) @@ -1,12 +1,12 @@ ---- node.gypi.orig 2018-04-30 18:52:35 UTC +--- node.gypi.orig 2018-06-06 12:52:40 UTC +++ node.gypi -@@ -298,6 +298,9 @@ +@@ -294,6 +294,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',