[44375] trunk/dports
mcalhoun at macports.org
mcalhoun at macports.org
Sat Dec 27 01:47:54 PST 2008
Revision: 44375
http://trac.macports.org/changeset/44375
Author: mcalhoun at macports.org
Date: 2008-12-27 01:47:52 -0800 (Sat, 27 Dec 2008)
Log Message:
-----------
multi-port commit: To allow cmake based ports to find qt4-mac, QTDIR was defined in configure.env.
${QTDIR}/bin is, however, the last place to be searched for qmake, so other Qt installations can interfere (see #17773).
For an unknown reason, some systems fail to find qmake entirely (see #17773 and #17773).
Setting -DQT_QMAKE_EXECUTABLE=... in configure.args solves both problems.
A revision increase is warranted because another qmake may have been found and used to build the packages.
Fixes #17773 and #17773.
Modified Paths:
--------------
trunk/dports/audio/phonon/Portfile
trunk/dports/databases/sqliteman/Portfile
trunk/dports/devel/akonadi/Portfile
trunk/dports/devel/automoc/Portfile
trunk/dports/devel/soprano/Portfile
trunk/dports/graphics/qimageblitz/Portfile
trunk/dports/kde/kdebase4/Portfile
trunk/dports/kde/kdegraphics4/Portfile
trunk/dports/kde/kdelibs4/Portfile
trunk/dports/kde/kdelibs4-devel/Portfile
trunk/dports/kde/kdepimlibs4/Portfile
trunk/dports/science/stellarium/Portfile
trunk/dports/x11/qtoctave-mac/Portfile
Modified: trunk/dports/audio/phonon/Portfile
===================================================================
--- trunk/dports/audio/phonon/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/audio/phonon/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name phonon
version 4.2.0
-revision 2
+revision 3
categories audio kde kde4
maintainers illogic-al at macports.org openmaintainer
description Cross Platform Multimedia API used by KDE4
@@ -25,7 +25,6 @@
configure.cmd cmake
configure.ccache no
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
@@ -33,6 +32,7 @@
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/databases/sqliteman/Portfile
===================================================================
--- trunk/dports/databases/sqliteman/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/databases/sqliteman/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -5,7 +5,7 @@
name sqliteman
version 1.2.0
-revision 1
+revision 2
description GUI tool for Sqlite3
long_description The best developer's and/or admin's GUI tool for Sqlite3 in the world. \
No joking here (or just a bit only) - it contains the most complete \
@@ -28,8 +28,7 @@
port:qt4-mac \
port:qscintilla
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
-configure.args
+configure.args -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake
Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- trunk/dports/devel/akonadi/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/devel/akonadi/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name akonadi
version 1.0.0
-revision 2
+revision 3
categories devel kde kde4
maintainers illogic-al at macports.org openmaintainer
description A personal information management storage service.
@@ -24,7 +24,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
@@ -33,6 +32,7 @@
-DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/devel/automoc/Portfile
===================================================================
--- trunk/dports/devel/automoc/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/devel/automoc/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name automoc
version 0.9.87
-revision 2
+revision 3
categories devel kde kde4
maintainers illogic-al at macports.org openmaintainer
description A tool which automatically creates .moc files and compiles them in.
@@ -22,7 +22,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
@@ -32,6 +31,7 @@
-DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/devel/soprano/Portfile
===================================================================
--- trunk/dports/devel/soprano/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/devel/soprano/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name soprano
version 2.1.1
-revision 2
+revision 3
categories devel
maintainers illogic-al at macports.org openmaintainer
description The Qt-based RDF framework.
@@ -23,7 +23,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
@@ -32,6 +31,7 @@
-DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/graphics/qimageblitz/Portfile
===================================================================
--- trunk/dports/graphics/qimageblitz/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/graphics/qimageblitz/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name qimageblitz
version 0.0.5
-revision 2
+revision 3
categories graphics kde kde4
maintainers illogic-al at macports.org openmaintainer
description Graphical effects library for KDE4
@@ -26,7 +26,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
@@ -37,6 +36,7 @@
-DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_OSX_SYSROOT=${universal_sysroot} \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/kdebase4/Portfile
===================================================================
--- trunk/dports/kde/kdebase4/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/kde/kdebase4/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name kdebase4
version 4.1.3
-revision 2
+revision 3
categories kde kde4
maintainers illogic-al at macports.org openmaintainer
description KDE4 applications and libraries from the base package
@@ -32,7 +32,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
@@ -48,6 +47,7 @@
-DWITH_XKB=OFF \
-DX11_XKB_INCLUDE_PATH=\"\" \
-DWITH_Xine=OFF \
+ -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
-Wno-dev
variant universal {
Modified: trunk/dports/kde/kdegraphics4/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics4/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/kde/kdegraphics4/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name kdegraphics4
version 4.1.3
-revision 2
+revision 3
categories kde kde4
maintainers illogic-al at macports.org openmaintainer
description KDE4 graphics applications
@@ -29,7 +29,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.args ../${distname} -DBUILD_SHARED_LIBS=ON \
@@ -43,6 +42,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
# Manually defining qca location forces building of Okular's
# encrytped openoffice document viewer. Might not want to do that.
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/kde/kdelibs4/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name kdelibs4
version 4.1.3
-revision 2
+revision 3
categories kde kde4
maintainers illogic-al at macports.org openmaintainer
description KDE4 core libraries
@@ -33,7 +33,6 @@
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.ccache no
configure.compiler gcc-4.2
@@ -46,6 +45,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
#post-configure {
Modified: trunk/dports/kde/kdelibs4-devel/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4-devel/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/kde/kdelibs4-devel/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name kdelibs4-devel
version 4.1.85
-revision 1
+revision 2
categories kde kde4
maintainers illogic-al at macports.org openmaintainer
description KDE4 core libraries
@@ -32,7 +32,6 @@
depends_build port:cmake \
port:automoc
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
use_parallel_build yes
worksrcdir build
post-extract { file mkdir ${worksrcpath} }
@@ -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
#post-configure {
Modified: trunk/dports/kde/kdepimlibs4/Portfile
===================================================================
--- trunk/dports/kde/kdepimlibs4/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/kde/kdepimlibs4/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name kdepimlibs4
version 4.1.3
-revision 2
+revision 3
categories kde kde4
maintainers illogic-al at macports.org openmaintainer
description KDE4 core PIM libraries
@@ -24,7 +24,6 @@
depends_build port:cmake \
port:automoc
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
use_parallel_build yes
worksrcdir build
pre-configure { file mkdir ${worksrcpath} }
@@ -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/science/stellarium/Portfile
===================================================================
--- trunk/dports/science/stellarium/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/science/stellarium/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name stellarium
version 0.10.0
-revision 1
+revision 2
categories science
platforms darwin
maintainers raimue \
@@ -38,12 +38,12 @@
reinplace "s:/Users/Shared/stellarium/:${applications_dir}/:" ${worksrcpath}/CMakeLists.txt
}
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
# cmake is unable to find FreeType2, so specify it here
configure.pre_args -DFreeType2_INCLUDE_DIR:PATH=${prefix}/include/freetype2 \
-DFreeType2_LIBRARIES:FILEPATH=${prefix}/lib/libfreetype.dylib
-configure.args -G \"Unix Makefiles\" .
+configure.args -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
+ -G \"Unix Makefiles\" .
# This post-destroot phase is similar to the 'make macosx_bundle' target,
# but it does not copy libraries into the bundle and does not require perl as
Modified: trunk/dports/x11/qtoctave-mac/Portfile
===================================================================
--- trunk/dports/x11/qtoctave-mac/Portfile 2008-12-27 09:31:42 UTC (rev 44374)
+++ trunk/dports/x11/qtoctave-mac/Portfile 2008-12-27 09:47:52 UTC (rev 44375)
@@ -4,7 +4,7 @@
name qtoctave-mac
version 0.7.4
-revision 2
+revision 3
categories x11 math
platforms darwin
maintainers andrea.damore openmaintainer
@@ -31,9 +31,9 @@
rmd160 18436cdb862c9ed4f49c5c10b96be7b8201cbae4
-configure.env-append QTDIR=${prefix}/libexec/qt4-mac
configure.cmd cmake
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
-configure.args -G \"Unix Makefiles\" .
+configure.args -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
+ -G \"Unix Makefiles\" .
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081227/a7e6b5f1/attachment-0001.html>
More information about the macports-changes
mailing list