3 files changed, 12 insertions, 58 deletions

diff --git a/www/npm/Makefile b/www/npm/Makefile
index bd6cadda1ab6..9996376a11cc 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	npm
-PORTVERSION=	4.5.0
+PORTVERSION=	4.6.1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/sunpoet
 
diff --git a/www/npm/distinfo b/www/npm/distinfo
index d873f102c387..c0a6de39c80f 100644
--- a/www/npm/distinfo
+++ b/www/npm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493554828
-SHA256 (npm-4.5.0.tar.xz) = f00fea2a4711a4dd5f79b779b5320a22b04c92fe15805ca3aa14f8a9d4da8a1f
-SIZE (npm-4.5.0.tar.xz) = 2700256
+TIMESTAMP = 1496253354
+SHA256 (npm-4.6.1.tar.xz) = 3cd977ab97e99b550b79a0923f8692256a53550d278768250c53eed9c15d6735
+SIZE (npm-4.6.1.tar.xz) = 2741108
diff --git a/www/npm/pkg-plist b/www/npm/pkg-plist
index 12aa2402dc0c..5446134e8934 100644
--- a/www/npm/pkg-plist
+++ b/www/npm/pkg-plist
@@ -328,6 +328,7 @@ lib/node_modules/npm/lib/utils/no-progress-while-running.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
+lib/node_modules/npm/lib/utils/perf.js
 lib/node_modules/npm/lib/utils/pick-manifest-from-registry-metadata.js
 lib/node_modules/npm/lib/utils/pulse-till-done.js
 lib/node_modules/npm/lib/utils/read-local-package.js
@@ -820,15 +821,9 @@ lib/node_modules/npm/node_modules/ini/LICENSE
 lib/node_modules/npm/node_modules/ini/README.md
 lib/node_modules/npm/node_modules/ini/ini.js
 lib/node_modules/npm/node_modules/ini/package.json
-lib/node_modules/npm/node_modules/init-package-json/.npmignore
-lib/node_modules/npm/node_modules/init-package-json/.travis.yml
 lib/node_modules/npm/node_modules/init-package-json/LICENSE
 lib/node_modules/npm/node_modules/init-package-json/README.md
 lib/node_modules/npm/node_modules/init-package-json/default-input.js
-lib/node_modules/npm/node_modules/init-package-json/example/example-basic.js
-lib/node_modules/npm/node_modules/init-package-json/example/example-default.js
-lib/node_modules/npm/node_modules/init-package-json/example/example-npm.js
-lib/node_modules/npm/node_modules/init-package-json/example/init/basic-init.js
 lib/node_modules/npm/node_modules/init-package-json/init-package-json.js
 lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/.npmignore
 lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/LICENSE
@@ -853,19 +848,6 @@ lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/test/s
 lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/test/validate.input
 lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/test/validate.js
 lib/node_modules/npm/node_modules/init-package-json/package.json
-lib/node_modules/npm/node_modules/init-package-json/test/basic.input
-lib/node_modules/npm/node_modules/init-package-json/test/basic.js
-lib/node_modules/npm/node_modules/init-package-json/test/dependencies.js
-lib/node_modules/npm/node_modules/init-package-json/test/lib/common.js
-lib/node_modules/npm/node_modules/init-package-json/test/license.js
-lib/node_modules/npm/node_modules/init-package-json/test/name-spaces.js
-lib/node_modules/npm/node_modules/init-package-json/test/name-uppercase.js
-lib/node_modules/npm/node_modules/init-package-json/test/npm-defaults.js
-lib/node_modules/npm/node_modules/init-package-json/test/scope-in-config-existing-name.js
-lib/node_modules/npm/node_modules/init-package-json/test/scope-in-config.js
-lib/node_modules/npm/node_modules/init-package-json/test/scope.js
-lib/node_modules/npm/node_modules/init-package-json/test/silent.js
-lib/node_modules/npm/node_modules/init-package-json/test/yes-defaults.js
 lib/node_modules/npm/node_modules/lazy-property/.npmignore
 lib/node_modules/npm/node_modules/lazy-property/LICENSE
 lib/node_modules/npm/node_modules/lazy-property/README.md
@@ -1282,8 +1264,6 @@ lib/node_modules/npm/node_modules/normalize-git-url/normalize-git-url.js
 lib/node_modules/npm/node_modules/normalize-git-url/package.json
 lib/node_modules/npm/node_modules/normalize-git-url/test/basic.js
 lib/node_modules/npm/node_modules/normalize-git-url/test/basic.js~
-lib/node_modules/npm/node_modules/normalize-package-data/.npmignore
-lib/node_modules/npm/node_modules/normalize-package-data/.travis.yml
 lib/node_modules/npm/node_modules/normalize-package-data/AUTHORS
 lib/node_modules/npm/node_modules/normalize-package-data/LICENSE
 lib/node_modules/npm/node_modules/normalize-package-data/README.md
