Update to 0.10.0. Data files now included, remove

bomberclone-data package.

- Added: two ways the game can end now. the old Bomberman
  style with getting the size of the gamefield down and
  another one with putting in the game alot of powerups.
  the game even has a timeout of 10 minutes + the
  2 minutes of the end game sequence.

- Makefile.am fixed in the data direktory. Added
  ${prefix}/ and changed @PREFIX_PACKAGE_DATA_DIR@ to
  @NO_PREFIX_PACKAGE_DATA_DIR@ . So debian packages
  can be generated easyly soon.

- GFX: scaling routine speeded up a little bit. Using inline
  functions and much less "switch case".

- TekKRat made two new players, the first two
  tilesets with the pseudo 3D effect
  (64x96 pixel tileset) and another tileset.
  (cemetery, sheep, hell and farm)

- caccola made another Tileset (supermario)

- Added: Switch to enable/disable broadcasted chats.
  So the confusing will stop why there are unknown people
  talking. You can enable it in the Network Options.

- Fixed: chat_findfreeline, there was a bug in the
  source and destination of copying the chatlines.
  Thats why the chat got mixed up after 255 lines.

- Added: maps have more options to set and it will be
  displayed in the multiplayer menu, this options can be
  saved for every map seperated.

- GFX: source cleanup. Player will now drawn in order they
  stay tileset will change we can support 64x64pixel size
  and 64x92pixel size tilesets no sdl_blit* calls from
  game_loop for the game gfx.. working on a new engine with
  sorting the tiles and update rects.

  The new size tilesets filenames are block96.bmp for the
  block.bmp file stone96.bmp for the stone.bmp file. If in
  one directory are two files one stone.bmp and ston96.bmp
  the game will always take the stone.bmp file.

5 files changed, 134 insertions, 30 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 71a8e3fd9bb..c4b73b16d9f 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/26 21:41:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/31 21:27:22 wiz Exp $
 #
 
-DISTNAME=		bomberclone-0.9.9
-PKGREVISION=		2
+DISTNAME=		bomberclone-0.10.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bomberclone/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://bomberclone.sourceforge.net/
 COMMENT=		Multi-player Bomberman clone
 
-DEPENDS+=		bomberclone-data>=0.7:../../games/bomberclone-data
+CONFLICTS=		bomberclone-data-[0-9]*
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/games/bomberclone/PLIST b/games/bomberclone/PLIST
index 13f1c0d4591..991568c4494 100644
--- a/games/bomberclone/PLIST
+++ b/games/bomberclone/PLIST
@@ -1,5 +1,89 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/23 15:48:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/31 21:27:23 wiz Exp $
 bin/bomberclone
