6 files changed, 76 insertions, 31 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 8a2702797a97..3b15bb758749 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	bomberclone
-PORTVERSION=	0.9.9
+PORTVERSION=	0.10.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 \
-		${PORTNAME}-data-0.7.tar.bz2
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Reimplementation of Atomic Bomber Man
@@ -34,13 +32,12 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
 
 post-extract:
-	${RM} -rf ${WRKDIR}/data/tileset/default/.xvpics
-
-post-install:
-	${MKDIR} ${PREFIX}/share/bomberclone
-	${CP} -R ${WRKDIR}/data/gfx ${PREFIX}/share/bomberclone
-	${CP} -R ${WRKDIR}/data/maps ${PREFIX}/share/bomberclone
-	${CP} -R ${WRKDIR}/data/player ${PREFIX}/share/bomberclone
-	${CP} -R ${WRKDIR}/data/tileset ${PREFIX}/share/bomberclone
+	${RM} -rf ${WRKSRC}/data/tileset/cemetery/.xvpics
+	${RM} -rf ${WRKSRC}/data/tileset/hell/.xvpics
+	${CHMOD} 755 ${WRKSRC}/data/tileset/cemetery
+	${CHMOD} 755 ${WRKSRC}/data/tileset/farm
+	${CHMOD} 755 ${WRKSRC}/data/tileset/hell
+	${CHMOD} 755 ${WRKSRC}/data/tileset/sheep
+	${CHMOD} 755 ${WRKSRC}/data/tileset/supermario
 
 .include <bsd.port.mk>
diff --git a/games/bomberclone/distinfo b/games/bomberclone/distinfo
index ecd20d94d08c..c9de12eac5bb 100644
--- a/games/bomberclone/distinfo
+++ b/games/bomberclone/distinfo
@@ -1,2 +1,2 @@
-MD5 (bomberclone-0.9.9.tar.bz2) = 408af580512dc288a36b5a203ce22eab
+MD5 (bomberclone-0.10.0.tar.bz2) = e5deca18e99497ca6e1ffe0dcc68321d
 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 dcb278c120cc..beb7c603d163 100644
--- a/games/bomberclone/files/patch-Makefile.in
+++ b/games/bomberclone/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Jun 13 10:09:40 2003
-+++ Makefile.in	Fri Jun 13 10:09:48 2003
-@@ -85,7 +85,7 @@
+--- Makefile.in.orig	Tue Jul 29 03:25:42 2003
++++ Makefile.in	Tue Jul 29 09:40:50 2003
+@@ -84,7 +84,7 @@
  
- 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/files/patch-configure b/games/bomberclone/files/patch-configure
deleted file mode 100644
index 7260cde26159..000000000000
--- a/games/bomberclone/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-data::Makefile.in b/games/bomberclone/files/patch-data::Makefile.in
new file mode 100644
index 000000000000..deb61b24ebfe
--- /dev/null
+++ b/games/bomberclone/files/patch-data::Makefile.in
@@ -0,0 +1,17 @@
+--- data/Makefile.in.orig	Tue Jul 29 09:49:15 2003
++++ data/Makefile.in	Tue Jul 29 09:49:33 2003
+@@ -196,10 +196,10 @@
+ 	@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 -r player ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
++	cp -r maps ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
++	cp -r gfx ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
++	cp -r tileset ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
+ 
+ uninstall:
+ 	rm -rf ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@
diff --git a/games/bomberclone/pkg-plist b/games/bomberclone/pkg-plist
index 2fcd306440ad..62870c412f8a 100644
--- a/games/bomberclone/pkg-plist
+++ b/games/bomberclone/pkg-plist
@@ -17,7 +17,6 @@ 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
@@ -36,6 +35,8 @@ 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
 @dirrm share/bomberclone/player
 
@@ -59,6 +60,17 @@ share/bomberclone/tileset/default/fire.bmp
 share/bomberclone/tileset/default/powersp.bmp
 @dirrm share/bomberclone/tileset/default
 
+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
+@dirrm share/bomberclone/tileset/cucumber
+
 share/bomberclone/tileset/classic/background.bmp
 share/bomberclone/tileset/classic/block.bmp
 share/bomberclone/tileset/classic/stone.bmp
@@ -74,5 +86,35 @@ share/bomberclone/tileset/radioactive/block.bmp
 share/bomberclone/tileset/radioactive/stone.bmp
 @dirrm share/bomberclone/tileset/radioactive
 
+share/bomberclone/tileset/cemetery/background.bmp
+share/bomberclone/tileset/cemetery/block96.bmp
+share/bomberclone/tileset/cemetery/stone96.bmp
+share/bomberclone/tileset/cemetery/map.nfo
+@dirrm share/bomberclone/tileset/cemetery
+
+share/bomberclone/tileset/sheep/background.bmp
+share/bomberclone/tileset/sheep/block.bmp
+share/bomberclone/tileset/sheep/stone.bmp
+share/bomberclone/tileset/sheep/map.nfo
+@dirrm share/bomberclone/tileset/sheep
+
+share/bomberclone/tileset/farm/background.bmp
+share/bomberclone/tileset/farm/block96.bmp
+share/bomberclone/tileset/farm/stone.bmp
+share/bomberclone/tileset/farm/map.nfo
+@dirrm share/bomberclone/tileset/farm
+
+share/bomberclone/tileset/hell/background.bmp
+share/bomberclone/tileset/hell/block.bmp
+share/bomberclone/tileset/hell/stone.bmp
+share/bomberclone/tileset/hell/map.nfo
+@dirrm share/bomberclone/tileset/hell
+
+share/bomberclone/tileset/supermario/background.bmp
+share/bomberclone/tileset/supermario/block.bmp
+share/bomberclone/tileset/supermario/stone.bmp
+share/bomberclone/tileset/supermario/stonebackup.bmp
+@dirrm share/bomberclone/tileset/supermario
+
 @dirrm share/bomberclone/tileset
 @dirrm share/bomberclone