Only one patch per file, and only patch each file by one patch.

6 files changed, 171 insertions, 194 deletions

diff --git a/devel/bcc/distinfo b/devel/bcc/distinfo
index 86244ec96d5..68e367f9322 100644
--- a/devel/bcc/distinfo
+++ b/devel/bcc/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2001/10/25 20:40:07 agc Exp $
+$NetBSD: distinfo,v 1.5 2001/12/25 22:46:32 wiz Exp $
 
 SHA1 (bcc.tar.gz) = 6a5c47bde0a6ddf82b65569883a5a490deb7e9b2
 Size (bcc.tar.gz) = 214834 bytes
-SHA1 (patch-aa) = 9f226cd8927f29755d354c44a491513caad2aac2
-SHA1 (patch-ab) = 04f619f1c888b3093d98f4913827a6152811f1be
-SHA1 (patch-ac) = fa24d1e33401868755217499684f4f9b452e9d1f
+SHA1 (patch-aa) = 3e8d9f543278573c57f5662820a939da8cfe1c79
+SHA1 (patch-ab) = c3f0a4123ca97cc5ed7dbb64a70c9b1faf818ea8
+SHA1 (patch-ac) = 45e828bbe12636d0473c8f130a1e8cb9f19b4b6b
 SHA1 (patch-ad) = 25879740733764421d74a5940b56265161494a12
 SHA1 (patch-ae) = aa50f7f49720185321600d852edd9dd65bcc176f
 SHA1 (patch-af) = a3374f89d99d6d334948cb83e50b8df94a2819ed
-SHA1 (patch-ag) = 9bbc62d233e8182a5212bd16b3a28babcecbdfff
+SHA1 (patch-ag) = de411e001cc45ea24b150dee6ac630e5339938ff
 SHA1 (patch-ah) = 18d775fe7306894fe941d0ae91ff2d16ae6c3674
 SHA1 (patch-ai) = 4d54368ab7567ec7d467d9e04d10b38789c6b647
 SHA1 (patch-aj) = 230b697998d2eb61fc1d635ae001a90f6a830f92
@@ -18,3 +18,4 @@ SHA1 (patch-am) = 5c96cda6a4698baade1aa87ac34c26bd4f2d75b2
 SHA1 (patch-an) = 63ba807561654368a54c7222e15153d1860c86fd
 SHA1 (patch-ao) = 04b7ee321cbba8fac7248de74d48be1a8acfdfeb
 SHA1 (patch-ap) = 8f7017c1a2f479eaccb3d2ed3adc6a4ae5043c66
+SHA1 (patch-aq) = c2ab59da541bfe4233a36f5953ba1f251b29983f
diff --git a/devel/bcc/patches/patch-aa b/devel/bcc/patches/patch-aa
index adf217483fa..131717d0014 100644
--- a/devel/bcc/patches/patch-aa
+++ b/devel/bcc/patches/patch-aa
@@ -1,68 +1,38 @@
-$NetBSD: patch-aa,v 1.3 2001/05/28 12:40:27 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2001/12/25 22:46:32 wiz Exp $
 
