Index: branches/2017Q4/www/node/Makefile =================================================================== --- branches/2017Q4/www/node/Makefile (revision 453012) +++ branches/2017Q4/www/node/Makefile (revision 453013) @@ -1,114 +1,106 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 8.6.0 +PORTVERSION= 8.8.1 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 DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib 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 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: branches/2017Q4/www/node/distinfo =================================================================== --- branches/2017Q4/www/node/distinfo (revision 453012) +++ branches/2017Q4/www/node/distinfo (revision 453013) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506500421 -SHA256 (node-v8.6.0.tar.gz) = 80551d47440c602c5825a3f6611e13cb0c57d277234dbff693af433a88351a08 -SIZE (node-v8.6.0.tar.gz) = 31159108 +TIMESTAMP = 1509020523 +SHA256 (node-v8.8.1.tar.gz) = 1725bbbe623d6a13ee14522730dfc90eac1c9ebe9a0a8f4c3322a402dd7e75a2 +SIZE (node-v8.8.1.tar.gz) = 30315618 Index: branches/2017Q4/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc =================================================================== --- branches/2017Q4/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (revision 453012) +++ branches/2017Q4/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (revision 453013) @@ -1,51 +1,51 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-08-09 18:48:10 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-10-24 19:40:14 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc -@@ -48,6 +48,48 @@ void* OS::Allocate(const size_t requested, size_t* all +@@ -51,6 +51,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__ + static unsigned StringToLong(char* buffer) { return static_cast(strtol(buffer, NULL, 16)); // NOLINT Index: branches/2017Q4/www/node/files/patch-deps_v8_src_libsampler_sampler.cc =================================================================== --- branches/2017Q4/www/node/files/patch-deps_v8_src_libsampler_sampler.cc (revision 453012) +++ branches/2017Q4/www/node/files/patch-deps_v8_src_libsampler_sampler.cc (revision 453013) @@ -1,15 +1,15 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2017-06-15 11:55:21 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2017-10-24 19:40:19 UTC +++ deps/v8/src/libsampler/sampler.cc -@@ -499,9 +499,9 @@ void SignalHandler::FillRegisterState(void* context, R +@@ -506,9 +506,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 - state->pc = reinterpret_cast(mcontext.mc_r15); - state->sp = reinterpret_cast(mcontext.mc_r13); - state->fp = reinterpret_cast(mcontext.mc_r11); + state->pc = reinterpret_cast(mcontext.__gregs[_REG_PC]); + state->sp = reinterpret_cast(mcontext.__gregs[_REG_SP]); + state->fp = reinterpret_cast(mcontext.__gregs[_REG_FP]); #endif // V8_HOST_ARCH_* #elif V8_OS_NETBSD #if V8_HOST_ARCH_IA32 Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 453012) +++ branches/2017Q4 (revision 453013) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r452891,452946