Don't use malloc.h.

7 files changed, 40 insertions, 45 deletions

diff --git a/www/mMosaic/distinfo b/www/mMosaic/distinfo
index 4a932b479a6..ba233d81c81 100644
--- a/www/mMosaic/distinfo
+++ b/www/mMosaic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/10/06 19:29:17 schwarz Exp $
+$NetBSD: distinfo,v 1.10 2007/08/08 20:20:07 joerg Exp $
 
 SHA1 (mMosaic-3.7.2.tar.gz) = f26d4fd115a0fb7fc09947506b59e1a3790b6ac7
 RMD160 (mMosaic-3.7.2.tar.gz) = 9c7f2e2f00beaef474e53e25a91aeb604584dd06
@@ -10,11 +10,11 @@ SHA1 (patch-ad) = 890c6ee44f7bbe9fb5c4418f67c72b49df601e38
 SHA1 (patch-ae) = 41eb6cccefb77f720bba0885993c453bc25dc14e
 SHA1 (patch-af) = 0cba2c49579f6631d7e7d4f1068c00c22401d879
 SHA1 (patch-ag) = 51a1021eda3d92bc8bea7dacda510b24ee8ae7ef
-SHA1 (patch-ah) = 5c78179ccb2757024994817725eefd31e45f9d33
+SHA1 (patch-ah) = db079473aee7b0ad4b674128d5debeb6e777640b
 SHA1 (patch-ai) = 990bfbd0181fa93a53de7aaa9a98e5e954e72813
-SHA1 (patch-aj) = 5a8d74285976d234744287f5b9d08268f3e2e92d
-SHA1 (patch-ak) = 0a9c6bf97261645aed2741ca4f0d1e845132e0b7
-SHA1 (patch-al) = 5dba5394bc2e3c84504ff741d82c5e1677c9454c
-SHA1 (patch-am) = 9205dc1b78eb69fbff9866d2cd48e6e6f4f88e4b
+SHA1 (patch-aj) = 7f4c86ec65d664dbeacd36ca0f3ae37f31fdd9cf
+SHA1 (patch-ak) = 2c698bbee79beb0b907c24361b501a71d319c839
+SHA1 (patch-al) = 659a831be28c22835a4ba2fbb1f39b92d43bd5e7
+SHA1 (patch-am) = c309f09e1e2ccf70c1ae3d1cc46d329af2c97209
 SHA1 (patch-an) = 3e03f847457166662da82162144a417d316a6508
-SHA1 (patch-ao) = 46430e4821335d84568d04186c91e097fd2c4447
+SHA1 (patch-ao) = afd25d932c5306c8dbee92715478235a76c3c69d
diff --git a/www/mMosaic/patches/patch-ah b/www/mMosaic/patches/patch-ah
index 8912be14baf..11addf55ada 100644
--- a/www/mMosaic/patches/patch-ah
+++ b/www/mMosaic/patches/patch-ah
@@ -1,13 +1,16 @@
-$NetBSD: patch-ah,v 1.1 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: patch-ah,v 1.2 2007/08/08 20:20:07 joerg Exp $
 
---- libhtmlw/HTML-PSformat.c.orig	2006-10-04 21:53:34.000000000 +0200
-+++ libhtmlw/HTML-PSformat.c	2006-10-04 21:55:11.000000000 +0200
-@@ -67,7 +67,7 @@
+--- libhtmlw/HTML-PSformat.c.orig	2001-01-15 10:52:40.000000000 +0000
++++ libhtmlw/HTML-PSformat.c
+@@ -65,11 +65,6 @@
+ #include <ctype.h>
+ #include <math.h>
  #include <stdlib.h>
- #ifdef __bsdi__
- #include <sys/malloc.h>
+-#ifdef __bsdi__
+-#include <sys/malloc.h>
 -#else
-+#elif !defined(__APPLE__)
- #include <malloc.h>
- #endif
+-#include <malloc.h>
+-#endif
+ #include <time.h>
+ #include <sys/types.h>
  #include <time.h>
diff --git a/www/mMosaic/patches/patch-aj b/www/mMosaic/patches/patch-aj
index be237d32d2e..120105253c7 100644
--- a/www/mMosaic/patches/patch-aj
+++ b/www/mMosaic/patches/patch-aj
@@ -1,15 +1,12 @@
-$NetBSD: patch-aj,v 1.1 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: patch-aj,v 1.2 2007/08/08 20:20:07 joerg Exp $
 
 --- libhtmlw/HTML.c.orig	2006-10-04 21:51:24.000000000 +0200
 +++ libhtmlw/HTML.c	2006-10-04 21:52:40.000000000 +0200
