5 files changed, 38 insertions, 34 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 7b08ae2f08b0..201adc871264 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openttd
-PORTVERSION=	0.4.8
-PORTREVISION=	2
+PORTVERSION=	0.5.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,11 +18,13 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 
+DISTVERSIONSUFFIX=	-source
+
 .if defined(WITH_MIDI_PLAYER)
 MAKE_ARGS+=	MIDI=${WITH_MIDI_PLAYER}
 .endif
 .if defined(WITH_DEDICATED_SERVER_ONLY)
-MAKE_ARGS+=	DEDICATED=1
+MAKE_ARGS+=	DEDICATED=1 PTHREAD_LIBS="${PTHREAD_LIBS}"
 .else
 USE_SDL=	sdl
 .endif
@@ -31,15 +32,17 @@ USE_SDL=	sdl
 MAKE_ARGS+=	RELEASE=${PORTVERSION} DATA_DIR="share/openttd" \
 		USE_HOMEDIR=1 PERSONAL_DIR=.openttd INSTALL=1 VERBOSE=1
 
-DISTVERSIONSUFFIX=	-source
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 SUB_FILES=	pkg-message
 
 MAN6=		openttd.6
 
 DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "" "openttd" "" false
 
+DOCS=		HOWTO_compile_lang_files.txt Howto_compile_lng_files_from_CLI.txt \
+		Manual.txt elrail.svg elrail_tile.png elrail_track.png \
+		landscape.html landscape_grid.html multiplayer.txt \
+		ottd-colour-palette.gif ottd-colourtext-palette.png tileh.png
+
 pre-everything::
 .if !defined(WITH_MIDI_PLAYER)
 	@${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player"
@@ -61,9 +64,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/${MAN6} ${MANPREFIX}/man/man6
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-. for f in Howto_compile_lng_files_from_CLI.txt Manual.txt console.txt \
-	landscape.html landscape_grid.html multiplayer.txt \
-	ottd-colour-palette.gif ottd-colourtext-palette.png tileh.png
+. for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
 . endfor
 .endif
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index ea10140eaab2..89672066c652 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,3 +1,3 @@
-MD5 (openttd-0.4.8-source.tar.gz) = 9427166fef866b2c8b0c03b5140d0b02
-SHA256 (openttd-0.4.8-source.tar.gz) = 3222591ada73032ac4252aa04aed6e4017885fcb1153a799472ba6437277a88e
-SIZE (openttd-0.4.8-source.tar.gz) = 2877075
+MD5 (openttd-0.5.0-source.tar.gz) = caae893dc0310454e61503f605052719
+SHA256 (openttd-0.5.0-source.tar.gz) = 27420905a6885d1cde31f78d04d9164fa95ca6d39dfa26c91f1156c8969fa32c
+SIZE (openttd-0.5.0-source.tar.gz) = 4093144
diff --git a/games/openttd/files/patch-Makefile b/games/openttd/files/patch-Makefile
index 21d9e648b6a4..1d6d53625501 100644
--- a/games/openttd/files/patch-Makefile
+++ b/games/openttd/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	Mon Mar 27 02:32:00 2006
 +++ Makefile	Fri Jun 16 04:30:11 2006
-@@ -240,7 +240,7 @@
+@@ -213,7 +213,7 @@
  ifndef WIN32
  	ifndef MORPHOS
  		ifndef OSX
@@ -9,16 +9,16 @@
  		endif
  	endif
  endif
-@@ -297,7 +297,7 @@
+@@ -319,7 +319,7 @@
  # GNU make can only test for (in)equality
  # this is a workaround to test for >=
  ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
--  CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes -Wundef
-+  CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes -Wundef
+-  CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wundef
++  CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wundef
+   CC_CFLAGS += -Wstrict-prototypes
    CFLAGS += -Wwrite-strings -Wpointer-arith
  endif
- ifeq ($(shell expr $(CC_VERSION) \>= 30), 1)
-@@ -350,8 +350,6 @@
+@@ -377,8 +377,6 @@
  ifdef MORPHOS
  BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
  BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
diff --git a/games/openttd/files/patch-makefiledir_Makefile.libdetection b/games/openttd/files/patch-makefiledir_Makefile.libdetection
deleted file mode 100644
index ad0916959195..000000000000
--- a/games/openttd/files/patch-makefiledir_Makefile.libdetection
+++ /dev/null
@@ -1,14 +0,0 @@
---- makefiledir/Makefile.libdetection.orig	Tue Sep 12 17:21:19 2006
-+++ makefiledir/Makefile.libdetection	Tue Sep 12 17:22:35 2006
-@@ -51,11 +51,7 @@
- endif
- 
- # FreeBSD uses sdl11 instead of sdl
--ifdef FREEBSD
--SDL_CONFIG:=sdl11-config
--else
- SDL_CONFIG:=sdl-config
--endif
- 
- # set libpng-config to the default value
- LIBPNG_CONFIG :=libpng-config
diff --git a/games/openttd/pkg-plist b/games/openttd/pkg-plist
index 859ae50c9556..a51c3e409c67 100644
--- a/games/openttd/pkg-plist
+++ b/games/openttd/pkg-plist
@@ -1,7 +1,10 @@
 bin/openttd
+%%DATADIR%%/data/2ccmap.grf
+%%DATADIR%%/data/airports.grf
 %%DATADIR%%/data/autorail.grf
 %%DATADIR%%/data/canalsw.grf
 %%DATADIR%%/data/dosdummy.grf
+%%DATADIR%%/data/elrailsw.grf
 %%DATADIR%%/data/nsignalsw.grf
 %%DATADIR%%/data/openttd.grf
 %%DATADIR%%/data/opntitle.dat
@@ -9,11 +12,13 @@ bin/openttd
 @dirrm %%DATADIR%%/data
 %%DATADIR%%/lang/american.lng
 %%DATADIR%%/lang/brazilian_portuguese.lng
+%%DATADIR%%/lang/bulgarian.lng
 %%DATADIR%%/lang/catalan.lng
 %%DATADIR%%/lang/czech.lng
 %%DATADIR%%/lang/danish.lng
 %%DATADIR%%/lang/dutch.lng
 %%DATADIR%%/lang/english.lng
+%%DATADIR%%/lang/esperanto.lng
 %%DATADIR%%/lang/estonian.lng
 %%DATADIR%%/lang/finnish.lng
 %%DATADIR%%/lang/french.lng
@@ -22,20 +27,32 @@ bin/openttd
 %%DATADIR%%/lang/hungarian.lng
 %%DATADIR%%/lang/icelandic.lng
 %%DATADIR%%/lang/italian.lng
-%%DATADIR%%/lang/norwegian.lng
+%%DATADIR%%/lang/japanese.lng
+%%DATADIR%%/lang/korean.lng
+%%DATADIR%%/lang/lithuanian.lng
+%%DATADIR%%/lang/norwegian_bokmal.lng
+%%DATADIR%%/lang/norwegian_nynorsk.lng
 %%DATADIR%%/lang/origveh.lng
 %%DATADIR%%/lang/polish.lng
 %%DATADIR%%/lang/portuguese.lng
 %%DATADIR%%/lang/romanian.lng
+%%DATADIR%%/lang/russian.lng
+%%DATADIR%%/lang/simplified_chinese.lng
 %%DATADIR%%/lang/slovak.lng
+%%DATADIR%%/lang/slovenian.lng
 %%DATADIR%%/lang/spanish.lng
 %%DATADIR%%/lang/swedish.lng
+%%DATADIR%%/lang/traditional_chinese.lng
 %%DATADIR%%/lang/turkish.lng
+%%DATADIR%%/lang/ukrainian.lng
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO_compile_lang_files.txt
 %%PORTDOCS%%%%DOCSDIR%%/Howto_compile_lng_files_from_CLI.txt
 %%PORTDOCS%%%%DOCSDIR%%/Manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/console.txt
+%%PORTDOCS%%%%DOCSDIR%%/elrail.svg
+%%PORTDOCS%%%%DOCSDIR%%/elrail_tile.png
+%%PORTDOCS%%%%DOCSDIR%%/elrail_track.png
 %%PORTDOCS%%%%DOCSDIR%%/landscape.html
 %%PORTDOCS%%%%DOCSDIR%%/landscape_grid.html
 %%PORTDOCS%%%%DOCSDIR%%/multiplayer.txt