Update lang/npm to 6.1.0.

- NEW FEATURE: npm audit fix
- OTHER NEW audit FEATURES
  - Add support for npm audit --json to print the report in JSON
    format.
  - Include number of audited packages in npm install summary output.
  - Overhaul audit install and detail output format.
- NEW FEATURE: GIT DEPS AND npm init <pkg>!
- FIX WRITE AFTER END ERROR
- DETECT CHANGES IN GIT SPECIFIERS
- OTHER BUGFIXES
  - When requesting the update of a direct dependency that was also a
    transitive dependency to a version incompatible with the
    transitive requirement and you had a lock-file but did not have a
    node_modules folder then npm would fail to provide a new copy of the
    transitive dependency, resulting in an invalid lock-file that could
    not self heal.
  - Cleanup output of npm ci summary report.
  - Node.js now has a test that scans for things that look like
    conflict markers in source code. This was triggering false
    positives on a fixture in a test of npm's ability to heal lockfiles
    with conflicts in them.
  - Make the new npm view work when the license field is an object
    instead of a string.
  - Add support for environments (like Docker) where the expected
    binary for opening external URLs is not available.
  - Fix a spurious colon in the new update notifier message and add
    support for the npm canary.
  - Infer a version range when a package.json has a dist-tag instead
    of a version range in one of its dependency specs. Previously,
    this would cause dependencies to be flagged as invalid.
  - Make sure scoped bundled deps are shown in the new publish
    preview, too.
  - Stop dropping size from metadata on npm cache verify.
  - Fix nested command aliases.
  - Make sure different versions of the Path env var on Windows all
    get node_modules/.bin prepended when running lifecycle scripts.

3 files changed, 19 insertions, 27 deletions

diff --git a/lang/npm/Makefile b/lang/npm/Makefile
index 901db7fe067..de7448ca2b9 100644
--- a/lang/npm/Makefile
+++ b/lang/npm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/05/11 09:37:13 adam Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/24 14:14:43 fhajny Exp $
 
-DISTNAME=	npm-6.0.1
+DISTNAME=	npm-6.1.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=npm/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/lang/npm/PLIST b/lang/npm/PLIST
index 7a158ae4d3f..e824b365307 100644
--- a/lang/npm/PLIST
+++ b/lang/npm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/05/11 09:37:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/05/24 14:14:43 fhajny Exp $
 bin/npm
 bin/npx
 lib/node_modules/npm/.github/CODEOWNERS
@@ -360,6 +360,7 @@ lib/node_modules/npm/lib/utils/metrics.js
 lib/node_modules/npm/lib/utils/module-name.js
 lib/node_modules/npm/lib/utils/move.js
 lib/node_modules/npm/lib/utils/no-progress-while-running.js
+lib/node_modules/npm/lib/utils/open-url.js
 lib/node_modules/npm/lib/utils/output.js
 lib/node_modules/npm/lib/utils/package-id.js
 lib/node_modules/npm/lib/utils/parse-json.js
@@ -3277,10 +3278,9 @@ lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin
 lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
 lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/readme.md
 lib/node_modules/npm/node_modules/normalize-package-data/package.json
-lib/node_modules/npm/node_modules/npm-audit-report/.travis.yml
+lib/node_modules/npm/node_modules/npm-audit-report/CHANGELOG.md
 lib/node_modules/npm/node_modules/npm-audit-report/LICENSE
 lib/node_modules/npm/node_modules/npm-audit-report/README.md
-lib/node_modules/npm/node_modules/npm-audit-report/appveyor.yml
 lib/node_modules/npm/node_modules/npm-audit-report/index.js
 lib/node_modules/npm/node_modules/npm-audit-report/lib/utils.js
 lib/node_modules/npm/node_modules/npm-audit-report/node_modules/console-control-strings/LICENSE
@@ -3529,7 +3529,6 @@ lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/nod
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-cache-semantics/README.md
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-cache-semantics/node4/index.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-cache-semantics/package.json
-lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/.npmignore
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/.travis.yml
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/History.md
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/README.md
@@ -3581,7 +3580,6 @@ lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/nod
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/LICENSE
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/Makefile
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/README.md
-lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/component.json
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/karma.conf.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/node.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/node_modules/ms/index.js
@@ -3592,7 +3590,6 @@ lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/nod
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/src/browser.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/src/debug.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/src/index.js
-lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/src/inspector-log.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/node_modules/debug/src/node.js
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/package.json
 lib/node_modules/npm/node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/http-proxy-agent/test/ssl-cert-snakeoil.key
