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

problems found after fixing malloc problems

37 files changed, 235 insertions, 71 deletions

diff --git a/benchmarks/lmbench/distinfo b/benchmarks/lmbench/distinfo
index f8c86f0fcb6..6e5d6e78544 100644
--- a/benchmarks/lmbench/distinfo
+++ b/benchmarks/lmbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/04/05 11:11:44 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (lmbench-2alpha11.tgz) = 7480815b8f8d4000647db59eb6160e9dbac06490
 Size (lmbench-2alpha11.tgz) = 464956 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 0f16f206d56cfdfdd870d21afcef46e3b8e2c53a
 SHA1 (patch-ab) = b25c659fd808535738591892c552b062bb7e7e8f
 SHA1 (patch-ac) = 2aa73fbf3119db95ca483f676bd3f3c2fd25c8f6
 SHA1 (patch-ad) = a196e6a4734de9a0d698d38f1691b1146bda45a2
-SHA1 (patch-ae) = 8784d2911529395e5a13c5dec5a89df5465145e9
+SHA1 (patch-ae) = 9a1475b04bb51f2d36edf8f6cf572235a31c55e0
 SHA1 (patch-af) = 9390d4b6fa950beb0020b44ad520dd22a8a2178e
 SHA1 (patch-ag) = cf5d1f3cf24b9fb6ab4a1a84ad8a44fda858add4
 SHA1 (patch-ah) = ec623c0c22c6f3314aacf965bdd643debca578e0
diff --git a/benchmarks/lmbench/patches/patch-ae b/benchmarks/lmbench/patches/patch-ae
index b4f91ceb59e..33ead658987 100644
--- a/benchmarks/lmbench/patches/patch-ae
+++ b/benchmarks/lmbench/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1 1998/08/30 17:46:26 garbled Exp $
---- src/lmdd.c.orig	Sat Aug 29 13:06:05 1998
-+++ src/lmdd.c	Sat Aug 29 13:17:06 1998
-@@ -797,7 +797,9 @@
+$NetBSD: patch-ae,v 1.2 2004/05/23 23:28:29 danw Exp $
+
+--- src/lmdd.c.orig	Fri Jul 31 15:55:18 1998
++++ src/lmdd.c
+@@ -40,7 +40,6 @@ char	*id = "$Id: lmdd.c,v 1.23 1997/12/0
+ #include	<stdlib.h>
+ #include	<signal.h>
+ #include	<string.h>
+-#include	<malloc.h>
+ #include	<unistd.h>
+ #include	<sys/types.h>
+ #include	<sys/wait.h>
+@@ -797,7 +796,9 @@ getfile(char *s, int ac, char **av)
  				oflags |= (notrunc || append) ? 0 : O_TRUNC;
  				oflags |= nocreate ? 0 : O_CREAT;
  				oflags |= append ? O_APPEND : 0;
diff --git a/games/powwow/distinfo b/games/powwow/distinfo
index a2e84c19f13..2bb423417b0 100644
--- a/games/powwow/distinfo
+++ b/games/powwow/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2002/02/16 15:25:36 jdolecek Exp $
+$NetBSD: distinfo,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (powwow-1.2.4.tar.gz) = cf0477ca95144711ad351e9e1b9aa64df28727c8
 Size (powwow-1.2.4.tar.gz) = 169825 bytes
 SHA1 (patch-aa) = c8359ddb3770aa6520dd50638f4dc6b183943566
-SHA1 (patch-ab) = 135ab4ac3948380c95622d69d1b41cf6d11d75e8
+SHA1 (patch-ab) = 053dda5bb9ae22a85ea37fad9b43ffe90114cbec
 SHA1 (patch-ac) = ded89b8da6b31d7c3fb0c5b477b45d4a3d0ba53b
+SHA1 (patch-ad) = b6457008ca461255d2d3e60ed401b10bb0c4fdd5
diff --git a/games/powwow/patches/patch-ab b/games/powwow/patches/patch-ab
index 781846fabf7..c88c8810caf 100644
--- a/games/powwow/patches/patch-ab
+++ b/games/powwow/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/02/16 15:24:47 jdolecek Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 --- make_it.orig	Thu Jan 13 22:50:01 2000
 +++ make_it	Wed Feb 13 16:21:44 2002
