summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/warzone2100/Makefile14
-rw-r--r--games/warzone2100/PLIST27
-rw-r--r--games/warzone2100/distinfo12
-rw-r--r--games/warzone2100/patches/patch-ad26
-rw-r--r--games/warzone2100/patches/patch-af18
-rw-r--r--games/warzone2100/patches/patch-ag15
6 files changed, 64 insertions, 48 deletions
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index f15977bc433..78b5911dc84 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:30 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/16 21:21:51 wiz Exp $
#
-DISTNAME= warzone2100-2.1.1
-PKGREVISION= 1
+DISTNAME= warzone2100-2.2.1
CATEGORIES= games
-MASTER_SITES= http://download.gna.org/warzone/releases/2.1/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -19,13 +18,10 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config bison msgfmt intltool gmake gsed gawk flex
-TOOLS_PLATFORM.gsed= #empty, override nonsense in tools
+USE_TOOLS+= pkg-config bison msgfmt intltool gmake gawk flex
CONFIGURE_ARGS+= --with-distributor=pkgsrc
-CHECK_WRKREF_SKIP= share/warzone2100/mods/global/aivolution.wz
-
post-build:
cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo
@@ -46,5 +42,7 @@ BUILDLINK_API_DEPENDS.flex+= flex>=2.5.35
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/quesoglc/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
.include "../../net/SDL_net/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/warzone2100/PLIST b/games/warzone2100/PLIST
index e753baf6177..f5971bbe772 100644
--- a/games/warzone2100/PLIST
+++ b/games/warzone2100/PLIST
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/16 21:21:51 wiz Exp $
bin/warzone2100
share/applications/warzone2100.desktop
share/doc/warzone2100/AUTHORS
share/doc/warzone2100/COPYING
+share/doc/warzone2100/COPYING.NONGPL
share/doc/warzone2100/COPYING.README
share/doc/warzone2100/ChangeLog
share/doc/warzone2100/Readme.de
share/doc/warzone2100/Readme.de.xhtml
share/doc/warzone2100/Readme.en
share/doc/warzone2100/Readme.en.xhtml
-share/doc/warzone2100/ScriptingManual.xhtml
+share/doc/warzone2100/ScriptingManual.htm
share/doc/warzone2100/styles/readme.print.css
share/doc/warzone2100/styles/readme.screen.css
share/doc/warzone2100/styles/scriptingmanual.css
@@ -19,7 +20,6 @@ share/locale/da/LC_MESSAGES/warzone2100.mo
share/locale/de/LC_MESSAGES/warzone2100.mo
share/locale/en_GB/LC_MESSAGES/warzone2100.mo
share/locale/es/LC_MESSAGES/warzone2100.mo
-share/locale/eu/LC_MESSAGES/warzone2100.mo
share/locale/fi/LC_MESSAGES/warzone2100.mo
share/locale/fr/LC_MESSAGES/warzone2100.mo
share/locale/fy/LC_MESSAGES/warzone2100.mo
@@ -27,28 +27,21 @@ share/locale/ga/LC_MESSAGES/warzone2100.mo
share/locale/it/LC_MESSAGES/warzone2100.mo
share/locale/la/LC_MESSAGES/warzone2100.mo
share/locale/lt/LC_MESSAGES/warzone2100.mo
-share/locale/lv/LC_MESSAGES/warzone2100.mo
share/locale/nb/LC_MESSAGES/warzone2100.mo
share/locale/nl/LC_MESSAGES/warzone2100.mo
-share/locale/nn/LC_MESSAGES/warzone2100.mo
share/locale/pl/LC_MESSAGES/warzone2100.mo
share/locale/pt/LC_MESSAGES/warzone2100.mo
share/locale/pt_BR/LC_MESSAGES/warzone2100.mo
share/locale/ro/LC_MESSAGES/warzone2100.mo
share/locale/ru/LC_MESSAGES/warzone2100.mo
share/locale/sl/LC_MESSAGES/warzone2100.mo
-share/locale/sv/LC_MESSAGES/warzone2100.mo
-share/locale/sv_SE/LC_MESSAGES/warzone2100.mo
-share/locale/tr/LC_MESSAGES/warzone2100.mo
-share/locale/uz/LC_MESSAGES/warzone2100.mo
share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
-share/warzone2100/mods/global/aivolution.wz
-share/warzone2100/mods/global/autoload/music/music/menu.ogg
-share/warzone2100/mods/global/autoload/music/music/music.wpl
-share/warzone2100/mods/global/autoload/music/music/track1.ogg
-share/warzone2100/mods/global/autoload/music/music/track2.ogg
-share/warzone2100/mods/global/grim.wz
-share/warzone2100/mods/global/newst_tiles.wz
+share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
+share/warzone2100/base.wz
+share/warzone2100/mods/multiplay/aivolution.wz
share/warzone2100/mods/multiplay/ntw.wz
share/warzone2100/mp.wz
-share/warzone2100/warzone.wz
+share/warzone2100/music/menu.ogg
+share/warzone2100/music/music.wpl
+share/warzone2100/music/track1.ogg
+share/warzone2100/music/track2.ogg
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index 5172a199bf0..8641b9a6c4e 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.2 2009/03/27 06:54:53 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/08/16 21:21:51 wiz Exp $
-SHA1 (warzone2100-2.1.1.tar.bz2) = 5f0cb41b283ec709cffa8e00c4c1fda8fc9a63d7
-RMD160 (warzone2100-2.1.1.tar.bz2) = 4eca8c00c917061e93d4c70db07b698a123ce37f
-Size (warzone2100-2.1.1.tar.bz2) = 44839794 bytes
+SHA1 (warzone2100-2.2.1.tar.bz2) = b993827a5972cacaa236512870f50361b4b2677a
+RMD160 (warzone2100-2.2.1.tar.bz2) = 0cb42f6d3bb3beeac6dd8dccb662d867c30bbeb6
+Size (warzone2100-2.2.1.tar.bz2) = 47907534 bytes
SHA1 (patch-aa) = 95c066ff4340ba6e4c021846541b53eb4cad0704
SHA1 (patch-ab) = e82a085ddf27a5443e011ada57e78cca1ab66c79
SHA1 (patch-ac) = b15234c26cbbeffe58e623feb49e9930bd3846d0
-SHA1 (patch-ad) = 1afe3527241d142e1af6c5e432a64324675d74f3
+SHA1 (patch-ad) = af29beef3b2014bf1b3d1068b2b3caa7d948de80
SHA1 (patch-ae) = 9a5f2fccd93100e87968d2dc9d783acc595ad5d3
+SHA1 (patch-af) = 46ea523fb72ed0f081d85dfea0813fde79087c82
+SHA1 (patch-ag) = 2604a894e8579377f4b3ac8eae7250ed2c73a21c
diff --git a/games/warzone2100/patches/patch-ad b/games/warzone2100/patches/patch-ad
index 13465f4caa7..9790f82c870 100644
--- a/games/warzone2100/patches/patch-ad
+++ b/games/warzone2100/patches/patch-ad
@@ -1,22 +1,12 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/02/15 16:05:43 jmcneill Exp $
+$NetBSD: patch-ad,v 1.2 2009/08/16 21:21:51 wiz Exp $
---- lib/framework/strlfuncs.h.orig 2008-12-21 13:41:15.000000000 -0500
-+++ lib/framework/strlfuncs.h
-@@ -22,6 +22,9 @@
- #include <stddef.h>
- #include <assert.h>
+--- lib/ivis_opengl/GLee.h.orig 2009-06-21 15:15:42.000000000 +0000
++++ lib/ivis_opengl/GLee.h
+@@ -814,7 +814,6 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture
-+#if defined(__NetBSD__)
-+#include <string.h>
-+#else
- /**
- * A safer variant of \c strncpy and its completely unsafe variant \c strcpy.
- * Copy src to string dst of size siz. At most siz-1 characters
-@@ -105,6 +108,7 @@ static inline size_t strlcat(char *WZ_DE
+ /* GLX */
- return(dlen + (s - src)); /* count does not include NUL */
- }
-+#endif
+- typedef void (*__GLXextFuncPtr)(void);
- /* Static array versions of common string functions. Safer because one less parameter to screw up.
- * Can only be used on strings longer than the length of a pointer, because we use this for debugging. */
+ #ifndef GLX_ARB_get_proc_address
+ #define GLX_ARB_get_proc_address 1
diff --git a/games/warzone2100/patches/patch-af b/games/warzone2100/patches/patch-af
new file mode 100644
index 00000000000..60fdc4cca5b
--- /dev/null
+++ b/games/warzone2100/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2009/08/16 21:21:51 wiz Exp $
+
+--- src/move.c.orig 2009-06-21 15:15:40.000000000 +0000
++++ src/move.c
+@@ -63,6 +63,13 @@
+
+ #include "drive.h"
+
++#ifndef fminf
++#define fminf(a,b) (((a) < (b)) ? (a) : (b))
++#endif
++#ifndef fmaxf
++#define fmaxf(a,b) (((a) < (b)) ? (b) : (a))
++#endif
++
+ /* max and min vtol heights above terrain */
+ #define VTOL_HEIGHT_MIN 250
+ #define VTOL_HEIGHT_LEVEL 300
diff --git a/games/warzone2100/patches/patch-ag b/games/warzone2100/patches/patch-ag
new file mode 100644
index 00000000000..7425397f9d9
--- /dev/null
+++ b/games/warzone2100/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2009/08/16 21:21:51 wiz Exp $
+
+--- lib/sequence/sequence.c.orig 2009-06-21 15:15:41.000000000 +0000
++++ lib/sequence/sequence.c
+@@ -77,6 +77,10 @@
+ # include <AL/al.h>
+ # endif
+
++#ifndef nearbyint
++#define nearbyint rint
++#endif
++
+ // stick this in sequence.h perhaps?
+ typedef struct
+ {
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 22:44:43 +0000