3 files changed, 32 insertions, 15 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index f2b87e83b4b8..1b29597382cb 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openttd
-PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \
 		#SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -15,16 +14,16 @@ MASTER_SITES=	http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An open source clone of Microprose Transport Tycoon Deluxe
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+		lzo2.2:${PORTSDIR}/archivers/lzo2
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
-
 DISTVERSIONSUFFIX=	-source
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -36,6 +35,8 @@ CONFIGURE_ARGS+=	--with-midi-arg=${WITH_MIDI_PLAYER_ARGS}
 .endif
 .if defined(WITH_DEDICATED_SERVER_ONLY)
 CONFIGURE_ARGS+=	--enable-dedicated
+# Aid it to find lzo2 headers; client build gets it via sdl-config
+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
 .else
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
@@ -48,11 +49,11 @@ MAN6=		openttd.6
 DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "openttd" "openttd" \
 		"Game;Simulation;StrategyGame;" false
 
-PORTDOCS=	32bpp.txt HOWTO_compile_lang_files.txt Manual.txt elrail.svg \
+PORTDOCS=	32bpp.txt HOWTO_compile_lang_files.txt elrail.svg \
 		elrail_tile.png elrail_track.png landscape.html \
 		landscape_externals.html landscape_grid.html multiplayer.txt \
-		obg_format.txt ottd-colour-palette.gif \
-		ottd-colourtext-palette.png tileh.png
+		obg_format.txt obm_format.txt obs_format.txt \
+		ottd-colour-palette.gif ottd-colourtext-palette.png tileh.png
 
 pre-everything::
 .if !defined(WITH_MIDI_PLAYER)
@@ -66,16 +67,20 @@ pre-everything::
 .endif
 
 post-patch:
-# Remove extra (vendor) CFLAGS, we set our own
-	@${REINPLACE_CMD} '1102,1103d' ${WRKSRC}/config.lib
+# Remove extra (vendor-provided) CFLAGS and LDFLAGS
+	@${REINPLACE_CMD} -e '1250,1252d' ${WRKSRC}/config.lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}/data ${DATADIR}/lang ${DATADIR}/scripts
+	@${MKDIR} ${DATADIR}/ai ${DATADIR}/data ${DATADIR}/gm \
+		${DATADIR}/lang ${DATADIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/bin/ai/*.nut ${DATADIR}/ai
 	${INSTALL_DATA} ${WRKSRC}/bin/data/* ${DATADIR}/data
+	${INSTALL_DATA} ${WRKSRC}/bin/gm/* ${DATADIR}/gm
 	${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${DATADIR}/scripts
 	${INSTALL_MAN} ${WRKSRC}/docs/${MAN6} ${MANPREFIX}/man/man6
+	${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm ${PREFIX}/share/pixmaps
 .for n in 16 32 48 64 128 256
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/${n}x${n}/apps
 	${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index c48b4b198935..a661e4e002ba 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,3 +1,3 @@
-MD5 (openttd-0.7.5-source.tar.bz2) = ceb7ab1f5d6ef5c54181949c232dd0ca
-SHA256 (openttd-0.7.5-source.tar.bz2) = 635dfcf83b43b2b808d65167a1b37601aee2b8bd873a8f57aa5fa9779e1156c3
-SIZE (openttd-0.7.5-source.tar.bz2) = 4891206
+MD5 (openttd-1.0.1-source.tar.bz2) = c79d21ea55141e1a2e75ac0430360898
+SHA256 (openttd-1.0.1-source.tar.bz2) = 6067601979736e8b1acb1b67919c13a9f53f3407d0f0704bd310a55ac15bbc1f
+SIZE (openttd-1.0.1-source.tar.bz2) = 5341259
diff --git a/games/openttd/pkg-plist b/games/openttd/pkg-plist
index a46746f11e13..5de7991bfbe8 100644
--- a/games/openttd/pkg-plist
+++ b/games/openttd/pkg-plist
@@ -1,10 +1,20 @@
 bin/openttd
+share/pixmaps/openttd.32.xpm
+%%DATADIR%%/ai/compat_0.7.nut
+%%DATADIR%%/ai/compat_1.0.nut
+@dirrm %%DATADIR%%/ai
+%%DATADIR%%/gm/no_music.obm
+%%DATADIR%%/gm/orig_win.obm
+@dirrm %%DATADIR%%/gm
 %%DATADIR%%/data/openttdd.grf
 %%DATADIR%%/data/openttdw.grf
 %%DATADIR%%/data/opntitle.dat
 %%DATADIR%%/data/orig_dos.obg
+%%DATADIR%%/data/orig_dos.obs
 %%DATADIR%%/data/orig_dos_de.obg
 %%DATADIR%%/data/orig_win.obg
+%%DATADIR%%/data/orig_win.obs
+%%DATADIR%%/data/no_sound.obs
 @dirrm %%DATADIR%%/data
 %%DATADIR%%/lang/afrikaans.lng
 %%DATADIR%%/lang/arabic_egypt.lng
@@ -23,6 +33,7 @@ bin/openttd
 %%DATADIR%%/lang/french.lng
 %%DATADIR%%/lang/galician.lng
 %%DATADIR%%/lang/german.lng
+%%DATADIR%%/lang/greek.lng
 %%DATADIR%%/lang/hebrew.lng
 %%DATADIR%%/lang/hungarian.lng
 %%DATADIR%%/lang/icelandic.lng
@@ -33,9 +44,9 @@ bin/openttd
 %%DATADIR%%/lang/latvian.lng
 %%DATADIR%%/lang/lithuanian.lng
 %%DATADIR%%/lang/luxembourgish.lng
+%%DATADIR%%/lang/malay.lng
 %%DATADIR%%/lang/norwegian_bokmal.lng
 %%DATADIR%%/lang/norwegian_nynorsk.lng
-%%DATADIR%%/lang/piglatin.lng
 %%DATADIR%%/lang/polish.lng
 %%DATADIR%%/lang/portuguese.lng
 %%DATADIR%%/lang/romanian.lng
@@ -49,6 +60,7 @@ bin/openttd
 %%DATADIR%%/lang/traditional_chinese.lng
 %%DATADIR%%/lang/turkish.lng
 %%DATADIR%%/lang/ukrainian.lng
+%%DATADIR%%/lang/vietnamese.lng
 %%DATADIR%%/lang/welsh.lng
 @dirrm %%DATADIR%%/lang
 %%DATADIR%%/scripts/autoexec.scr.example