[69799] trunk/dports/aqua/qt4-mac/Portfile

[michaelld at macports.org]

Revision: 69799
          http://trac.macports.org/changeset/69799
Author:   michaelld at macports.org
Date:     2010-07-16 13:20:37 -0700 (Fri, 16 Jul 2010)
Log Message:
-----------
Move to using pre-compiled headers & optimized qmake; should speed up
compiling Qt as well as ports that depend on qmake.  Remove trailing
'/' from SDK paths since that seems confuse up qmake.  Move any SQL
extensions from being in the Qt libraries into separate plugins.
Corrected comment on fixing .pc (etc) files.  No revision bump since
these changes do not require it.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2010-07-16 19:51:14 UTC (rev 69798)
+++ trunk/dports/aqua/qt4-mac/Portfile	2010-07-16 20:20:37 UTC (rev 69799)
@@ -106,7 +106,9 @@
     -system-sqlite                                        \
     -openssl-linked                                       \
     -dbus-linked                                          \
+    -pch                                                  \
     -fast                                                 \
+    -optimized-qmake                                      \
     -arch            \"${build_arch}\"
 
 # Stop configure script from searching for SQL Drivers
@@ -155,11 +157,13 @@
     lunshift header_path ${prefix}/include/mysql5/mysql
     lunshift library_path ${prefix}/lib/mysql5/mysql
     configure.args-delete -no-sql-mysql
+    configure.args-append -plugin-sql-mysql
 }
 
 variant odbc description {Enable iODBC SQL Driver} {
     depends_lib-append port:libiodbc
     configure.args-delete -no-sql-odbc
+    configure.args-append -plugin-sql-odbc
 }
 
 variant psql description {Enable PostgreSQL SQL Driver} {
@@ -167,11 +171,13 @@
     lunshift header_path ${prefix}/include/postgresql83
     lunshift library_path ${prefix}/lib/postgresql83
     configure.args-delete -no-sql-psql
+    configure.args-append -plugin-sql-psql
 }
 
 variant sqlite2 description {Enable SQLite version 2 SQL Driver} {
     depends_lib-append port:sqlite2
     configure.args-delete -no-sql-sqlite2
+    configure.args-append -plugin-sql-sqlite2
 }
 
 variant raster description {Use raster graphics system by default} {
@@ -218,7 +224,7 @@
 platform darwin 9 {
     if {![variant_isset universal] || ![info exists universal_sysroot]} {
         if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
-            configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk/
+            configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk
         } else {
             ui_msg "No SDK found in Developer/SDKs ; \
 configure will probably fail. \n \
@@ -232,7 +238,7 @@
 platform darwin 10 {
     if {![variant_isset universal] || ![info exists universal_sysroot]} {
         if {[file exists /Developer/SDKs/MacOSX10.6.sdk]} {
-            configure.args-append -sdk /Developer/SDKs/MacOSX10.6.sdk/
+            configure.args-append -sdk /Developer/SDKs/MacOSX10.6.sdk
         } else {
             ui_msg "No SDK found in /Developer/SDKs ; \
 configure will probably fail. \n \
@@ -257,11 +263,9 @@
 post-destroot {
     set destroot_qt ${destroot}${qt_dir}
 
-    # Fix .pc and .prl files by changing ${destroot}/lib to ${qt_dir}/lib
+    # Fix .pc and .prl files by changing ${worksrcpath}/lib to ${qt_dir}/lib
     foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/* ${qt_dir}/lib/*.prl ${qt_dir}/lib/*/*.prl ${qt_dir}/share/${dirname}/demos/shared/*.prl] {
-        reinplace  \
-            "s|${worksrcpath}/lib|${qt_dir}/lib|g" \
-            ${fixfile}
+        reinplace "s|${worksrcpath}/lib|${qt_dir}/lib|g" ${fixfile}
     }
 
     # Install documentation.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100716/551eb6ff/attachment.html>