CVS commit: pkgsrc/lang/nodejs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/nodejs
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 9 Dec 2019 20:03:51 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec  9 20:03:51 UTC 2019

Modified Files:
        pkgsrc/lang/nodejs: DESCR Makefile Makefile.common PLIST distinfo
            nodeversion.mk
        pkgsrc/lang/nodejs/patches: patch-deps_openssl_openssl-cl__asm.gypi
            patch-deps_openssl_openssl-cl__no__asm.gypi
            patch-deps_openssl_openssl__asm.gypi
            patch-deps_openssl_openssl__no__asm.gypi
            patch-deps_v8_src_base_atomicops.h
            patch-deps_v8_src_base_platform_semaphore.cc
            patch-deps_v8_src_compiler_types.h patch-src_inspector__agent.cc
            patch-tools_install.py
Added Files:
        pkgsrc/lang/nodejs/patches: patch-deps_v8_src_common_globals.h
Removed Files:
        pkgsrc/lang/nodejs/patches: patch-configure.py
            patch-deps_v8_src_arm_assembler-arm-inl.h
            patch-deps_v8_src_arm_assembler-arm.cc
            patch-deps_v8_src_arm_cpu-arm.cc patch-deps_v8_src_globals.h
            patch-deps_v8_src_log-utils.h

Log Message:
nodejs: updated to 13.3.0

Version 13.3.0:

Notable Changes
fs:
Reworked experimental recursive rmdir()
The maxBusyTries option is renamed to maxRetries, and its default is set to 0. The emfileWait option has been removed, and EMFILE errors use the same retry logic as other errors. The retryDelay 
option is now supported. ENFILE errors are now retried.
http:
Make maximum header size configurable per-stream or per-server
http2:
Make maximum tolerated rejected streams configurable
Allow to configure maximum tolerated invalid frames
wasi:
Introduce initial WASI support


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/nodejs/DESCR
cvs rdiff -u -r1.164 -r1.165 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/nodejs/PLIST
cvs rdiff -u -r1.155 -r1.156 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/nodejs/nodeversion.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/nodejs/patches/patch-configure.py \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm-inl.h \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm.cc
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_cpu-arm.cc \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_globals.h \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_log-utils.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_atomicops.h \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_compiler_types.h \
    pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc \
    pkgsrc/lang/nodejs/patches/patch-tools_install.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_common_globals.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/DESCR
diff -u pkgsrc/lang/nodejs/DESCR:1.2 pkgsrc/lang/nodejs/DESCR:1.3
--- pkgsrc/lang/nodejs/DESCR:1.2        Mon Nov  9 20:19:35 2015
+++ pkgsrc/lang/nodejs/DESCR    Mon Dec  9 20:03:51 2019
@@ -1,4 +1,4 @@
 Node.js is an evented I/O framework for the V8 JavaScript engine. It is
 intended for writing scalable network programs such as web servers.
 
-This package holds the latest stable release.
+This package holds the latest release.

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.164 pkgsrc/lang/nodejs/Makefile:1.165
--- pkgsrc/lang/nodejs/Makefile:1.164   Sun Nov 24 15:49:31 2019
+++ pkgsrc/lang/nodejs/Makefile Mon Dec  9 20:03:51 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.164 2019/11/24 15:49:31 adam Exp $
+# $NetBSD: Makefile,v 1.165 2019/12/09 20:03:51 adam Exp $
 
-DISTNAME=      node-v10.17.0
+DISTNAME=      node-v13.3.0
 
 USE_LANGUAGES= c gnu++14
 

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.28 pkgsrc/lang/nodejs/Makefile.common:1.29
--- pkgsrc/lang/nodejs/Makefile.common:1.28     Sun Nov  3 19:04:03 2019
+++ pkgsrc/lang/nodejs/Makefile.common  Mon Dec  9 20:03:51 2019
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.28 2019/11/03 19:04:03 rillig Exp $
+# $NetBSD: Makefile.common,v 1.29 2019/12/09 20:03:51 adam Exp $
 # used by lang/nodejs/Makefile
-# used by lang/nodejs6/Makefile
 # used by lang/nodejs8/Makefile
+# used by lang/nodejs10/Makefile
+# used by lang/nodejs12/Makefile
 