+share/bomberclone/gfx/font0.bmp
+share/bomberclone/gfx/font1.bmp
+share/bomberclone/gfx/font2.bmp
+share/bomberclone/gfx/logo.bmp
+share/bomberclone/gfx/logo1.bmp
+share/bomberclone/gfx/menuselect.bmp
+share/bomberclone/maps/first.map
+share/bomberclone/maps/firstmap.map
+share/bomberclone/maps/fourth.map
+share/bomberclone/maps/kitutou1.map
+share/bomberclone/maps/kitutou2.map
+share/bomberclone/maps/second.map
+share/bomberclone/maps/smal.map
+share/bomberclone/maps/smalfull.map
+share/bomberclone/maps/third.map
+share/bomberclone/player/dead0.bmp
+share/bomberclone/player/player0.bmp
+share/bomberclone/player/player1.bmp
+share/bomberclone/player/player2.bmp
+share/bomberclone/player/player3.bmp
+share/bomberclone/player/player4.bmp
+share/bomberclone/player/player5.bmp
+share/bomberclone/player/player6.bmp
+share/bomberclone/player/player7.bmp
+share/bomberclone/player/playersick.bmp
+share/bomberclone/tileset/cemetery/.xvpics/background.bmp
+share/bomberclone/tileset/cemetery/background.bmp
+share/bomberclone/tileset/cemetery/block96.bmp
+share/bomberclone/tileset/cemetery/map.nfo
+share/bomberclone/tileset/cemetery/stone96.bmp
+share/bomberclone/tileset/classic/background.bmp
+share/bomberclone/tileset/classic/block.bmp
+share/bomberclone/tileset/classic/stone.bmp
+share/bomberclone/tileset/cucumber/background.bmp
+share/bomberclone/tileset/cucumber/block.bmp
+share/bomberclone/tileset/cucumber/dead.wav
+share/bomberclone/tileset/cucumber/drop.wav
+share/bomberclone/tileset/cucumber/fire.bmp
+share/bomberclone/tileset/cucumber/powerbad.bmp
+share/bomberclone/tileset/cucumber/powersp.bmp
+share/bomberclone/tileset/cucumber/powerup.bmp
+share/bomberclone/tileset/cucumber/stone.bmp
+share/bomberclone/tileset/default/background.bmp
+share/bomberclone/tileset/default/block.bmp
+share/bomberclone/tileset/default/bomb.bmp
+share/bomberclone/tileset/default/dead.wav
+share/bomberclone/tileset/default/drop.wav
+share/bomberclone/tileset/default/explode.wav
+share/bomberclone/tileset/default/fire.bmp
+share/bomberclone/tileset/default/powerbad.bmp
+share/bomberclone/tileset/default/powersp.bmp
+share/bomberclone/tileset/default/powerup.bmp
+share/bomberclone/tileset/default/pwbomb.bmp
+share/bomberclone/tileset/default/pwdeath.bmp
+share/bomberclone/tileset/default/pwfire.bmp
+share/bomberclone/tileset/default/pwshoe.bmp
+share/bomberclone/tileset/default/sppush.bmp
+share/bomberclone/tileset/default/sprow.bmp
+share/bomberclone/tileset/default/sptrigger.bmp
+share/bomberclone/tileset/default/stone.bmp
+share/bomberclone/tileset/farm/background.bmp
+share/bomberclone/tileset/farm/block96.bmp
+share/bomberclone/tileset/farm/map.nfo
+share/bomberclone/tileset/farm/stone.bmp
+share/bomberclone/tileset/hell/.xvpics/background.bmp
+share/bomberclone/tileset/hell/.xvpics/block.bmp
+share/bomberclone/tileset/hell/background.bmp
+share/bomberclone/tileset/hell/block.bmp
+share/bomberclone/tileset/hell/map.nfo
+share/bomberclone/tileset/hell/stone.bmp
+share/bomberclone/tileset/jungle/background.bmp
+share/bomberclone/tileset/jungle/block.bmp
+share/bomberclone/tileset/jungle/stone.bmp
+share/bomberclone/tileset/radioactive/background.bmp
+share/bomberclone/tileset/radioactive/block.bmp
+share/bomberclone/tileset/radioactive/stone.bmp
+share/bomberclone/tileset/sheep/background.bmp
+share/bomberclone/tileset/sheep/block.bmp
+share/bomberclone/tileset/sheep/map.nfo
+share/bomberclone/tileset/sheep/stone.bmp
+share/bomberclone/tileset/supermario/background.bmp
+share/bomberclone/tileset/supermario/block.bmp
+share/bomberclone/tileset/supermario/stone.bmp
+share/bomberclone/tileset/supermario/stonebackup.bmp
 share/doc/bomberclone/AUTHORS
 share/doc/bomberclone/COPYING
 share/doc/bomberclone/ChangeLog
@@ -8,3 +92,20 @@ share/doc/bomberclone/NEWS
 share/doc/bomberclone/README
 share/doc/bomberclone/TODO
 @dirrm share/doc/bomberclone
