From 8a15aa5afe7965a112b85f167d176a2c0c4c9768 Mon Sep 17 00:00:00 2001 From: Alejandro Pulver Date: Thu, 31 Aug 2006 22:39:04 +0000 Subject: - Rename games/warzone back to games/warzone2100 because the last version (2.0.4) changed the name to the original one. - Update to version 2.0.4. - Add patches and pkg-message to fix problems [1]. Obtained from:>-Iasen Kostov (private e-mail) [1] --- UPDATING | 7 ++++ games/Makefile | 2 +- games/warzone/Makefile | 52 -------------------------- games/warzone/distinfo | 3 -- games/warzone/files/patch-src__game.c | 11 ------ games/warzone/pkg-descr | 13 ------- games/warzone/pkg-plist | 6 --- games/warzone2100/Makefile | 56 ++++++++++++++++++++++++++++ games/warzone2100/distinfo | 3 ++ games/warzone2100/files/patch-src__loop.c | 13 +++++++ games/warzone2100/files/patch-src__seqdisp.c | 22 +++++++++++ games/warzone2100/pkg-descr | 13 +++++++ games/warzone2100/pkg-message | 22 +++++++++++ games/warzone2100/pkg-plist | 6 +++ 14 files changed, 143 insertions(+), 86 deletions(-) delete mode 100644 games/warzone/Makefile delete mode 100644 games/warzone/distinfo delete mode 100644 games/warzone/files/patch-src__game.c delete mode 100644 games/warzone/pkg-descr delete mode 100644 games/warzone/pkg-plist create mode 100644 games/warzone2100/Makefile create mode 100644 games/warzone2100/distinfo create mode 100644 games/warzone2100/files/patch-src__loop.c create mode 100644 games/warzone2100/files/patch-src__seqdisp.c create mode 100644 games/warzone2100/pkg-descr create mode 100644 games/warzone2100/pkg-message create mode 100644 games/warzone2100/pkg-plist diff --git a/UPDATING b/UPDATING index eb98dc8448c1..c362ec08e4b6 100644 --- a/UPDATING +++ b/UPDATING @@ -8,6 +8,13 @@ upgrades. +20060831: + AFFECTS: users of games/warzone + AUTHOR: alepulver@FreeBSD.org + + games/warzone port directory was renamed back to games/warzone2100 because + the last version (2.0.4) uses the original name. + 20060830: AFFECTS: users of textproc/p5-Senna AUTHOR: kuriyama@FreeBSD.org diff --git a/games/Makefile b/games/Makefile index 8233a3dc21bd..55197794d515 100644 --- a/games/Makefile +++ b/games/Makefile @@ -726,7 +726,7 @@ SUBDIR += wargus SUBDIR += warsow SUBDIR += warsow-data - SUBDIR += warzone + SUBDIR += warzone2100 SUBDIR += wesnoth SUBDIR += wmeyes SUBDIR += wmfortune diff --git a/games/warzone/Makefile b/games/warzone/Makefile deleted file mode 100644 index efad4a62f2c8..000000000000 --- a/games/warzone/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# New ports collection makefile for: warzone2100 -# Date created: 21 Aug 2005 -# Whom: Alejandro Pulver -# -# $FreeBSD$ -# - -PORTNAME= warzone -PORTVERSION= 2.0.3 -CATEGORIES= games -MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ - -MAINTAINER= alepulver@FreeBSD.org -COMMENT= Innovative 3D real-time strategy game - -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - mad.2:${PORTSDIR}/audio/libmad \ - ogg.5:${PORTSDIR}/audio/libogg \ - openal.0:${PORTSDIR}/audio/openal \ - physfs-1.0.1:${PORTSDIR}/devel/physfs \ - png.5:${PORTSDIR}/graphics/png \ - vorbis.3:${PORTSDIR}/audio/libvorbis - -USE_BZIP2= yes -USE_BISON= yes -USE_GL= yes -USE_SDL= net sdl - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-transform-name="" -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - LIBS="${PTHREAD_LIBS}" - -post-patch: - @${REINPLACE_CMD} -e '/stdint.h/d' ${WRKSRC}/lib/ivis_opengl/screen.c - @${REINPLACE_CMD} -e 's|-m32||' \ - -e 's|/usr/local|${LOCALBASE}|; s|/usr/X11R6|${X11BASE}|' \ - ${WRKSRC}/configure -.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} -.endif - -.include diff --git a/games/warzone/distinfo b/games/warzone/distinfo deleted file mode 100644 index 8768b95f71b2..000000000000 --- a/games/warzone/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (warzone-2.0.3.tar.bz2) = 2396e0def69e5e48902448d04944927a -SHA256 (warzone-2.0.3.tar.bz2) = 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749 -SIZE (warzone-2.0.3.tar.bz2) = 19902273 diff --git a/games/warzone/files/patch-src__game.c b/games/warzone/files/patch-src__game.c deleted file mode 100644 index 36a9d5503fa5..000000000000 --- a/games/warzone/files/patch-src__game.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/game.c.bak Thu Aug 17 18:52:11 2006 -+++ src/game.c Thu Aug 17 18:52:44 2006 -@@ -2832,7 +2832,7 @@ - aFileName[strlen(aFileName) - 4] = '\0'; - - //create dir will fail if directory already exists but don't care! -- (void) PHYSFS_mkdir(aFileName); -+ (void) PHYSFS_mkdir(unix_path(aFileName)); - - //save the map file - strcat(aFileName, "/"); diff --git a/games/warzone/pkg-descr b/games/warzone/pkg-descr deleted file mode 100644 index c22cf0226aa2..000000000000 --- a/games/warzone/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -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. - -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. - -WWW: http://wz.rootzilla.de/site/ diff --git a/games/warzone/pkg-plist b/games/warzone/pkg-plist deleted file mode 100644 index 6006146bbb7b..000000000000 --- a/games/warzone/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/warzone -%%DATADIR%%/mp.wz -%%DATADIR%%/warzone.wz -%%PORTDOCS%%%%DOCSDIR%%/README -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile new file mode 100644 index 000000000000..cf318404488e --- /dev/null +++ b/games/warzone2100/Makefile @@ -0,0 +1,56 @@ +# New ports collection makefile for: warzone2100 +# Date created: 21 Aug 2005 +# Whom: Alejandro Pulver +# +# $FreeBSD$ +# + +PORTNAME= warzone2100 +PORTVERSION= 2.0.4 +CATEGORIES= games +MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ + +MAINTAINER= alepulver@FreeBSD.org +COMMENT= Innovative 3D real-time strategy game + +BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + mad.2:${PORTSDIR}/audio/libmad \ + ogg.5:${PORTSDIR}/audio/libogg \ + openal.0:${PORTSDIR}/audio/openal \ + physfs-1.0.1:${PORTSDIR}/devel/physfs \ + png.5:${PORTSDIR}/graphics/png \ + vorbis.3:${PORTSDIR}/audio/libvorbis + +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` +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib + +post-patch: + @${REINPLACE_CMD} -e '/stdint.h/d' ${WRKSRC}/lib/ivis_opengl/screen.c + @${REINPLACE_CMD} -e \ + 's|-m32||; \ + 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} +.endif + +.include diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo new file mode 100644 index 000000000000..995003794ad3 --- /dev/null +++ b/games/warzone2100/distinfo @@ -0,0 +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 diff --git a/games/warzone2100/files/patch-src__loop.c b/games/warzone2100/files/patch-src__loop.c new file mode 100644 index 000000000000..7deef6c8f62f --- /dev/null +++ b/games/warzone2100/files/patch-src__loop.c @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..8687b9d2ebbf --- /dev/null +++ b/games/warzone2100/files/patch-src__seqdisp.c @@ -0,0 +1,22 @@ +--- 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 new file mode 100644 index 000000000000..c22cf0226aa2 --- /dev/null +++ b/games/warzone2100/pkg-descr @@ -0,0 +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. + +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. + +WWW: http://wz.rootzilla.de/site/ diff --git a/games/warzone2100/pkg-message b/games/warzone2100/pkg-message new file mode 100644 index 000000000000..155d7920e78c --- /dev/null +++ b/games/warzone2100/pkg-message @@ -0,0 +1,22 @@ +============================================================================== + +Warzone2100 has been installed. + +If the game locks up in heavy fight (e.g. many units firing at each other) try +to set OPENAL_BUFFER_SIZE to 8192 before running it. + +$ env OPENAL_BUFFER_SIZE=8192 warzone + +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 + +For csh/tcsh add in your /etc/csh.cshrc or ~/.cshrc: +setenv OPENAL_BUFFER_SIZE=8192 + +Enjoy! + +============================================================================== diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist new file mode 100644 index 000000000000..e26ee908b1c7 --- /dev/null +++ b/games/warzone2100/pkg-plist @@ -0,0 +1,6 @@ +bin/warzone2100 +%%DATADIR%%/mp.wz +%%DATADIR%%/warzone.wz +%%PORTDOCS%%%%DOCSDIR%%/README +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.2.3