updated to boehm-gc 6.0 (gc6.0) which incorporated most of our patch.

On i386 aout/ELF, saprc ELF and macppc, 'cd ${WRKSRC}; make test' got
success and www/w3m package which depends on this runs.

11 files changed, 54 insertions, 413 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index bfe07e7be20..af7a7923914 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2001/05/04 01:28:14 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/09/08 00:36:09 kei Exp $
 # FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp
 #
 
-DISTNAME=		gc5.3
-PKGNAME=		boehm-gc-5.3
+DISTNAME=		gc6.0
+PKGNAME=		boehm-gc-6.0
 CATEGORIES=		devel
 MASTER_SITES=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
@@ -13,7 +13,6 @@ COMMENT=		Garbage collection and memory leak detection for C and C++
 
 USE_GMAKE=		# defined
 
-WRKSRC=			${WRKDIR}/gc
 MAKE_ENV+=		COPTS="${CFLAGS}"
 
 ALL_TARGET=		BSD-pkg-all
@@ -30,10 +29,17 @@ CFLAGS+=		-D__MIPSEL__
 .endif
 
 post-extract:
-	${MV} ${WRKSRC}/gc.man ${WRKSRC}/gc.man.in
+	${MV} ${WRKSRC}/doc/gc.man ${WRKSRC}/doc/gc.man.in
 
 pre-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
-		${WRKSRC}/gc.man.in > ${WRKSRC}/gc.man
+		${WRKSRC}/doc/gc.man.in > ${WRKSRC}/doc/gc.man
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/bsd-libgc.a ${PREFIX}/lib/libgc.a
+	${INSTALL_DATA} ${WRKSRC}/bsd-libleak.a ${PREFIX}/lib/libleak.a
+	${INSTALL_DATA} ${WRKSRC}/include/gc.h ${WRKSRC}/include/gc_cpp.h \
+	    ${PREFIX}/include
+	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${PREFIX}/man/man3/gc.3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 1ee43090f69..9d2aab5ee82 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/05/04 01:28:15 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/09/08 00:36:09 kei Exp $
 
-SHA1 (gc5.3.tar.gz) = b9acd4ac18ad56ca5b16dad23e5bf589720c6b8a
-Size (gc5.3.tar.gz) = 369125 bytes
-SHA1 (patch-aa) = 7985474afb5efbf80c7f140df066159b4220bd2b
-SHA1 (patch-ab) = 1168c658e55389d16cf3629195f1b7a21966b1dd
-SHA1 (patch-ac) = 4ea3367e7d54b2c2c55260445f2b57c1a2bfab74
-SHA1 (patch-ad) = 1a6fb30bf57d40b477ce08bfbb0cf860c2d25b00
-SHA1 (patch-ae) = 24aa52eec33fe25657514afa2aa025eff33b6380
-SHA1 (patch-af) = 98b8e418abfa95c34d6c6d17fa3b7256dadf41f2
-SHA1 (patch-ag) = 7beb9787669071a99c13ad4f04122eaf5a9839a4
-SHA1 (patch-ah) = 9863fcd96eb416f78b73fb579987ff10e8786205
-SHA1 (patch-ai) = c521f8c281e54b6f47c002a3866799b655417ee4
+SHA1 (gc6.0.tar.gz) = 9698826b33472b314d7b2eb640c1669ce05f5277
+Size (gc6.0.tar.gz) = 562188 bytes
+SHA1 (patch-aa) = e8558979454b3cff1f53b991648309ae0145080c
+SHA1 (patch-ac) = 38b22813cf2861dcbc9739d70f9fefe69acf3210
+SHA1 (patch-ad) = 66cdc0fdbf78c527b3fccfa54895a5f06d482268
+SHA1 (patch-ai) = aabb71b2e064d033290e595fa6addc9b779add15
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index 25fdcfdd961..d4991079492 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.10 2001/05/04 01:28:15 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2001/09/08 00:36:09 kei Exp $
 
---- Makefile.orig	Fri Sep 22 13:27:35 2000
-+++ Makefile
-@@ -10,14 +10,32 @@
+--- Makefile.orig	Fri Jul 27 03:47:41 2001
++++ Makefile	Fri Sep  7 15:58:41 2001
+@@ -11,8 +11,8 @@
+ # cord/de - builds dumb editor based on cords.
  ABI_FLAG= 
  CC=cc $(ABI_FLAG)
