malloc.h fixes for darwin, plus a handful of other small fixes for

problems found after fixing malloc problems

5 files changed, 27 insertions, 11 deletions

diff --git a/games/powwow/distinfo b/games/powwow/distinfo
index a2e84c19f13..2bb423417b0 100644
--- a/games/powwow/distinfo
+++ b/games/powwow/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2002/02/16 15:25:36 jdolecek Exp $
+$NetBSD: distinfo,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (powwow-1.2.4.tar.gz) = cf0477ca95144711ad351e9e1b9aa64df28727c8
 Size (powwow-1.2.4.tar.gz) = 169825 bytes
 SHA1 (patch-aa) = c8359ddb3770aa6520dd50638f4dc6b183943566
-SHA1 (patch-ab) = 135ab4ac3948380c95622d69d1b41cf6d11d75e8
+SHA1 (patch-ab) = 053dda5bb9ae22a85ea37fad9b43ffe90114cbec
 SHA1 (patch-ac) = ded89b8da6b31d7c3fb0c5b477b45d4a3d0ba53b
+SHA1 (patch-ad) = b6457008ca461255d2d3e60ed401b10bb0c4fdd5
diff --git a/games/powwow/patches/patch-ab b/games/powwow/patches/patch-ab
index 781846fabf7..c88c8810caf 100644
--- a/games/powwow/patches/patch-ab
+++ b/games/powwow/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/02/16 15:24:47 jdolecek Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 --- make_it.orig	Thu Jan 13 22:50:01 2000
 +++ make_it	Wed Feb 13 16:21:44 2002
@@ -7,8 +7,8 @@ $NetBSD: patch-ab,v 1.2 2002/02/16 15:24:47 jdolecek Exp $
                  CF='-O2 -fomit-frame-pointer -DUSE_RANDOM -DUSE_VT100 -DLINES=25'
                  LF='';;
 -
-+	NetBSD)
-+		echo 'Making Powwow for NetBSD'
++	NetBSD|Darwin)
++		echo "Making Powwow for $OS"
 +		CC='gcc'
 +		CF='-O2 -pipe -DUSE_SGTTY -DBSD_LIKE -DUSE_RANDOM -DUSE_REGEXP'
 +		if [ ! -z "$POWWOW_DIR" ]; then
diff --git a/games/powwow/patches/patch-ad b/games/powwow/patches/patch-ad
new file mode 100644
index 00000000000..eef210798dd
--- /dev/null
+++ b/games/powwow/patches/patch-ad
@@ -0,0 +1,6 @@
+$NetBSD: patch-ad,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- malloc.h.orig	Sun May 23 17:06:22 2004
++++ malloc.h
+@@ -0,0 +1 @@
++#include <stdlib.h>
diff --git a/games/xsoldier/distinfo b/games/xsoldier/distinfo
index a198ebfdc70..dadd252be4e 100644
--- a/games/xsoldier/distinfo
+++ b/games/xsoldier/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/09/14 03:48:06 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (xsoldier-0.96.tar.gz) = af16dbe1506cdd519a099ed58e26a5569400bea2
 Size (xsoldier-0.96.tar.gz) = 82413 bytes
 SHA1 (patch-aa) = 26eb8778cf418e092e321bed04aee302135d2cbc
 SHA1 (patch-ab) = 464407fb6e9e0af33b57d7dfc17a58acb1591f0a
 SHA1 (patch-ac) = 3551fd7507aa0ff8faeb9cdc8e2addc03dbc1274
-SHA1 (patch-ad) = 2d4b158bd7200b7228de4dc5e082b75e1d191adb
+SHA1 (patch-ad) = 5689b9f211b89aebbc65eeabaac35531ab3ab819
diff --git a/games/xsoldier/patches/patch-ad b/games/xsoldier/patches/patch-ad
index 3eaa9307f8c..b0a543bcd4e 100644
--- a/games/xsoldier/patches/patch-ad
+++ b/games/xsoldier/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 1999/12/23 01:44:03 wiz Exp $
---- manage.c.orig	Mon Feb 24 17:20:07 1997
-+++ manage.c	Wed Dec 22 02:32:19 1999
-@@ -306,7 +306,7 @@ PlayerData *NewPlayerData(void)
+$NetBSD: patch-ad,v 1.2 2004/05/23 23:28:29 danw Exp $
+
+--- manage.c.orig	Mon Feb 24 11:20:07 1997
++++ manage.c
+@@ -9,7 +9,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ 
+@@ -306,7 +305,7 @@ PlayerData *NewPlayerData(void)
      if ((pw=getpwuid(getuid())) == NULL)
          sprintf(name,"%d",getuid());
      else