4 files changed, 79 insertions, 20 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 67d4972e237b..7f6846c645e3 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openttd
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,24 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An open source clone of Microprose Transport Tycoon Deluxe
 
+DISTVERSIONSUFFIX=	-source
+
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_SDL=	sdl
-
-post-extract:
-	@${REINPLACE_CMD} -e 's|-O2 $$(WARNING_DISPLAY)|${CFLAGS} $$(WARNING_DISPLAY)|' \
-		-e 's|`$$(SDL-CONFIG) --cflags`|$$(shell $$(SDL-CONFIG) --cflags)|' \
-		-e 's|`$$(SDL-CONFIG) --libs`|$$(shell $$(SDL-CONFIG) --libs)|' \
-		-e 's|CC=|CC\?=|; s|CXX=|CXX\?=|; s|x86_64|amd64|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/extmidi.c
-
-MAKE_ARGS+=	RELEASE=${PORTVERSION} GAME_DATA_DIR=${DATADIR}/ \
-		USE_HOMEDIR=1 PERSONAL_DIR=.openttd
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 pre-everything::
 .if !defined(WITH_MIDI_PLAYER)
@@ -39,17 +27,34 @@ pre-everything::
 .else
 MAKE_ARGS+=	MIDI=${WITH_MIDI_PLAYER}
 .endif
-.if !defined(WITH_NETWORK)
-	@${ECHO_MSG} "Define WITH_NETWORK to enable networking (EXPERIMENTAL!)"
+.if !defined(WITH_DEDICATED_SERVER_ONLY)
+	@${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server"
+USE_SDL=	sdl
 .else
-MAKE_ARGS+=	WITH_NETWORK=1
+MAKE_ARGS+=	DEDICATED=1
 .endif
 
+post-extract:
+	@${REINPLACE_CMD} -e 's|-O2 $$(WARNING_DISPLAY)|${CFLAGS} $$(WARNING_DISPLAY)|' \
+		${WRKSRC}/Makefile
+.if defined(WITH_DEDICATED_SERVER_ONLY)
+	@${REINPLACE_CMD} -e 's|^WITH_SDL|#WITH_SDL|' ${WRKSRC}/makefiledir/Makefile.libdetection
+.endif
+
+MAKE_ARGS+=	RELEASE=${PORTVERSION} DATA_DIR="share/openttd" \
+		USE_HOMEDIR=1 PERSONAL_DIR=.openttd INSTALL=1 VERBOSE=1
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+MAN6=		openttd.6
+
 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_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 \
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 1dc58d2f8561..e5d3f99be858 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,2 +1,2 @@
-MD5 (openttd-0.3.4.tar.bz2) = 14a4761593ac31418454c9cc1fe8a8bb
-SIZE (openttd-0.3.4.tar.bz2) = 1394627
+MD5 (openttd-0.3.5-source.tar.gz) = 10a97eac9c77b977ddaa11660a3ccb7c
+SIZE (openttd-0.3.5-source.tar.gz) = 2059465
diff --git a/games/openttd/files/patch-Makefile b/games/openttd/files/patch-Makefile
new file mode 100644
index 000000000000..4a5583179262
--- /dev/null
+++ b/games/openttd/files/patch-Makefile
@@ -0,0 +1,47 @@
+--- Makefile.orig	Fri Dec 24 07:40:45 2004
++++ Makefile	Thu Jan 13 17:50:56 2005
+@@ -232,8 +232,8 @@
+ #
+ # Compiler configuration
+ #
+-CC=gcc
+-CXX=g++
++CC?=gcc
++CXX?=g++
+ 
+ ifdef MORPHOS
+ CC += -noixemul -pipe
+@@ -274,7 +274,7 @@
+ BUILDDATE=`date +%d.%m.%y`
+ 
+ # AMD64 needs a little more settings to work
+-ifeq ($(shell uname -m), x86_64)
++ifeq ($(shell uname -m), amd64)
+ endwarnings:=endwarnings
+ 64_bit_warnings:=64_bit_warnings
+ BASECFLAGS += -m64
+@@ -371,11 +371,11 @@
+ # SDL config
+ ifdef WITH_SDL
+ CDEFS += -DWITH_SDL
+-CFLAGS += `$(SDL-CONFIG) --cflags`
++CFLAGS += $(shell $(SDL-CONFIG) --cflags)
+ ifdef STATIC
+-LIBS += `$(SDL-CONFIG) --static-libs`
++LIBS += $(shell $(SDL-CONFIG) --static-libs)
+ else
+-LIBS += `$(SDL-CONFIG) --libs`
++LIBS += $(shell $(SDL-CONFIG) --libs)
+ endif
+ endif
+ 
+@@ -420,7 +420,8 @@
+ CDEFS += -DWITH_PNG
+ # FreeBSD doesn't use libpng-config
+ ifdef FREEBSD
+-LIBS += -lpng
++LIBS += -lpng -L$(PREFIX)/lib
++CFLAGS += -I$(PREFIX)/include/libpng
+ else
+ CFLAGS += `libpng-config --cflags`
+ 
diff --git a/games/openttd/pkg-plist b/games/openttd/pkg-plist
index a38a285559e2..98562379f812 100644
--- a/games/openttd/pkg-plist
+++ b/games/openttd/pkg-plist
@@ -6,6 +6,7 @@ bin/openttd
 %%DATADIR%%/data/trkfoundw.grf
 @dirrm %%DATADIR%%/data
 %%DATADIR%%/lang/american.lng
+%%DATADIR%%/lang/catalan.lng
 %%DATADIR%%/lang/czech.lng
 %%DATADIR%%/lang/danish.lng
 %%DATADIR%%/lang/dutch.lng
@@ -15,13 +16,19 @@ bin/openttd
 %%DATADIR%%/lang/galician.lng
 %%DATADIR%%/lang/german.lng
 %%DATADIR%%/lang/hungarian.lng
+%%DATADIR%%/lang/icelandic.lng
 %%DATADIR%%/lang/italian.lng
+%%DATADIR%%/lang/latvian.lng
 %%DATADIR%%/lang/norwegian.lng
 %%DATADIR%%/lang/origveh.lng
 %%DATADIR%%/lang/polish.lng
+%%DATADIR%%/lang/portuguese.lng
 %%DATADIR%%/lang/romanian.lng
+%%DATADIR%%/lang/russian.lng
 %%DATADIR%%/lang/slovak.lng
+%%DATADIR%%/lang/spanish.lng
 %%DATADIR%%/lang/swedish.lng
+%%DATADIR%%/lang/turkish.lng
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/Howto_compile_lng_files_from_CLI.txt