@@ -1305,28 +1285,6 @@ 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/normalize-package-data/test/basic.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/consistency.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/dependencies.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/async.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/badscripts.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/bcrypt.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/coffee-script.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/http-server.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/movefile.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/no-description.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/node-module_exist.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/npm.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/read-package-json.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/request.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/fixtures/underscore.json
-lib/node_modules/npm/node_modules/normalize-package-data/test/github-urls.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/mixedcase-names.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/normalize.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/scoped.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/scripts.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/strict.js
-lib/node_modules/npm/node_modules/normalize-package-data/test/typo.js
 lib/node_modules/npm/node_modules/npm-cache-filename/LICENSE
 lib/node_modules/npm/node_modules/npm-cache-filename/README.md
 lib/node_modules/npm/node_modules/npm-cache-filename/index.js
@@ -1397,7 +1355,6 @@ lib/node_modules/npm/node_modules/npmlog/CHANGELOG.md
 lib/node_modules/npm/node_modules/npmlog/LICENSE
 lib/node_modules/npm/node_modules/npmlog/README.md
 lib/node_modules/npm/node_modules/npmlog/log.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/.npmignore
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/CHANGES.md
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/LICENSE
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md
@@ -1411,10 +1368,6 @@ lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modu
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/test/index.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
-lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/lib/test-event.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/tracker.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackerstream.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker-base.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker-group.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker-stream.js
@@ -1430,7 +1383,6 @@ lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/base-theme.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/error.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/has-color.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/index.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/.bin/supports-color
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/license
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/package.json
@@ -1457,10 +1409,6 @@ lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/readme.md
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/package.json
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/readme.md
-lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/cli.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/index.js
-lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/package.json
-lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/readme.md
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/.npmignore
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/LICENSE
 lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/README.md
@@ -1611,6 +1559,7 @@ lib/node_modules/npm/node_modules/readable-stream/GOVERNANCE.md
 lib/node_modules/npm/node_modules/readable-stream/LICENSE
 lib/node_modules/npm/node_modules/readable-stream/README.md
 lib/node_modules/npm/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
+lib/node_modules/npm/node_modules/readable-stream/duplex-browser.js
 lib/node_modules/npm/node_modules/readable-stream/duplex.js
 lib/node_modules/npm/node_modules/readable-stream/lib/_stream_duplex.js
 lib/node_modules/npm/node_modules/readable-stream/lib/_stream_passthrough.js
@@ -1618,6 +1567,8 @@ lib/node_modules/npm/node_modules/readable-stream/lib/_stream_readable.js
 lib/node_modules/npm/node_modules/readable-stream/lib/_stream_transform.js
 lib/node_modules/npm/node_modules/readable-stream/lib/_stream_writable.js
 lib/node_modules/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js
+lib/node_modules/npm/node_modules/readable-stream/lib/internal/streams/stream-browser.js
+lib/node_modules/npm/node_modules/readable-stream/lib/internal/streams/stream.js
 lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/index.js
 lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/license.md
 lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/package.json
@@ -1645,7 +1596,7 @@ lib/node_modules/npm/node_modules/readable-stream/node_modules/process-nextick-a
 lib/node_modules/npm/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 lib/node_modules/npm/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 lib/node_modules/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
-lib/node_modules/npm/node_modules/readable-stream/node_modules/string_decoder/index.js
+lib/node_modules/npm/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js
 lib/node_modules/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
 lib/node_modules/npm/node_modules/readable-stream/node_modules/util-deprecate/History.md
 lib/node_modules/npm/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
@@ -1655,8 +1606,10 @@ lib/node_modules/npm/node_modules/readable-stream/node_modules/util-deprecate/no
 lib/node_modules/npm/node_modules/readable-stream/node_modules/util-deprecate/package.json
 lib/node_modules/npm/node_modules/readable-stream/package.json
 lib/node_modules/npm/node_modules/readable-stream/passthrough.js
+lib/node_modules/npm/node_modules/readable-stream/readable-browser.js
 lib/node_modules/npm/node_modules/readable-stream/readable.js
 lib/node_modules/npm/node_modules/readable-stream/transform.js
+lib/node_modules/npm/node_modules/readable-stream/writable-browser.js
 lib/node_modules/npm/node_modules/readable-stream/writable.js
 lib/node_modules/npm/node_modules/readdir-scoped-modules/.travis.yml
 lib/node_modules/npm/node_modules/readdir-scoped-modules/LICENSE
@@ -3210,6 +3163,7 @@ lib/node_modules/npm/test/tap/update-symlink.js
 lib/node_modules/npm/test/tap/upgrade-lifecycles.js
 lib/node_modules/npm/test/tap/url-dependencies.js
 lib/node_modules/npm/test/tap/verify-no-lifecycle-on-repo.js
+lib/node_modules/npm/test/tap/version-allow-same-version.js
 lib/node_modules/npm/test/tap/version-from-git.js
 lib/node_modules/npm/test/tap/version-git-not-clean.js
 lib/node_modules/npm/test/tap/version-lifecycle.js