Update lang/nodejs to 5.5.0.

* events: make sure console functions exist (Dave) #4479
* fs: add autoClose option to fs.createWriteStream (Saquib) #3679
* http: improves expect header handling (Daniel Sellers) #4501
* node: allow preload modules with -i (Evan Lucas) #4696
* v8,src: expose statistics about heap spaces (v8.getHeapSpaceStatistics())
  (Ben Ripkens) #4463
* Minor performance improvements:
  - lib: Use arrow functions instead of bind where possible (Minwoo Jung)
    #3622.
  - module: cache stat() results more aggressively (Ben Noordhuis) #4575
  - querystring: improve parse() performance (Brian White) #4675

5 files changed, 16 insertions, 97 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index b3b7b80e64b..336fc59840e 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2016/01/18 20:57:41 fhajny Exp $
+# $NetBSD: Makefile,v 1.55 2016/01/21 11:45:30 fhajny Exp $
 
-DISTNAME=	node-v5.4.1
+DISTNAME=	node-v5.5.0
 
 .include "../../lang/nodejs/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common
index b0ede3051b9..8751b83859d 100644
--- a/lang/nodejs/Makefile.common
+++ b/lang/nodejs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2015/12/05 21:25:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/01/21 11:45:30 fhajny Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs4/Makefile
 
@@ -22,18 +22,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 0.10.24
 
 GCC_REQD+=		4.8
 
-SUBST_CLASSES+=		python
-SUBST_STAGE.python=	pre-configure
-SUBST_MESSAGE.python=	Fixing Python references
-SUBST_FILES.python=	node.gyp deps/v8/tools/gyp/v8.gyp
-SUBST_VARS.python=	PYTHONBIN
-
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	pre-configure
-SUBST_MESSAGE.man=	Fixing man path
-SUBST_FILES.man=	tools/install.py
-SUBST_VARS.man=		PKGMANDIR
-
 CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--shared-zlib
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index f841b53ec4d..6593e1c569d 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.53 2016/01/18 20:57:41 fhajny Exp $
+$NetBSD: distinfo,v 1.54 2016/01/21 11:45:30 fhajny Exp $
 
