Index: head/www/node/Makefile =================================================================== --- head/www/node/Makefile (revision 447672) +++ head/www/node/Makefile (revision 447673) @@ -1,128 +1,116 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 8.2.1 +PORTVERSION= 8.3.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 OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT=DTRACE OPTIONS_SUB= yes OPTIONS_DEFAULT_FreeBSD_10= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_aarch64= 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 USES= compiler:c++11-lib execinfo gmake python:2,build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes USE_LDCONFIG= yes CONFLICTS_INSTALL= node[456]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]* ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386 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 && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base IGNORE= node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl 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} == "armv6" 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 - -.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} CONFIGURE_ARGS+= --with-dtrace .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/deps/v8/src/v8.gyp # So many different ways to run python. Fix them all. @${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -type f -name '*.gyp*' -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} \ -e "s|'python'|'${PYTHON_CMD}'|" \ -e 's| Index: head/www/node/distinfo =================================================================== --- head/www/node/distinfo (revision 447672) +++ head/www/node/distinfo (revision 447673) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500933063 -SHA256 (node-v8.2.1.tar.gz) = 66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f -SIZE (node-v8.2.1.tar.gz) = 30334692 +TIMESTAMP = 1502344455 +SHA256 (node-v8.3.0.tar.gz) = 33fa7a02f265636c240be9ebd0f93942f77856a9c2c751592da1a0962b6ed010 +SIZE (node-v8.3.0.tar.gz) = 30588563 Index: head/www/node/files/patch-common.gypi =================================================================== --- head/www/node/files/patch-common.gypi (revision 447672) +++ head/www/node/files/patch-common.gypi (nonexistent) @@ -1,12 +0,0 @@ ---- 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', - ], Property changes on: head/www/node/files/patch-common.gypi ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/node/files/patch-deps_v8_src_base_cpu.cc =================================================================== --- head/www/node/files/patch-deps_v8_src_base_cpu.cc (revision 447672) +++ head/www/node/files/patch-deps_v8_src_base_cpu.cc (revision 447673) @@ -1,19 +1,19 @@ ---- deps/v8/src/base/cpu.cc.orig 2017-06-19 14:24:53.928317000 +0000 -+++ deps/v8/src/base/cpu.cc 2017-06-19 14:24:57.294664000 +0000 -@@ -601,6 +601,7 @@ +--- deps/v8/src/base/cpu.cc.orig 2017-08-09 18:48:10 UTC ++++ deps/v8/src/base/cpu.cc +@@ -607,6 +607,7 @@ CPU::CPU() #elif V8_HOST_ARCH_ARM64 +#if V8_OS_LINUX CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -634,6 +635,8 @@ +@@ -640,6 +641,8 @@ CPU::CPU() } delete[] part; } + +#endif // V8_OS_LINUX #elif V8_HOST_ARCH_PPC 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 (revision 447672) +++ head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (revision 447673) @@ -1,51 +1,51 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-06-15 11:55:21 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-08-09 18:48:10 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc -@@ -35,6 +35,48 @@ - namespace v8 { - namespace base { +@@ -48,6 +48,48 @@ void* OS::Allocate(const size_t requested, size_t* all + return mbase; + } +#ifdef __arm__ + +bool OS::ArmUsingHardFloat() { + // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify + // the Floating Point ABI used (PCS stands for Procedure Call Standard). + // We use these as well as a couple of other defines to statically determine + // what FP ABI used. + // GCC versions 4.4 and below don't support hard-fp. + // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or + // __ARM_PCS_VFP. + +#define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) +#if GCC_VERSION >= 40600 +#if defined(__ARM_PCS_VFP) + return true; +#else + return false; +#endif + +#elif GCC_VERSION < 40500 + return false; + +#else +#if defined(__ARM_PCS_VFP) + return true; +#elif defined(__ARM_PCS) || defined(__SOFTFP__) || defined(__SOFTFP) || \ + !defined(__VFP_FP__) + return false; +#else +#error "Your version of GCC does not report the FP ABI compiled for." \ + "Please report it on this issue" \ + "http://code.google.com/p/v8/issues/detail?id=2140" + +#endif +#endif +#undef GCC_VERSION +} + +#endif // def __arm__ + - const char* OS::LocalTimezone(double time, TimezoneCache* cache) { - if (std::isnan(time)) return ""; + static unsigned StringToLong(char* buffer) { + return static_cast(strtol(buffer, NULL, 16)); // NOLINT Index: head/www/node/pkg-plist =================================================================== --- head/www/node/pkg-plist (revision 447672) +++ head/www/node/pkg-plist (revision 447673) @@ -1,123 +1,124 @@ bin/node 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 %%BUNDLED_SSL%%include/node/openssl/aes.h %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/aix-gcc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-x32/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/asn1.h %%BUNDLED_SSL%%include/node/openssl/asn1_mac.h %%BUNDLED_SSL%%include/node/openssl/asn1t.h %%BUNDLED_SSL%%include/node/openssl/bio.h %%BUNDLED_SSL%%include/node/openssl/blowfish.h %%BUNDLED_SSL%%include/node/openssl/bn.h %%BUNDLED_SSL%%include/node/openssl/buffer.h %%BUNDLED_SSL%%include/node/openssl/camellia.h %%BUNDLED_SSL%%include/node/openssl/cast.h %%BUNDLED_SSL%%include/node/openssl/cmac.h %%BUNDLED_SSL%%include/node/openssl/cms.h %%BUNDLED_SSL%%include/node/openssl/comp.h %%BUNDLED_SSL%%include/node/openssl/conf.h %%BUNDLED_SSL%%include/node/openssl/conf_api.h %%BUNDLED_SSL%%include/node/openssl/crypto.h %%BUNDLED_SSL%%include/node/openssl/des.h %%BUNDLED_SSL%%include/node/openssl/des_old.h %%BUNDLED_SSL%%include/node/openssl/dh.h %%BUNDLED_SSL%%include/node/openssl/dsa.h %%BUNDLED_SSL%%include/node/openssl/dso.h %%BUNDLED_SSL%%include/node/openssl/dtls1.h %%BUNDLED_SSL%%include/node/openssl/e_os2.h %%BUNDLED_SSL%%include/node/openssl/ebcdic.h %%BUNDLED_SSL%%include/node/openssl/ec.h %%BUNDLED_SSL%%include/node/openssl/ecdh.h %%BUNDLED_SSL%%include/node/openssl/ecdsa.h %%BUNDLED_SSL%%include/node/openssl/engine.h %%BUNDLED_SSL%%include/node/openssl/err.h %%BUNDLED_SSL%%include/node/openssl/evp.h %%BUNDLED_SSL%%include/node/openssl/hmac.h %%BUNDLED_SSL%%include/node/openssl/idea.h %%BUNDLED_SSL%%include/node/openssl/krb5_asn.h %%BUNDLED_SSL%%include/node/openssl/kssl.h %%BUNDLED_SSL%%include/node/openssl/lhash.h %%BUNDLED_SSL%%include/node/openssl/md4.h %%BUNDLED_SSL%%include/node/openssl/md5.h %%BUNDLED_SSL%%include/node/openssl/mdc2.h %%BUNDLED_SSL%%include/node/openssl/modes.h %%BUNDLED_SSL%%include/node/openssl/obj_mac.h %%BUNDLED_SSL%%include/node/openssl/objects.h %%BUNDLED_SSL%%include/node/openssl/ocsp.h %%BUNDLED_SSL%%include/node/openssl/opensslconf.h %%BUNDLED_SSL%%include/node/openssl/opensslv.h %%BUNDLED_SSL%%include/node/openssl/ossl_typ.h %%BUNDLED_SSL%%include/node/openssl/pem.h %%BUNDLED_SSL%%include/node/openssl/pem2.h %%BUNDLED_SSL%%include/node/openssl/pkcs12.h %%BUNDLED_SSL%%include/node/openssl/pkcs7.h %%BUNDLED_SSL%%include/node/openssl/pqueue.h %%BUNDLED_SSL%%include/node/openssl/rand.h %%BUNDLED_SSL%%include/node/openssl/rc2.h %%BUNDLED_SSL%%include/node/openssl/rc4.h %%BUNDLED_SSL%%include/node/openssl/ripemd.h %%BUNDLED_SSL%%include/node/openssl/rsa.h %%BUNDLED_SSL%%include/node/openssl/safestack.h %%BUNDLED_SSL%%include/node/openssl/seed.h %%BUNDLED_SSL%%include/node/openssl/sha.h %%BUNDLED_SSL%%include/node/openssl/srp.h %%BUNDLED_SSL%%include/node/openssl/srtp.h %%BUNDLED_SSL%%include/node/openssl/ssl.h %%BUNDLED_SSL%%include/node/openssl/ssl2.h %%BUNDLED_SSL%%include/node/openssl/ssl23.h %%BUNDLED_SSL%%include/node/openssl/ssl3.h %%BUNDLED_SSL%%include/node/openssl/stack.h %%BUNDLED_SSL%%include/node/openssl/symhacks.h %%BUNDLED_SSL%%include/node/openssl/tls1.h %%BUNDLED_SSL%%include/node/openssl/ts.h %%BUNDLED_SSL%%include/node/openssl/txt_db.h %%BUNDLED_SSL%%include/node/openssl/ui.h %%BUNDLED_SSL%%include/node/openssl/ui_compat.h %%BUNDLED_SSL%%include/node/openssl/whrlpool.h %%BUNDLED_SSL%%include/node/openssl/x509.h %%BUNDLED_SSL%%include/node/openssl/x509_vfy.h %%BUNDLED_SSL%%include/node/openssl/x509v3.h include/node/v8-debug.h include/node/v8-inspector-protocol.h include/node/v8-inspector.h include/node/v8-platform.h include/node/v8-profiler.h include/node/v8-testing.h include/node/v8-util.h +include/node/v8-value-serializer-version.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 @(,,444) man/man1/node.1.gz %%PORTDOCS%%%%DOCSDIR%%/gdbinit %%PORTDOCS%%%%DOCSDIR%%/lldb_commands.py %%PORTDOCS%%%%DOCSDIR%%/lldbinit share/systemtap/tapset/node.stp