- HOSTCC=$(CC)
 -CXX=g++ $(ABI_FLAG)
 -AS=as $(ABI_FLAG)
 +CXX=c++ $(ABI_FLAG)
@@ -13,68 +13,32 @@ $NetBSD: patch-aa,v 1.10 2001/05/04 01:28:15 jlam Exp $
  #  The above doesn't work with gas, which doesn't run cpp.
  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
  #  Under Irix 6, you will have to specify the ABI (-o32, -n32, or -64)
- #  if you use something other than the default ABI on your machine.
+@@ -296,16 +296,23 @@
  
--CFLAGS= -O -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT
-+CFLAGS= -O -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT $(COPTS)
-+
+ all: gc.a gctest
+ 
+-BSD-pkg-all: bsd-libgc.a
 +LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
 +
 +BSD-pkg-all: bsd-libgc.a bsd-libleak.a
-+
-+bsd-libgc.a:
-+	$(MAKE) CFLAGS="$(CFLAGS)" clean c++-t
-+	mv gc.a bsd-libgc.a
-+
+ 
+ bsd-libgc.a:
+ 	$(MAKE) CFLAGS="$(CFLAGS)" clean c++-t
+ 	mv gc.a bsd-libgc.a
+ 
 +bsd-libleak.a:
 +	$(MAKE) CFLAGS="$(LEAKFLAGS)" clean c++-nt
 +	mv gc.a bsd-libleak.a
 +
