Upgrade to 0.7.2.

The changelog is too verbose to include here.

4 files changed, 62 insertions, 107 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 5d944693c71..e88a20cc5b4 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2009/07/22 09:01:29 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2009/09/22 12:02:36 ahoka Exp $
 
-DISTNAME=	openttd-0.6.3-source
+DISTNAME=	openttd-0.7.2-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openttd/}
@@ -43,5 +43,6 @@ post-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index cefa2817167..7c9f19bb49e 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,6 +1,20 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 19:10:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/09/22 12:02:36 ahoka Exp $
 bin/openttd
 man/man6/openttd.6
+share/applications/openttd.desktop
+share/doc/openttd/32bpp.txt
+share/doc/openttd/COPYING
+share/doc/openttd/changelog.txt
+share/doc/openttd/known-bugs.txt
+share/doc/openttd/multiplayer.txt
+share/doc/openttd/obg_format.txt
+share/doc/openttd/readme.txt
+share/icons/hicolor/128x128/apps/openttd.png
+share/icons/hicolor/16x16/apps/openttd.png
+share/icons/hicolor/256x256/apps/openttd.png
+share/icons/hicolor/32x32/apps/openttd.png
+share/icons/hicolor/48x48/apps/openttd.png
+share/icons/hicolor/64x64/apps/openttd.png
 share/openttd/data/openttdd.grf
 share/openttd/data/openttdw.grf
 share/openttd/data/opntitle.dat
@@ -32,7 +46,11 @@ ${PLIST.ttd-data}share/openttd/gm/gm_tt18.gm
 ${PLIST.ttd-data}share/openttd/gm/gm_tt19.gm
 ${PLIST.ttd-data}share/openttd/gm/gm_tt20.gm
 ${PLIST.ttd-data}share/openttd/gm/gm_tt21.gm
+share/openttd/data/orig_dos.obg
+share/openttd/data/orig_dos_de.obg
+share/openttd/data/orig_win.obg
 share/openttd/lang/afrikaans.lng
+share/openttd/lang/arabic_egypt.lng
 share/openttd/lang/brazilian_portuguese.lng
 share/openttd/lang/bulgarian.lng
 share/openttd/lang/catalan.lng
@@ -48,20 +66,24 @@ share/openttd/lang/finnish.lng
 share/openttd/lang/french.lng
 share/openttd/lang/galician.lng
 share/openttd/lang/german.lng
+share/openttd/lang/hebrew.lng
 share/openttd/lang/hungarian.lng
 share/openttd/lang/icelandic.lng
+share/openttd/lang/indonesian.lng
 share/openttd/lang/italian.lng
 share/openttd/lang/japanese.lng
 share/openttd/lang/korean.lng
+share/openttd/lang/latvian.lng
 share/openttd/lang/lithuanian.lng
+share/openttd/lang/luxembourgish.lng
 share/openttd/lang/norwegian_bokmal.lng
 share/openttd/lang/norwegian_nynorsk.lng
-share/openttd/lang/origveh.lng
 share/openttd/lang/piglatin.lng
 share/openttd/lang/polish.lng
 share/openttd/lang/portuguese.lng
 share/openttd/lang/romanian.lng
 share/openttd/lang/russian.lng
+share/openttd/lang/serbian.lng
 share/openttd/lang/simplified_chinese.lng
 share/openttd/lang/slovak.lng
 share/openttd/lang/slovenian.lng
@@ -70,21 +92,16 @@ share/openttd/lang/swedish.lng
 share/openttd/lang/traditional_chinese.lng
 share/openttd/lang/turkish.lng
 share/openttd/lang/ukrainian.lng
+share/openttd/lang/welsh.lng
+share/openttd/scripts/autoexec.scr.example
+share/openttd/scripts/game_start.scr.example
+share/openttd/scripts/on_client.scr.example
+share/openttd/scripts/on_dedicated.scr.example
+share/openttd/scripts/on_server.scr.example
+share/openttd/scripts/on_server_connect.scr.example
+share/openttd/scripts/pre_dedicated.scr.example
+share/openttd/scripts/pre_server.scr.example
+share/openttd/scripts/readme.txt
 share/pixmaps/openttd.32.xpm
