[87718] trunk/dports/devel/nodejs

[ciserlohn at macports.org]

Revision: 87718
          http://trac.macports.org/changeset/87718
Author:   ciserlohn at macports.org
Date:     2011-12-02 00:25:29 -0800 (Fri, 02 Dec 2011)
Log Message:
-----------
nodejs: update to version 0.6.4

- add $CPP to build args (ensure we are UsingTheRightCompiler)
- removed npm install patch. Installing npm can now disabled in the configure phase
- removed configure.cpp_flags. They are not used, and if they would it 
  has not the desired effect (partly reverts r87475)

Revision Links:
--------------
    http://trac.macports.org/changeset/87475

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

Removed Paths:
-------------
    trunk/dports/devel/nodejs/files/patch-wscript-npm.diff

Modified: trunk/dports/devel/nodejs/Portfile
===================================================================
--- trunk/dports/devel/nodejs/Portfile	2011-12-02 08:19:54 UTC (rev 87717)
+++ trunk/dports/devel/nodejs/Portfile	2011-12-02 08:25:29 UTC (rev 87718)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    nodejs
-version                 0.6.3
+version                 0.6.4
 categories              devel net
 platforms               darwin
 license                 {MIT BSD}
@@ -22,15 +22,14 @@
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}
 
-checksums               rmd160  be42db24394c907abf747005176f227d175abb15 \
-                        sha256  fe5642d26d04cc7e7d47daa426da2a79e244bdcbae1594a12578f0d6fe03082e
+checksums               rmd160  780ed8996a5eb16a538c772a585359926646561e \
+                        sha256  67b029f0da10ffa706cda23d6a3bb7c682ca589cd7f6647a578dcfb74a78f916
 
 distname                node-v${version}
 
 depends_lib             port:python27
 
-patchfiles              patch-Makefile-python.diff \
-                        patch-wscript-npm.diff
+patchfiles              patch-Makefile-python.diff
 
 proc rec_glob {basedir pattern} {
     set files [glob -directory $basedir -nocomplain -type f $pattern]
@@ -55,9 +54,8 @@
     }
 }
 
-# build system doesn't ensure its internal include paths come first (#28066)
-configure.cppflags      -isystem ${prefix}/include
 configure.args          --without-ssl
+configure.args-append   --without-npm
 
 variant ssl description {Add secure socket layer support} {
     depends_build-append    port:pkgconfig
@@ -81,6 +79,7 @@
 
 build.args-append   CC=${configure.cc} \
                     CXX=${configure.cxx} \
+                    CPP=${configure.cpp} \
                     CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
                     LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \
                     PYTHON=${py27_bin}

Deleted: trunk/dports/devel/nodejs/files/patch-wscript-npm.diff
===================================================================
--- trunk/dports/devel/nodejs/files/patch-wscript-npm.diff	2011-12-02 08:19:54 UTC (rev 87717)
+++ trunk/dports/devel/nodejs/files/patch-wscript-npm.diff	2011-12-02 08:25:29 UTC (rev 87718)
@@ -1,10 +0,0 @@
---- wscript.orig	2011-11-25 23:41:57.000000000 +0100
-+++ wscript	2011-11-25 23:43:19.000000000 +0100
-@@ -969,7 +969,6 @@
-   bld.install_files('${PREFIX}/bin/', 'tools/node-waf', chmod=0755)
-   bld.install_files('${LIBDIR}/node/wafadmin', 'tools/wafadmin/*.py')
-   bld.install_files('${LIBDIR}/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py')
--  install_npm(bld)
- 
- def install_npm(bld):
-   start_dir = bld.path.find_dir('deps/npm')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111202/44a44d18/attachment-0001.html>