[62211] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Thu Dec 31 13:36:34 PST 2009
Revision: 62211
http://trac.macports.org/changeset/62211
Author: ryandesign at macports.org
Date: 2009-12-31 13:36:31 -0800 (Thu, 31 Dec 2009)
Log Message:
-----------
Allow qt4-mac or qt4-mac-devel to satisfy the dependency; see
http://lists.macosforge.org/pipermail/macports-users/2009-December/018200.html
Modified Paths:
--------------
trunk/dports/aqua/LyX/Portfile
trunk/dports/aqua/djview/Portfile
trunk/dports/aqua/mumble/Portfile
trunk/dports/aqua/qtiplot/Portfile
trunk/dports/aqua/qtoctave-mac/Portfile
trunk/dports/aqua/qtpfsgui/Portfile
trunk/dports/audio/hydrogen/Portfile
trunk/dports/audio/liblastfm/Portfile
trunk/dports/comms/cutecom-qt4-mac/Portfile
trunk/dports/databases/sqliteman/Portfile
trunk/dports/devel/qca/Portfile
trunk/dports/devel/qgit/Portfile
trunk/dports/devel/qscintilla/Portfile
trunk/dports/editors/sigil/Portfile
trunk/dports/editors/tea/Portfile
trunk/dports/gis/cgal/Portfile
trunk/dports/gis/qlandkarte/Portfile
trunk/dports/graphics/GLC_lib/Portfile
trunk/dports/graphics/Quarter/Portfile
trunk/dports/graphics/lprof/Portfile
trunk/dports/graphics/poppler/Portfile
trunk/dports/graphics/qwt/Portfile
trunk/dports/graphics/qwt52/Portfile
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC09/Portfile
trunk/dports/multimedia/lmms/Portfile
trunk/dports/multimedia/mlt/Portfile
trunk/dports/net/murmur/Portfile
trunk/dports/net/psi/Portfile
trunk/dports/python/py-pyqt4/Portfile
trunk/dports/python/py-pyqwt/Portfile
trunk/dports/python/py25-pyqt4/Portfile
trunk/dports/python/py25-pyqwt/Portfile
trunk/dports/python/py26-pyqt4/Portfile
trunk/dports/science/emergent/Portfile
trunk/dports/science/root/Portfile
trunk/dports/science/stellarium/Portfile
trunk/dports/security/Vidalia/Portfile
trunk/dports/security/ophcrack/Portfile
trunk/dports/textproc/doxygen/Portfile
Modified: trunk/dports/aqua/LyX/Portfile
===================================================================
--- trunk/dports/aqua/LyX/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/aqua/LyX/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -20,7 +20,7 @@
platforms darwin
depends_build port:pkgconfig
-depends_lib port:qt4-mac \
+depends_lib path:bin/qmake-mac:qt4-mac \
bin:tex:texlive \
port:ImageMagick \
port:python25
Modified: trunk/dports/aqua/djview/Portfile
===================================================================
--- trunk/dports/aqua/djview/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/aqua/djview/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -32,7 +32,7 @@
depends_lib \
port:djvulibre \
- port:qt4-mac
+ path:bin/qmake-mac:qt4-mac
configure.env QTDIR=${prefix}/libexec/qt4-mac
Modified: trunk/dports/aqua/mumble/Portfile
===================================================================
--- trunk/dports/aqua/mumble/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/aqua/mumble/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -26,7 +26,7 @@
livecheck.regex "${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}"
depends_lib \
- port:qt4-mac \
+ path:bin/qmake-mac:qt4-mac \
port:openssl \
port:portaudio \
port:ice-cpp \
Modified: trunk/dports/aqua/qtiplot/Portfile
===================================================================
--- trunk/dports/aqua/qtiplot/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/aqua/qtiplot/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -22,7 +22,7 @@
master_sites http://download.berlios.de/qtiplot/
use_bzip2 yes
-depends_lib port:qt4-mac \
+depends_lib path:bin/qmake-mac:qt4-mac \
port:muparser \
port:boost \
port:gsl \
Modified: trunk/dports/aqua/qtoctave-mac/Portfile
===================================================================
--- trunk/dports/aqua/qtoctave-mac/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/aqua/qtoctave-mac/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -19,7 +19,7 @@
master_sites http://forja.rediris.es/frs/download.php/744/
depends_lib port:octave \
- port:qt4-mac
+ path:bin/qmake-mac:qt4-mac
depends_build bin:cmake:cmake
patchfiles patch-src-CMakeList.diff \
Modified: trunk/dports/aqua/qtpfsgui/Portfile
===================================================================
--- trunk/dports/aqua/qtpfsgui/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/aqua/qtpfsgui/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -16,7 +16,7 @@
patchfiles patch-qtpfsgui-1.9.2-app-path.diff patch-qtpfsgui-1.9.2-exp10f.diff
patch.pre_args -p1
-depends_lib port:qt4-mac port:exiv2 port:openexr port:ilmbase port:fftw-3-single port:tiff
+depends_lib path:bin/qmake-mac:qt4-mac port:exiv2 port:openexr port:ilmbase port:fftw-3-single port:tiff
checksums md5 8a037c1dc75f04752dc36a59e7237fc4
Modified: trunk/dports/audio/hydrogen/Portfile
===================================================================
--- trunk/dports/audio/hydrogen/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/audio/hydrogen/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -22,7 +22,7 @@
depends_build port:scons
-depends_lib port:qt4-mac \
+depends_lib path:bin/qmake-mac:qt4-mac \
port:flac \
port:libsndfile \
port:libtar
Modified: trunk/dports/audio/liblastfm/Portfile
===================================================================
--- trunk/dports/audio/liblastfm/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/audio/liblastfm/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -19,7 +19,7 @@
sha1 1dabd8d67f4a36aebad29608c6f89b895472c25a \
rmd160 39098fe55f88c3831ab5b1380c1e978c2ef55aac
-depends_build port:ruby port:qt4-mac
+depends_build port:ruby path:bin/qmake-mac:qt4-mac
depends_lib port:libsamplerate port:fftw-3-single
Modified: trunk/dports/comms/cutecom-qt4-mac/Portfile
===================================================================
--- trunk/dports/comms/cutecom-qt4-mac/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/comms/cutecom-qt4-mac/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -18,7 +18,7 @@
platforms darwin
depends_build port:cmake
-depends_lib port:qt4-mac
+depends_lib path:bin/qmake-mac:qt4-mac
patchfiles patch-qcppdialogimpl.cpp \
patch-qcppdialogimpl.h \
Modified: trunk/dports/databases/sqliteman/Portfile
===================================================================
--- trunk/dports/databases/sqliteman/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/databases/sqliteman/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -25,7 +25,7 @@
depends_build port:cmake
depends_lib port:sqlite3 \
- port:qt4-mac \
+ path:bin/qmake-mac:qt4-mac \
port:qscintilla
configure.cmd cmake
Modified: trunk/dports/devel/qca/Portfile
===================================================================
--- trunk/dports/devel/qca/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/devel/qca/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -22,7 +22,7 @@
sha1 5b896647426637e1974703f2950786746408c70b \
rmd160 256ca518fea507d03b67c0f5d26ba2ac7b3db517
-depends_lib port:qt4-mac
+depends_lib path:bin/qmake-mac:qt4-mac
configure.args --qtdir=${prefix}/libexec/qt4-mac
Modified: trunk/dports/devel/qgit/Portfile
===================================================================
--- trunk/dports/devel/qgit/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/devel/qgit/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -20,7 +20,7 @@
master_sites sourceforge
checksums md5 f863efa000aa1549f803c6ad743decd6
-depends_lib port:qt4-mac port:git-core
+depends_lib path:bin/qmake-mac:qt4-mac port:git-core
patchfiles patch_src_namespace_def.cpp.diff patch_src_qgit.cpp.diff
Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================
--- trunk/dports/devel/qscintilla/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/devel/qscintilla/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -29,7 +29,7 @@
sha1 17962bb64d2641f9e181b39fdca39228170488a3 \
rmd160 19e5d5c331705c217c5192b1fcac5d298942db69
-depends_lib port:qt4-mac \
+depends_lib path:bin/qmake-mac:qt4-mac \
path:bin/python:python25
worksrcdir ${distname}
Modified: trunk/dports/editors/sigil/Portfile
===================================================================
--- trunk/dports/editors/sigil/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/editors/sigil/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -29,7 +29,7 @@
depends_build bin:cmake:cmake \
bin:gmake:gmake
-depends_lib port:qt4-mac-devel
+depends_lib path:bin/qmake-mac:qt4-mac-devel
configure.env PATH="${prefix}/libexec/qt4-mac/bin:$env(PATH)"
configure.cmd "cmake"
Modified: trunk/dports/editors/tea/Portfile
===================================================================
--- trunk/dports/editors/tea/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/editors/tea/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -16,7 +16,7 @@
sha1 49d3c2d5058652f527ea82f6fe1e0c69f6d8433f \
rmd160 1c2dc1173038a5a0334dff3c6fd56501bb28dd20
-depends_lib port:qt4-mac
+depends_lib path:bin/qmake-mac:qt4-mac
use_bzip2 yes
Modified: trunk/dports/gis/cgal/Portfile
===================================================================
--- trunk/dports/gis/cgal/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/gis/cgal/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -58,7 +58,7 @@
}
variant demos {
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
configure.args-append -DWITH_examples=TRUE
configure.args-append -DWITH_demos=TRUE
Modified: trunk/dports/gis/qlandkarte/Portfile
===================================================================
--- trunk/dports/gis/qlandkarte/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/gis/qlandkarte/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -20,7 +20,7 @@
depends_lib port:proj \
port:libusb-compat \
- port:qt4-mac
+ path:bin/qmake-mac:qt4-mac
configure.args --with-extra-includes=${prefix}/include\
--with-extra-libs=${prefix}/lib \
Modified: trunk/dports/graphics/GLC_lib/Portfile
===================================================================
--- trunk/dports/graphics/GLC_lib/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/graphics/GLC_lib/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -14,7 +14,7 @@
homepage http://www.glc-lib.net/
-depends_lib port:qt4-mac
+depends_lib path:bin/qmake-mac:qt4-mac
master_sites sourceforge:glc-lib
distname GLC_lib_src_$version
Modified: trunk/dports/graphics/Quarter/Portfile
===================================================================
--- trunk/dports/graphics/Quarter/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/graphics/Quarter/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -23,4 +23,4 @@
configure.ldflags-append -L${prefix}/libexec/qt4-mac/lib
configure.cppflags-append -I${prefix}/libexec/qt4-mac/include
-depends_lib port:qt4-mac port:Coin
+depends_lib path:bin/qmake-mac:qt4-mac port:Coin
Modified: trunk/dports/graphics/lprof/Portfile
===================================================================
--- trunk/dports/graphics/lprof/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/graphics/lprof/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -24,7 +24,7 @@
cvs.date ${version}
cvs.module lprof
-depends_lib port:qt4-mac port:libusb-compat
+depends_lib path:bin/qmake-mac:qt4-mac port:libusb-compat
depends_build port:cmake
worksrcdir lprof
Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/graphics/poppler/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -59,7 +59,7 @@
variant qt4 description { Support for the QT toolkit } {
configure.args-delete --disable-poppler-qt4
if ([variant_isset quartz]) {
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
set qt_dir ${prefix}/libexec/qt4-mac
} else {
depends_lib-append port:qt4-x11
Modified: trunk/dports/graphics/qwt/Portfile
===================================================================
--- trunk/dports/graphics/qwt/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/graphics/qwt/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -42,7 +42,7 @@
}
variant qt4 conflicts qt3 description "Use qt4-mac" {
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
}
if { ![variant_isset qt3] && ![variant_isset qt4] } {
Modified: trunk/dports/graphics/qwt52/Portfile
===================================================================
--- trunk/dports/graphics/qwt52/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/graphics/qwt52/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -42,18 +42,14 @@
}
-variant qt3 conflicts qt4 qt4-devel description "Use qt3-mac" {
+variant qt3 conflicts qt4 description "Use qt3-mac" {
depends_lib-append port:qt3-mac
}
-variant qt4 conflicts qt3 qt4-devel description "Use qt4-mac" {
- depends_lib-append port:qt4-mac
+variant qt4 conflicts qt3 description "Use qt4-mac" {
+ depends_lib-append path:bin/qmake-mac:qt4-mac
}
-variant qt4devel conflicts qt3 qt4 description "Use qt4-mac-devel" {
- depends_lib-append port:qt4-mac-devel
-}
-
-if { ![variant_isset qt3] && ![variant_isset qt4] && ![variant_isset qt4devel] } {
+if { ![variant_isset qt3] && ![variant_isset qt4] } {
default_variants +qt4
}
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/multimedia/VLC/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -210,7 +210,7 @@
set qt_dir ${prefix}/libexec/qt4-x11
configure.cppflags-append -D__USE_WS_X11__
} else {
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
set qt_dir ${prefix}/libexec/qt4-mac
}
configure.env-append QTDIR=${qt_dir}
Modified: trunk/dports/multimedia/VLC09/Portfile
===================================================================
--- trunk/dports/multimedia/VLC09/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/multimedia/VLC09/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -197,7 +197,7 @@
set qt_dir ${prefix}/libexec/qt4-x11
configure.cppflags-append -D__USE_WS_X11__
} else {
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
set qt_dir ${prefix}/libexec/qt4-mac
}
configure.env-append QTDIR=${qt_dir}
Modified: trunk/dports/multimedia/lmms/Portfile
===================================================================
--- trunk/dports/multimedia/lmms/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/multimedia/lmms/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -26,7 +26,7 @@
configure.args-append -DWANT_VST=off
depends_lib port:libsndfile \
- port:qt4-mac \
+ path:bin/qmake-mac:qt4-mac \
path:lib/pkgconfig/sdl.pc:libsdl \
port:fftw-3-single \
port:fluidsynth
Modified: trunk/dports/multimedia/mlt/Portfile
===================================================================
--- trunk/dports/multimedia/mlt/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/multimedia/mlt/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -38,7 +38,7 @@
port:libsamplerate \
path:lib/pkgconfig/sdl.pc:libsdl \
port:libvorbis \
- port:qt4-mac \
+ path:bin/qmake-mac:qt4-mac \
port:sox
configure.args --enable-gpl \
Modified: trunk/dports/net/murmur/Portfile
===================================================================
--- trunk/dports/net/murmur/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/net/murmur/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -27,7 +27,7 @@
livecheck.regex "& Murmur (\\d+\\.\\d+(\\.\\d+))"
depends_lib \
- port:qt4-mac \
+ path:bin/qmake-mac:qt4-mac \
port:openssl
depends_build \
Modified: trunk/dports/net/psi/Portfile
===================================================================
--- trunk/dports/net/psi/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/net/psi/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -24,7 +24,7 @@
rmd160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f
depends_lib lib:libz:zlib \
- port:qt4-mac
+ path:bin/qmake-mac:qt4-mac
configure.args --qtdir=${prefix}/libexec/qt4-mac
Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/python/py-pyqt4/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -23,7 +23,7 @@
sha1 6d1f3a717e551cd762b0adbd9c50f213c3ce8cbe \
rmd160 da91bedccfb6b1e3cbc69f527dd57ead83eb647e
-depends_lib port:py-sip port:qt4-mac
+depends_lib port:py-sip path:bin/qmake-mac:qt4-mac
#patchfiles patch-configure.py
Modified: trunk/dports/python/py-pyqwt/Portfile
===================================================================
--- trunk/dports/python/py-pyqwt/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/python/py-pyqwt/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -17,7 +17,7 @@
sha1 d1b55e4a7400889e1d0831f8d6f3b692fc37aecb \
rmd160 e8bbf154a9e30894977494829bf379a807fdf1e9
-depends_lib port:qt4-mac port:qwt
+depends_lib path:bin/qmake-mac:qt4-mac port:qwt
worksrcdir ${worksrcdir}/configure
Modified: trunk/dports/python/py25-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py25-pyqt4/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/python/py25-pyqt4/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -24,7 +24,7 @@
sha1 8f3b94b4f1a5c5a80a1916e29a92e8669d2784ff \
rmd160 cb2b8800143eef8cf7610925ee8e44498b5d2f66
-depends_lib port:py25-sip port:qt4-mac
+depends_lib port:py25-sip path:bin/qmake-mac:qt4-mac
set pyversion 2.5
set qt_dir ${prefix}/libexec/qt4-mac
Modified: trunk/dports/python/py25-pyqwt/Portfile
===================================================================
--- trunk/dports/python/py25-pyqwt/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/python/py25-pyqwt/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -25,7 +25,7 @@
sha1 797f37c63dec660272f6a8ccfd16a017df0ad640 \
rmd160 e4c8a63d623d974cd500e29fbc62255746ca7feb
-depends_lib port:qt4-mac \
+depends_lib path:bin/qmake-mac:qt4-mac \
port:qwt52 \
port:py25-numpy
Modified: trunk/dports/python/py26-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py26-pyqt4/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/python/py26-pyqt4/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -24,7 +24,7 @@
sha1 8f3b94b4f1a5c5a80a1916e29a92e8669d2784ff \
rmd160 cb2b8800143eef8cf7610925ee8e44498b5d2f66
-depends_lib port:py26-sip port:qt4-mac
+depends_lib port:py26-sip path:bin/qmake-mac:qt4-mac
set pyversion 2.6
set qt_dir ${prefix}/libexec/qt4-mac
Modified: trunk/dports/science/emergent/Portfile
===================================================================
--- trunk/dports/science/emergent/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/science/emergent/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -28,5 +28,5 @@
use_parallel_build yes
depends_build bin:cmake:cmake
-depends_lib port:readline port:qt4-mac port:Coin port:Quarter port:gsl port:ode
+depends_lib port:readline path:bin/qmake-mac:qt4-mac port:Coin port:Quarter port:gsl port:ode
Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/science/root/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -23,7 +23,7 @@
depends_lib port:libpng \
port:giflib \
port:tiff \
- port:qt4-mac \
+ path:bin/qmake-mac:qt4-mac \
port:freetype
configure.args --enable-shared \
Modified: trunk/dports/science/stellarium/Portfile
===================================================================
--- trunk/dports/science/stellarium/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/science/stellarium/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -26,7 +26,7 @@
universal_variant no
depends_build port:cmake
-depends_lib port:boost port:libsdl_mixer path:lib/pkgconfig/sdl.pc:libsdl port:qt4-mac port:freetype
+depends_lib port:boost port:libsdl_mixer path:lib/pkgconfig/sdl.pc:libsdl path:bin/qmake-mac:qt4-mac port:freetype
patch {
reinplace "s:/Users/Shared/stellarium/:${applications_dir}/:" ${worksrcpath}/CMakeLists.txt
Modified: trunk/dports/security/Vidalia/Portfile
===================================================================
--- trunk/dports/security/Vidalia/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/security/Vidalia/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -23,7 +23,7 @@
sha1 36d81c063f001db4509a4ad5e3eab1fb849f0562 \
rmd160 82ea9736176128b6fbffde8b3bac7bfbce41f8eb
-depends_lib-append port:tor port:qt4-mac
+depends_lib-append port:tor path:bin/qmake-mac:qt4-mac
set qmake_path ${prefix}/bin/qmake
@@ -36,7 +36,7 @@
}
variant x11 description {build with qt4-x11} {
- depends_lib-delete port:qt4-mac
+ depends_lib-delete path:bin/qmake-mac:qt4-mac
configure.args-delete -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac
depends_lib-append port:qt4-x11
Modified: trunk/dports/security/ophcrack/Portfile
===================================================================
--- trunk/dports/security/ophcrack/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/security/ophcrack/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -72,7 +72,7 @@
}
variant gui description {Builds the GUI version instead of the CLI version, requires the qt4-mac port} {
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
configure.args-delete --disable-gui
configure.args-append --with-libqt4=${prefix}/libexec/qt4-mac
Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile 2009-12-31 17:55:05 UTC (rev 62210)
+++ trunk/dports/textproc/doxygen/Portfile 2009-12-31 21:36:31 UTC (rev 62211)
@@ -67,7 +67,7 @@
variant wizard description {Include the GUI wizard based on Qt} {
configure.env-append QTDIR=${prefix}/libexec/qt4-mac
build.env-append QTDIR=${prefix}/libexec/qt4-mac
- depends_lib-append port:qt4-mac
+ depends_lib-append path:bin/qmake-mac:qt4-mac
configure.args-append --with-doxywizard
# on Macs, qmake builds .app directories
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091231/1629c38f/attachment-0001.html>
More information about the macports-changes
mailing list