[88659] trunk/dports/devel/nodejs

[ciserlohn at macports.org]

Revision: 88659
          http://trac.macports.org/changeset/88659
Author:   ciserlohn at macports.org
Date:     2012-01-07 00:24:51 -0800 (Sat, 07 Jan 2012)
Log Message:
-----------
nodejs: update to version 0.6.7; add python variants (see #32429)

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	2012-01-07 01:17:51 UTC (rev 88658)
+++ trunk/dports/devel/nodejs/Portfile	2012-01-07 08:24:51 UTC (rev 88659)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    nodejs
-version                 0.6.6
+version                 0.6.7
 categories              devel net
 platforms               darwin
 license                 {MIT BSD}
@@ -22,13 +22,11 @@
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}
 
-checksums               rmd160  e17ff8daae7ed7ad945092a71e8e0678e5c4ba60 \
-                        sha256  7abea518b1b63fd669c9ca436bf33d0bb0b09b252f06d700ccbd290fe5222102
+checksums               rmd160  be61a1be37812738eb0dd1dabe448b7bccd20f62 \
+                        sha256  b34387449723352d2f5b7a51d8c1358c247908a5f7acd7849cac45f980246d54
 
 distname                node-v${version}
 
-depends_lib             port:python27
-
 patchfiles              patch-Makefile-python.diff
 
 proc rec_glob {basedir pattern} {
@@ -57,6 +55,25 @@
 configure.args          --without-ssl
 configure.args-append   --without-npm
 
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    depends_lib         port:python25
+    configure.python    ${prefix}/bin/python2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    depends_lib         port:python26
+    configure.python    ${prefix}/bin/python2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    depends_lib         port:python27
+    configure.python    ${prefix}/bin/python2.7
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 variant ssl description {Add secure socket layer support} {
     depends_build-append    port:pkgconfig
     depends_lib-append      port:openssl

Modified: trunk/dports/devel/nodejs/files/patch-Makefile-python.diff
===================================================================
--- trunk/dports/devel/nodejs/files/patch-Makefile-python.diff	2012-01-07 01:17:51 UTC (rev 88658)
+++ trunk/dports/devel/nodejs/files/patch-Makefile-python.diff	2012-01-07 08:24:51 UTC (rev 88659)
@@ -1,12 +1,12 @@
---- Makefile.orig	2011-12-15 23:59:24.000000000 +0100
-+++ Makefile	2011-12-16 00:00:22.000000000 +0100
+--- Makefile.orig	2012-01-07 08:45:02.000000000 +0100
++++ Makefile	2012-01-07 08:51:26.000000000 +0100
 @@ -1,4 +1,4 @@
 -WAF=python tools/waf-light
 +WAF=$(PYTHON) tools/waf-light
  
  web_root = node at nodejs.org:~/web/nodejs.org/
  
-@@ -32,40 +32,40 @@
+@@ -32,41 +32,41 @@
  	@$(WAF) uninstall
  
  test: all
@@ -24,6 +24,7 @@
  test-all: all
 -	python tools/test.py --mode=debug,release
 +	$(PYTHON) tools/test.py --mode=debug,release
+ 	make test-npm
  
  test-all-http1: all
 -	python tools/test.py --mode=debug,release --use-http1
@@ -57,9 +58,9 @@
 -	python tools/test.py internet
 +	$(PYTHON) tools/test.py internet
  
- 
- out/Release/node: all
-@@ -140,7 +140,7 @@
+ test-npm: all
+ 	./node deps/npm/test/run.js
+@@ -146,7 +146,7 @@
  check:
  	@tools/waf-light check
  
@@ -68,7 +69,7 @@
  TARNAME=node-$(VERSION)
  TARBALL=$(TARNAME).tar.gz
  PKG=out/$(TARNAME).pkg
-@@ -188,10 +188,10 @@
+@@ -194,10 +194,10 @@
  	./node benchmark/idle_clients.js &
  
  jslint:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120107/89963e0e/attachment.html>