[pkgsrc/trunk]: pkgsrc/math/xlife Make this build with gcc-3.3.2.

[fredb <fredb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6be6497cf14b
branches:  trunk
changeset: 463387:6be6497cf14b
user:      fredb <fredb%pkgsrc.org@localhost>
date:      Sun Nov 09 04:20:18 2003 +0000

description:
Make this build with gcc-3.3.2.

diffstat:

 math/xlife/distinfo         |   5 ++++-
 math/xlife/patches/patch-ac |  17 +++++++++++++++++
 math/xlife/patches/patch-ad |  14 ++++++++++++++
 math/xlife/patches/patch-ae |  19 +++++++++++++++++++
 4 files changed, 54 insertions(+), 1 deletions(-)

diffs (76 lines):

diff -r 0b4aa0e2d67f -r 6be6497cf14b math/xlife/distinfo
--- a/math/xlife/distinfo       Sun Nov 09 02:23:18 2003 +0000
+++ b/math/xlife/distinfo       Sun Nov 09 04:20:18 2003 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2002/12/05 10:57:46 abs Exp $
+$NetBSD: distinfo,v 1.3 2003/11/09 04:20:18 fredb Exp $
 
 SHA1 (xlife-5.0.tar.gz) = 168edb2c8bdeb1689fea82c56db76e85aeeed43e
 Size (xlife-5.0.tar.gz) = 214220 bytes
 SHA1 (patch-aa) = a1797c733efa564b361f299650ea521987635feb
 SHA1 (patch-ab) = 891c098845652ad9f172b3693cdf416685e9a960
+SHA1 (patch-ac) = 952eb7c45be5cb767cd98e028f7305ea7efc249f
+SHA1 (patch-ad) = 07f653049e43dc9bf2681d32a6357421add9357e
+SHA1 (patch-ae) = 119164be84be7fa0b00f9c783a492a2a1d81092e
diff -r 0b4aa0e2d67f -r 6be6497cf14b math/xlife/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xlife/patches/patch-ac       Sun Nov 09 04:20:18 2003 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2003/11/09 04:20:19 fredb Exp $
+
+--- cell.c.orig        1996-06-17 15:06:40.000000000 -0500
++++ cell.c
+@@ -393,9 +393,9 @@ void displaybox(u32bits x, u32bits y, ce
+ #endif /* STATEBITS > 1 */
+     {
+       register u32bits live1 = ptr->twostate.live1;
+-      register u32bits long live2 = ptr->twostate.live2;
+-      register u32bits long olive1 = ptr->twostate.olive1;
+-      register u32bits long olive2 = ptr->twostate.olive2;
++      register u32bits live2 = ptr->twostate.live2;
++      register u32bits olive1 = ptr->twostate.olive1;
++      register u32bits olive2 = ptr->twostate.olive2;
+ 
+       displayline(live1,x,y,olive1);
+       displayline(live1>>8,x,++y,olive1>>8);
diff -r 0b4aa0e2d67f -r 6be6497cf14b math/xlife/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xlife/patches/patch-ad       Sun Nov 09 04:20:18 2003 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2003/11/09 04:20:19 fredb Exp $
+
+--- generate.c.orig    1995-06-07 01:05:30.000000000 -0500
++++ generate.c
+@@ -54,7 +54,8 @@ static bool ev_mode = VALENCE_DRIVEN;
+ 
+ static void evolve2(pattern *context)
+ {
+-    register u_long t1,t2,t3,*tmpptr,y, live_total = 0, changes = 0;
++    register u_long t1,t2,t3,y, live_total = 0, changes = 0;
++    register u32bits *tmpptr;
+     tile *cptr,*tptr,*cptrup,*cptrdn,*cptrlf,*cptrrt;
+ 
+     /*
diff -r 0b4aa0e2d67f -r 6be6497cf14b math/xlife/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xlife/patches/patch-ae       Sun Nov 09 04:20:18 2003 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2003/11/09 04:20:19 fredb Exp $
+
+--- tile.h.orig        1996-06-17 15:07:41.000000000 -0500
++++ tile.h
+@@ -20,10 +20,12 @@
+  * PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <sys/types.h>
++
+ #define BOXSIZE         8
+ 
+-/* someday, on a 64-bit machine, this might be unsigned int rather than long */
+-typedef unsigned long u32bits;
++/* typedef unsigned long      u32bits; */
++#define u32bits uint32_t
+ 
+ typedef union 
+ {