- Update to 0.3

7 files changed, 37 insertions, 79 deletions

diff --git a/games/rezerwar/Makefile b/games/rezerwar/Makefile
index 8cd2a242300b..4f40ba6a3ad5 100644
--- a/games/rezerwar/Makefile
+++ b/games/rezerwar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rezerwar
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	games
 MASTER_SITES=	http://tamentis.com/projects/rezerwar/files/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -20,29 +20,24 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	Unix
 MAKE_JOBS_SAFE=	yes
 
-PORTDOCS=	README
+PORTDOCS=	*
+
+post-extract:
+	@${FIND} ${WRKSRC}/data -name Makefile -delete
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/mkfiles/Makefile.unix \
-		${WRKSRC}/data/Makefile ${WRKSRC}/data/gfx/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/share/games/rezerwar/data|${DATADIR}|' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/mkfiles/config_h_unix
-	@${REINPLACE_CMD} -e 's|hiscore.dat|.rezerwar.hiscore|' \
-		${WRKSRC}/src/hiscore.c
+#	@${REINPLACE_CMD} -e 's|hiscore.dat|.rezerwar.hiscore|' \
+#		${WRKSRC}/src/hiscore.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/rezerwar ${PREFIX}/bin/
-	${MKDIR} ${DATADIR}/gfx
-	cd ${WRKSRC}/data/gfx && ${COPYTREE_SHARE} . ${DATADIR}/gfx "-name *\.bmp"
-	${MKDIR} ${DATADIR}/sfx
-	${INSTALL_DATA} ${WRKSRC}/data/sfx/*.wav ${DATADIR}/sfx/
-	${MKDIR} ${DATADIR}/music
-	${INSTALL_DATA} ${WRKSRC}/data/music/*.mp3 ${DATADIR}/music/
-	${MKDIR} ${DATADIR}/levels
-	${INSTALL_DATA} ${WRKSRC}/data/levels/*.lvl ${DATADIR}/levels/
+	${MKDIR} ${DATADIR}
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/rezerwar/distinfo b/games/rezerwar/distinfo
index d79b6835c389..ae89fd22fdae 100644
--- a/games/rezerwar/distinfo
+++ b/games/rezerwar/distinfo
@@ -1,3 +1,3 @@
-MD5 (rezerwar-0.2.tar.gz) = 434ee07a27625a0ee57e0ac7289c3101
-SHA256 (rezerwar-0.2.tar.gz) = b5e89937bc07aa5456369789afc14fd9be2532040f7934e36673444fd3aeef33
-SIZE (rezerwar-0.2.tar.gz) = 7606388
+MD5 (rezerwar-0.3.tar.gz) = b410f43b7e3c05995efdcd51e9f24c34
+SHA256 (rezerwar-0.3.tar.gz) = 51f04ea88d674f87fd9da190ca2fc19c7c4c3b5ba15cf21c5bbee499e8281adc
+SIZE (rezerwar-0.3.tar.gz) = 6258312
diff --git a/games/rezerwar/files/patch-mkfiles-Makefile.unix b/games/rezerwar/files/patch-mkfiles-Makefile.unix
deleted file mode 100644
index d5bbe4a6e864..000000000000
--- a/games/rezerwar/files/patch-mkfiles-Makefile.unix
+++ /dev/null
@@ -1,15 +0,0 @@
---- mkfiles/Makefile.unix.orig	2009-07-10 06:58:20.000000000 +0400
-+++ mkfiles/Makefile.unix	2009-07-17 21:45:32.000000000 +0400
-@@ -10,10 +10,10 @@
- all: data_build build
- 
- build:
--	make -C src
-+	${MAKE} -C src
- 
- data_build:
--	make -C data/
-+	${MAKE} -C data/
- 
- clean:
- 	make -C data/ clean
diff --git a/games/rezerwar/files/patch-mkfiles-MkConf.unix b/games/rezerwar/files/patch-mkfiles-MkConf.unix
index 4a91acaa1a48..47f4248873d4 100644
--- a/games/rezerwar/files/patch-mkfiles-MkConf.unix
+++ b/games/rezerwar/files/patch-mkfiles-MkConf.unix
@@ -1,15 +1,11 @@
---- mkfiles/MkConf.unix.orig	2009-07-10 06:58:20.000000000 +0400
-+++ mkfiles/MkConf.unix	2009-07-17 21:43:04.000000000 +0400
-@@ -4,11 +4,11 @@
- # Copyright (c) 2009 Bertrand Janin
- #
- 
--CC=gcc
-+CC?=gcc
+--- mkfiles/MkConf.unix.orig	2009-08-10 16:30:36.000000000 +0400
++++ mkfiles/MkConf.unix	2009-08-11 20:26:10.000000000 +0400
+@@ -7,8 +7,8 @@
+ CC?=gcc
  
  # Standard
--CFLAGS=`sdl-config --cflags` -Wall -O2
--LIBS=`sdl-config --libs` -lSDL_mixer
+-CFLAGS+=`sdl-config --cflags` -Wall -O2
+-LIBS+=`sdl-config --libs` -lSDL_mixer
 +CFLAGS+=`${SDL_CONFIG} --cflags` -Wall
 +LIBS+=`${SDL_CONFIG} --libs` -lSDL_mixer
  
diff --git a/games/rezerwar/files/patch-mkfiles-config_h_unix b/games/rezerwar/files/patch-mkfiles-config_h_unix
new file mode 100644
index 000000000000..f43a5b29f368
--- /dev/null
+++ b/games/rezerwar/files/patch-mkfiles-config_h_unix
@@ -0,0 +1,6 @@
+--- mkfiles/config_h_unix.orig	2009-08-10 16:30:36.000000000 +0400
++++ mkfiles/config_h_unix	2009-08-11 20:32:00.000000000 +0400
+@@ -1,2 +1,2 @@
+-#define DATAPATH	"/usr/share/games/rezerwar/data"
++#define DATAPATH	"/usr/local/share/rezerwar"
+ #define CFGPATH		".rezerwar"
diff --git a/games/rezerwar/files/patch-src-main.c b/games/rezerwar/files/patch-src-main.c
deleted file mode 100644
index e882c0ac1a8e..000000000000
--- a/games/rezerwar/files/patch-src-main.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/main.c.orig	2009-07-10 06:58:20.000000000 +0400
-+++ src/main.c	2009-07-18 03:03:19.000000000 +0400
-@@ -26,6 +26,9 @@
-  */
- 
- 
-+#include <unistd.h>
-+#include <err.h>
-+#include <sys/stat.h>
- #include <stdio.h>
- #include <time.h>
- #ifdef __WII__
-@@ -203,6 +206,9 @@
- int
- main(int ac, char **av)
- {
-+	if (chdir(getenv("HOME")) != 0)
-+		err(1, "cannot cd to $HOME");
-+
- 	int status = MTYPE_SUBMENU;
- 	bool loop = true;
- 	char *path;
diff --git a/games/rezerwar/pkg-plist b/games/rezerwar/pkg-plist
index 8a512aa13344..e8efc5c5f6a2 100644
--- a/games/rezerwar/pkg-plist
+++ b/games/rezerwar/pkg-plist
@@ -1,10 +1,10 @@
 bin/rezerwar
-%%DATADIR%%/gfx/a_chimneys/chimneys_01.bmp
-%%DATADIR%%/gfx/a_sky/sky.bmp
 %%DATADIR%%/gfx/gameback.bmp
 %%DATADIR%%/gfx/gamemenu.bmp
-%%DATADIR%%/gfx/splash/tdc.bmp
+%%DATADIR%%/gfx/molemask.bmp
+%%DATADIR%%/gfx/sky.bmp
 %%DATADIR%%/gfx/sprites.bmp
+%%DATADIR%%/gfx/tdc.bmp
 %%DATADIR%%/levels/tuto_01.lvl
 %%DATADIR%%/levels/tuto_02.lvl
 %%DATADIR%%/levels/tuto_03.lvl
@@ -13,18 +13,16 @@ bin/rezerwar
 %%DATADIR%%/levels/tuto_06.lvl
 %%DATADIR%%/music/level1.mp3
 %%DATADIR%%/music/menu.mp3
-%%DATADIR%%/sfx/boom.ogg.wav
-%%DATADIR%%/sfx/horn.ogg.wav
-%%DATADIR%%/sfx/lazer.ogg.wav
-%%DATADIR%%/sfx/menunav.ogg.wav
-%%DATADIR%%/sfx/menuselect.ogg.wav
-%%DATADIR%%/sfx/tack1.ogg.wav
-%%DATADIR%%/sfx/tick1.ogg.wav
+%%DATADIR%%/sfx/boom.wav
+%%DATADIR%%/sfx/horn.wav
+%%DATADIR%%/sfx/lazer.wav
+%%DATADIR%%/sfx/menunav.wav
+%%DATADIR%%/sfx/menuselect.wav
+%%DATADIR%%/sfx/splash.wav
+%%DATADIR%%/sfx/tack1.wav
+%%DATADIR%%/sfx/tick1.wav
 @dirrm %%DATADIR%%/sfx
 @dirrm %%DATADIR%%/music
 @dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/gfx/splash
-@dirrm %%DATADIR%%/gfx/a_sky
-@dirrm %%DATADIR%%/gfx/a_chimneys
 @dirrm %%DATADIR%%/gfx
 @dirrm %%DATADIR%%