Update lang/nodejs to 5.8.0. Clean stale bits from options.mk.

Changes since 5.7.1:
- child_process: send() now accepts an options parameter
- constants: ENGINE_METHOD_RSA is now correctly exposed
- Fixed two regressions which originated in v5.7.0:
  - http: Errors inside of http client callbacks now propagate
    correctly
  - path: Fixed normalization of absolute paths
- repl: start() no longer requires an options parameter
- util: Improved format() performance 50-300%

4 files changed, 59 insertions, 29 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index fc015cf7f10..47e0ab036eb 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2016/03/05 11:28:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.60 2016/03/09 20:13:23 fhajny Exp $
 
-DISTNAME=	node-v5.7.1
+DISTNAME=	node-v5.8.0
 
-PKGREVISION= 1
 .include "../../lang/nodejs/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nodejs/PLIST b/lang/nodejs/PLIST
index 649590f0c9e..641adf8d377 100644
--- a/lang/nodejs/PLIST
+++ b/lang/nodejs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2016/02/23 11:23:32 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.32 2016/03/09 20:13:23 fhajny Exp $
 bin/node
 bin/npm
 include/node/android-ifaddrs.h
@@ -463,13 +463,6 @@ lib/node_modules/npm/node_modules/cmd-shim/.travis.yml
 lib/node_modules/npm/node_modules/cmd-shim/LICENSE
 lib/node_modules/npm/node_modules/cmd-shim/README.md
 lib/node_modules/npm/node_modules/cmd-shim/index.js
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/.npmignore
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/LICENSE
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/README.md
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/fs.js
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/graceful-fs.js
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/package.json
-lib/node_modules/npm/node_modules/cmd-shim/node_modules/graceful-fs/polyfills.js
 lib/node_modules/npm/node_modules/cmd-shim/package.json
 lib/node_modules/npm/node_modules/columnify/LICENSE
 lib/node_modules/npm/node_modules/columnify/Makefile
@@ -750,6 +743,10 @@ lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._basefor/
 lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._basefor/README.md
 lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._basefor/index.js
 lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._basefor/package.json
+lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._root/LICENSE
+lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._root/README.md
+lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._root/index.js
+lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._root/package.json
 lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._stack/LICENSE
 lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._stack/README.md
 lib/node_modules/npm/node_modules/lodash.clonedeep/node_modules/lodash._stack/index.js
@@ -794,6 +791,10 @@ lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._cachehas/LIC
 lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._cachehas/README.md
 lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._cachehas/index.js
 lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._cachehas/package.json
+lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._root/LICENSE
+lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._root/README.md
+lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._root/index.js
+lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._root/package.json
 lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._setcache/LICENSE
 lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._setcache/README.md
 lib/node_modules/npm/node_modules/lodash.union/node_modules/lodash._setcache/index.js
@@ -822,6 +823,10 @@ lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._cachehas/LICE
 lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._cachehas/README.md
 lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._cachehas/index.js
 lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._cachehas/package.json
+lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._root/LICENSE
+lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._root/README.md
+lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._root/index.js
+lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._root/package.json
 lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._setcache/LICENSE
 lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._setcache/README.md
 lib/node_modules/npm/node_modules/lodash.uniq/node_modules/lodash._setcache/index.js
@@ -1648,6 +1653,16 @@ lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream
 lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/readme.markdown
 lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
 lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/.npmignore
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/License
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/Makefile
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/README.md
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/equation.gif
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/example/dns.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/index.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/lib/retry.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/lib/retry_operation.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/package.json
 lib/node_modules/npm/node_modules/npm-registry-client/package.json
 lib/node_modules/npm/node_modules/npm-user-validate/.npmignore
 lib/node_modules/npm/node_modules/npm-user-validate/.travis.yml
@@ -1678,6 +1693,7 @@ lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/index.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/.npmignore
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/History.md
+lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/License
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Makefile
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Readme.md
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js
@@ -1886,6 +1902,20 @@ lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/LICENSE
 lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/README.md
 lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/index.js
 lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/package.json
+lib/node_modules/npm/node_modules/request/node_modules/aws4/.npmignore
+lib/node_modules/npm/node_modules/request/node_modules/aws4/.travis.yml
+lib/node_modules/npm/node_modules/request/node_modules/aws4/LICENSE
+lib/node_modules/npm/node_modules/request/node_modules/aws4/README.md
+lib/node_modules/npm/node_modules/request/node_modules/aws4/aws4.js
+lib/node_modules/npm/node_modules/request/node_modules/aws4/example.js
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/.npmignore
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/.travis.yml
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/CONTRIBUTORS
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/LICENSE
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/README.md
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/lib/lru-cache.js
+lib/node_modules/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache/package.json
+lib/node_modules/npm/node_modules/request/node_modules/aws4/package.json
 lib/node_modules/npm/node_modules/request/node_modules/bl/.jshintrc
 lib/node_modules/npm/node_modules/request/node_modules/bl/.npmignore
 lib/node_modules/npm/node_modules/request/node_modules/bl/.travis.yml
