Include stdlib.h instead of malloc.h to build on Darwin.

10 files changed, 112 insertions, 43 deletions

diff --git a/devel/ruby-byaccr/distinfo b/devel/ruby-byaccr/distinfo
index ae57f3e9861..9f62ae46cb4 100644
--- a/devel/ruby-byaccr/distinfo
+++ b/devel/ruby-byaccr/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:32 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/06/19 20:44:06 minskim Exp $
 
 SHA1 (byaccr-0.1.tar.gz) = a4971742083d2570bb630908d0b15010af134e9f
 RMD160 (byaccr-0.1.tar.gz) = db1a74e6c94e3df5574a86822ea14c00ab433dae
 Size (byaccr-0.1.tar.gz) = 34786 bytes
 SHA1 (patch-aa) = c096eafa8cf381c3c275e89c8127e2688f7bd37e
-SHA1 (patch-ab) = f21e616d460f84b294d33e005243ecd2bfa12440
-SHA1 (patch-ac) = d76cbfd9367961604f4bb8fefe71625860fdfc00
-SHA1 (patch-ad) = 858e40ceef10f208438517aa24586e43db5e3bd1
-SHA1 (patch-ae) = 34a62d838dc36392e0cf3e014b7721c03f1d3f0b
-SHA1 (patch-af) = 3b2dc22bff3c712a908c23eaa86220007ebcd540
-SHA1 (patch-ag) = 5f3614bcc154a586eef3d045160fe8f101883ab3
+SHA1 (patch-ab) = 204c8d22df7b2534a0da839d65a0c07ac6a41796
+SHA1 (patch-ac) = 458af937b1873cafb0147089a551509d94404828
+SHA1 (patch-ad) = 53c93d78624ff993d8052a888be1897c2f293fb6
+SHA1 (patch-ae) = d435fad8b1ad6b2e945e657c0ce77a7e6334f98e
+SHA1 (patch-af) = 2ff14b611ead3c1430b91317c455603cf7e8c9e6
+SHA1 (patch-ag) = 9d1611697cb0fee7ca31e5ad9cacb2da547d0361
+SHA1 (patch-ah) = 424de112c37fefdaa34f75c1944995470aeaf15c
+SHA1 (patch-ai) = 6ecc71d255b7c1512a45b9ccdd153e7076a1a980
+SHA1 (patch-aj) = 2b8baaf980b79055caebda1430304949e858f423
diff --git a/devel/ruby-byaccr/patches/patch-ab b/devel/ruby-byaccr/patches/patch-ab
index 993408293ff..72039488a3b 100644
--- a/devel/ruby-byaccr/patches/patch-ab
+++ b/devel/ruby-byaccr/patches/patch-ab
@@ -1,18 +1,20 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-ab,v 1.2 2005/06/19 20:44:06 minskim Exp $
 
---- defs.h.orig	Thu Nov  2 01:29:07 2000
+--- defs.h.orig	2001-04-02 08:57:20.000000000 -0500
 +++ defs.h
-@@ -6,7 +6,8 @@
+@@ -5,8 +5,9 @@
+ #include <assert.h>
  #include <ctype.h>
  #include <stdio.h>
- #include <malloc.h>
+-#include <malloc.h>
 -
++#include <stdlib.h>
 +#include <unistd.h>
 +#include <unistd.h>
  
  
  /*  machine-dependent definitions			*/
-@@ -241,8 +242,8 @@
+@@ -242,8 +243,8 @@ extern int nvars;
  extern int ntags;
  
  extern char unionized;
@@ -23,7 +25,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  
  extern int   start_symbol;
  extern char  **symbol_name;
-@@ -290,8 +291,11 @@
+@@ -291,8 +292,11 @@ extern short final_state;
  
  /* system variables */
  
diff --git a/devel/ruby-byaccr/patches/patch-ac b/devel/ruby-byaccr/patches/patch-ac
index 28ee577b0c1..91e85b72d9b 100644
--- a/devel/ruby-byaccr/patches/patch-ac
+++ b/devel/ruby-byaccr/patches/patch-ac
@@ -1,8 +1,14 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-ac,v 1.2 2005/06/19 20:44:06 minskim Exp $
 
---- lr0.c.orig	Thu Nov  2 01:29:07 2000
+--- lr0.c.orig	2000-11-01 08:03:49.000000000 -0600
 +++ lr0.c
-@@ -12,9 +12,6 @@
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <malloc.h>
+ 
+ #include "defs.h"
+ 
+@@ -12,9 +11,6 @@ core *first_state;
  shifts *first_shift;
  reductions *first_reduction;
  
