[pkgsrc/trunk]: pkgsrc/lang lang/nodejs*: Remove the npm package...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang lang/nodejs*: Remove the npm package...
From: fhajny <fhajny%pkgsrc.org@localhost>
Date: Wed, 02 May 2018 17:22:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/18f04574ce16
branches:  trunk
changeset: 307208:18f04574ce16
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed May 02 16:33:02 2018 +0000
description:
lang/nodejs*: Remove the npm package manager from nodejs packages. Introduce nodeversion.mk framework to pick and depend on one of the supported nodejs version packages. Bump respective PKGREVISIONs.

diffstat:

 lang/nodejs/Makefile                                                                         |     4 +-
 lang/nodejs/Makefile.common                                                                  |    15 +-
 lang/nodejs/PLIST                                                                            |  4282 +---------
 lang/nodejs/distinfo                                                                         |     4 +-
 lang/nodejs/nodeversion.mk                                                                   |   104 +
 lang/nodejs/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py    |    15 -
 lang/nodejs/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_xcode__emulation.py  |    15 -
 lang/nodejs6/Makefile                                                                        |     3 +-
 lang/nodejs6/PLIST                                                                           |  2669 +------
 lang/nodejs6/distinfo                                                                        |     3 +-
 lang/nodejs6/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py   |    15 -
 lang/nodejs8/Makefile                                                                        |     4 +-
 lang/nodejs8/PLIST                                                                           |  4282 +---------
 lang/nodejs8/distinfo                                                                        |     4 +-
 lang/nodejs8/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py   |    15 -
 lang/nodejs8/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_xcode__emulation.py |    15 -
 16 files changed, 119 insertions(+), 11330 deletions(-)

diffs (truncated from 11636 to 300 lines):

diff -r dc5bc1121124 -r 18f04574ce16 lang/nodejs/Makefile
--- a/lang/nodejs/Makefile      Wed May 02 16:27:54 2018 +0000
+++ b/lang/nodejs/Makefile      Wed May 02 16:33:02 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2018/04/29 21:31:49 adam Exp $
+# $NetBSD: Makefile,v 1.126 2018/05/02 16:33:02 fhajny Exp $
 
 DISTNAME=      node-v9.11.1
 
@@ -8,7 +8,7 @@
 CONFIGURE_ARGS+=       --shared-nghttp2
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../lang/nodejs/Makefile.common"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../www/nghttp2/buildlink3.mk"
diff -r dc5bc1121124 -r 18f04574ce16 lang/nodejs/Makefile.common
--- a/lang/nodejs/Makefile.common       Wed May 02 16:27:54 2018 +0000
+++ b/lang/nodejs/Makefile.common       Wed May 02 16:33:02 2018 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.17 2017/11/01 12:07:31 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.18 2018/05/02 16:33:02 fhajny Exp $
 # used by lang/nodejs/Makefile
-# used by lang/nodejs4/Makefile
 # used by lang/nodejs6/Makefile
 # used by lang/nodejs8/Makefile
 
@@ -17,6 +16,7 @@
 USE_TOOLS+=    bash gmake pkg-config
 USE_LANGUAGES= c c++
 
+PYTHON_FOR_BUILD_ONLY=         yes
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 0.10.24
 
 .include "../../mk/bsd.prefs.mk"
@@ -27,6 +27,7 @@
 CONFIG_SHELL=          ${PYTHONBIN}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --shared-zlib
+CONFIGURE_ARGS+=       --without-npm
 PTHREAD_AUTO_VARS=     yes
 
 CONFIGURE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd"
@@ -40,13 +41,6 @@
 REPLACE_PYTHON+=       tools/genv8constants.py
 REPLACE_PYTHON+=       tools/gyp/pylib/gyp/flock_tool.py
 