@@ -7,8 +7,8 @@ $NetBSD: patch-ab,v 1.2 2002/02/16 15:24:47 jdolecek Exp $
                  CF='-O2 -fomit-frame-pointer -DUSE_RANDOM -DUSE_VT100 -DLINES=25'
                  LF='';;
 -
-+	NetBSD)
-+		echo 'Making Powwow for NetBSD'
++	NetBSD|Darwin)
++		echo "Making Powwow for $OS"
 +		CC='gcc'
 +		CF='-O2 -pipe -DUSE_SGTTY -DBSD_LIKE -DUSE_RANDOM -DUSE_REGEXP'
 +		if [ ! -z "$POWWOW_DIR" ]; then
diff --git a/games/powwow/patches/patch-ad b/games/powwow/patches/patch-ad
new file mode 100644
index 00000000000..eef210798dd
--- /dev/null
+++ b/games/powwow/patches/patch-ad
@@ -0,0 +1,6 @@
+$NetBSD: patch-ad,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- malloc.h.orig	Sun May 23 17:06:22 2004
++++ malloc.h
+@@ -0,0 +1 @@
++#include <stdlib.h>
diff --git a/games/xsoldier/distinfo b/games/xsoldier/distinfo
index a198ebfdc70..dadd252be4e 100644
--- a/games/xsoldier/distinfo
+++ b/games/xsoldier/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/09/14 03:48:06 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (xsoldier-0.96.tar.gz) = af16dbe1506cdd519a099ed58e26a5569400bea2
 Size (xsoldier-0.96.tar.gz) = 82413 bytes
 SHA1 (patch-aa) = 26eb8778cf418e092e321bed04aee302135d2cbc
 SHA1 (patch-ab) = 464407fb6e9e0af33b57d7dfc17a58acb1591f0a
 SHA1 (patch-ac) = 3551fd7507aa0ff8faeb9cdc8e2addc03dbc1274
-SHA1 (patch-ad) = 2d4b158bd7200b7228de4dc5e082b75e1d191adb
+SHA1 (patch-ad) = 5689b9f211b89aebbc65eeabaac35531ab3ab819
diff --git a/games/xsoldier/patches/patch-ad b/games/xsoldier/patches/patch-ad
index 3eaa9307f8c..b0a543bcd4e 100644
--- a/games/xsoldier/patches/patch-ad
+++ b/games/xsoldier/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 1999/12/23 01:44:03 wiz Exp $
---- manage.c.orig	Mon Feb 24 17:20:07 1997
-+++ manage.c	Wed Dec 22 02:32:19 1999
-@@ -306,7 +306,7 @@ PlayerData *NewPlayerData(void)
+$NetBSD: patch-ad,v 1.2 2004/05/23 23:28:29 danw Exp $
+
+--- manage.c.orig	Mon Feb 24 11:20:07 1997
++++ manage.c
+@@ -9,7 +9,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ 
+@@ -306,7 +305,7 @@ PlayerData *NewPlayerData(void)
      if ((pw=getpwuid(getuid())) == NULL)
          sprintf(name,"%d",getuid());
      else
diff --git a/graphics/ljpeg/distinfo b/graphics/ljpeg/distinfo
index 5b428cdc486..c268b751482 100644
--- a/graphics/ljpeg/distinfo
+++ b/graphics/ljpeg/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/21 21:30:14 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (ljpg-1.0/ljpg.tar.Z) = 47071fad1f11a3b9241a34b188ab07d54dcd13bc
 Size (ljpg-1.0/ljpg.tar.Z) = 334459 bytes
 SHA1 (patch-aa) = 562ce4a8f82c6ed59b4b730f59822d4749e925a3