-*** ld/Makefile.orig	Sat Feb 19 23:32:12 1994
---- ld/Makefile	Sun Mar 26 12:31:37 1995
-***************
-*** 1,18 ****
-! CFLAGS		=-O -DBSD_A_OUT -DSTANDARD_GNU_A_OUT
-! LDFLAGS		=-N -s
-  
-! OBJS		=dumps.o io.o ld.o readobj.o table.o typeconv.o writebin.o
-  
-! ld: $(OBJS)
-! 	$(CC) $(LDFLAGS) $(OBJS) -o $@
-  
-! clean:
-! 	rm -f $(OBJS) ld
-! 
-! dumps.o: dumps.c const.h config.h obj.h type.h globvar.h
-! io.o: io.c const.h config.h obj.h type.h globvar.h
-! ld.o: ld.c const.h config.h byteord.h type.h globvar.h
-! readobj.o: readobj.c const.h config.h byteord.h obj.h type.h globvar.h
-! table.o: table.c const.h config.h align.h obj.h type.h globvar.h
-! typeconv.o: typeconv.c const.h config.h type.h globvar.h
-! writebin.o: writebin.c const.h config.h obj.h type.h globvar.h
---- 1,18 ----
-! .include "../Makefile.inc"
-  
-! CFLAGS		+=-DBSD_A_OUT -DSTANDARD_GNU_A_OUT
-! CFLAGS		+=-Wall
-! LDFLAGS		=
-  
-! SRCS		=dumps.c io.c ld.c readobj.c table.c typeconv.c writebin.c
-  
-! PROG		=ld86
-! 
-! BINDIR		=${LOCALPREFIX}/bin
-! MANDIR		=${LOCALPREFIX}/man
-! 
-! beforeinstall:
-! 		-mkdir -p ${BINDIR}
-!		-mkdir -p ${MANDIR}/man1
-! 
-! .include <bsd.prog.mk>
-*** ld/ld.c.orig	Sat Feb 19 23:36:05 1994
---- ld/ld.c	Sun Mar 26 11:59:47 1995
-***************
-*** 3,9 ****
-  /* Copyright (C) 1994 Bruce Evans */
-  
-  #include "const.h"
-- #include "byteord.h"
-  #include "type.h"
-  #include "globvar.h"
-  
---- 3,8 ----
-***************
-*** 25,30 ****
---- 24,33 ----
-  #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
+--- ld/Makefile.orig	Sat Feb 19 23:32:12 1994
++++ ld/Makefile
+@@ -1,18 +1,18 @@
+-CFLAGS		=-O -DBSD_A_OUT -DSTANDARD_GNU_A_OUT
+-LDFLAGS		=-N -s
++.include "../Makefile.inc"
+ 
+-OBJS		=dumps.o io.o ld.o readobj.o table.o typeconv.o writebin.o
++CFLAGS		+=-DBSD_A_OUT -DSTANDARD_GNU_A_OUT
++CFLAGS		+=-Wall
++LDFLAGS		=
+ 
+-ld: $(OBJS)
+-	$(CC) $(LDFLAGS) $(OBJS) -o $@
++SRCS		=dumps.c io.c ld.c readobj.c table.c typeconv.c writebin.c
+ 
+-clean:
+-	rm -f $(OBJS) ld
+-
+-dumps.o: dumps.c const.h config.h obj.h type.h globvar.h
+-io.o: io.c const.h config.h obj.h type.h globvar.h
+-ld.o: ld.c const.h config.h byteord.h type.h globvar.h
+-readobj.o: readobj.c const.h config.h byteord.h obj.h type.h globvar.h
+-table.o: table.c const.h config.h align.h obj.h type.h globvar.h
+-typeconv.o: typeconv.c const.h config.h type.h globvar.h
+-writebin.o: writebin.c const.h config.h obj.h type.h globvar.h
++PROG		=ld86
++
++BINDIR		=${LOCALPREFIX}/bin
++MANDIR		=${LOCALPREFIX}/man
++
++beforeinstall:
++		-mkdir -p ${BINDIR}
++	-mkdir -p ${MANDIR}/man1
++
++.include <bsd.prog.mk>
diff --git a/devel/bcc/patches/patch-ab b/devel/bcc/patches/patch-ab
index 0e5ffed543e..9471e36ec43 100644
--- a/devel/bcc/patches/patch-ab
+++ b/devel/bcc/patches/patch-ab
@@ -1,77 +1,48 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/12/25 22:46:32 wiz Exp $
 
