Long overdue update of openttd to v. 0.5.2.

Diff from Jeff Quast, tweaked by jasper@, thanks a lot to both of you.

Tested a lot by myself, and I think niallo@ and jasper@ too.

games/openttd/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2007/02/22 22:02:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2007/06/11 10:56:28 mk Exp $
 
 COMMENT=	"open source clone of the game Transport Tycoon Deluxe"
-DISTNAME=	openttd-0.4.7-source
+DISTNAME=	openttd-0.5.2-source
-PKGNAME=	${DISTNAME:S/-source//}p0
+PKGNAME=	${DISTNAME:S/-source//}
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	games
 
@@ -15,19 +15,20 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext c m pthread usbhid z
+WANTLIB=	X11 Xext c expat fontconfig freetype m pthread stdc++ usbhid z
+
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openttd/}
 
 LIB_DEPENDS=		SDL::devel/sdl \
 			png.>=2::graphics/png
 
-MAKE_ENV+=		WITH_ZLIB=1 WITH_PNG=1 INSTALL=1 VERBOSE=1 \
+MAKE_ENV+=		INSTALL=1 USE_HOMEDIR=1 VERBOSE=1 WITH_PNG=1 \
+			WITH_ZLIB=1 \
 			DATA_DIR=share/openttd \
 			ICON_DIR=share/pixmaps \
 			BINARY_DIR=bin \
-			PERSONAL_DIR=.openttd \
+			PERSONAL_DIR=.openttd
-			USE_HOMEDIR=1
 
 USE_X11=		Yes
 USE_GMAKE=		Yes

games/openttd/distinfo

@@ -1,5 +1,5 @@
-MD5 (openttd-0.4.7-source.tar.bz2) = enIB7Q9sFyesIql30gx2EQ==
+MD5 (openttd-0.5.2-source.tar.bz2) = fBZwFyS+Z8YUWYV3+YA4HQ==
-RMD160 (openttd-0.4.7-source.tar.bz2) = FIF/fIf4CGpg8Fi20EbtLGGD6NA=
+RMD160 (openttd-0.5.2-source.tar.bz2) = d1KPptVYeHz8E0nYIQQfAF8yYqs=
-SHA1 (openttd-0.4.7-source.tar.bz2) = RL2RfBtYMhPDmYvxuzOh7VOp574=
+SHA1 (openttd-0.5.2-source.tar.bz2) = jIAc2SA4dB27EyfBaIpps6k54FQ=
-SHA256 (openttd-0.4.7-source.tar.bz2) = pAgyiUmQlxUEKiuANkfSJh83uCh3BSvagpkmMdqRVWU=
+SHA256 (openttd-0.5.2-source.tar.bz2) = xaF1PzKocpMTA0frRAvZ526/ApnbXWoZBZyk1SQH1LE=
-SIZE (openttd-0.4.7-source.tar.bz2) = 2202261
+SIZE (openttd-0.5.2-source.tar.bz2) = 3034368

games/openttd/patches/patch-Makefile

@@ -1,63 +1,29 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2006/06/01 08:06:45 jolan Exp $
+$OpenBSD: patch-Makefile,v 1.2 2007/06/11 10:56:28 mk Exp $
---- Makefile.orig	Sun Mar 26 13:32:00 2006
+--- Makefile.orig	Fri Apr 20 21:47:49 2007
-+++ Makefile	Sun May 28 21:12:34 2006
++++ Makefile	Tue May 29 15:00:57 2007
-@@ -292,7 +292,7 @@ CFLAGS_HOST = $(BASECFLAGS)
+@@ -408,7 +408,6 @@ LRT:=
- endif
- 
- 
--CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3)
-+CC_VERSION = 0
- 
- # GNU make can only test for (in)equality
- # this is a workaround to test for >=
-@@ -379,7 +379,7 @@ LDFLAGS += -mno-cygwin
  endif
  endif
  
 -CFLAGS += $(BASECFLAGS)
