Changeset 70710


Ignore:
Timestamp:
Aug 18, 2010, 12:24:36 PM (10 years ago)
Author:
michaelld@…
Message:

Fixed 'destroot.keepdirs'.
Add in post-patch to correct phonon version.
Add in CMake file, installation, and use comment; does not conflict

with that installed by 'kdelibs4'.

Location:
trunk/dports/aqua
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac-devel/Portfile

    r70523 r70710  
    1212name                ${select_name}
    1313version             4.7.0-beta2
    14 revision            1
     14revision            2
    1515categories          aqua
    1616platforms           macosx
     
    4040# but configure calls it, by default, with a C compiler.
    4141patchfiles          patch-precomp.test.diff
     42
     43post-extract {
     44    # correct phonon version info.
     45    # (1) retrieve the correct info (minor, patch)
     46    set phonon_minor_version \
     47        [exec grep PHONON_LIB_MINOR_VERSION \
     48             ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
     49             grep set | tr -dc '\[0-9\]']
     50    set phonon_patch_version \
     51        [exec grep PHONON_LIB_PATCH_VERSION \
     52             ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
     53             grep set | tr -dc '\[0-9\]']
     54
     55    # (2) correct that which Qt uses
     56    # (there has GOT to be a better way :)
     57    reinplace "/PHONON_MINOR_VERSION =/s@\\(\[^0-9\]*\\)\[0-9\]*\\(\[^0-9\]*\\)@\\1${phonon_minor_version}\\2@" \
     58        ${worksrcpath}/src/phonon/phonon.pro
     59    reinplace "/PHONON_PATCH_VERSION =/s@\\(\[^0-9\]*\\)\[0-9\]*\\(\[^0-9\]*\\)@\\1${phonon_patch_version}\\2@" \
     60        ${worksrcpath}/src/phonon/phonon.pro
     61}
    4262
    4363# The build process uses -fconstant-cfstrings.
     
    321341        ${destroot}${prefix}/etc/select/${select_group}/${select_name}
    322342
     343    # install cmake files (taken from port 'kdelibs4'). To use this
     344    # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
     345    # the initial 'configure' stage (which uses CMake), to the full
     346    # path of where the CMake files are installed.
     347    xinstall -m 755 -d ${destroot_qt}/share/cmake/modules
     348    foreach file { FindQt4.cmake Qt4ConfigDependentSettings.cmake \
     349                       Qt4Macros.cmake } {
     350        xinstall -c -m 644 ${filespath}/${file} \
     351            ${destroot_qt}/share/cmake/modules
     352    }
     353
    323354    # then, reinplace the select file as necessary for variants; put
    324355    # these here instead of in the variants because I don't know which
     
    339370            # the directory "share/${name}" will be empty.  keep it
    340371            # around since other ports might install into it.
    341             destroot.keepdirs ${destroot}${destroot_qt}/share/${name}
     372            destroot.keepdirs ${destroot_qt}/share/${name}
    342373        }
    343374    }
  • trunk/dports/aqua/qt4-mac/Portfile

    r70523 r70710  
    1212name                ${select_name}
    1313version             4.6.3
    14 revision            5
     14revision            6
    1515categories          aqua
    1616platforms           macosx
     
    4646                    patch-qaudioinput-readyread.diff \
    4747                    patch-qaudiooutput-period-size.diff
     48
     49post-extract {
     50    # correct phonon version info.
     51    # (1) retrieve the correct info (minor, patch)
     52    set phonon_minor_version \
     53        [exec grep PHONON_LIB_MINOR_VERSION \
     54             ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
     55             grep set | tr -dc '\[0-9\]']
     56    set phonon_patch_version \
     57        [exec grep PHONON_LIB_PATCH_VERSION \
     58             ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
     59             grep set | tr -dc '\[0-9\]']
     60
     61    # (2) correct that which Qt uses
     62    # (there has GOT to be a better way :)
     63    reinplace "/PHONON_MINOR_VERSION =/s@\\(\[^0-9\]*\\)\[0-9\]*\\(\[^0-9\]*\\)@\\1${phonon_minor_version}\\2@" \
     64        ${worksrcpath}/src/phonon/phonon.pro
     65    reinplace "/PHONON_PATCH_VERSION =/s@\\(\[^0-9\]*\\)\[0-9\]*\\(\[^0-9\]*\\)@\\1${phonon_patch_version}\\2@" \
     66        ${worksrcpath}/src/phonon/phonon.pro
     67}
    4868
    4969# The build process uses -fconstant-cfstrings.
     
    326346        ${destroot}${prefix}/etc/select/${select_group}/${select_name}
    327347
     348    # install cmake files (taken from port 'kdelibs4'). To use this
     349    # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
     350    # the initial 'configure' stage (which uses CMake), to the full
     351    # path of where the CMake files are installed.
     352    xinstall -m 755 -d ${destroot_qt}/share/cmake/modules
     353    foreach file { FindQt4.cmake Qt4ConfigDependentSettings.cmake \
     354                       Qt4Macros.cmake } {
     355        xinstall -c -m 644 ${filespath}/${file} \
     356            ${destroot_qt}/share/cmake/modules
     357    }
     358
    328359    # then, reinplace the select file as necessary for variants; put
    329360    # these here instead of in the variants because I don't know which
     
    344375            # the directory "share/${name}" will be empty.  keep it
    345376            # around since other ports might install into it.
    346             destroot.keepdirs ${destroot}${destroot_qt}/share/${name}
     377            destroot.keepdirs ${destroot_qt}/share/${name}
    347378        }
    348379    }
Note: See TracChangeset for help on using the changeset viewer.