use the boehm-gc package instead of the one included with sdcc.

this fixes sdcc on alpha, and probably sparc and others.

also include a slew of missing headers.

22 files changed, 222 insertions, 27 deletions

diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 5ad0c43f81a..ff559eb0917 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/23 17:35:41 wulf Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/29 16:15:15 dmcmahill Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.2.1-src
@@ -19,6 +19,9 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 # Use of bison fixes this problem for now.
 #
 BUILD_DEPENDS+=	bison-*:../../devel/bison
+# we link to the static boehm-gc library so we only
+# need this at compile time
+BUILD_DEPENDS+=	boehm-gc-*:../../devel/boehm-gc
 YACC=		bison
 
 GNU_CONFIGURE=	yes
@@ -34,6 +37,7 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${WRKDIR}/include
 post-extract:
 	${MKDIR} ${WRKDIR}/include
 	${LN} -fs /usr/include/sys/endian.h ${WRKDIR}/include
+	${RM} -f ${WRKSRC}/as/mcs51/string.h ${WRKSRC}/as/z80/string.h
 .endif
 
 post-install:
diff --git a/devel/sdcc/distinfo b/devel/sdcc/distinfo
index 9ecebb13808..ed575bf8bb6 100644
--- a/devel/sdcc/distinfo
+++ b/devel/sdcc/distinfo
@@ -1,20 +1,33 @@
-$NetBSD: distinfo,v 1.3 2001/04/23 17:56:01 wulf Exp $
+$NetBSD: distinfo,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $
 
 SHA1 (sdcc-2.2.1-src.tar.gz) = c0d448bbdc86620d87b781f62635c51ab44b2235
 Size (sdcc-2.2.1-src.tar.gz) = 2015592 bytes
-SHA1 (patch-aa) = f0d229bb5d070f565bdeccd11c45a0395044fbf3
+SHA1 (patch-aa) = 94c041b23f72f0bd51ef76625c450f4938811808
 SHA1 (patch-ab) = 41d6d664da79ba97061d74428dc9cd3d3329901c
 SHA1 (patch-ac) = 1f02ed2239cc8c5c8a4286303bf0d6fa87ac42d8
 SHA1 (patch-ad) = 87e80d25073d3e225c2094145df64867c287ad30
-SHA1 (patch-ae) = 3bcea3455bbcdeabde9ab637b6377b1d05bad9cf
-SHA1 (patch-af) = 6e4b500fac97e70f963175fea6c9d77d8e670a98
+SHA1 (patch-ae) = 5f6414ea1c00524efbf95745532471035afbfd52
+SHA1 (patch-af) = eda3a2f04a7a929ba117abab5a15283a5c47ef12
 SHA1 (patch-ag) = 966234636ef78fa4bc46bb959664f27ef386a01d
 SHA1 (patch-ah) = cd19f7fa5a3c684eaf8982a4866bb7691f368ffa
 SHA1 (patch-ai) = 40df752b589e746d568de5af6e0e589445a57632
 SHA1 (patch-aj) = 9f936132c94b4920df1a276dbebfc1f050ef7ac0
 SHA1 (patch-ak) = 412efd5a8ba3713d0efd7e7fa994deaae5e03507
-SHA1 (patch-al) = 596c86a46bf158603bc3d51825384e7348f8052c
-SHA1 (patch-am) = 515c3b35cd07f62dee6ead90f844e058fb4d625c
-SHA1 (patch-an) = 07ef83ad0c375e4c1bad32b1511f21438bea7628
-SHA1 (patch-ao) = fb6bb2dc221562ca8a2450532a52ac6f93761e5d
+SHA1 (patch-al) = a1f8378bf7cf7a204743fdba44bdf5bd5f278a04
+SHA1 (patch-am) = d51ffefad32f11f96a6006596231aede183cb394
+SHA1 (patch-an) = 3fc879a9aa8aaf2ac9cac9e84d9c68d2be8747ef
+SHA1 (patch-ao) = 53aafbbe54ae7eb7b0ad0954352d4a0ad4650f4a
 SHA1 (patch-ap) = 396c3de9496fe717dcccd9404472cfbe0654669e