+SHA1 (patch-ab) = c56ad99b8ce278d58f50fc8770c6ca62aa8936f4
diff --git a/graphics/ljpeg/patches/patch-ab b/graphics/ljpeg/patches/patch-ab
new file mode 100644
index 00000000000..5717d583284
--- /dev/null
+++ b/graphics/ljpeg/patches/patch-ab
@@ -0,0 +1,6 @@
+$NetBSD: patch-ab,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- malloc.h.orig	Sun May 23 17:14:14 2004
++++ malloc.h
+@@ -0,0 +1 @@
++#include <stdlib.h>
diff --git a/lang/tinyscheme/distinfo b/lang/tinyscheme/distinfo
index 3c1c824ca76..cb4eae7b127 100644
--- a/lang/tinyscheme/distinfo
+++ b/lang/tinyscheme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2004/04/08 15:47:49 kristerw Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (tinyscheme-1.33.tar.gz) = c596b428487c001d31f812137673a2683b352fae
 Size (tinyscheme-1.33.tar.gz) = 52733 bytes
-SHA1 (patch-aa) = d5e9006396c3d894f78a56a49b0d67bf18a1b6f2
-SHA1 (patch-ab) = 4c0a07947323410c26760128ba86cac99a662549
+SHA1 (patch-aa) = 8760042198cbcc202106d0840a6b4627ab599cd0
+SHA1 (patch-ab) = fc6ce2db6fd4344daebd7a9c7e5562179eee17d0
diff --git a/lang/tinyscheme/patches/patch-aa b/lang/tinyscheme/patches/patch-aa
index 7dc6a691c3d..8c55d971f42 100644
--- a/lang/tinyscheme/patches/patch-aa
+++ b/lang/tinyscheme/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/10/30 07:56:09 agc Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 --- makefile	2002/10/24 09:41:47	1.1
 +++ makefile	2002/10/24 09:42:36
@@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/30 07:56:09 agc Exp $
  
  scheme$(EXE_EXT): $(OBJS) 
 -	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS) 
-+	${LIBTOOL} --mode=link ${CC} -o $@ ${DEBUG} ${OBJS} ${SYS_LIBS} ${LIBS:.a=.la} -o scheme${EXE_EXT}
++	${LIBTOOL} --mode=link ${CC} ${DEBUG} ${OBJS} ${SYS_LIBS} ${LIBS:.a=.la} -o scheme${EXE_EXT}
  
  $(STATICLIBTARGET): $(OBJS)
 -	$(AR) $@ $(OBJS)
diff --git a/lang/tinyscheme/patches/patch-ab b/lang/tinyscheme/patches/patch-ab
index e729a174471..95f5515dcc8 100644
--- a/lang/tinyscheme/patches/patch-ab
+++ b/lang/tinyscheme/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/23 23:28:29 danw Exp $
 