-*** as/Makefile.orig	Thu Apr 23 06:04:42 1992
---- as/Makefile	Sun Mar 26 12:31:17 1995
-***************
-*** 1,27 ****
-! CFLAGS		=-O
-  LDFLAGS		=
-  
-! OBJS		=as.o assemble.o error.o express.o \
-! 		 genbin.o genlist.o genobj.o gensym.o \
-! 		 macro.o mops.o pops.o readsrc.o \
-! 		 scan.o table.o typeconv.o
-! 
-! as: $(OBJS)
-! 	$(CC) $(LDFLAGS) $(OBJS) -o as
-! 	chmem =182000 as
-! 
-! as.o: const.h type.h byteord.h macro.h file.h flag.h globvar.h
-! assemble.o: const.h type.h address.h globvar.h opcode.h scan.h
-! error.o: const.h type.h
-! express.o: const.h type.h address.h globvar.h scan.h source.h
-! genbin.o: const.h type.h address.h file.h globvar.h
-! genlist.o: const.h type.h address.h flag.h file.h globvar.h macro.h scan.h \
-! 	   source.h
-! genobj.o: const.h type.h address.h file.h globvar.h
-! gensym.o: const.h type.h flag.h file.h globvar.h
-! macro.o: const.h type.h globvar.h scan.h macro.h
-! mops.o: const.h type.h globvar.h opcode.h scan.h address.h
-! pops.o: const.h type.h address.h flag.h globvar.h opcode.h scan.h
-! readsrc.o: const.h type.h flag.h file.h globvar.h macro.h scan.h source.h
-! scan.o: const.h type.h globvar.h scan.h 
-! table.o: const.h type.h globvar.h opcode.h scan.h
---- 1,18 ----
-! .include "../Makefile.inc"
-! .PATH:	../ld
-! 
-! CFLAGS		+=-Wall
-  LDFLAGS		=
-  
-! SRCS		=as.c assemble.c error.c express.c \
-! 		 genbin.c genlist.c genobj.c gensym.c \
-! 		 macro.c mops.c pops.c readsrc.c \
-! 		 scan.c table.c typeconv.c
-! 
-! PROG		=as86
-! 
-! BINDIR		= ${LOCALPREFIX}/bin
-! MANDIR		= ${LOCALPREFIX}/man
-! 
-! 
-! .include <bsd.prog.mk>
-*** as/as.c.orig	Sat Jul 10 21:03:52 1993
---- as/as.c	Sun Mar 26 12:11:09 1995
-***************
-*** 7,13 ****
-  
-  #include "const.h"
-  #include "type.h"
-- #include "byteord.h"
-  #include "macro.h"
-  #undef EXTERN
-  #define EXTERN
---- 7,12 ----
-***************
-*** 36,41 ****
---- 35,44 ----
-  #include <fcntl.h>
-  #include <unistd.h>
-  #endif
-+ 
-+ /* BSD #defines this in <machine/endian.h>, but with another sense */
-+ #undef BIG_ENDIAN
-+ #include "byteord.h"
-  
-  PUBLIC char hexdigit[] = "0123456789ABCDEF";	/* XXX - ld uses lower case */
-  
+--- as/Makefile.orig	Thu Apr 23 06:04:42 1992
++++ as/Makefile
+@@ -1,27 +1,18 @@
+-CFLAGS		=-O
++.include "../Makefile.inc"
++.PATH:	../ld
++
++CFLAGS		+=-Wall
+ LDFLAGS		=
+ 
+-OBJS		=as.o assemble.o error.o express.o \
+-		 genbin.o genlist.o genobj.o gensym.o \
+-		 macro.o mops.o pops.o readsrc.o \
+-		 scan.o table.o typeconv.o
+-
+-as: $(OBJS)
+-	$(CC) $(LDFLAGS) $(OBJS) -o as
+-	chmem =182000 as
+-
+-as.o: const.h type.h byteord.h macro.h file.h flag.h globvar.h
+-assemble.o: const.h type.h address.h globvar.h opcode.h scan.h
+-error.o: const.h type.h
+-express.o: const.h type.h address.h globvar.h scan.h source.h
+-genbin.o: const.h type.h address.h file.h globvar.h
+-genlist.o: const.h type.h address.h flag.h file.h globvar.h macro.h scan.h \
+-	   source.h
+-genobj.o: const.h type.h address.h file.h globvar.h
+-gensym.o: const.h type.h flag.h file.h globvar.h
+-macro.o: const.h type.h globvar.h scan.h macro.h
+-mops.o: const.h type.h globvar.h opcode.h scan.h address.h
+-pops.o: const.h type.h address.h flag.h globvar.h opcode.h scan.h
+-readsrc.o: const.h type.h flag.h file.h globvar.h macro.h scan.h source.h
+-scan.o: const.h type.h globvar.h scan.h 
+-table.o: const.h type.h globvar.h opcode.h scan.h
++SRCS		=as.c assemble.c error.c express.c \
++		 genbin.c genlist.c genobj.c gensym.c \
++		 macro.c mops.c pops.c readsrc.c \
++		 scan.c table.c typeconv.c
++
++PROG		=as86
++
++BINDIR		= ${LOCALPREFIX}/bin
++MANDIR		= ${LOCALPREFIX}/man
++
++
++.include <bsd.prog.mk>
diff --git a/devel/bcc/patches/patch-ac b/devel/bcc/patches/patch-ac
index d3e3d3b8853..12061203f50 100644
--- a/devel/bcc/patches/patch-ac
+++ b/devel/bcc/patches/patch-ac
@@ -1,43 +1,36 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/12/25 22:46:32 wiz Exp $
 
