4 files changed, 35 insertions, 52 deletions

diff --git a/games/vor/Makefile b/games/vor/Makefile
index 0950d9518e7d..223746522f4f 100644
--- a/games/vor/Makefile
+++ b/games/vor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vor
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	games
 MASTER_SITES=	http://qualdan.com/vor/
 
@@ -18,35 +18,33 @@ BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
 USE_SDL=	mixer image sdl
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
+
+PORTDOCS=	README
+
+.include <bsd.port.pre.mk>
 
 post-patch:
-.for file in main.c shape.h sound.h
-	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/${file}
-.endfor
-.for file in shape.h score.c score.h debug.c
-	@${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' ${WRKSRC}/${file}
-.endfor
+	@${REINPLACE_CMD} -e 's|SDL/||' ${WRKSRC}/sound.c
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|^\(my_objects.*\)$$|\1 ${LOCALBASE}/lib/libargp.a|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/share/vor|${PREFIX}/share/vor|g' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e 's|/usr/share/vor|${DATADIR}|' ${WRKSRC}/Makefile
+.if (${OSVERSION} < 500000)
+	@${REINPLACE_CMD} -e 's|UINT32_MAX|0xffffffffU|' ${WRKSRC}/mt.c
+	@${REINPLACE_CMD} -e 's|INT32_MIN|(-0x7fffffff-1)|' ${WRKSRC}/mt.c
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vor ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/banners
-	${MKDIR} ${DATADIR}/fonts
-	${MKDIR} ${DATADIR}/icons
-	${MKDIR} ${DATADIR}/indicators
-	${MKDIR} ${DATADIR}/music
-	${MKDIR} ${DATADIR}/sounds
-	${MKDIR} ${DATADIR}/sprites
-	${INSTALL_DATA} ${WRKSRC}/data/banners/* ${DATADIR}/banners/
-	${INSTALL_DATA} ${WRKSRC}/data/fonts/* ${DATADIR}/fonts/
-	${INSTALL_DATA} ${WRKSRC}/data/icons/* ${DATADIR}/icons/
-	${INSTALL_DATA} ${WRKSRC}/data/indicators/* ${DATADIR}/indicators/
-	${INSTALL_DATA} ${WRKSRC}/data/music/* ${DATADIR}/music/
-	${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${DATADIR}/sounds/
-	${INSTALL_DATA} ${WRKSRC}/data/sprites/* ${DATADIR}/sprites/
-
-.include <bsd.port.mk>
+.for d in banners fonts icons indicators music sounds sprites
+	${MKDIR} ${DATADIR}/${d}
+	${INSTALL_DATA} ${WRKSRC}/data/${d}/* ${DATADIR}/${d}/
+.endfor
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/games/vor/distinfo b/games/vor/distinfo
index ac101f071532..101a6c49b128 100644
--- a/games/vor/distinfo
+++ b/games/vor/distinfo
@@ -1,3 +1,3 @@
-MD5 (vor-0.3.tar.bz2) = 814100a94a7881e58ef0238ec3eb4367
-SHA256 (vor-0.3.tar.bz2) = d0170ec85e41605bd1c84b15e9d93f7069e5348cfe7fa1f63ebd48578e111d94
-SIZE (vor-0.3.tar.bz2) = 444658
+MD5 (vor-0.4.tar.bz2) = 8ab437075fb9fa6a5b8cd269e339aa9a
+SHA256 (vor-0.4.tar.bz2) = 4f502e6485f71e48aec2922f06fb6d83e1cdd4fa9f606e703022f3f98730c779
+SIZE (vor-0.4.tar.bz2) = 450486
diff --git a/games/vor/files/patch-file.c b/games/vor/files/patch-file.c
index fb2350252212..e11e4d531a88 100644
--- a/games/vor/files/patch-file.c
+++ b/games/vor/files/patch-file.c
@@ -1,26 +1,13 @@
---- file.c.orig	Wed Sep  7 05:00:47 2005
-+++ file.c	Wed Sep  7 05:01:01 2005
-@@ -58,20 +58,19 @@
- find_data_dir(void)
+--- file.c.orig	Sun Mar 26 06:52:35 2006
++++ file.c	Mon Mar 27 02:30:51 2006
+@@ -101,9 +101,9 @@
  {
  	int i;
--	char *data_options[3] = {
--		"./data",
-+	char *data_options[2] = {
+ 	char *data_options[3] = {
++		DATA_PREFIX,
  		getenv("VOR_DATA"),
- 		DATA_PREFIX
+ 		"data",
+-		DATA_PREFIX
  	};
  
--	for(i=0; i<3; i++) {
-+	for(i=0; i<2; i++) {
- 		if(!data_options[i]) continue;
- 		g_data_dir = strdup(data_options[i]);
- 		if(is_dir(g_data_dir)) return true;
- 	}
- 
- 	fprintf(stderr, "Can't find VoR data! Tried:\n");
--	for(i=0; i<3; i++) {
-+	for(i=0; i<2; i++) {
- 		fprintf(stderr, "\t%s\n", data_options[i]);
- 	}
- 	return false;
+ 	for(i=0; i<3; i++) {
diff --git a/games/vor/pkg-descr b/games/vor/pkg-descr
index 95e0e8b8a169..047bd5aa3bf2 100644
--- a/games/vor/pkg-descr
+++ b/games/vor/pkg-descr
@@ -8,5 +8,3 @@ than the original. It is intended to be a quickie game to kill a few spare
 moments here and there, not an epic space adventure.
 
 WWW: http://herkamire.com/jason/vor
-
-- Dmitry Marakasov <amdmi3@mail.ru>