[107384] trunk/dports/devel/npm

[Ryan Schmidt]

On Jun 26, 2013, at 14:50, ciserlohn at macports.org wrote:

> Revision: 107384
>          https://trac.macports.org/changeset/107384
> Author:   ciserlohn at macports.org
> Date:     2013-06-26 12:50:16 -0700 (Wed, 26 Jun 2013)
> Log Message:
> -----------
> npm: update to version 1.2.32
> 
> Modified Paths:
> --------------
>    trunk/dports/devel/npm/Portfile
> 
> Added Paths:
> -----------
>    trunk/dports/devel/npm/files/patch-lib-update.js.diff
> 
> Modified: trunk/dports/devel/npm/Portfile
> ===================================================================
> --- trunk/dports/devel/npm/Portfile	2013-06-26 19:22:50 UTC (rev 107383)
> +++ trunk/dports/devel/npm/Portfile	2013-06-26 19:50:16 UTC (rev 107384)
> @@ -4,7 +4,7 @@
> PortSystem          1.0
> 
> name                npm
> -version             1.2.30
> +version             1.2.32
> 
> categories          devel
> platforms           darwin
> @@ -24,8 +24,8 @@
> 
> extract.suffix      .tgz
> 
> -checksums           rmd160  c50705eaa4a5dd3a05829475a70d0bcec7cb6186 \
> -                    sha256  73c0f061cd3ccd59bab30a75ecb58ba98e3581a5f2b27c7b37b2df7eab376eee
> +checksums           rmd160  b3ff1a001a5ae601939ed7fca3af2be4627e1316 \
> +                    sha256  cb50951626e79a110f37a359da4174b8a71d5ef26a68ebbd7956ff63494513a6
> 
> worksrcdir          "package"
> 
> @@ -33,7 +33,7 @@
> 
> use_configure       no
> 
> -patchfiles          patch-lib-update.js
> +patchfiles          patch-lib-update.js.diff
> 
> post-patch {
>     regsub -all {/} "^${prefix}/(bin/npm\\|lib/node_modules/npm)+" {\\\/} npm_path_jsregex
> 
> Added: trunk/dports/devel/npm/files/patch-lib-update.js.diff
> ===================================================================
> --- trunk/dports/devel/npm/files/patch-lib-update.js.diff	                        (rev 0)
> +++ trunk/dports/devel/npm/files/patch-lib-update.js.diff	2013-06-26 19:50:16 UTC (rev 107384)
> @@ -0,0 +1,17 @@
> +--- lib/update.js.orig	2013-06-21 13:44:01.000000000 +0200
> ++++ lib/update.js	2013-06-26 21:18:40.000000000 +0200
> +@@ -35,6 +35,14 @@
> +         , req = ww[4]
> +         , url = require('url')
> + 
> ++      if (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()
> ++      }
> ++
> +       // use the initial installation method (repo, tar, git) for updating
> +       if (url.parse(req).protocol) what = req
> +       npm.commands.install(where, what, cb)

If you wanted to rename the patchfile to conform to our guidelines, it looks like you should have used "svn mv patch-lib-update.js patch-lib-update.js.diff" prior to editing it, to preserve its history. As it is, you now have two patchfiles in the directory, which look like they were created independently of one another, one of which is not being used.