<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/8d9de2a5791702c398c27d751940c1a0d0ae66cb">https://github.com/macports/macports-ports/commit/8d9de2a5791702c398c27d751940c1a0d0ae66cb</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 8d9de2a5791 npm10: new port based off npm9; add conflicts for npm*.
</span>8d9de2a5791 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8d9de2a5791702c398c27d751940c1a0d0ae66cb
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Thu Aug 31 21:10:36 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> npm10: new port based off npm9; add conflicts for npm*.
</span>---
devel/{npm9 => npm10}/Portfile | 16 +++++++--------
.../npm10/files/patch-lib-commands-update.js.diff | 24 ++++++++++++++++++++++
devel/npm10/files/patch-package.json.diff | 10 +++++++++
devel/npm3/Portfile | 2 +-
devel/npm4/Portfile | 2 +-
devel/npm5/Portfile | 2 +-
devel/npm6/Portfile | 2 +-
devel/npm7/Portfile | 2 +-
devel/npm8/Portfile | 2 +-
devel/npm9/Portfile | 4 ++--
10 files changed, 50 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm9/Portfile b/devel/npm10/Portfile
</span>similarity index 88%
copy from devel/npm9/Portfile
copy to devel/npm10/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 2ed1c608fa1..ed489c9ed02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm10/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 npm9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name npm10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.0.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 npm7 npm8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6 npm7 npm8 npm9
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,14 @@ 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 6bc33f9c847b894e1ad113727bd80fdc1b7337ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b8f070cc770128b38017160491504184863329f0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0f3e2ae9569291274114b765d8d79b644f63fa162497daee54446d9a600e0f79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2700249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 992200170b2ac50ec74bb9cb83f7462fb156d3da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 8ae4af5337f3b5f6bd9c02f485acba0b43ab54d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 550078a66a3bb1065bae29f047b25210fbc966b69d3d2a6aab74d0378e37916a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2782805
</span>
worksrcdir "package"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:bin/node:nodejs18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:bin/node:nodejs20
</span>
platform darwin {
if {${os.major} < 13} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm10/files/patch-lib-commands-update.js.diff b/devel/npm10/files/patch-lib-commands-update.js.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..539c00091ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm10/files/patch-lib-commands-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/commands/update.js.orig 1985-10-26 01:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/commands/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 npm10 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 npm10');
</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 npm10 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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm10/files/patch-package.json.diff b/devel/npm10/files/patch-package.json.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ac80ca53a27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm10/files/patch-package.json.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- package.json.orig 1985-10-26 01:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ package.json 2023-06-21 16:36:00.795518863 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,7 +214,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "test:nocolor": "CI=true tap -Rclassic",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "test-all": "node . run test -ws -iwr --if-present",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "snap": "tap",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "prepack": "node . run build -w docs",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "posttest": "node . run lint",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "lint": "eslint \"**/*.js\"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "lintfix": "node . run lint -- --fix",
</span><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 3c3074d5f6b..6d26f809169 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;'>@@ -23,7 +23,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 npm8 npm9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm4 npm5 npm6 npm7 npm8 npm9 npm10
</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 a43409ba521..b4c4ad59aca 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;'>@@ -23,7 +23,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 npm8 npm9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm5 npm6 npm7 npm8 npm9 npm10
</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 61eaf2e4551..f9daf3213c5 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;'>@@ -23,7 +23,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 npm8 npm9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm6 npm7 npm8 npm9 npm10
</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 7c2dacc380c..0bd046bf0db 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 npm8 npm9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm7 npm8 npm9 npm10
</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 cbd33676e1f..9e40ca976fc 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 npm8 npm9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6 npm8 npm9 npm10
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm8/Portfile b/devel/npm8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d172e445ced..3b0a3754827 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm8/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;'>@@ -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 npm7 npm9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6 npm7 npm9 npm10
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm9/Portfile b/devel/npm9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ed1c608fa1..b6f2d81d275 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm9/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 npm7 npm8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts npm3 npm4 npm5 npm6 npm7 npm8 npm10
</span>
homepage https://www.npmjs.com/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,4 +90,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-9":"(.*?)"}
</span></pre><pre style='margin:0'>
</pre>