Apply build fixes from Pierrick Brossin. Thanks!

25 files changed, 186 insertions, 102 deletions

diff --git a/devel/bcc/distinfo b/devel/bcc/distinfo
index 2406068f40a..281e48fc4a1 100644
--- a/devel/bcc/distinfo
+++ b/devel/bcc/distinfo
@@ -1,25 +1,29 @@
-$NetBSD: distinfo,v 1.13 2006/01/08 19:50:30 joerg Exp $
+$NetBSD: distinfo,v 1.14 2006/10/10 06:56:05 uebayasi Exp $
 
 SHA1 (bcc.tar.gz) = 6a5c47bde0a6ddf82b65569883a5a490deb7e9b2
 RMD160 (bcc.tar.gz) = 6ce1a333bb4ffa36d9cea5c116925f74db64345e
 Size (bcc.tar.gz) = 214834 bytes
-SHA1 (patch-aa) = 998b87ba9839f734d10f07e23e10941661e8546a
-SHA1 (patch-ab) = 3bdac5087890d4035c957bd13f5ed8cb5daac0e0
-SHA1 (patch-ac) = 45e828bbe12636d0473c8f130a1e8cb9f19b4b6b
-SHA1 (patch-ad) = 25879740733764421d74a5940b56265161494a12
-SHA1 (patch-ae) = 43f68ba3b3e5325aa9b7b4a019aa66289187619f
-SHA1 (patch-af) = a3374f89d99d6d334948cb83e50b8df94a2819ed
-SHA1 (patch-ag) = de411e001cc45ea24b150dee6ac630e5339938ff
-SHA1 (patch-ah) = 18d775fe7306894fe941d0ae91ff2d16ae6c3674
-SHA1 (patch-ai) = 4d54368ab7567ec7d467d9e04d10b38789c6b647
-SHA1 (patch-aj) = 230b697998d2eb61fc1d635ae001a90f6a830f92
-SHA1 (patch-ak) = aed840bfd49ae8865a04f1e6850a557fb2c7e4b3
-SHA1 (patch-al) = 82449ae6f60c22a3d1c1fca7bcb7b605b725521b
-SHA1 (patch-am) = 5c96cda6a4698baade1aa87ac34c26bd4f2d75b2
-SHA1 (patch-an) = 63ba807561654368a54c7222e15153d1860c86fd
-SHA1 (patch-ao) = 04b7ee321cbba8fac7248de74d48be1a8acfdfeb
-SHA1 (patch-ap) = 6be306396154ba84b336f266a672f71aeb0ba829
-SHA1 (patch-aq) = c2ab59da541bfe4233a36f5953ba1f251b29983f
-SHA1 (patch-ar) = a1c9eeaaff393214cf5addce1f80f0dbb5d8b8d2
-SHA1 (patch-as) = 97cb1871dd055b45a000a1688e32ebf838999783
-SHA1 (patch-at) = 7f121955b757657dca22128823f08fb18cf419a3
+SHA1 (patch-aa) = 3bce844ad121bce8de4110e0384b4d9885acf663
+SHA1 (patch-ab) = c8770a046256c59c924615ca27da962978ae5a20
+SHA1 (patch-ac) = 0eb5dd2c00ad09ad4ca9611cb0449248f3cefd27
+SHA1 (patch-ad) = b1e609a0436132d4a7f6893cc2dab89f77cde12e
+SHA1 (patch-ae) = ede27bbd8f1cc92fe047f1dc687881660d6b7a96
+SHA1 (patch-af) = df7c41fb3a200145496b38694de2f927d5f108a9
+SHA1 (patch-ag) = 9d564f0d6ae174545e38ca8c9ca2f11f961d8688
+SHA1 (patch-ah) = 0aafaaff3ccef5f491d3ee3de12d27f24cbcddd0
+SHA1 (patch-ai) = f5b921d3a3ce810728aa7df23e19eac26c12ca29
+SHA1 (patch-aj) = 6a33e364aaa99576cd5fe62c963484c8a269c026
+SHA1 (patch-ak) = babcde54e610609151ae525efe5ad632e2fc5de7
+SHA1 (patch-al) = 98c7508aeb54771385efd44e75d7ab765f3fd91e
+SHA1 (patch-am) = 4e3d440ce908ea27ddb7efb1bfb7261b8cb91d03
+SHA1 (patch-an) = 7be41aeee0d37f44783b1f3c697562c3a827646b
+SHA1 (patch-ao) = 006249e0776f2a3b74b1eb9a7c1c3235ce371c8b
+SHA1 (patch-ap) = d4963c2ae0eb66b4b1d56daa8206a5d04d778ee0
+SHA1 (patch-aq) = 343f318437b3690fdfa15f564522ce47047e5223
+SHA1 (patch-ar) = 94f5afcca0aeae1d8befafd304185e5b964acb46
+SHA1 (patch-as) = b5b52b843eeaf649342813a50a042dfde8314ffd
+SHA1 (patch-at) = 932f6c0ad2fa5372493cd6e88806e1445cdbe448
+SHA1 (patch-au) = cef1a15e3b9feba7377e55fa9ee7c812dac63e2c
+SHA1 (patch-av) = 7583906b59251aa99010616b3247728a2bea27a8
+SHA1 (patch-aw) = dc47528f06f16a835e53055135d704d166e41040
+SHA1 (patch-ax) = 4bd5b6f2de8f04584dc188ade6ecd2cef2380976
diff --git a/devel/bcc/patches/patch-aa b/devel/bcc/patches/patch-aa
index fa2ec8ea138..9a5b91daf61 100644
--- a/devel/bcc/patches/patch-aa
+++ b/devel/bcc/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2004/06/12 02:24:57 grant Exp $
+$NetBSD: patch-aa,v 1.6 2006/10/10 06:56:05 uebayasi Exp $
 
