[75030] trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

[michaelld at macports.org]

Revision: 75030
          http://trac.macports.org/changeset/75030
Author:   michaelld at macports.org
Date:     2011-01-12 06:39:54 -0800 (Wed, 12 Jan 2011)
Log Message:
-----------
qt4 PortGroup Changes:
 * Add qt's pkg-config dir as a global.
 * Add a possible-future location for Qt's frameworks, as a global.
 * Fix debug check to use Qt's library and frameworks directories.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2011-01-12 13:58:27 UTC (rev 75029)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2011-01-12 14:39:54 UTC (rev 75030)
@@ -42,7 +42,8 @@
         if {[variant_exists debug] && \
             [variant_isset debug] && \
            ![info exists building_qt4]} {
-            if {![file exists ${prefix}/lib/libQtCore_debug.dylib]} {
+            if {![file exists ${qt_frameworks_dir}/QtCore/QtCore_debug] &&
+                ![file exists ${qt_libs_dir}/libQtCore_debug.dylib]} {
                 return -code error "\n\nERROR:\n\
 In order to install this port as +debug,
 Qt4 must also be installed with +debug.\n"
@@ -83,6 +84,10 @@
 global qt_libs_dir
 set qt_libs_dir         ${qt_dir}/lib
 
+# standard Qt libraries directory
+global qt_frameworks_dir
+set qt_frameworks_dir   ${qt_dir}/Library/Frameworks
+
 # standard Qt non-.app executables directory
 global qt_bins_dir
 set qt_bins_dir         ${qt_dir}/bin
@@ -131,6 +136,10 @@
 global qt_lrelease_cmd
 set qt_lrelease_cmd     ${qt_dir}/bin/lrelease
 
+# standard PKGCONFIG path
+global qt_pkg_config_dir
+set qt_pkg_config_dir   ${qt_dir}/lib/pkgconfig
+
 # standard cmake info for Qt4
 global qt_cmake_defines
 set qt_cmake_defines    \
@@ -182,7 +191,7 @@
 }
 
 # append Qt's PKGCONFIG path to whatever is there now.
-set qt_pkg_config_path ${qt_dir}/lib/pkgconfig
+set qt_pkg_config_path ${qt_pkg_config_dir}
 if {${qt_dir} != ${prefix}} {
     set qt_pkg_config_path ${pkg_config_path}:${prefix}/lib/pkgconfig
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110112/8c5cce4b/attachment-0001.html>