diff options
author | joerg <joerg@pkgsrc.org> | 2011-11-25 21:50:31 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-11-25 21:50:31 +0000 |
commit | b82c494f7002bed5bbe5565761801811084f7b91 (patch) | |
tree | bb328fe0e483933facfb1c10417e3e386845f272 /games/battleball | |
parent | 52b1621b7677666e8f1a65a7b898a827aa114750 (diff) | |
download | pkgsrc-b82c494f7002bed5bbe5565761801811084f7b91.tar.gz |
Fix build issues with newer GCC
Diffstat (limited to 'games/battleball')
-rw-r--r-- | games/battleball/distinfo | 20 | ||||
-rw-r--r-- | games/battleball/patches/patch-aa | 23 | ||||
-rw-r--r-- | games/battleball/patches/patch-ad | 22 | ||||
-rw-r--r-- | games/battleball/patches/patch-ah | 17 | ||||
-rw-r--r-- | games/battleball/patches/patch-bb_bbgfxtarget.C | 21 | ||||
-rw-r--r-- | games/battleball/patches/patch-bb_gob.h | 17 | ||||
-rw-r--r-- | games/battleball/patches/patch-bb_player.C | 17 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_ang3d.h | 17 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_dimension.C | 17 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_dimentable.h | 16 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_fastpts.h | 28 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_pt2d.h | 17 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_pt3d.h | 18 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_region3d.C | 31 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_region3d.h | 23 | ||||
-rw-r--r-- | games/battleball/patches/patch-lib3d_xform.C | 13 |
16 files changed, 304 insertions, 13 deletions
diff --git a/games/battleball/distinfo b/games/battleball/distinfo index 4400498acd1..a4a42790dd1 100644 --- a/games/battleball/distinfo +++ b/games/battleball/distinfo @@ -1,14 +1,26 @@ -$NetBSD: distinfo,v 1.6 2008/06/21 18:12:42 joerg Exp $ +$NetBSD: distinfo,v 1.7 2011/11/25 21:50:31 joerg Exp $ SHA1 (battleball.21.src.tar.gz) = 5bc651d513d378d449c117488ef54af5f3381072 RMD160 (battleball.21.src.tar.gz) = 8bc3ad8767c274135bc3f9d8bf95d8b6518c3542 Size (battleball.21.src.tar.gz) = 102001 bytes -SHA1 (patch-aa) = 96728a9548fb46fcc84e75ed57a074613a1e81d2 +SHA1 (patch-aa) = 2edf7330113a768c210b78f88a17a1bc25b9d189 SHA1 (patch-ab) = 477a8860a8f65a10b163846f184c39e7916712ff SHA1 (patch-ac) = 2c192f32eb0d732ad88d934e68321ee21a90ae4f -SHA1 (patch-ad) = 6257ea75af46d4ff29e9c4f1532470c3808c78fa +SHA1 (patch-ad) = 687db97474d6aa4be7fb031221b83156adb5f36b SHA1 (patch-ae) = b0e027ab0a08b334f3a099af43ceca0b2cb06600 SHA1 (patch-af) = 4df474c2c33c6585c66b0fac818fbfa07f425e96 SHA1 (patch-ag) = 49db8de772d6540459b7681d0976a1ba2d0ca48a -SHA1 (patch-ah) = cc38a241b74f32fbc04e79faedd0f9a9bf023418 +SHA1 (patch-ah) = 9d65a69ce553dbb4f749e68b19f63ed8822c4afb SHA1 (patch-ai) = 6a281ab5775b768df0554600c0329f7b24564c45 +SHA1 (patch-bb_bbgfxtarget.C) = 2e70faa565da1766abeb1f0dcce6458067c90816 +SHA1 (patch-bb_gob.h) = 978fe42cc2e5f174d3a0820aaaf3f7fb3216e8e6 +SHA1 (patch-bb_player.C) = 5772874c77a94e0ceb5eab39e6d3a64c2756ae32 +SHA1 (patch-lib3d_ang3d.h) = 79ad88d4d7d7b9125ca7fd9de812f7fdaf708212 +SHA1 (patch-lib3d_dimension.C) = a1c91280a35322ebc27cdf55f244da2a1d21bf3b +SHA1 (patch-lib3d_dimentable.h) = 7687d43c782acf83ee263b2c9252372a96d2876c +SHA1 (patch-lib3d_fastpts.h) = 4aa042b1d97ecc3a62964c94a829494b702948ec +SHA1 (patch-lib3d_pt2d.h) = ff4fd959650125a9d12d627db0823f95a3a91ceb +SHA1 (patch-lib3d_pt3d.h) = d4e82dfa78de4bd088f3a7864c056fd73dc72228 +SHA1 (patch-lib3d_region3d.C) = bd6cd34c8e586bdd2f7d215607991da8ec7b87bc +SHA1 (patch-lib3d_region3d.h) = 7b9d5f59082765a6421e29e4bca0e6b214f26c0b +SHA1 (patch-lib3d_xform.C) = e41040bdb52cbdb33781828215decd3883abb382 diff --git a/games/battleball/patches/patch-aa b/games/battleball/patches/patch-aa index 130095dd397..f5800f32bac 100644 --- a/games/battleball/patches/patch-aa +++ b/games/battleball/patches/patch-aa @@ -1,8 +1,25 @@ -$NetBSD: patch-aa,v 1.4 2002/10/20 12:59:08 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2011/11/25 21:50:31 joerg Exp $ ---- lib3d/gfxtarget.h.orig Fri Sep 3 04:25:19 1999 +--- lib3d/gfxtarget.h.orig 1999-09-03 02:25:19.000000000 +0000 +++ lib3d/gfxtarget.h -@@ -72,7 +72,14 @@ struct gfxTarget { +@@ -7,7 +7,7 @@ + #define _GFXTARGET_H + #include <stdlib.h> + #include <string.h> +-#include <iostream.h> ++#include <iostream> + #include <X11/Xlib.h> + #include <X11/Xutil.h> + +@@ -19,6 +19,7 @@ + #include "general.h" + #include "pt2d.h" + ++using namespace std; + + struct gfxTarget { + Display *disp; // X Display +@@ -72,7 +73,14 @@ struct gfxTarget { XFillRectangle(disp,win,gc,(int)p.x,(int)p.y,(int)sz.x,(int)sz.y); } void ResizeWindow(const pt2d& sz) { diff --git a/games/battleball/patches/patch-ad b/games/battleball/patches/patch-ad index 57e80cd7eaa..f18ebe82197 100644 --- a/games/battleball/patches/patch-ad +++ b/games/battleball/patches/patch-ad @@ -1,8 +1,22 @@ -$NetBSD: patch-ad,v 1.3 2004/04/17 20:40:45 snj Exp $ +$NetBSD: patch-ad,v 1.4 2011/11/25 21:50:31 joerg Exp $ ---- lib3d/xform.h.orig 2004-04-17 13:33:48.000000000 -0700 -+++ lib3d/xform.h 2004-04-17 13:35:07.000000000 -0700 -@@ -64,6 +64,7 @@ class tcomp { +--- lib3d/xform.h.orig 1999-09-03 02:25:19.000000000 +0000 ++++ lib3d/xform.h +@@ -7,11 +7,12 @@ + #define TRANSFORM_h + + +-#include <iostream.h> ++#include <iostream> + #include "general.h" + #include "pt3d.h" + #include "ang3d.h" + ++using namespace std; + + //========================================================================== + // Transformation matrix classes +@@ -64,6 +65,7 @@ class tcomp { //=========================================================================== class tmtrx { diff --git a/games/battleball/patches/patch-ah b/games/battleball/patches/patch-ah index f09a15023d1..bc9c43aef6e 100644 --- a/games/battleball/patches/patch-ah +++ b/games/battleball/patches/patch-ah @@ -1,7 +1,20 @@ -$NetBSD: patch-ah,v 1.1 2008/06/21 18:12:42 joerg Exp $ +$NetBSD: patch-ah,v 1.2 2011/11/25 21:50:31 joerg Exp $ ---- lib3d/bsppanel3d.C.orig 2008-06-21 12:05:40.000000000 +0000 +--- lib3d/bsppanel3d.C.orig 1999-09-03 02:25:19.000000000 +0000 +++ lib3d/bsppanel3d.C +@@ -3,10 +3,10 @@ + // it under the terms of the GNU General Public License v2 or later. + + +-#include <iostream.h> ++#include <iostream> + #include "bsppanel3d.h" + +- ++using namespace std; + + /***************************************************************************/ + bspPanel3d::bspPanel3d(const Polygon3f& poly, fastPts& pts, @@ -42,7 +42,7 @@ Polygon3f bspPanel3d::asPolygon3f(pt3d p } diff --git a/games/battleball/patches/patch-bb_bbgfxtarget.C b/games/battleball/patches/patch-bb_bbgfxtarget.C new file mode 100644 index 00000000000..024f08001e0 --- /dev/null +++ b/games/battleball/patches/patch-bb_bbgfxtarget.C @@ -0,0 +1,21 @@ +$NetBSD: patch-bb_bbgfxtarget.C,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- bb/bbgfxtarget.C.orig 2011-11-25 15:16:51.000000000 +0000 ++++ bb/bbgfxtarget.C +@@ -5,7 +5,7 @@ + + #include <assert.h> + #include <string.h> // to get strlen +-#include <iostream.h> ++#include <iostream> + #include <X11/Xlib.h> // to get XEvent, XFontStruct + + #ifndef NO_OPENGL +@@ -16,6 +16,7 @@ + #include "bbgfxtarget.h" + #include "xpanel3d.h" // to get MINDIST + ++using namespace std; + + #define DEFAULTWINWIDTH 512 + #define DEFAULTWINHEIGHT ((int)(DEFAULTWINWIDTH*0.6+6*14+2)) diff --git a/games/battleball/patches/patch-bb_gob.h b/games/battleball/patches/patch-bb_gob.h new file mode 100644 index 00000000000..e53847007c3 --- /dev/null +++ b/games/battleball/patches/patch-bb_gob.h @@ -0,0 +1,17 @@ +$NetBSD: patch-bb_gob.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- bb/gob.h.orig 2011-11-25 15:17:06.000000000 +0000 ++++ bb/gob.h +@@ -7,8 +7,10 @@ + #define BBGOB_h + + +-#include <list.h> +-#include <vector.h> ++#include <list> ++#include <vector> ++ ++using namespace std; + + #include "view.h" + #include "bb.h" diff --git a/games/battleball/patches/patch-bb_player.C b/games/battleball/patches/patch-bb_player.C new file mode 100644 index 00000000000..25386e1eb82 --- /dev/null +++ b/games/battleball/patches/patch-bb_player.C @@ -0,0 +1,17 @@ +$NetBSD: patch-bb_player.C,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- bb/player.C.orig 2011-11-25 15:17:20.000000000 +0000 ++++ bb/player.C +@@ -8,10 +8,11 @@ + #include <limits.h> // to get INT_MAX, LONG_MAX + #include <assert.h> + #include <X11/keysym.h> // to get XK_* +-#include <algo.h> // ugh, this baby's big ++#include <algorithm> // ugh, this baby's big + #include "player.h" + #include "xform.h" + ++using namespace std; + + const coord + COORD_MAX= LONG_MAX, diff --git a/games/battleball/patches/patch-lib3d_ang3d.h b/games/battleball/patches/patch-lib3d_ang3d.h new file mode 100644 index 00000000000..427cc1dcd2a --- /dev/null +++ b/games/battleball/patches/patch-lib3d_ang3d.h @@ -0,0 +1,17 @@ +$NetBSD: patch-lib3d_ang3d.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/ang3d.h.orig 2011-11-25 15:13:08.000000000 +0000 ++++ lib3d/ang3d.h +@@ -7,10 +7,11 @@ + #define ANG3D_h + + +-#include <iostream.h> ++#include <iostream> + #include "general.h" + #include "ang2d.h" + ++using namespace std; + + struct ang3d + { ang2d xy, // angle in XY plane diff --git a/games/battleball/patches/patch-lib3d_dimension.C b/games/battleball/patches/patch-lib3d_dimension.C new file mode 100644 index 00000000000..0d9d6e99f14 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_dimension.C @@ -0,0 +1,17 @@ +$NetBSD: patch-lib3d_dimension.C,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/dimension.C.orig 2011-11-25 15:15:48.000000000 +0000 ++++ lib3d/dimension.C +@@ -3,10 +3,10 @@ + // it under the terms of the GNU General Public License v2 or later. + + +-#include <iostream.h> ++#include <iostream> + #include "dimension.h" + +- ++using namespace std; + + /************************************************************************/ + ostream& operator<<(ostream& out, const dimension& d) { diff --git a/games/battleball/patches/patch-lib3d_dimentable.h b/games/battleball/patches/patch-lib3d_dimentable.h new file mode 100644 index 00000000000..ff3fe9eb446 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_dimentable.h @@ -0,0 +1,16 @@ +$NetBSD: patch-lib3d_dimentable.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/dimentable.h.orig 2011-11-25 15:14:16.000000000 +0000 ++++ lib3d/dimentable.h +@@ -7,9 +7,10 @@ + #define DIMENTABLE_h + + +-#include <list.h> // STL ++#include <list> // STL + #include "dimension.h" + ++using namespace std; + + /*=========================================================================*/ + struct dimenTable { diff --git a/games/battleball/patches/patch-lib3d_fastpts.h b/games/battleball/patches/patch-lib3d_fastpts.h new file mode 100644 index 00000000000..76d020a00a3 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_fastpts.h @@ -0,0 +1,28 @@ +$NetBSD: patch-lib3d_fastpts.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/fastpts.h.orig 2011-11-25 15:13:50.000000000 +0000 ++++ lib3d/fastpts.h +@@ -7,12 +7,13 @@ + #define FASTPTS_h + + +-#include <iostream.h> ++#include <iostream> + #include "general.h" + #include "table.h" + #include "xform.h" + #include "dimentable.h" + ++using namespace std; + + /*=========================================================================*/ + struct pt3dPtr { +@@ -70,7 +71,7 @@ struct FastPts { + int Num() const {return pts.Num();} + pnt *Array() const {return pts.Array();} + pnt& operator[](int i) const {return pts[i];} +- table<pnt>& table() {return pts;} ++ table<pnt>& my_table() {return pts;} + }; + + #ifdef FASTPTS_TEMPLATE diff --git a/games/battleball/patches/patch-lib3d_pt2d.h b/games/battleball/patches/patch-lib3d_pt2d.h new file mode 100644 index 00000000000..94df6378dff --- /dev/null +++ b/games/battleball/patches/patch-lib3d_pt2d.h @@ -0,0 +1,17 @@ +$NetBSD: patch-lib3d_pt2d.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/pt2d.h.orig 2011-11-25 15:12:01.000000000 +0000 ++++ lib3d/pt2d.h +@@ -8,10 +8,11 @@ + + + #include <math.h> // to get sqrt(), M_SQRT2, sin(), etc. +-#include <iostream.h> ++#include <iostream> + #include "general.h" + #include "ang2d.h" + ++using namespace std; + + /*======================================================================*/ + struct pt2d { diff --git a/games/battleball/patches/patch-lib3d_pt3d.h b/games/battleball/patches/patch-lib3d_pt3d.h new file mode 100644 index 00000000000..007f857ab06 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_pt3d.h @@ -0,0 +1,18 @@ +$NetBSD: patch-lib3d_pt3d.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/pt3d.h.orig 2011-11-25 15:13:38.000000000 +0000 ++++ lib3d/pt3d.h +@@ -7,11 +7,12 @@ + #define PT3D_h + + +-#include <iostream.h> ++#include <iostream> + #include "general.h" + #include "pt2d.h" + #include "ang3d.h" + ++using namespace std; + + /*=========================================================================*/ + struct pt3d : pt2d { diff --git a/games/battleball/patches/patch-lib3d_region3d.C b/games/battleball/patches/patch-lib3d_region3d.C new file mode 100644 index 00000000000..befe3ff4753 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_region3d.C @@ -0,0 +1,31 @@ +$NetBSD: patch-lib3d_region3d.C,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/region3d.C.orig 2011-11-25 15:16:05.000000000 +0000 ++++ lib3d/region3d.C +@@ -44,7 +44,7 @@ region3d::region3d(const panelList& othe + if (wantEdges) + for(p= otherPanels.begin(); p != otherPanels.end(); p++) + edges.AddPanel(*p); +- box.MakeBoundingBox(pts.table(),farthestDist); ++ box.MakeBoundingBox(pts.my_table(),farthestDist); + } + + +@@ -83,7 +83,7 @@ bool region3d::InFrustum(const pt3d& vie + int region3d::Add(const xpanel3d& p) { + if (p.ptNums.Num() >0) { + edges.AddPanel(p); +- box.MakeBoundingBox(pts.table(), farthestDist); ++ box.MakeBoundingBox(pts.my_table(), farthestDist); + return panels.Add(p); + } + else +@@ -123,7 +123,7 @@ void region3d::InitPanelsEtc(int *srcPan + //panels[panels.Num()-1].normal *= normalDir; + edges.AddPanel(panels[panels.Num()-1]); + } +- box.MakeBoundingBox(pts.table(),farthestDist); ++ box.MakeBoundingBox(pts.my_table(),farthestDist); + } + + diff --git a/games/battleball/patches/patch-lib3d_region3d.h b/games/battleball/patches/patch-lib3d_region3d.h new file mode 100644 index 00000000000..553b7f41de6 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_region3d.h @@ -0,0 +1,23 @@ +$NetBSD: patch-lib3d_region3d.h,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/region3d.h.orig 2011-11-25 15:14:54.000000000 +0000 ++++ lib3d/region3d.h +@@ -7,8 +7,8 @@ + #define REGION3D_h + + +-#include <iostream.h> +-#include <list.h> // STL ++#include <iostream> ++#include <list> // STL + #include "general.h" + #include "xform.h" + #include "region2d.h" +@@ -18,6 +18,7 @@ + #include "edgetable.h" + #include "xpanel3d.h" + ++using namespace std; + + extern const pt3d::coord COORD_MAX; + diff --git a/games/battleball/patches/patch-lib3d_xform.C b/games/battleball/patches/patch-lib3d_xform.C new file mode 100644 index 00000000000..d9cf2c21d19 --- /dev/null +++ b/games/battleball/patches/patch-lib3d_xform.C @@ -0,0 +1,13 @@ +$NetBSD: patch-lib3d_xform.C,v 1.1 2011/11/25 21:50:31 joerg Exp $ + +--- lib3d/xform.C.orig 2011-11-25 15:16:31.000000000 +0000 ++++ lib3d/xform.C +@@ -4,7 +4,7 @@ + + + #include <math.h> +-#include <iomanip.h> ++#include <iomanip> + #include "xform.h" + + |