-+#CFLAGS += $(BASECFLAGS)
  
  ifdef UNIX
  CDEFS += -DUNIX
-@@ -821,7 +821,7 @@ endian_target.h: $(ENDIAN_CHECK)
+@@ -929,7 +928,7 @@ endif
  
- $(ENDIAN_CHECK): endian_check.c
+ $(STRGEN): strgen/strgen.c string.c endian_host.h table/control_codes.h
  	@echo '===> Compiling and Linking $@'
--	$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
+-	$(Q)$(CC_HOST) $(CFLAGS_HOST) -DSTRGEN strgen/strgen.c string.c -o $@
-+	$(Q)$(CC_HOST) $(CFLAGS) $(CDEFS) $< -o $@
++	$(Q)$(CC_HOST) $(CFLAGS) -DSTRGEN strgen/strgen.c string.c -o $@
- 
- 
- $(TTD): $(OBJS) $(MAKE_CONFIG)
-@@ -830,7 +830,7 @@ $(TTD): $(OBJS) $(MAKE_CONFIG)
- 
- $(STRGEN): strgen/strgen.c endian_host.h
- 	@echo '===> Compiling and Linking $@'
--	$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
-+	$(Q)$(CC_HOST) $(CFLAGS) $(CDEFS) $< -o $@
  
  table/strings.h: lang/english.txt $(STRGEN)
  	@echo '===> Generating $@'
-@@ -926,9 +926,9 @@ endif
+@@ -953,8 +952,6 @@ release: all
- 						 $(ICON_DIR_INSTALL) \
+ 	$(Q)cp -R $(TTD)                      "/t/openttd-$(REV)-morphos/"
- 	           $(BINARY_DIR_INSTALL)
+ 	$(Q)cp data/*                         "/t/openttd-$(REV)-morphos/data/"
- ifndef USE_HOMEDIR
+ 	$(Q)cp lang/*.lng                     "/t/openttd-$(REV)-morphos/lang/"
--	mkdir -p $(PERSONAL_DIR)/scenario
+-	$(Q)-cp scenario/*.scn                "/t/openttd-$(REV)-morphos/scenario/"
-+	#mkdir -p $(PERSONAL_DIR)/scenario
+-	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(REV)-morphos/scenario/heightmap/"
- else
+ 	$(Q)cp readme.txt                     "/t/openttd-$(REV)-morphos/docs/ReadMe"
--	mkdir -p $(DATA_DIR_INSTALL)/scenario
+ 	$(Q)cp COPYING                        "/t/openttd-$(REV)-morphos/docs/"
-+	#mkdir -p $(DATA_DIR_INSTALL)/scenario
+ 	$(Q)cp changelog.txt                  "/t/openttd-$(REV)-morphos/docs/ChangeLog"
- endif
- 	install $(TTD) $(BINARY_DIR_INSTALL)
- 	install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang
-@@ -937,9 +937,9 @@ endif
- 	install -m 644 media/openttd.64.png $(ICON_DIR_INSTALL)
- 	install -m 644 media/openttd.32.xpm $(ICON_DIR_INSTALL)
- ifndef USE_HOMEDIR
--	cp scenario/* $(PERSONAL_DIR)/scenario/
-+	#cp scenario/* $(PERSONAL_DIR)/scenario/
- else
--	cp scenario/* $(DATA_DIR_INSTALL)/scenario/
-+	#cp scenario/* $(DATA_DIR_INSTALL)/scenario/
- endif
- else	#MorphOS
- install:

games/openttd/patches/patch-endian_check_c

@@ -1,8 +1,8 @@
-$OpenBSD: patch-endian_check_c,v 1.2 2007/02/22 22:02:13 jasper Exp $
+$OpenBSD: patch-endian_check_c,v 1.3 2007/06/11 10:56:28 mk Exp $
---- endian_check.c.orig	Tue Dec  6 15:35:10 2005
+--- endian_check.c.orig	Tue May 29 14:57:42 2007
-+++ endian_check.c	Wed Feb 21 12:07:43 2007
++++ endian_check.c	Tue May 29 14:58:01 2007
 @@ -1,6 +1,7 @@
- /* $Id: patch-endian_check_c,v 1.2 2007/02/22 22:02:13 jasper Exp $ */
+ /* $Id: patch-endian_check_c,v 1.3 2007/06/11 10:56:28 mk Exp $ */
  
  #include <stdio.h>
 +#include <string.h>

