- Update to version 2.0.5 RC1 (is is a release candidate but it fixes many

  bugs from the last version, specially in single player games).

7 files changed, 20 insertions, 60 deletions

diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index de7297afe148..ee3d959a5cba 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	warzone2100
-PORTVERSION=	2.0.4
+DISTVERSION=	2.0.5_rc1
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/warzone/releases/2.0/
 
@@ -26,14 +26,13 @@ USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GL=		yes
 USE_SDL=	net sdl
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=""
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include \
-		`${SDL_CONFIG} --cflags`
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+WRKSRC=		${WRKDIR}/warzone-${DISTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -47,15 +46,11 @@ post-patch:
 		 s|/usr/local|${LOCALBASE}|; \
 		 s|/usr/X11R6|${X11BASE}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.for f in configure *.c *.h
-	@${FIND} ${WRKSRC} -type f -name "${f}" -print0 | \
-		${XARGS} -0 ${REINPLACE_CMD} -e 's|SDL/||'
-.endfor
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index 995003794ad3..a9e3bcdfd29b 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,3 +1,3 @@
-MD5 (warzone2100-2.0.4.tar.bz2) = 84e92061d9a00405994ab7496d03a610
-SHA256 (warzone2100-2.0.4.tar.bz2) = 06ce1d72ec1c3ffceed8f5aae77b96442469abe3096caebc5ce43b1178aee9b5
-SIZE (warzone2100-2.0.4.tar.bz2) = 19883711
+MD5 (warzone2100-2.0.5_rc1.tar.bz2) = ffa5e7b1b51ffa7129029a911986536f
+SHA256 (warzone2100-2.0.5_rc1.tar.bz2) = 6e470d7837a0bfd7360d1a74a64c2fabc9f0896414ab914dd062097168d29bcc
+SIZE (warzone2100-2.0.5_rc1.tar.bz2) = 19889767
diff --git a/games/warzone2100/files/patch-src__loop.c b/games/warzone2100/files/patch-src__loop.c
deleted file mode 100644
index 7deef6c8f62f..000000000000
--- a/games/warzone2100/files/patch-src__loop.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/loop.c	2006/08/26 15:50:47	289
-+++ src/loop.c	2006/08/29 19:57:34	304
-@@ -1085,7 +1085,7 @@
- 	paused = FALSE;
- 	video = FALSE;
- 	gameTimeStart();
--//	pie_SetFogStatus(TRUE);
-+	pie_SetFogStatus(TRUE);
- 	cdAudio_Resume();
- 	ASSERT( videoMode == 0,"loop_ClearVideoPlaybackMode: out of sync." );
- }
-
-
diff --git a/games/warzone2100/files/patch-src__seqdisp.c b/games/warzone2100/files/patch-src__seqdisp.c
deleted file mode 100644
index 8687b9d2ebbf..000000000000
--- a/games/warzone2100/files/patch-src__seqdisp.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/seqdisp.c	2006/08/27 19:09:35	298
-+++ src/seqdisp.c	2006/08/29 19:57:34	304
-@@ -384,13 +384,14 @@
- //full screenvideo functions
- BOOL seq_StartFullScreenVideo(char* videoName, char* audioName)
- {
--	bHoldSeqForAudio = FALSE;
--
- #ifdef DUMMY_VIDEO
- 	debug( LOG_VIDEO, "seq_StartFullScreenVideo: Refusing to play video! (Not a bug)" );
--	return FALSE;
-+	// FIXME We probably should call something like eventFireCallbackTrigger((TRIGGER_TYPE)CALL_VIDEO_QUIT); here!
-+	return TRUE;
- #endif
- 
-+	bHoldSeqForAudio = FALSE;
-+
- 	frameSkip = 1;
- 	switch(war_GetSeqMode())
- 	{
-
-
diff --git a/games/warzone2100/pkg-descr b/games/warzone2100/pkg-descr
index c22cf0226aa2..df56d1d757c2 100644
--- a/games/warzone2100/pkg-descr
+++ b/games/warzone2100/pkg-descr
@@ -1,13 +1,13 @@
-Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and
-most will agree it didn't enjoy the commercial success it should have had. The
-game's source code was liberated on December 6th, 2004, under a GPL license
-(see COPYING in this directory for details). Soon after that, the Warzone 2100
-ReDev project was formed to take care of its future.
+Warzone 2100 is a real-time strategy game, developed by Pumpkin Studios and
+published by Eidos-Interactive. Although comparable to Earth2150 in many
+significant respects, it does contain aspects that are unique. These include
+various radar technologies, a greater focus on artillery and counter-battery
+technologies, more frequent in-game cinematic updates as gameplay progress, as
+well as a different vehicle design method. It was released in 1999 for both PC
+and Playstation.
 
-Our goal is to make warzone run on all possible platforms. Therefore, we
-stripped the original code of all proprietary technologies and replaced them
-with cross-platform and free equivalents, like OpenGL, OpenAL, etc... Right
-now, Warzone 2100 works very well on Windows and GNU/Linux, and we have even
-heard of it running on BSD with no particular issue.
+In late 2004 warzone was released by its copyright holders, Eidos-Interactive,
+to the public under the GNU General Public License (GPL), and the Warzone 2100
+Resurrection Project was born.
 
-WWW: http://wz.rootzilla.de/site/
+WWW: http://wz2100.net/
diff --git a/games/warzone2100/pkg-message b/games/warzone2100/pkg-message
index b4b75b2b8d9c..2f482df09926 100644
--- a/games/warzone2100/pkg-message
+++ b/games/warzone2100/pkg-message
@@ -11,8 +11,7 @@ Or set the environment variable in your shell's configuration file (you can
 also run these commands directly from the command-line).
 
 For sh/bash add in your /etc/profile or ~/.profile:
-OPENAL_BUFFER_SIZE=8192
-export OPENAL_BUFFER_SIZE
+export OPENAL_BUFFER_SIZE=8192
 
 For csh/tcsh add in your /etc/csh.cshrc or ~/.cshrc:
 setenv OPENAL_BUFFER_SIZE=8192
diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist
index e26ee908b1c7..98af657d1a63 100644
--- a/games/warzone2100/pkg-plist
+++ b/games/warzone2100/pkg-plist
@@ -1,6 +1,7 @@
 bin/warzone2100
 %%DATADIR%%/mp.wz
 %%DATADIR%%/warzone.wz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%