[111837] trunk/dports/python/py-pyqt4/Portfile

[michaelld at macports.org]

Revision: 111837
          https://trac.macports.org/changeset/111837
Author:   michaelld at macports.org
Date:     2013-10-03 08:04:58 -0700 (Thu, 03 Oct 2013)
Log Message:
-----------
py*-pyqt4:
* use dbus-python for 2.6/7 only; does not yet work otherwise;
* set a global version to keep port happy, which fixes ticket #40652.

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

Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile	2013-10-03 14:41:42 UTC (rev 111836)
+++ trunk/dports/python/py-pyqt4/Portfile	2013-10-03 15:04:58 UTC (rev 111837)
@@ -29,13 +29,17 @@
     }
 }
 
+# keep 'port' happy, by defining a global version which is for the
+# primary release
+
+set patch 4.10
+version ${patch}.3
+
 if {$subport ne $name} {
 
-    set patch 4.10
-
     if {[string last devel ${subport}] != -1} {
 
-        # devel port; use different download info
+        # devel port
 
         version         ${patch}.4
         set snapshot    507d15ce70b8
@@ -50,7 +54,8 @@
 
     } else {
 
-        version         ${patch}.3
+        # release port
+
         revision        2
 
         master_sites    sourceforge:pyqt
@@ -140,13 +145,6 @@
         CFLAGS="${cflags}" \
         CXXFLAGS="${cxxflags}"
 
-    # support for dbus-python in < 3.0
-
-    if {${python.version} < 30} {
-        depends_lib-append port:dbus-python${python.version}
-        configure.args-append --dbus=${python.include}/dbus-1.0
-    }
-
     # subport for Python 2.4 or 2.5 installs into non-Framework locations
     if {${python.version} <= 25} {
         configure.cmd-append " -d ${python.pkgd} -b ${prefix}/bin"
@@ -168,6 +166,12 @@
             configure.args-append   --qsci-api
             depends_lib-append      port:qscintilla
         }
+
+        # dbus-python does not yet work correctly with 2.5- or 3.0+
+
+        depends_lib-append port:dbus-python${python.version}
+        configure.args-append --dbus=${python.include}/dbus-1.0
+
     }
 
     post-configure {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131003/889e850d/attachment.html>