[146678] trunk/dports/devel

[ryandesign at macports.org]

Revision: 146678
          https://trac.macports.org/changeset/146678
Author:   ryandesign at macports.org
Date:     2016-03-15 05:46:35 -0700 (Tue, 15 Mar 2016)
Log Message:
-----------
nodejs, nodejs-devel: remove conflict with iojs (#50196)

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

Modified: trunk/dports/devel/nodejs/Portfile
===================================================================
--- trunk/dports/devel/nodejs/Portfile	2016-03-15 12:41:58 UTC (rev 146677)
+++ trunk/dports/devel/nodejs/Portfile	2016-03-15 12:46:35 UTC (rev 146678)
@@ -19,7 +19,7 @@
                         Machine or Python's Twisted. Node takes the event model a bit further-it \
                         presents the event loop as a language construct instead of as a library.
 
-conflicts               nodejs-devel iojs
+conflicts               nodejs-devel
 
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}

Modified: trunk/dports/devel/nodejs-devel/Portfile
===================================================================
--- trunk/dports/devel/nodejs-devel/Portfile	2016-03-15 12:41:58 UTC (rev 146677)
+++ trunk/dports/devel/nodejs-devel/Portfile	2016-03-15 12:46:35 UTC (rev 146678)
@@ -19,7 +19,7 @@
                         Machine or Python's Twisted. Node takes the event model a bit further-it \
                         presents the event loop as a language construct instead of as a library.
 
-conflicts               nodejs iojs
+conflicts               nodejs
 
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160315/a9736247/attachment.html>