[54054] trunk/dports/python/py26-pyqt4

[dh at macports.org]

Revision: 54054
          http://trac.macports.org/changeset/54054
Author:   dh at macports.org
Date:     2009-07-19 16:47:52 -0700 (Sun, 19 Jul 2009)
Log Message:
-----------
Two fixes to broken port
- upgrade to 4.5.2 to incorporate upstream's fix to licence check
- patch configure.py to ensure qtdesigner can link, now that qt4-mac is no longer configured with explicit -L flags

Not waiting for maintainer as port is currently non functional

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

Added Paths:
-----------
    trunk/dports/python/py26-pyqt4/files/
    trunk/dports/python/py26-pyqt4/files/patch-configure.py

Modified: trunk/dports/python/py26-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py26-pyqt4/Portfile	2009-07-19 21:53:21 UTC (rev 54053)
+++ trunk/dports/python/py26-pyqt4/Portfile	2009-07-19 23:47:52 UTC (rev 54054)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem	1.0
@@ -3,5 +4,5 @@
 
 name		py26-pyqt4
-version		4.5.1
+version		4.5.2
 categories	python devel
 platforms	macosx
@@ -18,17 +19,22 @@
 		http://pyqwt.sourceforge.net/support/
 distname	PyQt-mac-gpl-${version}
 
-checksums md5    6183de3147c7b7ada195f98c781e09a9 \
-          sha1   073d8a60079086ab3377a93e14acabeeba76004f \
-          rmd160 5ce46cfbc2ba70f7c8d953f1999ae6e0f92b02b8
+checksums md5    158a7a0804ce2fbc748a9a41105e34fe \
+          sha1   4fa04583829927a6bacba90adb9fabee682b3a7b \
+          rmd160 9a766254813bee83ccb923f4cae08dc084ee0927
 
 depends_lib	port:py26-sip port:qt4-mac
 
-#patchfiles	patch-configure.py
-
 set pyversion 2.6
 set qt_dir	${prefix}/libexec/qt4-mac
 
+# The patch file alters configure.py so that the qtdesigner plugin can link.
+# - it ensures that both LFLAGS are included and that the relevant version framework is linked
+patchfiles	patch-configure.py
+post-patch {
+    reinplace "s|@@MACPORTS_PYTHON_FRAMEWORK@@|${frameworks_dir}/Python.framework/Versions/${pyversion}/Python|" ${worksrcpath}/configure.py
+}
+
 pre-configure {
 	file copy -force ${qt_dir}/mkspecs/macx-g++/qmake.conf \
 		${worksrcpath}/qmake.conf
@@ -46,6 +52,7 @@
 configure.post_args	LFLAGS="-F${prefix}/Library/Frameworks -L${prefix}/lib"
 
 build.target    all
+use_parallel_build yes
 
 test.run	yes
 test.cmd	cd qt && ${prefix}/bin/python2.6 -c 'import PyQt4'

Added: trunk/dports/python/py26-pyqt4/files/patch-configure.py
===================================================================
--- trunk/dports/python/py26-pyqt4/files/patch-configure.py	                        (rev 0)
+++ trunk/dports/python/py26-pyqt4/files/patch-configure.py	2009-07-19 23:47:52 UTC (rev 54054)
@@ -0,0 +1,11 @@
+--- configure.py.orig	2009-07-15 01:37:10.000000000 +1200
++++ configure.py	2009-07-19 18:28:19.000000000 +1200
+@@ -840,7 +840,7 @@
+                 if sys.platform == "darwin":
+                     # We need to work out how to specify the right framework
+                     # version.
+-                    link = "-framework Python"
++                    link = "%s @@MACPORTS_PYTHON_FRAMEWORK@@" % sipcfg.build_macros().get('LFLAGS', '')
+                 elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
+                       glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
+                     lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090719/eebf4486/attachment.html>