5 files changed, 84 insertions, 68 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index c4078b42c8b0..b575a5576867 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -6,65 +6,77 @@
 #
 
 PORTNAME=	openttd
-PORTVERSION=	0.5.3
-PORTREVISION=	2
+PORTVERSION=	0.6.1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An open source clone of Microprose Transport Tycoon Deluxe
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
+HAS_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
+INSTALLS_ICONS=	yes
+
+CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
 
 DISTVERSIONSUFFIX=	-source
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if defined(WITH_MIDI_PLAYER)
-MAKE_ARGS+=	MIDI=${WITH_MIDI_PLAYER}
+CONFIGURE_ARGS+=	--with-midi=${WITH_MIDI_PLAYER}
+.endif
+.if defined(WITH_MIDI_PLAYER_ARGS)
+CONFIGURE_ARGS+=	--with-midi-arg=${WITH_MIDI_PLAYER_ARGS}
 .endif
 .if defined(WITH_DEDICATED_SERVER_ONLY)
-MAKE_ARGS+=	DEDICATED=1
+CONFIGURE_ARGS+=	--enable-dedicated
 .else
 USE_SDL=	sdl
 .endif
 
-MAKE_ARGS+=	RELEASE=${PORTVERSION} DATA_DIR="share/openttd" \
-		USE_HOMEDIR=1 PERSONAL_DIR=.openttd INSTALL=1 VERBOSE=1 \
-		PTHREAD_LIBS="-lpthread"
-
 SUB_FILES=	pkg-message
-
 MAN6=		openttd.6
 
-DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "" "openttd" "" false
+DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "openttd" "openttd" \
+		"Game;Simulation;StrategyGame;" 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 \
+DOCS=		32bpp.txt HOWTO_compile_lang_files.txt Manual.txt elrail.svg \
+		elrail_tile.png elrail_track.png landscape.html \
+		landscape_externals.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"
 .endif
