[115142] trunk/dports/games/openttd

[cal at macports.org]

Revision: 115142
          https://trac.macports.org/changeset/115142
Author:   cal at macports.org
Date:     2013-12-26 09:14:02 -0800 (Thu, 26 Dec 2013)
Log Message:
-----------
openttd: remove deployment target, always build against current version

Modified Paths:
--------------
    trunk/dports/games/openttd/Portfile

Added Paths:
-----------
    trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff

Removed Paths:
-------------
    trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff

Modified: trunk/dports/games/openttd/Portfile
===================================================================
--- trunk/dports/games/openttd/Portfile	2013-12-26 11:39:07 UTC (rev 115141)
+++ trunk/dports/games/openttd/Portfile	2013-12-26 17:14:02 UTC (rev 115142)
@@ -13,7 +13,7 @@
 
 if {${name} eq ${subport}} {
     version             1.3.3
-    revision            2
+    revision            3
     checksums           rmd160  cf569d6fa66f4bb694a40e243f23668c65adb431 \
                         sha256  6991ed2c0170481800c3a92a1b43546821a658de91d3ac7efe868588387eca5d
 
@@ -47,14 +47,8 @@
                         port:openttd-opensfx \
                         port:openttd-openmsx
 
-    patchfiles          patch-src__video__cocoa__cocoa_v.mm-10_9.diff
-    platform darwin {
-        if {${os.major} >= 13} {
-            # Mavericks builds using libc++, using a deployment target < 10.7
-            # will break that
-            patchfiles-append   patch-config.lib-increase-deployment-target.diff
-        }
-    }
+    patchfiles          patch-src__video__cocoa__cocoa_v.mm-10_9.diff \
+                        patch-config.lib-remove-deployment-target.diff
 
     configure.env-append \
                         CFLAGS_BUILD="${configure.cflags}" \

Deleted: trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff
===================================================================
--- trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff	2013-12-26 11:39:07 UTC (rev 115141)
+++ trunk/dports/games/openttd/files/patch-config.lib-increase-deployment-target.diff	2013-12-26 17:14:02 UTC (rev 115142)
@@ -1,11 +0,0 @@
---- config.lib.orig	2013-12-25 20:49:22.000000000 +0100
-+++ config.lib	2013-12-25 20:49:28.000000000 +0100
-@@ -1562,7 +1562,7 @@
- 			# Only set the min version when not doing an universal build.
- 			# Universal builds set the version elsewhere.
- 			if [ "$cpu_type" = "64" ]; then
--				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
-+				CFLAGS="$CFLAGS -mmacosx-version-min=10.7"
- 			else
- 				gcc_cpu=`$cc_host -dumpmachine`
- 				if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then

Added: trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff
===================================================================
--- trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff	                        (rev 0)
+++ trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff	2013-12-26 17:14:02 UTC (rev 115142)
@@ -0,0 +1,26 @@
+--- config.lib.orig	2013-12-26 17:59:22.000000000 +0100
++++ config.lib	2013-12-26 18:01:06.000000000 +0100
+@@ -1557,23 +1557,6 @@
+ 			CFLAGS="$OSX_SYSROOT $CFLAGS"
+ 			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
+ 		fi
+-
+-		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
+-			# Only set the min version when not doing an universal build.
+-			# Universal builds set the version elsewhere.
+-			if [ "$cpu_type" = "64" ]; then
+-				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
+-			else
+-				gcc_cpu=`$cc_host -dumpmachine`
+-				if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then
+-					# PowerPC build can run on 10.3
+-					CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
+-				else
+-					# Intel is only available starting from 10.4
+-					CFLAGS="$CFLAGS -mmacosx-version-min=10.4"
+-				fi
+-			fi
+-		fi
+ 	fi
+ 
+ 	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131226/c878204b/attachment-0001.html>