update to 0.6.2

not sure if midi music option is still available currently

4 files changed, 22 insertions, 24 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 3d2ce00d2a6..a5119ec9beb 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2008/04/08 23:11:21 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2008/08/05 12:38:22 kefren Exp $
 
-DISTNAME=	openttd-0.6.0-source
+DISTNAME=	openttd-0.6.2-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openttd/}
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index a493480eaf8..302e351fafd 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/08/05 12:38:22 kefren Exp $
 bin/openttd
-share/openttd/data/generictrams_v0.4.grf
 share/openttd/data/openttdd.grf
 share/openttd/data/openttdw.grf
 share/openttd/data/opntitle.dat
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 5d3dda211d0..cb9a3f002d2 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.12 2008/04/07 19:44:19 tnn Exp $
+$NetBSD: distinfo,v 1.13 2008/08/05 12:38:22 kefren Exp $
 
-SHA1 (openttd-0.6.0-source.tar.bz2) = 94c55f80e3869decb5b613d78f3b889f7168b6e5
-RMD160 (openttd-0.6.0-source.tar.bz2) = 9ba4d63d4613779ae57a96fa25d4bb897c558976
-Size (openttd-0.6.0-source.tar.bz2) = 3688002 bytes
+SHA1 (openttd-0.6.2-source.tar.bz2) = c53ec5515729613fe55bbb714af48b908e70af39
+RMD160 (openttd-0.6.2-source.tar.bz2) = 6e6d8864773138ed2f588b19c0a7f399607cf6ea
+Size (openttd-0.6.2-source.tar.bz2) = 3670638 bytes
+SHA1 (patch-aa) = 389ff1a447804e53df12072184c99b6ca3d70d62
+SHA1 (patch-ab) = ae1ff320072c65f68f09a34df55514c2be122b79
 SHA1 (ttd/gm_tt00.gm) = 79d21ad066867e9d737fb7b2fb1fbec9a7e3ff67
 RMD160 (ttd/gm_tt00.gm) = 682df44d2080f78d26bfc7095b1da4b026c24e31
 Size (ttd/gm_tt00.gm) = 29714 bytes
@@ -87,5 +89,3 @@ Size (ttd/trgir.grf) = 342377 bytes
 SHA1 (ttd/trgtr.grf) = 436d0ff41b3e2e0229960d56a50c68a871077a10
 RMD160 (ttd/trgtr.grf) = a73cb82dd0e18baf5142fa10fa9a90e8f9de1c8c
 Size (ttd/trgtr.grf) = 559392 bytes
-SHA1 (patch-aa) = 0301945e21a84d263ff087623b06eb6622eea46e
-SHA1 (patch-ab) = ae1ff320072c65f68f09a34df55514c2be122b79
diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa
index b033d23eaf7..8724295e8f0 100644
--- a/games/openttd/patches/patch-aa
+++ b/games/openttd/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
-
---- config.lib.orig	2008-04-01 00:31:33.000000000 +0200
-+++ config.lib
-@@ -392,9 +392,9 @@ check_params() {
+--- ./config.lib.orig	2008-08-02 02:52:22.000000000 +0300
++++ ./config.lib	2008-08-05 13:34:05.000000000 +0300
+@@ -392,9 +392,9 @@
  		exit 1
  	fi
  	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
@@ -14,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
  		exit 1
  	fi
  	# cpu_type can be either 32 or 64
-@@ -1000,6 +1000,10 @@ make_cflags_and_ldflags() {
+@@ -1003,6 +1003,10 @@
  		LIBS="$LIBS -pthread"
  	fi
  
@@ -25,7 +23,7 @@ $NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
  	if [ "$os" = "FREEBSD" ]; then
  		LIBS="$LIBS -lpthread"
  	fi
-@@ -1016,7 +1020,7 @@ make_cflags_and_ldflags() {
+@@ -1019,7 +1023,7 @@
  	fi
  
  	# Most targets act like UNIX, just with some additions
@@ -34,7 +32,7 @@ $NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
  		CFLAGS="$CFLAGS -DUNIX"
  	fi
  	# And others like Windows
-@@ -1511,7 +1515,7 @@ detect_awk() {
+@@ -1542,7 +1546,7 @@
  
  detect_os() {
  	if [ "$os" = "DETECT" ]; then
@@ -43,23 +41,24 @@ $NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
  
  		# Try first via dumpmachine, then via uname
  		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
-@@ -1519,6 +1523,7 @@ detect_os() {
+@@ -1550,6 +1554,8 @@
  					/darwin/       { print "OSX";     exit}
  					/freebsd/      { print "FREEBSD"; exit}
  					/openbsd/      { print "OPENBSD"; exit}
 +					/netbsd/       { print "NETBSD";  exit}
++					/netbsd/       { print "NETBSD";  exit}
  					/morphos/      { print "MORPHOS"; exit}
  					/beos/         { print "BEOS";    exit}
  					/sunos/        { print "SUNOS";   exit}
-@@ -1536,6 +1541,7 @@ detect_os() {
+@@ -1566,6 +1572,7 @@
+ 					/linux/        { print "UNIX";    exit}
  					/darwin/       { print "OSX";     exit}
  					/freebsd/      { print "FREEBSD"; exit}
- 					/openbsd/      { print "OPENBSD"; exit}
 +					/netbsd/       { print "NETBSD";  exit}
+ 					/openbsd/      { print "OPENBSD"; exit}
  					/morphos/      { print "MORPHOS"; exit}
  					/beos/         { print "BEOS";    exit}
- 					/sunos/        { print "SUNOS";   exit}
-@@ -1548,7 +1554,7 @@ detect_os() {
+@@ -1579,7 +1586,7 @@
  		if [ -z "$os" ]; then
  			log 1 "detecting OS... none detected"
  			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
@@ -68,7 +67,7 @@ $NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
  			exit 1
  		fi
  
-@@ -2296,7 +2302,7 @@ showhelp() {
+@@ -2320,7 +2327,7 @@
  	echo "  --awk=AWK                      the awk to use in configure [awk]"
  	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
  	echo "  --os=OS                        the OS we are compiling for [DETECT]"