-SHA1 (node-v5.4.1.tar.gz) = 8055bb2bf30a44ed5aaf4b07e69709dd09ca3ebf
-RMD160 (node-v5.4.1.tar.gz) = 9bf4903fba85caf48a68076edbe22b2614b96608
-SHA512 (node-v5.4.1.tar.gz) = 84d96aaad905927bf8134b8dca5cc6a1cc6611a83e606665293c51edc82366f8ab9b301f919acfa065ca25eba2b3f20716d0f9fdd99ebd46930bcb1d8deb83b3
-Size (node-v5.4.1.tar.gz) = 22559624 bytes
+SHA1 (node-v5.5.0.tar.gz) = 2bc54d87d542953af5d43b3a0ef8fd64bfe305ad
+RMD160 (node-v5.5.0.tar.gz) = d274815054bb690e6c62e724d16a81d4633d2145
+SHA512 (node-v5.5.0.tar.gz) = de02714a12036ea674da5c76d8441bd0d9ccb9aa21a1c9fb08d469bec4432890625c047e50a9498da7ea803ba7cee81149cc00065cc6e536a5d638fc174ec402
+Size (node-v5.5.0.tar.gz) = 22632110 bytes
 SHA1 (patch-common.gypi) = 5b3a50617358637a6f910de28bb5a14f037317a6
 SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f
 SHA1 (patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 78d6ddd37ae30e869e0da666a78baad86a638c50
@@ -17,9 +17,8 @@ SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = eff609b75125dab536934
 SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = dd8cafadd2668f069dab8625f57fbd71a304db3e
 SHA1 (patch-deps_v8_src_log-utils.h) = 32bbf2de2af7a8ab6900a4d5e968dcc1357f6de2
 SHA1 (patch-deps_v8_src_types.h) = a15d1f13a577135a006e8ef0617c9476eb971fa3
-SHA1 (patch-deps_v8_tools_gyp_v8.gyp) = d80f4716f9f2b53357cbcbc6ad003c8541f57049
 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
 SHA1 (patch-src_cares__wrap.cc) = d9510afd0cd4b0156a604d9197d9f97d6e3b291f
 SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 132008f362ea696e43a4d19bf9d8a0ac754ef55c
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e
-SHA1 (patch-tools_install.py) = 5d60a30fdd412ae27972c645018df6448bd377dd
+SHA1 (patch-tools_install.py) = 5755e67dce5261b84e43acee281c7e8810708bb4
diff --git a/lang/nodejs/patches/patch-deps_v8_tools_gyp_v8.gyp b/lang/nodejs/patches/patch-deps_v8_tools_gyp_v8.gyp
deleted file mode 100644
index 2d6deea7e08..00000000000
--- a/lang/nodejs/patches/patch-deps_v8_tools_gyp_v8.gyp
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-deps_v8_tools_gyp_v8.gyp,v 1.3 2015/09/09 00:04:54 ryoon Exp $
-
-Fix path to Python.
-
---- deps/v8/tools/gyp/v8.gyp.orig	2015-09-08 15:30:44.000000000 +0000
-+++ deps/v8/tools/gyp/v8.gyp
-@@ -1696,14 +1696,14 @@
-                       '<(PRODUCT_DIR)/natives_blob_host.bin',
-                     ],
-                     'action': [
--                      'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
-+                      '@PYTHONBIN@', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
-                     ],
-                   }, {
-                     'outputs': [
-                       '<(PRODUCT_DIR)/natives_blob.bin',
-                     ],
-                     'action': [
--                      'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
-+                      '@PYTHONBIN@', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
-                     ],
-                   }],
-                 ],
-@@ -1712,7 +1712,7 @@
-                   '<(PRODUCT_DIR)/natives_blob.bin',
-                 ],
-                 'action': [
--                  'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
-+                  '@PYTHONBIN@', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
-                 ],
-               }],
-             ],
-@@ -1812,7 +1812,7 @@
-             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
-           ],
-           'action': [
--            'python',
-+            '@PYTHONBIN@',
-             '../../tools/js2c.py',
-             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
-             'CORE',
-@@ -1838,7 +1838,7 @@
-             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
-           ],
-           'action': [
--            'python',
-+            '@PYTHONBIN@',
-             '../../tools/js2c.py',
-             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
-             'EXPERIMENTAL',
-@@ -1863,7 +1863,7 @@
-             '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
-           ],
-           'action': [
--            'python',
-+            '@PYTHONBIN@',
-             '../../tools/js2c.py',
-             '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
-             'EXTRAS',
-@@ -1900,7 +1900,7 @@
-               '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
-             ],
-             'action': [
--              'python',
-+              '@PYTHONBIN@',
-               '../../tools/gen-postmortem-metadata.py',
-               '<@(_outputs)',
-               '<@(heapobject_files)'
diff --git a/lang/nodejs/patches/patch-tools_install.py b/lang/nodejs/patches/patch-tools_install.py
index 893f4f45cdd..8e9face11c4 100644
--- a/lang/nodejs/patches/patch-tools_install.py
+++ b/lang/nodejs/patches/patch-tools_install.py
@@ -1,18 +1,18 @@
-$NetBSD: patch-tools_install.py,v 1.3 2015/09/09 00:04:54 ryoon Exp $
+$NetBSD: patch-tools_install.py,v 1.4 2016/01/21 11:45:30 fhajny Exp $
 
 Install man pages under the right directory.
 
---- tools/install.py.orig	2015-09-08 15:30:49.000000000 +0000
+--- tools/install.py.orig	2016-01-21 01:08:27.000000000 +0000
 +++ tools/install.py
-@@ -141,9 +141,9 @@ def files(action):
+@@ -141,10 +141,7 @@ def files(action):
+ 
    action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
  
-   if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
+-  if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
 -    action(['doc/node.1'], 'man/man1/')
-+    action(['doc/node.1'], '@PKGMANDIR@/man1/')
-   else:
+-  else:
 -    action(['doc/node.1'], 'share/man/man1/')
-+    action(['doc/node.1'], '@PKGMANDIR@/man1/')
++  action(['doc/node.1'], os.environ.get('PKGMANDIR') + '/man1/')
  
    if 'true' == variables.get('node_install_npm'): npm_files(action)