+SHA1 (patch-aq) = ba2d4e09cb07990399c566f0b364497bdc438a37
+SHA1 (patch-ar) = 71dd271f7ad7a506a54b116d083eb77f34a23f2c
+SHA1 (patch-as) = 79a1234f35a8e072ba42e89e86989a7efe54d836
+SHA1 (patch-at) = 3a41e9e1fc8d26baa6cbef1b666481d9977a2f98
+SHA1 (patch-au) = 36e6e5470112ba8c813b98f6e2283accb9d4f115
+SHA1 (patch-av) = 21802d0892891719b116adfc5bfdab60fabd32c3
+SHA1 (patch-aw) = 8429c7adf50e82629c6638a0f722ffc08eccfd3c
+SHA1 (patch-ax) = 9729ccb4b42412ea189d55a916d0b6093fe6cba6
+SHA1 (patch-ay) = e48cff86a76fe9225e5461b29288f94e7a44f308
+SHA1 (patch-az) = 98c998118350d7686ab0ba31145ee7d6db9d7cfa
+SHA1 (patch-ba) = f0cfc1b1a92844c6a4beadfbb72650bddf36f6a0
+SHA1 (patch-bb) = 34c131a28d4f5c56df14fa22f73a51262f67bd15
+SHA1 (patch-bc) = 5666dd713f32155aba56a744707eb86d249aee5b
diff --git a/devel/sdcc/patches/patch-aa b/devel/sdcc/patches/patch-aa
index f9e7c102d16..745686f2ff3 100644
--- a/devel/sdcc/patches/patch-aa
+++ b/devel/sdcc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/04/23 17:33:06 wulf Exp $ 
+$NetBSD: patch-aa,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $ 
 
 --- as/z80/Makefile.in.orig	Mon Apr  9 21:38:43 2001
 +++ as/z80/Makefile.in	Mon Apr  9 21:38:59 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2001/04/23 17:33:06 wulf Exp $
  infodir         = ${prefix}/info
  
 -CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR)
-+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -Dunix
++CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(LOCALBASE)/include -Dunix
  CFLAGS		= @CFLAGS@ -Wall -DINDEXLIB -DMLH_MAP -DUNIX -DSDK -funsigned-char -ggdb
  M_OR_MM		= @M_OR_MM@
  LDFLAGS		= @LDFLAGS@ -lm
diff --git a/devel/sdcc/patches/patch-ae b/devel/sdcc/patches/patch-ae
index c8b82429f58..9ad0db71a21 100644
--- a/devel/sdcc/patches/patch-ae
+++ b/devel/sdcc/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2001/04/23 17:33:06 wulf Exp $
+$NetBSD: patch-ae,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $
 
 --- support/cpp/Makefile.in.orig	Thu May  6 20:29:32 1999
 +++ support/cpp/Makefile.in	Fri Aug 25 23:17:26 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.3 2001/04/23 17:33:06 wulf Exp $
  
  STD_INC		= @sdcc_include_dir@
 -CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -D_FORASXXXX_
-+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -D_FORASXXXX_ -Dunix
++CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(LOCALBASE)/include -D_FORASXXXX_ -Dunix
  CFLAGS		= @CFLAGS@
  M_OR_MM		= @M_OR_MM@
  LDFLAGS		= @LDFLAGS@
diff --git a/devel/sdcc/patches/patch-af b/devel/sdcc/patches/patch-af
index 9752109363f..ce4e82dfeae 100644
--- a/devel/sdcc/patches/patch-af
+++ b/devel/sdcc/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2001/04/23 17:33:06 wulf Exp $
+$NetBSD: patch-af,v 1.4 2001/04/29 16:15:16 dmcmahill Exp $
 
 --- support/gc/Makefile.in.orig	Tue May 11 17:14:06 1999
 +++ support/gc/Makefile.in	Fri Aug 25 23:17:26 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.3 2001/04/23 17:33:06 wulf Exp $
  #  it for the C compiler.
  
 -CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I /usr/local/include
-+CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I /usr/local/include -Dunix
++CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I$(LOCALBASE)/include -Dunix
  
  # For dynamic library builds, it may be necessary to add flags to generate
  # PIC code, e.g. -fPIC on Linux.
