Don't use malloc.h.

8 files changed, 86 insertions, 12 deletions

diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index 0a429f141be..3140e7dbc87 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2005/12/19 19:45:02 joerg Exp $
+$NetBSD: distinfo,v 1.22 2007/08/08 20:30:27 joerg Exp $
 
 SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
 RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
@@ -10,4 +10,4 @@ SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
 SHA1 (patch-af) = 4c63205d51ad264aec0406810206e7a1913b7c54
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
 SHA1 (patch-ah) = 238bd9d0284d7b43aa92ab558f9a6dd723722f05
-SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821
+SHA1 (patch-ai) = f12acf028c90659bde26bdb5d20692a6daf810c7
diff --git a/games/nethack-qt/patches/patch-ai b/games/nethack-qt/patches/patch-ai
index fce697fd688..45c7a59cddc 100644
--- a/games/nethack-qt/patches/patch-ai
+++ b/games/nethack-qt/patches/patch-ai
@@ -1,8 +1,21 @@
-$NetBSD: patch-ai,v 1.2 2003/03/01 21:12:51 pooka Exp $
+$NetBSD: patch-ai,v 1.3 2007/08/08 20:30:27 joerg Exp $
 
---- win/Qt/qt_win.cpp.orig	2003-02-23 16:43:45.000000000 +0200
-+++ win/Qt/qt_win.cpp	2003-03-01 22:37:46.000000000 +0200
-@@ -4278,7 +4278,7 @@
+--- win/Qt/qt_win.cpp.orig	2003-12-07 23:39:13.000000000 +0000
++++ win/Qt/qt_win.cpp
+@@ -102,11 +102,7 @@ extern "C" {
+ #include "qt_xpms.h"
+ 
+ #include <dirent.h>
+-#ifdef Q_WS_MACX
+-#  include <sys/malloc.h>
+-#else
+-#  include <malloc.h>
+-#endif
++#include <stdlib.h>
+ 
+ #ifdef _WS_X11_
+ // For userid control
+@@ -4278,7 +4274,7 @@ void NetHackQtYnDialog::done(int i)
  
  NetHackQtGlyphs::NetHackQtGlyphs()
  {
diff --git a/games/nighthawk/distinfo b/games/nighthawk/distinfo
index b9d214a8588..b14c5548dcd 100644
--- a/games/nighthawk/distinfo
+++ b/games/nighthawk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/01/13 00:13:54 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/08/08 20:40:20 joerg Exp $
 
 SHA1 (nighthawk-2.1.tgz) = 117cd7d2c496a0d9e44b1b6d02523ad1cb0de1bf
 RMD160 (nighthawk-2.1.tgz) = 3973ff63c4525de65ae4dd3803d355c102968997
@@ -11,6 +11,10 @@ SHA1 (patch-ab) = 1e0b921ad6920f74341b78e7d9804313e0269663
 SHA1 (patch-ac) = 910c7a1d20490b2eb52fcab2ed022eca1b41e38e
 SHA1 (patch-ad) = 2cb1ad86cd8fbfcfbc0ece05ce3d65508a57fe68
 SHA1 (patch-ae) = 1699979e5013e86dc158722faef525b46ce30076
+SHA1 (patch-af) = 69b3905960d2da2a2023187e3bab258acc2461a3
+SHA1 (patch-ag) = be5419e9cbd1f2af3a41f2dc37db792e299f8625
+SHA1 (patch-ah) = 5734f92db807cb44da1494bb51eab9fd18d9fec8
+SHA1 (patch-ai) = 72d47ae02b1e5f1a5f04094c03d00471370a3092
 SHA1 (patch-ba) = 3bf82814d23305a686317ea36ff03698d65157ee
-SHA1 (patch-bb) = f0f4a540e41a9f961b03f9960914436d400ebaaf
+SHA1 (patch-bb) = 783951fb4532aa66466ef8e820e3964fd6326aa6
 SHA1 (patch-bc) = 8bbcd9bd7bcde579a9b7ddb26ef60ffc05362b7e
diff --git a/games/nighthawk/patches/patch-af b/games/nighthawk/patches/patch-af
new file mode 100644
index 00000000000..1a14dbd389d
--- /dev/null
+++ b/games/nighthawk/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2007/08/08 20:40:20 joerg Exp $
+
+--- src/floor.cc.orig	2007-08-08 20:13:45.000000000 +0000
++++ src/floor.cc
+@@ -16,7 +16,7 @@
+ extern "C" {
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
diff --git a/games/nighthawk/patches/patch-ag b/games/nighthawk/patches/patch-ag
new file mode 100644
index 00000000000..f6bdbbe5094
--- /dev/null
+++ b/games/nighthawk/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/08/08 20:40:20 joerg Exp $
+
+--- src/ship.cc.orig	2007-08-08 20:14:23.000000000 +0000
++++ src/ship.cc
+@@ -17,7 +17,7 @@ extern "C" {
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
diff --git a/games/nighthawk/patches/patch-ah b/games/nighthawk/patches/patch-ah
new file mode 100644
index 00000000000..89028e21c46
--- /dev/null
+++ b/games/nighthawk/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2007/08/08 20:40:20 joerg Exp $
+
+--- src_sound/funkload.c.orig	2007-08-08 20:17:33.000000000 +0000
++++ src_sound/funkload.c
+@@ -15,7 +15,7 @@
+ ***************************************************************************/
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "funktracker_defs.h"
+ #include "dsp_mixxer.h"
+ #include "funktracker.h"
diff --git a/games/nighthawk/patches/patch-ai b/games/nighthawk/patches/patch-ai
new file mode 100644
index 00000000000..543b68b5452
--- /dev/null
+++ b/games/nighthawk/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/08/08 20:40:20 joerg Exp $
+
+--- src_sound/nighthawk_sound.c.orig	2007-08-08 20:18:55.000000000 +0000
++++ src_sound/nighthawk_sound.c
+@@ -15,7 +15,7 @@
+ ****************************************************************************
+ ***************************************************************************/
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
diff --git a/games/nighthawk/patches/patch-bb b/games/nighthawk/patches/patch-bb
index b8e4ac7df04..c79e0ac2d57 100644
--- a/games/nighthawk/patches/patch-bb
+++ b/games/nighthawk/patches/patch-bb
@@ -1,13 +1,18 @@
-$NetBSD: patch-bb,v 1.4 2006/01/13 00:13:54 joerg Exp $
+$NetBSD: patch-bb,v 1.5 2007/08/08 20:40:20 joerg Exp $
 
---- src_sound/dsp_mixxer.c.orig	1998-06-22 05:41:31.000000000 -0500
+--- src_sound/dsp_mixxer.c.orig	1998-06-22 10:41:31.000000000 +0000
 +++ src_sound/dsp_mixxer.c
-@@ -19,10 +19,10 @@
+@@ -15,14 +15,14 @@
+ ***************************************************************************/
+ #include <stdio.h>
+ #include <math.h>
+-#include <malloc.h>
++#include <stdlib.h>
  #include <unistd.h>
  #include <fcntl.h>
  #include <sys/ioctl.h>
 -#ifdef Linux
-+#if defined(Linux) || defined( FreeBSD) || defined(__DragonFly__)
++#if defined(Linux) || defined(__FreeBSD__) || defined(__DragonFly__)
   #include <sys/soundcard.h>
 -#elif FreeBSD
 - #include <machine/soundcard.h>