Changes 1.2.0:

* Fix: When starting GS or AI, always use the settings of the game, not the
  new-game settings
* Fix: Provide translated comments in the desktop file without language name
  postfix
* Fix: Cloning orders of aircraft with limited range failed

8 files changed, 117 insertions, 41 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 744a3763142..fe00990c335 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2012/04/27 12:31:48 obache Exp $
+# $NetBSD: Makefile,v 1.43 2012/04/28 06:56:42 adam Exp $
 
-DISTNAME=	openttd-1.0.5-source
+DISTNAME=	openttd-1.2.0-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	5
 CATEGORIES=	games x11
 MASTER_SITES=	http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openttd.org/
@@ -31,7 +30,8 @@ CONFIGURE_ARGS+=	--man-dir=${PKGMANDIR}/man6
 CONFIGURE_ARGS+=	--menu-dir=share/applications
 CONFIGURE_ARGS+=	--personal-dir=.openttd
 CONFIGURE_ARGS+=	--shared-dir=${VARBASE}/games/openttd
-CONFIGURE_ARGS+=	--with-lzo2=${BUILDLINK_PREFIX.lzo}/lib/liblzo2.so
+# Hack: built-in xz does not provide liblzma.pc, needed to configure
+PREFER_PKGSRC+=		xz
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,6 +40,7 @@ CONFIGURE_ARGS+=	--os=FREEBSD
 .endif
 
 .if (${OPSYS} == "Darwin")
+CONFIGURE_ARGS+=	--disable-cocoa-quickdraw
 CONFIGURE_ARGS+=	--with-cocoa
 CONFIGURE_ARGS+=	--without-application-bundle
 CONFIGURE_ARGS+=	--without-osx-sysroot
@@ -48,6 +49,7 @@ CONFIGURE_ARGS+=	--without-osx-sysroot
 .endif
 
 .include "../../archivers/lzo/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index 4efb172b4cd..b1222dae846 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/12/08 17:47:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2012/04/28 06:56:42 adam Exp $
 bin/openttd
 man/man6/openttd.6
 share/applications/openttd.desktop
@@ -7,9 +7,6 @@ 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/obm_format.txt
-share/doc/openttd/obs_format.txt
 share/doc/openttd/readme.txt
 share/icons/hicolor/128x128/apps/openttd.png
 share/icons/hicolor/16x16/apps/openttd.png
@@ -19,17 +16,18 @@ share/icons/hicolor/48x48/apps/openttd.png
 share/icons/hicolor/64x64/apps/openttd.png
 share/openttd/ai/compat_0.7.nut
 share/openttd/ai/compat_1.0.nut
-share/openttd/data/no_sound.obs
-share/openttd/data/openttdd.grf
-share/openttd/data/openttdw.grf
-share/openttd/data/opntitle.dat
-share/openttd/data/orig_dos.obg
-share/openttd/data/orig_dos.obs
-share/openttd/data/orig_dos_de.obg
-share/openttd/data/orig_win.obg
-share/openttd/data/orig_win.obs
-share/openttd/gm/no_music.obm
-share/openttd/gm/orig_win.obm
+share/openttd/ai/compat_1.1.nut
+share/openttd/ai/compat_1.2.nut
+share/openttd/baseset/no_music.obm
+share/openttd/baseset/no_sound.obs
+share/openttd/baseset/openttd.grf
+share/openttd/baseset/opntitle.dat
+share/openttd/baseset/orig_dos.obg
+share/openttd/baseset/orig_dos.obs
+share/openttd/baseset/orig_dos_de.obg
+share/openttd/baseset/orig_win.obg
+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/belarusian.lng
@@ -41,6 +39,7 @@ share/openttd/lang/czech.lng
 share/openttd/lang/danish.lng
 share/openttd/lang/dutch.lng
 share/openttd/lang/english.lng