---- ld/Makefile.orig	1994-02-20 09:32:12.000000000 +1100
+--- ld/Makefile.orig	1994-02-19 23:32:12.000000000 +0100
 +++ ld/Makefile
 @@ -1,18 +1,17 @@
 -CFLAGS		=-O -DBSD_A_OUT -DSTANDARD_GNU_A_OUT
diff --git a/devel/bcc/patches/patch-ab b/devel/bcc/patches/patch-ab
index 6d4d629c4e4..5d6e446a852 100644
--- a/devel/bcc/patches/patch-ab
+++ b/devel/bcc/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2004/06/12 02:24:57 grant Exp $
+$NetBSD: patch-ab,v 1.5 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/Makefile.orig	1992-04-23 14:04:42.000000000 +1000
+--- as/Makefile.orig	1992-04-23 06:04:42.000000000 +0200
 +++ as/Makefile
 @@ -1,27 +1,17 @@
 -CFLAGS		=-O
diff --git a/devel/bcc/patches/patch-ac b/devel/bcc/patches/patch-ac
index 12061203f50..5f83f47d105 100644
--- a/devel/bcc/patches/patch-ac
+++ b/devel/bcc/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2001/12/25 22:46:32 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2006/10/10 06:56:05 uebayasi Exp $
 
---- bcc/Makefile.orig	Thu Mar  9 11:43:29 1995
+--- bcc/Makefile.orig	1995-03-09 11:43:29.000000000 +0100
 +++ bcc/Makefile
 @@ -1,14 +1,22 @@
 -CFLAGS		=-O -DNSIG=32
diff --git a/devel/bcc/patches/patch-ad b/devel/bcc/patches/patch-ad
index efbea50ab54..6d037a622ee 100644
--- a/devel/bcc/patches/patch-ad
+++ b/devel/bcc/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 1998/07/17 04:45:57 tsarna Exp $
+$NetBSD: patch-ad,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
 
 bin86 uses BIG_ENDIAN in silly ways.
 
