[69882] trunk/dports/aqua

[michaelld at macports.org]

Revision: 69882
          http://trac.macports.org/changeset/69882
Author:   michaelld at macports.org
Date:     2010-07-19 19:26:10 -0700 (Mon, 19 Jul 2010)
Log Message:
-----------
Fix for ticket #25712: remove configure.arg "-optimized-qmake" since
it seems to result in a non-functional 'qmake' executable on 10.6 i386
and x86_64, qt4-mac and qt4-mac-devel.  This flag does seem to work on
10.5, so leaving it in place for all but 10.6.  Removed
'pre-deactivate' deleting of the "[Pp]honon" header file(s), because
in order for that section to be executed one will already be using the
sqlite db -- which is case sensitive and hence those headers will
always be removed correctly.

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2010-07-19 23:06:56 UTC (rev 69881)
+++ trunk/dports/aqua/qt4-mac/Portfile	2010-07-20 02:26:10 UTC (rev 69882)
@@ -226,21 +226,25 @@
         if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
             configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk
         } else {
-            ui_msg "No SDK found in Developer/SDKs ; \
+            ui_msg "No SDK found in Developer/SDKs for 10.5 ; \
 configure will probably fail. \n \
 Please install Apple's Developer Tools again."
         }
     }
 }
 
-# use the 10.6 SDK for 10.6
-# but only if not (doing universal and the universal sysroot is set)
 platform darwin 10 {
+    # disable optimizing qmake, since the resulting executable doesn't
+    # seem to function correctly on 10.6 only (both i386 and x86_64).
+    configure.args-delete -optimized-qmake
+
+    # use the 10.6 SDK for 10.6, but only if not (doing universal and
+    # the universal sysroot is set)
     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
         } else {
-            ui_msg "No SDK found in /Developer/SDKs ; \
+            ui_msg "No SDK found in /Developer/SDKs for 10.6 ; \
 configure will probably fail. \n \
 Please install Apple's Developer Tools again."
         }
@@ -347,19 +351,13 @@
 pre-deactivate {
     # If this is qt4-* is selected, select 'none' & tell the user
     set current_select [exec ${prefix}/bin/${select_port} -s]
-    if { [exec ${prefix}/bin/${select_port} -s] == ${select_name} } {
+    if {${current_select} == ${select_name} } {
         system "${prefix}/bin/${select_port} none"
         ui_msg "\
-Port '${current_select}' was selected; none is now selected.\n \
+Port '${current_select}' was selected; 'none' is now selected.\n \
 To select another port for group '${select_group}', \
 please run '${select_port}'."
     }
-
-    # remove case-sensitive ${prefix}/${qt_dir}/include/phonon/[Pp]honon
-    foreach tf [glob -directory ${prefix}/${qt_dir}/include/phonon \
-                     ?honon] {
-        delete ${tf}
-    }
 }
 
 livecheck.type      regex

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2010-07-19 23:06:56 UTC (rev 69881)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2010-07-20 02:26:10 UTC (rev 69882)
@@ -235,9 +235,13 @@
     }
 }
 
-# use the 10.6 SDK for 10.6
-# but only if not (doing universal and the universal sysroot is set)
 platform darwin 10 {
+    # disable optimizing qmake, since the resulting executable doesn't
+    # seem to function correctly on 10.6 only (both i386 and x86_64).
+    configure.args-delete -optimized-qmake
+
+    # use the 10.6 SDK for 10.6, but only if not (doing universal and
+    # the universal sysroot is set)
     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
@@ -349,19 +353,13 @@
 pre-deactivate {
     # If this is qt4-* is selected, select 'none' & tell the user
     set current_select [exec ${prefix}/bin/${select_port} -s]
-    if { [exec ${prefix}/bin/${select_port} -s] == ${select_name} } {
+    if {${current_select} == ${select_name} } {
         system "${prefix}/bin/${select_port} none"
         ui_msg "\
-Port '${current_select}' was selected; none is now selected.\n \
+Port '${current_select}' was selected; 'none' is now selected.\n \
 To select another port for group '${select_group}', \
 please run '${select_port}'."
     }
-
-    # remove case-sensitive ${prefix}/${qt_dir}/include/phonon/[Pp]honon
-    foreach tf [glob -directory ${prefix}/${qt_dir}/include/phonon \
-                     ?honon] {
-        delete ${tf}
-    }
 }
 
 livecheck.type      regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100719/52a1c1de/attachment.html>