+share/openttd/lang/english_AU.lng
 share/openttd/lang/english_US.lng
 share/openttd/lang/esperanto.lng
 share/openttd/lang/estonian.lng
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 1f179e95eec..ba716bfd2ea 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.16 2010/12/08 17:47:50 adam Exp $
+$NetBSD: distinfo,v 1.17 2012/04/28 06:56:42 adam Exp $
 
-SHA1 (openttd-1.0.5-source.tar.bz2) = 2e0cfa2d6e4c4bc1235a60de39961728bb727eb8
-RMD160 (openttd-1.0.5-source.tar.bz2) = 8d723e8efeb6de9860b62cf835fa3db09a7848cd
-Size (openttd-1.0.5-source.tar.bz2) = 5684796 bytes
-SHA1 (patch-aa) = ad42a8eac1268b00641715c825d505b480e9a234
-SHA1 (patch-ab) = 40ff3d0b0837ca5660ff136b60e8531e1f0a1cc0
+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 (patch-Makefile.src.in) = 8b695a1ef030189c2716add7af3fd18298bc1bc7
+SHA1 (patch-aa) = a77c366fba4a5b8fb8c81e3735e410a85e8f5a13
+SHA1 (patch-ab) = f1f24847499b57ccfe68625193e69f293410eca8
+SHA1 (patch-src_string.cpp) = c694d4a44b5cfd766b0f962210b524674b01dfea
diff --git a/games/openttd/patches/patch-Makefile.setting.in b/games/openttd/patches/patch-Makefile.setting.in
new file mode 100644
index 00000000000..beeecb24c16
--- /dev/null
+++ b/games/openttd/patches/patch-Makefile.setting.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile.setting.in,v 1.1 2012/04/28 06:56:43 adam Exp $
+
+--- Makefile.setting.in.orig	2012-04-15 11:55:05.000000000 +0000
++++ Makefile.setting.in
+@@ -9,13 +9,16 @@ SETTINGSGEN      = !!SETTINGSGEN!!
+ ENDIAN_CHECK     = !!ENDIAN_CHECK!!
+ SRC_DIR          = !!SRC_DIR!!
+ CXX_BUILD        = !!CXX_BUILD!!
+-CFLAGS_BUILD     = !!CFLAGS_BUILD!!
+-LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
++CFLAGS_BUILD     = !!CFLAGS!! !!CFLAGS_BUILD!!
++LDFLAGS_BUILD    = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
+ STAGE            = !!STAGE!!
+ SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
+ 
+ ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
+ 
++# Make sure endian_host.h is reachable as if it was in the src/ dir
++CFLAGS_BUILD += -I $(SETTING_OBJS_DIR)
++
+ # Check if we want to show what we are doing
+ ifdef VERBOSE
+ 	Q =
diff --git a/games/openttd/patches/patch-Makefile.src.in b/games/openttd/patches/patch-Makefile.src.in
new file mode 100644
index 00000000000..65862ecb865
--- /dev/null
+++ b/games/openttd/patches/patch-Makefile.src.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile.src.in,v 1.1 2012/04/28 06:56:43 adam Exp $
+
+--- Makefile.src.in.orig	2012-04-27 16:50:24.000000000 +0000
++++ Makefile.src.in
+@@ -12,12 +12,12 @@ CXX_BUILD      = !!CXX_BUILD!!
+ WINDRES        = !!WINDRES!!
+ STRIP          = !!STRIP!!
+ CFLAGS         = !!CFLAGS!!
+-CFLAGS_BUILD   = !!CFLAGS_BUILD!!
++CFLAGS_BUILD   = !!CFLAGS!! !!CFLAGS_BUILD!!
+ CXXFLAGS       = !!CXXFLAGS!!
+-CXXFLAGS_BUILD = !!CXXFLAGS_BUILD!!
++CXXFLAGS_BUILD = !!CXXFLAGS!! !!CXXFLAGS_BUILD!!
+ LIBS           = !!LIBS!!
+ LDFLAGS        = !!LDFLAGS!!
+-LDFLAGS_BUILD  = !!LDFLAGS_BUILD!!
++LDFLAGS_BUILD  = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
+ ROOT_DIR       = !!ROOT_DIR!!
+ BIN_DIR        = !!BIN_DIR!!
+ LANG_DIR       = !!LANG_DIR!!
diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa
index 5a22289373d..593a69223cf 100644
--- a/games/openttd/patches/patch-aa
+++ b/games/openttd/patches/patch-aa
@@ -1,22 +1,35 @@
-$NetBSD: patch-aa,v 1.9 2010/12/08 17:47:50 adam Exp $
+$NetBSD: patch-aa,v 1.10 2012/04/28 06:56:43 adam Exp $
 
