[148074] trunk/dports/devel/npm-devel

[ciserlohn at macports.org]

Revision: 148074
          https://trac.macports.org/changeset/148074
Author:   ciserlohn at macports.org
Date:     2016-04-26 00:49:52 -0700 (Tue, 26 Apr 2016)
Log Message:
-----------
npm-devel: update to version 3.8.7; fix patchfile (closes #51155)

Modified Paths:
--------------
    trunk/dports/devel/npm-devel/Portfile
    trunk/dports/devel/npm-devel/files/patch-lib-update.js.diff

Modified: trunk/dports/devel/npm-devel/Portfile
===================================================================
--- trunk/dports/devel/npm-devel/Portfile	2016-04-26 07:11:47 UTC (rev 148073)
+++ trunk/dports/devel/npm-devel/Portfile	2016-04-26 07:49:52 UTC (rev 148074)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                npm-devel
-version             3.8.6
+version             3.8.7
 
 categories          devel
 platforms           darwin
@@ -26,8 +26,8 @@
 
 extract.suffix      .tgz
 
-checksums           rmd160  f230bc9051f44d23b60d16b425bfc320657b8850 \
-                    sha256  29bc9d6f6123c9281914b298e863f683fd98ac2762632a55458308bb88b005e8
+checksums           rmd160  af37894dc6df42f393e01209e5222f967a61b2cb \
+                    sha256  4e05ba120fbb840ac783ec1fdacbc4dbec19877a45d02727fe4bb1e541501d97
 
 distname            npm-${version}
 
@@ -57,7 +57,6 @@
                    ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/progress/index.js \
                    ${worksrcpath}/node_modules/opener/opener.js \
                    ${worksrcpath}/node_modules/read-cmd-shim/test/integration.js \
-                   ${worksrcpath}/node_modules/request/node_modules/bl/test/sauce.js \
                    ${worksrcpath}/node_modules/request/node_modules/har-validator/bin/har-validator \
                    ${worksrcpath}/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md \
                    ${worksrcpath}/node_modules/request/node_modules/node-uuid/bin/uuid \

Modified: trunk/dports/devel/npm-devel/files/patch-lib-update.js.diff
===================================================================
--- trunk/dports/devel/npm-devel/files/patch-lib-update.js.diff	2016-04-26 07:11:47 UTC (rev 148073)
+++ trunk/dports/devel/npm-devel/files/patch-lib-update.js.diff	2016-04-26 07:49:52 UTC (rev 148074)
@@ -1,17 +1,16 @@
---- lib/update.js.orig	2015-09-11 02:47:10.000000000 +0200
-+++ lib/update.js	2015-10-31 00:33:55.000000000 +0100
-@@ -46,6 +46,14 @@
-       // use the initial installation method (repo, tar, git) for updating
+--- lib/update.js.orig	2016-04-26 09:35:11.000000000 +0200
++++ lib/update.js	2016-04-26 09:34:24.000000000 +0200
+@@ -47,7 +47,12 @@
        if (url.parse(ww.req).protocol) ww.what = ww.req
  
-+      if (what.match(/^npm@/) && where.match(/@@NPM_PATH_JSREGEX@@/)) {
+       var where = ww.dep.parent && ww.dep.parent.path || ww.dep.path
+-      if (toInstall[where]) {
++      if (ww.what.match(/^npm@/) && where.match(/@@NPM_PATH_JSREGEX@@/)) {
 +        log.error("Trying to update '" + what + "' in '" + where + "'")
 +        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")
-+        return cb()
-+      }
-+
-       var where = ww.dep.parent && ww.dep.parent.path || ww.dep.path
-       if (toInstall[where]) {
++      } else if (toInstall[where]) {
          toInstall[where].push(ww.what)
+       } else {
+         toInstall[where] = [ww.what]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160426/dd6d567b/attachment.html>