CVS commit: pkgsrc/lang

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Sat May 12 08:59:56 UTC 2018

Modified Files:
        pkgsrc/lang/nodejs: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/lang/nodejs6: Makefile PLIST buildlink3.mk
        pkgsrc/lang/nodejs8: Makefile PLIST buildlink3.mk
Added Files:
        pkgsrc/lang/nodejs/patches: patch-node.gypi

Log Message:
lang/nodejs: Use pkgsrc http-parser, libuv, libcares instead of bundled versions.
Switch back to bundled nghttp2 on lang/nodejs to reconcile a conflict
of OpenSSL versions.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.55 -r1.56 pkgsrc/lang/nodejs/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs/buildlink3.mk
cvs rdiff -u -r1.121 -r1.122 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/nodejs/patches/patch-node.gypi
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/nodejs6/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/nodejs6/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs6/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/nodejs8/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/nodejs8/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs8/buildlink3.mk

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/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.128 pkgsrc/lang/nodejs/Makefile:1.129
--- pkgsrc/lang/nodejs/Makefile:1.128   Fri May  4 04:29:46 2018
+++ pkgsrc/lang/nodejs/Makefile Sat May 12 08:59:56 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2018/05/04 04:29:46 minskim Exp $
+# $NetBSD: Makefile,v 1.129 2018/05/12 08:59:56 fhajny Exp $
 
 DISTNAME=      node-v10.0.0
+PKGREVISION=   1
 
 USE_LANGUAGES= c gnu++14
 
@@ -9,7 +10,10 @@ GCC_REQD+=    4.9.4
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=       --shared-nghttp2
+# Optional OpenSSL support in nghttp2 conflicts with OpenSSL 1.1.x
+# bundled and built by lang/nodejs.
+# Uncomment when we switch to openssl>=1.1
+# CONFIGURE_ARGS+=     --shared-nghttp2
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
 CHECK_PORTABILITY_SKIP+=       deps/openssl/openssl/.travis-create-release.sh
@@ -18,5 +22,6 @@ CHECK_PORTABILITY_SKIP+=      deps/openssl/op
 
 .include "../../lang/nodejs/Makefile.common"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../www/nghttp2/buildlink3.mk"
+# Uncomment when we switch to openssl>=1.1
+# .include "../../www/nghttp2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.19 pkgsrc/lang/nodejs/Makefile.common:1.20
--- pkgsrc/lang/nodejs/Makefile.common:1.19     Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/Makefile.common  Sat May 12 08:59:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2018/05/03 21:19:16 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.20 2018/05/12 08:59:56 fhajny Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs6/Makefile
 # used by lang/nodejs8/Makefile
@@ -23,6 +23,9 @@ 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
 PTHREAD_AUTO_VARS=     yes
@@ -63,7 +66,10 @@ post-install:
 .if ${OPSYS} != "Darwin"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .endif
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .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.55 pkgsrc/lang/nodejs/PLIST:1.56
--- pkgsrc/lang/nodejs/PLIST:1.55       Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/PLIST    Sat May 12 08:59:56 2018
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.55 2018/05/03 21:19:16 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.56 2018/05/12 08:59:56 fhajny Exp $
 bin/node
-include/node/android-ifaddrs.h
 include/node/common.gypi
 include/node/config.gypi
 include/node/libplatform/libplatform-export.h
@@ -283,22 +282,6 @@ ${PLIST.openssl}include/node/openssl/whr
 ${PLIST.openssl}include/node/openssl/x509.h
 ${PLIST.openssl}include/node/openssl/x509_vfy.h
 ${PLIST.openssl}include/node/openssl/x509v3.h
-include/node/pthread-barrier.h
-include/node/stdint-msvc2008.h
-include/node/tree.h
-include/node/uv-aix.h
-include/node/uv-bsd.h
-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
-include/node/uv-version.h
-include/node/uv-win.h
-include/node/uv.h
 include/node/v8-inspector-protocol.h
 include/node/v8-inspector.h
 include/node/v8-platform.h

