Allow qt4-mac or qt4-mac-devel to satisfy the dependency; see

http://lists.macosforge.org/pipermail/macports-users/2009-December/018200.html git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@62211 d073be05-634f-4543-b044-5fe20cf6d1d6
macports · Dec 31, 2009 · d86d361 · d86d361
1 parent facc583
commit d86d361
Show file tree

Hide file tree

Showing 40 changed files with 44 additions and 48 deletions.
diff --git a/aqua/LyX/Portfile b/aqua/LyX/Portfile
@@ -20,7 +20,7 @@ long_description	LyX is an advanced open source document processor \
 
 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

diff --git a/aqua/djview/Portfile b/aqua/djview/Portfile
@@ -32,7 +32,7 @@ depends_build \
 
 depends_lib \
     port:djvulibre \
-    port:qt4-mac
+    path:bin/qmake-mac:qt4-mac
 
 configure.env             QTDIR=${prefix}/libexec/qt4-mac
 

diff --git a/aqua/mumble/Portfile b/aqua/mumble/Portfile
@@ -26,7 +26,7 @@ livecheck.url       http://sourceforge.net/project/showfiles.php?group_id=147372
 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 \

diff --git a/aqua/qtiplot/Portfile b/aqua/qtiplot/Portfile
@@ -22,7 +22,7 @@ homepage            http://soft.proindependent.com/qtiplot.html
 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 \

diff --git a/aqua/qtoctave-mac/Portfile b/aqua/qtoctave-mac/Portfile
@@ -19,7 +19,7 @@ distname    qtoctave-${version}
 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 \

diff --git a/aqua/qtpfsgui/Portfile b/aqua/qtpfsgui/Portfile
@@ -16,7 +16,7 @@ master_sites	sourceforge
 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
 

diff --git a/audio/hydrogen/Portfile b/audio/hydrogen/Portfile
@@ -22,7 +22,7 @@ checksums           md5     88f036f32153843997837a95c46ecbc5 \
 
 depends_build       port:scons
 
-depends_lib         port:qt4-mac \
+depends_lib         path:bin/qmake-mac:qt4-mac \
                     port:flac \
                     port:libsndfile \
                     port:libtar

diff --git a/audio/liblastfm/Portfile b/audio/liblastfm/Portfile
@@ -19,7 +19,7 @@ checksums           md5     3f73222ebc31635941832b01e7a494b6 \
                     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
 

diff --git a/comms/cutecom-qt4-mac/Portfile b/comms/cutecom-qt4-mac/Portfile
@@ -18,7 +18,7 @@ homepage            http://cutecom.sourceforge.net
 
 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 \

diff --git a/databases/sqliteman/Portfile b/databases/sqliteman/Portfile
@@ -25,7 +25,7 @@ use_bzip2           yes
 depends_build       port:cmake
 
 depends_lib         port:sqlite3    \
-                    port:qt4-mac    \
+                    path:bin/qmake-mac:qt4-mac    \
                     port:qscintilla
 
 configure.cmd       cmake

diff --git a/devel/qca/Portfile b/devel/qca/Portfile
@@ -22,7 +22,7 @@ checksums            md5 07d54358ef4880d05b3c6f56b629aa55 \
                      sha1 5b896647426637e1974703f2950786746408c70b \
                      rmd160 256ca518fea507d03b67c0f5d26ba2ac7b3db517
 
-depends_lib          port:qt4-mac
+depends_lib          path:bin/qmake-mac:qt4-mac
 
 configure.args       --qtdir=${prefix}/libexec/qt4-mac
 

diff --git a/devel/qgit/Portfile b/devel/qgit/Portfile
@@ -20,7 +20,7 @@ worksrcdir          qgit
 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
 

diff --git a/devel/qscintilla/Portfile b/devel/qscintilla/Portfile
@@ -29,7 +29,7 @@ checksums           md5     dd69520ec91f1acb97a4eb74ddde37c9 \
                     sha1    17962bb64d2641f9e181b39fdca39228170488a3 \
                     rmd160  19e5d5c331705c217c5192b1fcac5d298942db69
 
-depends_lib         port:qt4-mac \
+depends_lib         path:bin/qmake-mac:qt4-mac \
                     path:bin/python:python25
 
 worksrcdir          ${distname}

diff --git a/editors/sigil/Portfile b/editors/sigil/Portfile
@@ -29,7 +29,7 @@ checksums           md5     f91bb765db8af3eba92516bc8426b40c \
 
 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"

diff --git a/editors/tea/Portfile b/editors/tea/Portfile
@@ -16,7 +16,7 @@ checksums               md5     072f7d60db0b5ffb6f0b3411af22620e \
                         sha1    49d3c2d5058652f527ea82f6fe1e0c69f6d8433f \
                         rmd160  1c2dc1173038a5a0334dff3c6fd56501bb28dd20
 
-depends_lib             port:qt4-mac
+depends_lib             path:bin/qmake-mac:qt4-mac
 
 use_bzip2               yes
 

diff --git a/gis/cgal/Portfile b/gis/cgal/Portfile
@@ -58,7 +58,7 @@ variant universal {
 }
 
 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

diff --git a/gis/qlandkarte/Portfile b/gis/qlandkarte/Portfile
@@ -20,7 +20,7 @@ checksums        md5 51f804235511f1c10ae8538f86743135
 
 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 \

diff --git a/graphics/GLC_lib/Portfile b/graphics/GLC_lib/Portfile
@@ -14,7 +14,7 @@ long_description    C++ class library that enables the quick creation of an Open
 
 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

