[46430] trunk/dports/x11/qt4-x11/Portfile

[mcalhoun at macports.org]

Revision: 46430
          http://trac.macports.org/changeset/46430
Author:   mcalhoun at macports.org
Date:     2009-02-04 14:11:31 -0800 (Wed, 04 Feb 2009)
Log Message:
-----------
qt4-x11: Since configure.cc and configure.cxx are defined earlier in MacPorts 1.7,
use reinplace to ensure correct compilers are used.

Modified Paths:
--------------
    trunk/dports/x11/qt4-x11/Portfile

Modified: trunk/dports/x11/qt4-x11/Portfile
===================================================================
--- trunk/dports/x11/qt4-x11/Portfile	2009-02-04 22:08:12 UTC (rev 46429)
+++ trunk/dports/x11/qt4-x11/Portfile	2009-02-04 22:11:31 UTC (rev 46430)
@@ -58,9 +58,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|= cc\\\$|= \${CC}|g\" -e \"s|= c++\\\$|= \${CXX}|g\" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf && ${configure.cmd}
 
 configure.env-append \
     OPENSOURCE_CXXFLAGS=-D__USE_WS_X11__
@@ -133,6 +130,10 @@
         "s|install_name\$\${LITERAL_WHITESPACE}|install_name\$\${LITERAL_WHITESPACE}\$\$\[QT_INSTALL_LIBS\]/|g" \
         ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
 
+    # ensure that MacPorts compilers are used
+    reinplace "s| cc\$| ${configure.cc}|"  ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+    reinplace "s| c++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+
     # Q_OS_MAC, Q_OS_MACX, and Q_OS_DARWIN is set for all Mac systems.
     # Q_WS_MAC is NOT set for the X11 version of QT.
     # It is not clear why so many of these had to be changed.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090204/749c2e0e/attachment.html>