From 0676490164c84c128350c029c970910a46738666 Mon Sep 17 00:00:00 2001 From: edwin Date: Wed, 19 Jan 2005 12:04:29 +0000 Subject: update port: games/bzflag to version 2.0.0 Update games/bzflag port to version 2.0.0. It might be useful to have some people test v2 long enough to confirm that people prefer it to v1.x. If the users prefer, it might be better to create a new port games/bzflag2, but I will wait for feedback which indicates this. PR: ports/76454 Submitted by: Charles Swiger --- games/bzflag/Makefile | 18 +- games/bzflag/distinfo | 4 +- games/bzflag/files/patch-XWindow.h | 16 -- games/bzflag/files/patch-configure | 23 +- .../bzflag/files/patch-src::bzadmin::StdBothUI.cxx | 4 +- .../files/patch-src::bzflag::HUDRenderer.cxx | 11 - games/bzflag/files/patch-usbjoy.cxx | 48 ---- games/bzflag/pkg-plist | 261 +++++++++++++-------- 8 files changed, 185 insertions(+), 200 deletions(-) delete mode 100644 games/bzflag/files/patch-XWindow.h delete mode 100644 games/bzflag/files/patch-src::bzflag::HUDRenderer.cxx delete mode 100644 games/bzflag/files/patch-usbjoy.cxx (limited to 'games') diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 4efccce73e9..d47af597da6 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -6,15 +6,22 @@ # PORTNAME= bzflag -PORTVERSION= 1.10.8 +PORTVERSION= 2.0.0 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}.20041007 +# SourceForge mirroring for BZFlag-2 is broken at the moment +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +#MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://www.pkix.net/mirror/sf.net/ \ + ftp://ftp.sucs.org/pub/linux/ +DISTNAME= ${PORTNAME}-${PORTVERSION}.20050117 MAINTAINER= chuck@pkix.net COMMENT= A multiplayer 3D tank battle game +BUILD_DEPENDS= ${LOCALBASE}/bin/curl-config:${PORTSDIR}/ftp/curl + +USE_BZIP2= yes +USE_SDL= yes USE_GL= yes USE_REINPLACE= yes USE_GMAKE= yes @@ -24,7 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" -MAN6= bzadmin.6 bzflag.6 bzfls.6 bzfquery.6 bzfrelay.6 bzfs.6 +MAN5= bzw.5 +MAN6= bzadmin.6 bzflag.6 bzfquery.6 bzfs.6 post-patch: @${REINPLACE_CMD} -e 's|@LINUX_TRUE@||g ; \ diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo index 719543cecba..b8c91673ac5 100644 --- a/games/bzflag/distinfo +++ b/games/bzflag/distinfo @@ -1,2 +1,2 @@ -MD5 (bzflag-1.10.8.20041007.tar.gz) = 881a2ee873bf87fa44fd2837fa9e974e -SIZE (bzflag-1.10.8.20041007.tar.gz) = 4244335 +MD5 (bzflag-2.0.0.20050117.tar.bz2) = 16da32cfaac130bf68ca156d0dec2b2e +SIZE (bzflag-2.0.0.20050117.tar.bz2) = 8297220 diff --git a/games/bzflag/files/patch-XWindow.h b/games/bzflag/files/patch-XWindow.h deleted file mode 100644 index 3a76147f122..00000000000 --- a/games/bzflag/files/patch-XWindow.h +++ /dev/null @@ -1,16 +0,0 @@ ---- src/platform/XWindow.h_orig Sat Jan 24 23:22:56 2004 -+++ src/platform/XWindow.h Sat Jan 24 23:23:25 2004 -@@ -35,7 +35,12 @@ - extern "C" { - #endif - #ifdef __FreeBSD__ --#include -+# include -+# if __FreeBSD_version >= 500111 -+# include -+# else -+# include -+# endif - #else - #include - #endif diff --git a/games/bzflag/files/patch-configure b/games/bzflag/files/patch-configure index a125349c2c6..5d77e1335d7 100644 --- a/games/bzflag/files/patch-configure +++ b/games/bzflag/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Jan 24 20:15:57 2004 -+++ configure Sun Jan 25 00:24:23 2004 -@@ -323,7 +323,7 @@ +--- configure.orig Tue Jan 18 17:13:36 2005 ++++ configure Tue Jan 18 17:16:43 2005 +@@ -63,7 +63,7 @@ prefix=NONE program_prefix=NONE program_suffix=NONE @@ -9,12 +9,11 @@ silent= site= srcdir= -@@ -6065,7 +6065,7 @@ - - # avoid using X11 in BeOS - if test $host_os != beos; then -- CPPFLAGS= -+ CPPFLAGS="$X_CFLAGS $CPPFLAGS" - if test x$no_x = x; then - GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS" - fi +@@ -4198,6 +4198,7 @@ + beos*) + ;; + *) ++ CPPFLAGS="$X_CFLAGS $CPPFLAGS" + if test x$no_x = x; then + GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS" + fi diff --git a/games/bzflag/files/patch-src::bzadmin::StdBothUI.cxx b/games/bzflag/files/patch-src::bzadmin::StdBothUI.cxx index 21da592d471..fdfe444a063 100644 --- a/games/bzflag/files/patch-src::bzadmin::StdBothUI.cxx +++ b/games/bzflag/files/patch-src::bzadmin::StdBothUI.cxx @@ -1,5 +1,5 @@ ---- src/bzadmin/StdBothUI.cxx.orig Tue Dec 9 16:38:14 2003 -+++ src/bzadmin/StdBothUI.cxx Thu Dec 11 01:25:29 2003 +--- src/bzadmin/StdBothUI.cxx.orig Tue Jan 18 18:28:44 2005 ++++ src/bzadmin/StdBothUI.cxx Wed Jan 19 00:05:11 2005 @@ -20,6 +20,7 @@ #include #include diff --git a/games/bzflag/files/patch-src::bzflag::HUDRenderer.cxx b/games/bzflag/files/patch-src::bzflag::HUDRenderer.cxx deleted file mode 100644 index 5a073f713fe..00000000000 --- a/games/bzflag/files/patch-src::bzflag::HUDRenderer.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/bzflag/HUDRenderer.cxx.orig Tue Dec 9 16:38:59 2003 -+++ src/bzflag/HUDRenderer.cxx Thu Dec 11 00:58:54 2003 -@@ -11,7 +11,7 @@ - */ - - // system headers --#if !defined(__APPLE__) -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #endif - #include diff --git a/games/bzflag/files/patch-usbjoy.cxx b/games/bzflag/files/patch-usbjoy.cxx deleted file mode 100644 index c749716f656..00000000000 --- a/games/bzflag/files/patch-usbjoy.cxx +++ /dev/null @@ -1,48 +0,0 @@ ---- src/platform/usbjoy.cxx.orig Tue Jun 4 02:39:32 2002 -+++ src/platform/usbjoy.cxx Sun May 4 14:36:38 2003 -@@ -46,7 +46,7 @@ - int data_buf_offset; - }; - --usb_joystick *stick; -+usb_joystick *stick=NULL; - - usb_joystick::usb_joystick(const char *name) - { -@@ -58,6 +58,7 @@ - status = FALSE; - hids = NULL; - num_axis = 0; -+ report_id = 0; - - if ((fd = open(name, O_RDONLY | O_NONBLOCK))<0) - return; -@@ -67,15 +68,27 @@ - return; - } - -+#if (__FreeBSD_version >= 470000) -+# if (__FreeBSD_version >= 500111) -+ data_buf_size = hid_report_size(rd, hid_input, report_id); -+# else -+ data_buf_size = hid_report_size(rd, report_id, hid_input); -+# endif -+#else - data_buf_size = hid_report_size(rd, hid_input, &report_id); -+#endif - if ((data_buf = (char *)malloc(data_buf_size)) == NULL) { - hid_dispose_report_desc(rd); - } -- data_buf_offset = (report_id != 0); -+ data_buf_offset = 0; - - int is_joystick = 0; - int interesting_hid = FALSE; -+#if (__FreeBSD_version >= 500111) -+ for (d = hid_start_parse(rd, 1 << hid_input, report_id); hid_get_item(d, &h); ) { -+#else - for (d = hid_start_parse(rd, 1 << hid_input); hid_get_item(d, &h); ) { -+#endif - int page = HID_PAGE(h.usage); - int usage = HID_USAGE(h.usage); - is_joystick = is_joystick || diff --git a/games/bzflag/pkg-plist b/games/bzflag/pkg-plist index d338af97f97..7fb457824c2 100644 --- a/games/bzflag/pkg-plist +++ b/games/bzflag/pkg-plist @@ -1,107 +1,160 @@ bin/bzadmin bin/bzflag -bin/bzfrelay bin/bzfs -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/burrow.wav -share/bzflag/caution.png -share/bzflag/clouds.png -share/bzflag/explode1.png -share/bzflag/explosion.wav -share/bzflag/fire.wav -share/bzflag/fixedbr.png -share/bzflag/fixedmr.png -share/bzflag/flag.png -share/bzflag/flag_alert.wav -share/bzflag/flag_drop.wav -share/bzflag/flag_grab.wav -share/bzflag/flag_lost.wav -share/bzflag/flag_won.wav -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 -share/bzflag/l10n/bzflag_da.po -share/bzflag/l10n/bzflag_de.po -share/bzflag/l10n/bzflag_en_US_l33t.po -share/bzflag/l10n/bzflag_en_US_redneck.po -share/bzflag/l10n/bzflag_es.po -share/bzflag/l10n/bzflag_fr.po -share/bzflag/l10n/bzflag_it.po -share/bzflag/l10n/bzflag_kg.po -share/bzflag/l10n/bzflag_nl.po -share/bzflag/l10n/bzflag_pt.po -share/bzflag/l10n/bzflag_sv.po -share/bzflag/l10n/bzflag_xx.po -share/bzflag/l10n/ISO-639-2_values_8bits.txt -share/bzflag/land.wav -share/bzflag/laser.wav -share/bzflag/lock.wav -share/bzflag/menu_arrow.png -share/bzflag/message_admin.wav -share/bzflag/message_private.wav -share/bzflag/message_team.wav -share/bzflag/missile.png -share/bzflag/missile.wav -share/bzflag/mountain1.png -share/bzflag/mountain2.png -share/bzflag/mountain3.png -share/bzflag/mountain4.png -share/bzflag/mountain5.png -share/bzflag/mountain6.png -share/bzflag/phantom.wav -share/bzflag/pop.wav -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/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/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/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/zone_ground.png -@dirrm share/bzflag/l10n -@dirrm share/bzflag +%%DATADIR%%/blue_basetop.png +%%DATADIR%%/blue_basewall.png +%%DATADIR%%/blue_bolt.png +%%DATADIR%%/blue_laser.png +%%DATADIR%%/blue_super_bolt.png +%%DATADIR%%/blue_tank.png +%%DATADIR%%/boom.wav +%%DATADIR%%/bounce.wav +%%DATADIR%%/boxwall.png +%%DATADIR%%/bubble.png +%%DATADIR%%/burrow.wav +%%DATADIR%%/bzflag-256x256.png +%%DATADIR%%/bzflag-32x32.xpm +%%DATADIR%%/bzflag-48x48.png +%%DATADIR%%/caution.png +%%DATADIR%%/clouds.png +%%DATADIR%%/explode1.png +%%DATADIR%%/explode2.png +%%DATADIR%%/explosion.wav +%%DATADIR%%/fire.wav +%%DATADIR%%/flag.png +%%DATADIR%%/flag_alert.wav +%%DATADIR%%/flag_drop.wav +%%DATADIR%%/flag_grab.wav +%%DATADIR%%/flag_lost.wav +%%DATADIR%%/flag_won.wav +%%DATADIR%%/flap.wav +%%DATADIR%%/fonts/LuxiMono_12.fmt +%%DATADIR%%/fonts/LuxiMono_12.png +%%DATADIR%%/fonts/LuxiMono_16.fmt +%%DATADIR%%/fonts/LuxiMono_16.png +%%DATADIR%%/fonts/LuxiMono_32.fmt +%%DATADIR%%/fonts/LuxiMono_32.png +%%DATADIR%%/fonts/LuxiMono_6.fmt +%%DATADIR%%/fonts/LuxiMono_6.png +%%DATADIR%%/fonts/LuxiMono_8.fmt +%%DATADIR%%/fonts/LuxiMono_8.png +%%DATADIR%%/fonts/ProFont_12.fmt +%%DATADIR%%/fonts/ProFont_12.png +%%DATADIR%%/fonts/ProFont_16.fmt +%%DATADIR%%/fonts/ProFont_16.png +%%DATADIR%%/fonts/ProFont_6.fmt +%%DATADIR%%/fonts/ProFont_6.png +%%DATADIR%%/fonts/ProFont_8.fmt +%%DATADIR%%/fonts/ProFont_8.png +%%DATADIR%%/fonts/TogaSansBold_12.fmt +%%DATADIR%%/fonts/TogaSansBold_12.png +%%DATADIR%%/fonts/TogaSansBold_16.fmt +%%DATADIR%%/fonts/TogaSansBold_16.png +%%DATADIR%%/fonts/TogaSansBold_32.fmt +%%DATADIR%%/fonts/TogaSansBold_32.png +%%DATADIR%%/fonts/TogaSansBold_6.fmt +%%DATADIR%%/fonts/TogaSansBold_6.png +%%DATADIR%%/fonts/TogaSansBold_8.fmt +%%DATADIR%%/fonts/TogaSansBold_8.png +%%DATADIR%%/fonts/TogaSerifBold_12.fmt +%%DATADIR%%/fonts/TogaSerifBold_12.png +%%DATADIR%%/fonts/TogaSerifBold_16.fmt +%%DATADIR%%/fonts/TogaSerifBold_16.png +%%DATADIR%%/fonts/TogaSerifBold_32.fmt +%%DATADIR%%/fonts/TogaSerifBold_32.png +%%DATADIR%%/fonts/VeraMonoBold_12.fmt +%%DATADIR%%/fonts/VeraMonoBold_12.png +%%DATADIR%%/fonts/VeraMonoBold_16.fmt +%%DATADIR%%/fonts/VeraMonoBold_16.png +%%DATADIR%%/fonts/VeraMonoBold_6.fmt +%%DATADIR%%/fonts/VeraMonoBold_6.png +%%DATADIR%%/fonts/VeraMonoBold_8.fmt +%%DATADIR%%/fonts/VeraMonoBold_8.png +%%DATADIR%%/fonts/readme +%%DATADIR%%/frog.png +%%DATADIR%%/green_basetop.png +%%DATADIR%%/green_basewall.png +%%DATADIR%%/green_bolt.png +%%DATADIR%%/green_laser.png +%%DATADIR%%/green_super_bolt.png +%%DATADIR%%/green_tank.png +%%DATADIR%%/hunt.wav +%%DATADIR%%/hunt_select.wav +%%DATADIR%%/hunter_tank.png +%%DATADIR%%/jump.wav +%%DATADIR%%/jumpjets.png +%%DATADIR%%/killteam.wav +%%DATADIR%%/l10n/ISO-639-2_values_8bits.txt +%%DATADIR%%/l10n/bzflag_cs_CZ.po +%%DATADIR%%/l10n/bzflag_da.po +%%DATADIR%%/l10n/bzflag_de.po +%%DATADIR%%/l10n/bzflag_en_US_l33t.po +%%DATADIR%%/l10n/bzflag_en_US_redneck.po +%%DATADIR%%/l10n/bzflag_es.po +%%DATADIR%%/l10n/bzflag_fr.po +%%DATADIR%%/l10n/bzflag_it.po +%%DATADIR%%/l10n/bzflag_kg.po +%%DATADIR%%/l10n/bzflag_lt.po +%%DATADIR%%/l10n/bzflag_nl.po +%%DATADIR%%/l10n/bzflag_pt.po +%%DATADIR%%/l10n/bzflag_sv.po +%%DATADIR%%/l10n/bzflag_xx.po +%%DATADIR%%/land.wav +%%DATADIR%%/laser.wav +%%DATADIR%%/lock.wav +%%DATADIR%%/menu_arrow.png +%%DATADIR%%/mesh.png +%%DATADIR%%/message_admin.wav +%%DATADIR%%/message_private.wav +%%DATADIR%%/message_team.wav +%%DATADIR%%/missile.png +%%DATADIR%%/missile.wav +%%DATADIR%%/moon.png +%%DATADIR%%/mountain1.png +%%DATADIR%%/mountain2.png +%%DATADIR%%/mountain3.png +%%DATADIR%%/phantom.wav +%%DATADIR%%/pop.wav +%%DATADIR%%/puddle.png +%%DATADIR%%/purple_basetop.png +%%DATADIR%%/purple_basewall.png +%%DATADIR%%/purple_bolt.png +%%DATADIR%%/purple_laser.png +%%DATADIR%%/purple_super_bolt.png +%%DATADIR%%/purple_tank.png +%%DATADIR%%/pyrwall.png +%%DATADIR%%/rabbit_bolt.png +%%DATADIR%%/rabbit_laser.png +%%DATADIR%%/rabbit_super_bolt.png +%%DATADIR%%/rabbit_tank.png +%%DATADIR%%/radar.png +%%DATADIR%%/raindrop.png +%%DATADIR%%/red_basetop.png +%%DATADIR%%/red_basewall.png +%%DATADIR%%/red_bolt.png +%%DATADIR%%/red_laser.png +%%DATADIR%%/red_super_bolt.png +%%DATADIR%%/red_tank.png +%%DATADIR%%/ricochet.wav +%%DATADIR%%/rogue_bolt.png +%%DATADIR%%/rogue_laser.png +%%DATADIR%%/rogue_super_bolt.png +%%DATADIR%%/rogue_tank.png +%%DATADIR%%/roof.png +%%DATADIR%%/shock.wav +%%DATADIR%%/snowflake.png +%%DATADIR%%/std_ground.png +%%DATADIR%%/steamroller.wav +%%DATADIR%%/teamgrab.wav +%%DATADIR%%/telelink.png +%%DATADIR%%/teleport.wav +%%DATADIR%%/tetrawall.png +%%DATADIR%%/thief.png +%%DATADIR%%/thief.wav +%%DATADIR%%/title.png +%%DATADIR%%/wall.png +%%DATADIR%%/water.png +%%DATADIR%%/zone_ground.png +@dirrm %%DATADIR%%/fonts +@dirrm %%DATADIR%%/l10n +@dirrm %%DATADIR%% -- cgit