Use system headers. Avoid redefining macros.

3 files changed, 54 insertions, 10 deletions

diff --git a/devel/bcc/distinfo b/devel/bcc/distinfo
index bd9031a0719..759ef5b15fd 100644
--- a/devel/bcc/distinfo
+++ b/devel/bcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/10/22 06:31:43 rillig Exp $
+$NetBSD: distinfo,v 1.16 2015/02/19 22:25:12 joerg Exp $
 
 SHA1 (bcc.tar.gz) = 6a5c47bde0a6ddf82b65569883a5a490deb7e9b2
 RMD160 (bcc.tar.gz) = 6ce1a333bb4ffa36d9cea5c116925f74db64345e
@@ -15,10 +15,11 @@ SHA1 (patch-al) = 98c7508aeb54771385efd44e75d7ab765f3fd91e
 SHA1 (patch-am) = 4e3d440ce908ea27ddb7efb1bfb7261b8cb91d03
 SHA1 (patch-an) = 7be41aeee0d37f44783b1f3c697562c3a827646b
 SHA1 (patch-aq) = 343f318437b3690fdfa15f564522ce47047e5223
-SHA1 (patch-ar) = 94f5afcca0aeae1d8befafd304185e5b964acb46
+SHA1 (patch-ar) = 1ca0eef40c8c4c3b84ec1037bcb4c82ab639b821
 SHA1 (patch-as) = b5b52b843eeaf649342813a50a042dfde8314ffd
 SHA1 (patch-at) = 932f6c0ad2fa5372493cd6e88806e1445cdbe448
 SHA1 (patch-au) = cef1a15e3b9feba7377e55fa9ee7c812dac63e2c
 SHA1 (patch-av) = 7583906b59251aa99010616b3247728a2bea27a8
 SHA1 (patch-aw) = dc47528f06f16a835e53055135d704d166e41040
 SHA1 (patch-ax) = 4bd5b6f2de8f04584dc188ade6ecd2cef2380976
+SHA1 (patch-bcc_byteord.h) = 50e2b5ad77bfc7ea2d107e07a68e61a4bdc3b3ee
diff --git a/devel/bcc/patches/patch-ar b/devel/bcc/patches/patch-ar
index bd756e3ab8e..af0dc6a62c1 100644
--- a/devel/bcc/patches/patch-ar
+++ b/devel/bcc/patches/patch-ar
@@ -1,13 +1,42 @@
-$NetBSD: patch-ar,v 1.2 2006/10/10 06:56:05 uebayasi Exp $
+$NetBSD: patch-ar,v 1.3 2015/02/19 22:25:12 joerg Exp $
 
---- bcc/proto.h.orig	1992-11-14 16:12:34.000000000 +0100
+When this file was written, C90 was already two years old.
+No excuse to not use system headers.
+
+--- bcc/proto.h.orig	1992-11-14 15:12:34.000000000 +0000
 +++ bcc/proto.h
-@@ -381,8 +381,6 @@ void *malloc P((unsigned _nbytes));
- void *realloc P((void *_ptr, unsigned _nbytes));
+@@ -370,30 +370,7 @@ struct typestruct *tounsigned P((struct 
+ void typeinit P((void));
  
- /* library - string.h */
+ /* library - fcntl.h */
+-int creat P((const char *_path, int _mode));
+-int open P((const char *_path, int _oflag, ...));
+-
+-/* library - stdlib.h */
+-double atof P((const char *_str));
+-void exit P((int _status));
+-void free P((void *_ptr));
+-void *malloc P((unsigned _nbytes));
+-void *realloc P((void *_ptr, unsigned _nbytes));
+-
+-/* library - string.h */
 -void *memcpy P((void *_t, const void *_s, unsigned _length));
 -void *memset P((void *_s, int _c, unsigned _nbytes));
- char *strcat P((char *_target, const char *_source));
- char *strchr P((const char *_s, int _ch));
- int strcmp P((const char *_s1, const char *_s2));
+-char *strcat P((char *_target, const char *_source));
+-char *strchr P((const char *_s, int _ch));
+-int strcmp P((const char *_s1, const char *_s2));
+-char *strcpy P((char *_target, const char *_source));
+-unsigned strlen P((const char *_s));
+-char *strncpy P((char *_target, const char *_source, unsigned _maxlength));
+-char *strrchr P((const char *_s, int _ch));
+-
+-/* library - unistd.h */
+-int close P((int _fd));
+-int isatty P((int _fd));
+-long lseek P((int _fd, long _offset, int _whence));
+-int read P((int _fd, char *_buf, unsigned _nbytes));
+-int write P((int _fd, char *_buf, unsigned _nbytes));
++#include <fcntl.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
diff --git a/devel/bcc/patches/patch-bcc_byteord.h b/devel/bcc/patches/patch-bcc_byteord.h
new file mode 100644
index 00000000000..fb29a96f9a9
--- /dev/null
+++ b/devel/bcc/patches/patch-bcc_byteord.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-bcc_byteord.h,v 1.1 2015/02/19 22:25:12 joerg Exp $
+
+--- bcc/byteord.h.orig	2015-02-19 19:39:56.000000000 +0000
++++ bcc/byteord.h
+@@ -2,6 +2,9 @@
+ 
+ /* Copyright (C) 1992 Bruce Evans */
+ 
++#undef BIG_ENDIAN
++#undef LONG_BIG_ENDIAN
++
+ #ifdef I8088
+ # define BIG_ENDIAN 0
+ # define LONG_BIG_ENDIAN 1	/* longs are back to front for Xenix */