diff options
| -rw-r--r-- | games/bzflag/Makefile | 13 | ||||
| -rw-r--r-- | games/bzflag/PLIST | 67 | ||||
| -rw-r--r-- | games/bzflag/distinfo | 11 | ||||
| -rw-r--r-- | games/bzflag/patches/patch-ac | 13 | ||||
| -rw-r--r-- | games/bzflag/patches/patch-ad | 17 | ||||
| -rw-r--r-- | games/bzflag/patches/patch-ae | 44 |
6 files changed, 86 insertions, 79 deletions
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 74854192dcc..fb9ea0ba717 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2004/02/28 06:08:16 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/03/02 23:14:31 snj Exp $ -DISTNAME= bzflag-1.10.20031209 -PKGNAME= ${DISTNAME:S/20031209/0/} +DISTNAME= bzflag-1.10.4.20040125 +PKGNAME= ${DISTNAME:S/.20040125//} CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/} @@ -9,14 +9,13 @@ MAINTAINER= blymn@baea.com.au HOMEPAGE= http://www.bzflag.org/ COMMENT= OpenGL tank game -WRKSRC= ${WRKDIR}/bzflag-1.9.10.20031209 GNU_CONFIGURE= yes -USE_NCURSES= # resize_term() -USE_X11= yes USE_BUILDLINK3= yes USE_GNU_TOOLS+= make -USE_PERL5= build USE_LANGUAGES= c c++ +USE_NCURSES= # resize_term() +USE_PERL5= build +USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/games/bzflag/PLIST b/games/bzflag/PLIST index 71e7f399721..121c93d960e 100644 --- a/games/bzflag/PLIST +++ b/games/bzflag/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/12/13 10:32:53 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/03/02 23:14:31 snj Exp $ bin/bzadmin bin/bzflag bin/bzfrelay @@ -9,11 +9,15 @@ man/man6/bzfls.6 man/man6/bzfquery.6 man/man6/bzfrelay.6 man/man6/bzfs.6 -share/bzflag/bbolt.png -share/bzflag/blaser.png +share/bzflag/blue_basetop.png +share/bzflag/blue_basewall.png +share/bzflag/blue_bolt.png +share/bzflag/blue_laser.png +share/bzflag/blue_super_bolt.png +share/bzflag/blue_tank.png share/bzflag/boom.wav share/bzflag/boxwall.png -share/bzflag/btbolt.png +share/bzflag/burrow.wav share/bzflag/caution.png share/bzflag/clouds.png share/bzflag/explode1.png @@ -27,15 +31,17 @@ share/bzflag/flag_drop.wav share/bzflag/flag_grab.wav share/bzflag/flag_lost.wav share/bzflag/flag_won.wav -share/bzflag/flage.png -share/bzflag/gbolt.png -share/bzflag/glaser.png -share/bzflag/ground.png -share/bzflag/gtbolt.png +share/bzflag/green_basetop.png +share/bzflag/green_basewall.png +share/bzflag/green_bolt.png +share/bzflag/green_laser.png +share/bzflag/green_super_bolt.png +share/bzflag/green_tank.png share/bzflag/helvbi.png share/bzflag/helvbr.png share/bzflag/hunt.wav share/bzflag/hunt_select.wav +share/bzflag/hunter_tank.png share/bzflag/jump.wav share/bzflag/killteam.wav share/bzflag/l10n/bzflag_cs_CZ.po @@ -54,35 +60,50 @@ share/bzflag/l10n/bzflag_xx.po share/bzflag/land.wav share/bzflag/laser.wav share/bzflag/lock.wav +share/bzflag/menu_arrow.png +share/bzflag/message_private.wav +share/bzflag/message_team.wav share/bzflag/missile.png share/bzflag/missile.wav -share/bzflag/mountain.png -share/bzflag/panel.png -share/bzflag/pbolt.png +share/bzflag/mountain1.png +share/bzflag/mountain2.png +share/bzflag/mountain3.png share/bzflag/phantom.wav -share/bzflag/plaser.png share/bzflag/pop.wav -share/bzflag/ptbolt.png +share/bzflag/purple_basetop.png +share/bzflag/purple_basewall.png +share/bzflag/purple_bolt.png +share/bzflag/purple_laser.png +share/bzflag/purple_super_bolt.png +share/bzflag/purple_tank.png share/bzflag/pyrwall.png -share/bzflag/rbolt.png +share/bzflag/rabbit_bolt.png +share/bzflag/rabbit_laser.png +share/bzflag/rabbit_super_bolt.png +share/bzflag/rabbit_tank.png +share/bzflag/red_basetop.png +share/bzflag/red_basewall.png +share/bzflag/red_bolt.png +share/bzflag/red_laser.png +share/bzflag/red_super_bolt.png +share/bzflag/red_tank.png share/bzflag/ricochet.wav -share/bzflag/rlaser.png +share/bzflag/rogue_bolt.png +share/bzflag/rogue_laser.png +share/bzflag/rogue_super_bolt.png +share/bzflag/rogue_tank.png share/bzflag/roof.png -share/bzflag/rtbolt.png share/bzflag/shock.wav +share/bzflag/std_ground.png share/bzflag/steamroller.wav share/bzflag/teamgrab.wav share/bzflag/teleport.wav share/bzflag/thief.png +share/bzflag/thief.wav share/bzflag/timesbi.png share/bzflag/timesbr.png share/bzflag/title.png share/bzflag/wall.png -share/bzflag/wbolt.png -share/bzflag/wlaser.png -share/bzflag/wtbolt.png -share/bzflag/ybolt.png -share/bzflag/ylaser.png -share/bzflag/ytbolt.png +share/bzflag/zone_ground.png @dirrm share/bzflag/l10n @dirrm share/bzflag diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo index 775e72f17f2..211b901b9ab 100644 --- a/games/bzflag/distinfo +++ b/games/bzflag/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.4 2003/12/31 03:10:39 xtraeme Exp $ +$NetBSD: distinfo,v 1.5 2004/03/02 23:14:31 snj Exp $ -SHA1 (bzflag-1.10.20031209.tar.gz) = 3bf7fb071707075f9a7a681fe5ae9e03c17a08ec -Size (bzflag-1.10.20031209.tar.gz) = 3352632 bytes +SHA1 (bzflag-1.10.4.20040125.tar.gz) = 36178903ee5eab7d95c18f23c0e43d4e43cde980 +Size (bzflag-1.10.4.20040125.tar.gz) = 4070444 bytes SHA1 (patch-aa) = 05df40eb0fbb7dbab583434f25709cb815469393 SHA1 (patch-ab) = 4c5cf621c5f66768b61669087373e74233d179ab -SHA1 (patch-ac) = 808f1065b64478248337e84785518d03d230c96b -SHA1 (patch-ad) = 896097e7cc29c8d186751c299857730be196b228 -SHA1 (patch-ae) = 2b20b1f46510e66c5ac33415af15e25e9acffc8d +SHA1 (patch-ad) = c7d9cc323c60477beab3e2826db1f89b1f9fa1b4 +SHA1 (patch-ae) = ca37994c7fa6c2d8a96ce83d264f7636ec6dca43 SHA1 (patch-af) = 8957feb16144cbb38436cd1f77358d50fb93f66b diff --git a/games/bzflag/patches/patch-ac b/games/bzflag/patches/patch-ac deleted file mode 100644 index 1226e86572f..00000000000 --- a/games/bzflag/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2003/12/13 10:32:53 xtraeme Exp $ - ---- src/bzadmin/Makefile.in.orig 2003-12-13 11:01:09.000000000 +0100 -+++ src/bzadmin/Makefile.in 2003-12-13 11:01:28.000000000 +0100 -@@ -128,7 +128,7 @@ - PROGRAMS = $(bin_PROGRAMS) - - --DEFS = @DEFS@ -I. -I$(srcdir) -I../../include -+DEFS = @DEFS@ -I. -I$(srcdir) -I../../include -I${BUILDLINK_DIR}/include - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ diff --git a/games/bzflag/patches/patch-ad b/games/bzflag/patches/patch-ad index 9855c3782f6..0eeda1e6d30 100644 --- a/games/bzflag/patches/patch-ad +++ b/games/bzflag/patches/patch-ad @@ -1,17 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2003/12/13 10:32:53 xtraeme Exp $ +$NetBSD: patch-ad,v 1.3 2004/03/02 23:14:31 snj Exp $ ---- configure.orig Tue Dec 9 17:08:21 2003 -+++ configure Thu Dec 11 00:55:53 2003 -@@ -2515,7 +2515,7 @@ - fi - - --LDFLAGS=$X_LIBS -+LDFLAGS="$X_LIBS $LDFLAGS" - case $host_os in - solaris*) - GLIBS="-lresolv -laudio $GLIBS"; -@@ -2724,7 +2724,7 @@ +--- configure.orig 2004-01-24 17:15:57.000000000 -0800 ++++ configure 2004-03-02 14:23:06.000000000 -0800 +@@ -6065,7 +6065,7 @@ fi # avoid using X11 in BeOS if test $host_os != beos; then diff --git a/games/bzflag/patches/patch-ae b/games/bzflag/patches/patch-ae index 96d7643d0fa..89f2a393375 100644 --- a/games/bzflag/patches/patch-ae +++ b/games/bzflag/patches/patch-ae @@ -1,30 +1,40 @@ -$NetBSD: patch-ae,v 1.2 2003/12/13 10:32:53 xtraeme Exp $ +$NetBSD: patch-ae,v 1.3 2004/03/02 23:14:31 snj Exp $ ---- src/bzflag/Makefile.in.orig Wed Dec 10 09:09:45 2003 -+++ src/bzflag/Makefile.in Thu Dec 11 02:09:15 2003 -@@ -168,7 +168,6 @@ +--- src/bzflag/Makefile.in.orig 2004-03-02 14:27:33.000000000 -0800 ++++ src/bzflag/Makefile.in 2004-03-02 14:32:25.000000000 -0800 +@@ -241,7 +241,6 @@ bzflag_SOURCES = \ @MACOS_FALSE@ ../scene/libSceneDB.a \ @MACOS_FALSE@ ../geometry/libGeometry.a \ @MACOS_FALSE@ ../mediafile/libMediaFile.a \ -@MACOS_FALSE@ ../zlib/libz.a \ @MACOS_FALSE@ $(RESOURCE) \ @MACOS_FALSE@ $(GLIBS) - # This is required to hook in ogg/vorbis libraries -@@ -176,7 +175,7 @@ +@@ -265,7 +264,7 @@ bzflag_SOURCES = \ + # $(ALIBS) AM_CPPFLAGS = $(X_CFLAGS) -bzflag_LDFLAGS = ../date/buildDate.o +bzflag_LDFLAGS = ../date/buildDate.o -lz ${LIBOSSAUDIO} + subdir = src/bzflag mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../include/config.h - CONFIG_CLEAN_FILES = -@@ -207,7 +206,7 @@ - @MACOS_FALSE@../common/libCommon.a ../obstacle/libObstacle.a \ - @MACOS_FALSE@../platform/libPlatform.a ../ogl/libGLKit.a \ - @MACOS_FALSE@../scene/libSceneDB.a ../geometry/libGeometry.a \ --@MACOS_FALSE@../mediafile/libMediaFile.a ../zlib/libz.a -+@MACOS_FALSE@../mediafile/libMediaFile.a - CXXFLAGS = @CXXFLAGS@ - CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) + CONFIG_HEADER = $(top_builddir)/include/config.h +@@ -296,7 +295,7 @@ bzflag_LDADD = $(LDADD) + @MACOS_FALSE@@WIN32_TRUE@ ../scene/libSceneDB.a \ + @MACOS_FALSE@@WIN32_TRUE@ ../geometry/libGeometry.a \ + @MACOS_FALSE@@WIN32_TRUE@ ../mediafile/libMediaFile.a \ +-@MACOS_FALSE@@WIN32_TRUE@ ../zlib/libz.a bzflag.res ++@MACOS_FALSE@@WIN32_TRUE@ bzflag.res + @MACOS_FALSE@@WIN32_FALSE@bzflag_DEPENDENCIES = ../net/libNet.a \ + @MACOS_FALSE@@WIN32_FALSE@ ../common/libCommon.a \ + @MACOS_FALSE@@WIN32_FALSE@ ../obstacle/libObstacle.a \ +@@ -304,8 +303,7 @@ bzflag_LDADD = $(LDADD) + @MACOS_FALSE@@WIN32_FALSE@ ../ogl/libGLKit.a \ + @MACOS_FALSE@@WIN32_FALSE@ ../scene/libSceneDB.a \ + @MACOS_FALSE@@WIN32_FALSE@ ../geometry/libGeometry.a \ +-@MACOS_FALSE@@WIN32_FALSE@ ../mediafile/libMediaFile.a \ +-@MACOS_FALSE@@WIN32_FALSE@ ../zlib/libz.a ++@MACOS_FALSE@@WIN32_FALSE@ ../mediafile/libMediaFile.a + @MACOS_TRUE@@WIN32_TRUE@bzflag_DEPENDENCIES = ../net/libNet.a \ + @MACOS_TRUE@@WIN32_TRUE@ ../common/libCommon.a \ + @MACOS_TRUE@@WIN32_TRUE@ ../obstacle/libObstacle.a \ |