Use bl3, update to 1.1.3. Changes:

* Added -a cmdline switch to help improve sound.
* New images for the chip and the socket
* Added -f switch to get fullscreen mode
* Display code rewritten.  Faster all around.
* Miscellaneous other bugfixes

4 files changed, 20 insertions, 25 deletions

diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 217665fb132..427c023f975 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/01/24 13:30:57 grant Exp $
-#
+# $NetBSD: Makefile,v 1.10 2004/03/10 00:53:37 snj Exp $
 
-DISTNAME=	tworld-1.0
+DISTNAME=	tworld-1.1.3
 PKGNAME=	${DISTNAME:S/^t/tile/}
-PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 
@@ -11,8 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.muppetlabs.com/~breadbox/software/tworld/
 COMMENT=	"Game based on Chip's Challenge"
 
-WRKSRC=		${WRKDIR}/tworld-1.0
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
 GNU_CONFIGURE=	YES
@@ -21,10 +18,5 @@ ALL_TARGET=	tworld
 
 MAKE_ENV+=	ECHO="${ECHO}" DATE="${DATE}"
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tworld
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tworld/
-	${INSTALL_DATA} ${WRKSRC}/docs/tworld.html ${PREFIX}/share/doc/tworld/
-
-.include "../../devel/SDL/buildlink2.mk"
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tileworld/PLIST b/games/tileworld/PLIST
index 57e44a02462..704d83be827 100644
--- a/games/tileworld/PLIST
+++ b/games/tileworld/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/15 08:13:20 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/10 00:53:37 snj Exp $
 bin/tworld
 man/man6/tworld.6
+share/doc/tworld/README
+share/doc/tworld/tworld.html
 share/tworld/data/intro.dat
 share/tworld/res/atiles.bmp
 share/tworld/res/block.wav
@@ -38,10 +40,8 @@ share/tworld/sets/cc-lynx.dac
 share/tworld/sets/cc-ms.dac
 share/tworld/sets/intro-lynx.dac
 share/tworld/sets/intro-ms.dac
-share/doc/tworld/README
-share/doc/tworld/tworld.html
-@dirrm share/doc/tworld
 @dirrm share/tworld/sets
 @dirrm share/tworld/res
 @dirrm share/tworld/data
 @dirrm share/tworld
+@dirrm share/doc/tworld
diff --git a/games/tileworld/distinfo b/games/tileworld/distinfo
index 69c30c98276..4e3b13ec279 100644
--- a/games/tileworld/distinfo
+++ b/games/tileworld/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/15 08:13:20 salo Exp $
+$NetBSD: distinfo,v 1.2 2004/03/10 00:53:37 snj Exp $
 
-SHA1 (tworld-1.0.tar.gz) = 6199962b1885e9c93c9a19866d974298b1800723
-Size (tworld-1.0.tar.gz) = 1032532 bytes
-SHA1 (patch-aa) = 4ba1f84aca5c4768bfd447a7557540519b5511d6
+SHA1 (tworld-1.1.3.tar.gz) = fb6aad7187a668893882d5ab9bb18bced05b2582
+Size (tworld-1.1.3.tar.gz) = 1041017 bytes
+SHA1 (patch-aa) = d4ef59946368c438bd4977ad64be3e46314dbff7
diff --git a/games/tileworld/patches/patch-aa b/games/tileworld/patches/patch-aa
index 5e54557772a..8eda296e2ef 100644
--- a/games/tileworld/patches/patch-aa
+++ b/games/tileworld/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/15 08:13:20 salo Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/10 00:53:37 snj Exp $
 
---- Makefile.in.orig	Thu Apr 25 16:02:56 2002
-+++ Makefile.in	Sat Feb 15 08:41:09 2003
-@@ -68,14 +68,14 @@
+--- Makefile.in.orig	2002-04-25 07:02:56.000000000 -0700
++++ Makefile.in	2004-03-09 16:45:56.000000000 -0800
+@@ -68,14 +68,14 @@ err.o      : err.c oshw.h err.h
  #
  
  comptime.h:
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/02/15 08:13:20 salo Exp $
  
  #
  # Resources
-@@ -89,17 +89,15 @@
+@@ -89,17 +89,18 @@ tworldres.o: tworld.ico
  #
  
  install: tworld
@@ -43,6 +43,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/02/15 08:13:20 salo Exp $
 +	${BSD_INSTALL_DATA} resources/rc resources/*.bmp \
 +			resources/*.wav $(sharedir)/res/
 +	${BSD_INSTALL_MAN} docs/tworld.6 $(mandir)/man6/
++	${BSD_INSTALL_DATA_DIR} $(prefix)/share/doc/tworld
++	${BSD_INSTALL_DATA} README $(prefix)/share/doc/tworld/
++	${BSD_INSTALL_DATA} docs/tworld.html $(prefix)/share/doc/tworld/
  
  clean:
  	rm -f $(OBJS) tworld mklynxcc comptime.h config.*