npm: updated to 6.13.1

v6.13.1:
fix(fund): support funding string shorthand
should not publish tap-snapshot folder
Add preliminary WSL support for npm and npx
print quick audit report for human output

v6.13.0:
add fund command
delete ps1 files on package removal
update supported node list to remove v6.0, v6.1, v9.0 - v9.2

v6.12.1:
add node v13 as a supported version
Fix regression in lockfile repair for sub-deps
resolve circular dependency in pack.js

v6.12.0:
Now npm ci runs prepare scripts for git dependencies, and respects the --no-optional argument. Warnings for engine mismatches are printed again. Various other fixes and cleanups.

5 files changed, 212 insertions, 257 deletions

diff --git a/lang/npm/Makefile b/lang/npm/Makefile
index 44e48bbdaec..a331d4840c4 100644
--- a/lang/npm/Makefile
+++ b/lang/npm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:21:22 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/24 20:21:23 adam Exp $
 
-DISTNAME=	cli-6.10.3
+DISTNAME=	cli-6.13.1
 PKGNAME=	${DISTNAME:S/cli/npm/}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=npm/}
 GITHUB_PROJECT=	cli
@@ -16,7 +15,7 @@ LICENSE=	artistic-2.0
 # Pre-fetch marked so that man pages can be built offline
 MARKED=			marked-0.7.0
 DISTFILES+=		${DISTNAME}${EXTRACT_SUFX} ${MARKED}.tar.gz