-*** bcc/Makefile.orig	Thu Mar  9 11:43:29 1995
---- bcc/Makefile	Sun Mar 26 12:23:06 1995
-***************
-*** 1,14 ****
-! CFLAGS		=-O -DNSIG=32
-  LDFLAGS 	=
-  
-! bcc: bcc.c
-! 	$(CC) $(CFLAGS) $(LDFLAGS) $@.c -o $@
-  
-! bcc09: bcc.c
-! 	$(CC) -DMC6809 $(CFLAGS) $(LDFLAGS) bcc.c -o $@
-  
-! ccc: bcc.c
-! 	$(CC) -DCCC $(CFLAGS) $(LDFLAGS) bcc.c -o $@
-  
-! clean:
-! 	rm -f bcc bcc09 ccc
---- 1,22 ----
-! .include "../Makefile.inc"
-! 
-! CFLAGS		+=-DNSIG=32
-! #CFLAGS		+=-Wall		# too many warnings
-  LDFLAGS 	=
-  
-! PROG		=bcc-cc1
-! 
-! SRCS		=assign.c declare.c gencode.c label.c preserve.c type.c \
-! 		 bcc-cc1.c express.c genloads.c loadexp.c scan.c \
-! 		 exptree.c glogcode.c longop.c softop.c codefrag.c \
-! 		 floatop.c hardop.c output.c state.c debug.c function.c \
-! 		 input.c preproc.c table.c
-! 
-  
-! BINDIR		= ${LOCALPREFIX}/lib/bcc
-! MANDIR		= ${LOCALPREFIX}/man
-  
-! beforeinstall:
-! 		-mkdir -p ${LOCALPREFIX}/lib/bcc
-  
-! .include <bsd.prog.mk>
+--- bcc/Makefile.orig	Thu Mar  9 11:43:29 1995
++++ bcc/Makefile
+@@ -1,14 +1,22 @@
+-CFLAGS		=-O -DNSIG=32
++.include "../Makefile.inc"
++
++CFLAGS		+=-DNSIG=32
++#CFLAGS		+=-Wall		# too many warnings
+ LDFLAGS 	=
+ 
+-bcc: bcc.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) $@.c -o $@
++PROG		=bcc-cc1
++
++SRCS		=assign.c declare.c gencode.c label.c preserve.c type.c \
++		 bcc-cc1.c express.c genloads.c loadexp.c scan.c \
++		 exptree.c glogcode.c longop.c softop.c codefrag.c \
++		 floatop.c hardop.c output.c state.c debug.c function.c \
++		 input.c preproc.c table.c
++
+ 
+-bcc09: bcc.c
+-	$(CC) -DMC6809 $(CFLAGS) $(LDFLAGS) bcc.c -o $@
++BINDIR		= ${LOCALPREFIX}/lib/bcc
++MANDIR		= ${LOCALPREFIX}/man
+ 
+-ccc: bcc.c
+-	$(CC) -DCCC $(CFLAGS) $(LDFLAGS) bcc.c -o $@
++beforeinstall:
++		-mkdir -p ${LOCALPREFIX}/lib/bcc
+ 
+-clean:
+-	rm -f bcc bcc09 ccc
++.include <bsd.prog.mk>
diff --git a/devel/bcc/patches/patch-ag b/devel/bcc/patches/patch-ag
index b9e60176661..e7537acde83 100644
--- a/devel/bcc/patches/patch-ag
+++ b/devel/bcc/patches/patch-ag
@@ -1,8 +1,27 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:40:21 agc Exp $
+$NetBSD: patch-ag,v 1.3 2001/12/25 22:46:32 wiz Exp $
 
---- as/as.c.orig	Thu Jul 16 17:18:03 1998
-+++ as/as.c	Thu Jul 16 17:18:13 1998
-@@ -160,7 +160,7 @@
+--- as/as.c.orig	Sat Jul 10 21:03:52 1993
++++ as/as.c	Tue Dec 25 23:03:46 2001
+@@ -7,7 +7,6 @@
+ 
+ #include "const.h"
+ #include "type.h"
+-#include "byteord.h"
+ #include "macro.h"
+ #undef EXTERN
+ #define EXTERN
+@@ -37,6 +36,10 @@
+ #include <unistd.h>
+ #endif
+ 
++/* BSD #defines this in <machine/endian.h>, but with another sense */
++#undef BIG_ENDIAN
++#include "byteord.h"
++
+ PUBLIC char hexdigit[] = "0123456789ABCDEF";	/* XXX - ld uses lower case */
+ 
+ PRIVATE struct block_s hid_blockstak[MAXBLOCK];	/* block stack */
+@@ -157,7 +160,7 @@
  {
      char *arg;
      bool_t isnextarg;
diff --git a/devel/bcc/patches/patch-aq b/devel/bcc/patches/patch-aq
new file mode 100644
index 00000000000..f660fd18c58
--- /dev/null
+++ b/devel/bcc/patches/patch-aq
@@ -0,0 +1,23 @@
+$NetBSD: patch-aq,v 1.1 2001/12/25 22:46:32 wiz Exp $
+
+--- ld/ld.c.orig	Sat Feb 19 23:36:05 1994
++++ ld/ld.c
+@@ -3,7 +3,6 @@
+ /* Copyright (C) 1994 Bruce Evans */
+ 
+ #include "const.h"
+-#include "byteord.h"
+ #include "type.h"
+ #include "globvar.h"
+ 
+@@ -25,6 +24,10 @@
+ #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