summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorfredb <fredb@pkgsrc.org>1999-08-07 10:36:16 +0000
committerfredb <fredb@pkgsrc.org>1999-08-07 10:36:16 +0000
commit0c050913dbafd3e0bd09ef487ddba4a8577c55c0 (patch)
treee9cf7d23bf4fbbfa4924be551a63f51024db1ce9 /games
parent03f02d836c1afa9fc59572094baec45983bd61f5 (diff)
downloadpkgsrc-0c050913dbafd3e0bd09ef487ddba4a8577c55c0.tar.gz
Expand nested template for consumption by egcs-1.1.1. (Fixes pr-6748.)
Assorted fixes and tweaks: conditionally disable work-around for __GNUC__<3.91; enable -funroll-loops per Imakefile comment; NetBSD needs to include unistd.h to get select().
Diffstat (limited to 'games')
-rw-r--r--games/battleball/files/md54
-rw-r--r--games/battleball/patches/patch-aa66
-rw-r--r--games/battleball/patches/patch-ab14
-rw-r--r--games/battleball/patches/patch-ac10
-rw-r--r--games/battleball/patches/patch-ad12
5 files changed, 104 insertions, 2 deletions
diff --git a/games/battleball/files/md5 b/games/battleball/files/md5
index 53e8afba3a1..3769e657817 100644
--- a/games/battleball/files/md5
+++ b/games/battleball/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:32 agc Exp $
+$NetBSD: md5,v 1.3 1999/08/07 10:36:16 fredb Exp $
-MD5 (battleball.20.src.tar.gz) = 073097c480c5646e0e611d2aee2ba887
+MD5 (battleball.20.src.tar.gz) = fd23bc6529d04608e21cb8bfb1b04d73
diff --git a/games/battleball/patches/patch-aa b/games/battleball/patches/patch-aa
new file mode 100644
index 00000000000..ab513348aa5
--- /dev/null
+++ b/games/battleball/patches/patch-aa
@@ -0,0 +1,66 @@
+$NetBSD: patch-aa,v 1.1 1999/08/07 10:36:17 fredb Exp $
+
+--- lib3d/rect3d.h.orig Wed Aug 5 20:55:33 1998
++++ lib3d/rect3d.h Sat Aug 7 03:18:21 1999
+@@ -13,31 +13,30 @@
+
+
+ /************************************************************************/
+-/* pnt = N-dimensional point type which delimits the bounds of the rect
+- pnts = container of pts
++/* pt3d = N-dimensional point type which delimits the bounds of the rect
++ table<pt3d> = container of pts
+ */
+-template <class pnt, class pnts>
+-struct rect {
+- pnt low,
++struct rect3d {
++ pt3d low,
+ high;
+
+- bool Contains(const pnt& p) const
++ bool Contains(const pt3d& p) const
+ {return p.IsBetween(low,high);};
+- bool ContainsInclusively(const pnt& p) const
++ bool ContainsInclusively(const pt3d& p) const
+ {return p.IsBetweenInclusively(low,high);};
+- bool ContainsExclusively(const pnt& p) const
++ bool ContainsExclusively(const pt3d& p) const
+ {return p.IsBetweenExclusively(low,high);};
+-// Center used to return "const pnt& "
+- pnt Center() const
++// Center used to return "const pt3d& "
++ pt3d Center() const
+ {return (low+high)/2;};
+
+- void MakeBoundingBox(const pnts& pts, pnt::coord& farthestDist) {
+- pnt::coord d;
++ void MakeBoundingBox(const table<pt3d>& pts, pt3d::coord& farthestDist) {
++ pt3d::coord d;
+
+ farthestDist= 0;
+ if (pts.Num()==0) {
+- low= pnt(0,0,0);
+- high= pnt(0,0,0);
++ low= pt3d(0,0,0);
++ high= pt3d(0,0,0);
+ return;
+ }
+
+@@ -45,7 +44,7 @@
+ high= pts[0];
+
+ forii(pts.Num()) {
+- d= (pnt::coord) pts[i].Dist();
++ d= (pt3d::coord) pts[i].Dist();
+ if (d >farthestDist)
+ farthestDist= d;
+ low.SetMin(pts[i]);
+@@ -55,7 +54,5 @@
+
+ };
+
+-
+-typedef rect<pt3d,table<pt3d> > rect3d;
+
+ #endif
diff --git a/games/battleball/patches/patch-ab b/games/battleball/patches/patch-ab
new file mode 100644
index 00000000000..908bf51474e
--- /dev/null
+++ b/games/battleball/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 1999/08/07 10:36:17 fredb Exp $
+
+--- bb/player.C.orig Wed Aug 5 21:00:47 1998
++++ bb/player.C Sat Aug 7 03:18:21 1999
+@@ -12,7 +12,9 @@
+
+
+ #ifdef __GNUC__
++# if (__GNUC__ < 3) && (__GNUC_MINOR__ < 91)
+ char __stl_temp_buffer[__stl_buffer_size];
++# endif
+ #else
+ #include "tempbuf.cpp" // quasi-hack necessary to use STL's stable_sort()
+ #endif
diff --git a/games/battleball/patches/patch-ac b/games/battleball/patches/patch-ac
new file mode 100644
index 00000000000..0c7bf075bbc
--- /dev/null
+++ b/games/battleball/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 1999/08/07 10:36:17 fredb Exp $
+
+--- Imakefile.orig Thu Oct 9 18:37:08 1997
++++ Imakefile Sat Aug 7 03:18:22 1999
+@@ -1,4 +1,5 @@
+ CXX = g++
++CXXOPTIONS = -funroll-loops -Wall
+ PROGRAMS = battleball
+
+ XCOMM If your compiler doesn't have STL in its default include path, add
diff --git a/games/battleball/patches/patch-ad b/games/battleball/patches/patch-ad
new file mode 100644
index 00000000000..c15e80d2ff9
--- /dev/null
+++ b/games/battleball/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 1999/08/07 10:36:18 fredb Exp $
+
+--- lib3d/general.C.orig Wed Aug 5 20:55:48 1998
++++ lib3d/general.C Sat Aug 7 03:30:27 1999
+@@ -6,6 +6,7 @@
+ #include <math.h>
+ #include <sys/time.h> // to get select()
+ //#include <sys/select.h> // to get select() on some other systems
++#include <unistd.h> // to get select() on NetBSD
+ #include "general.h"
+ #include "ang2d.h"
+