Changes 1.3.2:

- Fix: [Admin] End-of-rcon data could not be determined reliably for any rcon command
- Fix: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect
- Fix: [Script] Changing the script difficulty level in-game would also change the settings using the default even though they were not allowed to change in-game
- Fix: [Admin] Ensure that sent and received length of json strings are the same
- Fix: [Squirrel] Stack overflow did not show an error, due to the stack to throw the error already being full
- Fix: [Script] Documentation implied that XXList::AddItem has a default for value if it isn't filled in
- Fix: Layouter caused significant slowdown with text heavy windows, cache it to make it manageable
- Fix: Make content list appear faster
- Fix: Non-ICU layouter started new lines with the space which triggered the linebreak
- Fix: If the next order cannot be resolved, reset the current order property instead of leaving it in an intermediate state
- Fix: [Squirrel] Infinite recursion loop in freeing data via a looping set of references
- Fix: One could build bridges over owned land of another company
- Fix: [Script] Texts from scripts were not validated before they were shown, causing an assertion to trigger
- Fix: Provide a warning when no vehicles are available, and tell what to do in that case
- Fix: Possible reading of uninitialised memory due to undefined execution order
- Fix: [Windows] Race condition between two drawing threads could crash OpenTTD
- Fix: ICU returns the width of the visual run as if the trailing space was added (in case a newline was added). This caused the width to be more than the requested width, but it would still be drawn correctly
- Fix: Small memory leaks
- Fix: [GS] The checks and validations for setting the extra text in the town window became too stringent

8 files changed, 34 insertions, 37 deletions

diff --git a/games/openttd-data/Makefile b/games/openttd-data/Makefile
index eaf30f47a3a..ba49323d067 100644
--- a/games/openttd-data/Makefile
+++ b/games/openttd-data/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 11:54:49 asau Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/05 19:24:35 adam Exp $
 
-DISTNAME=	openttd-data-0.4.4
+DISTNAME=	openttd-data-0.4.7
 CATEGORIES=	games x11
 MASTER_SITES=	http://binaries.openttd.org/extra/
 DISTFILES=	opengfx-${PKGVERSION_NOREV}-all.zip
 DISTFILES+=	openmsx-0.3.1-all.zip
 DISTFILES+=	opensfx-0.2.3-all.zip
-SITES.opengfx-0.4.4-all.zip=	${MASTER_SITES:Q}/opengfx/${PKGVERSION_NOREV}/
+SITES.opengfx-0.4.7-all.zip=	${MASTER_SITES:Q}/opengfx/${PKGVERSION_NOREV}/
 SITES.openmsx-0.3.1-all.zip=	${MASTER_SITES:Q}/openmsx/0.3.1/
 SITES.opensfx-0.2.3-all.zip=	${MASTER_SITES:Q}/opensfx/0.2.3/
 
diff --git a/games/openttd-data/distinfo b/games/openttd-data/distinfo
index 5b03e1679ee..28a09b939b3 100644
--- a/games/openttd-data/distinfo
+++ b/games/openttd-data/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2012/04/28 06:56:43 adam Exp $
+$NetBSD: distinfo,v 1.3 2013/08/05 19:24:35 adam Exp $
 
-SHA1 (opengfx-0.4.4-all.zip) = c68cdbb1ee8980a44feff320288e466d06efcd19
-RMD160 (opengfx-0.4.4-all.zip) = 6b98dee11682588da9877a65754f117fae4dc7e9
-Size (opengfx-0.4.4-all.zip) = 3470306 bytes
+SHA1 (opengfx-0.4.7-all.zip) = 401967470bd6f3f33180416f48a6a41a00fbeb29
+RMD160 (opengfx-0.4.7-all.zip) = 6f37ebe23e75137f204e5d13233cf7b92b28a9e0
+Size (opengfx-0.4.7-all.zip) = 3471843 bytes
 SHA1 (openmsx-0.3.1-all.zip) = e9c4203923bb9c974ac67886bd00b7090658b961
 RMD160 (openmsx-0.3.1-all.zip) = 8eff246e89e44f63ca480e9acef94a1da5fa81d2
 Size (openmsx-0.3.1-all.zip) = 136981 bytes
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 284e99b1477..f34bb620798 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/06/04 22:16:10 tron Exp $
+# $NetBSD: Makefile,v 1.51 2013/08/05 19:24:35 adam Exp $
 
