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 <chuck@pkix.net>

5 files changed, 13 insertions, 89 deletions

diff --git a/games/bzflag/files/patch-XWindow.h b/games/bzflag/files/patch-XWindow.h
deleted file mode 100644
index 3a76147f1223..000000000000
--- 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 <libusb.h>
-+# include <osreldate.h>
-+# if __FreeBSD_version >= 500111
-+#  include <usbhid.h>
-+# else
-+#  include <libusbhid.h>
-+# endif
- #else
- #include <usb.h>
- #endif
diff --git a/games/bzflag/files/patch-configure b/games/bzflag/files/patch-configure
index a125349c2c65..5d77e1335d74 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 21da592d4715..fdfe444a063b 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 <ws2tcpip.h>
  #include <wincon.h>
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 5a073f713fee..000000000000
--- 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 <malloc.h>
- #endif
- #include <stdio.h>
diff --git a/games/bzflag/files/patch-usbjoy.cxx b/games/bzflag/files/patch-usbjoy.cxx
deleted file mode 100644
index c749716f656e..000000000000
--- 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 ||