Index: head/UPDATING =================================================================== --- head/UPDATING +++ head/UPDATING @@ -5,6 +5,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20170628: + AFFECTS: users of www/node + AUTHOR: bhughes@freebsd.org + + The www/node port has been updated to Node.js v8.1.2, the latest + upstream release. This is a major release, including many significant + changes. Users are encouraged to read the release announcements before + upgrading: + + https://nodejs.org/en/blog/release/v8.0.0/ + https://nodejs.org/en/blog/release/v8.1.0/ + 20170626: AFFECTS: users of net-mgmt/zabbix24* AUTHOR: dbaio@FreeBSD.org Index: head/www/node/Makefile =================================================================== --- head/www/node/Makefile +++ head/www/node/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 7.10.0 +PORTVERSION= 8.1.2 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ MAINTAINER= bhughes@FreeBSD.org -COMMENT= V8 JavaScript for client and server (7.x) +COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE @@ -81,6 +81,18 @@ .if ${COMPILER_TYPE} == gcc # GCC does not expose std::snprintf() without this define CXXFLAGS+= -D_GLIBCXX_USE_C99 +.endif + +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40 +# Conditinal work around for a bug in libc++ included with clang 3.x: +# https://bugs.llvm.org/show_bug.cgi?id=18249 +# https://bugs.llvm.org/show_bug.cgi?id=18350 +# https://bugs.llvm.org/show_bug.cgi?id=18853 +# +# Upstream Node.js adds the define to all FreeBSD builds. This breaks +# the build with clang 4.0, so we patch it out (files/patch-common.gypi) +# and add it here instead. +CXXFLAGS+= -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR .endif .if ${PORT_OPTIONS:MDTRACE} Index: head/www/node/distinfo =================================================================== --- head/www/node/distinfo +++ head/www/node/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494269914 -SHA256 (node-v7.10.0.tar.gz) = c4843fe8bffb59c2327063a5e67a89af60d7927f7ace7548695a2cf4c1aa6d03 -SIZE (node-v7.10.0.tar.gz) = 28110265 +TIMESTAMP = 1498511945 +SHA256 (node-v8.1.2.tar.gz) = d717b364868956e0b775145e57a84e63962a9cf83146e778547fc71bb27a2251 +SIZE (node-v8.1.2.tar.gz) = 29934001 Index: head/www/node/files/patch-common.gypi =================================================================== --- head/www/node/files/patch-common.gypi +++ head/www/node/files/patch-common.gypi @@ -0,0 +1,12 @@ +--- common.gypi.orig 2017-06-28 05:52:55 UTC ++++ common.gypi +@@ -407,9 +407,6 @@ + 'libraries': [ '-lelf' ], + }], + ['OS=="freebsd"', { +- # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial +- # https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html +- 'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ], + 'ldflags': [ + '-Wl,--export-dynamic', + ], Index: head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc =================================================================== --- head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc +++ head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc @@ -1,4 +1,4 @@ ---- deps/v8/src/arm/cpu-arm.cc.orig 2016-10-19 22:02:03 UTC +--- deps/v8/src/arm/cpu-arm.cc.orig 2017-06-15 11:55:20 UTC +++ deps/v8/src/arm/cpu-arm.cc @@ -7,6 +7,9 @@ #ifdef __QNXNTO__ @@ -10,7 +10,7 @@ #else #include // for cache flushing. #endif -@@ -24,6 +27,9 @@ void CpuFeatures::FlushICache(void* star +@@ -24,6 +27,9 @@ void CpuFeatures::FlushICache(void* start, size_t size #if !defined(USE_SIMULATOR) #if V8_OS_QNX msync(start, size, MS_SYNC | MS_INVALIDATE_ICACHE); Index: head/www/node/files/patch-deps_v8_src_base_atomicops__internals__arm__gcc.h =================================================================== --- head/www/node/files/patch-deps_v8_src_base_atomicops__internals__arm__gcc.h +++ head/www/node/files/patch-deps_v8_src_base_atomicops__internals__arm__gcc.h @@ -1,14 +0,0 @@ ---- deps/v8/src/base/atomicops_internals_arm_gcc.h.orig 2016-10-19 22:02:03 UTC -+++ deps/v8/src/base/atomicops_internals_arm_gcc.h -@@ -64,8 +71,9 @@ inline void MemoryBarrier() { - defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \ - defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ -- defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \ -- defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) -+ defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6KZ__) || \ -+ defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \ -+ defined(__ARM_ARCH_6T2__) - - inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, Index: head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc =================================================================== --- head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc +++ head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2016-10-19 22:02:03 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-06-15 11:55:21 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc @@ -35,6 +35,48 @@ namespace v8 { Index: head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc =================================================================== --- head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc +++ head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc @@ -1,6 +1,6 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2016-11-08 18:53:14 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2017-06-15 11:55:21 UTC +++ deps/v8/src/libsampler/sampler.cc -@@ -499,9 +499,9 @@ void SignalHandler::FillRegisterState(vo +@@ -499,9 +499,9 @@ void SignalHandler::FillRegisterState(void* context, R state->sp = reinterpret_cast(mcontext.mc_rsp); state->fp = reinterpret_cast(mcontext.mc_rbp); #elif V8_HOST_ARCH_ARM Index: head/www/node/files/patch-node.gyp =================================================================== --- head/www/node/files/patch-node.gyp +++ head/www/node/files/patch-node.gyp @@ -1,15 +0,0 @@ ---- node.gyp.orig 2017-05-10 12:22:23 UTC -+++ node.gyp -@@ -513,6 +513,12 @@ - '<(OBJ_DIR)/node/src/node_dtrace_ustack.o' - ], - 'conditions': [ -+ [ 'target_arch=="arm"', { -+ 'action': [ -+ 'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc', -+ '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)', -+ ] -+ } ], - [ 'target_arch=="ia32"', { - 'action': [ - 'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc', Index: head/www/node/pkg-plist =================================================================== --- head/www/node/pkg-plist +++ head/www/node/pkg-plist @@ -2,8 +2,11 @@ include/node/common.gypi include/node/config.gypi include/node/libplatform/libplatform.h +include/node/libplatform/libplatform-export.h include/node/libplatform/v8-tracing.h include/node/node.h +include/node/node_api.h +include/node/node_api_types.h include/node/node_buffer.h include/node/node_object_wrap.h include/node/node_version.h @@ -102,7 +105,6 @@ %%BUNDLED_SSL%%include/node/openssl/x509_vfy.h %%BUNDLED_SSL%%include/node/openssl/x509v3.h include/node/v8-debug.h -include/node/v8-experimental.h include/node/v8-inspector-protocol.h include/node/v8-inspector.h include/node/v8-platform.h @@ -110,6 +112,7 @@ include/node/v8-testing.h include/node/v8-util.h include/node/v8-version.h +include/node/v8-version-string.h include/node/v8.h include/node/v8config.h %%DTRACE%%lib/dtrace/node.d