+.if !defined(WITH_MIDI_PLAYER_ARGS)
+	@${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player"
+.endif
 .if !defined(WITH_DEDICATED_SERVER_ONLY)
 	@${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server"
 .endif
 
-post-extract:
-.if defined(WITH_DEDICATED_SERVER_ONLY)
-	@${REINPLACE_CMD} -e 's|^WITH_SDL|#WITH_SDL|' ${WRKSRC}/makefiledir/Makefile.libdetection
-.endif
+post-patch:
+# Remove extra (vendor) CFLAGS, we set our own
+	@${REINPLACE_CMD} '877,878d' ${WRKSRC}/config.lib
 
 do-install:
-	@${MKDIR} ${DATADIR}/data ${DATADIR}/lang
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data
-	${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${DATADIR}/lang
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}/data ${DATADIR}/lang ${DATADIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/bin/data/* ${DATADIR}/data
+	${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${DATADIR}/lang
+	${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${DATADIR}/scripts
 	${INSTALL_MAN} ${WRKSRC}/docs/${MAN6} ${MANPREFIX}/man/man6
+.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 \
+		${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 . for f in ${DOCS}
@@ -73,6 +85,8 @@ do-install:
 .endif
 
 post-install:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index aa2dbceb629d..573bb41280e7 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,3 +1,3 @@
-MD5 (openttd-0.5.3-source.tar.gz) = 609bd6a728987326cb0293994185e490
-SHA256 (openttd-0.5.3-source.tar.gz) = 0327028653af2b8e2aa90c83ead83b4487792bbfbee3b5bbd15f7ed8907ee70d
-SIZE (openttd-0.5.3-source.tar.gz) = 4114053
+MD5 (openttd-0.6.1-source.tar.bz2) = f7c0f19dcca051cd28641109d795f202
+SHA256 (openttd-0.6.1-source.tar.bz2) = d7d26e41f78a904e84dbfafad0f555e5d29aa20f3688e8d6865a57a46837086c
+SIZE (openttd-0.6.1-source.tar.bz2) = 3690207
diff --git a/games/openttd/files/patch-Makefile b/games/openttd/files/patch-Makefile
deleted file mode 100644
index 1d6d53625501..000000000000
--- a/games/openttd/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	Mon Mar 27 02:32:00 2006
-+++ Makefile	Fri Jun 16 04:30:11 2006
-@@ -213,7 +213,7 @@
- ifndef WIN32
- 	ifndef MORPHOS
- 		ifndef OSX
--			LDFLAGS+=-lpthread
-+			LDFLAGS+=${PTHREAD_LIBS}
- 		endif
- 	endif
- endif
-@@ -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 -Wundef
-+  CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wundef
-   CC_CFLAGS += -Wstrict-prototypes
-   CFLAGS += -Wwrite-strings -Wpointer-arith
- endif
-@@ -377,8 +377,6 @@
- ifdef MORPHOS
- BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
- BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
--else
--BASECFLAGS += -O2
- endif
- ifndef PROFILE
- ifndef IRIX
diff --git a/games/openttd/files/pkg-message.in b/games/openttd/files/pkg-message.in
index 7a4f6271e47e..8fc77cc68085 100644
--- a/games/openttd/files/pkg-message.in
+++ b/games/openttd/files/pkg-message.in
@@ -12,7 +12,7 @@
 	trgtr.grf
 
     If you are using a non-latin language, you may see lots of `?'s on
-    the screen.  Please open your configuration file and add a desired
+    the screen.  Please open your configuration file and add desired
     fonts (file name with full path).  Bold fonts might look better:
 
 	[misc]
@@ -20,6 +20,12 @@
 	medium_font =
 	large_font =
 
+    To enable Generic Tram Set update your ~/.openttd/openttd.cfg
+    configuration file in the following way:
+
+	[newgrf]
+	generictrams_v0.4.grf
+
     Enjoy!!
 
 ==========================================================================
diff --git a/games/openttd/pkg-plist b/games/openttd/pkg-plist
index 079a40da1466..3bcaf5d2ef43 100644
--- a/games/openttd/pkg-plist
+++ b/games/openttd/pkg-plist
@@ -1,16 +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/generictrams_v0.4.grf
+%%DATADIR%%/data/openttdd.grf
+%%DATADIR%%/data/openttdw.grf
 %%DATADIR%%/data/opntitle.dat
-%%DATADIR%%/data/trkfoundw.grf
 @dirrm %%DATADIR%%/data
-%%DATADIR%%/lang/american.lng
+%%DATADIR%%/lang/afrikaans.lng
 %%DATADIR%%/lang/brazilian_portuguese.lng
 %%DATADIR%%/lang/bulgarian.lng
 %%DATADIR%%/lang/catalan.lng
@@ -19,6 +13,7 @@ bin/openttd
 %%DATADIR%%/lang/danish.lng
 %%DATADIR%%/lang/dutch.lng
 %%DATADIR%%/lang/english.lng
+%%DATADIR%%/lang/english_US.lng
 %%DATADIR%%/lang/esperanto.lng
 %%DATADIR%%/lang/estonian.lng
 %%DATADIR%%/lang/finnish.lng
@@ -34,6 +29,7 @@ bin/openttd
 %%DATADIR%%/lang/norwegian_bokmal.lng
 %%DATADIR%%/lang/norwegian_nynorsk.lng
 %%DATADIR%%/lang/origveh.lng
+%%DATADIR%%/lang/piglatin.lng
 %%DATADIR%%/lang/polish.lng
 %%DATADIR%%/lang/portuguese.lng
 %%DATADIR%%/lang/romanian.lng
@@ -47,14 +43,43 @@ bin/openttd
 %%DATADIR%%/lang/turkish.lng
 %%DATADIR%%/lang/ukrainian.lng
 @dirrm %%DATADIR%%/lang
+%%DATADIR%%/scripts/autoexec.scr.example
+%%DATADIR%%/scripts/on_client.scr.example
+%%DATADIR%%/scripts/on_dedicated.scr.example
+%%DATADIR%%/scripts/on_server.scr.example
+%%DATADIR%%/scripts/pre_dedicated.scr.example
+%%DATADIR%%/scripts/pre_server.scr.example
+%%DATADIR%%/scripts/readme.txt
+@dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%
+share/icons/hicolor/16x16/apps/openttd.png
+share/icons/hicolor/32x32/apps/openttd.png
+share/icons/hicolor/48x48/apps/openttd.png
+share/icons/hicolor/64x64/apps/openttd.png
+share/icons/hicolor/128x128/apps/openttd.png
+share/icons/hicolor/256x256/apps/openttd.png
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+%%PORTDOCS%%%%DOCSDIR%%/32bpp.txt
 %%PORTDOCS%%%%DOCSDIR%%/HOWTO_compile_lang_files.txt
-%%PORTDOCS%%%%DOCSDIR%%/Howto_compile_lng_files_from_CLI.txt
 %%PORTDOCS%%%%DOCSDIR%%/Manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/elrail.svg
 %%PORTDOCS%%%%DOCSDIR%%/elrail_tile.png
 %%PORTDOCS%%%%DOCSDIR%%/elrail_track.png
 %%PORTDOCS%%%%DOCSDIR%%/landscape.html
+%%PORTDOCS%%%%DOCSDIR%%/landscape_externals.html
 %%PORTDOCS%%%%DOCSDIR%%/landscape_grid.html
 %%PORTDOCS%%%%DOCSDIR%%/multiplayer.txt
 %%PORTDOCS%%%%DOCSDIR%%/ottd-colour-palette.gif