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

[michaelld at macports.org]

Revision: 138421
          https://trac.macports.org/changeset/138421
Author:   michaelld at macports.org
Date:     2015-07-07 12:28:44 -0700 (Tue, 07 Jul 2015)
Log Message:
-----------
py*-pyqt4:
+ be explicit about the qsci-api-destdir;
+ rearrange bits into similar parts;
+ hopefully addresses ticket #48275;
+ rev-bump for changes, just in case.

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

Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile	2015-07-07 19:25:13 UTC (rev 138420)
+++ trunk/dports/python/py-pyqt4/Portfile	2015-07-07 19:28:44 UTC (rev 138421)
@@ -20,7 +20,7 @@
 homepage        http://www.riverbankcomputing.co.uk/software/pyqt/intro
 
 version         4.11.4
-revision        1
+revision        2
 
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set patch       [lindex [split ${version} .] 2]
@@ -74,7 +74,8 @@
     dist_subdir        python
 
     depends_lib-append port:py${python.version}-sip \
-                       port:qt4-mac
+                       port:qt4-mac \
+                       port:dbus-python${python.version}
 
     # patch-configure.py* file alters configure.py so that the
     # qtdesigner plugin can link.  It ensures that both LFLAGS are
@@ -128,6 +129,8 @@
                             -e QtXml \
                             -e QtXmlPatterns \
                             -e QAxContainer \
+                            -e QtDesigner \
+                            --dbus=${python.include}/dbus-1.0 \
                             --no-qsci-api
 
     # SIP's configure tools ignore environment variables, so have to
@@ -148,11 +151,6 @@
         CFLAGS="${cflags}" \
         CXXFLAGS="${cxxflags}"
 
-    configure.args-append   -e QtDesigner
-
-    depends_lib-append      port:dbus-python${python.version}
-    configure.args-append   --dbus=${python.include}/dbus-1.0
-
     variant phonon description {Add phonon support} {
         configure.args-append   -e phonon
         depends_lib-append      port:phonon
@@ -160,8 +158,15 @@
 
     variant scintilla description {Add QScintilla API file } {
         configure.args-delete   --no-qsci-api
-        configure.args-append   --qsci-api
+        configure.args-append   --qsci-api \
+                                --qsci-api-destdir=${qt_data_dir}/qsci
         depends_lib-append      port:qscintilla
+
+        post-destroot {
+            # move the Qsci API file to a Python specific name
+            move ${destroot}${qt_data_dir}/qsci/api/python/PyQt4.api \
+                ${destroot}${qt_data_dir}/qsci/api/python/PyQt4-Python${python.branch}.api
+        }
     }
 
     post-configure {
@@ -233,12 +238,6 @@
                 ${destroot}${qt_plugins_dir}/designer/${new_name}"
         }
 
-        # (b) Qsci API file, if it exists (if Qsci is installed at build time)
-        if {[variant_isset scintilla]} {
-            move ${destroot}${qt_data_dir}/qsci/api/python/PyQt4.api \
-                ${destroot}${qt_data_dir}/qsci/api/python/PyQt4-Python${python.branch}.api
-        }
-
         # delete python3 code from python2 installs and vice versa,
         # if each exists
         if {${python.version} >= 30} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150707/5225477f/attachment.html>