[99164] trunk/dports/games/simutrans
ryandesign at macports.org
ryandesign at macports.org
Sun Oct 28 15:35:34 PDT 2012
Revision: 99164
http://trac.macports.org//changeset/99164
Author: ryandesign at macports.org
Date: 2012-10-28 15:35:34 -0700 (Sun, 28 Oct 2012)
Log Message:
-----------
simutrans: update to 112.0; fix build with clang (#36776); add modeline
Modified Paths:
--------------
trunk/dports/games/simutrans/Portfile
trunk/dports/games/simutrans/files/patch-Makefile.diff
trunk/dports/games/simutrans/files/patch-config.default.diff
trunk/dports/games/simutrans/files/patch-powerpc.diff
Added Paths:
-----------
trunk/dports/games/simutrans/files/patch-simtypes.h.diff
Modified: trunk/dports/games/simutrans/Portfile
===================================================================
--- trunk/dports/games/simutrans/Portfile 2012-10-28 22:11:30 UTC (rev 99163)
+++ trunk/dports/games/simutrans/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,6 +4,5 @@
name simutrans
-version 111.2.2
-revision 1
+version 112.0
set branch [join [lrange [split ${version} .] 0 1] .]
set my_version [strsed ${version} {g/\./-/}]
@@ -31,14 +31,12 @@
if {${name} == ${subport}} {
PortGroup app 1.0
- revision 1
-
master_sites sourceforge:project/simutrans/simutrans/${my_version}
distname ${name}-src-${my_version}
- checksums rmd160 306f5b618dc5190f3a8b31462c44e6db8c1e5ea6 \
- sha256 e97279ab7149cef430bb53c6206786ff039915dfa98a1b597e61e3f192840732
+ checksums rmd160 82352f6509e4f9d8402cefb31b7fa7e4dbc228b7 \
+ sha256 1f8c067290c7a286ddddbae41ba3cc4997a0e51d1d0dcbe57120a715d904791e
depends_build port:pkgconfig
@@ -52,7 +50,8 @@
}
patchfiles patch-config.default.diff \
- patch-Makefile.diff
+ patch-Makefile.diff \
+ patch-simtypes.h.diff
post-patch {
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Makefile
@@ -117,8 +116,8 @@
distname simupak64-${my_branch}
- checksums rmd160 40b5c0e57427eda83ef357a1bbb8cdb5250a79ac \
- sha256 5cda187d578e5263a1a77f8cd09268e2694157f6ca4c3ad4921b3fc8710fea38
+ checksums rmd160 ec268f1367d3b07f93b59a31e34f4b6be531f63e \
+ sha256 a58052627e4f4257a8b0abd1622507aa5893ab13ebf38407bf43533b3b228719
post-extract {
fs-traverse item ${worksrcpath} {
Modified: trunk/dports/games/simutrans/files/patch-Makefile.diff
===================================================================
--- trunk/dports/games/simutrans/files/patch-Makefile.diff 2012-10-28 22:11:30 UTC (rev 99163)
+++ trunk/dports/games/simutrans/files/patch-Makefile.diff 2012-10-28 22:35:34 UTC (rev 99164)
@@ -1,6 +1,6 @@
---- Makefile.orig 2012-03-20 16:34:16.000000000 -0500
-+++ Makefile 2012-04-22 21:53:59.000000000 -0500
-@@ -125,7 +125,7 @@
+--- Makefile.orig 2012-10-22 16:31:31.000000000 -0500
++++ Makefile 2012-10-28 17:15:32.000000000 -0500
+@@ -138,7 +138,7 @@
endif
endif
@@ -9,7 +9,7 @@
CCFLAGS += -Wstrict-prototypes
-@@ -396,10 +396,8 @@
+@@ -451,10 +451,8 @@
SOURCES += simsys_s.cc
CFLAGS += -DUSE_16BIT_DIB
ifeq ($(OSTYPE),mac)
Modified: trunk/dports/games/simutrans/files/patch-config.default.diff
===================================================================
--- trunk/dports/games/simutrans/files/patch-config.default.diff 2012-10-28 22:11:30 UTC (rev 99163)
+++ trunk/dports/games/simutrans/files/patch-config.default.diff 2012-10-28 22:35:34 UTC (rev 99164)
@@ -1,5 +1,5 @@
---- config.default.orig 2012-03-15 16:23:32.000000000 -0500
-+++ config.default 2012-04-22 21:45:34.000000000 -0500
+--- config.default.orig 2012-06-15 16:31:23.000000000 -0500
++++ config.default 2012-10-28 17:17:57.000000000 -0500
@@ -6,12 +6,12 @@
#BACKEND = allegro
#BACKEND = gdi
@@ -29,7 +29,7 @@
#PROFILE = 1 # Enable profiling
#PROFILE = 2 # Enable profiling with optimisation flags, can be used with `OPTIMISE = 1'
-@@ -34,10 +34,10 @@
+@@ -36,10 +36,10 @@
# Define these as empty strings, if you don't have the respective config program
#ALLEGRO_CONFIG = allegro-config
Modified: trunk/dports/games/simutrans/files/patch-powerpc.diff
===================================================================
--- trunk/dports/games/simutrans/files/patch-powerpc.diff 2012-10-28 22:11:30 UTC (rev 99163)
+++ trunk/dports/games/simutrans/files/patch-powerpc.diff 2012-10-28 22:35:34 UTC (rev 99164)
@@ -1,6 +1,6 @@
---- config.default.orig 2012-03-15 16:23:32.000000000 -0500
-+++ config.default 2012-04-22 21:56:03.000000000 -0500
-@@ -66,6 +66,7 @@
+--- config.default.orig 2012-06-15 16:31:23.000000000 -0500
++++ config.default 2012-10-28 17:15:32.000000000 -0500
+@@ -67,6 +67,7 @@
#
# In order to use the flags, add a line like this: (-Dxxx)
# FLAGS = -DUSE_C
Added: trunk/dports/games/simutrans/files/patch-simtypes.h.diff
===================================================================
--- trunk/dports/games/simutrans/files/patch-simtypes.h.diff (rev 0)
+++ trunk/dports/games/simutrans/files/patch-simtypes.h.diff 2012-10-28 22:35:34 UTC (rev 99164)
@@ -0,0 +1,14 @@
+Fix build error "variable length array of non-POD element type" when building with clang.
+http://forum.simutrans.com/index.php?topic=10477
+--- simtypes.h.orig 2012-06-15 16:31:23.000000000 -0500
++++ simtypes.h 2012-10-28 17:29:41.000000000 -0500
+@@ -17,6 +17,9 @@
+ # define ALLOCA(type, name, count) type* name = static_cast<type*>(alloca(sizeof(type) * (count)))
+ #
+ # define inline _inline
++#elif defined __clang__
++# include <alloca.h>
++# define ALLOCA(type, name, count) type* name = static_cast<type*>(alloca(sizeof(type) * (count)))
+ #else
+ # define ALLOCA(type, name, count) type name[count]
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121028/2b6fad7a/attachment.html>
More information about the macports-changes
mailing list