diff --git a/devel/ruby-byaccr/patches/patch-ad b/devel/ruby-byaccr/patches/patch-ad
index 0d1864c16db..23b35cccf41 100644
--- a/devel/ruby-byaccr/patches/patch-ad
+++ b/devel/ruby-byaccr/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-ad,v 1.2 2005/06/19 20:44:06 minskim Exp $
 
---- main.c.orig	Thu Nov  2 01:29:07 2000
+--- main.c.orig	2001-04-02 08:57:20.000000000 -0500
 +++ main.c
-@@ -307,9 +307,11 @@
+@@ -1,7 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <malloc.h>
+ 
+ #ifndef MSW  /*rwj  --  make portable*/
+ #include <signal.h>
+@@ -324,9 +323,11 @@ char *tmpdir;
      text_file_name[len + 5] = 't';
      union_file_name[len + 5] = 'u';
  
@@ -14,7 +22,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  
      if (jflag)/*rwj*/
        {
-@@ -363,6 +365,9 @@
+@@ -380,6 +381,9 @@ char *tmpdir;
  
  void open_files(void)
  {
@@ -24,7 +32,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
    create_file_names();
  
    if (input_file == 0)
-@@ -372,11 +377,25 @@
+@@ -389,11 +393,25 @@ void open_files(void)
  	    open_error(input_file_name);
      }
  
@@ -52,7 +60,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
    if (text_file == 0)
  	open_error(text_file_name);
  
-@@ -392,7 +411,14 @@
+@@ -409,7 +427,14 @@ void open_files(void)
  	 defines_file = fopen(defines_file_name, "w");
  	 if (defines_file == 0)
  	    open_error(defines_file_name);
diff --git a/devel/ruby-byaccr/patches/patch-ae b/devel/ruby-byaccr/patches/patch-ae
index 119bed55acd..f2974af4756 100644
--- a/devel/ruby-byaccr/patches/patch-ae
+++ b/devel/ruby-byaccr/patches/patch-ae
@@ -1,8 +1,14 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-ae,v 1.2 2005/06/19 20:44:06 minskim Exp $
 
---- mkpar.c.orig	Thu Nov  2 01:29:07 2000
+--- mkpar.c.orig	2000-11-01 08:03:49.000000000 -0600
 +++ mkpar.c
-@@ -16,12 +16,6 @@
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <malloc.h>
+ 
+ #include "defs.h"
+ 
+@@ -16,12 +15,6 @@ short final_state;
  static int SRcount;
  static int RRcount;
  
@@ -15,7 +21,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  void make_parser(void)
  {
  int i;
-@@ -174,11 +168,12 @@
+@@ -174,11 +167,12 @@ action *p;
      for (i = 3; i < nrules; ++i)
  	if (!rules_used[i]) ++nunused;
  
diff --git a/devel/ruby-byaccr/patches/patch-af b/devel/ruby-byaccr/patches/patch-af
index 5d06125f5b5..8136834d1a2 100644
--- a/devel/ruby-byaccr/patches/patch-af
+++ b/devel/ruby-byaccr/patches/patch-af
@@ -1,8 +1,15 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-af,v 1.2 2005/06/19 20:44:06 minskim Exp $
 
---- output.c.orig	Tue Nov 14 17:42:19 2000
+--- output.c.orig	2000-11-14 02:42:19.000000000 -0600
 +++ output.c
-@@ -834,9 +834,7 @@
+@@ -1,6 +1,5 @@
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
+ 
+ #include "defs.h"
+ 
+@@ -834,9 +833,7 @@ void output_defines(void)
  	s = symbol_name[i];
  	if (is_C_identifier(s))
  	{
@@ -13,7 +20,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  	      fprintf(code_file, "#define ");
  	    if (dflag) fprintf(defines_file, "#define ");
  	    c = *s;
-@@ -876,8 +874,17 @@
+@@ -876,8 +873,17 @@ void output_defines(void)
  
      if (dflag && unionized)
      {
@@ -31,7 +38,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  	if (union_file == NULL) open_error(union_file_name);
  	while ((c = getc(union_file)) != EOF)
  	    putc(c, defines_file);
-@@ -891,8 +898,17 @@
+@@ -891,8 +897,17 @@ void output_stored_text(void)
  int c;
  FILE *in, *out;
  
@@ -49,7 +56,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
      if (text_file == NULL)
  	open_error(text_file_name);
      in = text_file;
-@@ -908,11 +924,12 @@
+@@ -908,11 +923,12 @@ FILE *in, *out;
  	    ++outline;
  	putc(c, out);
      }
@@ -63,7 +70,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  }
  
  
-@@ -1191,8 +1208,6 @@
+@@ -1191,8 +1207,6 @@ char **symnam, *s;
  void output_stype(void)
  {
  int prim; /*is the Ruby semantic type a primitive?*/
@@ -72,7 +79,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
    if (jflag){ /*rwj*/
      prim=0;
      fprintf(code_file,"\n\n");
-@@ -1313,11 +1328,12 @@
+@@ -1313,11 +1327,12 @@ FILE *in, *out;
  	++outline;
  	putc('\n', out);
      }
@@ -86,7 +93,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  }
  
  
-@@ -1326,8 +1342,17 @@
+@@ -1326,8 +1341,17 @@ void output_semantic_actions(void)
  int c, last;
  FILE *out;
  
@@ -104,7 +111,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
      if (action_file == NULL)
  	open_error(action_file_name);
  
-@@ -1353,11 +1378,12 @@
+@@ -1353,11 +1377,12 @@ FILE *out;
  	putc('\n', out);
      }
  
diff --git a/devel/ruby-byaccr/patches/patch-ag b/devel/ruby-byaccr/patches/patch-ag
index d5e20652d4c..d5ebec64d85 100644
--- a/devel/ruby-byaccr/patches/patch-ag
+++ b/devel/ruby-byaccr/patches/patch-ag
@@ -1,8 +1,15 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
+$NetBSD: patch-ag,v 1.2 2005/06/19 20:44:06 minskim Exp $
 
---- reader.c.orig	Thu Nov  2 01:29:07 2000
+--- reader.c.orig	2000-11-01 08:03:49.000000000 -0600
 +++ reader.c
-@@ -35,8 +35,8 @@
+@@ -1,6 +1,5 @@
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
+ 
+ #include "defs.h"
+ 
+@@ -35,8 +34,8 @@ bucket **plhs;
  int name_pool_size;
  char *name_pool;
  
@@ -13,7 +20,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  
  
  void cachec(int c)
-@@ -315,11 +315,12 @@
+@@ -315,11 +314,12 @@ char *t_cptr = t_line + (cptr - line - 2
  	if (line == 0)
  	    unterminated_text(t_lineno, t_line, t_cptr);
      }
@@ -27,7 +34,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  
  loop:
      c = *cptr++;
-@@ -446,11 +447,12 @@
+@@ -446,11 +446,12 @@ int c;
      if (unionized) over_unionized(cptr - 6);
      unionized = 1;
  
@@ -41,7 +48,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
  
      fprintf(text_file, "typedef union");
      if (dflag) fprintf(union_file, "typedef union");
-@@ -1190,7 +1192,7 @@
+@@ -1190,7 +1191,7 @@ char *a_cptr = a_line + (cptr - line);
  	insert_empty_rule();
      last_was_action = 1;
  
@@ -50,7 +57,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/07/01 14:39:15 taca Exp $
        if (jflag){
  	fprintf(f, "when %d\n", nrules - 2);
          fprintf(f, jline_format, lineno, input_file_name);
-@@ -1199,6 +1201,7 @@
+@@ -1199,6 +1200,7 @@ char *a_cptr = a_line + (cptr - line);
  	fprintf(f, "%d:\n", nrules - 2);
          fprintf(f, line_format, lineno, input_file_name);
        };
diff --git a/devel/ruby-byaccr/patches/patch-ah b/devel/ruby-byaccr/patches/patch-ah
new file mode 100644
index 00000000000..bb3a885dcb1
--- /dev/null
+++ b/devel/ruby-byaccr/patches/patch-ah
@@ -0,0 +1,10 @@
+$NetBSD: patch-ah,v 1.1 2005/06/19 20:44:06 minskim Exp $
+
+--- lalr.c.orig	2000-11-01 08:03:46.000000000 -0600
++++ lalr.c
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <malloc.h>
+ 
+ #include "defs.h"
+ 
diff --git a/devel/ruby-byaccr/patches/patch-ai b/devel/ruby-byaccr/patches/patch-ai
new file mode 100644
index 00000000000..8b68e2634d5
--- /dev/null
+++ b/devel/ruby-byaccr/patches/patch-ai
@@ -0,0 +1,10 @@
+$NetBSD: patch-ai,v 1.1 2005/06/19 20:44:06 minskim Exp $
+
+--- symtab.c.orig	2000-11-01 08:03:49.000000000 -0600
++++ symtab.c
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ 
+ #include "defs.h"
diff --git a/devel/ruby-byaccr/patches/patch-aj b/devel/ruby-byaccr/patches/patch-aj
new file mode 100644
index 00000000000..7dd4688fc02
--- /dev/null
+++ b/devel/ruby-byaccr/patches/patch-aj
@@ -0,0 +1,10 @@
+$NetBSD: patch-aj,v 1.1 2005/06/19 20:44:06 minskim Exp $
+
+--- verbose.c.orig	2000-11-01 08:03:49.000000000 -0600
++++ verbose.c
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <malloc.h>
+ 
+ #include "defs.h"
+