Revision: 86857 http://trac.macports.org/changeset/86857 Author: ciserlohn@macports.org Date: 2011-11-05 14:14:27 -0700 (Sat, 05 Nov 2011) Log Message: ----------- nodejs: update to version 0.6.0 - update master_sites - disable parallel build (won't work anymore) - post-patch: more files that need the shebang to be changed to use python from macports - adapted Makefile patch to upstream changes Modified Paths: -------------- trunk/dports/devel/nodejs/Portfile trunk/dports/devel/nodejs/files/patch-Makefile-python.diff Modified: trunk/dports/devel/nodejs/Portfile =================================================================== --- trunk/dports/devel/nodejs/Portfile 2011-11-05 20:46:58 UTC (rev 86856) +++ trunk/dports/devel/nodejs/Portfile 2011-11-05 21:14:27 UTC (rev 86857) @@ -4,7 +4,7 @@ PortSystem 1.0 name nodejs -version 0.4.12 +version 0.6.0 categories devel net platforms darwin maintainers ciserlohn @@ -19,10 +19,10 @@ conflicts nodejs-devel homepage http://nodejs.org/ -master_sites ${homepage}dist/ +master_sites ${homepage}dist/v${version} -checksums rmd160 3861afdcbe49516c018fa0d5a5416b15a10b8f05 \ - sha256 c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4 +checksums rmd160 9dcfb94a55352b72efc10cfa078a9047ee4e610f \ + sha256 1b6a34b6f2099145c44a0c20d3a5cab7c9ec063de1a195ddeda61ad55d601d7f distname node-v${version} @@ -41,7 +41,14 @@ set py27_bin ${prefix}/bin/python2.7 post-patch { - foreach f [concat ${worksrcpath}/tools/node-waf ${worksrcpath}/tools/waf-light ${worksrcpath}/wscript [rec_glob ${worksrcpath} *.py]] { + foreach f [concat ${worksrcpath}/wscript \ + ${worksrcpath}/configure-gyp \ + ${worksrcpath}/tools/node-waf \ + ${worksrcpath}/tools/waf-light \ + ${worksrcpath}/tools/gyp/gyp \ + ${worksrcpath}/tools/gyp_node \ + ${worksrcpath}/deps/uv/gyp_uv \ + [rec_glob ${worksrcpath} *.py]] { reinplace "s|/usr/bin/env python|${py27_bin}|" ${f} } } @@ -78,6 +85,8 @@ test.run yes +use_parallel_build no + build.args-append CC=${configure.cc} \ CXX=${configure.cxx} \ CFLAGS="${configure.cflags} ${configure.cc_archflags}" \ @@ -92,7 +101,6 @@ ChangeLog \ LICENSE \ README.md \ - TODO \ ${docdir} } Modified: trunk/dports/devel/nodejs/files/patch-Makefile-python.diff =================================================================== --- trunk/dports/devel/nodejs/files/patch-Makefile-python.diff 2011-11-05 20:46:58 UTC (rev 86856) +++ trunk/dports/devel/nodejs/files/patch-Makefile-python.diff 2011-11-05 21:14:27 UTC (rev 86857) @@ -1,18 +1,22 @@ ---- Makefile.orig 2011-08-08 00:05:27.000000000 +0200 -+++ Makefile 2011-08-08 00:05:41.000000000 +0200 +--- Makefile.orig 2011-11-05 20:25:23.000000000 +0100 ++++ Makefile 2011-11-05 20:26:11.000000000 +0100 @@ -1,4 +1,4 @@ -WAF=python tools/waf-light +WAF=$(PYTHON) tools/waf-light - web_root = ryan@nodejs.org:~/web/nodejs.org/ + web_root = node@nodejs.org:~/web/nodejs.org/ -@@ -23,34 +23,34 @@ +@@ -32,40 +32,40 @@ @$(WAF) uninstall test: all - python tools/test.py --mode=release simple message + $(PYTHON) tools/test.py --mode=release simple message + test-http1: all +- python tools/test.py --mode=release --use-http1 simple message ++ $(PYTHON) tools/test.py --mode=release --use-http1 simple message + test-valgrind: all - python tools/test.py --mode=release --valgrind simple message + $(PYTHON) tools/test.py --mode=release --valgrind simple message @@ -21,6 +25,10 @@ - python tools/test.py --mode=debug,release + $(PYTHON) tools/test.py --mode=debug,release + test-all-http1: all +- python tools/test.py --mode=debug,release --use-http1 ++ $(PYTHON) tools/test.py --mode=debug,release --use-http1 + test-all-valgrind: all - python tools/test.py --mode=debug,release --valgrind + $(PYTHON) tools/test.py --mode=debug,release --valgrind @@ -49,9 +57,9 @@ - python tools/test.py internet + $(PYTHON) tools/test.py internet - build/default/node: all -@@ -132,10 +132,10 @@ + out/Release/node: all +@@ -149,10 +149,10 @@ ./node benchmark/idle_clients.js & jslint: