diff options
-rw-r--r-- | lang/nodejs6/Makefile | 4 | ||||
-rw-r--r-- | lang/nodejs6/PLIST | 3 | ||||
-rw-r--r-- | lang/nodejs6/distinfo | 14 | ||||
-rw-r--r-- | lang/nodejs6/patches/patch-deps_uv_src_unix_netbsd.c | 22 | ||||
-rw-r--r-- | lang/nodejs6/patches/patch-deps_uv_uv.gyp | 12 |
5 files changed, 28 insertions, 27 deletions
diff --git a/lang/nodejs6/Makefile b/lang/nodejs6/Makefile index c8789dc1562..c054ce2eb9d 100644 --- a/lang/nodejs6/Makefile +++ b/lang/nodejs6/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2017/10/25 13:45:18 fhajny Exp $ +# $NetBSD: Makefile,v 1.18 2017/11/08 18:31:15 fhajny Exp $ -DISTNAME= node-v6.11.5 +DISTNAME= node-v6.12.0 .include "../../lang/nodejs/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nodejs6/PLIST b/lang/nodejs6/PLIST index a4ccdb75a2e..ce2fd0a30ed 100644 --- a/lang/nodejs6/PLIST +++ b/lang/nodejs6/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2017/06/07 11:09:44 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.5 2017/11/08 18:31:15 fhajny Exp $ bin/node bin/npm include/node/android-ifaddrs.h @@ -23,6 +23,7 @@ include/node/uv-darwin.h include/node/uv-errno.h include/node/uv-linux.h include/node/uv-os390.h +include/node/uv-posix.h include/node/uv-sunos.h include/node/uv-threadpool.h include/node/uv-unix.h diff --git a/lang/nodejs6/distinfo b/lang/nodejs6/distinfo index 64ade9869d1..a0b67b68aec 100644 --- a/lang/nodejs6/distinfo +++ b/lang/nodejs6/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.16 2017/10/25 13:45:18 fhajny Exp $ +$NetBSD: distinfo,v 1.17 2017/11/08 18:31:15 fhajny Exp $ -SHA1 (node-v6.11.5.tar.gz) = 138923809d039c011ec2ae3f48afd5f76a907c4d -RMD160 (node-v6.11.5.tar.gz) = d7c7a92a49a024d59137dc0185baa00f71ee8c7c -SHA512 (node-v6.11.5.tar.gz) = 63b80b68cda08121993db7c35bb4db4823c4c9c0fc596a20713bea55290bb434b940c42b0f3c7da64283842625870449c602bdafd7ad230de1b54b0280183f37 -Size (node-v6.11.5.tar.gz) = 26915846 bytes +SHA1 (node-v6.12.0.tar.gz) = 3d689a4ee9526a3bd2033802abca9cf19ac03ec9 +RMD160 (node-v6.12.0.tar.gz) = 3c31d09a33a26fc7cd9f1996eb1ac1173f0c0d18 +SHA512 (node-v6.12.0.tar.gz) = 3d285a2011a77e2bc4f9b1500a1bb45b04baf0780f1824761a1f73c56ea90d8517bd9c12e618d66d6640f45bfa42c33c73fe65979ce98252e8fd804616fee339 +Size (node-v6.12.0.tar.gz) = 27378146 bytes SHA1 (patch-common.gypi) = 5b3a50617358637a6f910de28bb5a14f037317a6 SHA1 (patch-deps_cares_cares.gyp) = bae68a88473f9b7e0af1fbf65da033bc8f917225 SHA1 (patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 78d6ddd37ae30e869e0da666a78baad86a638c50 SHA1 (patch-deps_uv_common.gypi) = ba9caa1f6d9d6df1913d0d72a8d18ea6db0a32ff -SHA1 (patch-deps_uv_src_unix_netbsd.c) = 0915dcd6ff65ec9bc098c05c32e3fedee9c8168b -SHA1 (patch-deps_uv_uv.gyp) = cce97c295e2c4e33bc40a950e137ed7c0482b62b +SHA1 (patch-deps_uv_src_unix_netbsd.c) = 9801ef0c1bdd9c8ea7448052a219d80c6624dd20 +SHA1 (patch-deps_uv_uv.gyp) = d5f434389e093a944aa34834e5b4dfcf403098bf SHA1 (patch-deps_v8__inspector_third__party_v8__inspector_platform_v8__inspector_PlatformSTL.h) = bd06047c14bde2984c80fcdade7067c4eac3cbc3 SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d SHA1 (patch-deps_v8_src_base_atomicops.h) = 65b6508f5260ae672b9efc5672ba2c93223355ff diff --git a/lang/nodejs6/patches/patch-deps_uv_src_unix_netbsd.c b/lang/nodejs6/patches/patch-deps_uv_src_unix_netbsd.c index 1ff8c8b024c..07d9a876f68 100644 --- a/lang/nodejs6/patches/patch-deps_uv_src_unix_netbsd.c +++ b/lang/nodejs6/patches/patch-deps_uv_src_unix_netbsd.c @@ -1,8 +1,8 @@ -$NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.1 2016/10/25 19:54:00 fhajny Exp $ +$NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.2 2017/11/08 18:31:15 fhajny Exp $ ---- deps/uv/src/unix/netbsd.c.orig 2016-04-05 21:52:30.000000000 +0000 +--- deps/uv/src/unix/netbsd.c.orig 2017-11-06 22:14:03.000000000 +0000 +++ deps/uv/src/unix/netbsd.c -@@ -43,6 +43,11 @@ +@@ -40,6 +40,11 @@ #include <unistd.h> #include <time.h> @@ -11,18 +11,18 @@ $NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.1 2016/10/25 19:54:00 fhajny Exp $ +# include <sys/param.h> +#endif + - #undef NANOSEC - #define NANOSEC ((uint64_t) 1e9) + static char *process_title; -@@ -90,7 +95,11 @@ int uv_exepath(char* buffer, size_t* siz + +@@ -80,7 +85,11 @@ int uv_exepath(char* buffer, size_t* siz mib[0] = CTL_KERN; mib[1] = KERN_PROC_ARGS; - mib[2] = mypid; + mib[2] = -1; +#if __NetBSD_Version__ >= 799000000 -+ mib[3] = KERN_PROC_PATHNAME; + mib[3] = KERN_PROC_PATHNAME; +#else - mib[3] = KERN_PROC_ARGV; ++ mib[3] = KERN_PROC_ARGV; +#endif + int_size = ARRAY_SIZE(int_buf); - cb = *size; - if (sysctl(mib, 4, buffer, &cb, NULL, 0)) + if (sysctl(mib, 4, int_buf, &int_size, NULL, 0)) diff --git a/lang/nodejs6/patches/patch-deps_uv_uv.gyp b/lang/nodejs6/patches/patch-deps_uv_uv.gyp index 19589c8867c..73746575f00 100644 --- a/lang/nodejs6/patches/patch-deps_uv_uv.gyp +++ b/lang/nodejs6/patches/patch-deps_uv_uv.gyp @@ -1,13 +1,13 @@ -$NetBSD: patch-deps_uv_uv.gyp,v 1.2 2017/10/25 13:45:18 fhajny Exp $ +$NetBSD: patch-deps_uv_uv.gyp,v 1.3 2017/11/08 18:31:15 fhajny Exp $ SunOS headers need _XOPEN_SOURCE=600 with c99. ---- deps/uv/uv.gyp.orig 2017-10-24 19:10:03.000000000 +0000 +--- deps/uv/uv.gyp.orig 2017-11-06 22:14:03.000000000 +0000 +++ deps/uv/uv.gyp @@ -37,7 +37,7 @@ 'xcode_settings': { 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden - 'WARNING_CFLAGS': [ '-Wall', '-Wextra', '-Wno-unused-parameter' ], + 'WARNING_CFLAGS': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wstrict-prototypes' ], - 'OTHER_CFLAGS': [ '-g', '--std=gnu89', '-pedantic' ], + 'OTHER_CFLAGS': [ '-g', '--std=gnu99', '-pedantic' ], } @@ -22,8 +22,8 @@ SunOS headers need _XOPEN_SOURCE=600 with c99. '-pedantic', '-Wall', '-Wextra', -@@ -259,7 +259,7 @@ - 'sources': [ 'src/unix/sunos.c' ], +@@ -262,7 +262,7 @@ + ], 'defines': [ '__EXTENSIONS__', - '_XOPEN_SOURCE=500', @@ -31,7 +31,7 @@ SunOS headers need _XOPEN_SOURCE=600 with c99. ], 'link_settings': { 'libraries': [ -@@ -488,7 +488,7 @@ +@@ -501,7 +501,7 @@ [ 'OS=="solaris"', { # make test-fs.c compile, needs _POSIX_C_SOURCE 'defines': [ '__EXTENSIONS__', |