-DISTNAME=	openttd-1.2.0-source
+DISTNAME=	openttd-1.3.2-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	5
 CATEGORIES=	games x11
 MASTER_SITES=	http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index b1222dae846..45e2e41c3d3 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.17 2012/04/28 06:56:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/08/05 19:24:35 adam 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
@@ -18,6 +17,7 @@ share/openttd/ai/compat_0.7.nut
 share/openttd/ai/compat_1.0.nut
 share/openttd/ai/compat_1.1.nut
 share/openttd/ai/compat_1.2.nut
+share/openttd/ai/compat_1.3.nut
 share/openttd/baseset/no_music.obm
 share/openttd/baseset/no_sound.obs
 share/openttd/baseset/openttd.grf
@@ -30,6 +30,7 @@ share/openttd/baseset/orig_win.obm
 share/openttd/baseset/orig_win.obs
 share/openttd/lang/afrikaans.lng
 share/openttd/lang/arabic_egypt.lng
+share/openttd/lang/basque.lng
 share/openttd/lang/belarusian.lng
 share/openttd/lang/brazilian_portuguese.lng
 share/openttd/lang/bulgarian.lng
@@ -43,8 +44,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
@@ -72,6 +75,8 @@ share/openttd/lang/slovak.lng
 share/openttd/lang/slovenian.lng
 share/openttd/lang/spanish.lng
 share/openttd/lang/swedish.lng
+share/openttd/lang/tamil.lng
+share/openttd/lang/thai.lng
 share/openttd/lang/traditional_chinese.lng
 share/openttd/lang/turkish.lng
 share/openttd/lang/ukrainian.lng
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index ba716bfd2ea..89574a5467a 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.17 2012/04/28 06:56:42 adam Exp $
+$NetBSD: distinfo,v 1.18 2013/08/05 19:24:35 adam Exp $
 
-SHA1 (openttd-1.2.0-source.tar.xz) = 9bb090bbe352ceee22c1ed7818bf4ac8e560379f
-RMD160 (openttd-1.2.0-source.tar.xz) = 0b3279b6fc9c4f370baa27e9949c165a52d795f3
-Size (openttd-1.2.0-source.tar.xz) = 5707216 bytes
-SHA1 (patch-Makefile.setting.in) = d7d2e502e032207f8c169f78c67515eea43c2986
+SHA1 (openttd-1.3.2-source.tar.xz) = 82283728e8812acf01e6aff59090de19edb40e5f
+RMD160 (openttd-1.3.2-source.tar.xz) = bfe9c7324debf55ec672b3b25a20af052d1f3f1a
+Size (openttd-1.3.2-source.tar.xz) = 6347104 bytes
+SHA1 (patch-Makefile.setting.in) = 1766a977ec259c443d13d64e16e77295bb2c6802
 SHA1 (patch-Makefile.src.in) = 8b695a1ef030189c2716add7af3fd18298bc1bc7
-SHA1 (patch-aa) = a77c366fba4a5b8fb8c81e3735e410a85e8f5a13
-SHA1 (patch-ab) = f1f24847499b57ccfe68625193e69f293410eca8
+SHA1 (patch-aa) = b34cc7e0adf8a91657f1426ff2d888eb7c31bcb2
+SHA1 (patch-ab) = 866cfea4555b8947bcb21e684a288c35f8936ee2
 SHA1 (patch-src_string.cpp) = c694d4a44b5cfd766b0f962210b524674b01dfea
