[44387] trunk/dports/kde
illogic-al at macports.org
illogic-al at macports.org
Sat Dec 27 10:32:19 PST 2008
Revision: 44387
http://trac.macports.org/changeset/44387
Author: illogic-al at macports.org
Date: 2008-12-27 10:32:17 -0800 (Sat, 27 Dec 2008)
Log Message:
-----------
Revert qt detection part of last commit and use mcalhoun's fix.
Modified Paths:
--------------
trunk/dports/kde/amarok/Portfile
trunk/dports/kde/amarok-devel/Portfile
trunk/dports/kde/kdebase4/Portfile
trunk/dports/kde/kdegraphics4/Portfile
trunk/dports/kde/kdelibs4/Portfile
trunk/dports/kde/kdemultimedia4/Portfile
trunk/dports/kde/kdenetwork4/Portfile
trunk/dports/kde/kdepimlibs4/Portfile
trunk/dports/kde/kdesdk4/Portfile
trunk/dports/kde/kdetoys4/Portfile
trunk/dports/kde/kdeutils4/Portfile
trunk/dports/kde/ktorrent/Portfile
Modified: trunk/dports/kde/amarok/Portfile
===================================================================
--- trunk/dports/kde/amarok/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/amarok/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -31,7 +31,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -41,6 +40,7 @@
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/amarok-devel/Portfile
===================================================================
--- trunk/dports/kde/amarok-devel/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/amarok-devel/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -39,7 +39,6 @@
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -49,6 +48,7 @@
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
default_variants +debug
Modified: trunk/dports/kde/kdebase4/Portfile
===================================================================
--- trunk/dports/kde/kdebase4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdebase4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -35,7 +35,6 @@
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
Modified: trunk/dports/kde/kdegraphics4/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdegraphics4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -31,7 +31,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdelibs4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -36,7 +36,6 @@
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
Modified: trunk/dports/kde/kdemultimedia4/Portfile
===================================================================
--- trunk/dports/kde/kdemultimedia4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdemultimedia4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -28,7 +28,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -38,6 +37,7 @@
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
# wait for port -DCDPARANOIA_INCLUDE_DIR=${prefix}/include \
Modified: trunk/dports/kde/kdenetwork4/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdenetwork4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -27,7 +27,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -40,6 +39,7 @@
-DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \
-DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/kdepimlibs4/Portfile
===================================================================
--- trunk/dports/kde/kdepimlibs4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdepimlibs4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -31,7 +31,6 @@
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
Modified: trunk/dports/kde/kdesdk4/Portfile
===================================================================
--- trunk/dports/kde/kdesdk4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdesdk4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -26,7 +26,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -37,6 +36,7 @@
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/kdetoys4/Portfile
===================================================================
--- trunk/dports/kde/kdetoys4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdetoys4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -26,7 +26,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -36,6 +35,7 @@
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/kdeutils4/Portfile
===================================================================
--- trunk/dports/kde/kdeutils4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/kdeutils4/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -26,7 +26,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -36,6 +35,7 @@
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/ktorrent/Portfile
===================================================================
--- trunk/dports/kde/ktorrent/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
+++ trunk/dports/kde/ktorrent/Portfile 2008-12-27 18:32:17 UTC (rev 44387)
@@ -27,7 +27,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -40,6 +39,7 @@
-DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \
-DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \
-DCMAKE_OSX_SYSROOT=${sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081227/64d4a227/attachment-0001.html>
More information about the macports-changes
mailing list