Update to 0.10.1

6 files changed, 77 insertions, 84 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 3b15bb758749..6d97dcf99638 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bomberclone
-PORTVERSION=	0.10.0
+PORTVERSION=	0.10.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,18 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Reimplementation of Atomic Bomber Man
 
-BUILD_DEPENDS=	sdl11-config:${PORTSDIR}/devel/sdl12 \
-		${BZIP2_CMD}:${PORTSDIR}/archivers/bzip2
+BUILD_DEPENDS=	${BZIP2_CMD}:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer	\
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image
 
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
-USE_REINPLACE=	yes
+USE_SDL=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 CONFIGURE_ARGS=	--target=""
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/games/bomberclone/distinfo b/games/bomberclone/distinfo
index c9de12eac5bb..3b458327428d 100644
--- a/games/bomberclone/distinfo
+++ b/games/bomberclone/distinfo
@@ -1,2 +1 @@
-MD5 (bomberclone-0.10.0.tar.bz2) = e5deca18e99497ca6e1ffe0dcc68321d
-MD5 (bomberclone-data-0.7.tar.bz2) = aed44dc8fa12d11d632b8627471878fb
+MD5 (bomberclone-0.10.1.tar.bz2) = 81efbe4f67a488013fefa44b8c767e90
diff --git a/games/bomberclone/files/patch-Makefile.in b/games/bomberclone/files/patch-Makefile.in
index beb7c603d163..e54e61f3b525 100644
--- a/games/bomberclone/files/patch-Makefile.in
+++ b/games/bomberclone/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Jul 29 03:25:42 2003
-+++ Makefile.in	Tue Jul 29 09:40:50 2003
+--- Makefile.in.orig	Sat Sep 13 07:18:20 2003
++++ Makefile.in	Fri Oct  3 23:27:19 2003
 @@ -84,7 +84,7 @@
  
  SUBDIRS = src data
diff --git a/games/bomberclone/files/patch-configure b/games/bomberclone/files/patch-configure
new file mode 100644
index 000000000000..f2e4ddf51b38
--- /dev/null
+++ b/games/bomberclone/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Oct  3 23:39:56 2003
++++ configure	Fri Oct  3 23:40:07 2003
+@@ -4197,7 +4197,7 @@
+   packageprefix=${prefix}
+ fi
+ 
+-packagedatadir=share/games/${PACKAGE}
++packagedatadir=share/${PACKAGE}
+ packagedocdir=share/doc/${PACKAGE}
+ 
+ packagepixmapsdir=${packagedatadir}/pixmaps
diff --git a/games/bomberclone/files/patch-data::Makefile.in b/games/bomberclone/files/patch-data::Makefile.in
deleted file mode 100644
index deb61b24ebfe..000000000000
--- a/games/bomberclone/files/patch-data::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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 62870c412f8a..f7fde3717c54 100644
--- a/games/bomberclone/pkg-plist
+++ b/games/bomberclone/pkg-plist
@@ -15,8 +15,6 @@ 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/first.map
 share/bomberclone/maps/firstmap.map
 share/bomberclone/maps/fourth.map
@@ -26,8 +24,6 @@ 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
@@ -38,83 +34,89 @@ share/bomberclone/player/player5.bmp
 share/bomberclone/player/player6.bmp
 share/bomberclone/player/player7.bmp
 share/bomberclone/player/playersick.bmp
-@dirrm share/bomberclone/player
-
+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/pwdeath.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/spliquid.bmp
+share/bomberclone/tileset/default/spmoved.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/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
-@dirrm share/bomberclone/tileset/classic
-
+share/bomberclone/tileset/default/tunnel.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/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
-@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
-
-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/sheep/stone.bmp
+share/bomberclone/tileset/sisso_cesso/background.bmp
+share/bomberclone/tileset/sisso_cesso/block.bmp
+share/bomberclone/tileset/sisso_cesso/dead.wav
+share/bomberclone/tileset/sisso_cesso/drop.wav
+share/bomberclone/tileset/sisso_cesso/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
-@dirrm share/bomberclone/tileset/supermario
+share/bomberclone/tileset/uccia_garbage/background.bmp
+share/bomberclone/tileset/uccia_garbage/block.bmp
+share/bomberclone/tileset/uccia_garbage/dead.wav
+share/bomberclone/tileset/uccia_garbage/stone.bmp
 
+@dirrm share/bomberclone/tileset/uccia_garbage
+@dirrm share/bomberclone/tileset/supermario
+@dirrm share/bomberclone/tileset/sisso_cesso
+@dirrm share/bomberclone/tileset/sheep
+@dirrm share/bomberclone/tileset/radioactive
+@dirrm share/bomberclone/tileset/jungle
+@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
 @dirrm share/bomberclone/tileset
+@dirrm share/bomberclone/player
+@dirrm share/bomberclone/maps
+@dirrm share/bomberclone/gfx
 @dirrm share/bomberclone