7 files changed, 59 insertions, 60 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 00eeb83acb0f..8a2702797a97 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	bomberclone
-PORTVERSION=	0.9.8
+PORTVERSION=	0.9.9
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz \
-		${PORTNAME}-data-0.6.tar.bz2
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 \
+		${PORTNAME}-data-0.7.tar.bz2
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Reimplementation of Atomic Bomber Man
@@ -21,12 +21,12 @@ BUILD_DEPENDS=	sdl11-config:${PORTSDIR}/devel/sdl12 \
 LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer	\
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image
 
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 CONFIGURE_ARGS=	--target=""
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
@@ -34,12 +34,7 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
 
 post-extract:
-	${TAR} --directory ${WRKDIR} --bunzip2 --extract --file ${DISTDIR}/${PORTNAME}-data-0.6.tar.bz2
-	${RM} -rf ${WRKDIR}/data/tileset/default/.thumbnails
-
-post-patch:
-	${REINPLACE_CMD} -e 's,@@LOCALBASE@@,${LOCALBASE},' \
-		${WRKSRC}/src/configuration.c
+	${RM} -rf ${WRKDIR}/data/tileset/default/.xvpics
 
 post-install:
 	${MKDIR} ${PREFIX}/share/bomberclone
diff --git a/games/bomberclone/distinfo b/games/bomberclone/distinfo
index 32e311470de1..ecd20d94d08c 100644
--- a/games/bomberclone/distinfo
+++ b/games/bomberclone/distinfo
@@ -1,2 +1,2 @@
-MD5 (bomberclone-0.9.8.tgz) = 3b732ccd9dfe23a3f143d3e4d204382f
-MD5 (bomberclone-data-0.6.tar.bz2) = 73381d4d6ab5c29d62747416a5da9206
+MD5 (bomberclone-0.9.9.tar.bz2) = 408af580512dc288a36b5a203ce22eab
+MD5 (bomberclone-data-0.7.tar.bz2) = aed44dc8fa12d11d632b8627471878fb
diff --git a/games/bomberclone/files/patch-Makefile.in b/games/bomberclone/files/patch-Makefile.in
index ba09ae6eba90..dcb278c120cc 100644
--- a/games/bomberclone/files/patch-Makefile.in
+++ b/games/bomberclone/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon May 12 18:43:37 2003
-+++ Makefile.in	Mon May 12 18:43:47 2003
-@@ -83,7 +83,7 @@
+--- Makefile.in.orig	Fri Jun 13 10:09:40 2003
++++ Makefile.in	Fri Jun 13 10:09:48 2003
+@@ -85,7 +85,7 @@
  
  SUBDIRS = src
  
diff --git a/games/bomberclone/files/patch-configure b/games/bomberclone/files/patch-configure
new file mode 100644
index 000000000000..7260cde26159
--- /dev/null
+++ b/games/bomberclone/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Jun 13 09:58:39 2003
++++ configure	Fri Jun 13 09:58:45 2003
+@@ -1996,7 +1996,7 @@
+ fi
+ 
+ packagedatadir=share/${PACKAGE}
+-packagedocdir=doc/${PACKAGE}
++packagedocdir=share/doc/${PACKAGE}
+ 
+ packagepixmapsdir=${packagedatadir}/pixmaps
+ packagehelpdir=${packagedatadir}/help
diff --git a/games/bomberclone/files/patch-src::configuration.c b/games/bomberclone/files/patch-src::configuration.c
deleted file mode 100644
index a05367a923c4..000000000000
--- a/games/bomberclone/files/patch-src::configuration.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/configuration.c.orig	Fri May  9 06:36:13 2003
-+++ src/configuration.c	Mon May 12 18:46:54 2003
-@@ -48,7 +48,7 @@
- 	gfx.random_tileset = 1;
-     bman.fieldsize.x = 25;
-     bman.fieldsize.y = 17;
--    sprintf (bman.datapath, "data");
-+    sprintf (bman.datapath, "@@LOCALBASE@@/share/bomberclone");
-     bman.fieldpath[0] = 0;
- 	bman.random_map = 2;
- 	init_map_tileset();
diff --git a/games/bomberclone/files/patch-src::udp.c b/games/bomberclone/files/patch-src::udp.c
deleted file mode 100644
index 2e7409ce2a39..000000000000
--- a/games/bomberclone/files/patch-src::udp.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/udp.c.orig	Mon Apr 28 06:56:46 2003
-+++ src/udp.c	Fri May  2 17:30:03 2003
-@@ -10,6 +10,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <time.h>
-+#include <sys/time.h>
- #ifdef _WIN32
- #include <winsock.h>
- #else
diff --git a/games/bomberclone/pkg-plist b/games/bomberclone/pkg-plist
index 1ba61366ff4b..2fcd306440ad 100644
--- a/games/bomberclone/pkg-plist
+++ b/games/bomberclone/pkg-plist
@@ -1,64 +1,78 @@
 bin/bomberclone
