<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/975b787e8b170e45fbfab39a406c463e9bf3cc38">https://github.com/macports/macports-ports/commit/975b787e8b170e45fbfab39a406c463e9bf3cc38</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 975b787 npm6: new port @6.0.0
</span>975b787 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 975b787e8b170e45fbfab39a406c463e9bf3cc38
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue Apr 24 16:31:57 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> npm6: new port @6.0.0
</span>---
devel/npm2/Portfile | 2 +-
devel/npm3/Portfile | 2 +-
devel/npm4/Portfile | 2 +-
devel/npm5/Portfile | 2 +-
devel/{npm5 => npm6}/Portfile | 42 +++++++++++++++----------------
devel/npm6/files/patch-lib-update.js.diff | 24 ++++++++++++++++++
6 files changed, 48 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm2/Portfile b/devel/npm2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 663e77c..0654c67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ long_description npm is a package manager for node. \
</span> You can use it to install and publish your node programs. \
It manages dependencies and does other cool stuff.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts npm3 npm4 npm5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6
</span>
homepage http://www.npmjs.org/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm3/Portfile b/devel/npm3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24c379b..e3b38cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ long_description npm is a package manager for node. \
</span> You can use it to install and publish your node programs. \
It manages dependencies and does other cool stuff.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts npm2 npm4 npm5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm2 npm4 npm5 npm6
</span>
homepage http://www.npmjs.org/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm4/Portfile b/devel/npm4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1d71fc..9407a52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ long_description npm is a package manager for node. \
</span> You can use it to install and publish your node programs. \
It manages dependencies and does other cool stuff.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts npm2 npm3 npm5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm2 npm3 npm5 npm6
</span>
homepage http://www.npmjs.org/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm5/Portfile b/devel/npm5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22716d5..3a6133d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ long_description npm is a package manager for node. \
</span> You can use it to install and publish your node programs. \
It manages dependencies and does other cool stuff.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts npm2 npm3 npm4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm2 npm3 npm4 npm6
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm5/Portfile b/devel/npm6/Portfile
</span>similarity index 74%
copy from devel/npm5/Portfile
copy to devel/npm6/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 22716d5..9cb96e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,22 +2,19 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name npm5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name npm6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.0
</span> categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers { ether.org.za:light @dylanbr } openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {l2dy @l2dy} openmaintainer
</span> description node package manager
long_description npm is a package manager for node. \
You can use it to install and publish your node programs. \
It manages dependencies and does other cool stuff.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts npm2 npm3 npm4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm2 npm3 npm4 npm5
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,17 +24,19 @@ distname npm-${version}
</span>
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 5e4bfb8c2e7ada01dd41ec0555d13dd0f446ddb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ebbd804bf552f89c2a616cfe6fc3cb7aa06e315f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3f32536d67eba5bd9929b3b1fe8c54f5cd18d76173e3bc52c151c31a0ea1c946
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 f5518c860ab91586db2a24aad4de1433cda108d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2ad2c402cfcf1b21ee1e80fba4d767837b64485c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 689ac0dbbbf372a8f9be5a25584044606c715eb5f552cdd4372fbe58afaf6334
</span>
worksrcdir "package"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:bin/node:nodejs6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:bin/node:nodejs8
</span>
platform darwin {
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace path:bin/node:nodejs6 path:bin/node:nodejs4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace path:bin/node:nodejs8 path:bin/node:nodejs4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace path:bin/node:nodejs8 path:bin/node:nodejs6
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +51,13 @@ post-patch {
</span> foreach f [concat ${worksrcpath}/bin/npm-cli.js \
${worksrcpath}/bin/npx-cli.js \
${worksrcpath}/node_modules/JSONStream/bin.js \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/build.js \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/cli.js \
</span> ${worksrcpath}/node_modules/mkdirp/bin/cmd.js \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/node-gyp/bin/node-gyp.js \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/node-gyp/node_modules/nopt/bin/nopt.js \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/node-gyp/node_modules/nopt/examples/my-program.js \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/node-gyp/node_modules/semver/bin/semver \
</span> ${worksrcpath}/node_modules/nopt/bin/nopt.js \
${worksrcpath}/node_modules/nopt/examples/my-program.js \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/npm-lifecycle/node_modules/node-gyp/bin/node-gyp.js \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/npm-lifecycle/node_modules/node-gyp/node_modules/nopt/bin/nopt.js \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/npm-lifecycle/node_modules/node-gyp/node_modules/nopt/examples/my-program.js \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/npm-lifecycle/node_modules/node-gyp/node_modules/semver/bin/semver \
</span> ${worksrcpath}/node_modules/opener/opener.js \
${worksrcpath}/node_modules/qrcode-terminal/bin/qrcode-terminal.js \
${worksrcpath}/node_modules/request/node_modules/har-validator/node_modules/ajv/scripts/info \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,8 +66,9 @@ post-patch {
</span> ${worksrcpath}/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-verify \
${worksrcpath}/node_modules/rimraf/bin.js \
${worksrcpath}/node_modules/semver/bin/semver \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/rc/index.js \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/rc/index.js \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/update-notifier/node_modules/is-ci/bin.js \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/rc/cli.js \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/rc/cli.js \
</span> ${worksrcpath}/node_modules/uuid/bin/uuid \
${worksrcpath}/node_modules/which/bin/which \
${worksrcpath}/node_modules/worker-farm/node_modules/errno/build.js \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,4 +103,4 @@ ${prefix}/lib/node_modules/ until you manually delete them.
</span>
livecheck.type regex
livecheck.url http://registry.npmjs.org/npm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {"latest-5":"(.*?)"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {"latest-6":"(.*?)"}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm6/files/patch-lib-update.js.diff b/devel/npm6/files/patch-lib-update.js.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..77d022b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm6/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/update.js.orig 1985-10-26 08:15:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/update.js 2018-04-24 15:59:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,10 +58,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (url.parse(ww.req).protocol) ww.what = ww.req
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const where = (ww.dep.parent && ww.dep.parent.path) || ww.dep.path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const isTransitive = !(ww.dep.requiredBy || []).some((p) => p.isTop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const key = where + ':' + String(isTransitive)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!toInstall[key]) toInstall[key] = {where: where, opts: {saveOnlyLock: isTransitive}, what: []}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (toInstall[key].what.indexOf(ww.what) === -1) toInstall[key].what.push(ww.what)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ww.what.match(/^npm@/) && where.match(/@@NPM_PATH_JSREGEX@@/)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error("Trying to update '" + ww.what + "' in '" + where + "'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error("which is part of the MacPorts npm base installation.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error("To update npm please run:")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error("sudo port selfupdate && sudo port upgrade npm6\n")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const isTransitive = !(ww.dep.requiredBy || []).some((p) => p.isTop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const key = where + ':' + String(isTransitive)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!toInstall[key]) toInstall[key] = {where: where, opts: {saveOnlyLock: isTransitive}, what: []}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (toInstall[key].what.indexOf(ww.what) === -1) toInstall[key].what.push(ww.what)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ })
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Bluebird.each(Object.keys(toInstall), (key) => {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const deps = toInstall[key]
</span></pre><pre style='margin:0'>
</pre>