---- config.lib.orig	2010-11-20 20:25:53.000000000 +0000
+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
-@@ -1241,7 +1241,7 @@ make_cflags_and_ldflags() {
- 		OBJS_SUBDIR="release"
- 		if [ "$os" = "OSX" ]; then
- 			# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
--			CFLAGS="-O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic $CFLAGS"
-+			CFLAGS="-mdynamic-no-pic $CFLAGS"
- 		else
- 			if [ "$os" = "MORPHOS" ]; then
- 				CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
-@@ -2304,7 +2304,7 @@ detect_library() {
+@@ -2001,7 +2001,7 @@ check_strip() {
+ 	elif [ "$os" = "OSX" ]; then
+ 		# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
+ 		echo "int main(int argc, char *argv[]) { }" > strip.test.c
+-		$cxx_host strip.test.c -o strip.test
++		$cc_host $CFLAGS strip.test.c -o strip.test
+ 		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
+ 		rm -f strip.test.c strip.test
+ 	else
+@@ -2533,7 +2533,7 @@ detect_library() {
  		if [ -z "$res" ]; then
- 			log 2 "  trying /usr/local/include/$4$5... no"
+ 			log 2 "  trying /opt/local/include/$4$5... no"
  		fi
 -		if [ -z "$res" ] && [ "$os" = "NETBSD" ]; then
 +		if [ -z "$res" ]; then
  			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 eea31faa707..3e4c235ff6c 100644
--- a/games/openttd/patches/patch-ab
+++ b/games/openttd/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2010/12/08 17:47:50 adam Exp $
+$NetBSD: patch-ab,v 1.7 2012/04/28 06:56:43 adam Exp $
 
 --- Makefile.lang.in.orig	2010-02-05 16:20:04.000000000 +0000
 +++ Makefile.lang.in
@@ -9,7 +9,7 @@ $NetBSD: patch-ab,v 1.6 2010/12/08 17:47:50 adam Exp $
 -CFLAGS_BUILD  = !!CFLAGS_BUILD!!
 -LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 +CFLAGS_BUILD  = !!CFLAGS!! !!CFLAGS_BUILD!!
-+LDFLAGS_BUILD = !!LDFLAGS!! !!LDFLAGS_BUILD!!
++LDFLAGS_BUILD = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
  STRGEN_FLAGS  = !!STRGEN_FLAGS!!
  STAGE         = !!STAGE!!
  LANG_SUPPRESS = !!LANG_SUPPRESS!!
diff --git a/games/openttd/patches/patch-src_string.cpp b/games/openttd/patches/patch-src_string.cpp
new file mode 100644
index 00000000000..dc3d2f3055b
--- /dev/null
+++ b/games/openttd/patches/patch-src_string.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_string.cpp,v 1.1 2012/04/28 06:56:43 adam Exp $
+
+Define Collator when building strgen.
+
+--- src/string.cpp.orig	2012-04-27 16:01:34.000000000 +0000
++++ src/string.cpp
+@@ -29,6 +29,9 @@
+ #include <unicode/ustring.h>
+ #include "language.h"
+ #include "gfx_func.h"
++#if defined(STRGEN) || defined(SETTINGSGEN)
++Collator *_current_collator = NULL;
++#endif
+ #endif /* WITH_ICU */
+ 
+ /**