diff --git a/games/openttd/patches/patch-Makefile.setting.in b/games/openttd/patches/patch-Makefile.setting.in
index beeecb24c16..e63d3002e3a 100644
--- a/games/openttd/patches/patch-Makefile.setting.in
+++ b/games/openttd/patches/patch-Makefile.setting.in
@@ -1,14 +1,16 @@
-$NetBSD: patch-Makefile.setting.in,v 1.1 2012/04/28 06:56:43 adam Exp $
+$NetBSD: patch-Makefile.setting.in,v 1.2 2013/08/05 19:24:35 adam Exp $
 
---- Makefile.setting.in.orig	2012-04-15 11:55:05.000000000 +0000
+--- Makefile.setting.in.orig	2013-07-27 15:09:40.000000000 +0000
 +++ Makefile.setting.in
-@@ -9,13 +9,16 @@ SETTINGSGEN      = !!SETTINGSGEN!!
+@@ -9,14 +9,17 @@ SETTINGSGEN      = !!SETTINGSGEN!!
  ENDIAN_CHECK     = !!ENDIAN_CHECK!!
  SRC_DIR          = !!SRC_DIR!!
  CXX_BUILD        = !!CXX_BUILD!!
 -CFLAGS_BUILD     = !!CFLAGS_BUILD!!
+-CXXFLAGS_BUILD   = !!CXXFLAGS_BUILD!!
 -LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 +CFLAGS_BUILD     = !!CFLAGS!! !!CFLAGS_BUILD!!
++CXXFLAGS_BUILD   = !!CXXFLAGS!! !!CXXFLAGS_BUILD!!
 +LDFLAGS_BUILD    = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
  STAGE            = !!STAGE!!
  SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa
index 593a69223cf..b2716994287 100644
--- a/games/openttd/patches/patch-aa
+++ b/games/openttd/patches/patch-aa
@@ -1,8 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2012/04/28 06:56:43 adam Exp $
+$NetBSD: patch-aa,v 1.11 2013/08/05 19:24:35 adam Exp $
 
 Compile 'strip' test with CFLAGS, so -isysroot can be passed on OSX.
 Correct library detection on NetBSD.
-Fix version checking of ICU 49 and above.
 
 --- config.lib.orig	2012-04-15 11:55:05.000000000 +0000
 +++ config.lib
@@ -24,12 +23,3 @@ Fix version checking of ICU 49 and above.
  			eval "$2=`ls -1 /usr/pkg/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
  			eval "res=\$$2"
  			if [ -z "$res" ]; then
-@@ -2864,7 +2864,7 @@ detect_icu() {
- 
- 	version=`$icu_config --version 2>/dev/null`
- 	ret=$?
--	shortversion=`echo $version | cut -c 1,3`
-+	shortversion=`echo $version | cut -c 1,2`
- 	log 2 "executing $icu_config --version"
- 	log 2 "  returned $version"
- 	log 2 "  exit code $ret"
diff --git a/games/openttd/patches/patch-ab b/games/openttd/patches/patch-ab
index 3e4c235ff6c..96af4ea678f 100644
--- a/games/openttd/patches/patch-ab
+++ b/games/openttd/patches/patch-ab
@@ -1,14 +1,15 @@
-$NetBSD: patch-ab,v 1.7 2012/04/28 06:56:43 adam Exp $
+$NetBSD: patch-ab,v 1.8 2013/08/05 19:24:35 adam Exp $
 
---- Makefile.lang.in.orig	2010-02-05 16:20:04.000000000 +0000
+--- Makefile.lang.in.orig	2013-07-27 15:09:40.000000000 +0000
 +++ Makefile.lang.in
-@@ -13,8 +13,8 @@ BIN_DIR       = !!BIN_DIR!!
+@@ -13,9 +13,9 @@ BIN_DIR       = !!BIN_DIR!!
  LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
  LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
  CXX_BUILD     = !!CXX_BUILD!!
 -CFLAGS_BUILD  = !!CFLAGS_BUILD!!
--LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 +CFLAGS_BUILD  = !!CFLAGS!! !!CFLAGS_BUILD!!
+ CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
+-LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 +LDFLAGS_BUILD = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
  STRGEN_FLAGS  = !!STRGEN_FLAGS!!
  STAGE         = !!STAGE!!