[109353] users/mojca/wxports/python/py-wxpython-2.8/Portfile

[mojca at macports.org]

Revision: 109353
          https://trac.macports.org/changeset/109353
Author:   mojca at macports.org
Date:     2013-08-13 13:48:00 -0700 (Tue, 13 Aug 2013)
Log Message:
-----------
mojca/wxpython: move variants back to the subport, else python.bin is unknown (alternatively just define build.args)

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

Modified: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile	2013-08-13 20:44:21 UTC (rev 109352)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile	2013-08-13 20:48:00 UTC (rev 109353)
@@ -53,10 +53,34 @@
         }
     }
 
+    variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
+        wxWidgets.use       wxWidgets-2.8
+        depends_lib-append  port:wxWidgets-2.8
+        # TODO: the following line would end up with --no-user-cfg
+        #build.args         WX_CONFIG="${wxWidgets.wxconfig}"
+        build.cmd           ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+        destroot.cmd        ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+    }
+
+    variant gtk conflicts carbon description {use wxGTK} {
+        wxWidgets.use       wxGTK-2.8
+        depends_lib-append  port:wxgtk-2.8
+        build.cmd           ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+        destroot.cmd        ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+    }
+
+    # TODO: think a bit more about it
+    if {![variant_isset carbon] && ![variant_isset gtk]} {
+        # gtk is the default variant on >= 10.7, carbon on <= 10.6
+        if {${os.major} >= 11} {
+            default_variants-append +gtk
+        } else {
+            default_variants-append +carbon
+        }
+    }
+
     livecheck.type  none
 } else {
-    build.cmd {}
-    destroot.cmd {}
     post-destroot {
         xinstall -d -m 755 ${destroot}${prefix}/share/doc/
         file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
@@ -67,33 +91,3 @@
     livecheck.url   ${homepage}
     livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
 }
-
-# TODO: should variants be part of the port or part of subports?
-# it doesn't make any difference on how the docs are installed,
-# but user sees the option when asking for 'port info py-wxpython-2.8'
-# TODO: check whether build.cm/destroot.cmd need to be reset for the main port
-variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
-    wxWidgets.use       wxWidgets-2.8
-    depends_lib-append  port:wxWidgets-2.8
-    # TODO: the following line would end up with --no-user-cfg
-    #build.args         WX_CONFIG="${wxWidgets.wxconfig}"
-    build.cmd           ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
-    destroot.cmd        ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
-}
-
-variant gtk conflicts carbon description {use wxGTK} {
-    wxWidgets.use       wxGTK-2.8
-    depends_lib-append  port:wxgtk-2.8
-    build.cmd           ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
-    destroot.cmd        ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
-}
-
-# TODO: think a bit more about it
-if {![variant_isset carbon] && ![variant_isset gtk]} {
-    # gtk is the default variant on >= 10.7, carbon on <= 10.6
-    if {${os.major} >= 11} {
-        default_variants-append +gtk
-    } else {
-        default_variants-append +carbon
-    }
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130813/6fb9418d/attachment.html>