-CATEGORIES=    devel
+CATEGORIES=    lang
 MASTER_SITES=  https://nodejs.org/dist/${DISTNAME:S/node-//}/
 PKGNAME=       ${DISTNAME:S/-v/js-/}
 
@@ -24,7 +25,6 @@ GCC_REQD+=            4.8
 CONFIG_SHELL=          ${PYTHONBIN}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --shared-cares
-CONFIGURE_ARGS+=       --shared-http-parser
 CONFIGURE_ARGS+=       --shared-libuv
 CONFIGURE_ARGS+=       --shared-zlib
 CONFIGURE_ARGS+=       --without-npm
@@ -49,15 +49,18 @@ BUILDLINK_TRANSFORM+=       rm:-ldl
 TEST_TARGET=           check
 
 .if defined(TOOLS_PLATFORM.paxctl)
-SUBST_CLASSES+=                        mksnapshot
-SUBST_STAGE.mksnapshot=                post-configure
-# nodejs6
-SUBST_FILES.mksnapshot=                out/deps/v8/tools/gyp/mksnapshot.target.mk
+SUBST_CLASSES+=                mktools
+SUBST_STAGE.mktools=   post-configure
 # nodejs8
-SUBST_FILES.mksnapshot+=       out/deps/v8/src/mksnapshot.target.mk
-# nodejs10+
-SUBST_FILES.mksnapshot+=       out/deps/v8/gypfiles/mksnapshot.target.mk
-SUBST_SED.mksnapshot+=         -e 's|call do_cmd,link)|call do_cmd,link)\${.newline}   ${TOOLS_PLATFORM.paxctl} +m $$@|'
+SUBST_FILES.mktools+=  out/deps/v8/src/mksnapshot.target.mk
+# nodejs10
+SUBST_FILES.mktools+=  out/deps/v8/gypfiles/mksnapshot.target.mk
+# nodejs12
+SUBST_FILES.mktools+=  out/mkcodecache.target.mk
+SUBST_FILES.mktools+=  out/tools/v8_gypfiles/mksnapshot.target.mk
+# nodejs13
+SUBST_FILES.mktools+=  out/node_mksnapshot.target.mk
+SUBST_SED.mktools+=    -e 's|call do_cmd,link)|call do_cmd,link)\${.newline}   ${TOOLS_PLATFORM.paxctl} +m $$@|'
 .endif
 
 CFLAGS.SunOS+=         -D_FILE_OFFSET_BITS=64
@@ -79,5 +82,4 @@ post-install:
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
 .include "../../net/libcares/buildlink3.mk"
-.include "../../www/http-parser/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/lang/nodejs/PLIST
diff -u pkgsrc/lang/nodejs/PLIST:1.57 pkgsrc/lang/nodejs/PLIST:1.58
--- pkgsrc/lang/nodejs/PLIST:1.57       Fri May 31 20:52:00 2019
+++ pkgsrc/lang/nodejs/PLIST    Mon Dec  9 20:03:51 2019
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.57 2019/05/31 20:52:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.58 2019/12/09 20:03:51 adam Exp $
 bin/node
 include/node/common.gypi
 include/node/config.gypi
+include/node/js_native_api.h
+include/node/js_native_api_types.h
 include/node/libplatform/libplatform-export.h
 include/node/libplatform/libplatform.h
 include/node/libplatform/v8-tracing.h
@@ -12,6 +14,21 @@ include/node/node_buffer.h
 include/node/node_object_wrap.h
 include/node/node_version.h
 ${PLIST.openssl}include/node/openssl/aes.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm/crypto/buildinf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm/include/openssl/opensslconf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm/include/progs.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm_avx2/crypto/buildinf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/asm_avx2/include/progs.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/no-asm/crypto/buildinf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/no-asm/include/openssl/opensslconf.h
