[pkgsrc/trunk]: pkgsrc/devel/bcc Apply build fixes from Pierrick Brossin. Th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9a52e4a601e
branches:  trunk
changeset: 519804:b9a52e4a601e
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Tue Oct 10 06:56:05 2006 +0000

description:
Apply build fixes from Pierrick Brossin.  Thanks!

diffstat:

 devel/bcc/distinfo         |  46 +++++++++++++++++++++++++---------------------
 devel/bcc/patches/patch-aa |   4 ++--
 devel/bcc/patches/patch-ab |   4 ++--
 devel/bcc/patches/patch-ac |   4 ++--
 devel/bcc/patches/patch-ad |   8 ++++----
 devel/bcc/patches/patch-ae |  10 +++++-----
 devel/bcc/patches/patch-af |  17 +++++++++--------
 devel/bcc/patches/patch-ag |  16 +++++++++++-----
 devel/bcc/patches/patch-ah |   8 ++++----
 devel/bcc/patches/patch-ai |  16 ++++++++++++----
 devel/bcc/patches/patch-aj |   8 ++++----
 devel/bcc/patches/patch-ak |  12 ++++++------
 devel/bcc/patches/patch-al |  10 +++++-----
 devel/bcc/patches/patch-am |   8 ++++----
 devel/bcc/patches/patch-an |   8 ++++----
 devel/bcc/patches/patch-ao |   6 +++---
 devel/bcc/patches/patch-ap |   6 +++---
 devel/bcc/patches/patch-aq |  16 ++++++++++------
 devel/bcc/patches/patch-ar |   9 +++++----
 devel/bcc/patches/patch-as |  17 +++++++++++++----
 devel/bcc/patches/patch-at |   4 ++--
 devel/bcc/patches/patch-au |  12 ++++++++++++
 devel/bcc/patches/patch-av |  13 +++++++++++++
 devel/bcc/patches/patch-aw |  13 +++++++++++++
 devel/bcc/patches/patch-ax |  13 +++++++++++++
 25 files changed, 186 insertions(+), 102 deletions(-)

diffs (truncated from 563 to 300 lines):

diff -r 02377728de6d -r b9a52e4a601e devel/bcc/distinfo
--- a/devel/bcc/distinfo        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/distinfo        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-aa
--- a/devel/bcc/patches/patch-aa        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-aa        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ab
--- a/devel/bcc/patches/patch-ab        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ab        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ac
--- a/devel/bcc/patches/patch-ac        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ac        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ad
--- a/devel/bcc/patches/patch-ad        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ad        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ae
--- a/devel/bcc/patches/patch-ae        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ae        Tue Oct 10 06:56:05 2006 +0000
@@ -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 @@
  #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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-af
--- a/devel/bcc/patches/patch-af        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-af        Tue Oct 10 06:56:05 2006 +0000
@@ -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 @@
  #   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 @@
            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 @@
                            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 @@
 +    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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ag
--- a/devel/bcc/patches/patch-ag        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ag        Tue Oct 10 06:56:05 2006 +0000
@@ -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 @@
  #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 @@
  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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ah
--- a/devel/bcc/patches/patch-ah        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ah        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ai
--- a/devel/bcc/patches/patch-ai        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ai        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-aj
--- a/devel/bcc/patches/patch-aj        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-aj        Tue Oct 10 06:56:05 2006 +0000
@@ -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 -r 02377728de6d -r b9a52e4a601e devel/bcc/patches/patch-ak
--- a/devel/bcc/patches/patch-ak        Tue Oct 10 03:20:48 2006 +0000
+++ b/devel/bcc/patches/patch-ak        Tue Oct 10 06:56:05 2006 +0000
@@ -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 @@
                 eap->base == EBPREG)
        {
            postb |= MEM1_MOD;
-@@ -917,8 +917,8 @@