[115351] trunk/dports/python

[mojca at macports.org]

Revision: 115351
          https://trac.macports.org/changeset/115351
Author:   mojca at macports.org
Date:     2013-12-31 12:06:54 -0800 (Tue, 31 Dec 2013)
Log Message:
-----------
py-robotframework-ride: revert accidental commit r115345, delete accidental addition of py-wxpython-3.0-phoenix

Revision Links:
--------------
    https://trac.macports.org/changeset/115345

Modified Paths:
--------------
    trunk/dports/python/py-robotframework-ride/Portfile

Removed Paths:
-------------
    trunk/dports/python/py-wxpython-3.0-phoenix/

Modified: trunk/dports/python/py-robotframework-ride/Portfile
===================================================================
--- trunk/dports/python/py-robotframework-ride/Portfile	2013-12-31 20:03:04 UTC (rev 115350)
+++ trunk/dports/python/py-robotframework-ride/Portfile	2013-12-31 20:06:54 UTC (rev 115351)
@@ -4,13 +4,12 @@
 PortSystem          1.0
 PortGroup           python 1.0
 PortGroup           wxWidgets 1.0
-PortGroup           active_variants 1.1
 
 name                py-robotframework-ride
 set internal_name   robotframework-ride
 
 version             1.2.3
-revision            2
+revision            3
 
 license             Apache-2
 
@@ -35,50 +34,29 @@
     build.cmd           ${python.bin} setup.py
     destroot.cmd        ${python.bin} setup.py
     depends_lib-append  port:py${python.version}-robotframework \
-                        port:py${python.version}-paver
+        port:py${python.version}-wxpython-2.8 \
+        port:py${python.version}-paver
 
+    # TODO: this port probably needs a variant to switch between py-wxpython-2.8 and py-wxpython-3.0
+    #       until it starts working properly on py-wxpython-3.0
+    if {${os.major}>=12} {
+        depends_lib-delete port:py${python.version}-wxpython-2.8
+        depends_lib-append port:py${python.version}-wxpython-3.0
+    }
+
     post-extract {
         reinplace "s/pybot/pybot-${python.branch}/g" $worksrcpath/src/robotide/contrib/testrunner/runprofiles.py
     }
 
-    variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxPython 3.0 (not fully functional yet)} {
-        wxWidgets.use           wxPython-3.0
-        depends_lib-append      port:py${python.version}-wxpython-3.0
-    }
-
-    variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxPython 2.8} {
-        wxWidgets.use           wxWidgets-2.8
-        depends_lib-append      port:py${python.version}-wxpython-2.8
-        require_active_variants port:py${python.version}-wxpython-2.8 carbon gtk
-        # TODO: conditionally use the following notes on x86_64 only
-        notes "To run, use 'arch -i386 ride.py-${python.branch}' to use 32-bit architecture"
-    }
-
-    variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use GTK-based wxPython 2.8} {
-        wxWidgets.use           wxGTK-2.8
-        depends_lib-append      port:py${python.version}-wxpython-2.8
-        require_active_variants port:py${python.version}-wxpython-2.8 gtk carbon
-    }
-
-    if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
-        if {[vercmp $xcodeversion 4.4] < 0} {
-            # if wxWidgets 2.8 can be installed, it is best to use py-wxpython-2.8 anyway (except that one needs to enable 32-bit by default)
-            default_variants +wxwidgets28
-        } else {
-            if { ${python.version} == 27} {
-                # buggy
-                default_variants +wxwidgets30
-            } else {
-                default_variants +wxgtk28
-            }
-        }
-    }
+    # with 'py-wxpython-3.0' and 'py-wxpython-2.8 +gtk' this should not be needed
+    # this should only be issued when depending on 'py-wxpython-2.8 +carbon' on 64-bit OS or deleted
+    # notes "To run, use 'arch -i386 ride.py-${python.branch}' to use 32bit architecture"
 }
 
 if {${name} eq ${subport}} {
-    livecheck.type  regex
-    livecheck.url   ${homepage}
-    livecheck.regex ${internal_name}-(\[0-9.\]+)\\.tar\\.\[bg\]z
+    livecheck.type     regex
+    livecheck.url      ${homepage}
+    livecheck.regex    ${internal_name}-(\[0-9.\]+)\\.tar\\.\[bg\]z
 } else {
-    livecheck.type  none
+    livecheck.type		none
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131231/7b811f7d/attachment.html>