-+BSD-pkg-install: BSD-pkg-all
-+	${BSD_INSTALL_DATA} bsd-libgc.a ${PREFIX}/lib/libgc.a
-+	${BSD_INSTALL_DATA} bsd-libleak.a ${PREFIX}/lib/libleak.a
-+	${BSD_INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
-+	${BSD_INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
+ BSD-pkg-install: BSD-pkg-all
+ 	${CP} bsd-libgc.a libgc.a
+ 	${INSTALL_DATA} libgc.a ${PREFIX}/lib
+ 	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
++	${INSTALL_MAN} doc/gc.man ${PREFIX}/man/man3/gc.3
  
- # For dynamic library builds, it may be necessary to add flags to generate
- # PIC code, e.g. -fPIC on Linux.
-@@ -181,7 +199,7 @@
-     gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h gc_alloc.h \
-     include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
-     solaris_threads.h backptr.h hpux_test_and_clear.s include/gc_gcj.h \
--    dbg_mlc.h $(CORD_SRCS)
-+    dbg_mlc.h sparc_netbsd_mach_dep.s $(CORD_SRCS)
- 
- OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
-            README test.c test_cpp.cc setjmp_t.c SMakefile.amiga \
-@@ -220,11 +238,9 @@
- # not time-critical anyway.
- # Set SPECIALCFLAGS to -q nodirect_code on Encore.
- 
--all: gc.a gctest
--
- pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h gcconfig.h mach_dep.o $(SRCS)
--	make -f PCR-Makefile depend
--	make -f PCR-Makefile
-+	$(MAKE) -f PCR-Makefile depend
-+	$(MAKE) -f PCR-Makefile
- 
- $(OBJS) test.o dyn_load.o dyn_load_sunos53.o: $(srcdir)/gc_priv.h $(srcdir)/gc_hdrs.h $(srcdir)/gc.h \
-     $(srcdir)/gcconfig.h $(srcdir)/gc_typed.h Makefile
-@@ -263,6 +279,12 @@
- 	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs`
- 	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a `./threadlibs`
- 
-+c++-t: c++
-+	./test_cpp 1
-+
-+c++-nt: c++
-+	@echo "Use ./test_cpp 1 to test the leak library"
-+
- c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
- 	rm -f dont_ar_4
- 	./if_mach SPARC SUNOS5 touch dont_ar_4
-@@ -271,7 +293,6 @@
+ pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \
+ include/private/gc_locks.h include/gc.h include/private/gcconfig.h \
+@@ -381,7 +388,6 @@
  	./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o
  	./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o
  	./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null
@@ -82,11 +46,3 @@ $NetBSD: patch-aa,v 1.10 2001/05/04 01:28:15 jlam Exp $
  	echo > c++
  
  dyn_load_sunos53.o: dyn_load.c
-@@ -322,6 +343,7 @@
- 	./if_mach SPARC SUNOS5 $(AS) -o mach_dep.o $(srcdir)/sparc_mach_dep.s
- 	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
- 	./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-+	./if_mach SPARC NETBSD $(AS) -o mach_dep.o $(srcdir)/sparc_netbsd_mach_dep.s
- 	./if_mach HP_PA HPUX $(AS) -o hpux_test_and_clear.o $(srcdir)/hpux_test_and_clear.s
- 	./if_mach HP_PA HPUX $(CC) -c -o md_tmp.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach HP_PA HPUX ld -r -o mach_dep.o md_tmp.o hpux_test_and_clear.o
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
deleted file mode 100644
index 7f1c1765020..00000000000
--- a/devel/boehm-gc/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2000/11/16 10:42:24 abs Exp $
-
---- dyn_load.c.orig	Tue Apr 25 17:01:16 2000
-+++ dyn_load.c
-@@ -50,7 +50,8 @@
- #if !defined(SUNOS4) && !defined(SUNOS5DL) && !defined(IRIX5) && \
-     !defined(MSWIN32) && !(defined(ALPHA) && defined(OSF1)) && \
-     !defined(HPUX) && !(defined(LINUX) && defined(__ELF__)) && \
--    !defined(RS6000) && !defined(SCO_ELF)
-+    !defined(RS6000) && !defined(SCO_ELF) && \
-+    !(defined(NETBSD) && defined(__ELF__))
-  --> We only know how to find data segments of dynamic libraries for the
-  --> above.  Additional SVR4 variants might not be too
-  --> hard to add.
-@@ -297,14 +298,19 @@
- # endif /* !USE_PROC ... */
- # endif /* SUNOS */
- 
--#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF)
-+#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-+    (defined(NETBSD) && defined(__ELF__))
- 
- /* Dynamic loading code for Linux running ELF. Somewhat tested on
-  * Linux/x86, untested but hopefully should work on Linux/Alpha. 
-  * This code was derived from the Solaris/ELF support. Thanks to
-  * whatever kind soul wrote that.  - Patrick Bridges */
- 
-+#if defined(NETBSD)
-+#include <sys/exec_elf.h>
-+#else
- #include <elf.h>
-+#endif
- #include <link.h>
- 
- /* Newer versions of Linux/Alpha and Linux/x86 define this macro.  We
diff --git a/devel/boehm-gc/patches/patch-ac b/devel/boehm-gc/patches/patch-ac
index 0a629b03f4a..248cc9b3582 100644
--- a/devel/boehm-gc/patches/patch-ac
+++ b/devel/boehm-gc/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.9 2000/11/16 10:42:24 abs Exp $
+$NetBSD: patch-ac,v 1.10 2001/09/08 00:36:10 kei Exp $
 
---- gc.man.in.orig	Tue Sep 21 16:55:00 1999
-+++ gc.man.in
+--- doc/gc.man.in.orig	Tue Sep 21 16:55:00 1999
++++ doc/gc.man.in
 @@ -9,7 +9,9 @@
  ... malloc(...) ...
  .br
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
index 93b046b0312..c1f52dde938 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,37 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2001/05/04 01:28:16 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2001/09/08 00:36:10 kei Exp $
 
---- gcconfig.h.orig	Mon Aug 28 16:56:19 2000
-+++ gcconfig.h
-@@ -27,6 +27,12 @@
- #    define LINUX
- # endif
- 
-+# if defined(__NetBSD__)
-+#    define NETBSD
-+#    undef unix
-+#    define unix 1	/* symbol unix is no longer defined in NetBSD */
-+# endif
-+
- /* Determine the machine type: */
- # if defined(sun) && defined(mc68000)
- #    define M68K
-@@ -50,10 +56,13 @@
- # endif
- # if defined(__NetBSD__) && defined(m68k)
- #    define M68K
--#    define NETBSD
- #    define mach_type_known
- # endif
--# if defined(__NetBSD__) && defined(arm32)
-+# if defined(__NetBSD__) && defined(__powerpc__)
-+#    define POWERPC
-+#    define mach_type_known
-+# endif
-+# if defined(__NetBSD__) && defined(__arm32__)
- #    define ARM32
- #    define NETBSD
- #    define mach_type_known
-@@ -67,6 +76,10 @@
+--- include/private/gcconfig.h.orig	Mon Aug 28 16:56:19 2000
++++ include/private/gcconfig.h
+@@ -75,6 +75,10 @@
  #    endif
  #    define mach_type_known
  # endif
@@ -42,144 +13,14 @@ $NetBSD: patch-ad,v 1.7 2001/05/04 01:28:16 jlam Exp $
  # if defined(mips) || defined(__mips)
  #    define MIPS
  #    if !defined(LINUX)
-@@ -81,6 +94,9 @@
- #	 endif
- #      endif
- #    endif /* !LINUX */
-+#    if defined(__NetBSD__) && defined(__MIPSEL__)
-+#      undef ULTRIX
-+#    endif
- #    define mach_type_known
- # endif
- # if defined(sequent) && defined(i386)
-@@ -114,7 +130,7 @@
- #   define mach_type_known
- # endif
- # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
--     && !defined(__OpenBSD__)
-+     && !defined(__OpenBSD__) && !(__NetBSD__)
- #   define SPARC
- #   define DRSNX
- #   define mach_type_known
-@@ -123,6 +139,10 @@
- #   define RS6000
- #   define mach_type_known
- # endif
-+# if defined(__NetBSD__) && defined(__sparc__)
-+#   define SPARC
-+#   define mach_type_known
-+# endif
- # if defined(_M_XENIX) && defined(_M_SYSV) && defined(_M_I386)
- 	/* The above test may need refinement	*/
- #   define I386
-@@ -172,7 +192,7 @@
- # endif
- # if defined(__alpha) || defined(__alpha__)
- #   define ALPHA
--#   if !defined(LINUX)
-+#   if !defined(LINUX) && !defined(NETBSD)
- #     define OSF1	/* a.k.a Digital Unix */
- #   endif
- #   define mach_type_known
-@@ -221,7 +241,6 @@
- # endif
- # if defined(__NetBSD__) && defined(i386)
- #   define I386
--#   define NETBSD
- #   define mach_type_known
- # endif
- # if defined(bsdi) && defined(i386)
-@@ -573,6 +592,14 @@
- #     define STACKBOTTOM ((ptr_t) 0xc0000000)
- #     define DATAEND	/* not needed */
- #   endif
-+#   ifdef NETBSD
-+#     define ALIGNMENT 4
-+#     define OS_TYPE "NETBSD"
-+#     define HEURISTIC2
-+      extern char etext;
-+#     define DATASTART GC_data_start
-+#     define DYNAMIC_LOADING
-+#   endif
- # endif
- 
- # ifdef VAX
-@@ -589,6 +616,10 @@
+@@ -690,6 +694,10 @@
+ #   ifdef ULTRIX
  #	define OS_TYPE "ULTRIX"
  #	define STACKBOTTOM ((ptr_t) 0x7fffc800)
- #   endif
++#   endif
 +#   ifdef NETBSD
 +#	define OS_TYPE "NETBSD"
 +#	define HEURISTIC2
-+#   endif
- # endif
- 
- # ifdef RT
-@@ -602,7 +633,6 @@
- #   define MACH_TYPE "SPARC"
- #   define ALIGNMENT 4	/* Required by hardware	*/
- #   define ALIGN_DOUBLE
--    extern int etext;
- #   ifdef SUNOS5
- #	define OS_TYPE "SUNOS5"
- 	extern int _etext;
-@@ -674,8 +704,20 @@
- #   ifdef OPENBSD
- #     define OS_TYPE "OPENBSD"
- #     define STACKBOTTOM ((ptr_t) 0xf8000000)
-+      extern int etext;
- #     define DATASTART ((ptr_t)(&etext))
  #   endif
-+#   ifdef NETBSD
-+#     define OS_TYPE "NETBSD"
-+#     define HEURISTIC2
-+#     ifdef __ELF__
-+#	define DATASTART GC_data_start
-+#	define DYNAMIC_LOADING
-+#     else
-+	extern char etext;
-+#	define DATASTART ((ptr_t)(&etext))
-+#     endif
-+#   endif
- # endif
- 
- # ifdef I386
-@@ -960,6 +1002,21 @@
- #	endif
- #	define DYNAMIC_LOADING
- #   endif
-+#   if defined(NETBSD) && defined(__MIPSEL__)
-+#     define ALIGNMENT 4
-+#     define OS_TYPE "NETBSD"
-+#     define HEURISTIC2
-+#     define USE_GENERIC_PUSH_REGS 1
-+#     ifdef __ELF__
-+        extern int etext;
-+#       define DATASTART GC_data_start
-+#       define NEED_FIND_LIMIT
-+#       define DYNAMIC_LOADING
-+#     else
-+#       define DATASTART ((ptr_t) 0x10000000)
-+#       define STACKBOTTOM ((ptr_t) 0x7ffff000)
-+#     endif /* _ELF_ */
-+#  endif
  # endif
  
- # ifdef RS6000
-@@ -1019,6 +1076,16 @@
- 	/* fp registers in some cases when the target is a 21264.  The assembly	*/
- 	/* code doesn't handle that yet, and version dependencies make that a	*/
- 	/* bit tricky.  Do the easy thing for now.				*/
-+#   ifdef NETBSD
-+#	define OS_TYPE "NETBSD"
-+#	define HEURISTIC2
-+#	define DATASTART GC_data_start
-+#	define ELFCLASS32 32
-+#	define ELFCLASS64 64
-+#	define ELF_CLASS ELFCLASS64
-+#   	define CPP_WORDSZ 64
-+#       define DYNAMIC_LOADING
-+#   endif
- #   ifdef OSF1
- #	define OS_TYPE "OSF1"
- #   	define DATASTART ((ptr_t) 0x140000000)
diff --git a/devel/boehm-gc/patches/patch-ae b/devel/boehm-gc/patches/patch-ae
deleted file mode 100644
index 91118defa92..00000000000
--- a/devel/boehm-gc/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2000/11/16 10:42:24 abs Exp $
-
---- mach_dep.c.orig	Fri Apr 14 13:57:14 2000
-+++ mach_dep.c
-@@ -220,8 +220,10 @@
- #       if defined(I386) &&!defined(OS2) &&!defined(SVR4) \
- 	&& (defined(__MINGW32__) || !defined(MSWIN32)) \
- 	&& !defined(SCO) && !defined(SCO_ELF) \
-- 	&& !(defined(LINUX)       && defined(__ELF__)) \
-+ 	&& !(defined(LINUX) && defined(__ELF__)) \
- 	&& !(defined(FREEBSD) && defined(__ELF__)) \
-+	&& !(defined(NETBSD) && defined(__ELF__)) \
-+	&& !(defined(OPENBSD) && defined(__ELF__)) \
- 	&& !defined(DOS4GW)
- 	/* I386 code, generic code does not appear to work */
- 	/* It does appear to work under OS2, and asms dont */
-@@ -236,7 +238,9 @@
- #       endif
- 
- #	if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
--	|| ( defined(I386) && defined(FREEBSD) && defined(__ELF__) )
-+	|| ( defined(I386) && defined(FREEBSD) && defined(__ELF__) ) \
-+	|| ( defined(I386) && defined(NETBSD) && defined(__ELF__) ) \
-+	|| ( defined(I386) && defined(OPENBSD) && defined(__ELF__) )
- 
- 	/* This is modified for Linux with ELF (Note: _ELF_ only) */
- 	/* This section handles FreeBSD with ELF. */
diff --git a/devel/boehm-gc/patches/patch-af b/devel/boehm-gc/patches/patch-af
deleted file mode 100644
index 7d2e63e0739..00000000000
--- a/devel/boehm-gc/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/11/16 10:42:24 abs Exp $
-
---- misc.c.orig	Tue Apr  4 17:37:29 2000
-+++ misc.c
-@@ -453,6 +453,9 @@
- 	/* This doesn't really work if the collector is in a shared library. */
- 	GC_init_linux_data_start();
- #   endif
-+#   if defined(NETBSD) && defined(__ELF__)
-+	GC_init_netbsd_elf();
-+#   endif
- #   ifdef SOLARIS_THREADS
- 	GC_thr_init();
- 	/* We need dirty bits in order to find live stack sections.	*/
diff --git a/devel/boehm-gc/patches/patch-ag b/devel/boehm-gc/patches/patch-ag
deleted file mode 100644
index 46e057d3f01..00000000000
--- a/devel/boehm-gc/patches/patch-ag
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2000/11/16 10:42:24 abs Exp $
-
---- os_dep.c.orig	Mon Apr 17 14:57:52 2000
-+++ os_dep.c
-@@ -161,6 +161,19 @@
-   }
- #endif
- 
-+#if defined(NETBSD) && defined(__ELF__)
-+  ptr_t GC_data_start;
-+
-+  void GC_init_netbsd_elf()
-+  {
-+    extern ptr_t GC_find_limit();
-+    extern char **environ;
-+	/* This may need to be environ, without the underscore, for	*/
-+	/* some versions.						*/
-+    GC_data_start = GC_find_limit((ptr_t)&environ, FALSE);
-+  }
-+#endif
-+
- # ifdef OS2
- 
- # include <stddef.h>
-@@ -2554,7 +2567,7 @@
- #     if defined (DRSNX)
- #	include <sys/sparc/frame.h>
- #     else
--#        if defined(OPENBSD)
-+#        if defined(OPENBSD) || defined(NETBSD)
- #          include <frame.h>
- #        else
- #          include <sys/frame.h>
-@@ -2569,7 +2582,7 @@
- /* Fill in the pc and argument information for up to NFRAMES of my	*/
- /* callers.  Ignore my frame and my callers frame.			*/
- 
--#ifdef OPENBSD
-+#if defined(OPENBSD) || defined(NETBSD)
- #  define FR_SAVFP fr_fp
- #  define FR_SAVPC fr_pc
- #else
diff --git a/devel/boehm-gc/patches/patch-ah b/devel/boehm-gc/patches/patch-ah
deleted file mode 100644
index 20a061c29ce..00000000000
--- a/devel/boehm-gc/patches/patch-ah
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2000/11/16 10:42:24 abs Exp $
-
---- sparc_netbsd_mach_dep.s.orig	Wed Nov 15 08:52:31 2000
-+++ sparc_netbsd_mach_dep.s
-@@ -0,0 +1,34 @@
-+!	SPARCompiler 3.0 and later apparently no longer handles
-+!	asm outside functions.  So we need a separate .s file
-+!	This is only set up for SunOS 4.
-+!	Assumes this is called before the stack contents are
-+!	examined.
-+
-+#include "machine/asm.h"
-+
-+	.seg 	"text"
-+	.globl	_C_LABEL(GC_save_regs_in_stack)
-+	.globl 	_C_LABEL(GC_push_regs)
-+_C_LABEL(GC_save_regs_in_stack):
-+_C_LABEL(GC_push_regs):
-+	ta	0x3   ! ST_FLUSH_WINDOWS
-+	mov	%sp,%o0
-+	retl
-+	nop
-+	
-+	.globl	_C_LABEL(GC_clear_stack_inner)
-+_C_LABEL(GC_clear_stack_inner):
-+	mov	%sp,%o2		! Save sp
-+	add	%sp,-8,%o3	! p = sp-8
-+	clr	%g1		! [g0,g1] = 0
-+	add	%o1,-0x60,%sp	! Move sp out of the way,
-+				! so that traps still work.
-+				! Includes some extra words
-+				! so we can be sloppy below.
-+loop:
-+	std	%g0,[%o3]	! *(long long *)p = 0
-+	cmp	%o3,%o1
-+	bgu	loop		! if (p > limit) goto loop
-+	add	%o3,-8,%o3	! p -= 8 (delay slot)
-+	retl
-+	mov	%o2,%sp		! Restore sp., delay slot
diff --git a/devel/boehm-gc/patches/patch-ai b/devel/boehm-gc/patches/patch-ai
index f19b148a045..c84ed2d2a41 100644
--- a/devel/boehm-gc/patches/patch-ai
+++ b/devel/boehm-gc/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2001/03/30 04:08:34 thorpej Exp $
+$NetBSD: patch-ai,v 1.2 2001/09/08 00:36:10 kei Exp $
 
-*** gc.h.orig	Thu Mar 29 19:57:39 2001
---- gc.h	Thu Mar 29 20:00:24 2001
+*** include/gc.h.orig	Thu Mar 29 19:57:39 2001
+--- include/gc.h	Thu Mar 29 20:00:24 2001
 ***************
 *** 370,375 ****
 --- 370,380 ----