[pkgsrc/trunk]: pkgsrc malloc.h fixes for darwin, plus a handful of other sma...

[danw <danw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f457722ec21
branches:  trunk
changeset: 475714:3f457722ec21
user:      danw <danw%pkgsrc.org@localhost>
date:      Sun May 23 23:28:29 2004 +0000

description:
malloc.h fixes for darwin, plus a handful of other small fixes for
problems found after fixing malloc problems

diffstat:

 benchmarks/lmbench/distinfo         |   4 ++--
 benchmarks/lmbench/patches/patch-ae |  17 +++++++++++++----
 games/powwow/distinfo               |   5 +++--
 games/powwow/patches/patch-ab       |   6 +++---
 games/powwow/patches/patch-ad       |   6 ++++++
 games/xsoldier/distinfo             |   4 ++--
 games/xsoldier/patches/patch-ad     |  17 +++++++++++++----
 graphics/ljpeg/distinfo             |   3 ++-
 graphics/ljpeg/patches/patch-ab     |   6 ++++++
 lang/tinyscheme/distinfo            |   6 +++---
 lang/tinyscheme/patches/patch-aa    |   4 ++--
 lang/tinyscheme/patches/patch-ab    |  27 +++++++++++++++++++--------
 lang/vslisp/distinfo                |   3 ++-
 lang/vslisp/patches/patch-af        |  15 +++++++++++++++
 math/gp-fplsa/distinfo              |   3 ++-
 math/gp-fplsa/patches/patch-aa      |  12 ++++++++++++
 misc/astrolog/Makefile              |   3 ++-
 misc/astrolog/distinfo              |   3 ++-
 misc/astrolog/patches/patch-ac      |  16 ++++++++++++++++
 misc/colortail/distinfo             |   4 ++--
 misc/colortail/patches/patch-ad     |  18 ++++++++++--------
 print/pcps/distinfo                 |   3 ++-
 print/pcps/patches/patch-ab         |  14 ++++++++++++++
 sysutils/e2fsprogs/distinfo         |   3 ++-
 sysutils/e2fsprogs/patches/patch-ae |  14 ++++++++++++++
 textproc/biblook/Makefile           |   6 +-----
 textproc/biblook/distinfo           |   4 ++--
 textproc/biblook/patches/patch-ab   |  16 +++++++++++++---
 time/sunclock/distinfo              |   3 ++-
 time/sunclock/patches/patch-aa      |  12 ++++++++++++
 wm/tvtwm/distinfo                   |   6 +++---
 wm/tvtwm/patches/patch-ai           |   4 ++--
 wm/tvtwm/patches/patch-ak           |   4 ++--
 www/cgilib/distinfo                 |   4 ++--
 www/cgilib/patches/patch-ac         |  16 +++++++++++++---
 www/ijb/distinfo                    |   3 ++-
 www/ijb/patches/patch-ab            |  12 ++++++++++++
 37 files changed, 235 insertions(+), 71 deletions(-)

diffs (truncated from 672 to 300 lines):

diff -r 469fb37bc3e8 -r 3f457722ec21 benchmarks/lmbench/distinfo
--- a/benchmarks/lmbench/distinfo       Sun May 23 23:28:08 2004 +0000
+++ b/benchmarks/lmbench/distinfo       Sun May 23 23:28:29 2004 +0000
@@ -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-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 -r 469fb37bc3e8 -r 3f457722ec21 benchmarks/lmbench/patches/patch-ae
--- a/benchmarks/lmbench/patches/patch-ae       Sun May 23 23:28:08 2004 +0000
+++ b/benchmarks/lmbench/patches/patch-ae       Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 games/powwow/distinfo
--- a/games/powwow/distinfo     Sun May 23 23:28:08 2004 +0000
+++ b/games/powwow/distinfo     Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 games/powwow/patches/patch-ab
--- a/games/powwow/patches/patch-ab     Sun May 23 23:28:08 2004 +0000
+++ b/games/powwow/patches/patch-ab     Sun May 23 23:28:29 2004 +0000
@@ -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 @@
                  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 -r 469fb37bc3e8 -r 3f457722ec21 games/powwow/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/powwow/patches/patch-ad     Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 games/xsoldier/distinfo
--- a/games/xsoldier/distinfo   Sun May 23 23:28:08 2004 +0000
+++ b/games/xsoldier/distinfo   Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 games/xsoldier/patches/patch-ad
--- a/games/xsoldier/patches/patch-ad   Sun May 23 23:28:08 2004 +0000
+++ b/games/xsoldier/patches/patch-ad   Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 graphics/ljpeg/distinfo
--- a/graphics/ljpeg/distinfo   Sun May 23 23:28:08 2004 +0000
+++ b/graphics/ljpeg/distinfo   Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 graphics/ljpeg/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ljpeg/patches/patch-ab   Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 lang/tinyscheme/distinfo
--- a/lang/tinyscheme/distinfo  Sun May 23 23:28:08 2004 +0000
+++ b/lang/tinyscheme/distinfo  Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 lang/tinyscheme/patches/patch-aa
--- a/lang/tinyscheme/patches/patch-aa  Sun May 23 23:28:08 2004 +0000
+++ b/lang/tinyscheme/patches/patch-aa  Sun May 23 23:28:29 2004 +0000
@@ -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 @@
  
  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 -r 469fb37bc3e8 -r 3f457722ec21 lang/tinyscheme/patches/patch-ab
--- a/lang/tinyscheme/patches/patch-ab  Sun May 23 23:28:08 2004 +0000
+++ b/lang/tinyscheme/patches/patch-ab  Sun May 23 23:28:29 2004 +0000
@@ -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 @@
  #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 @@
            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 @@
    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 @@
    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 -r 469fb37bc3e8 -r 3f457722ec21 lang/vslisp/distinfo
--- a/lang/vslisp/distinfo      Sun May 23 23:28:08 2004 +0000
+++ b/lang/vslisp/distinfo      Sun May 23 23:28:29 2004 +0000
@@ -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-ac) = 490975b1e19ee6aaaf05fb2ade1d79e805257540
 SHA1 (patch-ad) = a08e31d1c11aa8aae909c2641f4f80f4ca39413a
 SHA1 (patch-ae) = b39473d8008d48ba19fc980e374bc95c28996705
+SHA1 (patch-af) = 8cd43805f9951d61535b69d3d309dbc705737028
diff -r 469fb37bc3e8 -r 3f457722ec21 lang/vslisp/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/vslisp/patches/patch-af      Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 math/gp-fplsa/distinfo
--- a/math/gp-fplsa/distinfo    Sun May 23 23:28:08 2004 +0000
+++ b/math/gp-fplsa/distinfo    Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 math/gp-fplsa/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/gp-fplsa/patches/patch-aa    Sun May 23 23:28:29 2004 +0000
@@ -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 -r 469fb37bc3e8 -r 3f457722ec21 misc/astrolog/Makefile
--- a/misc/astrolog/Makefile    Sun May 23 23:28:08 2004 +0000