Hi,
Here is a minor update to openttd-1.3.1, with some cleanup.
- Update to 1.3.1 (mostly new language translations)
- Respect CFLAGS
- Use our strndup/strcasestr instead of openttd's internal copy
(fixes an intermittent crash during build noticed by espie@)
Works well here on i386.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openttd/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 20 Apr 2013 02:52:31 -0000 1.31
+++ Makefile 25 Jun 2013 03:10:30 -0000
@@ -2,10 +2,10 @@
COMMENT= open source clone of the game Transport Tycoon Deluxe
-V = 1.3.0
+V = 1.3.1
DISTNAME = openttd-${V}
EXTRACT_SUFX= -source.tar.gz
-GFX_V= 0.4.6.1
+GFX_V= 0.4.7
SFX_V= 0.2.3
MSX_V= 0.3.1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -51,7 +51,9 @@ CONFIGURE_ARGS+= --prefix-dir=${PREFIX}
--with-png \
--with-zlib \
--without-allegro \
- --without-libtimidity
+ --without-libtimidity \
+ --CFLAGS_BUILD="${CFLAGS}" \
+ --disable-strip
MAKE_ENV+= VERBOSE=1
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openttd/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 20 Apr 2013 02:52:31 -0000 1.15
+++ distinfo 25 Jun 2013 03:10:30 -0000
@@ -1,8 +1,8 @@
-SHA256 (openttd/opengfx-0.4.6.1.zip) =
sfHJIq8FjNOxmo2hiK1GC0hB11Pl5XT0cc70rNPvjeM=
+SHA256 (openttd/opengfx-0.4.7.zip) =
EAMsaD+YtNN4wGURGKSFiubT8KUFkwLcP5a/v83GckE=
SHA256 (openttd/openmsx-0.3.1.zip) =
kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU=
SHA256 (openttd/opensfx-0.2.3.zip) =
NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI=
-SHA256 (openttd/openttd-1.3.0-source.tar.gz) =
mZrpMummseG/Kc3dxJRyXMLy5dzopD5RcdV1YRFn/l4=
-SIZE (openttd/opengfx-0.4.6.1.zip) = 3470661
+SHA256 (openttd/openttd-1.3.1-source.tar.gz) =
54VT4r4m/5iFG4fbgLfD8KReSWhnLnLc6ntYIhz5WWY=
+SIZE (openttd/opengfx-0.4.7.zip) = 3471843
SIZE (openttd/openmsx-0.3.1.zip) = 136981
SIZE (openttd/opensfx-0.2.3.zip) = 11144025
-SIZE (openttd/openttd-1.3.0-source.tar.gz) = 9351230
+SIZE (openttd/openttd-1.3.1-source.tar.gz) = 9546727
Index: patches/patch-config_lib
===================================================================
RCS file: patches/patch-config_lib
diff -N patches/patch-config_lib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config_lib 25 Jun 2013 03:10:30 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Don't build with -O1. The reason they add it is irrevelant to OpenBSD anyway.
+--- config.lib.orig Fri May 31 14:57:18 2013
++++ config.lib Sun Jun 23 15:47:00 2013
+@@ -1462,7 +1462,7 @@ make_cflags_and_ldflags() {
+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+
+ # Just add -O1 to the tools needed for building.
+- CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"
++ CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2"
+ fi
+ fi
+
Index: patches/patch-src_string_func_h
===================================================================
RCS file: patches/patch-src_string_func_h
diff -N patches/patch-src_string_func_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_string_func_h 25 Jun 2013 03:10:30 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+Don't use openttd's internal copies of strndup()/strcasestr().
+--- src/string_func.h.orig Fri May 31 14:57:15 2013
++++ src/string_func.h Sun Jun 23 21:47:08 2013
+@@ -196,7 +196,7 @@ static inline bool IsWhitespace(WChar c)
+ #endif
+
+ /* strndup is a GNU extension */
+-#if defined(_GNU_SOURCE) || (defined(__NetBSD_Version__) && 400000000 <=
__NetBSD_Version__) || (defined(__FreeBSD_version) && 701101 <=
__FreeBSD_version) || (defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200809L)
++#if defined(_GNU_SOURCE) || (defined(__NetBSD_Version__) && 400000000 <=
__NetBSD_Version__) || (defined(__FreeBSD_version) && 701101 <=
__FreeBSD_version) || (defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >=
200809L) || defined(__OpenBSD__)
+ # undef DEFINE_STRNDUP
+ #else
+ # define DEFINE_STRNDUP
+@@ -204,7 +204,7 @@ char *strndup(const char *s, size_t len);
+ #endif /* strndup is available */
+
+ /* strcasestr is available for _GNU_SOURCE, BSD and some Apple */
+-#if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) ||
(defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) ||
defined(_DARWIN_C_SOURCE))) || defined(_NETBSD_SOURCE)
++#if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) ||
(defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) ||
defined(_DARWIN_C_SOURCE))) || defined(_NETBSD_SOURCE) || defined(__OpenBSD__)
+ # undef DEFINE_STRCASESTR
+ #else
+ # define DEFINE_STRCASESTR
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/openttd/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST 20 Apr 2013 02:52:31 -0000 1.16
+++ pkg/PLIST 25 Jun 2013 03:10:30 -0000
@@ -122,8 +122,10 @@ share/openttd/lang/english_AU.lng
share/openttd/lang/english_US.lng
share/openttd/lang/esperanto.lng
share/openttd/lang/estonian.lng
+share/openttd/lang/faroese.lng
share/openttd/lang/finnish.lng
share/openttd/lang/french.lng
+share/openttd/lang/gaelic.lng
share/openttd/lang/galician.lng
share/openttd/lang/german.lng
share/openttd/lang/greek.lng
@@ -158,6 +160,16 @@ share/openttd/lang/ukrainian.lng
share/openttd/lang/vietnamese.lng
share/openttd/lang/welsh.lng
share/openttd/media/
+share/openttd/media/baseset/
+share/openttd/media/baseset/no_music.obm
+share/openttd/media/baseset/no_sound.obs
+share/openttd/media/baseset/orig_dos.obg
+share/openttd/media/baseset/orig_dos.obs
+share/openttd/media/baseset/orig_dos_de.obg
+share/openttd/media/baseset/orig_win.obg
+share/openttd/media/baseset/orig_win.obm
+share/openttd/media/baseset/orig_win.obs
+share/openttd/media/baseset/translations.awk
share/openttd/media/extra_grf/
share/openttd/media/extra_grf/2ccmap.nfo
share/openttd/media/extra_grf/airport_preview.nfo
