Update to 6.1, provided by Julio Merino in PR 18240.

Changes: lots of bugfixes and improvements.

6 files changed, 48 insertions, 38 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 61e47acb548..5a893851e37 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2002/08/25 18:38:25 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2002/09/25 18:18:51 wiz Exp $
 # FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp
 #
 
-DISTNAME=		gc6.0
-PKGNAME=		boehm-gc-6.0
+DISTNAME=		gc6.1
+PKGNAME=		boehm-gc-6.1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 2139e237b83..b33d8ae44b1 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2002/08/25 18:38:26 jlam Exp $
+$NetBSD: distinfo,v 1.8 2002/09/25 18:18:52 wiz Exp $
 
-SHA1 (gc6.0.tar.gz) = 9698826b33472b314d7b2eb640c1669ce05f5277
-Size (gc6.0.tar.gz) = 562188 bytes
-SHA1 (patch-aa) = e8558979454b3cff1f53b991648309ae0145080c
-SHA1 (patch-ab) = d6ef904226912a321220d06916b01a1f2fe10af1
+SHA1 (gc6.1.tar.gz) = 043d51316ebb7f0ac919e4a72c456f269e604d2f
+Size (gc6.1.tar.gz) = 673024 bytes
+SHA1 (patch-aa) = 6455a30d927f95e37788bca022eccb9801382478
+SHA1 (patch-ab) = a50c81392d8ca7ffd8451f0ab471ce2bf258c660
 SHA1 (patch-ac) = 38b22813cf2861dcbc9739d70f9fefe69acf3210
-SHA1 (patch-ad) = 66cdc0fdbf78c527b3fccfa54895a5f06d482268
+SHA1 (patch-ad) = 5dd339437319caafa85ee5ab157e2fab01f05668
 SHA1 (patch-ai) = aabb71b2e064d033290e595fa6addc9b779add15
+SHA1 (patch-aj) = 879beac6b0d674cfd162f3bc7cf87eb60c0fea3d
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index d4991079492..62774bfbd28 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2001/09/08 00:36:09 kei Exp $
+$NetBSD: patch-aa,v 1.12 2002/09/25 18:18:52 wiz Exp $
 
---- 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= 
+--- Makefile.orig	Mon Sep  9 14:50:58 2002
++++ Makefile	Mon Sep  9 14:52:54 2002
+@@ -20,8 +20,8 @@
+ # executables.
+ 
  CC=cc $(ABI_FLAG)
 -CXX=g++ $(ABI_FLAG)
--AS=as $(ABI_FLAG)
+-AS=as $(AS_ABI_FLAG)
 +CXX=c++ $(ABI_FLAG)
 +AS=gcc -c -x assembler-with-cpp $(ABI_FLAG)
  #  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)
-@@ -296,16 +296,23 @@
+ 
+@@ -335,16 +335,23 @@
  
  all: gc.a gctest
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.11 2001/09/08 00:36:09 kei Exp $
  
  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 @@
+@@ -420,7 +427,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
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
index 8b6dcb2b0a4..3699425373b 100644
--- a/devel/boehm-gc/patches/patch-ab
+++ b/devel/boehm-gc/patches/patch-ab
@@ -1,24 +1,21 @@
-$NetBSD: patch-ab,v 1.8 2002/08/25 18:38:27 jlam Exp $
+$NetBSD: patch-ab,v 1.9 2002/09/25 18:18:52 wiz Exp $
 
---- dyn_load.c.orig	Tue Jun 26 04:37:38 2001
-+++ dyn_load.c	Wed Jul 31 15:57:28 2002
-@@ -426,9 +426,19 @@
+--- dyn_load.c.orig	Mon Sep  9 14:54:12 2002
++++ dyn_load.c	Mon Sep  9 14:54:53 2002
+@@ -535,6 +535,16 @@
  
  #if defined(NETBSD)
  #  include <sys/exec_elf.h>
 +/* for compatibility with 1.4.x */
 +#  ifndef DT_DEBUG
-+#  define DT_DEBUG	21
++#  define DT_DEBUG     21
 +#  endif
 +#  ifndef PT_LOAD
-+#  define PT_LOAD	1
++#  define PT_LOAD      1
 +#  endif
 +#  ifndef PF_W
-+#  define PF_W		2	
++#  define PF_W         2
 +#  endif
  #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-ad b/devel/boehm-gc/patches/patch-ad
index c1f52dde938..d2a7a29960f 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2001/09/08 00:36:10 kei Exp $
+$NetBSD: patch-ad,v 1.9 2002/09/25 18:18:52 wiz Exp $
 
---- include/private/gcconfig.h.orig	Mon Aug 28 16:56:19 2000
-+++ include/private/gcconfig.h
-@@ -75,6 +75,10 @@
+--- include/private/gcconfig.h.orig	Mon Sep  9 14:56:06 2002
++++ include/private/gcconfig.h	Mon Sep  9 14:57:33 2002
+@@ -98,6 +98,10 @@
  #    endif
  #    define mach_type_known
  # endif
@@ -10,17 +10,17 @@ $NetBSD: patch-ad,v 1.8 2001/09/08 00:36:10 kei Exp $
 +#    define VAX
 +#    define mach_type_known
 +# endif
- # if defined(mips) || defined(__mips)
+ # if defined(mips) || defined(__mips) || defined(_mips)
  #    define MIPS
- #    if !defined(LINUX)
-@@ -690,6 +694,10 @@
+ #    if defined(nec_ews) || defined(_nec_ews)
+@@ -752,6 +756,10 @@
  #   ifdef ULTRIX
  #	define OS_TYPE "ULTRIX"
  #	define STACKBOTTOM ((ptr_t) 0x7fffc800)
 +#   endif
 +#   ifdef NETBSD
-+#	define OS_TYPE "NETBSD"
-+#	define HEURISTIC2
++#      define OS_TYPE "NETBSD"
++#      define HEURISTIC2
  #   endif
  # endif
  
diff --git a/devel/boehm-gc/patches/patch-aj b/devel/boehm-gc/patches/patch-aj
new file mode 100644
index 00000000000..9a978be2ff0
--- /dev/null
+++ b/devel/boehm-gc/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2002/09/25 18:18:52 wiz Exp $
+
+--- os_dep.c.orig	Mon Sep  9 14:59:29 2002
++++ os_dep.c	Mon Sep  9 15:00:00 2002
+@@ -3165,7 +3165,6 @@
+ # endif
+ #endif
+ 
+-#include <execinfo.h>
+ #ifdef LINUX
+ #   include <unistd.h>
+ #endif