[109859] users/mojca/wxports/python

[mojca at macports.org]

Revision: 109859
          https://trac.macports.org/changeset/109859
Author:   mojca at macports.org
Date:     2013-08-20 14:56:07 -0700 (Tue, 20 Aug 2013)
Log Message:
-----------
mojca/wxpython: py2X-wxpython-2.8 and py2X-wxpython-2.9 conflict with each other (no idea if this can be solved)

Modified Paths:
--------------
    users/mojca/wxports/python/py-wxpython-2.8/Portfile
    users/mojca/wxports/python/py-wxpython-3.0/Portfile

Modified: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile	2013-08-20 21:50:58 UTC (rev 109858)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile	2013-08-20 21:56:07 UTC (rev 109859)
@@ -44,6 +44,7 @@
 extract.post_args   "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
 
 if {$subport != $name} {
+    conflicts               py${python.version}-wxpython-3.0
     patchfiles              patch-config.py.diff
 
     variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {

Modified: users/mojca/wxports/python/py-wxpython-3.0/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-3.0/Portfile	2013-08-20 21:50:58 UTC (rev 109858)
+++ users/mojca/wxports/python/py-wxpython-3.0/Portfile	2013-08-20 21:56:07 UTC (rev 109859)
@@ -43,6 +43,7 @@
 extract.post_args   "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
 
 if {$subport != $name} {
+    conflicts           py${python.version}-wxpython-2.8
     wxWidgets.use       wxPython-3.0
     depends_lib-append  port:${wxWidgets.port}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130820/b24d75ce/attachment.html>