* Update to version 0.3.6

* Fix shared data path to share/games/<package>

openttd/MESSAGE

@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/08/27 22:42:22 thomasklausner Exp $
+$NetBSD: MESSAGE,v 1.3 2005/01/27 14:23:15 ianzag Exp $
 
 To run openttd you need data files provided by the original Transport
 Tycoon Deluxe.
 
-The following files should be copied to ${PREFIX}/share/openttd/data
+The following files should be copied to ${PREFIX}/share/games/openttd/data
 in order to play:
 	
 	sample.cat

openttd/Makefile

@@ -1,41 +1,45 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/27 21:56:11 froz Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/27 14:23:15 ianzag Exp $
 
-DISTNAME=	openttd-0.3.3
+DISTNAME=	openttd-0.3.6-source
+PKGNAME=	openttd-0.3.6
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=openttd/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	froz@icix.org
 HOMEPAGE=	http://www.openttd.com/
 COMMENT=	Open source clone of Transport Tycoon Deluxe
 
-GNU_CONFIGURE=	yes
 USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
-MAKE_ENV+=	WITH_NETWORK=1 USE_HOMEDIR=1 PERSONAL_DIR=.openttd GAME_DATA_DIR=${PREFIX}/share/openttd/
-
 USE_X11=	yes
 
+DATA_DIR= 	${PREFIX}/share/games/openttd
+
+MAKE_ENV+=	PREFIX=${PREFIX}
+MAKE_ENV+=	INSTALL=1
+MAKE_ENV+=	BINARY_DIR=bin
+MAKE_ENV+=	DATA_DIR=share/games/openttd
+MAKE_ENV+=	USE_HOMEDIR=1
+MAKE_ENV+=	PERSONAL_DIR=.openttd
+MAKE_ENV+=	WITH_NETWORK=1
 MAKE_ENV+=	X11BASE=${X11BASE}
 