-@@ -3,7 +3,9 @@
+@@ -3,7 +3,6 @@
  
  #include <stdio.h>
  #include <stdlib.h>
 -#include <malloc.h>
-+#ifndef __APPLE__
-+# include <malloc.h>
-+#endif
  #include <ctype.h>
  #include <assert.h>
  
diff --git a/www/mMosaic/patches/patch-ak b/www/mMosaic/patches/patch-ak
index efb81b70f9e..f1e0cf0c111 100644
--- a/www/mMosaic/patches/patch-ak
+++ b/www/mMosaic/patches/patch-ak
@@ -1,15 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: patch-ak,v 1.2 2007/08/08 20:20:07 joerg Exp $
 
 --- libhtmlw/HTMLcolors.c.orig	2006-10-04 21:49:35.000000000 +0200
 +++ libhtmlw/HTMLcolors.c	2006-10-04 21:50:54.000000000 +0200
-@@ -2,7 +2,9 @@
+@@ -2,7 +2,6 @@
  
  #include <stdio.h>
  #include <stdlib.h>
 -#include <malloc.h>
-+#ifndef __APPLE__
-+# include <malloc.h>
-+#endif
  #include <ctype.h>
  #include <math.h>
  
diff --git a/www/mMosaic/patches/patch-al b/www/mMosaic/patches/patch-al
index 2fadb6be65e..c80b8869662 100644
--- a/www/mMosaic/patches/patch-al
+++ b/www/mMosaic/patches/patch-al
@@ -1,15 +1,12 @@
-$NetBSD: patch-al,v 1.1 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: patch-al,v 1.2 2007/08/08 20:20:07 joerg Exp $
 
 --- libmc/mc_obj.c.orig	2006-10-04 21:57:03.000000000 +0200
 +++ libmc/mc_obj.c	2006-10-04 21:56:48.000000000 +0200
-@@ -5,7 +5,9 @@
+@@ -5,7 +5,6 @@
  #include <fcntl.h>
  #include <sys/uio.h>
  #include <unistd.h>
 -#include <malloc.h>
-+#ifndef __APPLE__
-+# include <malloc.h>
-+#endif
  #include <assert.h>
  
  #include <Xm/XmAll.h>
diff --git a/www/mMosaic/patches/patch-am b/www/mMosaic/patches/patch-am
index f546db8c03b..172a163912f 100644
--- a/www/mMosaic/patches/patch-am
+++ b/www/mMosaic/patches/patch-am
@@ -1,15 +1,12 @@
-$NetBSD: patch-am,v 1.1 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: patch-am,v 1.2 2007/08/08 20:20:07 joerg Exp $
 
 --- libnut/list.c.orig	2006-10-04 21:55:45.000000000 +0200
 +++ libnut/list.c	2006-10-04 21:56:05.000000000 +0200
-@@ -9,7 +9,9 @@
+@@ -9,7 +9,6 @@
  
  #include <stdio.h>				/* joe@athena, TBL 921019 */
  #include <stdlib.h>
 -#include <malloc.h>
-+#ifndef __APPLE__
-+# include <malloc.h>
-+#endif
  
  #define outofmem(file, func) \
   { fprintf(stderr, "%s %s: out of memory.\nProgram aborted.\n", file, func); \
diff --git a/www/mMosaic/patches/patch-ao b/www/mMosaic/patches/patch-ao
index fb509a6af9f..007f3d9b4eb 100644
--- a/www/mMosaic/patches/patch-ao
+++ b/www/mMosaic/patches/patch-ao
@@ -1,13 +1,17 @@
-$NetBSD: patch-ao,v 1.1 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: patch-ao,v 1.2 2007/08/08 20:20:07 joerg Exp $
 
---- src/proxy-dialogs.c.orig	2006-10-04 22:04:00.000000000 +0200
-+++ src/proxy-dialogs.c	2006-10-04 22:04:28.000000000 +0200
-@@ -19,7 +19,7 @@
+--- src/proxy-dialogs.c.orig	2000-12-08 16:11:08.000000000 +0000
++++ src/proxy-dialogs.c
+@@ -17,11 +17,7 @@
+ #include <Xm/Label.h>
+ #include <Xm/MessageB.h>
  
- #ifdef __bsdi__
- #include <sys/malloc.h>
+-#ifdef __bsdi__
+-#include <sys/malloc.h>
 -#else
-+#elif !defined(__APPLE__)
- #include <malloc.h>
- #endif
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
  #include <string.h>
+ #include <assert.h>
+