- Update to 0.4

5 files changed, 15 insertions, 40 deletions

diff --git a/games/rezerwar/Makefile b/games/rezerwar/Makefile
index 4f40ba6a3ad5..dd36d0a8ae5b 100644
--- a/games/rezerwar/Makefile
+++ b/games/rezerwar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rezerwar
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	games
 MASTER_SITES=	http://tamentis.com/projects/rezerwar/files/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -19,25 +19,15 @@ USE_SDL=	sdl mixer
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	Unix
 MAKE_JOBS_SAFE=	yes
+CONFIGURE_ENV=	TARGET_BIN=${PREFIX}/bin \
+		TARGET_DOC=${DOCSDIR} \
+		TARGET_DATA=${DATADIR}
 
 PORTDOCS=	*
 
-post-extract:
-	@${FIND} ${WRKSRC}/data -name Makefile -delete
-
+.if defined(NOPORTDOCS)
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-		${WRKSRC}/mkfiles/config_h_unix
-#	@${REINPLACE_CMD} -e 's|hiscore.dat|.rezerwar.hiscore|' \
-#		${WRKSRC}/src/hiscore.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/rezerwar ${PREFIX}/bin/
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/
+	@${REINPLACE_CMD} -e '/TARGET_DOC/ d' ${WRKSRC}/mkfiles/Makefile.main
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/rezerwar/distinfo b/games/rezerwar/distinfo
index ae89fd22fdae..c78f020d76a1 100644
--- a/games/rezerwar/distinfo
+++ b/games/rezerwar/distinfo
@@ -1,3 +1,3 @@
-MD5 (rezerwar-0.3.tar.gz) = b410f43b7e3c05995efdcd51e9f24c34
-SHA256 (rezerwar-0.3.tar.gz) = 51f04ea88d674f87fd9da190ca2fc19c7c4c3b5ba15cf21c5bbee499e8281adc
-SIZE (rezerwar-0.3.tar.gz) = 6258312
+MD5 (rezerwar-0.4.tar.gz) = 1acb71401b7499c2eaa8d0b10acc04f3
+SHA256 (rezerwar-0.4.tar.gz) = 84d06bc024a47ab09656fde08194c3673c62c65d0c86041f1f319c6a33402ce2
+SIZE (rezerwar-0.4.tar.gz) = 4399483
diff --git a/games/rezerwar/files/patch-mkfiles-MkConf.unix b/games/rezerwar/files/patch-mkfiles-MkConf.unix
deleted file mode 100644
index 47f4248873d4..000000000000
--- a/games/rezerwar/files/patch-mkfiles-MkConf.unix
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
-+LIBS+=`${SDL_CONFIG} --libs` -lSDL_mixer
- 
- # Debug (no optimization)
- # CFLAGS=`sdl-config --cflags` -Wall -ggdb
diff --git a/games/rezerwar/files/patch-mkfiles-config_h_unix b/games/rezerwar/files/patch-mkfiles-config_h_unix
deleted file mode 100644
index f43a5b29f368..000000000000
--- a/games/rezerwar/files/patch-mkfiles-config_h_unix
+++ /dev/null
@@ -1,6 +0,0 @@
---- 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/pkg-plist b/games/rezerwar/pkg-plist
index e8efc5c5f6a2..93dfbb33c09b 100644
--- a/games/rezerwar/pkg-plist
+++ b/games/rezerwar/pkg-plist
@@ -11,8 +11,12 @@ bin/rezerwar
 %%DATADIR%%/levels/tuto_04.lvl
 %%DATADIR%%/levels/tuto_05.lvl
 %%DATADIR%%/levels/tuto_06.lvl
-%%DATADIR%%/music/level1.mp3
-%%DATADIR%%/music/menu.mp3
+%%DATADIR%%/levels/tuto_07.lvl
+%%DATADIR%%/levels/tuto_08.lvl
+%%DATADIR%%/levels/tuto_09.lvl
+%%DATADIR%%/levels/tuto_end.lvl
+%%DATADIR%%/music/level1.ogg
+%%DATADIR%%/music/menu.ogg
 %%DATADIR%%/sfx/boom.wav
 %%DATADIR%%/sfx/horn.wav
 %%DATADIR%%/sfx/lazer.wav