summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2008-06-21 18:12:42 +0000
committerjoerg <joerg@pkgsrc.org>2008-06-21 18:12:42 +0000
commit5ce6b0e9322d67c9f2621b5ed2b72c4a5cefb36c (patch)
tree349c1777029a94d6c0f24ecb370b5efca51a507c /games
parentb9618cf2dbb6b6d138ea005b3780b72220cf7cd6 (diff)
downloadpkgsrc-5ce6b0e9322d67c9f2621b5ed2b72c4a5cefb36c.tar.gz
Fix LP64 issues. Bump revision.
Diffstat (limited to 'games')
-rw-r--r--games/battleball/Makefile4
-rw-r--r--games/battleball/distinfo7
-rw-r--r--games/battleball/patches/patch-ae13
-rw-r--r--games/battleball/patches/patch-af13
-rw-r--r--games/battleball/patches/patch-ag13
-rw-r--r--games/battleball/patches/patch-ah13
-rw-r--r--games/battleball/patches/patch-ai13
7 files changed, 73 insertions, 3 deletions
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 95d5878dda8..2ecaa41b988 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/03/04 06:59:03 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2008/06/21 18:12:42 joerg Exp $
DISTNAME= battleball.21.src
PKGNAME= battleball-2.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games x11
MASTER_SITES= #
diff --git a/games/battleball/distinfo b/games/battleball/distinfo
index 36c76ea9723..4400498acd1 100644
--- a/games/battleball/distinfo
+++ b/games/battleball/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:11:54 agc Exp $
+$NetBSD: distinfo,v 1.6 2008/06/21 18:12:42 joerg Exp $
SHA1 (battleball.21.src.tar.gz) = 5bc651d513d378d449c117488ef54af5f3381072
RMD160 (battleball.21.src.tar.gz) = 8bc3ad8767c274135bc3f9d8bf95d8b6518c3542
@@ -7,3 +7,8 @@ SHA1 (patch-aa) = 96728a9548fb46fcc84e75ed57a074613a1e81d2
SHA1 (patch-ab) = 477a8860a8f65a10b163846f184c39e7916712ff
SHA1 (patch-ac) = 2c192f32eb0d732ad88d934e68321ee21a90ae4f
SHA1 (patch-ad) = 6257ea75af46d4ff29e9c4f1532470c3808c78fa
+SHA1 (patch-ae) = b0e027ab0a08b334f3a099af43ceca0b2cb06600
+SHA1 (patch-af) = 4df474c2c33c6585c66b0fac818fbfa07f425e96
+SHA1 (patch-ag) = 49db8de772d6540459b7681d0976a1ba2d0ca48a
+SHA1 (patch-ah) = cc38a241b74f32fbc04e79faedd0f9a9bf023418
+SHA1 (patch-ai) = 6a281ab5775b768df0554600c0329f7b24564c45
diff --git a/games/battleball/patches/patch-ae b/games/battleball/patches/patch-ae
new file mode 100644
index 00000000000..1ef3b563fcc
--- /dev/null
+++ b/games/battleball/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/06/21 18:12:42 joerg Exp $
+
+--- bsp/bsp.C.orig 2008-06-21 12:05:00.000000000 +0000
++++ bsp/bsp.C
+@@ -1205,7 +1205,7 @@ void bsp_printf(BSP *t,int level) {
+ printf("bad_neg_parent ");
+
+ for (i=0; i<t->numpolys; i++)
+- printf("%ld ", (t->polys[i]->material_index) % 100000);
++ printf("%ld ", (long)(t->polys[i]->material_index) % 100000);
+
+ if (t->positive)
+ if (t->negative)
diff --git a/games/battleball/patches/patch-af b/games/battleball/patches/patch-af
new file mode 100644
index 00000000000..e08c34945da
--- /dev/null
+++ b/games/battleball/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/06/21 18:12:42 joerg Exp $
+
+--- bsp/polygon.C.orig 2008-06-21 12:05:25.000000000 +0000
++++ bsp/polygon.C
+@@ -130,7 +130,7 @@ void
+ PolygonPrint3f(FILE *fp, Polygon3f *p)
+ {
+ int i;
+- fprintf(fp, "numverts=%d material_index=%d\n", p->numverts, p->material_index);
++ fprintf(fp, "numverts=%d material_index=%p\n", p->numverts, p->material_index);
+ for (i = 0; i < p->numverts; i++)
+ fprintf(fp, "%f %f %f\n",
+ p->verts[i][0], p->verts[i][1], p->verts[i][2]);
diff --git a/games/battleball/patches/patch-ag b/games/battleball/patches/patch-ag
new file mode 100644
index 00000000000..0da8688d8aa
--- /dev/null
+++ b/games/battleball/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/06/21 18:12:42 joerg Exp $
+
+--- bsp/polygon.h.orig 2008-06-21 12:04:08.000000000 +0000
++++ bsp/polygon.h
+@@ -21,7 +21,7 @@ typedef struct {
+ int numverts;
+ Vec3f verts[MAXPOLYVERT];
+ Vec3f plane_normal;
+- int material_index;
++ void *material_index;
+ int facesForward; // true: faces same dir as BSP node's plane faces
+ } Polygon3f;
+
diff --git a/games/battleball/patches/patch-ah b/games/battleball/patches/patch-ah
new file mode 100644
index 00000000000..f09a15023d1
--- /dev/null
+++ b/games/battleball/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/06/21 18:12:42 joerg Exp $
+
+--- lib3d/bsppanel3d.C.orig 2008-06-21 12:05:40.000000000 +0000
++++ lib3d/bsppanel3d.C
+@@ -42,7 +42,7 @@ Polygon3f bspPanel3d::asPolygon3f(pt3d p
+ }
+
+ pt3d2Vec3f(normal,poly.plane_normal);
+- poly.material_index= (int) this;
++ poly.material_index= this;
+ return poly;
+ }
+
diff --git a/games/battleball/patches/patch-ai b/games/battleball/patches/patch-ai
new file mode 100644
index 00000000000..e8b0dca6ab3
--- /dev/null
+++ b/games/battleball/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2008/06/21 18:12:42 joerg Exp $
+
+--- lib3d/bspregion3d.C.orig 2008-06-21 12:06:10.000000000 +0000
++++ lib3d/bspregion3d.C
+@@ -97,7 +97,7 @@ void bspRegion3d::MakeBspTreePanels(BSP
+ xpanel3d& panel= * (xpanel3d *) poly->material_index;
+
+ poly->material_index=
+- (int) & *treePanels.insert(treePanels.end(),xpanel3d(*poly,pts,panel));
++ & *treePanels.insert(treePanels.end(),xpanel3d(*poly,pts,panel));
+ }
+ MakeBspTreePanels(bspt->negative);
+ MakeBspTreePanels(bspt->positive);