-share/doc/bomberclone/README
-share/doc/bomberclone/COPYING
+
 share/doc/bomberclone/AUTHORS
+share/doc/bomberclone/COPYING
 share/doc/bomberclone/ChangeLog
 share/doc/bomberclone/INSTALL
 share/doc/bomberclone/NEWS
+share/doc/bomberclone/README
 share/doc/bomberclone/TODO
 @dirrm share/doc/bomberclone
 
-share/bomberclone/gfx/font.bmp
+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
 @dirrm share/bomberclone/gfx
 
+share/bomberclone/maps/clean.map
+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
 @dirrm share/bomberclone/maps
 
+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/playersick.bmp
 @dirrm share/bomberclone/player
 
 share/bomberclone/tileset/default/background.bmp
 share/bomberclone/tileset/default/block.bmp
 share/bomberclone/tileset/default/bomb.bmp
-share/bomberclone/tileset/default/fieldbomb.bmp
-share/bomberclone/tileset/default/fielddeath.bmp
-share/bomberclone/tileset/default/fieldfire.bmp
-share/bomberclone/tileset/default/fieldshoe.bmp
-share/bomberclone/tileset/default/fire.bmp
+share/bomberclone/tileset/default/pwdeath.bmp
+share/bomberclone/tileset/default/pwbomb.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/default/dead.wav
+share/bomberclone/tileset/default/drop.wav
+share/bomberclone/tileset/default/explode.wav
+share/bomberclone/tileset/default/powerup.bmp
+share/bomberclone/tileset/default/powerbad.bmp
+share/bomberclone/tileset/default/fire.bmp
+share/bomberclone/tileset/default/powersp.bmp
 @dirrm share/bomberclone/tileset/default
 
-share/bomberclone/tileset/radioactive/background.bmp
-share/bomberclone/tileset/radioactive/block.bmp
-share/bomberclone/tileset/radioactive/bomb.bmp
-share/bomberclone/tileset/radioactive/fieldbomb.bmp
-share/bomberclone/tileset/radioactive/fielddeath.bmp
-share/bomberclone/tileset/radioactive/fieldfire.bmp
-share/bomberclone/tileset/radioactive/fieldshoe.bmp
-share/bomberclone/tileset/radioactive/fire.bmp
-share/bomberclone/tileset/radioactive/stone.bmp
-@dirrm share/bomberclone/tileset/radioactive
+share/bomberclone/tileset/classic/background.bmp
+share/bomberclone/tileset/classic/block.bmp
+share/bomberclone/tileset/classic/stone.bmp
+@dirrm share/bomberclone/tileset/classic
 
 share/bomberclone/tileset/jungle/background.bmp
 share/bomberclone/tileset/jungle/block.bmp
-share/bomberclone/tileset/jungle/bomb.bmp
-share/bomberclone/tileset/jungle/fieldbomb.bmp
-share/bomberclone/tileset/jungle/fielddeath.bmp
-share/bomberclone/tileset/jungle/fieldfire.bmp
-share/bomberclone/tileset/jungle/fieldshoe.bmp
-share/bomberclone/tileset/jungle/fire.bmp
 share/bomberclone/tileset/jungle/stone.bmp
 @dirrm share/bomberclone/tileset/jungle
 
+share/bomberclone/tileset/radioactive/background.bmp
+share/bomberclone/tileset/radioactive/block.bmp
+share/bomberclone/tileset/radioactive/stone.bmp
+@dirrm share/bomberclone/tileset/radioactive
+
 @dirrm share/bomberclone/tileset
 @dirrm share/bomberclone