diff options
Diffstat (limited to 'devel/bcc')
| -rw-r--r-- | devel/bcc/Makefile | 29 | ||||
| -rw-r--r-- | devel/bcc/distinfo | 7 | ||||
| -rw-r--r-- | devel/bcc/files/Makefile.as | 12 | ||||
| -rw-r--r-- | devel/bcc/files/Makefile.bcc | 24 | ||||
| -rw-r--r-- | devel/bcc/files/Makefile.bcc-cc1 | 17 | ||||
| -rw-r--r-- | devel/bcc/files/Makefile.ld | 9 | ||||
| -rw-r--r-- | devel/bcc/files/Makefile.main | 5 | ||||
| -rw-r--r-- | devel/bcc/patches/patch-aa | 37 | ||||
| -rw-r--r-- | devel/bcc/patches/patch-ab | 47 | ||||
| -rw-r--r-- | devel/bcc/patches/patch-ac | 36 | ||||
| -rw-r--r-- | devel/bcc/patches/patch-ao | 9 | ||||
| -rw-r--r-- | devel/bcc/patches/patch-ap | 19 |
12 files changed, 68 insertions, 183 deletions
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile index 8bfa76a11d7..b017e08be94 100644 --- a/devel/bcc/Makefile +++ b/devel/bcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:02 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2006/10/22 06:31:43 rillig Exp $ DISTNAME= bcc PKGNAME= bcc-95.3.12 @@ -12,16 +12,25 @@ NOT_FOR_PLATFORM+= Interix-*-* # no <a.out.h> MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q} +MAKE_ENV+= BINDIR=${PREFIX}/bin +MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} MANCOMPRESSED_IF_MANZ= yes -do-configure: - ${RM} -f ${WRKSRC}/as/typeconv.o - ${MV} ${WRKSRC}/bcc ${WRKSRC}/bcc-cc1 - ${MKDIR} ${WRKSRC}/bcc - ${CP} ${FILESDIR}/Makefile.bcc ${WRKSRC}/bcc/Makefile - ${CP} ${FILESDIR}/ld86.1 ${WRKSRC}/ld/ - ${CP} ${FILESDIR}/as86.1 ${WRKSRC}/as/ - ${CP} ${FILESDIR}/bcc.1 ${WRKSRC}/bcc/ - ${CP} ${FILESDIR}/bcc-cc1.1 ${WRKSRC}/bcc-cc1/ +INSTALLATION_DIRS= bin lib/bcc ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 + +post-extract: + set -e; \ + cd ${FILESDIR}; \ + mkdir ${WRKSRC}/bcc-cc1; \ + cp Makefile.main ${WRKSRC}/Makefile; \ + cp Makefile.ld ${WRKSRC}/ld/Makefile; \ + cp ld86.1 ${WRKSRC}/ld/; \ + cp Makefile.as ${WRKSRC}/as/Makefile; \ + cp as86.1 ${WRKSRC}/as/; \ + cp Makefile.bcc ${WRKSRC}/bcc/Makefile; \ + cp bcc.1 ${WRKSRC}/bcc/; \ + cp Makefile.bcc-cc1 ${WRKSRC}/bcc-cc1/Makefile; \ + cp bcc-cc1.1 ${WRKSRC}/bcc-cc1/ + rm -f ${WRKSRC}/as/typeconv.o .include "../../mk/bsd.pkg.mk" diff --git a/devel/bcc/distinfo b/devel/bcc/distinfo index 281e48fc4a1..bd9031a0719 100644 --- a/devel/bcc/distinfo +++ b/devel/bcc/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.14 2006/10/10 06:56:05 uebayasi Exp $ +$NetBSD: distinfo,v 1.15 2006/10/22 06:31:43 rillig Exp $ SHA1 (bcc.tar.gz) = 6a5c47bde0a6ddf82b65569883a5a490deb7e9b2 RMD160 (bcc.tar.gz) = 6ce1a333bb4ffa36d9cea5c116925f74db64345e Size (bcc.tar.gz) = 214834 bytes -SHA1 (patch-aa) = 3bce844ad121bce8de4110e0384b4d9885acf663 -SHA1 (patch-ab) = c8770a046256c59c924615ca27da962978ae5a20 -SHA1 (patch-ac) = 0eb5dd2c00ad09ad4ca9611cb0449248f3cefd27 SHA1 (patch-ad) = b1e609a0436132d4a7f6893cc2dab89f77cde12e SHA1 (patch-ae) = ede27bbd8f1cc92fe047f1dc687881660d6b7a96 SHA1 (patch-af) = df7c41fb3a200145496b38694de2f927d5f108a9 @@ -17,8 +14,6 @@ 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 diff --git a/devel/bcc/files/Makefile.as b/devel/bcc/files/Makefile.as new file mode 100644 index 00000000000..ab9ea7c2aa2 --- /dev/null +++ b/devel/bcc/files/Makefile.as @@ -0,0 +1,12 @@ +# $NetBSD: Makefile.as,v 1.1 2006/10/22 06:31:43 rillig Exp $ +# + +.PATH: ../ld + +PROG= as86 +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 +WARNS= 0 + +.include <bsd.prog.mk> diff --git a/devel/bcc/files/Makefile.bcc b/devel/bcc/files/Makefile.bcc index 9e9dd48741f..9c0e90bace3 100644 --- a/devel/bcc/files/Makefile.bcc +++ b/devel/bcc/files/Makefile.bcc @@ -1,23 +1,9 @@ -# $NetBSD: Makefile.bcc,v 1.2 1998/08/07 10:40:20 agc Exp $ +# $NetBSD: Makefile.bcc,v 1.3 2006/10/22 06:31:43 rillig Exp $ # -.include "../Makefile.inc" - -.PATH: ../bcc-cc1 - -CFLAGS = -DNSIG=32 -CFLAGS += -Wall -CFLAGS += -DLOCALPREFIX=\"${LOCALPREFIX}\" -LDFLAGS = - - -SRCS = bcc.c - -PROG = bcc - -BINDIR = ${LOCALPREFIX}/bin -MANDIR = ${LOCALPREFIX}/man - -WARNS = 0 +PROG= bcc +CPPFLAGS+= -DNSIG=32 +CPPFLAGS+= -DLOCALPREFIX=\"${PREFIX}\" +WARNS= 0 .include <bsd.prog.mk> diff --git a/devel/bcc/files/Makefile.bcc-cc1 b/devel/bcc/files/Makefile.bcc-cc1 new file mode 100644 index 00000000000..1d7024f7809 --- /dev/null +++ b/devel/bcc/files/Makefile.bcc-cc1 @@ -0,0 +1,17 @@ +# $NetBSD: Makefile.bcc-cc1,v 1.1 2006/10/22 06:31:43 rillig Exp $ +# + +.PATH: ../bcc + +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 +CPPFLAGS+= -DNSIG=32 +CPPFLAGS+= -DLOCALPREFIX=\"${PREFIX}\" +WARNS= 0 +BINDIR= ${PREFIX}/lib/bcc + +.include <bsd.prog.mk> diff --git a/devel/bcc/files/Makefile.ld b/devel/bcc/files/Makefile.ld new file mode 100644 index 00000000000..62beffd18f2 --- /dev/null +++ b/devel/bcc/files/Makefile.ld @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.ld,v 1.1 2006/10/22 06:31:43 rillig Exp $ +# + +PROG= ld86 +SRCS= dumps.c io.c ld.c readobj.c table.c typeconv.c writebin.c +CPPFLAGS+= -DBSD_A_OUT -DSTANDARD_GNU_A_OUT +WARNS= 0 + +.include <bsd.prog.mk> diff --git a/devel/bcc/files/Makefile.main b/devel/bcc/files/Makefile.main new file mode 100644 index 00000000000..d628c536aa2 --- /dev/null +++ b/devel/bcc/files/Makefile.main @@ -0,0 +1,5 @@ +# $NetBSD: Makefile.main,v 1.1 2006/10/22 06:31:43 rillig Exp $ + +SUBDIR= ld as bcc-cc1 bcc + +.include <bsd.subdir.mk> diff --git a/devel/bcc/patches/patch-aa b/devel/bcc/patches/patch-aa deleted file mode 100644 index 9a5b91daf61..00000000000 --- a/devel/bcc/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2006/10/10 06:56:05 uebayasi Exp $ - ---- 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 --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 -+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 deleted file mode 100644 index 5d6e446a852..00000000000 --- a/devel/bcc/patches/patch-ab +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2006/10/10 06:56:05 uebayasi Exp $ - ---- as/Makefile.orig 1992-04-23 06:04:42.000000000 +0200 -+++ as/Makefile -@@ -1,27 +1,17 @@ --CFLAGS =-O -+.include "../Makefile.inc" -+.PATH: ../ld -+ - 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 deleted file mode 100644 index 5f83f47d105..00000000000 --- a/devel/bcc/patches/patch-ac +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/10/10 06:56:05 uebayasi Exp $ - ---- bcc/Makefile.orig 1995-03-09 11:43:29.000000000 +0100 -+++ 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-ao b/devel/bcc/patches/patch-ao deleted file mode 100644 index 5f9bc046e99..00000000000 --- a/devel/bcc/patches/patch-ao +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2006/10/10 06:56:05 uebayasi Exp $ - ---- Makefile.orig 2006-10-03 16:59:07.000000000 +0200 -+++ Makefile -@@ -0,0 +1,4 @@ -+ -+SUBDIR = ld as bcc-cc1 bcc -+ -+.include <bsd.subdir.mk> diff --git a/devel/bcc/patches/patch-ap b/devel/bcc/patches/patch-ap deleted file mode 100644 index 88573ce38fb..00000000000 --- a/devel/bcc/patches/patch-ap +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2006/10/10 06:56:05 uebayasi Exp $ - ---- Makefile.inc.orig 2006-10-03 16:59:07.000000000 +0200 -+++ Makefile.inc -@@ -0,0 +1,14 @@ -+# -+# Makefile.inc -+# -+# This file has been created by the "configure" script; DO NOT EDIT. -+# -+# Edit the port's Makefile ${PREFIX} variable should you wish to -+# override this, and reconfigure. -+# -+ -+LOCALPREFIX = ${LOCALBASE} -+ -+# Make sure we always install man- and catpages to have a consistent PLIST -+ -+MANINSTALL= catinstall maninstall |