@@ -4974,6 +4971,14 @@ lib/node_modules/npm/node_modules/pacote/node_modules/minimatch/node_modules/bra
 lib/node_modules/npm/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
 lib/node_modules/npm/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/package.json
 lib/node_modules/npm/node_modules/pacote/node_modules/minimatch/package.json
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/README.md
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/index.js
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/node_modules/yallist/LICENSE
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/node_modules/yallist/README.md
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/node_modules/yallist/iterator.js
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/node_modules/yallist/package.json
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/node_modules/yallist/yallist.js
+lib/node_modules/npm/node_modules/pacote/node_modules/minipass/package.json
 lib/node_modules/npm/node_modules/pacote/node_modules/promise-retry/.editorconfig
 lib/node_modules/npm/node_modules/pacote/node_modules/promise-retry/.npmignore
 lib/node_modules/npm/node_modules/pacote/node_modules/promise-retry/.travis.yml
@@ -5225,8 +5230,6 @@ 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/.tern-port
 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
@@ -5717,13 +5720,6 @@ lib/node_modules/npm/node_modules/request/node_modules/qs/test/index.js
 lib/node_modules/npm/node_modules/request/node_modules/qs/test/parse.js
 lib/node_modules/npm/node_modules/request/node_modules/qs/test/stringify.js
 lib/node_modules/npm/node_modules/request/node_modules/qs/test/utils.js
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/.npmignore
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/.travis.yml
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/LICENSE.txt
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/README.md
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/example.js
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/package.json
-lib/node_modules/npm/node_modules/request/node_modules/stringstream/stringstream.js
 lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/LICENSE
 lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/README.md
 lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
@@ -5898,11 +5894,6 @@ lib/node_modules/npm/node_modules/tar/node_modules/minizlib/README.md
 lib/node_modules/npm/node_modules/tar/node_modules/minizlib/constants.js
 lib/node_modules/npm/node_modules/tar/node_modules/minizlib/index.js
 lib/node_modules/npm/node_modules/tar/node_modules/minizlib/package.json
-lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/LICENSE
-lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/README.md
-lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/index.d.ts
-lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/index.js
-lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/package.json
 lib/node_modules/npm/node_modules/tar/node_modules/yallist/LICENSE
 lib/node_modules/npm/node_modules/tar/node_modules/yallist/README.md
 lib/node_modules/npm/node_modules/tar/node_modules/yallist/iterator.js
@@ -6552,3 +6543,4 @@ man/man7/npm-scope.7
 man/man7/npm-scripts.7
 man/man7/removing-npm.7
 man/man7/semver.7
+@pkgdir share
diff --git a/lang/npm/distinfo b/lang/npm/distinfo
index 9767a22b87a..07debc8aaa8 100644
--- a/lang/npm/distinfo
+++ b/lang/npm/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2018/05/11 09:37:13 adam Exp $
+$NetBSD: distinfo,v 1.6 2018/05/24 14:14:43 fhajny Exp $
 
 SHA1 (marked-0.3.19.tar.gz) = d30691ac399f05d156f40a0a893ce7a2a7f6c5be
 RMD160 (marked-0.3.19.tar.gz) = e78a28dfaf5fc1039e48f63228f892fa24a13e6f
 SHA512 (marked-0.3.19.tar.gz) = ea518863a27a07034568b0f7a3b2cd2c1ecb8d208472af0fbfa883f59662b7212d73828d67b7d0ccde7be4f706679f88190d26545ecc72965a112ee35518a55a
 Size (marked-0.3.19.tar.gz) = 100673 bytes
-SHA1 (npm-6.0.1.tar.gz) = 16a6ed04bcaf1306c745c4d0c3864ffbda69558c
-RMD160 (npm-6.0.1.tar.gz) = 261a3626464cd5c47420a99f5fa0a5d1b48196f9
-SHA512 (npm-6.0.1.tar.gz) = 91517ba68a13ea7341a2f24b2aafdaf85ba8f2190e1915b729b49f0189fa3551547576d11413ad12bcc4b594df979bc799e2990093da6229eb7047eee1a0ecca
-Size (npm-6.0.1.tar.gz) = 8570368 bytes
+SHA1 (npm-6.1.0.tar.gz) = 231e68aac9f69eacac41b74521de55edaeae247b
+RMD160 (npm-6.1.0.tar.gz) = 406ca2a8f0a4d77fbd16c57c1e90ff50c5a8dee4
+SHA512 (npm-6.1.0.tar.gz) = 8c44e462965ea1ca93f76a34b98726eb20123c127fda8a19643cb2345d612381e94e2741fcdbe814ccf3c73069ecdc89412d8963d2b4f0fb67a8c45bb6f1d85c
+Size (npm-6.1.0.tar.gz) = 8579329 bytes
 SHA1 (patch-Makefile) = 29b3e9515ee2a45f3b12c116075c00faca73d270
 SHA1 (patch-node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 291e079fb48caea7501ab864c19ef26672b76bc5
 SHA1 (patch-node__modules_node-gyp_gyp_pylib_gyp_xcode__emulation.py) = 7f9f5cd8aadafd309ba8dfb27f96fe8fa56a8af8