---- scheme.c.orig	2003-01-07 20:40:51.000000000 +0100
-+++ scheme.c	2004-04-08 17:40:03.000000000 +0200
-@@ -91,8 +91,16 @@
+--- scheme.c.orig	Tue Jan  7 14:40:51 2003
++++ scheme.c
+@@ -57,9 +57,7 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-#ifndef macintosh
+-# include <malloc.h>
+-#else
++#ifdef macintosh
+ static int stricmp(const char *s1, const char *s2)
+ {
+   unsigned char c1, c2;
+@@ -91,8 +89,16 @@ static const char *strlwr(char *s) {
  # define prompt "> "
  #endif
  
@@ -20,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
  #endif
  
  #ifndef FIRST_CELLSEGS
-@@ -569,7 +577,7 @@
+@@ -569,7 +575,7 @@ static int alloc_cellseg(scheme *sc, int
  	  i = ++sc->last_cell_seg ;
  	  sc->alloc_seg[i] = cp;
  	  /* adjust in TYPE_BITS-bit boundary */
@@ -29,7 +40,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
  	    cp=(char*)(adj*((long)cp/adj+1));
  	  }
          /* insert new segment in address order */
-@@ -2055,7 +2063,7 @@
+@@ -2055,7 +2061,7 @@ struct dump_stack_frame { 
  
  static void s_save(scheme *sc, enum scheme_opcodes op, pointer args, pointer code) 
  { 
@@ -38,7 +49,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
    struct dump_stack_frame *next_frame; 
  
    /* enough room for the next frame? */ 
-@@ -2075,7 +2083,7 @@
+@@ -2075,7 +2081,7 @@ static void s_save(scheme *sc, enum sche
  
  static pointer _s_return(scheme *sc, pointer a) 
  { 
@@ -47,7 +58,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
    struct dump_stack_frame *frame; 
  
    sc->value = (a); 
-@@ -2115,7 +2123,7 @@
+@@ -2115,7 +2121,7 @@ static void dump_stack_free(scheme *sc) 
  
  static INLINE void dump_stack_mark(scheme *sc) 
  { 
diff --git a/lang/vslisp/distinfo b/lang/vslisp/distinfo
index b59649b1cea..5b54082e4f6 100644
--- a/lang/vslisp/distinfo
+++ b/lang/vslisp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/03/15 00:22:42 jmc Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (vslisp-4.0-1.tar.gz) = ccd21360f6bd2a7f47638797a7a5d25d2f8cb797
 Size (vslisp-4.0-1.tar.gz) = 167403 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 645d4a4ffd6949b9406083744b71676220bf19be
 SHA1 (patch-ac) = 490975b1e19ee6aaaf05fb2ade1d79e805257540
 SHA1 (patch-ad) = a08e31d1c11aa8aae909c2641f4f80f4ca39413a
 SHA1 (patch-ae) = b39473d8008d48ba19fc980e374bc95c28996705
+SHA1 (patch-af) = 8cd43805f9951d61535b69d3d309dbc705737028
diff --git a/lang/vslisp/patches/patch-af b/lang/vslisp/patches/patch-af
new file mode 100644
index 00000000000..58bd051b32d
--- /dev/null
+++ b/lang/vslisp/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- src/functions/funct.c.orig	Sun May  7 16:26:24 2000
++++ src/functions/funct.c
+@@ -18,10 +18,6 @@
+ #include "../WIN/sysdeps.h"
+ #endif
+ 
+-#ifndef WINDOWS 
+-#include <malloc.h>
+-#endif
+-
+ #include "l_defs.h"
+ 
+ %%L_Gotoxy,gotoxy;
diff --git a/math/gp-fplsa/distinfo b/math/gp-fplsa/distinfo
index 2a1aac29528..68bc7524b4e 100644
--- a/math/gp-fplsa/distinfo
+++ b/math/gp-fplsa/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/24 00:17:25 cjep Exp $
+$NetBSD: distinfo,v 1.2 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (fplsa.zoo) = 05133200b31dc6294cb2e085b3ad478d4b5b87c5
 Size (fplsa.zoo) = 206427 bytes
+SHA1 (patch-aa) = cc93cf7a25adcf1ea9d58ae87200519538f96e26
diff --git a/math/gp-fplsa/patches/patch-aa b/math/gp-fplsa/patches/patch-aa
new file mode 100644
index 00000000000..59e550daa0c
--- /dev/null
+++ b/math/gp-fplsa/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- src/fplsa4.c.orig	Thu May  6 11:18:56 1999
++++ src/fplsa4.c
+@@ -981,7 +981,6 @@
+ #include <time.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <malloc.h>
+ #if defined(SPP_2000)
+ #include <alloca.h>  /* This file the genuine SPP compiler requires */
+ #endif
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 ##
diff --git a/print/pcps/distinfo b/print/pcps/distinfo
index 2639b5b12cb..95c71936e95 100644
--- a/print/pcps/distinfo
+++ b/print/pcps/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/06/10 00:04:18 jmc Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (pcps840.tar.gz) = aa144398d59326c183d2d248b16f30f31420b3c6
 Size (pcps840.tar.gz) = 84459 bytes
 SHA1 (patch-aa) = b61ed0bac9c83716519797cc980e2ccfabbdd395
+SHA1 (patch-ab) = e17de47516bc1b97704c632a618f881aadb6432e
diff --git a/print/pcps/patches/patch-ab b/print/pcps/patches/patch-ab
new file mode 100644
index 00000000000..ef8d2c7d53a
--- /dev/null
+++ b/print/pcps/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- define.h.orig	Tue Apr  4 23:06:22 2000
++++ define.h
+@@ -146,9 +146,6 @@ Company: MicroSource     Snail:    10 De
+ 
+ #  else /* UNIX */
+ 
+-#  ifndef NEXT                 /* NeXT has malloc stuff in stdlib */
+-#   include <malloc.h>
+-#  endif
+ #  include <limits.h>
+ #  define MAX_PATH MAXPATHLEN
+ #  define MODE " Unix Mode "
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index c5c09aa72ae..ded18bdb13a 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/08/05 14:23:58 seb Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f
 Size (e2fsprogs-1.32.tar.gz) = 2894603 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 61561b5c12345aceee3d8b46249b805a3f97822b
 SHA1 (patch-ab) = 932d19e15eed6589e124de60c35712b32e86eb83
 SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067
 SHA1 (patch-ad) = 6aff39f1ca9ff0c43333168a190e16c4d7d98e2b
+SHA1 (patch-ae) = 85d394a64681882006854beee6826d4c6a6cd442
diff --git a/sysutils/e2fsprogs/patches/patch-ae b/sysutils/e2fsprogs/patches/patch-ae
new file mode 100644
index 00000000000..98d93e3dca6
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- e2fsck/unix.c.orig	Fri Nov  8 18:42:33 2002
++++ e2fsck/unix.c
+@@ -34,7 +34,9 @@ extern int optind;
+ #include <mntent.h>
+ #endif
+ #include <sys/ioctl.h>
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ 
+ #include "et/com_err.h"
+ #include "e2fsck.h"
diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile
index c6b008d7ea3..e4c6f6f4a3b 100644
--- a/textproc/biblook/Makefile
+++ b/textproc/biblook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:49 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/23 23:28:29 danw Exp $
 #
 
 DISTNAME=	biblook
@@ -10,16 +10,12 @@ MAINTAINER=	seb@pbox.org
 HOMEPAGE=	http://compgeom.cs.uiuc.edu/~jeffe/biblook.html
 COMMENT=	Indexing and searching tools for BibTeX bibliography databases
 
-.include "../../mk/bsd.prefs.mk"
-
 WRKSRC=		${WRKDIR}
 MAKE_FLAGS=     CC="${CC}"
 
 # override definitions in the package's Makefile via command line
-.if ${OPSYS} == "NetBSD"
 MAKE_FLAGS+=    OPT="${CFLAGS} -Dunix"
 MAKE_FLAGS+=    DEF_H_FILES="-DHAVE_STDLIB_H -DHAVE_NETINET_IN_H"
 MAKE_FLAGS+=    DEF_MORE="-DMOREPATH=\\\"/usr/bin/more\\\" -DMORE=\\\"more\\\""
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/biblook/distinfo b/textproc/biblook/distinfo
index 49ef42d6d6b..f7e0fa88fef 100644
--- a/textproc/biblook/distinfo
+++ b/textproc/biblook/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/31 10:54:21 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (biblook.tar.gz) = 2bb056b806db4518c07e245fc86097c12938443b
 Size (biblook.tar.gz) = 44691 bytes
 SHA1 (patch-aa) = 35775eda3f306e2cfa07bc91ac14daa59b84e10b
-SHA1 (patch-ab) = 61aea8b1355d7441e3e1b9269bd9ce5e0b2cfaef
+SHA1 (patch-ab) = 7063e2d7b92a45b1f055ca201fe1d6b11bfec7bc
 SHA1 (patch-ac) = 4d6ae0e4301a184b40c777712ee91ea739d7fbfe
diff --git a/textproc/biblook/patches/patch-ab b/textproc/biblook/patches/patch-ab
index 29ac213a798..ea994ab4094 100644
--- a/textproc/biblook/patches/patch-ab
+++ b/textproc/biblook/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/31 10:54:21 agc Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/23 23:28:29 danw Exp $
 
---- biblook.h.orig	Tue Mar 31 01:31:04 1998
+--- biblook.h.orig	Mon Mar 30 18:31:04 1998
 +++ biblook.h
-@@ -206,7 +206,7 @@
+@@ -73,9 +73,6 @@ extern uint16 ntohs (uint16 netshort);
+ 					/* around broken g++ libc.h */
+ #else
+ #include <unistd.h>
+-#if HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif /* HAVE_MALLOC_H */
+ #endif /* __NeXT__ */
+ 
+ #if (__STDC__ || __cplusplus || c_plusplus)
+@@ -206,7 +203,7 @@ u_short	ntohs(u_short netshort);
  #define MAJOR_VERSION 	2	/* program version     */
  #define MINOR_VERSION 	9
  
diff --git a/time/sunclock/distinfo b/time/sunclock/distinfo
index f40013fc6ca..43babee6b84 100644
--- a/time/sunclock/distinfo
+++ b/time/sunclock/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:15 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (sunclock-1.4.tar.gz) = 25736e88de37cc5d7fba11c9cf47d29a50c121b5
 Size (sunclock-1.4.tar.gz) = 28758 bytes
+SHA1 (patch-aa) = 1e315cb6a68bf7d97a849ef9437aff277d3a4862
diff --git a/time/sunclock/patches/patch-aa b/time/sunclock/patches/patch-aa
new file mode 100644
index 00000000000..e6ae63a329c
--- /dev/null
+++ b/time/sunclock/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2004/05/23 23:28:29 danw Exp $
+
+--- tildepath.c.orig	Sun Mar 29 16:08:21 1998
++++ tildepath.c
+@@ -37,7 +37,6 @@ static char SccsId[] = { "@(#) tildepath
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <pwd.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
diff --git a/wm/tvtwm/distinfo b/wm/tvtwm/distinfo
index 22ba654984f..306568745cb 100644
--- a/wm/tvtwm/distinfo
+++ b/wm/tvtwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:47 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (tvtwm.pl11.tar.gz) = a0e092c6dbab072b488606c28a78746d1b55d078
 Size (tvtwm.pl11.tar.gz) = 224935 bytes
@@ -8,9 +8,9 @@ SHA1 (patch-ae) = 747e2763f7b9a1bff8e495e5606adc5cd24ceb63
 SHA1 (patch-af) = 0e82d97aa3c716eb0930d41c5b234399c1999480
 SHA1 (patch-ag) = ee456b9eef5ef6e1ab55afe13ee39d587e17afa3
 SHA1 (patch-ah) = d2fbfe56a5588c6b490df4c9ada37ee3bc3b0cb9
-SHA1 (patch-ai) = 13ddf9ea7e708fe351742d582cdfe70b934aeef4
+SHA1 (patch-ai) = 81475df3d97a1d3506ffc5075d9687857d32af83
 SHA1 (patch-aj) = ec674f384a42375765576873cfba98b292c76e82
-SHA1 (patch-ak) = e40a0c8ec4492198a3d7a91ce81cb1a7f65a7218
+SHA1 (patch-ak) = 952a03dbe17e520a46384c61ecd9b6655eeeb793
 SHA1 (patch-al) = 6614b46b5f348ebaf8418494ab1eac71bf845f63
 SHA1 (patch-am) = 3691648d9a7f1b25f742f359cdf50e32bb11ddc3
 SHA1 (patch-an) = db292b1aa120da9a95629352175b5042a1bb7d77
diff --git a/wm/tvtwm/patches/patch-ai b/wm/tvtwm/patches/patch-ai
index 8a298a6c3b6..2f291ab3ee7 100644
--- a/wm/tvtwm/patches/patch-ai
+++ b/wm/tvtwm/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2004/05/23 23:28:29 danw Exp $
 
 Index: icons.c
 ===================================================================
@@ -12,7 +12,7 @@ diff -u -r1.1.1.1 -r1.2
   **********************************************************************/
  
  #include <stdio.h>
-+#include <malloc.h>
++#include <stdlib.h>
  #include "twm.h"
  #include "screen.h"
  #include "icons.h"
diff --git a/wm/tvtwm/patches/patch-ak b/wm/tvtwm/patches/patch-ak
index 6947dc80da9..d7b1c466ee0 100644
--- a/wm/tvtwm/patches/patch-ak
+++ b/wm/tvtwm/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2004/05/23 23:28:29 danw Exp $
 
 Index: lex.l
 ===================================================================
@@ -50,7 +50,7 @@ diff -u -r1.1.1.1 -r1.2
 -yywrap() { return(1);}
 +int yywrap() { return(1);}
 +#endif
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__APPLE__)
 +int yylineno;
  #endif
  
diff --git a/www/cgilib/distinfo b/www/cgilib/distinfo
index 44616994a6a..63ce9901a14 100644
--- a/www/cgilib/distinfo
+++ b/www/cgilib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/12/27 14:36:02 cjep Exp $
+$NetBSD: distinfo,v 1.8 2004/05/23 23:28:30 danw Exp $
 
 SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
 Size (cgilib-0.5.tar.gz) = 13991 bytes
 SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef
 SHA1 (patch-ab) = ee15b5f4afd45725e58209f7a0560cfefd22d5a6
-SHA1 (patch-ac) = 0f3929094024de5357d97b00abb9bd12cdd2fbc8
+SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728
 SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d
diff --git a/www/cgilib/patches/patch-ac b/www/cgilib/patches/patch-ac
index 627a7777786..7fd7937e830 100644
--- a/www/cgilib/patches/patch-ac
+++ b/www/cgilib/patches/patch-ac
@@ -1,11 +1,21 @@
-$NetBSD: patch-ac,v 1.1 2001/09/10 21:36:20 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2004/05/23 23:28:30 danw Exp $
 
 --- cgi.c.orig	Fri Aug 20 17:14:07 1999
-+++ cgi.c	Mon Sep 10 16:06:58 2001
-@@ -381,5 +381,5 @@
++++ cgi.c
+@@ -31,7 +31,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <malloc.h>
+ #include <cgi.h>
+ 
+ int cgiDebugLevel = 0;
+@@ -380,7 +379,7 @@ char **cgiGetVariables (s_cgi *parms)
+ void cgiRedirect (const char *url)
  {
      if (url && strlen(url)) {
 -	printf ("Content-type: text/html\nContent-length: %d\n", 77+(strlen(url)*2));
 +	printf ("Content-type: text/html\nContent-length: %ld\n",(long)( 77+(strlen(url)*2)));
  	printf ("Status: 302 Temporal Relocation\n");
  	printf ("Location: %s\n\n", url);
+ 	printf ("<html>\n<body>\nThe page has been moved to <a href=\"%s\">%s</a>\n</body>\n</html>\n", url, url);
diff --git a/www/ijb/distinfo b/www/ijb/distinfo
index 87dbf868b7e..b6d70f6eb57 100644
--- a/www/ijb/distinfo
+++ b/www/ijb/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/09/12 12:40:57 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 23:28:30 danw Exp $
 
 SHA1 (ijb20.tar.Z) = 2233cc5f26208058c5046168ff9ddf70312bfb75
 Size (ijb20.tar.Z) = 286005 bytes
 SHA1 (patch-aa) = 4c4f75f5cc3af63afce4aa8beab7f5e2e0b422dd
+SHA1 (patch-ab) = 1295fffa7e2cac2de991ac5b0a7a9f5bfa9cd1d1
diff --git a/www/ijb/patches/patch-ab b/www/ijb/patches/patch-ab
new file mode 100644
index 00000000000..a1bb7d813e0
--- /dev/null
+++ b/www/ijb/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2004/05/23 23:28:30 danw Exp $
+
+--- loaders.c.orig	Fri Oct 30 22:58:47 1998
++++ loaders.c
+@@ -8,7 +8,6 @@ char *loaders_rcs = "$Id: loaders.c,v 1.
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <ctype.h>