-REPLACE_INTERPRETER+=  node
-REPLACE.node.old=      .*node
-REPLACE.node.new=      ${PREFIX}/bin/node
-REPLACE_FILES.node=    deps/npm/bin/npx-cli.js
-
-CHECK_INTERPRETER_SKIP+=       lib/node_modules/npm/*
-
 .if ${OPSYS} == "NetBSD"
 BUILD_DEPENDS+=        lockf-[0-9]*:../../sysutils/lockf
 .endif
@@ -62,12 +56,9 @@
 .endif
 
 pre-install:
-       ${FIND} ${WRKSRC}/deps/npm -name '*.orig' | ${XARGS} ${RM} -f
        ${CHMOD} -R g-w ${WRKSRC}
 
 post-install:
-       cd ${DESTDIR}${PREFIX} && ${SETENV} ${BASH} \
-               ./lib/node_modules/npm/scripts/relocate.sh ${PREFIX}/bin/node
 .if defined(TOOLS_PLATFORM.paxctl)
        ${TOOLS_PLATFORM.paxctl} +m ${DESTDIR}${PREFIX}/bin/node
 .endif
diff -r dc5bc1121124 -r 18f04574ce16 lang/nodejs/PLIST
--- a/lang/nodejs/PLIST Wed May 02 16:27:54 2018 +0000
+++ b/lang/nodejs/PLIST Wed May 02 16:33:02 2018 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.53 2018/01/11 08:11:12 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.54 2018/05/02 16:33:02 fhajny Exp $
 bin/node
-bin/npm
-bin/npx
 include/node/android-ifaddrs.h
 include/node/common.gypi
 include/node/config.gypi
@@ -43,4284 +41,6 @@
 include/node/v8.h
 include/node/v8config.h
 ${PLIST.dtrace}lib/dtrace/node.d
-lib/node_modules/npm/.github/CODEOWNERS
-lib/node_modules/npm/.github/issue_template.md
-lib/node_modules/npm/.mailmap
-lib/node_modules/npm/.npmignore
-lib/node_modules/npm/.travis.yml
-lib/node_modules/npm/AUTHORS
-lib/node_modules/npm/CHANGELOG.md
-lib/node_modules/npm/CONTRIBUTING.md
-lib/node_modules/npm/LICENSE
-lib/node_modules/npm/Makefile
-lib/node_modules/npm/README.md
-lib/node_modules/npm/TROUBLESHOOTING.md
-lib/node_modules/npm/appveyor.yml
-lib/node_modules/npm/bin/node-gyp-bin/node-gyp
-lib/node_modules/npm/bin/node-gyp-bin/node-gyp.cmd
-lib/node_modules/npm/bin/npm
-lib/node_modules/npm/bin/npm-cli.js
-lib/node_modules/npm/bin/npm.cmd
-lib/node_modules/npm/bin/npx
-lib/node_modules/npm/bin/npx-cli.js
-lib/node_modules/npm/bin/npx.cmd
-lib/node_modules/npm/changelogs/CHANGELOG-1.md
-lib/node_modules/npm/changelogs/CHANGELOG-2.md
-lib/node_modules/npm/changelogs/CHANGELOG-3.md
-lib/node_modules/npm/changelogs/CHANGELOG-4.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-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-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-init.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-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-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-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-init.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-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-index.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/lib/access.js
-lib/node_modules/npm/lib/adduser.js
-lib/node_modules/npm/lib/auth/legacy.js
-lib/node_modules/npm/lib/auth/oauth.js
-lib/node_modules/npm/lib/auth/saml.js
-lib/node_modules/npm/lib/auth/sso.js
-lib/node_modules/npm/lib/bin.js
-lib/node_modules/npm/lib/bugs.js
-lib/node_modules/npm/lib/build.js
-lib/node_modules/npm/lib/cache.js
-lib/node_modules/npm/lib/completion.js
-lib/node_modules/npm/lib/config.js
-lib/node_modules/npm/lib/config/bin-links.js
-lib/node_modules/npm/lib/config/clear-credentials-by-uri.js
-lib/node_modules/npm/lib/config/cmd-list.js
-lib/node_modules/npm/lib/config/core.js
-lib/node_modules/npm/lib/config/defaults.js
-lib/node_modules/npm/lib/config/fetch-opts.js
-lib/node_modules/npm/lib/config/gentle-fs.js
-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/pacote.js
-lib/node_modules/npm/lib/config/reg-client.js
-lib/node_modules/npm/lib/config/set-credentials-by-uri.js
-lib/node_modules/npm/lib/config/set-user.js
-lib/node_modules/npm/lib/dedupe.js
-lib/node_modules/npm/lib/deprecate.js
-lib/node_modules/npm/lib/dist-tag.js
-lib/node_modules/npm/lib/docs.js
-lib/node_modules/npm/lib/doctor.js
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang lang/nodejs4: Remove nodejs 4.x that...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang lang/npm: Import npm 6.0.0.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang lang/nodejs4: Remove nodejs 4.x that...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang lang/npm: Import npm 6.0.0.
Indexes:
Home | Main Index | Thread Index | Old Index