[77584] trunk/dports/devel/nodejs

[raimue at macports.org]

Revision: 77584
          http://trac.macports.org/changeset/77584
Author:   raimue at macports.org
Date:     2011-04-05 01:19:57 -0700 (Tue, 05 Apr 2011)
Log Message:
-----------
devel/nodejs: Do not rely on python in PATH, use a specific version

Modified Paths:
--------------
    trunk/dports/devel/nodejs/Portfile

Added Paths:
-----------
    trunk/dports/devel/nodejs/files/patch-Makefile-python.diff

Modified: trunk/dports/devel/nodejs/Portfile
===================================================================
--- trunk/dports/devel/nodejs/Portfile	2011-04-05 07:18:41 UTC (rev 77583)
+++ trunk/dports/devel/nodejs/Portfile	2011-04-05 08:19:57 UTC (rev 77584)
@@ -24,8 +24,11 @@
 
 distname                node-v${version}
 
-patchfiles              patch-platform.diff
+depends_build           port:python27
 
+patchfiles              patch-Makefile-python.diff \
+                        patch-platform.diff
+
 configure.args          --without-ssl
 
 variant ssl description {Add secure socket layer support} {
@@ -56,8 +59,9 @@
 
 build.args-append   CC=${configure.cc} \
                     CXX=${configure.cxx} \
-                    CFLAGS="${configure.cflags} ${configure.cc_archflags}"\
-                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}"
+                    CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
+                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \
+                    PYTHON=${prefix}/bin/python2.7
 
 livecheck.type      regex
 livecheck.regex     ">node-v(\\d+(?:\\.\\d+)*)${extract.suffix}<"

Added: trunk/dports/devel/nodejs/files/patch-Makefile-python.diff
===================================================================
--- trunk/dports/devel/nodejs/files/patch-Makefile-python.diff	                        (rev 0)
+++ trunk/dports/devel/nodejs/files/patch-Makefile-python.diff	2011-04-05 08:19:57 UTC (rev 77584)
@@ -0,0 +1,54 @@
+--- Makefile.orig	2011-03-18 22:25:20.000000000 +0100
++++ Makefile	2011-04-05 09:51:09.000000000 +0200
+@@ -1,4 +1,5 @@
+-WAF=python tools/waf-light
++PYTHON=python
++WAF=$(PYTHON) tools/waf-light
+ 
+ web_root = ryan at nodejs.org:~/web/nodejs.org/
+ 
+@@ -23,34 +24,34 @@
+ 	@$(WAF) uninstall
+ 
+ test: all
+-	python tools/test.py --mode=release simple message
++	$(PYTHON) tools/test.py --mode=release simple message
+ 
+ test-valgrind: all
+-	python tools/test.py --mode=release --valgrind simple message
++	$(PYTHON) tools/test.py --mode=release --valgrind simple message
+ 
+ test-all: all
+-	python tools/test.py --mode=debug,release
++	$(PYTHON) tools/test.py --mode=debug,release
+ 
+ test-all-valgrind: all
+-	python tools/test.py --mode=debug,release --valgrind
++	$(PYTHON) tools/test.py --mode=debug,release --valgrind
+ 
+ test-release: all
+-	python tools/test.py --mode=release
++	$(PYTHON) tools/test.py --mode=release
+ 
+ test-debug: all
+-	python tools/test.py --mode=debug
++	$(PYTHON) tools/test.py --mode=debug
+ 
+ test-message: all
+-	python tools/test.py message
++	$(PYTHON) tools/test.py message
+ 
+ test-simple: all
+-	python tools/test.py simple
++	$(PYTHON) tools/test.py simple
+ 
+ test-pummel: all
+-	python tools/test.py pummel
++	$(PYTHON) tools/test.py pummel
+ 
+ test-internet: all
+-	python tools/test.py internet
++	$(PYTHON) tools/test.py internet
+ 
+ build/default/node: all
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110405/abd28bb7/attachment-0001.html>