Ticket #27343: qt4-mac-Portfile.2.diff

Portfile

@@ -74 +74 @@
 # only; this patch requires that (2) already be in place.
 patchfiles-append   patch-mkspecs_common_mac.conf.diff
 
+global TARGET
+set TARGET ""
+
 post-patch {
     # set ARCHES in configure (per the third patchfile above), for
     # building QMake.  join any 2 or more arch entries with the GCC
@@ -91 +94 @@
     # set MACOSX_DEPLOYMENT_TARGET version in various places.  These
     # were all patched in (2) above, and can be easily changed or
     # overridden by the user in a project-local qmake .pro script.
-    set minor [expr [lindex [split ${os.version} "."] 0] - 4]
-    set MACOSX_DEPLOYMENT_TARGET "10.${minor}"
+    set TARGET ${macosx_deployment_target}
+
+    # hopefully the TARGET exists and is set by now.  if not, last
+    # resort (which is not desirable) is to use the os.version.
+    if {${TARGET} == ""} {
+        set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+        set TARGET "10.${minor}"
+    }
     foreach fixfile {configure mkspecs/common/mac-g++.conf \
                      mkspecs/common/mac.conf qmake/qmake.pri \
                      src/tools/bootstrap/bootstrap.pro } {
-        reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${MACOSX_DEPLOYMENT_TARGET}|g" \
+        reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${TARGET}|g" \
             ${worksrcpath}/${fixfile}
     }
 
@@ -273 +282 @@
             configure.args-delete -optimized-qmake
         }
 
-        # find a way to specify the SDK to use
-        set SDK ""
-        if {[variant_exists universal] && [variant_isset universal]} {
-            if {[info exists universal_sysroot]} {
-                set SDK ${universal_sysroot}
+        # find a way to specify the SDK to use; Qt will use the 10.4u
+        # by default which won't work on 10.6 since it is not
+        # supported.  Allow the user to specify the SDK if desired.
+        set SDK ${configure.sdkroot}
+        if {${SDK} == ""} {
+            # find a way to specify the SDK to use, based on the TARGET
+            # hopefully the TARGET exists and is set by now.
+            # last resort: use os.version to get target (bad)
+            set minor ""
+            global TARGET
+            if {${TARGET} == ""} {
+                set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+            } else {
+                set minor [lindex [split ${TARGET} "."] 1]
             }
-        }
-        if {${SDK} == ""} {
-            # else use the one for this OS version, if installed
-            set minor [expr [lindex [split ${os.version} "."] 0] - 4]
             # set SDK version depending on OS version
             set sdk_version ""
             if {${minor} == "4"} {