Fix malloc.h usage.

13 files changed, 180 insertions, 14 deletions

diff --git a/math/xfractint/distinfo b/math/xfractint/distinfo
index 424d62eb3a9..581059c1638 100644
--- a/math/xfractint/distinfo
+++ b/math/xfractint/distinfo
@@ -1,19 +1,29 @@
-$NetBSD: distinfo,v 1.6 2007/06/30 14:19:52 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2007/07/28 01:42:50 joerg Exp $
 
 SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
 RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
 Size (xfrac310.zip) = 1074760 bytes
 SHA1 (patch-aa) = 43815e2af79a7b438992169fa5f0b9afe30d9b2e
 SHA1 (patch-ab) = 4bde32376bc1fac3a620e5be0900c4c640277f73
+SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847
+SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325
+SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5
 SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948
 SHA1 (patch-ag) = bf0ce10e27b29022890bc292daf72a09974a3aa0
 SHA1 (patch-ah) = f0599bb9f59921938784a866d27205abaef6a964
 SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310
 SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081
 SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a
-SHA1 (patch-al) = 1954f3243be20ceb03c0e9d6dba86c2fd101ce89
+SHA1 (patch-al) = 73cf3be0f7cf656f8235acc1f9a0625179a8a36d
 SHA1 (patch-am) = ae214e36ff64009d18724e80638f1fa55544d19e
-SHA1 (patch-an) = 5c4728b4d4ffa4ddd1ff904943af1484d75308f1
+SHA1 (patch-an) = d4effdac0afa8efc68cc3eae80e62bfe8c9281a1
 SHA1 (patch-ao) = c9fb472e44bbc4d939fe00725be9b06fd8cecb26
 SHA1 (patch-ap) = 87f6bc9db67554f600428e3369f83849b81d23fa
 SHA1 (patch-aq) = 8202b8a7adc3e3badee6de0b395d912910aa6710
+SHA1 (patch-ar) = 6052e96b0b008c75ca43f71dd26452195d9b96de
+SHA1 (patch-as) = e35ce93cb4ef9785eb144e7a8b4d26b2b323d8c9
+SHA1 (patch-at) = 01a906fe87d2bd56f2fc3dd2196445c6c2b3cc40
+SHA1 (patch-au) = c2e983ba469379e910c695a56e1ace9c2e5ce791
+SHA1 (patch-av) = 9ea1fc10c51a4cf5d374c5dacbbabd85f1977819
+SHA1 (patch-aw) = 5aa67b824d005c5ba7a0d821422e627573370b10
+SHA1 (patch-ax) = 33169e3d0b2577b6c4ad2eda77e72ca2160a24fd
diff --git a/math/xfractint/patches/patch-ac b/math/xfractint/patches/patch-ac
new file mode 100644
index 00000000000..65e8279caae
--- /dev/null
+++ b/math/xfractint/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2007/07/28 01:42:50 joerg Exp $
+
+--- fractalb.c.orig	2007-07-28 01:15:21.000000000 +0000
++++ fractalb.c
+@@ -8,11 +8,7 @@ fractal routines.
+ 
+ #include <limits.h>
+ #include <string.h>
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#elif !defined(__386BSD__)
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+   /* see Fractint.c for a description of the "include"  hierarchy */
+ #include "port.h"
+ #include "prototyp.h"
diff --git a/math/xfractint/patches/patch-ad b/math/xfractint/patches/patch-ad
new file mode 100644
index 00000000000..fafd7aacef0
--- /dev/null
+++ b/math/xfractint/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2007/07/28 01:42:50 joerg Exp $
+
+--- fractals.c.orig	2007-07-28 01:15:51.000000000 +0000
++++ fractals.c
+@@ -39,11 +39,7 @@ an appropriate setup, per_image, per_pix
+ 
+ #include <limits.h>
+ #include <string.h>
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#elif !defined(__386BSD__)
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+   /* see Fractint.c for a description of the "include"  hierarchy */
+ #include "port.h"
+ #include "prototyp.h"
diff --git a/math/xfractint/patches/patch-ae b/math/xfractint/patches/patch-ae
new file mode 100644
index 00000000000..35f45cdb056
--- /dev/null
+++ b/math/xfractint/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/07/28 01:42:50 joerg Exp $
+
+--- biginit.c.orig	2007-07-28 01:24:10.000000000 +0000
++++ biginit.c
+@@ -7,7 +7,7 @@ is in the allocations of memory for the 
+ */
+ 
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+   /* see Fractint.c for a description of the "include"  hierarchy */
+ #include "port.h"
+ #include "prototyp.h"
diff --git a/math/xfractint/patches/patch-al b/math/xfractint/patches/patch-al
index af27b76a1ec..b620f284fbf 100644
--- a/math/xfractint/patches/patch-al
+++ b/math/xfractint/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2006/06/14 09:07:45 rillig Exp $
+$NetBSD: patch-al,v 1.2 2007/07/28 01:42:50 joerg Exp $
 
---- memory.c.orig	2006-06-15 07:57:40.000000000 +0200
-+++ memory.c	2006-06-15 08:35:53.000000000 +0200
+--- memory.c.orig	1999-09-06 15:38:10.000000000 +0000
++++ memory.c
 @@ -1,11 +1,14 @@
 +#if !defined(USE_VARARGS)
 +#include <stdarg.h>
@@ -11,7 +11,8 @@ $NetBSD: patch-al,v 1.1 2006/06/14 09:07:45 rillig Exp $
 +
  #include <string.h>
  #include <limits.h>
- #include <malloc.h>
+-#include <malloc.h>
++#include <stdlib.h>
  #ifndef XFRACT
  #include <io.h>
 -#include <stdarg.h>
