Changeset 103430 for trunk/dports/aqua


Ignore:
Timestamp:
Feb 25, 2013, 5:53:31 PM (6 years ago)
Author:
michaelld@…
Message:

qt4-mac:

  • remove silly rev-bump warning: que sera, sera!
  • In QMake (the executable):

+ enable correct "-framework foo,bar" parsing as specified by Apple's LD when searching for QMake .prl files;

+ remove "/Library/Frameworks" as a default search path;

+ use "PREFIX/Library/Frameworks" and "PREFIX/lib" as a default search paths, where PREFIX is the MacPorts' install prefix.

Location:
trunk/dports/aqua/qt4-mac
Files:
1 added
1 edited

Legend:

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

    r102951 r103430  
    1717conflicts           qt3 qt3-mac
    1818version             4.8.4
    19 
    20 # NOTE: Before doing a rev-bump due to an external dependency, please
    21 # contact the maintainer and have him/her do it.  I often have other
    22 # changes to put in place, but hold off doing so until either a
    23 # rev-bump is necessary or I have some critical changes.  Rebuilding
    24 # qt4-mac is quite time consuming, so I make every reasonable effort
    25 # to  require rebuilding it no more often than necessary.  Thanks!
    26 revision            5
     19revision            6
    2720
    2821categories          aqua
     
    144137
    145138patchfiles-append   patch-qmake_project.cpp.diff
     139
     140# (10.1) In QMake: (a) enable correct "-framework foo,bar" parsing as
     141# specified by Apple's LD; (b) disable "/Library/Frameworks" as a
     142# default search path; use "PREFIX/Library/Frameworks" and replace
     143# PREFIX in post-patch.  Also set "PREFIX/lib" as a default library
     144# search path.
     145
     146patchfiles-append   patch-qmake_generators_unix_unixmakke.cpp.diff
    146147
    147148# (11) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build for
     
    329330    reinplace "s,@QT_PLUGINS_DIR@,${qt_plugins_dir},g" \
    330331        ${worksrcpath}/tools/macdeployqt/macdeployqt/main.cpp
     332
     333    # fix PREFIX in QMake makefile generator
     334
     335    reinplace "s,@PREFIX@,${qt_dir},g" \
     336        ${worksrcpath}/qmake/generators/unix/unixmake.cpp
    331337
    332338    # if no debug, then do not even build debug code
Note: See TracChangeset for help on using the changeset viewer.