Update to battleball 2.1. Since the author's original site is gone, and

since the tarball seems to be available on tucows, we'll move it there
instead of putting it on my people.FreeBSD.org space. This also fixes
the distfile fennerism, and finally we can remove USE_IMAKE! The patches
that have been removed are obsolete due to newer compilers.

4 files changed, 39 insertions, 14 deletions

diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 8c4af5378c5f..309657962a52 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	battleball
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	games
-MASTER_SITES=	http://www.cs.utexas.edu/users/pahardin/
+MASTER_SITES=	http://fundy.linux.tucows.com/files/x11/entertain/
 DISTNAME=	${PORTNAME}.${PORTVERSION:S/.//}.src
 
 MAINTAINER=	will@FreeBSD.org
 
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/bb-2.0
+WRKSRC=		${WRKDIR}/battleball-2.1-src
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
diff --git a/games/battleball/distinfo b/games/battleball/distinfo
index 0f1be7d4c4dc..a8c353876e9d 100644
--- a/games/battleball/distinfo
+++ b/games/battleball/distinfo
@@ -1 +1 @@
-MD5 (battleball.20.src.tar.gz) = fd23bc6529d04608e21cb8bfb1b04d73
+MD5 (battleball.21.src.tar.gz) = d0ed7beee19194cea86e738fed2b69c4
diff --git a/games/battleball/files/patch-ab b/games/battleball/files/patch-ab
index e6108864bd1c..7a027906392a 100644
--- a/games/battleball/files/patch-ab
+++ b/games/battleball/files/patch-ab
@@ -1,6 +1,6 @@
---- bb/main.C	Thu Oct  9 16:03:25 1997
-+++ /home/andy/tmp/wrk/bb/main.C	Wed Dec 16 23:34:59 1998
-@@ -16,6 +16,9 @@
+--- bb/main.C	Thu Sep  2 22:25:19 1999
++++ bb/main.C.new	Sun Apr 16 17:23:35 2000
+@@ -11,6 +11,9 @@
  #include <stdio.h>       // to get sprintf()
  #include <string.h>      // to get strncpy()
  #include <time.h>        // to get time(time_t *)
@@ -8,15 +8,15 @@
 +#include <floatingpoint.h>
 +#endif
  #include "bb.h"
+ #include "bbgfxtarget.h"
  #include "player.h"
- 
-@@ -818,6 +821,9 @@
+@@ -803,6 +806,9 @@
+ /*=========================================================================*/
  // A long and complicated main() function!
- 
  main (int argc, char *argv[]) {
 +#ifdef __FreeBSD__
 +  fpsetmask(0);
 +#endif
-   battleBall bb(argc,argv);
-   bb.Play();
- }
+   bb= new battleBall(argc,argv);
+   bb->Play();
+   delete bb;
diff --git a/games/battleball/files/patch-af b/games/battleball/files/patch-af
new file mode 100644
index 000000000000..5c67ec764104
--- /dev/null
+++ b/games/battleball/files/patch-af
@@ -0,0 +1,26 @@
+--- Makefile	Thu Sep  2 22:25:18 1999
++++ Makefile.new	Sun Apr 16 17:28:19 2000
+@@ -1,17 +1,18 @@
+-CXX		= g++
++CXX		?= c++
+ 
+ # If you don't have OpenGL or Mesa, you can still compile BattleBall;
+ # just define the symbol NO_OPENGL when compiling, and don't link with
+ # $(GLLIBS) when linking
+-CXXFLAGS	= -O2 -funroll-loops
++CXXFLAGS	?= -O -pipe
+ #CXXFLAGS	= -O2 -funroll-loops -DNO_OPENGL
+ 
+ INCS		= -Ibsp -Ilib3d
+-XLIBS		= -L/usr/X11R6/lib -lX11
++X11BASE		?=/usr/X11R6
++XLIBS		= -L$(X11BASE)/lib -lX11
+ LIBS		= -lm $(XLIBS)
+ 
+-GLINCS		= -I/usr/local/X11/include
+-GLLIBS		= -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
++GLINCS		= -I$(X11BASE)/include
++GLLIBS		= -lXi -lXmu -lXext -L$(X11BASE)/lib -lGL
+ #GLLIBS		=
+ 
+ BSPOBJS		= bsp/brep.o bsp/bsp.o bsp/polygon.o