[79382] trunk/dports/python

[ryandesign at macports.org]

Revision: 79382
          http://trac.macports.org/changeset/79382
Author:   ryandesign at macports.org
Date:     2011-06-11 20:58:34 -0700 (Sat, 11 Jun 2011)
Log Message:
-----------
py*-cherrypy and py*-cherrypy3 conflict

Modified Paths:
--------------
    trunk/dports/python/py-cherrypy/Portfile
    trunk/dports/python/py-cherrypy3/Portfile
    trunk/dports/python/py25-cherrypy/Portfile
    trunk/dports/python/py25-cherrypy3/Portfile
    trunk/dports/python/py26-cherrypy/Portfile
    trunk/dports/python/py26-cherrypy3/Portfile

Modified: trunk/dports/python/py-cherrypy/Portfile
===================================================================
--- trunk/dports/python/py-cherrypy/Portfile	2011-06-12 03:57:16 UTC (rev 79381)
+++ trunk/dports/python/py-cherrypy/Portfile	2011-06-12 03:58:34 UTC (rev 79382)
@@ -5,6 +5,7 @@
 PortGroup           python24 1.0
 
 name                py-cherrypy
+conflicts           py-cherrypy3
 version             2.3.0
 revision            1
 categories          python www

Modified: trunk/dports/python/py-cherrypy3/Portfile
===================================================================
--- trunk/dports/python/py-cherrypy3/Portfile	2011-06-12 03:57:16 UTC (rev 79381)
+++ trunk/dports/python/py-cherrypy3/Portfile	2011-06-12 03:58:34 UTC (rev 79382)
@@ -5,6 +5,7 @@
 PortGroup           python24 1.0
 
 name                py-cherrypy3
+conflicts           py-cherrypy
 version             3.2.0
 categories          python www
 maintainers         akitada openmaintainer

Modified: trunk/dports/python/py25-cherrypy/Portfile
===================================================================
--- trunk/dports/python/py25-cherrypy/Portfile	2011-06-12 03:57:16 UTC (rev 79381)
+++ trunk/dports/python/py25-cherrypy/Portfile	2011-06-12 03:58:34 UTC (rev 79382)
@@ -5,6 +5,7 @@
 PortGroup           python25 1.0
 
 name                py25-cherrypy
+conflicts           py25-cherrypy3
 version             2.3.0
 revision            1
 categories          python www

Modified: trunk/dports/python/py25-cherrypy3/Portfile
===================================================================
--- trunk/dports/python/py25-cherrypy3/Portfile	2011-06-12 03:57:16 UTC (rev 79381)
+++ trunk/dports/python/py25-cherrypy3/Portfile	2011-06-12 03:58:34 UTC (rev 79382)
@@ -5,6 +5,7 @@
 PortGroup           python25 1.0
 
 name                py25-cherrypy3
+conflicts           py25-cherrypy
 version             3.2.0
 categories          python www
 maintainers         akitada openmaintainer

Modified: trunk/dports/python/py26-cherrypy/Portfile
===================================================================
--- trunk/dports/python/py26-cherrypy/Portfile	2011-06-12 03:57:16 UTC (rev 79381)
+++ trunk/dports/python/py26-cherrypy/Portfile	2011-06-12 03:58:34 UTC (rev 79382)
@@ -5,6 +5,7 @@
 PortGroup           python26 1.0
 
 name                py26-cherrypy
+conflicts           py26-cherrypy3
 version             2.3.0
 revision            1
 categories          python www

Modified: trunk/dports/python/py26-cherrypy3/Portfile
===================================================================
--- trunk/dports/python/py26-cherrypy3/Portfile	2011-06-12 03:57:16 UTC (rev 79381)
+++ trunk/dports/python/py26-cherrypy3/Portfile	2011-06-12 03:58:34 UTC (rev 79382)
@@ -5,6 +5,7 @@
 PortGroup           python26 1.0
 
 name                py26-cherrypy3
+conflicts           py26-cherrypy
 version             3.2.0
 categories          python www
 maintainers         akitada openmaintainer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110611/c5156db8/attachment.html>