[153015] trunk/dports/aqua/qt4-mac

[michaelld at macports.org]

Revision: 153015
          https://trac.macports.org/changeset/153015
Author:   michaelld at macports.org
Date:     2016-09-22 04:34:56 -0700 (Thu, 22 Sep 2016)
Log Message:
-----------
qt4-mac:
+ fix typos;
+ allow building on 10.12;
+ add patch to allow building when using libc++ForOlderSystems on Leopard and Snow Leopard, which addresses ticket #51844.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac/files/split_sources.prf

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2016-09-22 10:24:02 UTC (rev 153014)
+++ trunk/dports/aqua/qt4-mac/Portfile	2016-09-22 11:34:56 UTC (rev 153015)
@@ -11,10 +11,6 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                qt4-mac
-# qt4-mac-devel is "replaced_by" this port,
-# so this port cannot conflict with it.
-#conflicts           qt3 qt3-mac qt4-mac-devel
-conflicts           qt3 qt3-mac
 version             4.8.7
 revision            4
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -271,15 +267,15 @@
 patchfiles-append   \
     patch-src_gui_dialogs_qfiledialog_mac.mm.diff
 
-# error out if trying to build on a new OSX version (> 10.11).
+# error out if trying to build on a new OSX version (> 10.12).
 
 platform darwin {
-    if {${MINOR} > 11} {
+    if {${MINOR} > 12} {
         # This project needs to be updated to build with clang++ against libc++
         depends_lib
         depends_run
         pre-fetch {
-            ui_error "$name does not currently build on OSX later than 10.11 'El Capitan'."
+            ui_error "$name does not currently build on Mac OS X later than 10.12 'Sierra'."
             error "unsupported platform"
         }
     }
@@ -585,6 +581,19 @@
 
     }
 
+    # on Leopard and Snow Leopard with libc++ForOlderSystems
+    # installed, SDK must be unset as we can only use system libraries
+    # also, a missing library link must be replaced for build to
+    # succeed: <https://trac.macports.org/ticket/51844>
+    platform darwin {
+        if {${os.major} == 9 || ${os.major} == 10} {
+            if {${configure.cxx_stdlib} eq "libc++"} {
+                set SDK ""
+                configure.ldflags-append "-lobjc"
+            }
+        }
+    }
+
     # set the SDK, if it was found and exists
 
     if {[file exists ${SDK}]} {

Modified: trunk/dports/aqua/qt4-mac/files/split_sources.prf
===================================================================
--- trunk/dports/aqua/qt4-mac/files/split_sources.prf	2016-09-22 10:24:02 UTC (rev 153014)
+++ trunk/dports/aqua/qt4-mac/files/split_sources.prf	2016-09-22 11:34:56 UTC (rev 153015)
@@ -1,4 +1,4 @@
-# move Obective C and C++ files from SOURCES to OBJECTIVE_SOURCES
+# move Objective C and C++ files from SOURCES to OBJECTIVE_SOURCES
 
 for(source, SOURCES) {
     contains(source,.*\\.m$) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160922/b1cbac87/attachment.html>