malloc.h fixes for darwin, plus a handful of other small fixes for

problems found after fixing malloc problems

5 files changed, 32 insertions, 12 deletions

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index af899e47427..51d4ce2caa0 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/20 12:21:01 agc Exp $
+# $NetBSD: Makefile,v 1.22 2004/05/23 23:28:29 danw Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
 #
 
@@ -25,6 +25,7 @@ EXTRACT_ONLY=	${DISTNAME}.shr
 EXTRACT_CMD=	${EXTRACT_CMD.shar}
 
 USE_X11BASE=	yes
+USE_BUILDLINK3=	yes
 
 DIST_SUBDIR=    astrolog
 ALL_TARGET=     astrolog
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index daf5de8111c..4062649864c 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/20 23:27:38 jtb Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (astrolog/ast54unx.shr) = 8511f7cdee0a559779f30d838e55e44585775840
 Size (astrolog/ast54unx.shr) = 1465432 bytes
@@ -10,3 +10,4 @@ SHA1 (astrolog/CPJV_24) = e9ecc057a1aa7a8423fad31b9e6c9cfdf4316b63
 Size (astrolog/CPJV_24) = 60000 bytes
 SHA1 (patch-aa) = aa3c6f09b6ba7d1c74465762567cac9c9d7240ce
 SHA1 (patch-ab) = 05cdba66d45c28407e7b2b4a634943218db9ca7c
+SHA1 (patch-ac) = 54020e3223c23a40bf8a4cb2fad0d018448683bd
diff --git a/misc/astrolog/patches/patch-ac b/misc/astrolog/patches/patch-ac
new file mode 100644
index 00000000000..aabe01eb704
--- /dev/null
+++ b/misc/astrolog/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- placalc.h.orig	Wed Dec 23 23:29:09 1998
++++ placalc.h
+@@ -121,11 +121,6 @@ auto-dectection of MSDOS (TURBO_C or MS_
+ #define UCHAR unsigned char
+ 
+ #if HPUNIX
+-#ifndef MAC
+-#ifndef NeXT
+-#include <malloc.h>
+-#endif
+-#endif /* MAC */
+ typedef double  REAL8;  /* real with at least 64 bit precision */
+ typedef float   REAL4;  /* real with at least 32 bit precision */
+ typedef long    INT4;   /* signed integer with at least 32 bit precision */
diff --git a/misc/colortail/distinfo b/misc/colortail/distinfo
index 4e91f4bd8e9..d7e47b706f4 100644
--- a/misc/colortail/distinfo
+++ b/misc/colortail/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2004/01/11 21:22:41 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (colortail-0.3.0.tar.gz) = 5c55a9b0550868129d8ede133f6b34fa5356c5ce
 Size (colortail-0.3.0.tar.gz) = 54329 bytes
 SHA1 (patch-aa) = 4db6ef6d231c98914c572f320700f67ae09101a7
 SHA1 (patch-ab) = 055d1a11e6a555b569d11fe2c870332ae93b13e6
 SHA1 (patch-ac) = fed43fd42497b951dd237f86ef08337f76fef494
-SHA1 (patch-ad) = d5d7c7c7b13856d097eaf21113a1a15cef8640f8
+SHA1 (patch-ad) = ed3a9bdcd7f20a231823aad0010dd929103e9fb1
 SHA1 (patch-ae) = 09aaf9aebad66b0b220387f0b230fb615f8bef08
 SHA1 (patch-af) = 00fc20aa9508db7c3894a8cab0d5f75ed6a4a967
 SHA1 (patch-ag) = 29222baff0953c1c78255092426926061ccd92c5
diff --git a/misc/colortail/patches/patch-ad b/misc/colortail/patches/patch-ad
index 42935343fab..68332718003 100644
--- a/misc/colortail/patches/patch-ad
+++ b/misc/colortail/patches/patch-ad
@@ -1,15 +1,17 @@
-$NetBSD: patch-ad,v 1.1 2004/01/11 21:22:41 jschauma Exp $
+$NetBSD: patch-ad,v 1.2 2004/05/23 23:28:29 danw Exp $
 
---- CfgFileParser.cc.orig	2004-01-11 16:15:05.000000000 -0500
-+++ CfgFileParser.cc	2004-01-11 16:15:08.000000000 -0500
-@@ -25,6 +25,10 @@
+--- CfgFileParser.cc.orig	Tue Aug  3 15:40:44 1999
++++ CfgFileParser.cc
+@@ -23,7 +23,11 @@
+ #include <fstream.h>
+ #include <assert.h>
  #include <string.h>
- #include <malloc.h>
- 
+-#include <malloc.h>
++#include <stdlib.h>
++
 +#include <iostream>
 +
 +using namespace std;
-+
  
- // ## class SearchData ##
  
+ // ## class SearchData ##