+${PLIST.openssl}include/node/openssl/archs/BSD-x86/no-asm/include/progs.h
 ${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/crypto/buildinf.h
 ${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h
 ${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h
@@ -257,6 +274,21 @@ ${PLIST.openssl}include/node/openssl/arc
 ${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h
 ${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h
 ${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/include/progs.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm/crypto/buildinf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm/include/openssl/opensslconf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm/include/progs.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm_avx2/crypto/buildinf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/asm_avx2/include/progs.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/no-asm/crypto/buildinf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h
+${PLIST.openssl}include/node/openssl/archs/linux64-mips64/no-asm/include/progs.h
 ${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/crypto/buildinf.h
 ${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h
 ${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h
@@ -413,8 +445,7 @@ ${PLIST.openssl}include/node/openssl/x50
 ${PLIST.openssl}include/node/openssl/x509err.h
 ${PLIST.openssl}include/node/openssl/x509v3.h
 ${PLIST.openssl}include/node/openssl/x509v3err.h
-include/node/v8-inspector-protocol.h
-include/node/v8-inspector.h
+include/node/v8-internal.h
 include/node/v8-platform.h
 include/node/v8-profiler.h
 include/node/v8-testing.h
@@ -422,11 +453,12 @@ include/node/v8-util.h
 include/node/v8-value-serializer-version.h
 include/node/v8-version-string.h
 include/node/v8-version.h
+include/node/v8-wasm-trap-handler-posix.h
+include/node/v8-wasm-trap-handler-win.h
 include/node/v8.h
 include/node/v8config.h
 ${PLIST.dtrace}lib/dtrace/node.d
 man/man1/node.1
 share/doc/node/gdbinit
 share/doc/node/lldb_commands.py
-share/doc/node/lldbinit
 share/systemtap/tapset/node.stp

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.155 pkgsrc/lang/nodejs/distinfo:1.156
--- pkgsrc/lang/nodejs/distinfo:1.155   Sun Nov 24 15:49:31 2019
+++ pkgsrc/lang/nodejs/distinfo Mon Dec  9 20:03:51 2019
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.155 2019/11/24 15:49:31 adam Exp $
+$NetBSD: distinfo,v 1.156 2019/12/09 20:03:51 adam Exp $
 
-SHA1 (node-v10.17.0.tar.gz) = c702535dc9470b4b7dc1321077287702997813a1
-RMD160 (node-v10.17.0.tar.gz) = 793415ea68bfb4fa6f9354a059fda3d11d139471
-SHA512 (node-v10.17.0.tar.gz) = e569efde671285411668281d8673d6b7a1ac3ac96ffbbd0fb1d9c737151cb04666ebbd1bedfb7150f214c35d8f20401e56bae2195ac98ca5ae0bea6ea59b7139
-Size (node-v10.17.0.tar.gz) = 45814546 bytes
+SHA1 (node-v13.3.0.tar.gz) = a99c403d0377fbcf3f89e325f249daa6e57c7540
+RMD160 (node-v13.3.0.tar.gz) = 8ac9b127f3a9686693a28c84db7c574ce64c7f84
+SHA512 (node-v13.3.0.tar.gz) = ad31e4d32c53abb3f84e370cff794074d9d803ed204496c9fce73514d9c45ec1ee1addd68b944b8b8dadea683e101239d885d805d17d673565b467bc9292f7d5
+Size (node-v13.3.0.tar.gz) = 60014645 bytes
 SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac
-SHA1 (patch-configure.py) = 077e0b223d441d17495641d2e4048c8831a54393
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = 12c91ca27ced24cabd714902fad9c9eb0ba40f9b
 SHA1 (patch-deps_openssl_config_bn__conf__asm.h) = a4cf4f0771c96fb09a00b76b25d35000d65ef92f
@@ -14,30 +13,26 @@ SHA1 (patch-deps_openssl_config_dso__con
 SHA1 (patch-deps_openssl_config_dso__conf__no-asm.h) = 78fe6bf2251940ad27913a624abdfb892e69f438
 SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = e9bb26b66431595d13d4173d3ed5f3e583bd009f
 SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 63c493a4e2b98fb630a094908aa5c4b629181d15
-SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = addb5837ea7b8ea2732cd2f5aaa8a24289b1199f
-SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 73368f336dbe500e45f0ba6bbb7656416a27b294
-SHA1 (patch-deps_openssl_openssl__asm.gypi) = b85e1f5a9f862d469afcb36ff6e1ad202bea704a
-SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = b549ea34f51e26669a41a64da0db10e92f0d0a99
+SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = 044ef35989d9ad2d55fe7ac965f2ec6e39e246ba
+SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = e40ae90fdc34c53e3761d5486ca58fb8e248a412
+SHA1 (patch-deps_openssl_openssl__asm.gypi) = 7c2b9a876792c66cf29c887d36e406996c61982f
+SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = 3b1bc963308d8b8d4d03aa2921605d0fab61e1b8
 SHA1 (patch-deps_openssl_openssl_crypto_rand_rand__unix.c) = ba8d4602c3386801ad8d3c33c757c69ad3d25a34
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_uv_src_unix_netbsd.c) = 76b27ae86aa80582554ee824146ee7c42c33883b
-SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29
-SHA1 (patch-deps_v8_src_arm_assembler-arm.cc) = f32d5d2a1096f822c813eaf6d02b9348564213f6
-SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d
-SHA1 (patch-deps_v8_src_base_atomicops.h) = 552d2b7781b39b93392fd00043b1cf4cb10802da
+SHA1 (patch-deps_v8_src_base_atomicops.h) = d1ef20a3fee1d188687bd76836ada6f2c8e0787f
 SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 427c7712fc1c2872fc48e593f7ab491c69ee44e3
 SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8
 SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0d80cc6587af9220832de112834e9f50242f819f
-SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = aa84bf1dbaac5808529f6b01502d117c88751649
-SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6
-SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff
-SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480
+SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6
+SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
+SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5
 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
 SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
 SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704
-SHA1 (patch-src_inspector__agent.cc) = 6066c01b671a1d416440b073a7a21fdf22eef926
+SHA1 (patch-src_inspector__agent.cc) = 2ec2a7be459648700488096f467a4ae6af5a9d91
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
 SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 8d76b78e46b0ba2fef08294872e17a068d595f32
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e
 SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 15937c419f3226ab280c7bcd5d726773cb5add57
-SHA1 (patch-tools_install.py) = aae60d31e8c2e74f18c61c328913412545943d79
+SHA1 (patch-tools_install.py) = 8058eb63387971b97a1c3573d1875befeb873e77

Index: pkgsrc/lang/nodejs/nodeversion.mk
diff -u pkgsrc/lang/nodejs/nodeversion.mk:1.5 pkgsrc/lang/nodejs/nodeversion.mk:1.6
--- pkgsrc/lang/nodejs/nodeversion.mk:1.5       Wed Dec 12 16:38:06 2018
+++ pkgsrc/lang/nodejs/nodeversion.mk   Mon Dec  9 20:03:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: nodeversion.mk,v 1.5 2018/12/12 16:38:06 adam Exp $
+# $NetBSD: nodeversion.mk,v 1.6 2019/12/09 20:03:51 adam Exp $
 
 # This file determins which nodejs version is used as a dependency for
 # a package.
@@ -8,8 +8,8 @@
 # NODE_VERSION_DEFAULT
 #      The preferred node version to use.
 #
-#      Possible values: 6 8 10
-#      Default: 8
+#      Possible values: 8 10 12 13
+#      Default: 10
 #
 # === Infrastructure variables ===
 #
@@ -27,13 +27,13 @@
 #      is significant; those listed earlier are preferred over those
 #      listed later.
 #
-#      Possible values: 6 8 10
-#      Default: 8 6 10
+#      Possible values: 8 10 12 13
+#      Default: 8 10 12 13
 #
 # NODE_VERSIONS_INCOMPATIBLE
 #      The node versions that the package *cannot* build against.
 #
-#      Possible values: 6 8 10
+#      Possible values: 8 10 12 13
 #      Default: <empty>
 #
 # Keywords: node
@@ -57,8 +57,8 @@ NODE_VERSION_REQD?=   ${PKGNAME_OLD:C/(^.*
 BUILD_DEFS+=           NODE_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=   NODE_PACKAGE
 
-NODE_VERSION_DEFAULT?=         8
-NODE_VERSIONS_ACCEPTED?=       8 6 10
+NODE_VERSION_DEFAULT?=         10
+NODE_VERSIONS_ACCEPTED?=       8 10 12 13
 NODE_VERSIONS_INCOMPATIBLE?=   # empty
 
 # Resolve NODE_VERSIONS_INCOMPATIBLE and generate the _OK vars.
@@ -90,9 +90,11 @@ _NODE_VERSION?=              none
 
 .if ${_NODE_VERSION} == "8"
 .include "../../lang/nodejs8/buildlink3.mk"
-.elif ${_NODE_VERSION} == "6"
-.include "../../lang/nodejs6/buildlink3.mk"
 .elif ${_NODE_VERSION} == "10"
+.include "../../lang/nodejs10/buildlink3.mk"
+.elif ${_NODE_VERSION} == "12"
+.include "../../lang/nodejs12/buildlink3.mk"
+.elif ${_NODE_VERSION} == "13"
 .include "../../lang/nodejs/buildlink3.mk"
 .else
 PKG_FAIL_REASON+=      "No valid node version found"

Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi:1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi:1.4
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi:1.3      Sun Feb 24 12:18:55 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi  Mon Dec  9 20:03:51 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
+$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.4 2019/12/09 20:03:51 adam Exp $
 
 Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
 XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
 
---- deps/openssl/openssl-cl_asm.gypi.orig      2019-01-29 16:20:45.000000000 +0900
-+++ deps/openssl/openssl-cl_asm.gypi   2019-02-24 10:28:36.290301337 +0900
+--- deps/openssl/openssl-cl_asm.gypi.orig      2019-11-19 08:29:07.000000000 +0000
++++ deps/openssl/openssl-cl_asm.gypi
 @@ -31,6 +31,12 @@
        'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
@@ -19,9 +19,9 @@ XXX Change default to linux-elf instead 
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
-@@ -41,7 +47,7 @@
-       'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'],
-     }, {
+@@ -43,7 +49,7 @@
+       'includes': ['config/archs/linux64-mips64/asm/openssl-cl.gypi'],
+     },{
        # Other architectures don't use assembly
 -      'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'],
 +      'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi:1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi:1.4
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi:1.3  Sun Feb 24 12:18:55 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi      Mon Dec  9 20:03:51 2019
@@ -1,18 +1,18 @@
-$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
+$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.4 2019/12/09 20:03:51 adam Exp $
 
 Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
 XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
 
---- deps/openssl/openssl-cl_no_asm.gypi.orig   2019-01-29 16:20:45.000000000 +0900
-+++ deps/openssl/openssl-cl_no_asm.gypi        2019-02-24 10:28:59.344517509 +0900
+--- deps/openssl/openssl-cl_no_asm.gypi.orig   2019-11-19 08:29:07.000000000 +0000
++++ deps/openssl/openssl-cl_no_asm.gypi
 @@ -1,4 +1,5 @@
  {
 +  'defines': ['OPENSSL_NO_ASM'],
    'conditions': [
      ['target_arch=="ppc" and OS=="aix"', {
        'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'],
-@@ -31,6 +32,12 @@
+@@ -33,6 +34,12 @@
        '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'],
@@ -25,8 +25,8 @@ XXX Change default to linux-elf instead 
      }, '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 +48,7 @@
-       'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
+@@ -45,7 +52,7 @@
+       'includes': ['config/archs/linux64-mips64/no-asm/openssl-cl.gypi'],
      }, {
        # Other architectures don't use assembly
 -      'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi:1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi:1.4
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi:1.3 Sun Feb 24 12:18:55 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi     Mon Dec  9 20:03:51 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
+$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.4 2019/12/09 20:03:51 adam Exp $
 
 Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
 XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
 
---- deps/openssl/openssl_asm.gypi.orig 2019-01-29 16:20:46.000000000 +0900
-+++ deps/openssl/openssl_asm.gypi      2019-02-24 12:11:23.696088048 +0900
+--- deps/openssl/openssl_asm.gypi.orig 2019-11-19 08:29:07.000000000 +0000
++++ deps/openssl/openssl_asm.gypi
 @@ -46,6 +46,12 @@
        'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
@@ -19,8 +19,8 @@ XXX Change default to linux-elf instead 
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
-@@ -75,7 +81,7 @@
-       'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'],
+@@ -77,7 +83,7 @@
+       'includes': ['config/archs/linux64-mips64/asm/openssl.gypi'],
      }, {
        # Other architectures don't use assembly
 -      'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'],
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi:1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi:1.4
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi:1.3     Sun Feb 24 12:18:55 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi Mon Dec  9 20:03:51 2019
@@ -1,11 +1,9 @@
-$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
+$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.4 2019/12/09 20:03:51 adam Exp $
 
 Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
-XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
-
---- deps/openssl/openssl_no_asm.gypi.orig      2019-01-29 16:20:46.000000000 +0900
-+++ deps/openssl/openssl_no_asm.gypi   2019-02-24 10:29:47.246812244 +0900
+--- deps/openssl/openssl_no_asm.gypi.orig      2019-11-19 08:29:07.000000000 +0000
++++ deps/openssl/openssl_no_asm.gypi
 @@ -32,6 +32,12 @@
        'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
@@ -19,8 +17,8 @@ XXX Change default to linux-elf instead 
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
-@@ -42,7 +48,7 @@
-       'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
+@@ -46,7 +52,7 @@
+       'includes': ['config/archs/linux64-mips64/no-asm/openssl.gypi'],
      }, {
        # Other architectures don't use assembly
 -      'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_atomicops.h
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_atomicops.h:1.2 pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_atomicops.h:1.3
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_atomicops.h:1.2   Tue Oct 25 19:50:40 2016
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_atomicops.h       Mon Dec  9 20:03:51 2019
@@ -1,17 +1,17 @@
-$NetBSD: patch-deps_v8_src_base_atomicops.h,v 1.2 2016/10/25 19:50:40 fhajny Exp $
+$NetBSD: patch-deps_v8_src_base_atomicops.h,v 1.3 2019/12/09 20:03:51 adam Exp $
 
---- deps/v8/src/base/atomicops.h.orig  2016-10-25 13:26:03.000000000 +0000
+--- deps/v8/src/base/atomicops.h.orig  2019-11-19 08:29:07.000000000 +0000
 +++ deps/v8/src/base/atomicops.h
-@@ -52,9 +52,13 @@ typedef intptr_t Atomic64;
+@@ -52,9 +52,13 @@ using Atomic64 = intptr_t;
  #endif  // defined(__ILP32__)
  #endif  // defined(V8_HOST_ARCH_64_BIT)
  
 +#if defined(__NetBSD__) && defined(__arm__)
-+typedef int32_t AtomicWord;
++using AtomicWord = int32_t;
 +#else
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.
- typedef intptr_t AtomicWord;
+ using AtomicWord = intptr_t;
 +#endif
  
  // Atomically execute:
Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_compiler_types.h
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_src_compiler_types.h:1.2 pkgsrc/lang/nodejs/patches/patch-deps_v8_src_compiler_types.h:1.3
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_src_compiler_types.h:1.2   Mon Jun  5 21:14:04 2017
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_compiler_types.h       Mon Dec  9 20:03:51 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-deps_v8_src_compiler_types.h,v 1.2 2017/06/05 21:14:04 fhajny Exp $
+$NetBSD: patch-deps_v8_src_compiler_types.h,v 1.3 2019/12/09 20:03:51 adam Exp $
 
 NetBSD 6 doesn't have nearbyint/nearbyintf.
 
---- deps/v8/src/compiler/types.h.orig  2017-05-30 17:31:37.000000000 +0000
+--- deps/v8/src/compiler/types.h.orig  2019-11-19 08:29:07.000000000 +0000
 +++ deps/v8/src/compiler/types.h
 @@ -5,6 +5,14 @@
  #ifndef V8_COMPILER_TYPES_H_
@@ -17,5 +17,5 @@ NetBSD 6 doesn't have nearbyint/nearbyin
 +#endif
 +
  #include "src/base/compiler-specific.h"
- #include "src/conversions.h"
- #include "src/globals.h"
+ #include "src/common/globals.h"
+ #include "src/compiler/heap-refs.h"
Index: pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc
diff -u pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc:1.2 pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc:1.3
--- pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc:1.2        Sat Dec 15 17:32:38 2018
+++ pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc    Mon Dec  9 20:03:51 2019
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_inspector__agent.cc,v 1.2 2018/12/15 17:32:38 maya Exp $
+$NetBSD: patch-src_inspector__agent.cc,v 1.3 2019/12/09 20:03:51 adam Exp $
 
---- src/inspector_agent.cc.orig        2017-05-30 17:32:13.000000000 +0000
+--- src/inspector_agent.cc.orig        2019-11-19 08:29:09.000000000 +0000
 +++ src/inspector_agent.cc
-@@ -96,7 +96,7 @@ static int RegisterDebugSignalHandler()
-   // Don't shrink the thread's stack on FreeBSD.  Said platform decided to
-   // follow the pthreads specification to the letter rather than in spirit:
-   // https://lists.freebsd.org/pipermail/freebsd-current/2014-March/048885.html
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) 
-   CHECK_EQ(0, pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN));
- #endif  // __FreeBSD__
-   CHECK_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
+@@ -112,7 +112,7 @@ static int StartDebugSignalHandler() {
+   CHECK_EQ(0, uv_sem_init(&start_io_thread_semaphore, 0));
+   pthread_attr_t attr;
+   CHECK_EQ(0, pthread_attr_init(&attr));
+-#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__)
++#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+   // PTHREAD_STACK_MIN is 2 KB with musl libc, which is too small to safely
+   // receive signals. PTHREAD_STACK_MIN + MINSIGSTKSZ is 8 KB on arm64, which
+   // is the musl architecture with the biggest MINSIGSTKSZ so let's use that

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc:1.5 pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc:1.6
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc:1.5 Tue Oct 25 19:50:40 2016
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc     Mon Dec  9 20:03:51 2019
@@ -1,4 +1,5 @@
-$NetBSD: patch-deps_v8_src_base_platform_semaphore.cc,v 1.5 2016/10/25 19:50:40 fhajny Exp $
+$NetBSD: patch-deps_v8_src_base_platform_semaphore.cc,v 1.6 2019/12/09 20:03:51 adam Exp $
+
 Work around lack of sem_timedwait(3) in NetBSD < 6.99.4.
 Adapted from d4f11c0cf476dd854eaebec1cbacb1afc7bea18e of the Chromium V8 sources.
 
Index: pkgsrc/lang/nodejs/patches/patch-tools_install.py
diff -u pkgsrc/lang/nodejs/patches/patch-tools_install.py:1.5 pkgsrc/lang/nodejs/patches/patch-tools_install.py:1.6
--- pkgsrc/lang/nodejs/patches/patch-tools_install.py:1.5       Wed Apr 12 11:26:52 2017
+++ pkgsrc/lang/nodejs/patches/patch-tools_install.py   Mon Dec  9 20:03:51 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-tools_install.py,v 1.5 2017/04/12 11:26:52 fhajny Exp $
+$NetBSD: patch-tools_install.py,v 1.6 2019/12/09 20:03:51 adam Exp $
 
 Install man pages under the right directory.
 
---- tools/install.py.orig      2017-04-11 15:48:50.000000000 +0000
+--- tools/install.py.orig      2019-11-19 08:29:09.000000000 +0000
 +++ tools/install.py
-@@ -136,10 +136,7 @@ def files(action):
-   action(['deps/v8/tools/lldbinit'], 'share/doc/node/')
+@@ -151,10 +151,7 @@ def files(action):
+   action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
    action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
  
 -  if 'freebsd' in sys.platform or 'openbsd' in sys.platform:

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_common_globals.h
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_v8_src_common_globals.h:1.1
--- /dev/null   Mon Dec  9 20:03:51 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_common_globals.h       Mon Dec  9 20:03:51 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-deps_v8_src_common_globals.h,v 1.1 2019/12/09 20:03:51 adam Exp $
+
+stdarg.h is needed for va_list on at least NetBSD.
+
+--- deps/v8/src/common/globals.h.orig  2019-11-19 08:29:07.000000000 +0000
++++ deps/v8/src/common/globals.h
+@@ -7,6 +7,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdarg.h>
+ 
+ #include <limits>
+ #include <ostream>

Prev by Date: CVS commit: pkgsrc/net/proftpd
Next by Date: CVS commit: pkgsrc/lang
Previous by Thread: CVS commit: pkgsrc/net/proftpd
Next by Thread: CVS commit: pkgsrc/lang
Indexes:

Home | Main Index | Thread Index | Old Index