diff --git a/math/xfractint/patches/patch-an b/math/xfractint/patches/patch-an
index ecfff8036d5..fb367cb32b4 100644
--- a/math/xfractint/patches/patch-an
+++ b/math/xfractint/patches/patch-an
@@ -1,12 +1,13 @@
-$NetBSD: patch-an,v 1.1 2006/06/14 09:07:45 rillig Exp $
+$NetBSD: patch-an,v 1.2 2007/07/28 01:42:50 joerg Exp $
 
-This file does not use variable arguments at all.
-
---- miscres.c.orig	2006-06-15 07:57:40.000000000 +0200
-+++ miscres.c	2006-06-15 08:37:41.000000000 +0200
-@@ -7,10 +7,7 @@
+--- miscres.c.orig	1999-09-06 15:38:10.000000000 +0000
++++ miscres.c
+@@ -5,12 +5,9 @@
+ #include <string.h>
+ #include <ctype.h>
  #include <time.h>
- #include <malloc.h>
+-#include <malloc.h>
++#include <stdlib.h>
  #ifndef XFRACT
 -#include <stdarg.h>
  #include <io.h>
diff --git a/math/xfractint/patches/patch-ar b/math/xfractint/patches/patch-ar
new file mode 100644
index 00000000000..c120efe524b
--- /dev/null
+++ b/math/xfractint/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1 2007/07/28 01:42:50 joerg Exp $
+
+--- frasetup.c.orig	2007-07-28 01:16:46.000000000 +0000
++++ frasetup.c
+@@ -1,10 +1,6 @@
+ #include <limits.h>
+ #include <string.h>
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#elif !defined(__386BSD__)
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+   /* see Fractint.c for a description of the "include"  hierarchy */
+ #include "port.h"
+ #include "prototyp.h"
diff --git a/math/xfractint/patches/patch-as b/math/xfractint/patches/patch-as
new file mode 100644
index 00000000000..3540c6709cb
--- /dev/null
+++ b/math/xfractint/patches/patch-as
@@ -0,0 +1,16 @@
+$NetBSD: patch-as,v 1.1 2007/07/28 01:42:51 joerg Exp $
+
+--- lsys.c.orig	2007-07-28 01:17:27.000000000 +0000
++++ lsys.c
+@@ -1,10 +1,6 @@
+ 
+ #include <string.h>
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#else
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+ 
+   /* see Fractint.c for a description of the "include"  hierarchy */
+ #include "port.h"
diff --git a/math/xfractint/patches/patch-at b/math/xfractint/patches/patch-at
new file mode 100644
index 00000000000..7e86f8ba893
--- /dev/null
+++ b/math/xfractint/patches/patch-at
@@ -0,0 +1,15 @@
+$NetBSD: patch-at,v 1.1 2007/07/28 01:42:51 joerg Exp $
+
+--- lsysf.c.orig	2007-07-28 01:18:21.000000000 +0000
++++ lsysf.c
+@@ -1,9 +1,5 @@
+ #include <string.h>
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#else
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+ 
+   /* see Fractint.c for a description of the "include"  hierarchy */
+ #include "port.h"
diff --git a/math/xfractint/patches/patch-au b/math/xfractint/patches/patch-au
new file mode 100644
index 00000000000..cc797a9e623
--- /dev/null
+++ b/math/xfractint/patches/patch-au
@@ -0,0 +1,17 @@
+$NetBSD: patch-au,v 1.1 2007/07/28 01:42:51 joerg Exp $
+
+--- prompts1.c.orig	2007-07-28 01:20:46.000000000 +0000
++++ prompts1.c
+@@ -18,11 +18,7 @@
+ #endif
+ #endif
+ #endif
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#elif !defined(__386BSD__)
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+ 
+ #ifdef __hpux
+ #include <sys/param.h>
diff --git a/math/xfractint/patches/patch-av b/math/xfractint/patches/patch-av
new file mode 100644
index 00000000000..b47a43c67f0
--- /dev/null
+++ b/math/xfractint/patches/patch-av
@@ -0,0 +1,17 @@
+$NetBSD: patch-av,v 1.1 2007/07/28 01:42:51 joerg Exp $
+
+--- prompts2.c.orig	2007-07-28 01:21:22.000000000 +0000
++++ prompts2.c
+@@ -18,11 +18,7 @@
+ #endif
+ #endif
+ #endif
+-#ifdef __TURBOC__
+-#include <alloc.h>
+-#elif !defined(__386BSD__)
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+ 
+ #ifdef __hpux
+ #include <sys/param.h>
diff --git a/math/xfractint/patches/patch-aw b/math/xfractint/patches/patch-aw
new file mode 100644
index 00000000000..fa3da6bd6ea
--- /dev/null
+++ b/math/xfractint/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2007/07/28 01:42:51 joerg Exp $
+
+--- soi.c.orig	2007-07-28 01:21:51.000000000 +0000
++++ soi.c
+@@ -13,7 +13,7 @@
+  */
+ #include <time.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "port.h"
+ #include "prototyp.h"
+ 
diff --git a/math/xfractint/patches/patch-ax b/math/xfractint/patches/patch-ax
new file mode 100644
index 00000000000..99d09c150ba
--- /dev/null
+++ b/math/xfractint/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2007/07/28 01:42:51 joerg Exp $
+
+--- soi1.c.orig	2007-07-28 01:22:14.000000000 +0000
++++ soi1.c
+@@ -13,7 +13,7 @@
+  */
+ #include <time.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "port.h"
+ #include "prototyp.h"
+