Index: pkgsrc/lang/nodejs/buildlink3.mk
diff -u pkgsrc/lang/nodejs/buildlink3.mk:1.1 pkgsrc/lang/nodejs/buildlink3.mk:1.2
--- pkgsrc/lang/nodejs/buildlink3.mk:1.1        Fri May  4 14:28:32 2018
+++ pkgsrc/lang/nodejs/buildlink3.mk    Sat May 12 08:59:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/04 14:28:32 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/05/12 08:59:56 fhajny Exp $
 
 BUILDLINK_TREE+=       nodejs
 
@@ -13,9 +13,13 @@ BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/
 .if ${OPSYS} != "Darwin"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .endif
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libcares/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../www/nghttp2/buildlink3.mk"
+.include "../../www/http-parser/buildlink3.mk"
+# Uncomment when we switch to openssl>=1.1
+# .include "../../www/nghttp2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 pkgbase := nodejs

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.121 pkgsrc/lang/nodejs/distinfo:1.122
--- pkgsrc/lang/nodejs/distinfo:1.121   Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/distinfo Sat May 12 08:59:56 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.121 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: distinfo,v 1.122 2018/05/12 08:59:56 fhajny Exp $
 
 SHA1 (node-v10.0.0.tar.gz) = 6547649ab1c3d8bb9048d6dfd4f7a00e9e9c5983
 RMD160 (node-v10.0.0.tar.gz) = 8cd5e0353fffc77025d3f0288bb42ea1fc6b665b
@@ -24,6 +24,7 @@ SHA1 (patch-deps_v8_src_compiler_types.h
 SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff
 SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480
 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) = f6d25964a6446a1cb3c7733b7668c87932efad98
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff

Index: pkgsrc/lang/nodejs6/Makefile
diff -u pkgsrc/lang/nodejs6/Makefile:1.26 pkgsrc/lang/nodejs6/Makefile:1.27
--- pkgsrc/lang/nodejs6/Makefile:1.26   Thu May  3 21:12:23 2018
+++ pkgsrc/lang/nodejs6/Makefile        Sat May 12 08:59:56 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2018/05/03 21:12:23 fhajny Exp $
+# $NetBSD: Makefile,v 1.27 2018/05/12 08:59:56 fhajny Exp $
 
 DISTNAME=      node-v6.14.2
+PKGREVISION=   1
 
 .include "options.mk"
 

Index: pkgsrc/lang/nodejs6/PLIST
diff -u pkgsrc/lang/nodejs6/PLIST:1.7 pkgsrc/lang/nodejs6/PLIST:1.8
--- pkgsrc/lang/nodejs6/PLIST:1.7       Thu May  3 10:29:16 2018
+++ pkgsrc/lang/nodejs6/PLIST   Sat May 12 08:59:56 2018
@@ -1,36 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2018/05/03 10:29:16 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/05/12 08:59:56 fhajny Exp $
 bin/node
-include/node/android-ifaddrs.h
-include/node/ares.h
-include/node/ares_build.h
-include/node/ares_rules.h
-include/node/ares_version.h
 include/node/common.gypi
 include/node/config.gypi
 include/node/libplatform/libplatform.h
-include/node/nameser.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
-include/node/pthread-barrier.h
-include/node/stdint-msvc2008.h
-include/node/tree.h
-include/node/uv-aix.h
-include/node/uv-bsd.h
-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
-include/node/uv-version.h
-include/node/uv-win.h
-include/node/uv.h
 include/node/v8-debug.h
 include/node/v8-experimental.h
 include/node/v8-platform.h

