[74982] trunk/dports/aqua/qt4-mac

[michaelld at macports.org]

Revision: 74982
          http://trac.macports.org/changeset/74982
Author:   michaelld at macports.org
Date:     2011-01-10 08:46:08 -0800 (Mon, 10 Jan 2011)
Log Message:
-----------
qt4-mac: Hopefully fixes ticket #27815. Patch the corewlan QMake build file so that the developer_dir isn't hard-wired to /Developer.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2011-01-10 15:10:04 UTC (rev 74981)
+++ trunk/dports/aqua/qt4-mac/Portfile	2011-01-10 16:46:08 UTC (rev 74982)
@@ -74,6 +74,11 @@
 # only; this patch requires that (2) already be in place.
 patchfiles-append   patch-mkspecs_common_mac.conf.diff
 
+# (5) fix the corewlan qmake file to use non-standard Developer SDK
+# location under 10.6, e.g., for some developers doing both iOS and
+# OSX.  This patch does not change behavior for 10.4 or 10.5.
+patchfiles-append   patch-src-plugins-bearer-corewlan-corewlan.pro.diff
+
 global TARGET
 set TARGET ""
 
@@ -132,6 +137,10 @@
     reinplace "/QMAKE_CONF_COMPILER/ \
              s at tail@grep -v \"\\\\\\\\\\\\\\\\\$\" | tail@" \
         ${worksrcpath}/configure
+
+    # fix the corewlan .pro file to use the correct developer dir
+    reinplace "s, at DEVELOPER_DIR@,${developer_dir},g" \
+        ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
 }
 
 # The build process uses -fconstant-cfstrings.

Added: trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff	2011-01-10 16:46:08 UTC (rev 74982)
@@ -0,0 +1,11 @@
+--- src/plugins/bearer/corewlan/corewlan.pro.orig	2011-01-10 11:23:43.000000000 -0500
++++ src/plugins/bearer/corewlan/corewlan.pro	2011-01-10 11:29:19.000000000 -0500
+@@ -5,7 +5,7 @@
+ LIBS += -framework Foundation -framework SystemConfiguration
+ 
+ contains(QT_CONFIG, corewlan) {
+-    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
++    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "@DEVELOPER_DIR@/SDKs/MacOSX10.6.sdk") {
+          LIBS += -framework CoreWLAN -framework Security
+          DEFINES += MAC_SDK_10_6
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110110/40056d7e/attachment.html>