@@ -2098,6 +2128,8 @@ lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/parser
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/signer.js
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/utils.js
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/verify.js
+lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/AUTHORS
+lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/CHANGES.md
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/README.md
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/assert.js
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
@@ -2204,11 +2236,6 @@ lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modul
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/tst/ber/reader.test.js
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/tst/ber/writer.test.js
-lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/AUTHORS
-lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/CHANGES.md
-lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/README.md
-lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/assert.js
-lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/package.json
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/README.md
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/etc/dashdash.bash_completion.in
 lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/lib/dashdash.js
@@ -2481,6 +2508,7 @@ lib/node_modules/npm/node_modules/validate-npm-package-name/node_modules/builtin
 lib/node_modules/npm/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
 lib/node_modules/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
 lib/node_modules/npm/node_modules/validate-npm-package-name/package.json
+lib/node_modules/npm/node_modules/which/.npmignore
 lib/node_modules/npm/node_modules/which/.travis.yml
 lib/node_modules/npm/node_modules/which/LICENSE
 lib/node_modules/npm/node_modules/which/README.md
@@ -2493,6 +2521,13 @@ lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is
 lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js
 lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json
 lib/node_modules/npm/node_modules/which/node_modules/is-absolute/package.json
+lib/node_modules/npm/node_modules/which/node_modules/isexe/.npmignore
+lib/node_modules/npm/node_modules/which/node_modules/isexe/README.md
+lib/node_modules/npm/node_modules/which/node_modules/isexe/access.js
+lib/node_modules/npm/node_modules/which/node_modules/isexe/index.js
+lib/node_modules/npm/node_modules/which/node_modules/isexe/mode.js
+lib/node_modules/npm/node_modules/which/node_modules/isexe/package.json
+lib/node_modules/npm/node_modules/which/node_modules/isexe/windows.js
 lib/node_modules/npm/node_modules/which/package.json
 lib/node_modules/npm/node_modules/which/which.js
 lib/node_modules/npm/node_modules/wrappy/LICENSE
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index 8d45554a339..36129514e42 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2016/03/03 11:54:28 fhajny Exp $
+$NetBSD: distinfo,v 1.58 2016/03/09 20:13:23 fhajny Exp $
 
-SHA1 (node-v5.7.1.tar.gz) = bd7825efe70b5f82b4a34df17f9f1826d490213d
-RMD160 (node-v5.7.1.tar.gz) = 194fa74e1366149306c20de711463d4b499d752b
-SHA512 (node-v5.7.1.tar.gz) = 3702ef0a4cba9c106ece330ce81291b17d3ca1216efd486fc2a97ce1d0baaf0d457bce4f261d1af5898369b6a040c35cf64a6185cb54374e6417ad445580b937
-Size (node-v5.7.1.tar.gz) = 22393987 bytes
+SHA1 (node-v5.8.0.tar.gz) = e448f9141c92f8f1a72c3e3da0763dc5a602caef
+RMD160 (node-v5.8.0.tar.gz) = ccd627c09235069ebf4c2a8c929b4bee6b585d84
+SHA512 (node-v5.8.0.tar.gz) = 67ba531b2f32b153d4b48996090f6564d4bc2857fdd78f7d77d5d20b35d2506515f124aa7d752e8a87bc1fb402daca7f15cc885e151b79f3127d15faf0653d5b
+Size (node-v5.8.0.tar.gz) = 22440294 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
diff --git a/lang/nodejs/options.mk b/lang/nodejs/options.mk
index 6e21fa57fd4..d2bcca2ccb2 100644
--- a/lang/nodejs/options.mk
+++ b/lang/nodejs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2015/09/09 00:04:54 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2016/03/09 20:13:23 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.node
 PKG_SUPPORTED_OPTIONS=	openssl dtrace icu
@@ -11,11 +11,11 @@ PKG_SUGGESTED_OPTIONS+=	dtrace
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	dtrace
+PLIST_VARS+=		dtrace
 
 .if !empty(PKG_OPTIONS:Mdtrace)
 CONFIGURE_ARGS+=	--with-dtrace
-PLIST.dtrace=	yes
+PLIST.dtrace=		yes
 .else
 CONFIGURE_ARGS+=	--without-dtrace
 .endif
@@ -30,9 +30,5 @@ BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.2
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--shared-openssl
 .else
-CONFIGURE_ARGS+=	--without-openssl
-.endif
-
-.if empty(PKG_OPTIONS:Msnapshot)
-CONFIGURE_ARGS+=	--without-snapshot
+CONFIGURE_ARGS+=	--without-ssl
 .endif