1. Update to 1.7e.1. d.9 is no longer interoperable.

2. Get rid of half-speed audio flag. It breaks audio on Yamaha chipsets.

3. The program maintainer has a bad habit of morphing the distfile and
WRKSRC name. Grr.

4. Some patches were subsumed and thus deleted. Other stuff has come up
though and thus must be patched.

5. Take over MAINTAINERship.

PR:		ports/26112
Approved by:	nbm

8 files changed, 82 insertions, 60 deletions

diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 4788fe132e73..806bf2448d67 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	bzflag
-PORTVERSION=	1.7d.9
+PORTVERSION=	1.7e.1
+DISTNAME=	${PORTNAME}_1.7e1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bzflag
-EXTRACT_SUFX=	.src.tar.gz
+EXTRACT_SUFX=	.tar.gz
 
-MAINTAINER=	nbm@FreeBSD.org
+MAINTAINER=	nsayer@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/bzflag
 
diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo
index 1a76f7f87ded..f0650e728a67 100644
--- a/games/bzflag/distinfo
+++ b/games/bzflag/distinfo
@@ -1 +1 @@
-MD5 (bzflag-1.7d.9.src.tar.gz) = ac2f83940581c5a9b4f0e09b4931c82a
+MD5 (bzflag_1.7e1.tar.gz) = 5e136af2423f6d2ca9108099e10d565f
diff --git a/games/bzflag/files/patch-LinuxMedia.cxx b/games/bzflag/files/patch-LinuxMedia.cxx
deleted file mode 100644
index c6b5636ca19a..000000000000
--- a/games/bzflag/files/patch-LinuxMedia.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/platform/LinuxMedia.cxx.orig	Sat Jan 15 04:09:48 2000
-+++ src/platform/LinuxMedia.cxx	Fri Aug 18 16:44:02 2000
-@@ -13,16 +13,27 @@
- #include "LinuxMedia.h"
- #include <math.h>
- #include <fcntl.h>
-+#include <sys/param.h>
-+#if !defined(BSD)
- #include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
- #include <sys/time.h>
--#include <sys/types.h>
- #include <unistd.h>
- #include <sys/wait.h>
- #include <signal.h>
-+#if !defined(BSD)
- #include <sys/soundcard.h>
-+#else
-+#include <machine/soundcard.h>
-+#endif
- #include <sys/ioctl.h>
- #include <TimeKeeper.h>
- #include <errno.h>
-+#if defined(BSD)
-+#include <string.h>
-+#endif
- 
- #ifdef HALF_RATE_AUDIO
- static const int defaultAudioRate=11025;
diff --git a/games/bzflag/files/patch-Make-common b/games/bzflag/files/patch-Make-common
new file mode 100644
index 000000000000..dcc937caa9e0
--- /dev/null
+++ b/games/bzflag/files/patch-Make-common
@@ -0,0 +1,19 @@
+--- Make-common.orig	Sat Mar 24 02:21:48 2001
++++ Make-common	Sat Mar 24 02:13:00 2001
+@@ -169,13 +169,13 @@
+ #
+ # default to optimized build
+ #
+-ifdef DEBUG
++.ifdef DEBUG
+ COPTIMIZER    = $(CDEBUG)
+ CXXOPTIMIZER  = $(CXXDEBUG)
+-else
++.else
+ COPTIMIZER    = $(COPT)
+ CXXOPTIMIZER  = $(CXXOPT)
+-endif
++.endif
+ 
+ #
+ # slurp up configuration
diff --git a/games/bzflag/files/patch-common.h b/games/bzflag/files/patch-common.h
deleted file mode 100644
index 109e3ce95fdd..000000000000
--- a/games/bzflag/files/patch-common.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/common.h.orig	Sun Sep 12 21:37:57 1999
-+++ include/common.h	Sat Aug 12 01:17:34 2000
-@@ -76,8 +76,10 @@
- 
- #if !defined(_WIN32)
- 
-+#include <sys/param.h>
-+#if !defined(BSD)
- #include <values.h>
--#include <sys/types.h>
-+#endif
- 
- #if defined(__linux) || (defined(__sgi) && !defined(__INTTYPES_MAJOR))
- typedef u_int16_t	uint16_t;
diff --git a/games/bzflag/files/patch-config b/games/bzflag/files/patch-config
new file mode 100644
index 000000000000..14b594189d4e
--- /dev/null
+++ b/games/bzflag/files/patch-config
@@ -0,0 +1,14 @@
+--- config.orig	Fri Feb  2 01:04:26 2001
++++ config	Sat Mar 24 02:23:04 2001
+@@ -41,9 +41,9 @@
+ #
+ # uncomment to enable debug render modes
+ #
+-ifdef DEBUG
++.ifdef DEBUG
+ DEBUG_RENDERING = -DDEBUG_RENDERING
+-endif
++.endif
+ 
+ #
+ # uncomment to enable robot tanks
diff --git a/games/bzflag/files/patch-multicast.cxx b/games/bzflag/files/patch-multicast.cxx
new file mode 100644
index 000000000000..9b46b05e56d0
--- /dev/null
+++ b/games/bzflag/files/patch-multicast.cxx
@@ -0,0 +1,44 @@
+--- src/net/multicast.cxx.orig	Mon Mar 26 07:21:54 2001
++++ src/net/multicast.cxx	Mon Mar 26 07:24:31 2001
+@@ -174,6 +174,7 @@
+   struct ip_mreq mreq;
+   struct in_addr ifaddr;
+   int fd;
++  unsigned int opt;
+ 
+   /* check parameters */
+   if (!addr) {
+@@ -322,7 +323,7 @@
+   else {
+ #if defined(SO_REUSEPORT)
+     /* set reuse port */
+-    int opt = 1;
++    opt = 1;
+     if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT,
+ 				(SSOType)&opt, sizeof(opt)) < 0) {
+       nerror("WARNING: openMulticast: setsockopt SO_REUSEPORT");
+@@ -335,7 +336,7 @@
+ #if defined(_WIN32)
+     BOOL opt = TRUE;
+ #else
+-    int opt = 1;
++    opt = 1;
+ #endif
+     if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+ 				(SSOType)&opt, sizeof(opt)) < 0) {
+@@ -384,12 +385,12 @@
+ int			setMulticastTTL(int fd, int ttl)
+ {
+ #if defined(_WIN32)
+-  unsigned int opt = (unsigned int)ttl;
++  opt = (unsigned int)ttl;
+ #else /* defined(_WIN32) */
+-  unsigned char opt = (unsigned char)ttl;
++  unsigned char Copt = (unsigned char)ttl;
+ #endif /* defined(_WIN32) */
+   return setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL,
+-				(SSOType)&opt, sizeof(opt));
++				(SSOType)&Copt, sizeof(Copt));
+ }
+ 
+ int			sendMulticast(int fd, const void* buffer,
diff --git a/games/bzflag/files/patch-network.h b/games/bzflag/files/patch-network.h
deleted file mode 100644
index 6470541c4590..000000000000
--- a/games/bzflag/files/patch-network.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/network.h.orig	Sat Aug 12 01:02:05 2000
-+++ include/network.h	Sat Aug 12 01:02:21 2000
-@@ -39,7 +39,7 @@
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <netdb.h>
--#if defined(_old_linux_) || (!defined(__linux__) && !defined(sun))
-+#if defined(_old_linux_) || (!defined(__linux__) && !defined(sun) && !defined(BSD))
- #include <bstring.h>
- #endif
-