Don't use malloc.h.

5 files changed, 46 insertions, 9 deletions

diff --git a/lang/joos/distinfo b/lang/joos/distinfo
index 243643311cc..df37dfb27c8 100644
--- a/lang/joos/distinfo
+++ b/lang/joos/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/08/08 19:48:13 joerg Exp $
 
 SHA1 (joos-0.2.tar.bz2) = ffc3a53908353f6ae4f1150f7e03086bfff787c7
 RMD160 (joos-0.2.tar.bz2) = 044f876a97ba11363a24e2cbb5860e13796bd10f
@@ -6,5 +6,6 @@ Size (joos-0.2.tar.bz2) = 285084 bytes
 SHA1 (patch-aa) = 20598bcc16b3c31246f618720909281e679693de
 SHA1 (patch-ab) = 80959321809481f229bc61c2f8230aa9e4e980b0
 SHA1 (patch-ac) = 298f43d4e50bab0aa4cc8b01b514b69d0125d98b
-SHA1 (patch-ad) = 4bc69ab337ee2591fd5bca4ee5113d99ecebf499
+SHA1 (patch-ad) = 00c5c71e1f18e2f6a104912147c7ac8239d0476f
 SHA1 (patch-ae) = 63ca5adc266bfa8823bece1d6b68647894275ef3
+SHA1 (patch-af) = b2880115c5b9b8ce4b474ad3a3235040c4b57b05
diff --git a/lang/joos/patches/patch-ad b/lang/joos/patches/patch-ad
index 8d31181184b..5f689008cfb 100644
--- a/lang/joos/patches/patch-ad
+++ b/lang/joos/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.1 2002/05/08 15:42:03 jschauma Exp $
+$NetBSD: patch-ad,v 1.2 2007/08/08 19:48:13 joerg Exp $
 
---- A+/joos.y.orig	Thu Aug  5 12:42:37 1999
-+++ A+/joos.y	Wed May  8 11:24:41 2002
-@@ -347,7 +347,7 @@
+--- A+/joos.y.orig	1999-08-05 16:42:37.000000000 +0000
++++ A+/joos.y
+@@ -14,7 +14,7 @@
+  
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "tree.h"
+ 
+ extern CLASSFILE *theclassfile;
+@@ -347,7 +347,7 @@ forstatement : tFOR '(' statementexpress
                                   makeSTATEMENTexp($7)
                               )
                           )
@@ -11,7 +20,7 @@ $NetBSD: patch-ad,v 1.1 2002/05/08 15:42:03 jschauma Exp $
                 }
  ;
  
-@@ -361,7 +361,7 @@
+@@ -361,7 +361,7 @@ forstatementnoshortif : tFOR '(' stateme
                                   makeSTATEMENTexp($7)
                               )
                           )
@@ -20,7 +29,7 @@ $NetBSD: patch-ad,v 1.1 2002/05/08 15:42:03 jschauma Exp $
                 }
  ;
   
-@@ -469,6 +469,7 @@
+@@ -469,6 +469,7 @@ unaryexpressionnotminus : 
                    {$$ = makeEXPnot($2);}
                  | castexpression
                    {$$ = $1;}
diff --git a/print/lgrind/distinfo b/print/lgrind/distinfo
index ec37159b24a..b6136983670 100644
--- a/print/lgrind/distinfo
+++ b/print/lgrind/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/04/07 03:01:36 minskim Exp $
+$NetBSD: distinfo,v 1.7 2007/08/08 19:50:55 joerg Exp $
 
 SHA1 (lgrind.tar.bz2) = 152d92ccdcb9bc7342f6aec6c4c009d124f7e812
 RMD160 (lgrind.tar.bz2) = c32b0002d95e3dec58d03ba39e58dd798058e0eb
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = fe4cfcebbfe2a4fb6f202cbbd9b3bc4c798c343d
 SHA1 (patch-ab) = a843a7bfda99fb073f809b42339c409a13864f70
 SHA1 (patch-ac) = 61ded0486a4f6c135fb26a4cf185a197f9ce1db3
 SHA1 (patch-ad) = a475dd078de2d92ffdd23592fd16ae489cec5dee
+SHA1 (patch-ae) = 1686f0a57a4e62a07907e5fa4e8a0339f5cdd36c
+SHA1 (patch-af) = 2c56072174c30d8d7c651785e0338a1b5b2ff879
diff --git a/print/lgrind/patches/patch-ae b/print/lgrind/patches/patch-ae
new file mode 100644
index 00000000000..ecb3ded2743
--- /dev/null
+++ b/print/lgrind/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2007/08/08 19:50:55 joerg Exp $
+
+--- lgrind.c.orig	2007-08-08 19:31:25.000000000 +0000
++++ lgrind.c
+@@ -70,7 +70,6 @@ static char Version[] =
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
+-#include <malloc.h>
+ /* One of the following two (depending on your system) */
+ #include <unistd.h>
+ /* #include <io.h> */
diff --git a/print/lgrind/patches/patch-af b/print/lgrind/patches/patch-af
new file mode 100644
index 00000000000..c901493ec9f
--- /dev/null
+++ b/print/lgrind/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2007/08/08 19:50:55 joerg Exp $
+
+--- regexp.c.orig	2007-08-08 19:31:27.000000000 +0000
++++ regexp.c
+@@ -23,7 +23,7 @@ static char Version[] =
+ 
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include "regexp.h"