-SITES.${MARKED}.tar.gz=	-https://github.com/markedjs/marked/archive/v${MARKED:S/marked-//}.tar.gz
+SITES.${MARKED}.tar.gz=	${MASTER_SITE_GITHUB:S,^,-,:=markedjs/marked/archive/v${MARKED:S/marked-//}.tar.gz}
 
 DEPENDS+=	nodejs-[0-9]*:../../lang/nodejs
 
diff --git a/lang/npm/PLIST b/lang/npm/PLIST
index 693d6955d7e..15f7912fc1e 100644
--- a/lang/npm/PLIST
+++ b/lang/npm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/08/07 07:34:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/11/24 20:21:23 adam Exp $
 bin/npm
 bin/npx
 lib/node_modules/npm/.licensee.json
@@ -26,167 +26,133 @@ lib/node_modules/npm/changelogs/CHANGELOG-3.md
 lib/node_modules/npm/changelogs/CHANGELOG-4.md
 lib/node_modules/npm/changelogs/CHANGELOG-5.md
 lib/node_modules/npm/configure
-lib/node_modules/npm/doc/cli/npm-access.md
-lib/node_modules/npm/doc/cli/npm-adduser.md
-lib/node_modules/npm/doc/cli/npm-audit.md
-lib/node_modules/npm/doc/cli/npm-bin.md
-lib/node_modules/npm/doc/cli/npm-bugs.md
-lib/node_modules/npm/doc/cli/npm-build.md
-lib/node_modules/npm/doc/cli/npm-bundle.md
-lib/node_modules/npm/doc/cli/npm-cache.md
-lib/node_modules/npm/doc/cli/npm-ci.md
-lib/node_modules/npm/doc/cli/npm-completion.md
-lib/node_modules/npm/doc/cli/npm-config.md
-lib/node_modules/npm/doc/cli/npm-dedupe.md
-lib/node_modules/npm/doc/cli/npm-deprecate.md
-lib/node_modules/npm/doc/cli/npm-dist-tag.md
-lib/node_modules/npm/doc/cli/npm-docs.md
-lib/node_modules/npm/doc/cli/npm-doctor.md
-lib/node_modules/npm/doc/cli/npm-edit.md
-lib/node_modules/npm/doc/cli/npm-explore.md
-lib/node_modules/npm/doc/cli/npm-help-search.md
-lib/node_modules/npm/doc/cli/npm-help.md
-lib/node_modules/npm/doc/cli/npm-hook.md
-lib/node_modules/npm/doc/cli/npm-init.md
-lib/node_modules/npm/doc/cli/npm-install-ci-test.md
-lib/node_modules/npm/doc/cli/npm-install-test.md
-lib/node_modules/npm/doc/cli/npm-install.md
-lib/node_modules/npm/doc/cli/npm-link.md
-lib/node_modules/npm/doc/cli/npm-logout.md
-lib/node_modules/npm/doc/cli/npm-ls.md
-lib/node_modules/npm/doc/cli/npm-org.md
-lib/node_modules/npm/doc/cli/npm-outdated.md
-lib/node_modules/npm/doc/cli/npm-owner.md
-lib/node_modules/npm/doc/cli/npm-pack.md
-lib/node_modules/npm/doc/cli/npm-ping.md
-lib/node_modules/npm/doc/cli/npm-prefix.md
-lib/node_modules/npm/doc/cli/npm-profile.md
-lib/node_modules/npm/doc/cli/npm-prune.md
-lib/node_modules/npm/doc/cli/npm-publish.md
-lib/node_modules/npm/doc/cli/npm-rebuild.md
-lib/node_modules/npm/doc/cli/npm-repo.md
-lib/node_modules/npm/doc/cli/npm-restart.md
-lib/node_modules/npm/doc/cli/npm-root.md
-lib/node_modules/npm/doc/cli/npm-run-script.md
-lib/node_modules/npm/doc/cli/npm-search.md
-lib/node_modules/npm/doc/cli/npm-shrinkwrap.md
-lib/node_modules/npm/doc/cli/npm-star.md
-lib/node_modules/npm/doc/cli/npm-stars.md
-lib/node_modules/npm/doc/cli/npm-start.md
-lib/node_modules/npm/doc/cli/npm-stop.md
-lib/node_modules/npm/doc/cli/npm-team.md
-lib/node_modules/npm/doc/cli/npm-test.md
-lib/node_modules/npm/doc/cli/npm-token.md
-lib/node_modules/npm/doc/cli/npm-uninstall.md
-lib/node_modules/npm/doc/cli/npm-unpublish.md
-lib/node_modules/npm/doc/cli/npm-update.md
-lib/node_modules/npm/doc/cli/npm-version.md
-lib/node_modules/npm/doc/cli/npm-view.md
-lib/node_modules/npm/doc/cli/npm-whoami.md
-lib/node_modules/npm/doc/cli/npm.md
-lib/node_modules/npm/doc/files/npm-folders.md
-lib/node_modules/npm/doc/files/npm-package-locks.md
-lib/node_modules/npm/doc/files/npm-shrinkwrap.json.md
-lib/node_modules/npm/doc/files/npmrc.md
-lib/node_modules/npm/doc/files/package-lock.json.md
-lib/node_modules/npm/doc/files/package.json.md
-lib/node_modules/npm/doc/misc/npm-coding-style.md
-lib/node_modules/npm/doc/misc/npm-config.md
-lib/node_modules/npm/doc/misc/npm-developers.md
-lib/node_modules/npm/doc/misc/npm-disputes.md
-lib/node_modules/npm/doc/misc/npm-index.md
-lib/node_modules/npm/doc/misc/npm-orgs.md
-lib/node_modules/npm/doc/misc/npm-registry.md
-lib/node_modules/npm/doc/misc/npm-scope.md
-lib/node_modules/npm/doc/misc/npm-scripts.md
-lib/node_modules/npm/doc/misc/removing-npm.md
-lib/node_modules/npm/doc/misc/semver.md
-lib/node_modules/npm/doc/spec/file-specifiers.md
-lib/node_modules/npm/doc/spec/package-lock.md
-lib/node_modules/npm/html/doc/README.html
-lib/node_modules/npm/html/doc/cli/npm-access.html
-lib/node_modules/npm/html/doc/cli/npm-adduser.html
-lib/node_modules/npm/html/doc/cli/npm-audit.html
-lib/node_modules/npm/html/doc/cli/npm-bin.html
-lib/node_modules/npm/html/doc/cli/npm-bugs.html
-lib/node_modules/npm/html/doc/cli/npm-build.html
-lib/node_modules/npm/html/doc/cli/npm-bundle.html
-lib/node_modules/npm/html/doc/cli/npm-cache.html
-lib/node_modules/npm/html/doc/cli/npm-ci.html
-lib/node_modules/npm/html/doc/cli/npm-completion.html
-lib/node_modules/npm/html/doc/cli/npm-config.html
-lib/node_modules/npm/html/doc/cli/npm-dedupe.html
-lib/node_modules/npm/html/doc/cli/npm-deprecate.html
-lib/node_modules/npm/html/doc/cli/npm-dist-tag.html
-lib/node_modules/npm/html/doc/cli/npm-docs.html
-lib/node_modules/npm/html/doc/cli/npm-doctor.html
-lib/node_modules/npm/html/doc/cli/npm-edit.html
-lib/node_modules/npm/html/doc/cli/npm-explore.html
-lib/node_modules/npm/html/doc/cli/npm-help-search.html
-lib/node_modules/npm/html/doc/cli/npm-help.html
-lib/node_modules/npm/html/doc/cli/npm-hook.html
-lib/node_modules/npm/html/doc/cli/npm-init.html
-lib/node_modules/npm/html/doc/cli/npm-install-ci-test.html
-lib/node_modules/npm/html/doc/cli/npm-install-test.html
-lib/node_modules/npm/html/doc/cli/npm-install.html
-lib/node_modules/npm/html/doc/cli/npm-link.html
-lib/node_modules/npm/html/doc/cli/npm-logout.html
-lib/node_modules/npm/html/doc/cli/npm-ls.html
-lib/node_modules/npm/html/doc/cli/npm-org.html
-lib/node_modules/npm/html/doc/cli/npm-outdated.html
-lib/node_modules/npm/html/doc/cli/npm-owner.html
-lib/node_modules/npm/html/doc/cli/npm-pack.html
-lib/node_modules/npm/html/doc/cli/npm-ping.html
-lib/node_modules/npm/html/doc/cli/npm-prefix.html
-lib/node_modules/npm/html/doc/cli/npm-profile.html
-lib/node_modules/npm/html/doc/cli/npm-prune.html
-lib/node_modules/npm/html/doc/cli/npm-publish.html
-lib/node_modules/npm/html/doc/cli/npm-rebuild.html
-lib/node_modules/npm/html/doc/cli/npm-repo.html
-lib/node_modules/npm/html/doc/cli/npm-restart.html
-lib/node_modules/npm/html/doc/cli/npm-root.html
-lib/node_modules/npm/html/doc/cli/npm-run-script.html
-lib/node_modules/npm/html/doc/cli/npm-search.html
-lib/node_modules/npm/html/doc/cli/npm-shrinkwrap.html
-lib/node_modules/npm/html/doc/cli/npm-star.html
-lib/node_modules/npm/html/doc/cli/npm-stars.html
-lib/node_modules/npm/html/doc/cli/npm-start.html
-lib/node_modules/npm/html/doc/cli/npm-stop.html
-lib/node_modules/npm/html/doc/cli/npm-team.html
-lib/node_modules/npm/html/doc/cli/npm-test.html
-lib/node_modules/npm/html/doc/cli/npm-token.html
-lib/node_modules/npm/html/doc/cli/npm-uninstall.html
-lib/node_modules/npm/html/doc/cli/npm-unpublish.html
-lib/node_modules/npm/html/doc/cli/npm-update.html
-lib/node_modules/npm/html/doc/cli/npm-version.html
-lib/node_modules/npm/html/doc/cli/npm-view.html
-lib/node_modules/npm/html/doc/cli/npm-whoami.html
-lib/node_modules/npm/html/doc/cli/npm.html
-lib/node_modules/npm/html/doc/files/npm-folders.html
-lib/node_modules/npm/html/doc/files/npm-global.html
-lib/node_modules/npm/html/doc/files/npm-json.html
-lib/node_modules/npm/html/doc/files/npm-package-locks.html
-lib/node_modules/npm/html/doc/files/npm-shrinkwrap.json.html
-lib/node_modules/npm/html/doc/files/npmrc.html
-lib/node_modules/npm/html/doc/files/package-lock.json.html
-lib/node_modules/npm/html/doc/files/package.json.html
-lib/node_modules/npm/html/doc/index.html
-lib/node_modules/npm/html/doc/misc/npm-coding-style.html
-lib/node_modules/npm/html/doc/misc/npm-config.html
-lib/node_modules/npm/html/doc/misc/npm-developers.html
-lib/node_modules/npm/html/doc/misc/npm-disputes.html
-lib/node_modules/npm/html/doc/misc/npm-orgs.html
-lib/node_modules/npm/html/doc/misc/npm-registry.html
-lib/node_modules/npm/html/doc/misc/npm-scope.html
-lib/node_modules/npm/html/doc/misc/npm-scripts.html
-lib/node_modules/npm/html/doc/misc/removing-npm.html
-lib/node_modules/npm/html/doc/misc/semver.html
-lib/node_modules/npm/html/docfoot.html
-lib/node_modules/npm/html/dochead.html
-lib/node_modules/npm/html/favicon.ico
-lib/node_modules/npm/html/index.html
-lib/node_modules/npm/html/static/style.css
-lib/node_modules/npm/html/static/toc.js
+lib/node_modules/npm/docs/LICENSE
+lib/node_modules/npm/docs/content/cli-commands/npm-access.md
+lib/node_modules/npm/docs/content/cli-commands/npm-adduser.md
+lib/node_modules/npm/docs/content/cli-commands/npm-audit.md
+lib/node_modules/npm/docs/content/cli-commands/npm-bin.md
+lib/node_modules/npm/docs/content/cli-commands/npm-bugs.md
+lib/node_modules/npm/docs/content/cli-commands/npm-build.md
+lib/node_modules/npm/docs/content/cli-commands/npm-bundle.md
+lib/node_modules/npm/docs/content/cli-commands/npm-cache.md
+lib/node_modules/npm/docs/content/cli-commands/npm-ci.md
+lib/node_modules/npm/docs/content/cli-commands/npm-completion.md
+lib/node_modules/npm/docs/content/cli-commands/npm-config.md
+lib/node_modules/npm/docs/content/cli-commands/npm-dedupe.md
+lib/node_modules/npm/docs/content/cli-commands/npm-deprecate.md
+lib/node_modules/npm/docs/content/cli-commands/npm-dist-tag.md
+lib/node_modules/npm/docs/content/cli-commands/npm-docs.md
+lib/node_modules/npm/docs/content/cli-commands/npm-doctor.md
+lib/node_modules/npm/docs/content/cli-commands/npm-edit.md
+lib/node_modules/npm/docs/content/cli-commands/npm-explore.md
+lib/node_modules/npm/docs/content/cli-commands/npm-fund.md
+lib/node_modules/npm/docs/content/cli-commands/npm-help-search.md
+lib/node_modules/npm/docs/content/cli-commands/npm-help.md
+lib/node_modules/npm/docs/content/cli-commands/npm-hook.md
+lib/node_modules/npm/docs/content/cli-commands/npm-init.md
+lib/node_modules/npm/docs/content/cli-commands/npm-install-ci-test.md
+lib/node_modules/npm/docs/content/cli-commands/npm-install-test.md
+lib/node_modules/npm/docs/content/cli-commands/npm-install.md
+lib/node_modules/npm/docs/content/cli-commands/npm-link.md
+lib/node_modules/npm/docs/content/cli-commands/npm-logout.md
+lib/node_modules/npm/docs/content/cli-commands/npm-ls.md
+lib/node_modules/npm/docs/content/cli-commands/npm-org.md
+lib/node_modules/npm/docs/content/cli-commands/npm-outdated.md
+lib/node_modules/npm/docs/content/cli-commands/npm-owner.md
+lib/node_modules/npm/docs/content/cli-commands/npm-pack.md
+lib/node_modules/npm/docs/content/cli-commands/npm-ping.md
+lib/node_modules/npm/docs/content/cli-commands/npm-prefix.md
+lib/node_modules/npm/docs/content/cli-commands/npm-profile.md
+lib/node_modules/npm/docs/content/cli-commands/npm-prune.md
+lib/node_modules/npm/docs/content/cli-commands/npm-publish.md
+lib/node_modules/npm/docs/content/cli-commands/npm-rebuild.md
+lib/node_modules/npm/docs/content/cli-commands/npm-repo.md
+lib/node_modules/npm/docs/content/cli-commands/npm-restart.md
+lib/node_modules/npm/docs/content/cli-commands/npm-root.md
+lib/node_modules/npm/docs/content/cli-commands/npm-run-script.md
+lib/node_modules/npm/docs/content/cli-commands/npm-search.md
+lib/node_modules/npm/docs/content/cli-commands/npm-shrinkwrap.md
+lib/node_modules/npm/docs/content/cli-commands/npm-star.md
+lib/node_modules/npm/docs/content/cli-commands/npm-stars.md
+lib/node_modules/npm/docs/content/cli-commands/npm-start.md
+lib/node_modules/npm/docs/content/cli-commands/npm-stop.md
+lib/node_modules/npm/docs/content/cli-commands/npm-team.md
+lib/node_modules/npm/docs/content/cli-commands/npm-test.md
+lib/node_modules/npm/docs/content/cli-commands/npm-token.md
+lib/node_modules/npm/docs/content/cli-commands/npm-uninstall.md
+lib/node_modules/npm/docs/content/cli-commands/npm-unpublish.md
+lib/node_modules/npm/docs/content/cli-commands/npm-update.md
+lib/node_modules/npm/docs/content/cli-commands/npm-version.md
+lib/node_modules/npm/docs/content/cli-commands/npm-view.md
+lib/node_modules/npm/docs/content/cli-commands/npm-whoami.md
+lib/node_modules/npm/docs/content/cli-commands/npm.md
+lib/node_modules/npm/docs/content/configuring-npm/folders.md
+lib/node_modules/npm/docs/content/configuring-npm/install.md
+lib/node_modules/npm/docs/content/configuring-npm/npmrc.md
+lib/node_modules/npm/docs/content/configuring-npm/package-json.md
+lib/node_modules/npm/docs/content/configuring-npm/package-lock-json.md
+lib/node_modules/npm/docs/content/configuring-npm/package-locks.md
+lib/node_modules/npm/docs/content/configuring-npm/shrinkwrap-json.md
+lib/node_modules/npm/docs/content/using-npm/config.md
+lib/node_modules/npm/docs/content/using-npm/developers.md
+lib/node_modules/npm/docs/content/using-npm/disputes.md
+lib/node_modules/npm/docs/content/using-npm/orgs.md
+lib/node_modules/npm/docs/content/using-npm/registry.md
+lib/node_modules/npm/docs/content/using-npm/removal.md
+lib/node_modules/npm/docs/content/using-npm/scope.md
+lib/node_modules/npm/docs/content/using-npm/scripts.md
+lib/node_modules/npm/docs/content/using-npm/semver.md
+lib/node_modules/npm/docs/gatsby-browser.js
+lib/node_modules/npm/docs/gatsby-config.js
+lib/node_modules/npm/docs/gatsby-node.js
+lib/node_modules/npm/docs/gatsby-ssr.js
+lib/node_modules/npm/docs/package-lock.json
+lib/node_modules/npm/docs/package.json
+lib/node_modules/npm/docs/src/components/Accordion.js
+lib/node_modules/npm/docs/src/components/Button.js
+lib/node_modules/npm/docs/src/components/DocLinks.js
+lib/node_modules/npm/docs/src/components/FoundTypo.js
+lib/node_modules/npm/docs/src/components/MobileSidebar.js
+lib/node_modules/npm/docs/src/components/Sidebar.js
+lib/node_modules/npm/docs/src/components/home/DarkBlock.js
+lib/node_modules/npm/docs/src/components/home/FeatureCard.js
+lib/node_modules/npm/docs/src/components/home/Features.js
+lib/node_modules/npm/docs/src/components/home/Footer.js
+lib/node_modules/npm/docs/src/components/home/Terminal.js
+lib/node_modules/npm/docs/src/components/home/Windows.js
+lib/node_modules/npm/docs/src/components/home/cubes.js
+lib/node_modules/npm/docs/src/components/home/hero.js
+lib/node_modules/npm/docs/src/components/layout.js
+lib/node_modules/npm/docs/src/components/links.js
+lib/node_modules/npm/docs/src/components/navbar.js
+lib/node_modules/npm/docs/src/components/scripts.js
+lib/node_modules/npm/docs/src/components/seo.js
+lib/node_modules/npm/docs/src/images/background-boxes.svg
+lib/node_modules/npm/docs/src/images/background-cubes.svg
+lib/node_modules/npm/docs/src/images/background-rectangles.svg
+lib/node_modules/npm/docs/src/images/bracket.svg
+lib/node_modules/npm/docs/src/images/cli-logo.svg
+lib/node_modules/npm/docs/src/images/down-carrot.svg
+lib/node_modules/npm/docs/src/images/hamburger-close.svg
+lib/node_modules/npm/docs/src/images/hamburger.svg
+lib/node_modules/npm/docs/src/images/manager-icon.svg
+lib/node_modules/npm/docs/src/images/network-icon.svg
+lib/node_modules/npm/docs/src/images/npm-icon.png
+lib/node_modules/npm/docs/src/images/orange-cube.svg
+lib/node_modules/npm/docs/src/images/pink-gradient-cube.svg
+lib/node_modules/npm/docs/src/images/purple-cube.svg
+lib/node_modules/npm/docs/src/images/purple-gradient-cube.svg
+lib/node_modules/npm/docs/src/images/red-cube.svg
+lib/node_modules/npm/docs/src/images/right-shadow-box.svg
+lib/node_modules/npm/docs/src/images/terminal-icon.svg
+lib/node_modules/npm/docs/src/images/test-icon.svg
+lib/node_modules/npm/docs/src/images/up-carrot.svg
+lib/node_modules/npm/docs/src/images/x.svg
+lib/node_modules/npm/docs/src/main.css
+lib/node_modules/npm/docs/src/pages/404.js
+lib/node_modules/npm/docs/src/pages/index.js
+lib/node_modules/npm/docs/src/templates/Page.js
+lib/node_modules/npm/docs/src/theme.js
 lib/node_modules/npm/lib/access.js
 lib/node_modules/npm/lib/adduser.js
 lib/node_modules/npm/lib/audit.js
@@ -212,7 +178,6 @@ lib/node_modules/npm/lib/config/get-credentials-by-uri.js
 lib/node_modules/npm/lib/config/lifecycle.js
 lib/node_modules/npm/lib/config/load-cafile.js
 lib/node_modules/npm/lib/config/load-prefix.js
-lib/node_modules/npm/lib/config/load-uid.js
 lib/node_modules/npm/lib/config/nerf-dart.js
 lib/node_modules/npm/lib/config/set-credentials-by-uri.js
 lib/node_modules/npm/lib/config/set-user.js
@@ -231,6 +196,7 @@ lib/node_modules/npm/lib/edit.js
 lib/node_modules/npm/lib/explore.js
 lib/node_modules/npm/lib/fetch-package-metadata.js
 lib/node_modules/npm/lib/fetch-package-metadata.md
+lib/node_modules/npm/lib/fund.js
 lib/node_modules/npm/lib/get.js
 lib/node_modules/npm/lib/help-search.js
 lib/node_modules/npm/lib/help.js
@@ -267,6 +233,7 @@ lib/node_modules/npm/lib/install/deps.js
 lib/node_modules/npm/lib/install/diff-trees.js
 lib/node_modules/npm/lib/install/exists.js
 lib/node_modules/npm/lib/install/flatten-tree.js
+lib/node_modules/npm/lib/install/fund.js
 lib/node_modules/npm/lib/install/get-requested.js
 lib/node_modules/npm/lib/install/has-modern-meta.js
 lib/node_modules/npm/lib/install/inflate-bundled.js
@@ -341,6 +308,7 @@ lib/node_modules/npm/lib/utils/error-handler.js
 lib/node_modules/npm/lib/utils/error-message.js
 lib/node_modules/npm/lib/utils/escape-arg.js
 lib/node_modules/npm/lib/utils/escape-exec-path.js
+lib/node_modules/npm/lib/utils/funding.js
 lib/node_modules/npm/lib/utils/gently-rm.js
 lib/node_modules/npm/lib/utils/git.js
 lib/node_modules/npm/lib/utils/gunzip-maybe.js
@@ -400,6 +368,7 @@ lib/node_modules/npm/man/man1/npm-docs.1
 lib/node_modules/npm/man/man1/npm-doctor.1
 lib/node_modules/npm/man/man1/npm-edit.1
 lib/node_modules/npm/man/man1/npm-explore.1
+lib/node_modules/npm/man/man1/npm-fund.1
 lib/node_modules/npm/man/man1/npm-help-search.1
 lib/node_modules/npm/man/man1/npm-help.1
 lib/node_modules/npm/man/man1/npm-hook.1
@@ -441,24 +410,21 @@ lib/node_modules/npm/man/man1/npm-view.1
 lib/node_modules/npm/man/man1/npm-whoami.1
 lib/node_modules/npm/man/man1/npm.1
 lib/node_modules/npm/man/man1/npx.1
-lib/node_modules/npm/man/man5/npm-folders.5
-lib/node_modules/npm/man/man5/npm-global.5
-lib/node_modules/npm/man/man5/npm-json.5
-lib/node_modules/npm/man/man5/npm-package-locks.5
-lib/node_modules/npm/man/man5/npm-shrinkwrap.json.5
+lib/node_modules/npm/man/man5/folders.5
+lib/node_modules/npm/man/man5/install.5
 lib/node_modules/npm/man/man5/npmrc.5
-lib/node_modules/npm/man/man5/package-lock.json.5
-lib/node_modules/npm/man/man5/package.json.5
-lib/node_modules/npm/man/man7/npm-coding-style.7
-lib/node_modules/npm/man/man7/npm-config.7
-lib/node_modules/npm/man/man7/npm-developers.7
-lib/node_modules/npm/man/man7/npm-disputes.7
-lib/node_modules/npm/man/man7/npm-index.7
-lib/node_modules/npm/man/man7/npm-orgs.7
-lib/node_modules/npm/man/man7/npm-registry.7
-lib/node_modules/npm/man/man7/npm-scope.7
-lib/node_modules/npm/man/man7/npm-scripts.7
-lib/node_modules/npm/man/man7/removing-npm.7
+lib/node_modules/npm/man/man5/package-json.5
+lib/node_modules/npm/man/man5/package-lock-json.5
+lib/node_modules/npm/man/man5/package-locks.5
+lib/node_modules/npm/man/man5/shrinkwrap-json.5
+lib/node_modules/npm/man/man7/config.7
+lib/node_modules/npm/man/man7/developers.7
+lib/node_modules/npm/man/man7/disputes.7
+lib/node_modules/npm/man/man7/orgs.7
+lib/node_modules/npm/man/man7/registry.7
+lib/node_modules/npm/man/man7/removal.7
+lib/node_modules/npm/man/man7/scope.7
+lib/node_modules/npm/man/man7/scripts.7
 lib/node_modules/npm/man/man7/semver.7
 lib/node_modules/npm/node_modules/.bin/JSONStream
 lib/node_modules/npm/node_modules/.bin/errno
@@ -947,15 +913,11 @@ lib/node_modules/npm/node_modules/clone/README.md
 lib/node_modules/npm/node_modules/clone/clone.iml
 lib/node_modules/npm/node_modules/clone/clone.js
 lib/node_modules/npm/node_modules/clone/package.json
-lib/node_modules/npm/node_modules/cmd-shim/.npmignore
-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/lib/to-batch-syntax.js
 lib/node_modules/npm/node_modules/cmd-shim/package.json
-lib/node_modules/npm/node_modules/cmd-shim/test/00-setup.js
-lib/node_modules/npm/node_modules/cmd-shim/test/basic.js
-lib/node_modules/npm/node_modules/cmd-shim/test/zz-cleanup.js
 lib/node_modules/npm/node_modules/co/History.md
 lib/node_modules/npm/node_modules/co/LICENSE
 lib/node_modules/npm/node_modules/co/Readme.md
@@ -1546,6 +1508,10 @@ lib/node_modules/npm/node_modules/from2/test.js
 lib/node_modules/npm/node_modules/fs-minipass/LICENSE
 lib/node_modules/npm/node_modules/fs-minipass/README.md
 lib/node_modules/npm/node_modules/fs-minipass/index.js
+lib/node_modules/npm/node_modules/fs-minipass/node_modules/minipass/LICENSE
+lib/node_modules/npm/node_modules/fs-minipass/node_modules/minipass/README.md
+lib/node_modules/npm/node_modules/fs-minipass/node_modules/minipass/index.js
+lib/node_modules/npm/node_modules/fs-minipass/node_modules/minipass/package.json
 lib/node_modules/npm/node_modules/fs-minipass/package.json
 lib/node_modules/npm/node_modules/fs-vacuum/.eslintrc
 lib/node_modules/npm/node_modules/fs-vacuum/.npmignore
@@ -1669,7 +1635,9 @@ lib/node_modules/npm/node_modules/gentle-fs/CHANGELOG.md
 lib/node_modules/npm/node_modules/gentle-fs/LICENSE
 lib/node_modules/npm/node_modules/gentle-fs/README.md
 lib/node_modules/npm/node_modules/gentle-fs/index.js
+lib/node_modules/npm/node_modules/gentle-fs/lib/chown.js
 lib/node_modules/npm/node_modules/gentle-fs/lib/link.js
+lib/node_modules/npm/node_modules/gentle-fs/lib/mkdir.js
 lib/node_modules/npm/node_modules/gentle-fs/lib/rm.js
 lib/node_modules/npm/node_modules/gentle-fs/node_modules/aproba/LICENSE
 lib/node_modules/npm/node_modules/gentle-fs/node_modules/aproba/README.md
@@ -1808,6 +1776,8 @@ lib/node_modules/npm/node_modules/http-signature/lib/signer.js
 lib/node_modules/npm/node_modules/http-signature/lib/utils.js
 lib/node_modules/npm/node_modules/http-signature/lib/verify.js
 lib/node_modules/npm/node_modules/http-signature/package.json
+lib/node_modules/npm/node_modules/https-proxy-agent/.editorconfig
+lib/node_modules/npm/node_modules/https-proxy-agent/.eslintrc.js
 lib/node_modules/npm/node_modules/https-proxy-agent/History.md
 lib/node_modules/npm/node_modules/https-proxy-agent/README.md
 lib/node_modules/npm/node_modules/https-proxy-agent/index.d.ts
@@ -2428,18 +2398,14 @@ lib/node_modules/npm/node_modules/minimist/test/parse.js
 lib/node_modules/npm/node_modules/minimist/test/parse_modified.js
 lib/node_modules/npm/node_modules/minimist/test/short.js
 lib/node_modules/npm/node_modules/minimist/test/whitespace.js
-lib/node_modules/npm/node_modules/minipass/README.md
-lib/node_modules/npm/node_modules/minipass/index.js
-lib/node_modules/npm/node_modules/minipass/node_modules/yallist/LICENSE
-lib/node_modules/npm/node_modules/minipass/node_modules/yallist/README.md
-lib/node_modules/npm/node_modules/minipass/node_modules/yallist/iterator.js
-lib/node_modules/npm/node_modules/minipass/node_modules/yallist/package.json
-lib/node_modules/npm/node_modules/minipass/node_modules/yallist/yallist.js
-lib/node_modules/npm/node_modules/minipass/package.json
 lib/node_modules/npm/node_modules/minizlib/LICENSE
 lib/node_modules/npm/node_modules/minizlib/README.md
 lib/node_modules/npm/node_modules/minizlib/constants.js
 lib/node_modules/npm/node_modules/minizlib/index.js
+lib/node_modules/npm/node_modules/minizlib/node_modules/minipass/LICENSE
+lib/node_modules/npm/node_modules/minizlib/node_modules/minipass/README.md
+lib/node_modules/npm/node_modules/minizlib/node_modules/minipass/index.js
+lib/node_modules/npm/node_modules/minizlib/node_modules/minipass/package.json
 lib/node_modules/npm/node_modules/minizlib/package.json
 lib/node_modules/npm/node_modules/mississippi/changelog.md
 lib/node_modules/npm/node_modules/mississippi/index.js
@@ -2622,6 +2588,7 @@ lib/node_modules/npm/node_modules/node-gyp/src/win_delay_load_hook.cc
 lib/node_modules/npm/node_modules/node-gyp/test/docker.sh
 lib/node_modules/npm/node_modules/node-gyp/test/fixtures/VS_2017_BuildTools_minimal.txt
 lib/node_modules/npm/node_modules/node-gyp/test/fixtures/VS_2017_Community_workload.txt
+lib/node_modules/npm/node_modules/node-gyp/test/fixtures/VS_2017_Express.txt
 lib/node_modules/npm/node_modules/node-gyp/test/fixtures/VS_2017_Unusable.txt
 lib/node_modules/npm/node_modules/node-gyp/test/fixtures/VS_2019_BuildTools_minimal.txt
 lib/node_modules/npm/node_modules/node-gyp/test/fixtures/VS_2019_Community_workload.txt
@@ -2772,9 +2739,6 @@ lib/node_modules/npm/node_modules/npm-install-checks/LICENSE
 lib/node_modules/npm/node_modules/npm-install-checks/README.md
 lib/node_modules/npm/node_modules/npm-install-checks/index.js
 lib/node_modules/npm/node_modules/npm-install-checks/package.json
-lib/node_modules/npm/node_modules/npm-install-checks/test/check-engine.js
-lib/node_modules/npm/node_modules/npm-install-checks/test/check-git.js
-lib/node_modules/npm/node_modules/npm-install-checks/test/check-platform.js
 lib/node_modules/npm/node_modules/npm-lifecycle/CHANGELOG.md
 lib/node_modules/npm/node_modules/npm-lifecycle/LICENSE
 lib/node_modules/npm/node_modules/npm-lifecycle/README.md
@@ -2815,6 +2779,11 @@ lib/node_modules/npm/node_modules/npm-registry-fetch/check-response.js
 lib/node_modules/npm/node_modules/npm-registry-fetch/config.js
 lib/node_modules/npm/node_modules/npm-registry-fetch/errors.js
 lib/node_modules/npm/node_modules/npm-registry-fetch/index.js
+lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/LICENSE
+lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/README.md
+lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/index.d.ts
+lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/index.js
+lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/package.json
 lib/node_modules/npm/node_modules/npm-registry-fetch/package.json
 lib/node_modules/npm/node_modules/npm-registry-fetch/silentlog.js
 lib/node_modules/npm/node_modules/npm-run-path/index.js
@@ -3221,11 +3190,10 @@ lib/node_modules/npm/node_modules/rc/package.json
 lib/node_modules/npm/node_modules/rc/test/ini.js
 lib/node_modules/npm/node_modules/rc/test/nested-env-vars.js
 lib/node_modules/npm/node_modules/rc/test/test.js
-lib/node_modules/npm/node_modules/read-cmd-shim/.npmignore
+lib/node_modules/npm/node_modules/read-cmd-shim/LICENSE
 lib/node_modules/npm/node_modules/read-cmd-shim/README.md
 lib/node_modules/npm/node_modules/read-cmd-shim/index.js
 lib/node_modules/npm/node_modules/read-cmd-shim/package.json
-lib/node_modules/npm/node_modules/read-cmd-shim/test/integration.js
 lib/node_modules/npm/node_modules/read-installed/.npmignore
 lib/node_modules/npm/node_modules/read-installed/.travis.yml
 lib/node_modules/npm/node_modules/read-installed/LICENSE
@@ -3441,7 +3409,6 @@ lib/node_modules/npm/node_modules/smart-buffer/docs/ROADMAP.md
 lib/node_modules/npm/node_modules/smart-buffer/package.json
 lib/node_modules/npm/node_modules/smart-buffer/typings/smartbuffer.d.ts
 lib/node_modules/npm/node_modules/smart-buffer/typings/utils.d.ts
-lib/node_modules/npm/node_modules/smart-buffer/yarn.lock
 lib/node_modules/npm/node_modules/socks-proxy-agent/.travis.yml
 lib/node_modules/npm/node_modules/socks-proxy-agent/History.md
 lib/node_modules/npm/node_modules/socks-proxy-agent/README.md
@@ -3492,7 +3459,6 @@ lib/node_modules/npm/node_modules/socks/typings/common/helpers.d.ts
 lib/node_modules/npm/node_modules/socks/typings/common/receiveBuffer.d.ts
 lib/node_modules/npm/node_modules/socks/typings/common/util.d.ts
 lib/node_modules/npm/node_modules/socks/typings/index.d.ts
-lib/node_modules/npm/node_modules/socks/yarn.lock
 lib/node_modules/npm/node_modules/sorted-object/LICENSE.txt
 lib/node_modules/npm/node_modules/sorted-object/lib/sorted-object.js
 lib/node_modules/npm/node_modules/sorted-object/package.json
@@ -3721,11 +3687,6 @@ lib/node_modules/npm/node_modules/tar/node_modules/minipass/LICENSE
 lib/node_modules/npm/node_modules/tar/node_modules/minipass/README.md
 lib/node_modules/npm/node_modules/tar/node_modules/minipass/index.js
 lib/node_modules/npm/node_modules/tar/node_modules/minipass/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
-lib/node_modules/npm/node_modules/tar/node_modules/yallist/package.json
-lib/node_modules/npm/node_modules/tar/node_modules/yallist/yallist.js
 lib/node_modules/npm/node_modules/tar/package.json
 lib/node_modules/npm/node_modules/term-size/index.js
 lib/node_modules/npm/node_modules/term-size/license
@@ -3917,12 +3878,10 @@ lib/node_modules/npm/node_modules/util-promisify/package.json
 lib/node_modules/npm/node_modules/util-promisify/test/common.js
 lib/node_modules/npm/node_modules/util-promisify/test/index.js
 lib/node_modules/npm/node_modules/util-promisify/test/timers.js
-lib/node_modules/npm/node_modules/uuid/.eslintrc.json
 lib/node_modules/npm/node_modules/uuid/AUTHORS
 lib/node_modules/npm/node_modules/uuid/CHANGELOG.md
 lib/node_modules/npm/node_modules/uuid/LICENSE.md
 lib/node_modules/npm/node_modules/uuid/README.md
-lib/node_modules/npm/node_modules/uuid/README_js.md
 lib/node_modules/npm/node_modules/uuid/bin/uuid
 lib/node_modules/npm/node_modules/uuid/index.js
 lib/node_modules/npm/node_modules/uuid/lib/bytesToUuid.js
@@ -4098,10 +4057,9 @@ lib/node_modules/npm/scripts/changelog.js
 lib/node_modules/npm/scripts/clean-old.sh
 lib/node_modules/npm/scripts/dep-update
 lib/node_modules/npm/scripts/dev-dep-update
-lib/node_modules/npm/scripts/doc-build.sh
+lib/node_modules/npm/scripts/docs-build.js
 lib/node_modules/npm/scripts/gen-changelog
 lib/node_modules/npm/scripts/gen-dev-ignores.js
-lib/node_modules/npm/scripts/index-build.js
 lib/node_modules/npm/scripts/install.sh
 lib/node_modules/npm/scripts/maketest
 lib/node_modules/npm/scripts/pr
@@ -4128,6 +4086,7 @@ man/man1/npm-docs.1
 man/man1/npm-doctor.1
 man/man1/npm-edit.1
 man/man1/npm-explore.1
+man/man1/npm-fund.1
 man/man1/npm-help-search.1
 man/man1/npm-help.1
 man/man1/npm-hook.1
@@ -4169,23 +4128,20 @@ man/man1/npm-view.1
 man/man1/npm-whoami.1
 man/man1/npm.1
 man/man1/npx.1
-man/man5/npm-folders.5
-man/man5/npm-global.5
-man/man5/npm-json.5
-man/man5/npm-package-locks.5
-man/man5/npm-shrinkwrap.json.5
+man/man5/folders.5
+man/man5/install.5
 man/man5/npmrc.5
-man/man5/package-lock.json.5
-man/man5/package.json.5
-man/man7/npm-coding-style.7
-man/man7/npm-config.7
-man/man7/npm-developers.7
-man/man7/npm-disputes.7
-man/man7/npm-index.7
-man/man7/npm-orgs.7
-man/man7/npm-registry.7
-man/man7/npm-scope.7
-man/man7/npm-scripts.7
-man/man7/removing-npm.7
+man/man5/package-json.5
+man/man5/package-lock-json.5
+man/man5/package-locks.5
+man/man5/shrinkwrap-json.5
+man/man7/config.7
+man/man7/developers.7
+man/man7/disputes.7
+man/man7/orgs.7
+man/man7/registry.7
+man/man7/removal.7
+man/man7/scope.7
+man/man7/scripts.7
 man/man7/semver.7
 @pkgdir share
diff --git a/lang/npm/distinfo b/lang/npm/distinfo
index 6f525db32c2..90d8d7b748a 100644
--- a/lang/npm/distinfo
+++ b/lang/npm/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.18 2019/08/07 07:34:32 adam Exp $
+$NetBSD: distinfo,v 1.19 2019/11/24 20:21:23 adam Exp $
 
-SHA1 (cli-6.10.3.tar.gz) = cf5b834eda98a60736f2611232e5c15d8ba28155
-RMD160 (cli-6.10.3.tar.gz) = af058bf57c6fe3a7d3d49ede91c44adcf078ef44
-SHA512 (cli-6.10.3.tar.gz) = af173c31c7713c83b083d5be1b75503db24d2228a942c94ee38757b847a15cf309abfe403328239085c93c1f6f42c3859fda4c88b8b80a07cb8d6f8b6b35b7f2
-Size (cli-6.10.3.tar.gz) = 5660267 bytes
+SHA1 (cli-6.13.1.tar.gz) = f39fe338ed0e64bc2bfab8441a8d536b3ff3581e
+RMD160 (cli-6.13.1.tar.gz) = 64fe0b3db9e41ad4b263066119ac00f31cbe5ffc
+SHA512 (cli-6.13.1.tar.gz) = dab02b3d01bbe84215de423674546d0bf09094f926b7b69054b651bf214d3420a3c86199ffa8487862d777d19a8116f5b149e477a6bbb9a59c802540d7b70fe5
+Size (cli-6.13.1.tar.gz) = 5624321 bytes
 SHA1 (marked-0.7.0.tar.gz) = 4094c4aa4bf00aa4d1bb0d2f0b9c50c1e81b7754
 RMD160 (marked-0.7.0.tar.gz) = 5fc126026dad9b24957089c147244217af9ecd83
 SHA512 (marked-0.7.0.tar.gz) = dc754b83f6bfa64ddc87b046935df91b16927eb98edaa47712610bfcb87f948ba878fa782e90b38213c710b33f512e65dc94d965e66e9ad14533b16b39861ee8
 Size (marked-0.7.0.tar.gz) = 160448 bytes
-SHA1 (patch-Makefile) = 29b3e9515ee2a45f3b12c116075c00faca73d270
+SHA1 (patch-Makefile) = 50cc950719f06198b7dffc8c740f08f3e5d4bb57
 SHA1 (patch-lib_config_defaults.js) = 5a00cbef781c9ab4efcec41ad781987f3f540886
 SHA1 (patch-node__modules_bin-links_index.js) = adbabdccde34483973ba134aa461b48ba690b5a2
 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
-SHA1 (patch-node__modules_node-gyp_lib_configure.js) = 3fb2fe036a4206c57c29da53009c81d4a05c7b96
+SHA1 (patch-node__modules_node-gyp_lib_configure.js) = 65e9e19fcf984bc7f5c100b2a280cc2a2406e30d
diff --git a/lang/npm/patches/patch-Makefile b/lang/npm/patches/patch-Makefile
index 9c605682f20..2aa23f41edc 100644
--- a/lang/npm/patches/patch-Makefile
+++ b/lang/npm/patches/patch-Makefile
@@ -1,24 +1,24 @@
-$NetBSD: patch-Makefile,v 1.2 2018/05/11 09:37:13 adam Exp $
+$NetBSD: patch-Makefile,v 1.3 2019/11/24 20:21:23 adam Exp $
 
 Do not build npm-index.html on rebuild.
+Do not build htmldocs, as these need some binary packages.
 
---- Makefile.orig	2018-05-04 09:28:53.000000000 +0000
+--- Makefile.orig	2019-11-18 18:22:06.000000000 +0000
 +++ Makefile
-@@ -23,7 +23,7 @@ files_mandocs = $(shell find doc/files -
-                man/man5/npm-json.5 \
-                man/man5/npm-global.5
+@@ -17,6 +17,7 @@ files_mandocs = $(shell find docs/conten
+                |sed 's|docs/content/configuring-npm/|man/man5/|g' ) \
  
--misc_mandocs = $(shell find doc/misc -name '*.md' \
-+misc_mandocs = $(shell find doc/misc -name '*.md' \! -name 'npm-index.md' \
+ misc_mandocs = $(shell find docs/content/using-npm -name '*.md' \
++               \! -name 'npm-index.md' \
                 |sed 's|.md|.7|g' \
-                |sed 's|doc/misc/|man/man7/|g' ) \
-                man/man7/npm-index.7
-@@ -39,7 +39,7 @@ files_htmldocs = $(shell find doc/files 
-                   html/doc/files/npm-json.html \
-                   html/doc/files/npm-global.html
+                |sed 's|docs/content/using-npm/|man/man7/|g' ) \
  
--misc_htmldocs = $(shell find doc/misc -name '*.md' \
-+misc_htmldocs = $(shell find doc/misc -name '*.md' \! -name 'npm-index.md' \
-                  |sed 's|.md|.html|g' \
-                  |sed 's|doc/misc/|html/doc/misc/|g' ) \
-                  html/doc/index.html
+@@ -53,7 +54,7 @@ htmldocs:
+ 	node ../bin/npm-cli.js run build:static echo>&2 && \
+ 	rm -rf node_modules .cache public/*js public/*json public/404* public/page-data public/manifest*
+ 
+-docs: mandocs htmldocs
++docs: mandocs
+ 
+ markedclean:
+ 	rm -rf node_modules/marked node_modules/.bin/marked .building_marked
diff --git a/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js b/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js
index 79f8ca34038..b3c2a4d66ce 100644
--- a/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js
+++ b/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js
@@ -1,8 +1,8 @@
-$NetBSD: patch-node__modules_node-gyp_lib_configure.js,v 1.2 2019/08/03 07:32:55 adam Exp $
+$NetBSD: patch-node__modules_node-gyp_lib_configure.js,v 1.3 2019/11/24 20:21:23 adam Exp $
 
 Skip Python detection, version 2.7 is required and we know where it is.
 
---- node_modules/node-gyp/lib/configure.js.orig	2019-07-23 16:20:30.000000000 +0000
+--- node_modules/node-gyp/lib/configure.js.orig	2019-11-18 18:22:06.000000000 +0000
 +++ node_modules/node-gyp/lib/configure.js
 @@ -15,21 +15,14 @@ if (win) {
  }
@@ -11,7 +11,7 @@ Skip Python detection, version 2.7 is required and we know where it is.
 -  var python
 +  var python = '@PYTHONBIN@'
    var buildDir = path.resolve('build')
-   var configNames = [ 'config.gypi', 'common.gypi' ]
+   var configNames = ['config.gypi', 'common.gypi']
    var configs = []
    var nodeDir
    var release = processRelease(argv, gyp, process.version, process.release)