diff --git a/graphics/Quarter/Portfile b/graphics/Quarter/Portfile
@@ -23,4 +23,4 @@ configure.env-append    QTDIR=${prefix}/libexec/qt4-mac/
 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
diff --git a/graphics/lprof/Portfile b/graphics/lprof/Portfile
@@ -24,7 +24,7 @@ cvs.root            :pserver:anonymous@lprof.cvs.sourceforge.net:/cvsroot/lprof
 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

diff --git a/graphics/poppler/Portfile b/graphics/poppler/Portfile
@@ -59,7 +59,7 @@ if {![variant_isset quartz]} {
 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

diff --git a/graphics/qwt/Portfile b/graphics/qwt/Portfile
@@ -42,7 +42,7 @@ variant qt3 conflicts qt4 description "Use qt3-mac" {
 }
 
 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] } {

diff --git a/graphics/qwt52/Portfile b/graphics/qwt52/Portfile
@@ -42,18 +42,14 @@ post-destroot {
 }
 
 
-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
 }
diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
@@ -210,7 +210,7 @@ variant qt4 description {Build using QT4 UI.  This will use qt4-x11 if +x11 and
         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}

diff --git a/multimedia/VLC09/Portfile b/multimedia/VLC09/Portfile
@@ -197,7 +197,7 @@ variant qt4 description {Build using QT4 UI.  This will use qt4-x11 if +x11 and
         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}

diff --git a/multimedia/lmms/Portfile b/multimedia/lmms/Portfile
@@ -26,7 +26,7 @@ checksums           md5     6d58d73b44baddadc4f0ac6464fbd530 \
 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

diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
@@ -38,7 +38,7 @@ depends_lib         port:atk \
                     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 \

diff --git a/net/murmur/Portfile b/net/murmur/Portfile
@@ -27,7 +27,7 @@ distname            mumble-${version}
 livecheck.regex     "&#38; Murmur (\\d+\\.\\d+(\\.\\d+))"
 
 depends_lib \
-    port:qt4-mac \
+    path:bin/qmake-mac:qt4-mac \
     port:openssl
 
 depends_build \

diff --git a/net/psi/Portfile b/net/psi/Portfile
@@ -24,7 +24,7 @@ checksums           md5     9d7dcce3bcab53b741a712199bd986be \
                     rmd160  0c4a07726c2f9819da0f8aa8f1982e939f1fc20f
 
 depends_lib         lib:libz:zlib \
-                    port:qt4-mac
+                    path:bin/qmake-mac:qt4-mac
 
 
 configure.args      --qtdir=${prefix}/libexec/qt4-mac

diff --git a/python/py-pyqt4/Portfile b/python/py-pyqt4/Portfile
@@ -23,7 +23,7 @@ checksums md5 6d2a11cd1372ce98b486e9bc5de3c0fc \
           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
 

diff --git a/python/py-pyqwt/Portfile b/python/py-pyqwt/Portfile
@@ -17,7 +17,7 @@ checksums       md5 c9d662a0d4fc95cec75d3c526e4e748a \
                 sha1 d1b55e4a7400889e1d0831f8d6f3b692fc37aecb \
                 rmd160 e8bbf154a9e30894977494829bf379a807fdf1e9
 
-depends_lib     port:qt4-mac port:qwt
+depends_lib     path:bin/qmake-mac:qt4-mac port:qwt
 
 worksrcdir      ${worksrcdir}/configure
 

diff --git a/python/py25-pyqt4/Portfile b/python/py25-pyqt4/Portfile
@@ -24,7 +24,7 @@ checksums           md5     2bde0a6ab4728048962075e12a32d8e6 \
                     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

diff --git a/python/py25-pyqwt/Portfile b/python/py25-pyqwt/Portfile
@@ -25,7 +25,7 @@ checksums          md5     fcd6c6029090d473dcc9df497516eae7 \
                    sha1    797f37c63dec660272f6a8ccfd16a017df0ad640 \
                    rmd160  e4c8a63d623d974cd500e29fbc62255746ca7feb
 
-depends_lib        port:qt4-mac \
+depends_lib        path:bin/qmake-mac:qt4-mac \
                    port:qwt52 \
                    port:py25-numpy
 

diff --git a/python/py26-pyqt4/Portfile b/python/py26-pyqt4/Portfile
@@ -24,7 +24,7 @@ checksums           md5     2bde0a6ab4728048962075e12a32d8e6 \
                     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

diff --git a/science/emergent/Portfile b/science/emergent/Portfile
@@ -28,5 +28,5 @@ build.dir       ${worksrcpath}/build
 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
 
diff --git a/science/root/Portfile b/science/root/Portfile
@@ -23,7 +23,7 @@ worksrcdir          root
 depends_lib         port:libpng \
                     port:giflib \
                     port:tiff \
-                    port:qt4-mac \
+                    path:bin/qmake-mac:qt4-mac \
                     port:freetype
 
 configure.args      --enable-shared \

diff --git a/science/stellarium/Portfile b/science/stellarium/Portfile
@@ -26,7 +26,7 @@ checksums       md5     c544fff9e75e9317055075b658ae5924 \
 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

diff --git a/security/Vidalia/Portfile b/security/Vidalia/Portfile
@@ -23,7 +23,7 @@ checksums           md5     005afad126dc6142d7748ec185d9fafe \
                     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 @@ destroot {
 }
 
 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

diff --git a/security/ophcrack/Portfile b/security/ophcrack/Portfile
@@ -72,7 +72,7 @@ post-activate {
 }
 
 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

diff --git a/textproc/doxygen/Portfile b/textproc/doxygen/Portfile
@@ -67,7 +67,7 @@ variant docs description {Include the doxygen PDF documentation and LaTeX} {
 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