Fix stage violation

5 files changed, 186 insertions, 231 deletions

diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index a4979e8139e0..ce184d7aab3f 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -13,7 +13,4 @@ USES=		uidfix
 
 CONFLICTS=	bin86-[0-9]* dev86-[0-9]*
 
-pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/bcc
-
 .include <bsd.port.mk>
diff --git a/devel/bcc/files/patch-as b/devel/bcc/files/patch-as
index e2e766db0dc5..95942d9d7fc1 100644
--- a/devel/bcc/files/patch-as
+++ b/devel/bcc/files/patch-as
@@ -1,75 +1,65 @@
-*** 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/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	1992-04-23 04:04:42 UTC
++++ 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
++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
+ 
+-as: $(OBJS)
+-	$(CC) $(LDFLAGS) $(OBJS) -o as
+-	chmem =182000 as
++PROG		=as86
+ 
+-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
++BINDIR		= ${LOCALPREFIX}/bin
++MANDIR		= ${LOCALPREFIX}/man/man
++
++
++.include <bsd.prog.mk>
+--- as/as.c.orig	1993-07-10 19:03:52 UTC
++++ as/as.c
+@@ -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 */
diff --git a/devel/bcc/files/patch-bcc b/devel/bcc/files/patch-bcc
index 7edb98ea93de..9d7af912e392 100644
--- a/devel/bcc/files/patch-bcc
+++ b/devel/bcc/files/patch-bcc
@@ -1,86 +1,65 @@
-*** 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/man
-  
-! beforeinstall:
-! 		-mkdir -p ${LOCALPREFIX}/lib/bcc
-  
-! .include <bsd.prog.mk>
-*** bcc/bcc.c.orig	Sat Jul 17 14:49:49 1993
---- bcc/bcc.c	Sun Mar 26 12:27:58 1995
-***************
-*** 27,46 ****
-  #define P(x)	()
-  #endif
-  
-! #define AS	"as"
-  #define BAS86
-  #define BCC86
-! #define CC1	"cc1"
-  #define CC1_MINUS_O_BROKEN	FALSE
-! #define CPP	"cpp"		/* normally a link to /usr/bin/bcc-cc1 */
-  #define CPPFLAGS	"-E"
-  #define CRT0	"crt0.o"
-  #define GCC	"gcc"
-! #define LD	"ld"
-! #define STANDARD_CRT0_0_PREFIX	"/usr/local/lib/i86/"
-! #define STANDARD_CRT0_3_PREFIX	"/usr/local/lib/i386/"
-! #define STANDARD_EXEC_PREFIX	"/usr/local/libexec/i386/bcc/"
-! #define STANDARD_EXEC_PREFIX_2	"/usr/bin/"
-  
-  #ifdef CCC
-  #undef BCC86
---- 27,46 ----
-  #define P(x)	()
-  #endif
-  
-! #define AS	"as86"
-  #define BAS86
-  #define BCC86
-! #define CC1	"bcc-cc1"
-  #define CC1_MINUS_O_BROKEN	FALSE
-! #define CPP	"bcc-cc1"	/* normally a link to /usr/bin/bcc-cc1 */
-  #define CPPFLAGS	"-E"
-  #define CRT0	"crt0.o"
-  #define GCC	"gcc"
-! #define LD	"ld86"
-! #define STANDARD_CRT0_0_PREFIX	LOCALPREFIX "/lib/bcc/i86/"
-! #define STANDARD_CRT0_3_PREFIX	LOCALPREFIX "/lib/bcc/i386/"
-! #define STANDARD_EXEC_PREFIX	LOCALPREFIX "/lib/bcc/"
-! #define STANDARD_EXEC_PREFIX_2	LOCALPREFIX "/bin/"
-  
-  #ifdef CCC
-  #undef BCC86
+--- bcc/Makefile.orig	1995-03-09 10:43:29 UTC
++++ 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
+ 
+-bcc09: bcc.c
+-	$(CC) -DMC6809 $(CFLAGS) $(LDFLAGS) bcc.c -o $@
++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
+ 
+-ccc: bcc.c
+-	$(CC) -DCCC $(CFLAGS) $(LDFLAGS) bcc.c -o $@
+ 
+-clean:
+-	rm -f bcc bcc09 ccc
++BINDIR		= ${LOCALPREFIX}/lib/bcc
++MANDIR		= ${LOCALPREFIX}/man/man
++
++beforeinstall:
++	-mkdir -p ${DESTDIR}${LOCALPREFIX}/lib/bcc
++
++.include <bsd.prog.mk>
+--- bcc/bcc.c.orig	1993-07-17 12:49:49 UTC
++++ bcc/bcc.c
+@@ -27,20 +27,20 @@
+ #define P(x)	()
+ #endif
+ 
+-#define AS	"as"
++#define AS	"as86"
+ #define BAS86
+ #define BCC86
+-#define CC1	"cc1"
++#define CC1	"bcc-cc1"
+ #define CC1_MINUS_O_BROKEN	FALSE
+-#define CPP	"cpp"		/* normally a link to /usr/bin/bcc-cc1 */
++#define CPP	"bcc-cc1"	/* normally a link to /usr/bin/bcc-cc1 */
+ #define CPPFLAGS	"-E"
+ #define CRT0	"crt0.o"
+ #define GCC	"gcc"
+-#define LD	"ld"
+-#define STANDARD_CRT0_0_PREFIX	"/usr/local/lib/i86/"
+-#define STANDARD_CRT0_3_PREFIX	"/usr/local/lib/i386/"
+-#define STANDARD_EXEC_PREFIX	"/usr/local/libexec/i386/bcc/"
+-#define STANDARD_EXEC_PREFIX_2	"/usr/bin/"
++#define LD	"ld86"
++#define STANDARD_CRT0_0_PREFIX	LOCALPREFIX "/lib/bcc/i86/"
++#define STANDARD_CRT0_3_PREFIX	LOCALPREFIX "/lib/bcc/i386/"
++#define STANDARD_EXEC_PREFIX	LOCALPREFIX "/lib/bcc/"
++#define STANDARD_EXEC_PREFIX_2	LOCALPREFIX "/bin/"
+ 
+ #ifdef CCC
+ #undef BCC86
diff --git a/devel/bcc/files/patch-ld b/devel/bcc/files/patch-ld
index af63cb038c09..33312814ca2e 100644
--- a/devel/bcc/files/patch-ld
+++ b/devel/bcc/files/patch-ld
@@ -1,66 +1,56 @@
-*** 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/man
-! 
-! beforeinstall:
-! 		-mkdir -p ${BINDIR}
-!		-mkdir -p ${MANDIR}1
-! 
-! .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	1994-02-19 22:32:12 UTC
++++ 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
++PROG		=ld86
+ 
+-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
++BINDIR		=${LOCALPREFIX}/bin
++MANDIR		=${LOCALPREFIX}/man/man
++
++beforeinstall:
++	-mkdir -p ${DESTDIR}${BINDIR}
++	-mkdir -p ${DESTDIR}${MANDIR}1
++
++.include <bsd.prog.mk>
+--- ld/ld.c.orig	1994-02-19 22:36:05 UTC
++++ ld/ld.c
+@@ -3,7 +3,6 @@
+ /* Copyright (C) 1994 Bruce Evans */
+ 
+ #include "const.h"
+-#include "byteord.h"
+ #include "type.h"
+ #include "globvar.h"
+ 
+@@ -26,6 +25,10 @@
+ #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/pkg-plist b/devel/bcc/pkg-plist
index 9e6309bb3cdc..287bd451f632 100644
--- a/devel/bcc/pkg-plist
+++ b/devel/bcc/pkg-plist
@@ -6,4 +6,3 @@ man/man1/as86.1.gz
 man/man1/bcc-cc1.1.gz
 man/man1/bcc.1.gz
 man/man1/ld86.1.gz
-@dirrm lib/bcc