[101591] trunk/dports/databases

[ryandesign at macports.org]

Revision: 101591
          https://trac.macports.org/changeset/101591
Author:   ryandesign at macports.org
Date:     2013-01-14 03:21:43 -0800 (Mon, 14 Jan 2013)
Log Message:
-----------
couchdb and couchdb-devel conflict

Modified Paths:
--------------
    trunk/dports/databases/couchdb/Portfile
    trunk/dports/databases/couchdb-devel/Portfile

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2013-01-14 11:20:00 UTC (rev 101590)
+++ trunk/dports/databases/couchdb/Portfile	2013-01-14 11:21:43 UTC (rev 101591)
@@ -5,6 +5,7 @@
 PortGroup active_variants 1.1
 
 name		couchdb
+conflicts           couchdb-devel
 version		1.2.0
 revision	2
 

Modified: trunk/dports/databases/couchdb-devel/Portfile
===================================================================
--- trunk/dports/databases/couchdb-devel/Portfile	2013-01-14 11:20:00 UTC (rev 101590)
+++ trunk/dports/databases/couchdb-devel/Portfile	2013-01-14 11:21:43 UTC (rev 101591)
@@ -5,6 +5,7 @@
 PortGroup active_variants 1.1
 
 name                couchdb-devel
+conflicts           couchdb
 svn.revision        1177555
 version             1.3.0a${svn.revision}
 revision            1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130114/7a38898c/attachment.html>