-DATA_DIR= 	${PREFIX}/share/openttd
-
-post-patch:
-	${SED} -e "s:@PREFIX@:"${PREFIX}":g" ${FILESDIR}/openttd > \
-		${WRKSRC}/openttd
+WRKSRC=		${WRKDIR}/${PKGNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ttd ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/openttd ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/openttd ${PREFIX}/bin
 	@${INSTALL_DATA_DIR} ${DATA_DIR}
 	@${INSTALL_DATA_DIR} ${DATA_DIR}/lang
 	@${INSTALL_DATA_DIR} ${DATA_DIR}/data
 	@${INSTALL_DATA_DIR} ${DATA_DIR}/docs
+	@${INSTALL_DATA_DIR} ${DATA_DIR}/gm
 	${INSTALL_DATA} -m 644 ${WRKSRC}/lang/*.lng ${DATA_DIR}/lang
 	${INSTALL_DATA} -m 644 ${WRKSRC}/data/* ${DATA_DIR}/data
 	${INSTALL_DATA} -m 644 ${WRKSRC}/readme.txt ${DATA_DIR}/docs
 	${INSTALL_DATA} -m 644 ${WRKSRC}/changelog.txt ${DATA_DIR}/docs
 	${INSTALL_DATA} -m 644 ${WRKSRC}/docs/Manual.txt ${DATA_DIR}/docs
+	${INSTALL_DATA} -m 644 ${WRKSRC}/docs/multiplayer.txt ${DATA_DIR}/docs
 
+#.include "../../graphics/png/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

openttd/PLIST

@@ -1,26 +1,37 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/05 21:19:27 thomasklausner Exp $
-bin/ttd
+@comment $NetBSD: PLIST,v 1.4 2005/01/27 14:23:15 ianzag Exp $
 bin/openttd
-share/openttd/lang/norwegian.lng
-share/openttd/lang/italian.lng
-share/openttd/lang/french.lng
-share/openttd/lang/danish.lng
-share/openttd/lang/swedish.lng
-share/openttd/lang/galician.lng
-share/openttd/lang/english.lng
-share/openttd/lang/german.lng
-share/openttd/lang/hungarian.lng
-share/openttd/lang/czech.lng
-share/openttd/lang/polish.lng
-share/openttd/lang/slovak.lng
-share/openttd/data/canalsw.grf
-share/openttd/data/openttd.grf
-share/openttd/data/opntitle.dat
-share/openttd/data/signalsw.grf
-share/openttd/docs/Manual.txt
-share/openttd/docs/readme.txt
-share/openttd/docs/changelog.txt
-@dirrm share/openttd/lang
-@dirrm share/openttd/docs
-@comment next dir may contain data files
-@unexec ${RMDIR} -p %D/share/openttd/data 2>/dev/null || ${TRUE}
+share/games/openttd/data/autorail.grf
+share/games/openttd/data/canalsw.grf
+share/games/openttd/data/openttd.grf
+share/games/openttd/data/opntitle.dat
+share/games/openttd/data/signalsw.grf
+share/games/openttd/data/trkfoundw.grf
+share/games/openttd/docs/Manual.txt
+share/games/openttd/docs/changelog.txt
+share/games/openttd/docs/multiplayer.txt
+share/games/openttd/docs/readme.txt
+share/games/openttd/lang/american.lng
+share/games/openttd/lang/catalan.lng
+share/games/openttd/lang/czech.lng
+share/games/openttd/lang/danish.lng
+share/games/openttd/lang/dutch.lng
+share/games/openttd/lang/english.lng
+share/games/openttd/lang/finnish.lng
+share/games/openttd/lang/french.lng
+share/games/openttd/lang/galician.lng
+share/games/openttd/lang/german.lng
+share/games/openttd/lang/hungarian.lng
+share/games/openttd/lang/icelandic.lng
+share/games/openttd/lang/italian.lng
+share/games/openttd/lang/norwegian.lng
+share/games/openttd/lang/origveh.lng
+share/games/openttd/lang/polish.lng
+share/games/openttd/lang/portuguese.lng
+share/games/openttd/lang/romanian.lng
+share/games/openttd/lang/slovak.lng
+share/games/openttd/lang/spanish.lng
+share/games/openttd/lang/swedish.lng
+@dirrm share/games/openttd/lang
+@dirrm share/games/openttd/docs
+@dirrm share/games/openttd/data
+@dirrm share/games/openttd

openttd/TODO

@@ -1 +1,5 @@
-0.3.5 is out.
+
+* Once again review Makefile* for NetBSD.
+* Fix libpng detection/support.
+* Add MIDI audio output.
+* Libtool (does it worth it?).

openttd/distinfo

@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/08/27 21:56:11 froz Exp $
+$NetBSD: distinfo,v 1.2 2005/01/27 14:23:15 ianzag Exp $
 
-SHA1 (openttd-0.3.3.tar.bz2) = c88757d3da77c83c8af5fe3ec776ae40aecec691
-Size (openttd-0.3.3.tar.bz2) = 1075443 bytes
+SHA1 (openttd-0.3.6-source.tar.gz) = 0e76068e046b53cb31eb4b623e460a785d6d836b
+Size (openttd-0.3.6-source.tar.gz) = 2511895 bytes
+SHA1 (patch-aa) = 1904fdf15a8796bb9b534f1fdd7e8989706c149c

openttd/files/openttd

@@ -1,4 +0,0 @@
-#!/bin/sh
-test -d ~/.openttd/ || mkdir -p ~/.openttd
-cd ~/.openttd/
-exec @PREFIX@/bin/ttd 

openttd/patches/patch-aa

@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2005/01/27 14:23:15 ianzag Exp $
+
+--- makefiledir/Makefile.libdetection.orig	2004-12-07 23:58:06.000000000 +0600
++++ makefiledir/Makefile.libdetection
+@@ -18,6 +18,11 @@ ifeq ($(shell uname),FreeBSD)
+ FREEBSD:=1
+ endif
+ 
++# Automatically recognize if building on NetBSD
++ifeq ($(shell uname),NetBSD)
++NETBSD:=1
++endif
++
+ # Automatically recognize if building on MacOSX
+ ifeq ($(VENDOR), apple)
+ OSX:=1