+@dirrm share/bomberclone/tileset/supermario
+@dirrm share/bomberclone/tileset/sheep
+@dirrm share/bomberclone/tileset/radioactive
+@dirrm share/bomberclone/tileset/jungle
+@dirrm share/bomberclone/tileset/hell/.xvpics
+@dirrm share/bomberclone/tileset/hell
+@dirrm share/bomberclone/tileset/farm
+@dirrm share/bomberclone/tileset/default
+@dirrm share/bomberclone/tileset/cucumber
+@dirrm share/bomberclone/tileset/classic
+@dirrm share/bomberclone/tileset/cemetery/.xvpics
+@dirrm share/bomberclone/tileset/cemetery
+@dirrm share/bomberclone/tileset
+@dirrm share/bomberclone/player
+@dirrm share/bomberclone/maps
+@dirrm share/bomberclone/gfx
+@dirrm share/bomberclone
diff --git a/games/bomberclone/distinfo b/games/bomberclone/distinfo
index 99bbb259cdf..b1fbc47bbe9 100644
--- a/games/bomberclone/distinfo
+++ b/games/bomberclone/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/23 15:48:24 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/07/31 21:27:23 wiz Exp $
 
-SHA1 (bomberclone-0.9.9.tar.bz2) = 88c757525caf29ea6498b1dadec0ff3c478dd6b0
-Size (bomberclone-0.9.9.tar.bz2) = 127639 bytes
-SHA1 (bomberclone-data-0.7.tar.bz2) = a324474aa141167fb154247260b339d64dce3fe6
-Size (bomberclone-data-0.7.tar.bz2) = 3279402 bytes
-SHA1 (patch-aa) = c5d5b1d3988847dbf4a4eec828d870e8e3c74551
-SHA1 (patch-ab) = 546f40d8f097c8bd352877f3fb767a61f4551d6c
+SHA1 (bomberclone-0.10.0.tar.bz2) = 7c211126d79b25312d37597bca1583db00647896
+Size (bomberclone-0.10.0.tar.bz2) = 5130087 bytes
+SHA1 (patch-aa) = 6844b30b4f173f21afac482f702721af5e80f521
+SHA1 (patch-ab) = 44765d8ec5109dd870f6d23e874f17abbcdb2b46
diff --git a/games/bomberclone/patches/patch-aa b/games/bomberclone/patches/patch-aa
index 0a91742f43e..fea84c4614a 100644
--- a/games/bomberclone/patches/patch-aa
+++ b/games/bomberclone/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 15:48:24 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/31 21:27:24 wiz Exp $
 
---- Makefile.in.orig	2003-06-12 22:53:17.000000000 +0200
+--- Makefile.in.orig	2003-07-31 21:49:46.000000000 +0200
 +++ Makefile.in
-@@ -85,7 +85,7 @@ install_sh = @install_sh@
+@@ -84,7 +84,7 @@ VERSION = @VERSION@
  
- SUBDIRS = src
+ SUBDIRS = src data
  
 -bomberclonedocdir = ${prefix}/doc/bomberclone
 +bomberclonedocdir = ${prefix}/share/doc/bomberclone
- bomberclonedoc_DATA = \
- 	README\
- 	COPYING\
+ bomberclonedoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO
+ 
+ 
diff --git a/games/bomberclone/patches/patch-ab b/games/bomberclone/patches/patch-ab
index e01a208ffbd..b2cf6e1cad6 100644
--- a/games/bomberclone/patches/patch-ab
+++ b/games/bomberclone/patches/patch-ab
@@ -1,13 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/23 15:48:24 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2003/07/31 21:27:24 wiz Exp $
 
---- configure.orig	2003-06-12 22:53:21.000000000 +0200
-+++ configure
-@@ -1996,7 +1996,7 @@ else
- fi
+--- data/Makefile.in.orig	2003-07-31 21:49:46.000000000 +0200
++++ data/Makefile.in
+@@ -196,10 +196,10 @@ install:
+ 	@if test ! -d ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@; then \
+ 		mkdir ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@; \
+ 	fi;
+-	cp player ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf
+-	cp maps ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf
+-	cp gfx ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf
+-	cp tileset ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf
++	cp -rf player ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
++	cp -rf maps ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
++	cp -rf gfx ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
++	cp -rf tileset ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
  
- packagedatadir=share/${PACKAGE}
--packagedocdir=doc/${PACKAGE}
-+packagedocdir=share/doc/${PACKAGE}
- 
- packagepixmapsdir=${packagedatadir}/pixmaps
- packagehelpdir=${packagedatadir}/help
+ uninstall:
+ 	rm -rf ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@