games/openttd/patches/patch-settings_c

@@ -1,21 +1,21 @@
-$OpenBSD: patch-settings_c,v 1.1.1.1 2006/06/01 08:06:45 jolan Exp $
+$OpenBSD: patch-settings_c,v 1.2 2007/06/11 10:56:28 mk Exp $
---- settings.c.orig	Wed Mar 22 05:17:21 2006
+--- settings.c.orig	Tue Apr 10 11:57:35 2007
-+++ settings.c	Thu Jun  1 00:50:15 2006
++++ settings.c	Tue May 29 15:00:57 2007
-@@ -733,7 +733,7 @@ static void save_setting_desc(IniFile *i
+@@ -1163,7 +1163,7 @@ static int32 EngineRenewMoneyUpdate(int32 p1)
- //***************************
+ /* End - Callback Functions */
  
  #ifndef EXTERNAL_PLAYER
 -#define EXTERNAL_PLAYER "timidity"
 +#define EXTERNAL_PLAYER "midiplay"
  #endif
  
- static const SettingDesc music_settings[] = {
+ static const SettingDesc _music_settings[] = {
-@@ -742,7 +742,7 @@ static const SettingDesc music_settings[
+@@ -1172,7 +1172,7 @@ static const SettingDesc _music_settings[] = {
- 	{"effect_vol",SDT_UINT8,	(void*)128,		&msf.effect_vol, NULL},
+ 	 SDT_VAR(MusicFileSettings, effect_vol, SLE_UINT8, S, 0, 128, 0, 100, 1,  STR_NULL, NULL),
- 	{"custom_1",	SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_1) << 16, NULL, &msf.custom_1, NULL},
+ 	SDT_LIST(MusicFileSettings, custom_1,   SLE_UINT8, S, 0, NULL,            STR_NULL, NULL),
- 	{"custom_2",	SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_2) << 16, NULL, &msf.custom_2, NULL},
+ 	SDT_LIST(MusicFileSettings, custom_2,   SLE_UINT8, S, 0, NULL,            STR_NULL, NULL),
--	{"playing",		SDT_BOOL,		(void*)true,	&msf.btn_down, NULL},
+-	SDT_BOOL(MusicFileSettings, playing,               S, 0, true,            STR_NULL, NULL),
-+	{"playing",		SDT_BOOL,		(void*)false,	&msf.btn_down, NULL},
++	SDT_BOOL(MusicFileSettings, playing,               S, 0, false,            STR_NULL, NULL),
- 	{"shuffle",		SDT_BOOL,		(void*)false, &msf.shuffle, NULL},
+ 	SDT_BOOL(MusicFileSettings, shuffle,               S, 0, false,           STR_NULL, NULL),
- 	{"extmidi",   SDT_STRINGBUF | (lengthof(msf.extmidi)<<16), EXTERNAL_PLAYER, &msf.extmidi, NULL},
+ 	 SDT_STR(MusicFileSettings, extmidi,     SLE_STRB, S, 0, EXTERNAL_PLAYER, STR_NULL, NULL),
- 	{NULL,				0,					NULL,					NULL,																NULL}
+ 	 SDT_END()

games/openttd/pkg/PLIST

@@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/02/22 22:02:13 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2007/06/11 10:56:28 mk Exp $
 bin/openttd
 share/doc/openttd/
+share/doc/openttd/HOWTO_compile_lang_files.txt
 share/doc/openttd/Howto_compile_lng_files_from_CLI.txt
 share/doc/openttd/Manual.txt
 share/doc/openttd/OSX_install_instructions.txt
-share/doc/openttd/OSX_why_multiple_applications.txt
-share/doc/openttd/Readme_Mandrake_Linux.txt
 share/doc/openttd/Readme_OS2.txt
-share/doc/openttd/Readme_Windows_MSVC6.0.txt
+share/doc/openttd/Readme_Windows_MSVC.txt
-share/doc/openttd/console.txt
+share/doc/openttd/elrail.svg
-share/doc/openttd/directmusic.txt
+share/doc/openttd/elrail_tile.png
+share/doc/openttd/elrail_track.png
 share/doc/openttd/landscape.html
 share/doc/openttd/landscape_grid.html
 share/doc/openttd/multiplayer.txt
@@ -27,9 +27,12 @@ share/examples/openttd/pre_server.scr.example
 share/examples/openttd/readme.txt
 share/openttd/
 share/openttd/data/
+share/openttd/data/2ccmap.grf
+share/openttd/data/airports.grf
 share/openttd/data/autorail.grf
 share/openttd/data/canalsw.grf
 share/openttd/data/dosdummy.grf
+share/openttd/data/elrailsw.grf
 share/openttd/data/nsignalsw.grf
 share/openttd/data/openttd.grf
 share/openttd/data/opntitle.dat
@@ -38,11 +41,13 @@ share/openttd/gm/
 share/openttd/lang/
 share/openttd/lang/american.lng
 share/openttd/lang/brazilian_portuguese.lng
+share/openttd/lang/bulgarian.lng
 share/openttd/lang/catalan.lng
 share/openttd/lang/czech.lng
 share/openttd/lang/danish.lng
 share/openttd/lang/dutch.lng
 share/openttd/lang/english.lng
+share/openttd/lang/esperanto.lng
 share/openttd/lang/estonian.lng
 share/openttd/lang/finnish.lng
 share/openttd/lang/french.lng
@@ -51,25 +56,38 @@ share/openttd/lang/german.lng
 share/openttd/lang/hungarian.lng
 share/openttd/lang/icelandic.lng
 share/openttd/lang/italian.lng
-share/openttd/lang/norwegian.lng
+share/openttd/lang/japanese.lng
+share/openttd/lang/korean.lng
+share/openttd/lang/lithuanian.lng
+share/openttd/lang/norwegian_bokmal.lng
+share/openttd/lang/norwegian_nynorsk.lng
 share/openttd/lang/origveh.lng
 share/openttd/lang/polish.lng
 share/openttd/lang/portuguese.lng
 share/openttd/lang/romanian.lng
+share/openttd/lang/russian.lng
+share/openttd/lang/simplified_chinese.lng
 share/openttd/lang/slovak.lng
+share/openttd/lang/slovenian.lng
 share/openttd/lang/spanish.lng
 share/openttd/lang/swedish.lng
+share/openttd/lang/traditional_chinese.lng
 share/openttd/lang/turkish.lng
+share/openttd/lang/ukrainian.lng
 share/openttd/media/
 share/openttd/media/openttd.128.png
 share/openttd/media/openttd.16.png
 share/openttd/media/openttd.256.png
+share/openttd/media/openttd.32.bmp
 share/openttd/media/openttd.32.png
 share/openttd/media/openttd.32.xpm
 share/openttd/media/openttd.48.png
 share/openttd/media/openttd.64.png
 share/openttd/media/openttd.64.xpm
 share/openttd/media/palette.act
+share/openttd/scenario/
+share/openttd/scenario/heightmap/
 share/pixmaps/
+share/pixmaps/openttd.32.bmp
 share/pixmaps/openttd.32.xpm
 share/pixmaps/openttd.64.png