Changeset 62211


Ignore:
Timestamp:
Dec 31, 2009, 9:36:31 PM (10 years ago)
Author:
ryandesign@…
Message:

Allow qt4-mac or qt4-mac-devel to satisfy the dependency; see
http://lists.macosforge.org/pipermail/macports-users/2009-December/018200.html

Location:
trunk/dports
Files:
40 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/LyX/Portfile

    r61922 r62211  
    2121platforms                   darwin
    2222depends_build       port:pkgconfig
    23 depends_lib                 port:qt4-mac \
     23depends_lib                 path:bin/qmake-mac:qt4-mac \
    2424                                    bin:tex:texlive \
    2525                                    port:ImageMagick \
  • trunk/dports/aqua/djview/Portfile

    r57230 r62211  
    3333depends_lib \
    3434    port:djvulibre \
    35     port:qt4-mac
     35    path:bin/qmake-mac:qt4-mac
    3636
    3737configure.env             QTDIR=${prefix}/libexec/qt4-mac
  • trunk/dports/aqua/mumble/Portfile

    r61923 r62211  
    2727
    2828depends_lib \
    29     port:qt4-mac \
     29    path:bin/qmake-mac:qt4-mac \
    3030    port:openssl \
    3131    port:portaudio \
  • trunk/dports/aqua/qtiplot/Portfile

    r60163 r62211  
    2323use_bzip2           yes
    2424
    25 depends_lib         port:qt4-mac \
     25depends_lib         path:bin/qmake-mac:qt4-mac \
    2626                    port:muparser \
    2727                    port:boost \
  • trunk/dports/aqua/qtoctave-mac/Portfile

    r57130 r62211  
    2020
    2121depends_lib   port:octave \
    22               port:qt4-mac
     22              path:bin/qmake-mac:qt4-mac
    2323depends_build bin:cmake:cmake
    2424
  • trunk/dports/aqua/qtpfsgui/Portfile

    r44216 r62211  
    1717patch.pre_args  -p1
    1818
    19 depends_lib     port:qt4-mac port:exiv2 port:openexr port:ilmbase port:fftw-3-single port:tiff
     19depends_lib     path:bin/qmake-mac:qt4-mac port:exiv2 port:openexr port:ilmbase port:fftw-3-single port:tiff
    2020
    2121checksums       md5 8a037c1dc75f04752dc36a59e7237fc4
  • trunk/dports/audio/hydrogen/Portfile

    r58617 r62211  
    2323depends_build       port:scons
    2424
    25 depends_lib         port:qt4-mac \
     25depends_lib         path:bin/qmake-mac:qt4-mac \
    2626                    port:flac \
    2727                    port:libsndfile \
  • trunk/dports/audio/liblastfm/Portfile

    r59297 r62211  
    2020                    rmd160  39098fe55f88c3831ab5b1380c1e978c2ef55aac
    2121
    22 depends_build       port:ruby port:qt4-mac
     22depends_build       port:ruby path:bin/qmake-mac:qt4-mac
    2323
    2424depends_lib         port:libsamplerate port:fftw-3-single
  • trunk/dports/comms/cutecom-qt4-mac/Portfile

    r54864 r62211  
    1919platforms           darwin
    2020depends_build       port:cmake
    21 depends_lib         port:qt4-mac
     21depends_lib         path:bin/qmake-mac:qt4-mac
    2222
    2323patchfiles          patch-qcppdialogimpl.cpp \
  • trunk/dports/databases/sqliteman/Portfile

    r44375 r62211  
    2626
    2727depends_lib         port:sqlite3    \
    28                     port:qt4-mac    \
     28                    path:bin/qmake-mac:qt4-mac    \
    2929                    port:qscintilla
    3030
  • trunk/dports/devel/qca/Portfile

    r59589 r62211  
    2323                     rmd160 256ca518fea507d03b67c0f5d26ba2ac7b3db517
    2424
    25 depends_lib          port:qt4-mac
     25depends_lib          path:bin/qmake-mac:qt4-mac
    2626
    2727configure.args       --qtdir=${prefix}/libexec/qt4-mac
  • trunk/dports/devel/qgit/Portfile

    r50984 r62211  
    2121checksums           md5 f863efa000aa1549f803c6ad743decd6
    2222
    23 depends_lib         port:qt4-mac port:git-core
     23depends_lib         path:bin/qmake-mac:qt4-mac port:git-core
    2424
    2525patchfiles          patch_src_namespace_def.cpp.diff  patch_src_qgit.cpp.diff
  • trunk/dports/devel/qscintilla/Portfile

    r54239 r62211  
    3030                    rmd160  19e5d5c331705c217c5192b1fcac5d298942db69
    3131
    32 depends_lib         port:qt4-mac \
     32depends_lib         path:bin/qmake-mac:qt4-mac \
    3333                    path:bin/python:python25
    3434
  • trunk/dports/editors/sigil/Portfile

    r61961 r62211  
    3030depends_build       bin:cmake:cmake \
    3131                    bin:gmake:gmake
    32 depends_lib         port:qt4-mac-devel
     32depends_lib         path:bin/qmake-mac:qt4-mac-devel
    3333
    3434configure.env       PATH="${prefix}/libexec/qt4-mac/bin:$env(PATH)"
  • trunk/dports/editors/tea/Portfile

    r57776 r62211  
    1717                        rmd160  1c2dc1173038a5a0334dff3c6fd56501bb28dd20
    1818
    19 depends_lib             port:qt4-mac
     19depends_lib             path:bin/qmake-mac:qt4-mac
    2020
    2121use_bzip2               yes
  • trunk/dports/gis/cgal/Portfile

    r60454 r62211  
    5959
    6060variant demos {
    61         depends_lib-append              port:qt4-mac
     61        depends_lib-append              path:bin/qmake-mac:qt4-mac
    6262       
    6363        configure.args-append   -DWITH_examples=TRUE
  • trunk/dports/gis/qlandkarte/Portfile

    r57043 r62211  
    2121depends_lib      port:proj \
    2222                 port:libusb-compat \
    23                  port:qt4-mac
     23                 path:bin/qmake-mac:qt4-mac
    2424
    2525configure.args   --with-extra-includes=${prefix}/include\
  • trunk/dports/graphics/GLC_lib/Portfile

    r54848 r62211  
    1515homepage            http://www.glc-lib.net/
    1616
    17 depends_lib         port:qt4-mac
     17depends_lib         path:bin/qmake-mac:qt4-mac
    1818
    1919master_sites        sourceforge:glc-lib
  • trunk/dports/graphics/Quarter/Portfile

    r58558 r62211  
    2424configure.cppflags-append   -I${prefix}/libexec/qt4-mac/include
    2525
    26 depends_lib             port:qt4-mac port:Coin
     26depends_lib             path:bin/qmake-mac:qt4-mac port:Coin
  • trunk/dports/graphics/lprof/Portfile

    r59748 r62211  
    2525cvs.module          lprof
    2626
    27 depends_lib         port:qt4-mac port:libusb-compat
     27depends_lib         path:bin/qmake-mac:qt4-mac port:libusb-compat
    2828depends_build       port:cmake
    2929
  • trunk/dports/graphics/poppler/Portfile

    r61532 r62211  
    6060    configure.args-delete --disable-poppler-qt4
    6161    if ([variant_isset quartz]) {
    62         depends_lib-append  port:qt4-mac
     62        depends_lib-append  path:bin/qmake-mac:qt4-mac
    6363        set qt_dir ${prefix}/libexec/qt4-mac
    6464    } else {
  • trunk/dports/graphics/qwt/Portfile

    r49941 r62211  
    4343
    4444variant qt4 conflicts qt3 description "Use qt4-mac" {
    45     depends_lib-append  port:qt4-mac
     45    depends_lib-append  path:bin/qmake-mac:qt4-mac
    4646}
    4747
  • trunk/dports/graphics/qwt52/Portfile

    r60846 r62211  
    4343
    4444
    45 variant qt3 conflicts qt4 qt4-devel description "Use qt3-mac" {
     45variant qt3 conflicts qt4 description "Use qt3-mac" {
    4646    depends_lib-append  port:qt3-mac
    4747}
    4848
    49 variant qt4 conflicts qt3 qt4-devel description "Use qt4-mac" {
    50     depends_lib-append  port:qt4-mac
     49variant qt4 conflicts qt3 description "Use qt4-mac" {
     50    depends_lib-append  path:bin/qmake-mac:qt4-mac
    5151}
    5252
    53 variant qt4devel conflicts qt3 qt4 description "Use qt4-mac-devel" {
    54     depends_lib-append  port:qt4-mac-devel
    55 }
    56 
    57 if { ![variant_isset qt3] && ![variant_isset qt4]  && ![variant_isset qt4devel] } {
     53if { ![variant_isset qt3] && ![variant_isset qt4] } {
    5854    default_variants    +qt4
    5955}
  • trunk/dports/multimedia/VLC/Portfile

    r61510 r62211  
    211211        configure.cppflags-append -D__USE_WS_X11__
    212212    } else {
    213         depends_lib-append port:qt4-mac
     213        depends_lib-append path:bin/qmake-mac:qt4-mac
    214214        set qt_dir ${prefix}/libexec/qt4-mac
    215215    }
  • trunk/dports/multimedia/VLC09/Portfile

    r61377 r62211  
    198198        configure.cppflags-append -D__USE_WS_X11__
    199199    } else {
    200         depends_lib-append port:qt4-mac
     200        depends_lib-append path:bin/qmake-mac:qt4-mac
    201201        set qt_dir ${prefix}/libexec/qt4-mac
    202202    }
  • trunk/dports/multimedia/lmms/Portfile

    r57605 r62211  
    2727
    2828depends_lib         port:libsndfile \
    29                     port:qt4-mac \
     29                    path:bin/qmake-mac:qt4-mac \
    3030                    path:lib/pkgconfig/sdl.pc:libsdl \
    3131                    port:fftw-3-single \
  • trunk/dports/multimedia/mlt/Portfile

    r58992 r62211  
    3939                    path:lib/pkgconfig/sdl.pc:libsdl \
    4040                    port:libvorbis \
    41                     port:qt4-mac \
     41                    path:bin/qmake-mac:qt4-mac \
    4242                    port:sox
    4343
  • trunk/dports/net/murmur/Portfile

    r60519 r62211  
    2828
    2929depends_lib \
    30     port:qt4-mac \
     30    path:bin/qmake-mac:qt4-mac \
    3131    port:openssl
    3232
  • trunk/dports/net/psi/Portfile

    r61884 r62211  
    2525
    2626depends_lib         lib:libz:zlib \
    27                     port:qt4-mac
     27                    path:bin/qmake-mac:qt4-mac
    2828
    2929
  • trunk/dports/python/py-pyqt4/Portfile

    r44238 r62211  
    2424          rmd160 da91bedccfb6b1e3cbc69f527dd57ead83eb647e
    2525
    26 depends_lib     port:py-sip port:qt4-mac
     26depends_lib     port:py-sip path:bin/qmake-mac:qt4-mac
    2727
    2828#patchfiles     patch-configure.py
  • trunk/dports/python/py-pyqwt/Portfile

    r39661 r62211  
    1818                rmd160 e8bbf154a9e30894977494829bf379a807fdf1e9
    1919
    20 depends_lib     port:qt4-mac port:qwt
     20depends_lib     path:bin/qmake-mac:qt4-mac port:qwt
    2121
    2222worksrcdir      ${worksrcdir}/configure
  • trunk/dports/python/py25-pyqt4/Portfile

    r60706 r62211  
    2525                    rmd160  cb2b8800143eef8cf7610925ee8e44498b5d2f66
    2626
    27 depends_lib     port:py25-sip port:qt4-mac
     27depends_lib     port:py25-sip path:bin/qmake-mac:qt4-mac
    2828
    2929set pyversion 2.5
  • trunk/dports/python/py25-pyqwt/Portfile

    r58493 r62211  
    2626                   rmd160  e4c8a63d623d974cd500e29fbc62255746ca7feb
    2727
    28 depends_lib        port:qt4-mac \
     28depends_lib        path:bin/qmake-mac:qt4-mac \
    2929                   port:qwt52 \
    3030                   port:py25-numpy
  • trunk/dports/python/py26-pyqt4/Portfile

    r60707 r62211  
    2525                    rmd160  cb2b8800143eef8cf7610925ee8e44498b5d2f66
    2626
    27 depends_lib     port:py26-sip port:qt4-mac
     27depends_lib     port:py26-sip path:bin/qmake-mac:qt4-mac
    2828
    2929set pyversion 2.6
  • trunk/dports/science/emergent/Portfile

    r58557 r62211  
    2929
    3030depends_build   bin:cmake:cmake
    31 depends_lib     port:readline port:qt4-mac port:Coin port:Quarter port:gsl port:ode
     31depends_lib     port:readline path:bin/qmake-mac:qt4-mac port:Coin port:Quarter port:gsl port:ode
    3232
  • trunk/dports/science/root/Portfile

    r61035 r62211  
    2424                    port:giflib \
    2525                    port:tiff \
    26                     port:qt4-mac \
     26                    path:bin/qmake-mac:qt4-mac \
    2727                    port:freetype
    2828
  • trunk/dports/science/stellarium/Portfile

    r58210 r62211  
    2727
    2828depends_build   port:cmake
    29 depends_lib     port:boost port:libsdl_mixer path:lib/pkgconfig/sdl.pc:libsdl port:qt4-mac port:freetype
     29depends_lib     port:boost port:libsdl_mixer path:lib/pkgconfig/sdl.pc:libsdl path:bin/qmake-mac:qt4-mac port:freetype
    3030
    3131patch {
  • trunk/dports/security/Vidalia/Portfile

    r57375 r62211  
    2424                    rmd160  82ea9736176128b6fbffde8b3bac7bfbce41f8eb
    2525
    26 depends_lib-append  port:tor port:qt4-mac
     26depends_lib-append  port:tor path:bin/qmake-mac:qt4-mac
    2727
    2828set qmake_path      ${prefix}/bin/qmake
     
    3737
    3838variant x11 description {build with qt4-x11} {
    39     depends_lib-delete port:qt4-mac
     39    depends_lib-delete path:bin/qmake-mac:qt4-mac
    4040    configure.args-delete -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac
    4141   
  • trunk/dports/security/ophcrack/Portfile

    r57375 r62211  
    7373
    7474variant gui description {Builds the GUI version instead of the CLI version, requires the qt4-mac port} {
    75     depends_lib-append port:qt4-mac
     75    depends_lib-append path:bin/qmake-mac:qt4-mac
    7676   
    7777    configure.args-delete --disable-gui
  • trunk/dports/textproc/doxygen/Portfile

    r57697 r62211  
    6868        configure.env-append    QTDIR=${prefix}/libexec/qt4-mac
    6969        build.env-append        QTDIR=${prefix}/libexec/qt4-mac
    70         depends_lib-append      port:qt4-mac
     70        depends_lib-append      path:bin/qmake-mac:qt4-mac
    7171        configure.args-append   --with-doxywizard
    7272
Note: See TracChangeset for help on using the changeset viewer.