Index: head/www/node/Makefile =================================================================== --- head/www/node/Makefile (revision 469780) +++ head/www/node/Makefile (revision 469781) @@ -1,105 +1,106 @@ # $FreeBSD$ PORTNAME= node PORTVERSION= 10.1.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 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 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 +.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/files/patch-deps_openssl_openssl__no__asm.gypi =================================================================== --- head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi (revision 469780) +++ head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi (nonexistent) @@ -1,23 +0,0 @@ ---- deps/openssl/openssl_no_asm.gypi.orig 2018-04-24 14:41:22 UTC -+++ deps/openssl/openssl_no_asm.gypi -@@ -1,7 +1,10 @@ - { - 'defines': ['OPENSSL_NO_ASM'], - 'conditions': [ -- ['target_arch=="ppc" and OS=="aix"', { -+ ['OS=="freebsd"', { -+ # noasm BSD-x86_64 for all FreeBSD archs -+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], -+ }, 'target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/no-asm/openssl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/no-asm/openssl.gypi'], -@@ -30,8 +33,6 @@ - }, 'target_arch=="ia32"', { - # noasm linux-elf for other ia32 platforms - 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], -- }, 'target_arch=="x64" and OS=="freebsd"', { -- 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="mac"', { - 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="solaris"', { Property changes on: head/www/node/files/patch-deps_openssl_openssl__no__asm.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_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi =================================================================== --- head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi (nonexistent) +++ head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi (revision 469781) @@ -0,0 +1,15 @@ +--- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2018-05-11 11:01:14 UTC ++++ deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi +@@ -9,10 +9,10 @@ + 'OPENSSL_PIC', + ], + 'openssl_cflags_linux-elf': [ +- '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer', ++ '-Wall -O3 -pthread -DL_ENDIAN', + ], + 'openssl_ex_libs_linux-elf': [ +- '-ldl -pthread', ++ '', + ], + 'openssl_cli_srcs_linux-elf': [ + 'openssl/apps/app_rand.c', Property changes on: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi =================================================================== --- head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi (nonexistent) +++ head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi (revision 469781) @@ -0,0 +1,15 @@ +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2018-05-11 11:01:19 UTC ++++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +@@ -652,10 +652,10 @@ + 'OPENSSL_PIC', + ], + 'openssl_cflags_linux-elf': [ +- '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer', ++ '-Wall -O3 -pthread -DL_ENDIAN', + ], + 'openssl_ex_libs_linux-elf': [ +- '-ldl -pthread', ++ '', + ], + }, + 'include_dirs': [ Property changes on: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/node/files/patch-deps_openssl_config_bn__conf__no-asm.h =================================================================== --- head/www/node/files/patch-deps_openssl_config_bn__conf__no-asm.h (revision 469780) +++ head/www/node/files/patch-deps_openssl_config_bn__conf__no-asm.h (revision 469781) @@ -1,15 +1,13 @@ ---- deps/openssl/config/bn_conf_no-asm.h.orig 2018-04-24 14:41:19 UTC +--- deps/openssl/config/bn_conf_no-asm.h.orig 2018-05-09 01:59:18 UTC +++ deps/openssl/config/bn_conf_no-asm.h -@@ -21,9 +21,9 @@ +@@ -21,8 +21,8 @@ # include "./archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h" #elif defined(_WIN32) && defined(_M_X64) # include "./archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h" -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -# include "./archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) +//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) +//# include "./archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h" -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) // && defined(__x86_64__) + #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) # include "./archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h" #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h" Index: head/www/node/files/patch-deps_openssl_config_dso__conf__no-asm.h =================================================================== --- head/www/node/files/patch-deps_openssl_config_dso__conf__no-asm.h (revision 469780) +++ head/www/node/files/patch-deps_openssl_config_dso__conf__no-asm.h (revision 469781) @@ -1,15 +1,13 @@ ---- deps/openssl/config/dso_conf_no-asm.h.orig 2018-04-24 14:41:19 UTC +--- deps/openssl/config/dso_conf_no-asm.h.orig 2018-05-09 01:59:18 UTC +++ deps/openssl/config/dso_conf_no-asm.h -@@ -21,9 +21,9 @@ +@@ -21,8 +21,8 @@ # include "./archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h" #elif defined(_WIN32) && defined(_M_X64) # include "./archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h" -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -# include "./archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) +//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) +//# include "./archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h" -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) // && defined(__x86_64__) + #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) # include "./archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h" #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h" Index: head/www/node/files/patch-deps_openssl_config_opensslconf__no-asm.h =================================================================== --- head/www/node/files/patch-deps_openssl_config_opensslconf__no-asm.h (revision 469780) +++ head/www/node/files/patch-deps_openssl_config_opensslconf__no-asm.h (revision 469781) @@ -1,15 +1,13 @@ ---- deps/openssl/config/opensslconf_no-asm.h.orig 2018-04-24 14:41:19 UTC +--- deps/openssl/config/opensslconf_no-asm.h.orig 2018-05-09 01:59:18 UTC +++ deps/openssl/config/opensslconf_no-asm.h -@@ -16,9 +16,9 @@ +@@ -16,8 +16,8 @@ # include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h" #elif defined(_WIN32) && defined(_M_X64) # include "./archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h" -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -# include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) +//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) +//# include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h" -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) // && defined(__x86_64__) + #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) # include "./archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h" #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h" Index: head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi =================================================================== --- head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi (revision 469780) +++ head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi (revision 469781) @@ -1,23 +1,17 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2018-04-24 14:41:19 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2018-05-11 10:11:27 UTC +++ deps/openssl/openssl-cl_no_asm.gypi -@@ -1,6 +1,10 @@ +@@ -1,4 +1,5 @@ { + 'defines': ['OPENSSL_NO_ASM'], 'conditions': [ -- ['target_arch=="ppc" and OS=="aix"', { -+ ['OS=="freebsd"', { -+ # noasm BSD-x86_64 for all FreeBSD archs -+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'], -+ }, 'target_arch=="ppc" and OS=="aix"', { + ['target_arch=="ppc" and OS=="aix"', { 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], - }, 'target_arch=="ppc" and OS=="linux"', { - 'includes': ['config/archs/linux-ppc/no-asm/openssl-cl.gypi'], -@@ -29,8 +33,6 @@ - }, 'target_arch=="ia32"', { - # noasm linux-elf for other ia32 platforms - 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], -- }, 'target_arch=="x64" and OS=="freebsd"', { -- 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="mac"', { - 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="solaris"', { +@@ -41,7 +42,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'], + }], + ], + }