diff --git a/devel/sdcc/patches/patch-al b/devel/sdcc/patches/patch-al
index 52238563615..6d75eb1d727 100644
--- a/devel/sdcc/patches/patch-al
+++ b/devel/sdcc/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 2001/04/23 17:33:06 wulf Exp $
+$NetBSD: patch-al,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
 
 --- Makefile.common.in.orig	Mon Apr  9 21:47:27 2001
 +++ Makefile.common.in	Mon Apr  9 21:47:40 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-al,v 1.2 2001/04/23 17:33:06 wulf Exp $
  HAVE_LIBGC	= @HAVE_LIBGC@
  DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 -CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR)
-+CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -Dunix
++CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(LOCALBASE)/include -Dunix
  ifeq ($(HAVE_LIBGC),1)
  else
  CPPFLAGS 	+= -I$(PRJDIR)/support
diff --git a/devel/sdcc/patches/patch-am b/devel/sdcc/patches/patch-am
index e589da095fb..7353a547731 100644
--- a/devel/sdcc/patches/patch-am
+++ b/devel/sdcc/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2001/04/23 17:33:06 wulf Exp $
+$NetBSD: patch-am,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
 
 --- device/include/Makefile.in.orig	Mon Apr  9 21:50:32 2001
 +++ device/include/Makefile.in	Mon Apr  9 21:50:47 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 2001/04/23 17:33:06 wulf Exp $
  srcdir          = @srcdir@
  
 -CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR)
-+CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -Dunix
++CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(LOCALBASE)/include -Dunix
  
  
  # Compiling entire program or any subproject
diff --git a/devel/sdcc/patches/patch-an b/devel/sdcc/patches/patch-an
index 89222875be0..f64c4aba76b 100644
--- a/devel/sdcc/patches/patch-an
+++ b/devel/sdcc/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2001/04/23 17:33:07 wulf Exp $
+$NetBSD: patch-an,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
 
 --- device/lib/Makefile.in.orig	Mon Apr  9 21:52:41 2001
 +++ device/lib/Makefile.in	Mon Apr  9 21:53:06 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.2 2001/04/23 17:33:07 wulf Exp $
  srcdir          = @srcdir@
  
 -CPPFLAGS        = -I$(INCDIR) 
-+CPPFLAGS        = -I$(INCDIR) -Dunix
++CPPFLAGS        = -I$(INCDIR) -I$(LOCALBASE)/include -Dunix
  CFLAGS		= 
  
  OBJECTS		= _atoi.rel _atol.rel _autobaud.rel _bp.rel _schar2fs.rel \
diff --git a/devel/sdcc/patches/patch-ao b/devel/sdcc/patches/patch-ao
index 979369d2338..914c1995be9 100644
--- a/devel/sdcc/patches/patch-ao
+++ b/devel/sdcc/patches/patch-ao
@@ -1,13 +1,25 @@
-$NetBSD: patch-ao,v 1.2 2001/04/23 17:33:07 wulf Exp $ 
+$NetBSD: patch-ao,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
 
---- debugger/mcs51/Makefile.in.orig	Mon Apr  9 21:55:03 2001
-+++ debugger/mcs51/Makefile.in	Mon Apr  9 21:55:16 2001
-@@ -27,7 +27,7 @@
- infodir         = ${prefix}/info
+--- debugger/mcs51/Makefile.in.orig	Sat Apr 29 18:25:05 2000
++++ debugger/mcs51/Makefile.in	Sun Apr 29 03:16:50 2001
+@@ -28,10 +28,10 @@
  
  STD_INC		= @sdcc_include_dir@
 -CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support
-+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support -Dunix
++CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support -I$(LOCALBASE)/include -Dunix
  CFLAGS		= @CFLAGS@
  M_OR_MM		= @M_OR_MM@
  LDFLAGS		= @LDFLAGS@
