[145610] trunk/dports/devel/nodejs

ciserlohn at macports.org ciserlohn at macports.org
Wed Feb 10 14:00:57 PST 2016


Revision: 145610
          https://trac.macports.org/changeset/145610
Author:   ciserlohn at macports.org
Date:     2016-02-10 14:00:57 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
nodejs: update to version 4.3.0; patch gyp so that the build no longer conflicts with c-ares and v8

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

Added Paths:
-----------
    trunk/dports/devel/nodejs/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff

Modified: trunk/dports/devel/nodejs/Portfile
===================================================================
--- trunk/dports/devel/nodejs/Portfile	2016-02-10 20:49:07 UTC (rev 145609)
+++ trunk/dports/devel/nodejs/Portfile	2016-02-10 22:00:57 UTC (rev 145610)
@@ -3,13 +3,9 @@
 
 PortSystem              1.0
 PortGroup               compiler_blacklist_versions 1.0
-PortGroup               conflicts_build 1.0
 
-# see https://github.com/nodejs/node/issues/2637
-conflicts_build         c-ares v8
-
 name                    nodejs
-version                 4.2.6
+version                 4.3.0
 
 categories              devel net
 platforms               darwin
@@ -28,8 +24,8 @@
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}
 
-checksums               rmd160  174fa292da5b84df6aeae105c5965f00b9a07c8f \
-                        sha256  ea5e357db8817052b17496d607c719d809ed1383e8fcf7c8ffc5214e705aefdd
+checksums               rmd160  873f1237a68376106b75a69c7ec08a51de2c67ca \
+                        sha256  18504ac6d903cd061f60a29dafcda416a078112f3404d23a7901c41a8e9706b9
 
 distname                node-v${version}
 
@@ -47,6 +43,8 @@
 
 configure.python ${prefix}/bin/python2.7
 
+patchfiles              patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
+
 post-patch {
     foreach f [concat ${worksrcpath}/configure \
                    ${worksrcpath}/tools/gyp/gyp \
@@ -103,8 +101,6 @@
 
 universal_variant       no
 
-patchfiles-append       patch-common.gypi.diff
-
 # "V8 doesn't like cache."
 configure.ccache        no
 

Added: trunk/dports/devel/nodejs/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff
===================================================================
--- trunk/dports/devel/nodejs/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff	                        (rev 0)
+++ trunk/dports/devel/nodejs/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff	2016-02-10 22:00:57 UTC (rev 145610)
@@ -0,0 +1,10 @@
+--- ./tools/gyp/pylib/gyp/generator/make.py	2016-01-20 19:08:27.000000000 -0600
++++ ./tools/gyp/pylib/gyp/generator/make.new.py	2016-01-22 14:34:20.000000000 -0600
+@@ -1211,6 +1211,7 @@
+       includes = config.get('include_dirs')
+       if includes:
+         includes = map(Sourceify, map(self.Absolutify, includes))
++        includes = reversed(includes)
+       self.WriteList(includes, 'INCS_%s' % configname, prefix='-I')
+ 
+     compilable = filter(Compilable, sources)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160210/9e834858/attachment-0001.html>


More information about the macports-changes mailing list