Make build with gcc3. Patches gleaned from abuse-sdl project.

Use CXX instead of CC for linking c++ code.

4 files changed, 52 insertions, 6 deletions

diff --git a/games/abuse/distinfo b/games/abuse/distinfo
index 7287b74cd84..e589f9f31d2 100644
--- a/games/abuse/distinfo
+++ b/games/abuse/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2002/07/16 14:26:20 agc Exp $
+$NetBSD: distinfo,v 1.5 2004/07/11 00:11:26 wiz Exp $
 
 SHA1 (abuse_pd.tgz) = 52a703abea31d6f00937d4cc0160af7a454e6630
 Size (abuse_pd.tgz) = 2525552 bytes
 SHA1 (abuse_data.tar.gz) = 2e7fad6b866fbbc8f34e3ac68cf2689c91596e48
 Size (abuse_data.tar.gz) = 1593160 bytes
 SHA1 (patch-aa) = 971c7d24af2388a0c6ab12636a209bd8f3282ae1
-SHA1 (patch-ab) = 09461b393ca4956e3f582a853465368e0a965861
+SHA1 (patch-ab) = a0128146a6a4129c7f5c4ae6193dd72a601660a9
 SHA1 (patch-ac) = b30031db9a89d7bf7c025674e549b08d637a89ff
 SHA1 (patch-ad) = 9003fe5ddd04be69c1d40b96ba995f453429ccb8
 SHA1 (patch-ae) = 3720352c2b73ed62e943d3c271a8e6c1f7f896d1
@@ -16,3 +16,5 @@ SHA1 (patch-ai) = 89dc9e69fd151623c4743338356b94ee3f09dee0
 SHA1 (patch-aj) = e23fb30a64303de78ba708ce1d35adbdd6bd01ee
 SHA1 (patch-ak) = 93b3a07045bd00e3f4e0515526513fd057a0b048
 SHA1 (patch-al) = 657bb4544d5cabd8df3c2af1943bc72a855566f3
+SHA1 (patch-am) = 6520c422349f3c0d2bad4d861dc391abda734ae2
+SHA1 (patch-an) = 35c22e102679e7fa6742762a4acc1a33c877be8d
diff --git a/games/abuse/patches/patch-ab b/games/abuse/patches/patch-ab
index 978c0e55bf1..5cfc994f190 100644
--- a/games/abuse/patches/patch-ab
+++ b/games/abuse/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/07/02 15:30:59 abs Exp $
+$NetBSD: patch-ab,v 1.3 2004/07/11 00:11:26 wiz Exp $
 
---- abuse/Makefile.in.orig	Wed Jul  9 08:55:21 1997
+--- abuse/Makefile.in.orig	1997-07-09 09:55:21.000000000 +0200
 +++ abuse/Makefile.in
-@@ -37,10 +37,10 @@
+@@ -37,10 +37,10 @@ AUTOCONF = @AUTOCONF@
  AUTOMAKE = @AUTOMAKE@
  AUTOHEADER = @AUTOHEADER@
  
@@ -17,7 +17,16 @@ $NetBSD: patch-ab,v 1.2 2001/07/02 15:30:59 abs Exp $
  transform = @program_transform_name@
  
  NORMAL_INSTALL = true
-@@ -239,11 +239,11 @@
+@@ -170,7 +170,7 @@ abuse_x11R6_LDFLAGS = 
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
+ CFLAGS = @CFLAGS@
+-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(CXX) $(CFLAGS) $(LDFLAGS) -o $@
+ DATA =  $(pkgdata_DATA)
+ 
+ DIST_COMMON =  Makefile.am Makefile.in abuse.in acinclude.m4 aclocal.m4 \
+@@ -239,11 +239,11 @@ maintainer-clean-pkglibPROGRAMS:
  
  install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
  	@$(NORMAL_INSTALL)
diff --git a/games/abuse/patches/patch-am b/games/abuse/patches/patch-am
new file mode 100644
index 00000000000..0becb6e48b6
--- /dev/null
+++ b/games/abuse/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2004/07/11 00:11:26 wiz Exp $
+
+--- abuse/src/gamma.c.orig	1996-04-14 22:14:21.000000000 +0200
++++ abuse/src/gamma.c
+@@ -136,12 +136,11 @@ void gamma_correct(palette *&pal, int fo
+   pal=new palette;
+   for (int i=0;i<256;i++)
+   {
+-    double r,g,b;
+-    uchar or,og,ob;
+-    old_pal->get(i,or,og,ob);
+-    pal->set(i,(int)(pow(or/255.0,gamma)*255),
+-	     (int)(pow(og/255.0,gamma)*255),
+-	     (int)(pow(ob/255.0,gamma)*255));
++    uchar oldr,oldg,oldb;
++    old_pal->get(i,oldr,oldg,oldb);
++    pal->set(i,(int)(pow(oldr/255.0,gamma)*255),
++	     (int)(pow(oldg/255.0,gamma)*255),
++	     (int)(pow(oldb/255.0,gamma)*255));
+   }
+ 
+   pal->load();
diff --git a/games/abuse/patches/patch-an b/games/abuse/patches/patch-an
new file mode 100644
index 00000000000..76a6c333c0b
--- /dev/null
+++ b/games/abuse/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2004/07/11 00:11:26 wiz Exp $
+
+--- abuse/src/ant.c.orig	1996-04-12 02:12:14.000000000 +0200
++++ abuse/src/ant.c
+@@ -234,7 +234,7 @@ void *ant_ai()
+ 	{ 
+ 	  o->set_state(stopped);
+ 	  o->set_aistate(ANT_RUNNING);
+-	  return ant_ai;
++	  return (void *)ant_ai;
+ 	}
+       }
+     } break;