Ignore:
Timestamp:
Jun 7, 2015, 5:28:14 AM (4 years ago)
Author:
mcalhoun@…
Message:

qt5-mac:

  • update Version (5.3.2 -> 5.4.1, fixes #47582)
  • install qt5-mac in private directory (see #44193 for details)
  • prevent installation on unsupported OS versions (fixes #47581)
  • install links so that pkg-config files are correct (fixes #44204)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/qt5-1.0.tcl

    r134878 r137229  
    6666# standard install directory
    6767global qt_dir
    68 set qt_dir              ${prefix}
    69 
    70 # standard Qt documents directory
    71 global qt_docs_dir
    72 set qt_docs_dir         ${qt_dir}/share/doc/${qt_name}
    73 
    74 # standard Qt plugins directory
    75 global qt_plugins_dir
    76 set qt_plugins_dir      ${qt_dir}/share/${qt_name}/plugins
    77 
    78 # standard Qt mkspecs directory
    79 global qt_mkspecs_dir
    80 set qt_mkspecs_dir      ${qt_dir}/share/${qt_name}/mkspecs
    81 
    82 # standard Qt imports directory
    83 global qt_imports_dir
    84 set qt_imports_dir      ${qt_dir}/share/${qt_name}/imports
    85 
    86 # standard Qt qml directory
    87 global qt_qml_dir
    88 set qt_qml_dir          ${qt_dir}/share/${qt_name}/qml
     68set qt_dir               ${prefix}/libexec/qt5-mac
     69
     70# standard Qt non-.app executables directory
     71global qt_bins_dir
     72set qt_bins_dir         ${qt_dir}/bin
    8973
    9074# standard Qt includes directory
     
    9882# standard Qt libraries directory
    9983global qt_frameworks_dir
    100 set qt_frameworks_dir   ${qt_dir}/Library/Frameworks
    101 
    102 # standard Qt non-.app executables directory
    103 global qt_bins_dir
    104 set qt_bins_dir         ${qt_dir}/bin
    105 
    106 # standard Qt .app executables directory, if created
    107 global qt_apps_dir
    108 set qt_apps_dir         ${applications_dir}/Qt5
     84set qt_frameworks_dir   ${qt_libs_dir}
     85
     86global qt_archdata_dir
     87set qt_archdata_dir  ${qt_dir}
     88
     89# standard Qt plugins directory
     90global qt_plugins_dir
     91set qt_plugins_dir      ${qt_archdata_dir}/plugins
     92
     93# standard Qt imports directory
     94global qt_imports_dir
     95set qt_imports_dir      ${qt_archdata_dir}/imports
     96
     97# standard Qt qml directory
     98global qt_qml_dir
     99set qt_qml_dir          ${qt_archdata_dir}/qml
    109100
    110101# standard Qt data directory
    111102global qt_data_dir
    112 set qt_data_dir         ${qt_dir}/share/${qt_name}
     103set qt_data_dir         ${qt_dir}
     104
     105# standard Qt documents directory
     106global qt_docs_dir
     107set qt_docs_dir         ${qt_data_dir}/doc
    113108
    114109# standard Qt translations directory
    115110global qt_translations_dir
    116 set qt_translations_dir ${qt_dir}/share/${qt_name}/translations
     111set qt_translations_dir ${qt_data_dir}/translations
    117112
    118113# standard Qt sysconf directory
    119114global qt_sysconf_dir
    120 set qt_sysconf_dir      ${qt_dir}/etc/${qt_name}
     115set qt_sysconf_dir      ${qt_dir}/etc/xdg
    121116
    122117# standard Qt examples directory
    123118global qt_examples_dir
    124 set qt_examples_dir     ${qt_dir}/share/${qt_name}/examples
     119set qt_examples_dir     ${qt_dir}/examples
    125120
    126121# standard Qt tests directory
    127122global qt_tests_dir
    128 set qt_tests_dir        ${qt_dir}/share/${qt_name}/tests
     123set qt_tests_dir        ${qt_dir}/tests
     124
     125# data used by qmake
     126global qt_host_data_dir
     127set qt_host_data_dir    ${qt_dir}
    129128
    130129# standard Qt demos directory
    131 global qt_demos_dir
    132 set qt_demos_dir        ${qt_dir}/share/${qt_name}/demos
     130#global qt_demos_dir
     131#set qt_demos_dir        ${qt_dir}/share/${qt_name}/demos
     132
     133# standard Qt mkspecs directory
     134global qt_mkspecs_dir
     135set qt_mkspecs_dir      ${qt_dir}/mkspecs
     136
     137# standard Qt .app executables directory, if created?
     138#global qt_apps_dir
     139#set qt_apps_dir         ${qt_bins_dir}
    133140
    134141# standard CMake module directory for Qt-related files
    135 global qt_cmake_module_dir
    136 set qt_cmake_module_dir ${qt_libs_dir}/cmake
     142#global qt_cmake_module_dir
     143#set qt_cmake_module_dir ${qt_libs_dir}/cmake
    137144
    138145# standard qmake command location
     
    140147set qt_qmake_cmd        ${qt_dir}/bin/qmake
    141148
     149# standard moc command location
     150global qt_moc_cmd
     151set qt_moc_cmd          ${qt_dir}/bin/moc
     152
     153# standard uic command location
     154global qt_uic_cmd
     155set qt_uic_cmd          ${qt_dir}/bin/uic
     156
     157# standard lrelease command location
     158global qt_lrelease_cmd
     159set qt_lrelease_cmd     ${qt_dir}/bin/lrelease
     160
     161# standard PKGCONFIG path
     162global qt_pkg_config_dir
     163set qt_pkg_config_dir   ${qt_libs_dir}/pkgconfig
     164
    142165# standard qmake spec
    143 # configure script prefers clang (but "[a]dvertise[s] g++ as an alternative on Lion and below").
    144 # According to http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations,
    145 #    however, Snow Leopard is only tested on "GCC as provided by Apple"
    146 # Create a variant for Snow Leopard that uses "-platform macx-g++-32" or "-platform macx-g++"?
     166# other platforms required? (see http://doc.qt.io/qt-5/supported-platforms.html and http://doc.qt.io/QtSupportedPlatforms/index.html)
    147167global qt_qmake_spec
    148168global qt_qmake_spec_32
     
    162182    set qt_qmake_spec ""
    163183}
    164 
    165 # standard moc command location
    166 global qt_moc_cmd
    167 set qt_moc_cmd          ${qt_dir}/bin/moc
    168 
    169 # standard uic command location
    170 global qt_uic_cmd
    171 set qt_uic_cmd          ${qt_dir}/bin/uic
    172 
    173 # standard lrelease command location
    174 global qt_lrelease_cmd
    175 set qt_lrelease_cmd     ${qt_dir}/bin/lrelease
    176 
    177 # standard PKGCONFIG path
    178 global qt_pkg_config_dir
    179 set qt_pkg_config_dir   ${qt_libs_dir}/pkgconfig
    180 
    181 # data used by qmake
    182 global qt_host_data_dir
    183 set qt_host_data_dir    ${qt_dir}/share/${qt_name}
    184184
    185185# standard cmake info for Qt5
Note: See TracChangeset for help on using the changeset viewer.