Index: pkgsrc/lang/nodejs6/buildlink3.mk
diff -u pkgsrc/lang/nodejs6/buildlink3.mk:1.1 pkgsrc/lang/nodejs6/buildlink3.mk:1.2
--- pkgsrc/lang/nodejs6/buildlink3.mk:1.1       Fri May  4 14:28:32 2018
+++ pkgsrc/lang/nodejs6/buildlink3.mk   Sat May 12 08:59:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/04 14:28:32 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/05/12 08:59:56 fhajny Exp $
 
 BUILDLINK_TREE+=       nodejs
 
@@ -13,7 +13,10 @@ BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/
 .if ${OPSYS} != "Darwin"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .endif
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libcares/buildlink3.mk"
+.include "../../www/http-parser/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 pkgbase := nodejs

Index: pkgsrc/lang/nodejs8/Makefile
diff -u pkgsrc/lang/nodejs8/Makefile:1.11 pkgsrc/lang/nodejs8/Makefile:1.12
--- pkgsrc/lang/nodejs8/Makefile:1.11   Thu May  3 21:12:23 2018
+++ pkgsrc/lang/nodejs8/Makefile        Sat May 12 08:59:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/05/03 21:12:23 fhajny Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/12 08:59:56 fhajny Exp $
 
 DISTNAME=      node-v8.11.1
 
@@ -9,7 +9,7 @@ GCC_REQD+=      4.9.4
 
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../lang/nodejs/Makefile.common"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/nodejs8/PLIST
diff -u pkgsrc/lang/nodejs8/PLIST:1.3 pkgsrc/lang/nodejs8/PLIST:1.4
--- pkgsrc/lang/nodejs8/PLIST:1.3       Wed May  2 16:33:02 2018
+++ pkgsrc/lang/nodejs8/PLIST   Sat May 12 08:59:56 2018
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2018/05/02 16:33:02 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/05/12 08:59:56 fhajny Exp $
 bin/node
-include/node/android-ifaddrs.h
 include/node/common.gypi
 include/node/config.gypi
 include/node/libplatform/libplatform-export.h
@@ -12,22 +11,6 @@ include/node/node_api_types.h
 include/node/node_buffer.h
 include/node/node_object_wrap.h
 include/node/node_version.h
-include/node/pthread-barrier.h
-include/node/stdint-msvc2008.h
-include/node/tree.h
-include/node/uv-aix.h
-include/node/uv-bsd.h
-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
-include/node/uv-version.h
-include/node/uv-win.h
-include/node/uv.h
 include/node/v8-debug.h
 include/node/v8-inspector-protocol.h
 include/node/v8-inspector.h

Index: pkgsrc/lang/nodejs8/buildlink3.mk
diff -u pkgsrc/lang/nodejs8/buildlink3.mk:1.1 pkgsrc/lang/nodejs8/buildlink3.mk:1.2
--- pkgsrc/lang/nodejs8/buildlink3.mk:1.1       Fri May  4 14:28:32 2018
+++ pkgsrc/lang/nodejs8/buildlink3.mk   Sat May 12 08:59:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/04 14:28:32 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/05/12 08:59:56 fhajny Exp $
 
 BUILDLINK_TREE+=       nodejs
 
@@ -13,8 +13,11 @@ BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/
 .if ${OPSYS} != "Darwin"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .endif
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libcares/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../www/http-parser/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 pkgbase := nodejs

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-node.gypi
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-node.gypi:1.1
--- /dev/null   Sat May 12 08:59:56 2018
+++ pkgsrc/lang/nodejs/patches/patch-node.gypi  Sat May 12 08:59:56 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-node.gypi,v 1.1 2018/05/12 08:59:56 fhajny Exp $
+
+Linking in libcares requires libsocket.
+
+--- node.gypi.orig     2018-04-24 14:41:37.000000000 +0000
++++ node.gypi
+@@ -251,6 +251,7 @@
+     [ 'OS=="solaris"', {
+       'libraries': [
+         '-lkstat',
++        '-lsocket',
+         '-lumem',
+       ],
+       'defines!': [