[44386] trunk/dports/kde
illogic-al at macports.org
illogic-al at macports.org
Sat Dec 27 10:09:00 PST 2008
Revision: 44386
http://trac.macports.org/changeset/44386
Author: illogic-al at macports.org
Date: 2008-12-27 10:08:59 -0800 (Sat, 27 Dec 2008)
Log Message:
-----------
Brute force treatment of breakage caused by new qt4-mac.
Also update some nomaintainer ports to read universal settings from macports.conf.
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 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/amarok/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -31,6 +31,7 @@
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/amarok-devel/Portfile
===================================================================
--- trunk/dports/kde/amarok-devel/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/amarok-devel/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -39,6 +39,7 @@
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/kdebase4/Portfile
===================================================================
--- trunk/dports/kde/kdebase4/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdebase4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -35,6 +35,7 @@
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 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdegraphics4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -31,6 +31,7 @@
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 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdelibs4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -36,6 +36,7 @@
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 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdemultimedia4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -20,7 +20,7 @@
# port:cdparanoia
# need newer version which is not ported to OSX
-depends_build port:cmake
+depends_build port:cmake port:automoc
use_parallel_build yes
worksrcdir build
@@ -28,6 +28,7 @@
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,13 +37,13 @@
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
- -DCMAKE_OSX_SYSROOT=${sysroot} \
+ -DCMAKE_OSX_SYSROOT=${universal_sysroot} \
-Wno-dev
# wait for port -DCDPARANOIA_INCLUDE_DIR=${prefix}/include \
variant universal {
configure.universal_args-delete --disable-dependency-tracking
- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"ppc\;i386\"
+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
}
variant debug description "Enable debug binaries" {
Modified: trunk/dports/kde/kdenetwork4/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork4/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdenetwork4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -19,7 +19,7 @@
depends_lib port:kdebase4 port:qca
-depends_build port:cmake
+depends_build port:cmake port:automoc
use_parallel_build yes
worksrcdir build
@@ -27,6 +27,7 @@
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,12 +39,12 @@
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
-DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \
-DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \
- -DCMAKE_OSX_SYSROOT=${sysroot} \
+ -DCMAKE_OSX_SYSROOT=${universal_sysroot} \
-Wno-dev
variant universal {
configure.universal_args-delete --disable-dependency-tracking
- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"ppc\;i386\"
+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
}
variant debug description "Enable debug binaries" {
Modified: trunk/dports/kde/kdepimlibs4/Portfile
===================================================================
--- trunk/dports/kde/kdepimlibs4/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdepimlibs4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -31,6 +31,7 @@
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 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdesdk4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -18,7 +18,7 @@
depends_lib port:kdelibs4 port:kdebase4
-depends_build port:cmake
+depends_build port:cmake port:automoc
use_parallel_build yes
worksrcdir build
@@ -26,7 +26,8 @@
configure.cmd cmake
configure.ccache no
-configure.args ../${distname} -DBUILD_SHARED_LIBS:BOOL=ON \
+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 \
-DCMAKE_BUILD_TYPE=Release \
@@ -35,12 +36,12 @@
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/ \
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
- -DCMAKE_OSX_SYSROOT=${sysroot} \
+ -DCMAKE_OSX_SYSROOT=${universal_sysroot} \
-Wno-dev
variant universal {
configure.universal_args-delete --disable-dependency-tracking
- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"ppc\;i386\"
+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
}
variant debug description "Enable debug binaries" {
Modified: trunk/dports/kde/kdetoys4/Portfile
===================================================================
--- trunk/dports/kde/kdetoys4/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdetoys4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -18,7 +18,7 @@
depends_lib port:kdelibs4 port:kdebase4
-depends_build port:cmake
+depends_build port:cmake port:automoc
use_parallel_build yes
worksrcdir build
@@ -26,6 +26,7 @@
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 \
@@ -34,11 +35,12 @@
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
+ -DCMAKE_OSX_SYSROOT=${universal_sysroot} \
-Wno-dev
variant universal {
configure.universal_args-delete --disable-dependency-tracking
- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"ppc\;i386\"
+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
}
variant debug description "Enable debug binaries" {
Modified: trunk/dports/kde/kdeutils4/Portfile
===================================================================
--- trunk/dports/kde/kdeutils4/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/kdeutils4/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -18,7 +18,7 @@
depends_lib port:kdelibs4 port:kdebase4
-depends_build port:cmake
+depends_build port:cmake port:automoc
use_parallel_build yes
worksrcdir build
@@ -26,7 +26,8 @@
configure.cmd cmake
configure.ccache no
-configure.args ../${distname} -DBUILD_SHARED_LIBS:BOOL=ON \
+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 \
-DCMAKE_BUILD_TYPE=Release \
@@ -34,12 +35,12 @@
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DPHONON_INCLUDE_DIR=${prefix}/include \
-DPHONON_LIBRARY=${prefix}/lib/libphonon.dylib \
- -DCMAKE_OSX_SYSROOT=${sysroot} \
+ -DCMAKE_OSX_SYSROOT=${universal_sysroot} \
-Wno-dev
variant universal {
configure.universal_args-delete --disable-dependency-tracking
- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"ppc\;i386\"
+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
}
variant debug description "Enable debug binaries" {
Modified: trunk/dports/kde/ktorrent/Portfile
===================================================================
--- trunk/dports/kde/ktorrent/Portfile 2008-12-27 17:47:25 UTC (rev 44385)
+++ trunk/dports/kde/ktorrent/Portfile 2008-12-27 18:08:59 UTC (rev 44386)
@@ -27,6 +27,7 @@
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 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081227/029e1793/attachment.html>
More information about the macports-changes
mailing list