Make this build on FreeBSD (stop fussing about with malloc.h).

12 files changed, 216 insertions, 5 deletions

diff --git a/devel/mkcmd/distinfo b/devel/mkcmd/distinfo
index 023fe3142b9..0c75072fd4b 100644
--- a/devel/mkcmd/distinfo
+++ b/devel/mkcmd/distinfo
@@ -1,6 +1,15 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/11/10 00:46:04 epg Exp $
+$NetBSD: distinfo,v 1.2 2004/11/10 16:43:50 epg Exp $
 
 SHA1 (mkcmd-8.14.tgz) = 33342afc845db84a040f116202b880d37b9f626f
 Size (mkcmd-8.14.tgz) = 295120 bytes
-SHA1 (patch-aa) = f9d297a7d3cf807163a53ba9d69d81e9dd83cd72
-SHA1 (patch-ab) = 72c1a8800491c967f402a1fa9038bab7a5cd3b11
+SHA1 (patch-aa) = f453a4abaaa4a0e4527e507249eb427f1c9ac22c
+SHA1 (patch-ab) = ff30b9b4818fcd105d433e0b2c943d27d698f18c
+SHA1 (patch-ac) = 6ee5e497e09157fbcf4d158966af8ee86e768bcb
+SHA1 (patch-ad) = cf3acdaf22930d577f13d28f2627515d78b8075b
+SHA1 (patch-ae) = 8610cbecca38033386bb2427647f18c80120591e
+SHA1 (patch-af) = 03f13f98dc52c467c8ae60dddcbcf7d9818adf33
+SHA1 (patch-ag) = 99e4ede7f0784bd343e181754de0608d65023b9f
+SHA1 (patch-ah) = 1738f8042db33232455d8cea0b033883312800df
+SHA1 (patch-ai) = 0ce87f6636e545c5a27c3a165de32b7b39bbd664
+SHA1 (patch-aj) = 1c0a9f177a8735f02cdec9f08f7311b03152c9f3
+SHA1 (patch-ak) = ed44815d12931845ab675ded6b32bda159d57af6
diff --git a/devel/mkcmd/patches/patch-aa b/devel/mkcmd/patches/patch-aa
index 030dd0c761f..6433835f4c0 100644
--- a/devel/mkcmd/patches/patch-aa
+++ b/devel/mkcmd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/10 00:46:04 epg Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/10 16:43:50 epg Exp $
 
 --- bin/mkcmd/main.c.orig	2000-07-30 17:56:23.000000000 -0400
 +++ bin/mkcmd/main.c
@@ -13,3 +13,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/10 00:46:04 epg Exp $
  
  
  #if USE_STRINGS
+@@ -47,14 +45,6 @@ extern int errno;
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ /* from std_version.m */
+ /* from std_help.m */
+ /* from scan.m */
diff --git a/devel/mkcmd/patches/patch-ab b/devel/mkcmd/patches/patch-ab
index ce5ef8d1774..f08324120e8 100644
--- a/devel/mkcmd/patches/patch-ab
+++ b/devel/mkcmd/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/11/10 00:46:04 epg Exp $
+$NetBSD: patch-ab,v 1.2 2004/11/10 16:43:50 epg Exp $
 
 --- bin/mkcmd/parser.c.orig	2000-07-30 17:56:23.000000000 -0400
 +++ bin/mkcmd/parser.c
@@ -10,3 +10,18 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/10 00:46:04 epg Exp $
  
  #include "machine.h"
  #include "type.h"
+@@ -26,14 +27,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ #if TILDEDIR
+ #include <pwd.h>
+ #endif
diff --git a/devel/mkcmd/patches/patch-ac b/devel/mkcmd/patches/patch-ac
new file mode 100644
index 00000000000..3e1b5021a4e
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/emit.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/emit.c
+@@ -27,14 +27,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ 
+ ATTR
+ 	wEmitMask = EMIT_AUTO_IND;	/* implicit emit options	*/
diff --git a/devel/mkcmd/patches/patch-ad b/devel/mkcmd/patches/patch-ad
new file mode 100644
index 00000000000..478cfea0cba
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/check.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/check.c
+@@ -24,14 +24,6 @@ extern int compwidth(/* pOR */);
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ /* find a buffer [declared as <type> variable "ident" in mkcmd]		(ksb)
+  * in the list of buffer (usually pORDecl)
+  */
diff --git a/devel/mkcmd/patches/patch-ae b/devel/mkcmd/patches/patch-ae
new file mode 100644
index 00000000000..dce828e7a30
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/list.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/list.c
+@@ -16,15 +16,6 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-extern void free();
+-#endif
+-#endif
+-
+ #if USE_STRINGS
+ #include <strings.h>
+ #else
diff --git a/devel/mkcmd/patches/patch-af b/devel/mkcmd/patches/patch-af
new file mode 100644
index 00000000000..4f56f60f404
--- /dev/null
+++ b/devel/mkcmd/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/mkcmd.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/mkcmd.c
+@@ -26,14 +26,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ LIST
+ 	LIComm,			/* header comments			*/
+ 	aLIExits[11],		/* user hooks jusr before exit		*/
diff --git a/devel/mkcmd/patches/patch-ag b/devel/mkcmd/patches/patch-ag
new file mode 100644
index 00000000000..3cc87a4870c
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/mkman.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/mkman.c
+@@ -28,14 +28,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ 
+ /* this code should output a man page template				(ksb)
+  * find out the ``common'' name for this page, default ``prog''
diff --git a/devel/mkcmd/patches/patch-ah b/devel/mkcmd/patches/patch-ah
new file mode 100644
index 00000000000..6841177b885
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/mkusage.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/mkusage.c
+@@ -26,14 +26,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ #if ADD_MULTI_BITS
+ int fMultiBases = 0;		/* do we need clues on mkuvec's strings	*/
+ #endif
diff --git a/devel/mkcmd/patches/patch-ai b/devel/mkcmd/patches/patch-ai
new file mode 100644
index 00000000000..8d4cdc30623
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/option.c.orig	2000-07-30 17:56:23.000000000 -0400
++++ bin/mkcmd/option.c
+@@ -26,14 +26,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ OPTION
+ 	*pORActn = nilOR,	/* special actions in program		*/
+ 	*pORDecl = nilOR,	/* globals we are to declare		*/
diff --git a/devel/mkcmd/patches/patch-aj b/devel/mkcmd/patches/patch-aj
new file mode 100644
index 00000000000..5cc27a767a2
--- /dev/null
+++ b/devel/mkcmd/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/stracc.c.orig	2000-07-30 17:56:24.000000000 -0400
++++ bin/mkcmd/stracc.c
+@@ -12,14 +12,6 @@
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ static char *pchBuf = (char *)0;
+ static unsigned long int lBufLen = 0, lCurBuf = 0;
+ 
diff --git a/devel/mkcmd/patches/patch-ak b/devel/mkcmd/patches/patch-ak
new file mode 100644
index 00000000000..d4bfce9b69f
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ak
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2004/11/10 16:43:50 epg Exp $
+
+--- bin/mkcmd/type.c.orig	2000-07-30 17:56:24.000000000 -0400
++++ bin/mkcmd/type.c
+@@ -23,14 +23,6 @@ extern char *progname;
+ #include <string.h>
+ #endif
+ 
+-#if USE_MALLOC_H
+-#include <malloc.h>
+-#else
+-#if NEED_MALLOC_EXTERN
+-extern char *malloc(), *calloc(), *realloc();
+-#endif
+-#endif
+-
+ 
+ char
+ 	sbEmpty[] = "",