<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/7d1e1ab57dd34d77632640ad1c7af0170aa20703">https://github.com/macports/macports-ports/commit/7d1e1ab57dd34d77632640ad1c7af0170aa20703</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 7d1e1ab npm5: new upstream 5.6.0 release.
</span>7d1e1ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d1e1ab57dd34d77632640ad1c7af0170aa20703
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Sat Jan 6 18:12:07 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> npm5: new upstream 5.6.0 release.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Maintainer timeout.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/55531
</span>---
devel/npm5/Portfile | 7 ++++---
devel/npm5/files/patch-lib-update.js.diff | 28 ++++++++++++++++++----------
2 files changed, 22 insertions(+), 13 deletions(-)
<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 12ed032..8101f70 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name npm5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.0
</span>
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,9 @@ distname npm-${version}
</span>
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 df54fbd1fb2fcad0356ff0ec1f768418d39c599d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b8b9afb0bb6211a289f969f66ba184ca5bc83abf6a570e0853ea5185073dca6f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 b11e72cd5167df48b06c43474e9331fe848cb05e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0760654a609e113d2ee8dd77461fb560896aff08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b1f0de3767136c1d7b4b0f10e6eb2fb3397e2fe11e4c9cddcd0030ad1af9eddd
</span>
worksrcdir "package"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm5/files/patch-lib-update.js.diff b/devel/npm5/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a53bd5..b48cf96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm5/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm5/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/update.js.orig 2016-04-26 09:35:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/update.js 2016-04-26 09:34:24.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/update.js.orig 2017-11-27 19:37:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/update.js 2018-01-09 17:01:45.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,10 +58,17 @@
</span> if (url.parse(ww.req).protocol) ww.what = ww.req
<span style='display:block; white-space:pre;background:#ffe0e0;'>- var where = ww.dep.parent && ww.dep.parent.path || ww.dep.path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (toInstall[where]) {
</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> + if (ww.what.match(/^npm@/) && where.match(/@@NPM_PATH_JSREGEX@@/)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.error("Trying to update '" + what + "' in '" + where + "'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error("Trying to update '" + ww.what + "' in '" + where + "'")
</span> + log.error("which is part of the MacPorts npm base installation.")
+ log.error("To update npm please run:")
+ log.error("sudo port selfupdate && sudo port upgrade npm\n")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (toInstall[where]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- toInstall[where].push(ww.what)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- toInstall[where] = [ww.what]
</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>