update boehm-gc to 6.3b1

changes:
- Add a patch provided by UCHIYAMA Yasushi in PR 26180 to support NetBSD/sh3.
- Correctly define ELFSIZE for NetBSD. Fixes PR 26252 by Kouichirou Hiratsuka.

Bump BUILDLINK_DEPNDS to 6.3nb1 for the ELFSIZE fix.

5 files changed, 61 insertions, 5 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 62267461893..843bc597469 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2004/07/09 00:18:54 recht Exp $
+# $NetBSD: Makefile,v 1.41 2004/07/13 14:22:27 recht Exp $
 #
 
 DISTNAME=	gc6.3
+PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/gc/boehm-gc-/}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index d210d78efbd..913fa2ab83f 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/07/13 14:22:27 recht Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboehm-gc}
 BUILDLINK_PACKAGES+=	boehm-gc
 
 .if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.2nb1
+BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.3nb1
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
 .endif	# BOEHM_GC_BUILDLINK3_MK
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 57165af4148..e0c4e7dfbb1 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.21 2004/07/09 00:18:54 recht Exp $
+$NetBSD: distinfo,v 1.22 2004/07/13 14:22:27 recht Exp $
 
 SHA1 (gc6.3.tar.gz) = 58042fd0dbfc96423cf0bb1fe6ea0791e9cb79cf
 Size (gc6.3.tar.gz) = 772114 bytes
+SHA1 (patch-ab) = ecb2c60bdc561bfe5177f20c6d89d3a1789c3a6d
 SHA1 (patch-ac) = 64c0f042a1ed7488158d49c77bab0330537d9e96
+SHA1 (patch-ad) = 1a7325d82be4d3e1fb2e37bdc54290871e46ca55
 SHA1 (patch-ae) = 6e99458a388b5a408e03c133f9b1fdc8b170e87f
 SHA1 (patch-af) = 35d27b97939c52319e2dc6524bb570f6aed01044
-SHA1 (patch-ai) = 0bd4056e890a89104a32aaf36e6e9234850d1a46
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
new file mode 100644
index 00000000000..361983cd164
--- /dev/null
+++ b/devel/boehm-gc/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.12 2004/07/13 14:22:27 recht Exp $
+
+--- dyn_load.c.orig	2004-05-06 01:03:06.000000000 +0200
++++ dyn_load.c	2004-07-12 21:07:23.000000000 +0200
+@@ -80,6 +80,11 @@
+ #   define l_name	lm_name
+ #endif
+ 
++#if defined(NETBSD)
++#   include <machine/elf_machdep.h>
++#   define ELFSIZE ARCH_ELFSIZE
++#endif
++
+ #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
+     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
+     (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
+@@ -91,7 +96,7 @@
+ /* Newer versions of GNU/Linux define this macro.  We
+  * define it similarly for any ELF systems that don't.  */
+ #  ifndef ElfW
+-#    ifdef __NetBSD__
++#    ifdef NETBSD
+ #      if ELFSIZE == 32
+ #        define ElfW(type) Elf32_##type
+ #      else
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
new file mode 100644
index 00000000000..5140f733cb9
--- /dev/null
+++ b/devel/boehm-gc/patches/patch-ad
@@ -0,0 +1,29 @@
+$NetBSD: patch-ad,v 1.19 2004/07/13 14:22:27 recht Exp $
+
+--- include/private/gcconfig.h.orig	2004-05-06 01:10:54.000000000 +0200
++++ include/private/gcconfig.h	2004-07-13 10:19:42.000000000 +0200
+@@ -97,6 +97,10 @@
+ #    define ARM32
+ #    define mach_type_known
+ # endif
++# if defined(NETBSD) && defined(__sh__)
++#    define SH
++#    define mach_type_known
++# endif
+ # if defined(vax)
+ #    define VAX
+ #    ifdef ultrix
+@@ -1811,6 +1815,13 @@
+       extern int _end[];
+ #     define DATAEND (_end)
+ #   endif
++#   ifdef NETBSD
++#      define OS_TYPE "NETBSD"
++#      define HEURISTIC2
++#      define DATASTART GC_data_start
++#       define USE_GENERIC_PUSH_REGS
++#      define DYNAMIC_LOADING
++#   endif
+ # endif
+  
+ # ifdef SH4