-share/applications/openttd.desktop
-share/doc/openttd/32bpp.txt
-share/doc/openttd/multiplayer.txt
-share/icons/hicolor/128x128/apps/openttd.128.png
-share/icons/hicolor/16x16/apps/openttd.16.png
-share/icons/hicolor/256x256/apps/openttd.256.png
-share/icons/hicolor/32x32/apps/openttd.32.png
-share/icons/hicolor/48x48/apps/openttd.48.png
-share/icons/hicolor/64x64/apps/openttd.64.png
-share/openttd/data/generictrams_v0.4.grf
-share/openttd/scenario/Greenistan.scn
-share/openttd/scenario/Polopolis.scn
-share/openttd/scenario/Skadi Islands.scn
-share/openttd/scenario/Terra Incognita.scn
-share/openttd/scenario/Wales and West England.scn
 @pkgdir share/openttd/data
 @pkgdir share/openttd/gm
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 5ec88e6fcb3..827220c7b64 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,89 +1,6 @@
-$NetBSD: distinfo,v 1.14 2008/12/14 01:31:01 ahoka Exp $
+$NetBSD: distinfo,v 1.15 2009/09/22 12:02:36 ahoka Exp $
 
-SHA1 (openttd-0.6.3-source.tar.bz2) = 5fb359789fae9b03550da268973fb1238ddf224c
-RMD160 (openttd-0.6.3-source.tar.bz2) = ab1f2ae17cbc97c2ebc4eceb1496bc708e6d83d4
-Size (openttd-0.6.3-source.tar.bz2) = 4609714 bytes
-SHA1 (ttd/gm_tt00.gm) = 79d21ad066867e9d737fb7b2fb1fbec9a7e3ff67
-RMD160 (ttd/gm_tt00.gm) = 682df44d2080f78d26bfc7095b1da4b026c24e31
-Size (ttd/gm_tt00.gm) = 29714 bytes
-SHA1 (ttd/gm_tt01.gm) = d906d160b06f8dbaa4bdfa6f2190c4a0a0093d7e
-RMD160 (ttd/gm_tt01.gm) = 46bbef72f56e8728a6f7fabae39e996a5b816b85
-Size (ttd/gm_tt01.gm) = 50427 bytes
-SHA1 (ttd/gm_tt02.gm) = b4f728a8fc9ac49e824b085f78d20b39f852bc98
-RMD160 (ttd/gm_tt02.gm) = 353b5b7c3f8b938d638acb1aef9cd7b5c76d8bd2
-Size (ttd/gm_tt02.gm) = 46406 bytes
-SHA1 (ttd/gm_tt03.gm) = a6bec83d018087a07e0c567b56bc568588650505
-RMD160 (ttd/gm_tt03.gm) = 0d32ceb716859ab9cc8a6150ee2a9edfdc7b839f
-Size (ttd/gm_tt03.gm) = 60986 bytes
-SHA1 (ttd/gm_tt04.gm) = e664d19d90de99ea7b67c0a83ca523f49186662f
-RMD160 (ttd/gm_tt04.gm) = ae7107811633c54dd9d1b1b08f748e6f8c519bd4
-Size (ttd/gm_tt04.gm) = 62712 bytes
-SHA1 (ttd/gm_tt05.gm) = 0502e045126e78ce3a811ef932b5de32e796105d
-RMD160 (ttd/gm_tt05.gm) = ee6677fe91083a89a654b281e66c113090cbf581
-Size (ttd/gm_tt05.gm) = 62952 bytes
-SHA1 (ttd/gm_tt06.gm) = 45c37a9bda218c19bf46c2143846d7331d17d83c
-RMD160 (ttd/gm_tt06.gm) = b7c45a88dd5d379e074efa8b2eb1661065f3c6e5
-Size (ttd/gm_tt06.gm) = 69089 bytes
-SHA1 (ttd/gm_tt07.gm) = 5c2484faa0ac4f8c87ef20100f1732c212cbfe3a
-RMD160 (ttd/gm_tt07.gm) = 2d398f1dafda8d9b6b8fec8d98fd353845b1f6e1
-Size (ttd/gm_tt07.gm) = 37182 bytes
-SHA1 (ttd/gm_tt08.gm) = e6ad03a452c521a7f685def4aa6b7facf9c6787e
-RMD160 (ttd/gm_tt08.gm) = cba6468fc6fd9a0144dabed4f06049fdd2d98ee6
-Size (ttd/gm_tt08.gm) = 17877 bytes
-SHA1 (ttd/gm_tt09.gm) = 1373c0bcf049706c1a2ff4d3ab0e0957fda06ac5
-RMD160 (ttd/gm_tt09.gm) = 8b3cc19bf26dfc43c090a6f815f5d6c42a875886
-Size (ttd/gm_tt09.gm) = 57940 bytes
-SHA1 (ttd/gm_tt10.gm) = c003252c57d3e114aeeac3bb85a34476b2536146
-RMD160 (ttd/gm_tt10.gm) = 011cf01f448b4b123d53c197daa0205f43c7ff85
-Size (ttd/gm_tt10.gm) = 43530 bytes
-SHA1 (ttd/gm_tt11.gm) = 25c6bc295aa691e832c6916b092254ac22f8964f
-RMD160 (ttd/gm_tt11.gm) = 5e1c54d8fc179b6fd47b04fe5fe47a4502ac0885
-Size (ttd/gm_tt11.gm) = 57439 bytes
-SHA1 (ttd/gm_tt12.gm) = b7a2308258b6b7f8cbe00f08ac0656c9fa986a40
-RMD160 (ttd/gm_tt12.gm) = 7bb3207d99f0c945bb93353b073909b394c1a355
-Size (ttd/gm_tt12.gm) = 40305 bytes
-SHA1 (ttd/gm_tt13.gm) = ea8e7428111f3aba480234a529d85c9523404f88
-RMD160 (ttd/gm_tt13.gm) = 5bd95bd2910937883eb5f8b09d74cfc23f8d1af6
-Size (ttd/gm_tt13.gm) = 35152 bytes
-SHA1 (ttd/gm_tt14.gm) = 3e60a6e6fdb92839e9e6f277b17fd79fa59dd258
-RMD160 (ttd/gm_tt14.gm) = a95ce86fd4e291ad9edbb8ca724db35488bdcc95
-Size (ttd/gm_tt14.gm) = 14751 bytes
-SHA1 (ttd/gm_tt15.gm) = 0139d6735d311e6ddf4719c1869712d1dfb9a797
-RMD160 (ttd/gm_tt15.gm) = 3824d45c46d669c0e544f35279a8a7b2dd580d70
-Size (ttd/gm_tt15.gm) = 60572 bytes
-SHA1 (ttd/gm_tt16.gm) = 75b434d09035251395b7003b0a6ffbfc7be057a9
-RMD160 (ttd/gm_tt16.gm) = fe0be50d44837e8bdf82202e2d86ae3d3c6a8cbd
-Size (ttd/gm_tt16.gm) = 48614 bytes
-SHA1 (ttd/gm_tt17.gm) = f49f08efe80e318fb512f70d5b1843a0cc6448dd
-RMD160 (ttd/gm_tt17.gm) = 100a4c8d799195a1fb0cfcbd6b0e440309529b16
-Size (ttd/gm_tt17.gm) = 43766 bytes
-SHA1 (ttd/gm_tt18.gm) = 826256ccbdb2cac17b03ae22610837096ec71713
-RMD160 (ttd/gm_tt18.gm) = 64f033ce01504a91b002507665e42e13b27624cb
-Size (ttd/gm_tt18.gm) = 52082 bytes
-SHA1 (ttd/gm_tt19.gm) = 02adfff8276798eb24b20802d939c29d80d8fff5
-RMD160 (ttd/gm_tt19.gm) = fadc6a100edd8f6590fd949e73991fbf66a3da9d
-Size (ttd/gm_tt19.gm) = 50279 bytes
-SHA1 (ttd/gm_tt20.gm) = 3130a5818ff751474a40443195bad7b47ad1f232
-RMD160 (ttd/gm_tt20.gm) = 3764e9179cb002790f8d68a9401feaab349907bd
-Size (ttd/gm_tt20.gm) = 64219 bytes
-SHA1 (ttd/gm_tt21.gm) = fc3fdf5ab16a961647966b7701b0e559f45d9095
-RMD160 (ttd/gm_tt21.gm) = 6262f3298a079ac099138ec3e1cbc07cc8dedc35
-Size (ttd/gm_tt21.gm) = 46812 bytes
-SHA1 (ttd/sample.cat) = 57ff8c136db86a5d91a497931b2d6df53e8635b5
-RMD160 (ttd/sample.cat) = e760abc6ee8ff68345d1c5d74215a830f1d83c77
-Size (ttd/sample.cat) = 1608618 bytes
-SHA1 (ttd/trg1r.grf) = 6d385630f7ad8413758bbfe8b4b16b0ed946e7ee
-RMD160 (ttd/trg1r.grf) = 9bd16bb0c02bdb0dc9743215809a2ad8c15cd02a
-Size (ttd/trg1r.grf) = 2426943 bytes
-SHA1 (ttd/trgcr.grf) = 5d1f97c3b82b41bebbd5811b838e129e7714d7a7
-RMD160 (ttd/trgcr.grf) = 2aa6a3cf2aa38adf43aea2577a2a3695bfdba799
-Size (ttd/trgcr.grf) = 267110 bytes
-SHA1 (ttd/trghr.grf) = f01bf6abe7dcfb42f385c28b660b198fdb8d497f
-RMD160 (ttd/trghr.grf) = 83859bb411f7e0806e8756b04858f1f50cdf8ecc
-Size (ttd/trghr.grf) = 410483 bytes
-SHA1 (ttd/trgir.grf) = d31646015cf0238e7752344ac5a882a7713aed79
-RMD160 (ttd/trgir.grf) = e30d76d101868b3b310af4d17c2e5c2e2353a1ed
-Size (ttd/trgir.grf) = 342377 bytes
-SHA1 (ttd/trgtr.grf) = 436d0ff41b3e2e0229960d56a50c68a871077a10
-RMD160 (ttd/trgtr.grf) = a73cb82dd0e18baf5142fa10fa9a90e8f9de1c8c
-Size (ttd/trgtr.grf) = 559392 bytes
+SHA1 (openttd-0.7.2-source.tar.bz2) = d020a2e371c2317e43b248964742483229d35b87
+RMD160 (openttd-0.7.2-source.tar.bz2) = da1c95310988c1f58d3d0a2e35aa57e6d323b985
+Size (openttd-0.7.2-source.tar.bz2) = 4874252 bytes
+SHA1 (patch-string_func.h) = e238acd9df0ac49a04f8ca9200a975da2f338d6b
diff --git a/games/openttd/patches/patch-string_func.h b/games/openttd/patches/patch-string_func.h
new file mode 100644
index 00000000000..8460ed81eef
--- /dev/null
+++ b/games/openttd/patches/patch-string_func.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-string_func.h,v 1.1 2009/09/22 12:02:36 ahoka Exp $
+
+--- src/string_func.h.orig	2009-05-10 23:33:55.000000000 +0200
++++ src/string_func.h
+@@ -239,13 +239,13 @@ static inline bool IsWhitespace(WChar c)
+ 	;
+ }
+ 
+-#ifndef _GNU_SOURCE
++#if !defined(_GNU_SOURCE) && (defined(__NetBSD_Version__) && __NetBSD_Version__ < 500000000)
+ /* strndup is a GNU extension */
+ char *strndup(const char *s, size_t len);
+ #endif /* !_GNU_SOURCE */
+ 
+ /* 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)))
++#if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) || (defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) || defined(_NETBSD_SOURCE)
+ #	undef DEFINE_STRCASESTR
+ #else
+ #	define DEFINE_STRCASESTR