Don't use malloc.h.

3 files changed, 24 insertions, 12 deletions

diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo
index e4bb67ffc2a..253bc33e0d9 100644
--- a/x11/xcolorsel/distinfo
+++ b/x11/xcolorsel/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:21 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/07/31 09:57:04 joerg Exp $
 
 SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c
 RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c
 Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes
 SHA1 (patch-aa) = 6a0e20fd50b058e9302fe0c938ff5c7951e34566
-SHA1 (patch-ab) = f6dcb6895bb4013d2a433d164516dd41fc4cd47d
+SHA1 (patch-ab) = f5dd98f791ee88db88e8c28d1cbb09dcc595968d
 SHA1 (patch-ac) = 8bbdcba8de4d69450459512b1527c729a24760a1
 SHA1 (patch-ad) = 79eeb35b8103b42be889ac8cf8979a1fdbfbb252
 SHA1 (patch-ae) = c1503c6912f8f8c5e7bc59251f829d056022c745
 SHA1 (patch-af) = 3284e0fcf69c8a26bc0be74300ac5cd6bf9deb00
 SHA1 (patch-ag) = ff36d06ad032024e1488435f2c6ce6a768b2b7a0
 SHA1 (patch-ah) = 17ec04769fb7f95327a0bca4227e520d816f317f
-SHA1 (patch-ai) = ab727875d1faf26b8d0069a155e6b809044a5800
+SHA1 (patch-ai) = 8ca07a15ba5ab62a4b4cb5d5b6f7c1aab82fe7ce
diff --git a/x11/xcolorsel/patches/patch-ab b/x11/xcolorsel/patches/patch-ab
index ca4ad30a068..bc0dff6e3e2 100644
--- a/x11/xcolorsel/patches/patch-ab
+++ b/x11/xcolorsel/patches/patch-ab
@@ -1,8 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:18:21 agc Exp $
+$NetBSD: patch-ab,v 1.3 2007/07/31 09:57:04 joerg Exp $
 
---- RgbText.c.orig	Tue Dec 13 23:13:27 1994
-+++ RgbText.c	Wed Jul 15 10:01:15 1998
-@@ -83,7 +83,7 @@
+--- RgbText.c.orig	1994-12-13 22:13:27.000000000 +0000
++++ RgbText.c
+@@ -78,12 +78,11 @@
+ #include <stdlib.h>
+ /* And here we have a special gift for all SUN's outside >;-> */
+ #include <unistd.h>
+-#include <malloc.h>
+ #include <ctype.h>
  #include <errno.h>
  #include <X11/IntrinsicP.h>
  #include <X11/StringDefs.h>
@@ -11,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:18:21 agc Exp $
  #include "RgbTextP.h"
  #include "RgbSinkP.h"
  #include "RgbSrc.h"
-@@ -146,7 +146,7 @@
+@@ -146,7 +145,7 @@ static XtResource resources[] = {
  { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns),
  		XtRString, (XtPointer) "30" },
  { XtNfile, XtCFile, XtRString, sizeof(String), offset(file),
diff --git a/x11/xcolorsel/patches/patch-ai b/x11/xcolorsel/patches/patch-ai
index 000dec27854..b7ee8543e9c 100644
--- a/x11/xcolorsel/patches/patch-ai
+++ b/x11/xcolorsel/patches/patch-ai
@@ -1,8 +1,15 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 11:18:23 agc Exp $
+$NetBSD: patch-ai,v 1.3 2007/07/31 09:57:04 joerg Exp $
 
---- xcolorsel.c.orig	Sun Nov 13 23:16:59 1994
-+++ xcolorsel.c	Wed Jul 15 10:02:50 1998
-@@ -60,16 +60,16 @@
+--- xcolorsel.c.orig	1994-11-13 22:16:59.000000000 +0000
++++ xcolorsel.c
+@@ -53,23 +53,22 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <malloc.h>
+ #include <fcntl.h>
+ 
+ #include <X11/Xlib.h>
  #include <X11/Intrinsic.h>
  #include <X11/Shell.h>
  #include <X11/StringDefs.h>