Revision: 149668 https://trac.macports.org/changeset/149668 Author: ciserlohn@macports.org Date: 2016-06-28 13:30:18 -0700 (Tue, 28 Jun 2016) Log Message: ----------- npm, npm-devel, npm2, npm3: new namimg scheme - Rename npm to npm2. - Rename npm-devel to npm3. - Update to the latest versions (2.15.8, 3.10.2). - Remove bash_completion variant. It does nothing and was only for legacy compatibility. Modified Paths: -------------- trunk/dports/devel/npm/Portfile trunk/dports/devel/npm-devel/Portfile trunk/dports/devel/npm2/Portfile trunk/dports/devel/npm3/Portfile Added Paths: ----------- trunk/dports/devel/npm2/ trunk/dports/devel/npm3/ Modified: trunk/dports/devel/npm/Portfile =================================================================== --- trunk/dports/devel/npm/Portfile 2016-06-28 20:13:51 UTC (rev 149667) +++ trunk/dports/devel/npm/Portfile 2016-06-28 20:30:18 UTC (rev 149668) @@ -2,90 +2,10 @@ # $Id$ PortSystem 1.0 - +replaced_by npm2 +PortGroup obsolete 1.0 name npm version 2.15.3 -revision 1 - +revision 2 categories devel -platforms darwin license MIT -maintainers ciserlohn - -supported_archs noarch - -description node package manager -long_description npm is a package manager for node. \ - You can use it to install and publish your node programs. \ - It manages dependencies and does other cool stuff. - -conflicts npm-devel - -homepage http://www.npmjs.org/ - -master_sites http://registry.npmjs.org/npm/-/ - -extract.suffix .tgz - -checksums rmd160 e652b86a01bb662842d013e260aa1f7e69351dcc \ - sha256 1815bdf2e155144b9919fc75b163e34fa5ff5cc8e875f340f958b69c9e84d4a2 - -worksrcdir "package" - -depends_lib path:bin/node:nodejs4 - -use_configure no - -patchfiles patch-lib-update.js.diff - -post-patch { - regsub -all {/} "^${prefix}/lib" {\\\/} npm_path_jsregex - reinplace "s|@@NPM_PATH_JSREGEX@@|${npm_path_jsregex}|g" ${worksrcpath}/lib/update.js - - foreach f [concat ${worksrcpath}/cli.js \ - ${worksrcpath}/bin/npm-cli.js \ - ${worksrcpath}/node_modules/ansi/examples/beep/index.js \ - ${worksrcpath}/node_modules/ansi/examples/clear/index.js \ - ${worksrcpath}/node_modules/ansi/examples/cursorPosition.js \ - ${worksrcpath}/node_modules/ansi/examples/progress/index.js \ - ${worksrcpath}/node_modules/cmd-shim/test/00-setup.js \ - ${worksrcpath}/node_modules/lru-cache/test/memory-leak.js \ - ${worksrcpath}/node_modules/node-gyp/bin/node-gyp.js \ - ${worksrcpath}/node_modules/nopt/bin/nopt.js \ - ${worksrcpath}/node_modules/nopt/examples/my-program.js \ - ${worksrcpath}/node_modules/opener/opener.js \ - ${worksrcpath}/node_modules/rimraf/bin.js \ - ${worksrcpath}/node_modules/semver/bin/semver \ - ${worksrcpath}/node_modules/which/bin/which \ - ${worksrcpath}/scripts/index-build.js \ - ${worksrcpath}/scripts/relocate.sh] { - reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${f} - } -} - -build {} - -destroot.cmd ${prefix}/bin/node ./cli.js -destroot.args --global . -destroot.destdir --prefix=${destroot}${prefix} - -post-destroot { - set completions_path ${destroot}${prefix}/share/bash-completion/completions/ - xinstall -d ${completions_path} - xinstall -m 644 ${worksrcpath}/lib/utils/completion.sh ${completions_path}/npm -} - -variant bash_completion { - depends_run-append path:etc/bash_completion:bash-completion -} - -notes " -It is not recommended to install packages globally. But if you do so\ -please be aware that they won't get cleaned up when you deactivate\ -or uninstall ${name}. Globally installed packages will remain in\ -${prefix}/lib/node_modules/ until you manually delete them. -" - -livecheck.type regex -livecheck.url http://registry.npmjs.org/npm -livecheck.regex {"latest-2":"(.*?)"} Modified: trunk/dports/devel/npm-devel/Portfile =================================================================== --- trunk/dports/devel/npm-devel/Portfile 2016-06-28 20:13:51 UTC (rev 149667) +++ trunk/dports/devel/npm-devel/Portfile 2016-06-28 20:30:18 UTC (rev 149668) @@ -2,101 +2,10 @@ # $Id$ PortSystem 1.0 - +replaced_by npm3 +PortGroup obsolete 1.0 name npm-devel version 3.8.8 -revision 1 - +revision 2 categories devel -platforms darwin license MIT -maintainers ciserlohn - -supported_archs noarch - -description node package manager -long_description npm is a package manager for node. \ - You can use it to install and publish your node programs. \ - It manages dependencies and does other cool stuff. - -conflicts npm - -homepage http://www.npmjs.org/ - -master_sites http://registry.npmjs.org/npm/-/ - -extract.suffix .tgz - -checksums rmd160 24e0bca1a923dfc2ee5e6f74c48b0a27ed4c4042 \ - sha256 e7353dc8d0b9e99560acd621c49eef686cfeef4e80e58e794cc7b59a07262bb2 - -distname npm-${version} - -worksrcdir "package" - -depends_lib path:bin/node:nodejs4 - -use_configure no - -patchfiles patch-lib-update.js.diff - -post-patch { - regsub -all {/} "^${prefix}/lib" {\\\/} npm_path_jsregex - reinplace "s|@@NPM_PATH_JSREGEX@@|${npm_path_jsregex}|g" ${worksrcpath}/lib/update.js - - foreach f [concat ${worksrcpath}/cli.js \ - ${worksrcpath}/bin/npm-cli.js \ - ${worksrcpath}/node_modules/cmd-shim/test/00-setup.js \ - ${worksrcpath}/node_modules/mkdirp/bin/cmd.js \ - ${worksrcpath}/node_modules/node-gyp/bin/node-gyp.js \ - ${worksrcpath}/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/memory-leak.js \ - ${worksrcpath}/node_modules/nopt/bin/nopt.js \ - ${worksrcpath}/node_modules/nopt/examples/my-program.js \ - ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/beep/index.js \ - ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/clear/index.js \ - ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/cursorPosition.js \ - ${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/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 \ - ${worksrcpath}/node_modules/rimraf/bin.js \ - ${worksrcpath}/node_modules/semver/bin/semver \ - ${worksrcpath}/node_modules/which/bin/which \ - ${worksrcpath}/scripts/index-build.js \ - ${worksrcpath}/scripts/relocate.sh \ - ${worksrcpath}/test/tap/config-edit.js \ - ${worksrcpath}/test/tap/gently-rm-cmdshims.js \ - ${worksrcpath}/test/tap/install-link-scripts.js \ - ${worksrcpath}/test/tap/scripts-whitespace-windows.js] { - reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${f} - } -} - -build {} - -destroot.cmd ${prefix}/bin/node ./cli.js -destroot.args --global . -destroot.destdir --prefix=${destroot}${prefix} - -post-destroot { - set completions_path ${destroot}${prefix}/share/bash-completion/completions/ - xinstall -d ${completions_path} - xinstall -m 644 ${worksrcpath}/lib/utils/completion.sh ${completions_path}/npm -} - -variant bash_completion { - depends_run-append path:etc/bash_completion:bash-completion -} - -notes " -It is not recommended to install packages globally. But if you do so\ -please be aware that they won't get cleaned up when you deactivate\ -or uninstall ${name}. Globally installed packages will remain in\ -${prefix}/lib/node_modules/ until you manually delete them. -" - -livecheck.type regex -livecheck.url http://registry.npmjs.org/npm -livecheck.regex {"latest":"(.*?)"} Modified: trunk/dports/devel/npm2/Portfile =================================================================== --- trunk/dports/devel/npm/Portfile 2016-06-28 19:49:01 UTC (rev 149656) +++ trunk/dports/devel/npm2/Portfile 2016-06-28 20:30:18 UTC (rev 149668) @@ -3,9 +3,8 @@ PortSystem 1.0 -name npm -version 2.15.3 -revision 1 +name npm2 +version 2.15.8 categories devel platforms darwin @@ -19,16 +18,18 @@ You can use it to install and publish your node programs. \ It manages dependencies and does other cool stuff. -conflicts npm-devel +conflicts npm3 homepage http://www.npmjs.org/ master_sites http://registry.npmjs.org/npm/-/ +distname npm-${version} + extract.suffix .tgz -checksums rmd160 e652b86a01bb662842d013e260aa1f7e69351dcc \ - sha256 1815bdf2e155144b9919fc75b163e34fa5ff5cc8e875f340f958b69c9e84d4a2 +checksums rmd160 978f5aead81c6fe04630353a1016389d5b258a74 \ + sha256 c9a54f5a7f86a89a77c1c26511bcf3bb55dc7ce5283b590ab1ba289f3824b400 worksrcdir "package" @@ -49,7 +50,6 @@ ${worksrcpath}/node_modules/ansi/examples/cursorPosition.js \ ${worksrcpath}/node_modules/ansi/examples/progress/index.js \ ${worksrcpath}/node_modules/cmd-shim/test/00-setup.js \ - ${worksrcpath}/node_modules/lru-cache/test/memory-leak.js \ ${worksrcpath}/node_modules/node-gyp/bin/node-gyp.js \ ${worksrcpath}/node_modules/nopt/bin/nopt.js \ ${worksrcpath}/node_modules/nopt/examples/my-program.js \ @@ -75,10 +75,6 @@ xinstall -m 644 ${worksrcpath}/lib/utils/completion.sh ${completions_path}/npm } -variant bash_completion { - depends_run-append path:etc/bash_completion:bash-completion -} - notes " It is not recommended to install packages globally. But if you do so\ please be aware that they won't get cleaned up when you deactivate\ Modified: trunk/dports/devel/npm3/Portfile =================================================================== --- trunk/dports/devel/npm-devel/Portfile 2016-06-28 19:49:01 UTC (rev 149656) +++ trunk/dports/devel/npm3/Portfile 2016-06-28 20:30:18 UTC (rev 149668) @@ -3,9 +3,8 @@ PortSystem 1.0 -name npm-devel -version 3.8.8 -revision 1 +name npm3 +version 3.10.2 categories devel platforms darwin @@ -19,16 +18,18 @@ You can use it to install and publish your node programs. \ It manages dependencies and does other cool stuff. -conflicts npm +conflicts npm2 homepage http://www.npmjs.org/ master_sites http://registry.npmjs.org/npm/-/ +distname npm-${version} + extract.suffix .tgz -checksums rmd160 24e0bca1a923dfc2ee5e6f74c48b0a27ed4c4042 \ - sha256 e7353dc8d0b9e99560acd621c49eef686cfeef4e80e58e794cc7b59a07262bb2 +checksums rmd160 515ab02cc6522e2c34ca3f607a0707bd04d62782 \ + sha256 ce8fc260a17b2b357b0676efc01d77e1f54110151ed578040bc4444ffc194dd3 distname npm-${version} @@ -52,10 +53,6 @@ ${worksrcpath}/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/memory-leak.js \ ${worksrcpath}/node_modules/nopt/bin/nopt.js \ ${worksrcpath}/node_modules/nopt/examples/my-program.js \ - ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/beep/index.js \ - ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/clear/index.js \ - ${worksrcpath}/node_modules/npmlog/node_modules/ansi/examples/cursorPosition.js \ - ${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/har-validator/bin/har-validator \ @@ -86,10 +83,6 @@ xinstall -m 644 ${worksrcpath}/lib/utils/completion.sh ${completions_path}/npm } -variant bash_completion { - depends_run-append path:etc/bash_completion:bash-completion -} - notes " It is not recommended to install packages globally. But if you do so\ please be aware that they won't get cleaned up when you deactivate\