[116093] trunk/dports/python/py-pyface/Portfile

mojca at macports.org mojca at macports.org
Sat Jan 18 02:42:35 PST 2014


Revision: 116093
          https://trac.macports.org/changeset/116093
Author:   mojca at macports.org
Date:     2014-01-18 02:42:35 -0800 (Sat, 18 Jan 2014)
Log Message:
-----------
py-pyface: add variants to pick the right wxPython, remove conflicts between variants (#40207, maintainer)

Modified Paths:
--------------
    trunk/dports/python/py-pyface/Portfile

Modified: trunk/dports/python/py-pyface/Portfile
===================================================================
--- trunk/dports/python/py-pyface/Portfile	2014-01-18 09:17:59 UTC (rev 116092)
+++ trunk/dports/python/py-pyface/Portfile	2014-01-18 10:42:35 UTC (rev 116093)
@@ -5,10 +5,10 @@
 
 PortGroup               python 1.0
 PortGroup               github 1.0
+PortGroup               wxWidgets 1.0
 
-#PortGroup              wxWidgets 1.0
-
 github.setup            enthought pyface 4.4.0
+revision                1
 
 name                    py-pyface
 categories-append       devel
@@ -31,22 +31,28 @@
     depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-traits
 
-    # # wx-3.0 is not fully compatible with enthought, JJS 1/8/14
-    # variant wx description {Use wxWidgets backend} {
-    #     depends_lib-append      port:py${python.version}-wxpython-3.0
-    # }
+    variant wxpython30 conflicts wxpython28 description "Use wxWidgets-3.0 (cocoa) backend (experimental)" {
+        depends_lib-append  port:py${python.version}-wxpython-3.0
+        notes-append "Warning: wxpython-3.0 is not fully compatible with pyface, but the wxpython30 variant exists for testing and future use.\n"
+    }
 
-    variant pyqt4 conflicts pyside description "Qt backend using PyQt4" {
+    variant wxpython28 conflicts wxpython28 description "Use wxWidgets-2.8 (gtk or carbon) backend" {
+        depends_lib-append  port:py${python.version}-wxpython-2.8
+    }
+
+    variant pyqt4 description "Qt backend using PyQt4" {
         # Can use either py*-pyqt4 or py*-pyqt4-devel.
-        depends_lib-append      path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
+        depends_lib-append  path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
     }
 
-    variant pyside conflicts pyqt4 description "Qt backend using PySide" {
-        depends_lib-append      port:py${python.version}-pyside
+    variant pyside description "Qt backend using PySide" {
+        depends_lib-append  port:py${python.version}-pyside
     }
 
-    default_variants-append +pyqt4
+    if {![variant_isset wxpython30] && ![variant_isset wxpython28] && ![variant_isset pyqt4] && ![variant_isset pyside]} {
+        default_variants    +pyqt4
+    }
 
-    notes "If wxpython is installed, enthought modules will try to use it\
- even if pyqt4 (or pyside) are also installed"
+    notes-append "If multiple backends are installed, the toolkit backend may be set\
+ with environment variables ETS_TOOLKIT and QT_API, e.g., ETS_TOOLKIT=qt4, QT_API=pyqt.\n"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140118/46733b58/attachment.html>


More information about the macports-changes mailing list