[45538] trunk/dports/aqua/qt4-mac/Portfile

[mcalhoun at macports.org]

Revision: 45538
          http://trac.macports.org/changeset/45538
Author:   mcalhoun at macports.org
Date:     2009-01-17 03:21:11 -0800 (Sat, 17 Jan 2009)
Log Message:
-----------
qt4-mac: Since MacPorts 1.7.0 defines configure.cc and configure.cxx earlier, use post-patch to ensure that correct compilers are used.
Add missing ${worksrcpath} in path name.

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2009-01-17 11:17:38 UTC (rev 45537)
+++ trunk/dports/aqua/qt4-mac/Portfile	2009-01-17 11:21:11 UTC (rev 45538)
@@ -49,9 +49,6 @@
 #    or else some generated Makefiles will not seem them
 configure.cppflags
 configure.ldflags
-# ensure that MacPorts compilers are used
-configure.cmd \
-    /usr/bin/sed -ibak -e \"s| gcc\\\$| \${CC}|g\" -e \"s| g++\\\$| \${CXX}|g\" ${worksrcpath}/mkspecs/common/mac-g++.conf && ${configure.cmd}
 
 set qt_dir ${prefix}/libexec/${name}
 
@@ -101,7 +98,11 @@
 
     # ensure that securesocketclient demo is built
     reinplace "s|contains(QT_CONFIG, openssl)|contains(QT_CONFIG, openssl) \\| contains(QT_CONFIG, openssl-linked)|" \
-        examples/network/network.pro
+        ${worksrcpath}/examples/network/network.pro
+
+    # ensure that MacPorts compilers are used
+    reinplace "s| gcc\$| ${configure.cc}|" ${worksrcpath}/mkspecs/common/mac-g++.conf
+    reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/common/mac-g++.conf
 }
 
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090117/8dc3b557/attachment-0001.html>