+ LIBS            = -lgc @LIBS@
+-LIBDIRS         = -L$(PRJDIR)/support/gc
++LIBDIRS         = -L$(LOCALBASE)/lib
+ 
+ 
+@@ -47,7 +47,4 @@
+ # ------------------------------------------
+ all: checkconf $(TARGET)
+-
+-$(PRJDIR)/support/gc/libgc.a:
+-	cd $(PRJDIR)/support/gc && $(MAKE)
+ 
+ # Compiling and installing everything and runing test
diff --git a/devel/sdcc/patches/patch-aq b/devel/sdcc/patches/patch-aq
new file mode 100644
index 00000000000..5d85b480aa5
--- /dev/null
+++ b/devel/sdcc/patches/patch-aq
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- Makefile.orig	Sat Sep 16 14:25:32 2000
++++ Makefile	Sun Apr 29 03:13:01 2001
+@@ -26,9 +26,4 @@
+ 
+ sdcc-libs:
+-ifeq ($(CROSS_LIBGC),1)
+-	$(MAKE) -C support/gc -f Makefile.cross
+-else
+-	$(MAKE) -C support/gc
+-endif
+ 	for lib in $(SDCC_LIBS); do $(MAKE) -C $$lib; done
+ 
diff --git a/devel/sdcc/patches/patch-ar b/devel/sdcc/patches/patch-ar
new file mode 100644
index 00000000000..1cf1748b751
--- /dev/null
+++ b/devel/sdcc/patches/patch-ar
@@ -0,0 +1,11 @@
+$NetBSD: patch-ar,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- debugger/mcs51/sdcdb.h.orig	Sat Apr 29 18:25:05 2000
++++ debugger/mcs51/sdcdb.h	Sun Apr 29 03:46:35 2001
+@@ -41,5 +41,5 @@
+ #else
+ 
+-#include "gc/gc.h"
++#include <gc.h>
+ 
+ #endif
diff --git a/devel/sdcc/patches/patch-as b/devel/sdcc/patches/patch-as
new file mode 100644
index 00000000000..a12f62a0e5c
--- /dev/null
+++ b/devel/sdcc/patches/patch-as
@@ -0,0 +1,11 @@
+$NetBSD: patch-as,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- src/SDCCglobl.h.orig	Sat Sep 30 15:39:35 2000
++++ src/SDCCglobl.h	Sun Apr 29 03:48:33 2001
+@@ -25,5 +25,5 @@
+ #else
+ 
+-#include "./gc/gc.h" 
++#include <gc.h>
+ 
+ #endif
diff --git a/devel/sdcc/patches/patch-at b/devel/sdcc/patches/patch-at
new file mode 100644
index 00000000000..6901e07a5ab
--- /dev/null
+++ b/devel/sdcc/patches/patch-at
@@ -0,0 +1,11 @@
+$NetBSD: patch-at,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- src/SDCChasht.h.orig	Tue Apr  4 21:31:45 2000
++++ src/SDCChasht.h	Sun Apr 29 03:49:32 2001
+@@ -37,5 +37,5 @@
+ #else
+ 
+-#include "./gc/gc.h" 
++#include <gc.h>
+ 
+ #endif
diff --git a/devel/sdcc/patches/patch-au b/devel/sdcc/patches/patch-au
new file mode 100644
index 00000000000..6e731a27074
--- /dev/null
+++ b/devel/sdcc/patches/patch-au
@@ -0,0 +1,11 @@
+$NetBSD: patch-au,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- src/SDCCset.h.orig	Fri Jan 28 16:55:30 2000
++++ src/SDCCset.h	Sun Apr 29 03:50:33 2001
+@@ -34,5 +34,5 @@
+ #else
+ 
+-#include "./gc/gc.h" 
++#include <gc.h>
+ 
+ #endif
diff --git a/devel/sdcc/patches/patch-av b/devel/sdcc/patches/patch-av
new file mode 100644
index 00000000000..d29982744de
--- /dev/null
+++ b/devel/sdcc/patches/patch-av
@@ -0,0 +1,10 @@
+$NetBSD: patch-av,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- src/Makefile.in.orig	Sat Sep 30 15:39:35 2000
++++ src/Makefile.in	Sun Apr 29 04:03:44 2001
+@@ -14,4 +14,5 @@
+ LIBS		= -lgc -lm @LIBS@
+ ifeq ($(HAVE_LIBGC), 1)
++LIBDIRS		= -L$(LOCALBASE)/lib
+ else
+ LIBDIRS		= -L$(PRJDIR)/support/gc
diff --git a/devel/sdcc/patches/patch-aw b/devel/sdcc/patches/patch-aw
new file mode 100644
index 00000000000..0876df9a26b
--- /dev/null
+++ b/devel/sdcc/patches/patch-aw
@@ -0,0 +1,23 @@
+$NetBSD: patch-aw,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- link/z80/lklibr.c.orig	Mon Jul 31 23:22:21 2000
++++ link/z80/lklibr.c	Sun Apr 29 04:24:57 2001
+@@ -21,4 +21,5 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <alloc.h>
+@@ -399,8 +400,10 @@
+ 
+ /* First entry in the library object symbol cache */
+-mlibraryfile libr = {
++mlibraryfile libr;
++/*= {
+ 	"", NULL, NULL
+ };
+-
++XXX need to init somewhere elsse
++*/
+ int fndsym( char *name )
+ {
diff --git a/devel/sdcc/patches/patch-ax b/devel/sdcc/patches/patch-ax
new file mode 100644
index 00000000000..dfd2afc04a4
--- /dev/null
+++ b/devel/sdcc/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- as/z80/aslist.c.orig	Mon Jul 31 23:22:21 2000
++++ as/z80/aslist.c	Sun Apr 29 10:49:26 2001
+@@ -15,7 +15,7 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <setjmp.h>
+ #include <string.h>
+-#include <alloc.h>
+ #include "asm.h"
+ 
diff --git a/devel/sdcc/patches/patch-ay b/devel/sdcc/patches/patch-ay
new file mode 100644
index 00000000000..1dee6d110d0
--- /dev/null
+++ b/devel/sdcc/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- as/z80/assym.c.orig	Mon Jul 31 23:22:21 2000
++++ as/z80/assym.c	Sun Apr 29 09:38:27 2001
+@@ -11,7 +11,7 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <setjmp.h>
+ #include <string.h>
+-#include <alloc.h>
+ #include "asm.h"
+ 
diff --git a/devel/sdcc/patches/patch-az b/devel/sdcc/patches/patch-az
new file mode 100644
index 00000000000..76460f6e7ba
--- /dev/null
+++ b/devel/sdcc/patches/patch-az
@@ -0,0 +1,12 @@
+$NetBSD: patch-az,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- link/z80/lksym.c.orig	Mon Jul 31 23:22:21 2000
++++ link/z80/lksym.c	Sun Apr 29 10:55:40 2001
+@@ -11,6 +11,6 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+-#include <alloc.h>
+ #include "aslink.h"
+ 
diff --git a/devel/sdcc/patches/patch-ba b/devel/sdcc/patches/patch-ba
new file mode 100644
index 00000000000..7f26f231d7f
--- /dev/null
+++ b/devel/sdcc/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- link/z80/lklist.c.orig	Mon Jul 31 23:22:21 2000
++++ link/z80/lklist.c	Sun Apr 29 10:55:04 2001
+@@ -11,6 +11,6 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+-#include <alloc.h>
+ #include "aslink.h"
+ 
diff --git a/devel/sdcc/patches/patch-bb b/devel/sdcc/patches/patch-bb
new file mode 100644
index 00000000000..b8c9dafd93d
--- /dev/null
+++ b/devel/sdcc/patches/patch-bb
@@ -0,0 +1,12 @@
+$NetBSD: patch-bb,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- link/z80/lkmain.c.orig	Mon Jul 31 23:22:21 2000
++++ link/z80/lkmain.c	Sun Apr 29 10:56:44 2001
+@@ -14,6 +14,6 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+-#include <alloc.h>
+ #include "aslink.h"
+ 
diff --git a/devel/sdcc/patches/patch-bc b/devel/sdcc/patches/patch-bc
new file mode 100644
index 00000000000..c8d3eddd510
--- /dev/null
+++ b/devel/sdcc/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+
+--- link/z80/lkrloc.c.orig	Mon Jul 31 23:22:21 2000
++++ link/z80/lkrloc.c	Sun Apr 29 11:32:18 2001
+@@ -15,6 +15,7 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+-#include <alloc.h>
++#include <ctype.h>
+ #include "aslink.h"
+