<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8c81aa1b754864cd5096e94814e2ef79b6de4059">https://github.com/macports/macports-ports/commit/8c81aa1b754864cd5096e94814e2ef79b6de4059</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 8c81aa1b754 npm8: new port based off npm7; add conflicts for npm*.
</span>8c81aa1b754 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c81aa1b754864cd5096e94814e2ef79b6de4059
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Thu Oct 14 21:58:38 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> npm8: new port based off npm7; add conflicts for npm*.
</span>---
devel/npm3/Portfile | 2 +-
devel/npm4/Portfile | 2 +-
devel/npm5/Portfile | 2 +-
devel/npm6/Portfile | 2 +-
devel/npm7/Portfile | 4 ++--
devel/{npm7 => npm8}/Portfile | 19 +++++++------------
devel/npm8/files/patch-lib-update.js.diff | 24 ++++++++++++++++++++++++
7 files changed, 37 insertions(+), 18 deletions(-)
<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 053e5835a7f..4c10aaa6f5d 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 npm4 npm5 npm6 npm7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm4 npm5 npm6 npm7 npm8
</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 cfd8e4c1a9c..bf8e524e435 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;'>@@ -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 npm3 npm5 npm6 npm7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm5 npm6 npm7 npm8
</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 04b7891466a..56ddd0a168a 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;'>@@ -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 npm3 npm4 npm6 npm7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm6 npm7 npm8
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm6/Portfile b/devel/npm6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc5d91765ac..293a5b80d10 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm6/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;'>@@ -15,7 +15,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 npm7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm7 npm8
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm7/Portfile b/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c7000fc685..0a12d49a834 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,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 npm6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6 npm8
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,4 +92,4 @@ ${prefix}/lib/node_modules/ until you manually delete them.
</span>
livecheck.type regex
livecheck.url https://registry.npmjs.org/npm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {"latest":"(.*?)"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {"next-7":"(.*?)"}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm7/Portfile b/devel/npm8/Portfile
</span>similarity index 80%
copy from devel/npm7/Portfile
copy to devel/npm8/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 5c7000fc685..0ac10b26051 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name npm7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.24.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name npm8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.1.0
</span> revision 0
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,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 npm6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6 npm7
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +27,10 @@ extract.suffix .tgz
</span>
# Please keep the sha1 - users can use it to validate sha values
# published on npmjs.org for the package
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f9f2d6565e8223af13371d12fa2f31454a02d626 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 861117af8241bea592289f22407230e5300e59ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b9eeea011f8bc3b76e55cc33339e87213800677f37e0756ad13ef0e9eaccd64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3146141
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a169453c06bd87d717e4e50ddb2dd7363db60788 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 2b4a44f00cab4ae7e8fb2d8180f2af92e1098b09 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 301ddf6bdbd6f6abb36de144902914c6bb4d6f7463758774fdd0a9ee7c597d34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2234592
</span>
worksrcdir "package"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,6 @@ post-patch {
</span> foreach f [concat ${worksrcpath}/bin/npm-cli.js \
${worksrcpath}/bin/npx-cli.js \
${worksrcpath}/node_modules/@npmcli/arborist/bin/index.js \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/ajv/scripts/info \
</span> ${worksrcpath}/node_modules/mkdirp/bin/cmd.js \
${worksrcpath}/node_modules/node-gyp/bin/node-gyp.js \
${worksrcpath}/node_modules/nopt/bin/nopt.js \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,10 +59,6 @@ post-patch {
</span> ${worksrcpath}/node_modules/qrcode-terminal/bin/qrcode-terminal.js \
${worksrcpath}/node_modules/rimraf/bin.js \
${worksrcpath}/node_modules/semver/bin/semver.js \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/sshpk/bin/sshpk-conv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/sshpk/bin/sshpk-sign \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/sshpk/bin/sshpk-verify \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/node_modules/uuid/bin/uuid \
</span> ${worksrcpath}/node_modules/which/bin/node-which] {
reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${f}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm8/files/patch-lib-update.js.diff b/devel/npm8/files/patch-lib-update.js.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6a4559c0b38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm8/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 01:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/update.js 2021-03-23 15:13:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +44,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ? global
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : this.npm.prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Prevent the npm package in global from updating. Prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // 'npm update -g' since it'll implicity upgrade npm and also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // prevent 'npm update -g npm'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (this.npm.config.get('global')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!args.length || (args.length && args.find(e => e === 'npm'))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'Ignoring attempt to update npm in ' + global);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'which is part of the MacPorts npm7 base');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'installation. To update npm please run:');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'sudo port selfupdate && sudo port upgrade npm7');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ throw new Error('Ignoring attempt to update npm in ' + global +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ' which is part of the MacPorts npm7 base' +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ' installation.');
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (this.npm.config.get('depth')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.warn('update', 'The --depth option no longer has any effect. See RFC0019.\n' +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'https://github.com/npm/rfcs/blob/latest/implemented/0019-remove-update-depth-option.md')
</span></pre><pre style='margin:0'>
</pre>