Ignore:
Timestamp:
Jun 13, 2012, 2:36:06 AM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac : upgrade to 4.8.2; upgrade and fix certain dependent ports.

Location:
trunk/dports
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports

  • trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl

    r94061 r94241  
    496496
    497497set portfetch::mirror_sites::sites(trolltech) {
     498    http://releases.qt-project.org/qt4/source/:nosubdir
    498499    http://ftp.heanet.ie/mirrors/ftp.trolltech.com/pub/qt/source/:nosubdir
    499500    ftp://ftp.informatik.hu-berlin.de/pub1/Mirrors/ftp.troll.no/QT/qt/source/:nosubdir
  • trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

    r92022 r94241  
    143143# standard PKGCONFIG path
    144144global qt_pkg_config_dir
    145 set qt_pkg_config_dir   ${qt_dir}/lib/pkgconfig
     145set qt_pkg_config_dir   ${qt_libs_dir}/pkgconfig
    146146
    147147# standard cmake info for Qt4
     
    157157default qt_arch_types {[string map {i386 x86} [get_canonical_archs]]}
    158158
    159 # allow for both qt4 and qt4 devel
     159# allow for depending on either qt4-mac and qt4-mac-devel, simultaneously
     160
    160161if {![info exists building_qt4]} {
    161162    if {${os.platform} == "darwin"} {
    162         depends_lib-append      path:lib/libQtCore.4.dylib:qt4-mac
     163
     164        # see if the framework install exists, and if so depend on it;
     165        # if not, depend on the library version
     166
     167        if {[file exists ${qt_frameworks_dir}/QtCore/QtCore]} {
     168            depends_lib-append path:Library/Frameworks/QtCore/QtCore:qt4-mac
     169        } else {
     170            depends_lib-append path:lib/libQtCore.4.dylib:qt4-mac
     171        }
     172
    163173    } else {
    164174        depends_lib-append      path:lib/libQtCore.so.4:qt4-x11
     
    166176}
    167177
    168 # standard configure environment
    169 configure.env-append    QTDIR=${qt_dir} \
    170                         QMAKE=${qt_qmake_cmd} \
    171                         QMAKESPEC=${qt_qmake_spec} \
    172                         MOC=${qt_moc_cmd}
    173 
    174 if {${qt_dir} != ${prefix}} {
    175     configure.env-append PATH=${qt_dir}/bin:$env(PATH)
    176 }
    177 
    178 # standard build environment
    179 build.env-append        QTDIR=${qt_dir} \
    180                         QMAKE=${qt_qmake_cmd} \
    181                         QMAKESPEC=${qt_qmake_spec} \
    182                         MOC=${qt_moc_cmd}
    183 
    184 if {${qt_dir} != ${prefix}} {
    185     build.env-append    PATH=${qt_dir}/bin:$env(PATH)
     178# standard configure environment, when not building qt4
     179
     180if {![info exists building_qt4]} {
     181    configure.env-append \
     182        QTDIR=${qt_dir} \
     183        QMAKE=${qt_qmake_cmd} \
     184        QMAKESPEC=${qt_qmake_spec} \
     185        MOC=${qt_moc_cmd}
     186
     187    # make sure the Qt binaries' directory is in the path, if it is
     188    # not the current prefix
     189
     190    if {${qt_dir} != ${prefix}} {
     191        configure.env-append PATH=${qt_dir}/bin:$env(PATH)
     192    }
     193} else {
     194    configure.env-append QMAKE_NO_DEFAULTS=""
     195}
     196
     197# standard build environment, when not building qt4
     198
     199if {![info exists building_qt4]} {
     200    build.env-append \
     201        QTDIR=${qt_dir} \
     202        QMAKE=${qt_qmake_cmd} \
     203        QMAKESPEC=${qt_qmake_spec} \
     204        MOC=${qt_moc_cmd}
     205
     206    # make sure the Qt binaries' directory is in the path, if it is
     207    # not the current prefix
     208
     209    if {${qt_dir} != ${prefix}} {
     210        build.env-append    PATH=${qt_dir}/bin:$env(PATH)
     211    }
     212} else {
     213    build.env-append QMAKE_NO_DEFAULTS=""
    186214}
    187215
     
    190218
    191219# standard destroot environment
    192 destroot.env-append     QTDIR=${qt_dir} \
    193                         QMAKE=${qt_qmake_cmd} \
    194                         QMAKESPEC=${qt_qmake_spec} \
    195                         MOC=${qt_moc_cmd} \
    196                         INSTALL_ROOT=${destroot} \
    197                         DESTDIR=${destroot}
    198 if {${qt_dir} != ${prefix}} {
    199     destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
     220
     221destroot.env-append \
     222    INSTALL_ROOT=${destroot} \
     223    DESTDIR=${destroot}
     224
     225# standard destroot environment, when not building qt4
     226
     227if {![info exists building_qt4]} {
     228    destroot.env-append \
     229        QTDIR=${qt_dir} \
     230        QMAKE=${qt_qmake_cmd} \
     231        QMAKESPEC=${qt_qmake_spec} \
     232        MOC=${qt_moc_cmd}
     233
     234    # make sure the Qt binaries' directory is in the path, if it is
     235    # not the current prefix
     236
     237    if {${qt_dir} != ${prefix}} {
     238        destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
     239    }
     240} else {
     241    destroot.env-append QMAKE_NO_DEFAULTS=""
    200242}
    201243
Note: See TracChangeset for help on using the changeset viewer.