---- ld/readobj.c.orig	Thu Jul 16 14:13:12 1998
-+++ ld/readobj.c	Thu Jul 16 14:13:21 1998
-@@ -15,6 +15,7 @@
+--- ld/readobj.c.orig	1994-02-19 23:36:05.000000000 +0100
++++ ld/readobj.c
+@@ -15,6 +15,7 @@ char *strncpy P((char *dest, const char 
  unsigned long strtoul P((const char *s, char **endptr, int base));
  #else
  #undef NULL
diff --git a/devel/bcc/patches/patch-ae b/devel/bcc/patches/patch-ae
index 656a449b5fe..7773187b9d8 100644
--- a/devel/bcc/patches/patch-ae
+++ b/devel/bcc/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2004/01/02 15:30:04 cjep Exp $
---- ld/table.c.orig	1994-02-19 22:36:05.000000000 +0000
-+++ ld/table.c	2004-01-02 15:25:50.000000000 +0000
-@@ -13,6 +13,7 @@
+$NetBSD: patch-ae,v 1.4 2006/10/10 06:56:05 uebayasi Exp $
+--- ld/table.c.orig	1994-02-19 23:36:05.000000000 +0100
++++ ld/table.c
+@@ -13,6 +13,7 @@ void *malloc P((unsigned size));
  #else
  #undef NULL
  #include <stdlib.h>
@@ -9,7 +9,7 @@ $NetBSD: patch-ae,v 1.3 2004/01/02 15:30:04 cjep Exp $
  #endif
  
  #define GOLDEN		157	/* GOLDEN/HASHTABSIZE approx golden ratio */
-@@ -48,7 +49,7 @@
+@@ -48,7 +49,7 @@ PUBLIC struct symstruct *addsym(name)
  char *name;
  {
      struct symstruct **hashptr;
diff --git a/devel/bcc/patches/patch-af b/devel/bcc/patches/patch-af
index 614e4d245ab..0fdb3e95fbe 100644
--- a/devel/bcc/patches/patch-af
+++ b/devel/bcc/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-af,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- ld/writebin.c.orig	Sat Feb 19 16:37:23 1994
-+++ ld/writebin.c	Thu Jul 16 16:57:56 1998
-@@ -12,6 +12,7 @@
+--- ld/writebin.c.orig	1994-02-19 23:37:23.000000000 +0100
++++ ld/writebin.c
+@@ -12,6 +12,7 @@ static long bdataoffset;
  #else
  # ifdef BSD_A_OUT
  #  ifdef STANDARD_GNU_A_OUT
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 10:40:21 agc Exp $
  #   include <a.out.h>
  #   define RELOC_INFO_SIZE 8	/* unportable bitfields - bcc doesn't pack */
  #  else
-@@ -174,7 +175,7 @@
+@@ -174,7 +175,7 @@ bool_pt argreloc_output;
  	    linkrefs(symptr->modptr);
  	needlink = FALSE;
  	{
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 10:40:21 agc Exp $
  	    struct redlist *rlptr;
  
  	    for (rlptr = redfirst; rlptr != NULL;
-@@ -478,11 +479,11 @@
+@@ -478,11 +479,11 @@ bool_pt arguzp;
  			    extsym.n_was_sclass = C_EXT;
  			else
  			    extsym.n_was_sclass = C_STAT;
@@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 10:40:21 agc Exp $
  			    switch (flags & (A_MASK | SEGM_MASK))
  			    {
  			    case 0:
-@@ -918,7 +919,11 @@
+@@ -918,8 +919,12 @@ PRIVATE void writeheader()
  #ifdef N_SET_MAGIC
      N_SET_MAGIC(header, OMAGIC);
  #else
@@ -41,7 +41,8 @@ $NetBSD: patch-af,v 1.2 1998/08/07 10:40:21 agc Exp $
 +    N_SETMAGIC(header,OMAGIC,MID_I386,0);
 +#else                          
      *(unsigned short *) &header.a_magic = OMAGIC;  /* XXX - works for 386BSD */
-+#endif
  #endif
++#endif
  #else
      header.a_magic[0] = A_MAGIC0;
+     header.a_magic[1] = A_MAGIC1;
diff --git a/devel/bcc/patches/patch-ag b/devel/bcc/patches/patch-ag
index e7537acde83..4f5d64e4070 100644
--- a/devel/bcc/patches/patch-ag
+++ b/devel/bcc/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2001/12/25 22:46:32 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/as.c.orig	Sat Jul 10 21:03:52 1993
-+++ as/as.c	Tue Dec 25 23:03:46 2001
+--- as/as.c.orig	1993-07-10 21:03:52.000000000 +0200
++++ as/as.c
 @@ -7,7 +7,6 @@
  
  #include "const.h"
@@ -10,7 +10,13 @@ $NetBSD: patch-ag,v 1.3 2001/12/25 22:46:32 wiz Exp $
  #include "macro.h"
  #undef EXTERN
  #define EXTERN
-@@ -37,6 +36,10 @@
+@@ -31,12 +30,15 @@ int close P((int fd));
+ int creat P((const char *path, int mode));
+ int write P((int fd, const void *buf, unsigned nbytes));
+ #else
+-#undef NULL
+ #include <sys/types.h>
+ #include <fcntl.h>
  #include <unistd.h>
  #endif
  
@@ -21,7 +27,7 @@ $NetBSD: patch-ag,v 1.3 2001/12/25 22:46:32 wiz Exp $
  PUBLIC char hexdigit[] = "0123456789ABCDEF";	/* XXX - ld uses lower case */
  
  PRIVATE struct block_s hid_blockstak[MAXBLOCK];	/* block stack */
-@@ -157,7 +160,7 @@
+@@ -157,7 +159,7 @@ char **argv;
  {
      char *arg;
      bool_t isnextarg;
diff --git a/devel/bcc/patches/patch-ah b/devel/bcc/patches/patch-ah
index d9e305f6030..bc814c214e6 100644
--- a/devel/bcc/patches/patch-ah
+++ b/devel/bcc/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-ah,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/genlist.c.orig	Thu Jul 16 18:38:43 1998
-+++ as/genlist.c	Thu Jul 16 19:56:53 1998
-@@ -186,8 +186,8 @@
+--- as/genlist.c.orig	1993-07-10 21:37:22.000000000 +0200
++++ as/genlist.c
+@@ -186,8 +186,8 @@ PUBLIC void listline()
  {
      if (!listpre)
      {
diff --git a/devel/bcc/patches/patch-ai b/devel/bcc/patches/patch-ai
index 1f2c0cc2487..b8e998c0988 100644
--- a/devel/bcc/patches/patch-ai
+++ b/devel/bcc/patches/patch-ai
@@ -1,8 +1,16 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-ai,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/genobj.c.orig	Thu Jul 16 20:00:49 1998
-+++ as/genobj.c	Thu Jul 16 20:01:38 1998
-@@ -385,8 +385,8 @@
+--- as/genobj.c.orig	1993-07-10 21:10:53.000000000 +0200
++++ as/genobj.c
+@@ -18,7 +18,6 @@ unsigned strlen P((const char *s));
+ #ifdef POSIX_HEADERS_MISSING
+ int write P((int fd, const void *buf, unsigned nbytes));
+ #else
+-#undef NULL
+ #include <sys/types.h>
+ #include <unistd.h>
+ #endif
+@@ -385,8 +384,8 @@ PUBLIC void objheader()
  	    do
  	    {
  		if ((symptr->type & EXPBIT || symptr->data & IMPBIT) ||
diff --git a/devel/bcc/patches/patch-aj b/devel/bcc/patches/patch-aj
index 3d7d6eefae8..0c479f6f848 100644
--- a/devel/bcc/patches/patch-aj
+++ b/devel/bcc/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-aj,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/macro.c.orig	Thu Jul 16 20:03:05 1998
-+++ as/macro.c	Thu Jul 16 20:03:15 1998
-@@ -95,7 +95,7 @@
+--- as/macro.c.orig	1993-07-10 21:08:23.000000000 +0200
++++ as/macro.c
+@@ -95,7 +95,7 @@ PUBLIC void pmacro()
  {
      bool_t saving;
      bool_t savingc;
diff --git a/devel/bcc/patches/patch-ak b/devel/bcc/patches/patch-ak
index 999a6a5445f..ca49cfbcf9f 100644
--- a/devel/bcc/patches/patch-ak
+++ b/devel/bcc/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-ak,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/mops.c.orig	Thu Jul 16 20:03:35 1998
-+++ as/mops.c	Thu Jul 16 20:05:45 1998
-@@ -547,7 +547,7 @@
+--- as/mops.c.orig	1993-07-10 20:36:55.000000000 +0200
++++ as/mops.c
+@@ -547,7 +547,7 @@ register struct ea_s *eap;
  	    mcount += asize;
  	}
  	else if (lastexp.offset != 0x0 ||
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.2 1998/08/07 10:40:21 agc Exp $
  		 eap->base == EBPREG)
  	{
  	    postb |= MEM1_MOD;
-@@ -917,8 +917,8 @@
+@@ -917,8 +917,8 @@ register struct ea_s *eap;
  		if (!(lastexp.data & UNDBIT) && lastexp.offset != 0x1)
  		{
  		    if (eap->base <= MAX16BITINDREG ||
@@ -22,7 +22,7 @@ $NetBSD: patch-ak,v 1.2 1998/08/07 10:40:21 agc Exp $
  			error(ILL_SCALE);
  		    else
  		    {
-@@ -1589,9 +1589,9 @@
+@@ -1589,9 +1589,9 @@ PUBLIC void mgroup1()
  	{
  	    if (target.indcount == 0x0 && (target.base == ALREG ||
  					   target.base == AXREG ||
diff --git a/devel/bcc/patches/patch-al b/devel/bcc/patches/patch-al
index f95e6bc148e..af827fb194a 100644
--- a/devel/bcc/patches/patch-al
+++ b/devel/bcc/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.4 2002/02/18 09:43:59 jmc Exp $
+$NetBSD: patch-al,v 1.5 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/pops.c.orig	Sun Jul 11 12:43:39 1993
-+++ as/pops.c	Mon Feb 18 09:40:23 2002
-@@ -72,7 +72,7 @@
+--- as/pops.c.orig	1993-07-11 14:43:39.000000000 +0200
++++ as/pops.c
+@@ -72,7 +72,7 @@ PUBLIC bool_pt checksegrel(symptr)
  register struct sym_s *symptr;
  {
      if ((symptr->type & LABIT ||
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.4 2002/02/18 09:43:59 jmc Exp $
  	((symptr->data ^ lcdata) & (RELBIT | SEGM)))
      {
  	error(SEGREL);
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ unsigned char impbits;
  PRIVATE void dofcc()
  {
      register char *bufptr;
diff --git a/devel/bcc/patches/patch-am b/devel/bcc/patches/patch-am
index 090a781e557..56d8476c455 100644
--- a/devel/bcc/patches/patch-am
+++ b/devel/bcc/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 10:40:22 agc Exp $
+$NetBSD: patch-am,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- as/readsrc.c.orig	Thu Jul 16 20:28:47 1998
-+++ as/readsrc.c	Thu Jul 16 22:30:18 1998
-@@ -220,7 +220,7 @@
+--- as/readsrc.c.orig	1993-07-10 21:06:52.000000000 +0200
++++ as/readsrc.c
+@@ -220,7 +220,7 @@ PUBLIC void readline()
        char *oldbufptr;
        struct schain_s *parameters;
        char paramnum;
diff --git a/devel/bcc/patches/patch-an b/devel/bcc/patches/patch-an
index 3fb17bc43e6..498c6c931bd 100644
--- a/devel/bcc/patches/patch-an
+++ b/devel/bcc/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 10:40:22 agc Exp $
+$NetBSD: patch-an,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- bcc/bcc.c.orig	Sat Jul 17 07:49:49 1993
-+++ bcc/bcc.c	Thu Jul 16 22:45:40 1998
+--- bcc/bcc.c.orig	1993-07-17 14:49:49.000000000 +0200
++++ bcc/bcc.c
 @@ -27,20 +27,20 @@
  #define P(x)	()
  #endif
@@ -31,7 +31,7 @@ $NetBSD: patch-an,v 1.2 1998/08/07 10:40:22 agc Exp $
  
  #ifdef CCC
  #undef BCC86
-@@ -553,7 +553,7 @@
+@@ -553,7 +553,7 @@ char **argv;
  	    {
  		arg = ldargs.argv[argc];
  		if (arg[0] == '-' && arg[1] == 'i'
diff --git a/devel/bcc/patches/patch-ao b/devel/bcc/patches/patch-ao
index d3a99667576..5f9bc046e99 100644
--- a/devel/bcc/patches/patch-ao
+++ b/devel/bcc/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1 2001/10/25 20:40:07 agc Exp $
+$NetBSD: patch-ao,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
 
---- /dev/null	Thu Oct 25 21:25:38 2001
-+++ Makefile	Thu Oct 25 21:25:39 2001
+--- Makefile.orig	2006-10-03 16:59:07.000000000 +0200
++++ Makefile
 @@ -0,0 +1,4 @@
 +
 +SUBDIR = ld as bcc-cc1 bcc
diff --git a/devel/bcc/patches/patch-ap b/devel/bcc/patches/patch-ap
index c8f5e5fe7ea..88573ce38fb 100644
--- a/devel/bcc/patches/patch-ap
+++ b/devel/bcc/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.2 2001/12/27 12:53:55 agc Exp $
+$NetBSD: patch-ap,v 1.3 2006/10/10 06:56:05 uebayasi Exp $
 
---- /dev/null	Thu Oct 25 21:25:38 2001
-+++ Makefile.inc	Thu Oct 25 21:25:39 2001
+--- Makefile.inc.orig	2006-10-03 16:59:07.000000000 +0200
++++ Makefile.inc
 @@ -0,0 +1,14 @@
 +#
 +# Makefile.inc
diff --git a/devel/bcc/patches/patch-aq b/devel/bcc/patches/patch-aq
index f660fd18c58..be9e3edb920 100644
--- a/devel/bcc/patches/patch-aq
+++ b/devel/bcc/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.1 2001/12/25 22:46:32 wiz Exp $
+$NetBSD: patch-aq,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
 
---- ld/ld.c.orig	Sat Feb 19 23:36:05 1994
+--- ld/ld.c.orig	1994-02-19 23:36:05.000000000 +0100
 +++ ld/ld.c
 @@ -3,7 +3,6 @@
  /* Copyright (C) 1994 Bruce Evans */
@@ -10,14 +10,18 @@ $NetBSD: patch-aq,v 1.1 2001/12/25 22:46:32 wiz Exp $
  #include "type.h"
  #include "globvar.h"
  
-@@ -25,6 +24,10 @@
- #undef NULL
+@@ -22,10 +21,13 @@ unsigned long strtoul P((const char *s, 
+ #define R_OK	0
+ int access P((const char *path, int amode));
+ #else
+-#undef NULL
  #include <unistd.h>
  #endif
-+
+ 
 +/* BSD #defines this in <machine/endian.h>, but with another sense */
 +#undef BIG_ENDIAN
 +#include "byteord.h"
- 
++
  #define MAX_LIBS	(NR_STDLIBS + 5)
  #define NR_STDLIBS	1
+ 
diff --git a/devel/bcc/patches/patch-ar b/devel/bcc/patches/patch-ar
index 9af191d3c5e..bd756e3ab8e 100644
--- a/devel/bcc/patches/patch-ar
+++ b/devel/bcc/patches/patch-ar
@@ -1,7 +1,8 @@
-$NetBSD: patch-ar,v 1.1 2003/08/02 20:24:59 kristerw Exp $
---- bcc/proto.h.orig	Sat Nov 14 16:12:34 1992
-+++ bcc/proto.h	Sat Aug  2 22:09:22 2003
-@@ -381,8 +381,6 @@
+$NetBSD: patch-ar,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
+
+--- bcc/proto.h.orig	1992-11-14 16:12:34.000000000 +0100
++++ bcc/proto.h
+@@ -381,8 +381,6 @@ void *malloc P((unsigned _nbytes));
  void *realloc P((void *_ptr, unsigned _nbytes));
  
  /* library - string.h */
diff --git a/devel/bcc/patches/patch-as b/devel/bcc/patches/patch-as
index a3e013506f9..594761b71b2 100644
--- a/devel/bcc/patches/patch-as
+++ b/devel/bcc/patches/patch-as
@@ -1,7 +1,8 @@
-$NetBSD: patch-as,v 1.1 2004/01/02 15:30:04 cjep Exp $
---- ld/io.c.orig	1994-04-17 22:59:53.000000000 +0100
-+++ ld/io.c	2004-01-02 15:21:25.000000000 +0000
-@@ -13,6 +13,7 @@
+$NetBSD: patch-as,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
+
+--- ld/io.c.orig	1994-04-17 23:59:53.000000000 +0200
++++ ld/io.c
+@@ -13,6 +13,7 @@ void *malloc P((unsigned size));
  #else
  #undef NULL
  #include <stdlib.h>
@@ -9,3 +10,11 @@ $NetBSD: patch-as,v 1.1 2004/01/02 15:30:04 cjep Exp $
  #endif
  
  #ifdef POSIX_HEADERS_MISSING
+@@ -33,7 +34,6 @@ int read P((int fd, void *buf, unsigned 
+ mode_t umask P((int oldmask));
+ int write P((int fd, const void *buf, unsigned nbytes));
+ #else
+-#undef NULL
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/devel/bcc/patches/patch-at b/devel/bcc/patches/patch-at
index 742edea5067..8999ef835be 100644
--- a/devel/bcc/patches/patch-at
+++ b/devel/bcc/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.1 2006/01/08 19:50:30 joerg Exp $
+$NetBSD: patch-at,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
 
---- bcc/express.c.orig	2006-01-08 19:45:09.000000000 +0000
+--- bcc/express.c.orig	1992-11-14 16:12:35.000000000 +0100
 +++ bcc/express.c
 @@ -21,7 +21,7 @@ PRIVATE unsigned insizeof;	/* nest level
  /* on p49 of K & R */
diff --git a/devel/bcc/patches/patch-au b/devel/bcc/patches/patch-au
new file mode 100644
index 00000000000..3055b0dc86e
--- /dev/null
+++ b/devel/bcc/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2006/10/10 06:56:05 uebayasi Exp $
+
+--- as/gensym.c.orig	1993-07-10 21:11:38.000000000 +0200
++++ as/gensym.c
+@@ -17,7 +17,6 @@ int strcmp P((const char *s1, const char
+ #ifdef POSIX_HEADERS_MISSING
+ int write P((int fd, const void *buf, unsigned nbytes));
+ #else
+-#undef NULL
+ #include <sys/types.h>
+ #include <unistd.h>
+ #endif
diff --git a/devel/bcc/patches/patch-av b/devel/bcc/patches/patch-av
new file mode 100644
index 00000000000..637df353f5a
--- /dev/null
+++ b/devel/bcc/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2006/10/10 06:56:05 uebayasi Exp $
+
+--- bcc/input.c.orig	1992-11-14 16:12:36.000000000 +0100
++++ bcc/input.c
+@@ -2,6 +2,8 @@
+ 
+ /* Copyright (C) 1992 Bruce Evans */
+ 
++#include <string.h>
++
+ #define ARBITRARY_BACKSLASH_NEWLINES_NOT
+ #define INSERT_BACKSLASH_NEWLINES_NOT
+ 
diff --git a/devel/bcc/patches/patch-aw b/devel/bcc/patches/patch-aw
new file mode 100644
index 00000000000..c82150fd0ed
--- /dev/null
+++ b/devel/bcc/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2006/10/10 06:56:05 uebayasi Exp $
+
+--- bcc/preproc.c.orig	1992-12-04 22:45:03.000000000 +0100
++++ bcc/preproc.c
+@@ -2,6 +2,8 @@
+ 
+ /* Copyright (C) 1992 Bruce Evans */
+ 
++#include <string.h>
++
+ #include "const.h"
+ #include "types.h"
+ #include "input.h"
diff --git a/devel/bcc/patches/patch-ax b/devel/bcc/patches/patch-ax
new file mode 100644
index 00000000000..cae80171a51
--- /dev/null
+++ b/devel/bcc/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2006/10/10 06:56:05 uebayasi Exp $
+
+--- bcc/table.c.orig	1992-11-14 16:12:38.000000000 +0100
++++ bcc/table.c
+@@ -6,6 +6,8 @@
+  * usually be set to some level different from OFFKLUDGELEVEL.
+  */
+ 
++#include <string.h>
++
+ #include "const.h"
+ #include "types.h"
+ #include "align.h"