npm: updated to 6.13.4

6.13.4:
BUGFIXES
Do not remove global bin/man links inappropriately

DEPENDENCIES
gentle-fs@2.3.0
bin-links@1.1.6

6.13.3:
DEPENDENCIES
bin-links@1.1.5 Properly normalize, sanitize, and verify bin entries in package.json.
npm-packlist@1.4.7
pacote@9.5.11
fix: Do not drop perms in git when not root
sanitize and normalize package bin field
read-package-json@2.1.1

3 files changed, 21 insertions, 25 deletions

diff --git a/lang/npm/Makefile b/lang/npm/Makefile
index aad3535b20f..56ba447bb66 100644
--- a/lang/npm/Makefile
+++ b/lang/npm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2019/12/09 20:10:19 adam Exp $
+# $NetBSD: Makefile,v 1.30 2019/12/29 16:22:42 adam Exp $
 
-DISTNAME=	cli-6.13.2
+DISTNAME=	cli-6.13.4
 PKGNAME=	${DISTNAME:S/cli/npm/}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=npm/}
@@ -12,16 +12,11 @@ HOMEPAGE=	https://github.com/npm/cli
 COMMENT=	Package manager for JavaScript
 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=	${MASTER_SITE_GITHUB:S,^,-,:=markedjs/marked/archive/v${MARKED:S/marked-//}.tar.gz}
-
 DEPENDS+=	nodejs-[0-9]*:../../lang/nodejs
 
 USE_TOOLS+=	bash gmake perl
 
-PYTHON_VERSIONS_ACCEPTED=	27 # required by gyp scripts included
+MAKE_JOBS_SAFE=	no	# building man-pages
 
 REPLACE_INTERPRETER+=	node
 REPLACE.node.old=	.*node
@@ -45,10 +40,6 @@ CHECK_INTERPRETER_SKIP+=	lib/node_modules/npm/*
 
 .include "../../mk/bsd.prefs.mk"
 
-pre-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} node bin/npm-cli.js install \
-		${WRKDIR}/${MARKED} --no-global --no-timing --no-save
-
 do-install:
 	${FIND} ${WRKSRC} -type f -name '*.orig' -delete
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${PREFIX}/bin/node \
diff --git a/lang/npm/PLIST b/lang/npm/PLIST
index 15f7912fc1e..a16f322da39 100644
--- a/lang/npm/PLIST
+++ b/lang/npm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/11/24 20:21:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/12/29 16:22:42 adam Exp $
 bin/npm
 bin/npx
 lib/node_modules/npm/.licensee.json
@@ -1635,6 +1635,7 @@ 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/bin-link.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
@@ -2752,6 +2753,17 @@ lib/node_modules/npm/node_modules/npm-logical-tree/LICENSE.md
 lib/node_modules/npm/node_modules/npm-logical-tree/README.md
 lib/node_modules/npm/node_modules/npm-logical-tree/index.js
 lib/node_modules/npm/node_modules/npm-logical-tree/package.json
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/.github/settings.yml
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/.npmignore
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/LICENSE
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/README.md
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/index.js
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/package-lock.json
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/package.json
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/test/array.js
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/test/nobin.js
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/test/object.js
+lib/node_modules/npm/node_modules/npm-normalize-package-bin/test/string.js
 lib/node_modules/npm/node_modules/npm-package-arg/CHANGELOG.md
 lib/node_modules/npm/node_modules/npm-package-arg/LICENSE
 lib/node_modules/npm/node_modules/npm-package-arg/README.md
@@ -3383,9 +3395,6 @@ lib/node_modules/npm/node_modules/signal-exit/README.md
 lib/node_modules/npm/node_modules/signal-exit/index.js
 lib/node_modules/npm/node_modules/signal-exit/package.json
 lib/node_modules/npm/node_modules/signal-exit/signals.js
-lib/node_modules/npm/node_modules/slash/index.js
-lib/node_modules/npm/node_modules/slash/package.json
-lib/node_modules/npm/node_modules/slash/readme.md
 lib/node_modules/npm/node_modules/slide/LICENSE
 lib/node_modules/npm/node_modules/slide/README.md
 lib/node_modules/npm/node_modules/slide/index.js
diff --git a/lang/npm/distinfo b/lang/npm/distinfo
index aa6e9d9043d..9a6d5758196 100644
--- a/lang/npm/distinfo
+++ b/lang/npm/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.20 2019/12/09 20:10:19 adam Exp $
+$NetBSD: distinfo,v 1.21 2019/12/29 16:22:42 adam Exp $
 
-SHA1 (cli-6.13.2.tar.gz) = 53ad30d12cd81ece1cdbee2a5c6b2c69f692847d
-RMD160 (cli-6.13.2.tar.gz) = 7fb1366d3e57985a436510827690f00936bab02b
-SHA512 (cli-6.13.2.tar.gz) = c1609d6181b46a51509ecb45a25badba9e6c97624569a4a7e3a26178599a90ad3397b4abdf461bc11744978cebbd7fdc258e5ba1f1d54683694b555aac67e3ad
-Size (cli-6.13.2.tar.gz) = 5626942 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 (cli-6.13.4.tar.gz) = 7b3656faf900e999838cb9cfceecf1e9e89d4a48
+RMD160 (cli-6.13.4.tar.gz) = 4361cf8e56c573c62e3919271355d019beffd76e
+SHA512 (cli-6.13.4.tar.gz) = 0b7b591bb73ea0ca25a5675e6c01c6289bdc85fd22cea399d0b7a0e428bda838d1f4ac279ee674de6ed7fcd1f3d2e91a3c8bd023ea8eaef211b8f4cee7ec718a
+Size (cli-6.13.4.tar.gz) = 5660059 bytes
 SHA1 (patch-Makefile) = 50cc950719f06198b7dffc8c740f08f3e5d4bb57
 SHA1 (patch-lib_config_defaults.js) = 5a00cbef781c9ab4efcec41ad781987f3f540886
 SHA1 (patch-node__modules_bin-links_index.js) = adbabdccde34483973ba134aa461b48ba690b5a2