update to 6.3

This is mostly a bug fix release.

Selection of changes:
- most pkgsrc patches have been integrated
- amd64 support for NetBSD/OpenBSD (thanks to drochner@)
- enhanced Darwin support

For a complete list see:
http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/recent_changes

10 files changed, 43 insertions, 266 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 2388a554706..62267461893 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.39 2004/06/28 15:45:18 toshii Exp $
+# $NetBSD: Makefile,v 1.40 2004/07/09 00:18:54 recht Exp $
 #
 
-DISTNAME=		gc6.2
-PKGNAME=		${DISTNAME:S/gc/boehm-gc-/}
-PKGREVISION=		3
-CATEGORIES=		devel
-MASTER_SITES=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
+DISTNAME=	gc6.3
+PKGNAME=	${DISTNAME:S/gc/boehm-gc-/}
+CATEGORIES=	devel
+MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
-MAINTAINER=		recht@NetBSD.org
-HOMEPAGE=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/
-COMMENT=		Garbage collection and memory leak detection for C and C++
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+COMMENT=	Garbage collection and memory leak detection for C and C++
 
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--enable-cplusplus --disable-threads
+USE_LANGUAGES=		c c++
 INSTALLATION_DIRS=	man/man3
 
-MAKE_ENV+=		COPTS="${CFLAGS}"
+MAKE_ENV+=		COPTS=${CFLAGS:Q}
 
 #TEST_TARGET=		check
 
@@ -42,9 +43,6 @@ pre-build:
 		${WRKSRC}/doc/gc.man.in > ${WRKSRC}/doc/gc.man
 
 post-install:
-	@cd ${WRKSRC}; \
-	${MAKE_PROGRAM} -f ${WRKSRC}/Makefile.direct bsd-libleak.a
-	${INSTALL_DATA} ${WRKSRC}/bsd-libleak.a ${PREFIX}/lib/libleak.a
 	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${PREFIX}/man/man3/gc.3
 
 do-test:
diff --git a/devel/boehm-gc/PLIST b/devel/boehm-gc/PLIST
index 37dd43f9935..1d801dcb722 100644
--- a/devel/boehm-gc/PLIST
+++ b/devel/boehm-gc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/08/17 05:01:58 kei Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/07/09 00:18:54 recht Exp $
 include/gc.h
 include/gc/gc.h
 include/gc/gc_alloc.h
@@ -21,7 +21,9 @@ include/gc/private/gc_locks.h
 include/gc/private/gc_priv.h
 include/gc/private/gcconfig.h
 include/gc/weakpointer.h
+include/gc_allocator.h
 include/gc_config_macros.h
+include/gc_cpp.h
 include/gc_local_alloc.h
 include/gc_pthread_redirects.h
 include/gc_typed.h
@@ -31,7 +33,11 @@ lib/libgc.la
 lib/libgc.so
 lib/libgc.so.1
 lib/libgc.so.1.2
-lib/libleak.a
+lib/libgccpp.a
+lib/libgccpp.la
+lib/libgccpp.so
+lib/libgccpp.so.1
+lib/libgccpp.so.1.2
 man/man3/gc.3
 share/doc/gc/README
 share/doc/gc/README.DGUX386
@@ -63,6 +69,7 @@ share/doc/gc/gcdescr.html
 share/doc/gc/gcinterface.html
 share/doc/gc/leak.html
 share/doc/gc/scale.html
+share/doc/gc/simple_example.html
 share/doc/gc/tree.html
 @dirrm share/doc/gc
 @dirrm include/gc/private
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 4bbbb0503ec..57165af4148 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.20 2004/06/28 15:45:18 toshii Exp $
+$NetBSD: distinfo,v 1.21 2004/07/09 00:18:54 recht Exp $
 
-SHA1 (gc6.2.tar.gz) = ef17f8f56e9853ef41808fdf5c4c7bf2f78f1fec
-Size (gc6.2.tar.gz) = 750883 bytes
-SHA1 (patch-aa) = 90e279f7efba12194c2fbcecfe62bd902d842654
-SHA1 (patch-ab) = 8e85e84a5408dfab53d19bb84cc25140331906b6
-SHA1 (patch-ac) = 38b22813cf2861dcbc9739d70f9fefe69acf3210
-SHA1 (patch-ad) = 4d1b10f7f2bcef3c69897c5c4cd02c8ae9c8413c
+SHA1 (gc6.3.tar.gz) = 58042fd0dbfc96423cf0bb1fe6ea0791e9cb79cf
+Size (gc6.3.tar.gz) = 772114 bytes
+SHA1 (patch-ac) = 64c0f042a1ed7488158d49c77bab0330537d9e96
 SHA1 (patch-ae) = 6e99458a388b5a408e03c133f9b1fdc8b170e87f
-SHA1 (patch-af) = ff3902115a8cc330916500db1169ce67f8354700
-SHA1 (patch-ag) = 540f937741280e2adb85e4c93c39065d5bedeb96
-SHA1 (patch-ah) = c690aa1a375ae17514009124d5d184adcc606633
+SHA1 (patch-af) = 35d27b97939c52319e2dc6524bb570f6aed01044
+SHA1 (patch-ai) = 0bd4056e890a89104a32aaf36e6e9234850d1a46
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
deleted file mode 100644
index 8a4d73a152a..00000000000
--- a/devel/boehm-gc/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2003/05/22 16:46:50 jmmv Exp $
-
---- Makefile.direct.orig	2003-03-07 20:08:44.000000000 +0100
-+++ Makefile.direct	2003-05-14 00:27:50.000000000 +0200
-@@ -20,8 +20,8 @@
- # executables.
- 
- CC=cc $(ABI_FLAG)
--CXX=g++ $(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.
- 
-@@ -359,16 +359,23 @@
- 
- 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-libleak.a:
-+	$(MAKE) -f Makefile.direct CFLAGS="$(LEAKFLAGS)" clean c++-nt
-+	mv gc.a bsd-libleak.a
-+
- 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
- 
- 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 \
-@@ -444,7 +451,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
--	./test_cpp 1
- 	echo > c++
- 
- dyn_load_sunos53.o: dyn_load.c
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
deleted file mode 100644
index c8eed0b4fcc..00000000000
--- a/devel/boehm-gc/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2003/05/22 16:46:50 jmmv Exp $
-
---- dyn_load.c.orig	2003-05-09 03:45:10.000000000 +0200
-+++ dyn_load.c	2003-05-14 00:28:16.000000000 +0200
-@@ -446,6 +446,16 @@
- 
- #if defined(NETBSD)
- #  include <sys/exec_elf.h>
-+/* for compatibility with 1.4.x */
-+#  ifndef DT_DEBUG
-+#  define DT_DEBUG     21
-+#  endif
-+#  ifndef PT_LOAD
-+#  define PT_LOAD      1
-+#  endif
-+#  ifndef PF_W
-+#  define PF_W         2
-+#  endif
- #else
- #  include <elf.h>
- #endif
diff --git a/devel/boehm-gc/patches/patch-ac b/devel/boehm-gc/patches/patch-ac
index 248cc9b3582..bb49f786a37 100644
--- a/devel/boehm-gc/patches/patch-ac
+++ b/devel/boehm-gc/patches/patch-ac
@@ -1,23 +1,20 @@
-$NetBSD: patch-ac,v 1.10 2001/09/08 00:36:10 kei Exp $
+$NetBSD: patch-ac,v 1.11 2004/07/09 00:18:54 recht Exp $
 
---- doc/gc.man.in.orig	Tue Sep 21 16:55:00 1999
-+++ doc/gc.man.in
-@@ -9,7 +9,9 @@
- ... malloc(...) ...
+--- doc/gc.man.in.orig	2004-03-23 01:36:15.000000000 +0100
++++ doc/gc.man.in	2004-04-04 14:13:02.000000000 +0200
+@@ -11,7 +11,7 @@
+ void * GC_realloc(void *ptr, size_t size);
  .br
  .sp
 -cc ... gc.a
 +cc ... -lgc
-+.sp
-+cc ... -lleak
  .LP
  .SH DESCRIPTION
  .I GC_malloc
-@@ -67,6 +69,48 @@
- This may temporarily write protect pages in the heap.  See the README file for more information on how this interacts with system calls that write to the heap.
+@@ -82,6 +82,48 @@
  .LP
  Other facilities not discussed here include limited facilities to support incremental collection on machines without appropriate VM support, provisions for providing more explicit object layout information to the garbage collector, more direct support for ``weak'' pointers, support for ``abortable'' garbage collections during idle time, etc.
-+.LP
+ .LP
 +.SH "PORT INFORMATION"
 +.LP
 +In this (BSD package) installation,
@@ -59,6 +56,7 @@ $NetBSD: patch-ac,v 1.10 2001/09/08 00:36:10 kei Exp $
 +extension of
 +.I g++.
 +This may or may not make a difference.
- .LP
++.LP
  .SH "SEE ALSO"
  The README and gc.h files in the distribution.  More detailed definitions of the functions exported by the collector are given there.  (The above list is not complete.)
+ .LP
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
deleted file mode 100644
index e93893895f9..00000000000
--- a/devel/boehm-gc/patches/patch-ad
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-ad,v 1.17 2004/06/28 15:45:18 toshii Exp $
-
---- include/private/gcconfig.h.orig	2003-06-17 11:01:23.000000000 +0900
-+++ include/private/gcconfig.h
-@@ -85,7 +85,7 @@
- #    define SPARC
- #    define mach_type_known
- # endif
--# if defined(NETBSD) && defined(m68k)
-+# if defined(NETBSD) && (defined(m68k) || defined(__m68k__))
- #    define M68K
- #    define mach_type_known
- # endif
-@@ -93,7 +93,7 @@
- #    define POWERPC
- #    define mach_type_known
- # endif
--# if defined(NETBSD) && defined(__arm32__)
-+# if defined(NETBSD) && (defined(__arm32__) || defined(__arm__))
- #    define ARM32
- #    define mach_type_known
- # endif
-@@ -106,6 +106,10 @@
- #    endif
- #    define mach_type_known
- # endif
-+# if defined(__NetBSD__) && defined(__vax__)
-+#    define VAX
-+#    define mach_type_known
-+# endif
- # if defined(mips) || defined(__mips) || defined(_mips)
- #    define MIPS
- #    if defined(nec_ews) || defined(_nec_ews)
-@@ -220,6 +224,10 @@
- #    define X86_64
- #    define mach_type_known
- # endif
-+# if defined(__NetBSD__) && defined(__x86_64__)
-+#    define X86_64
-+#    define mach_type_known
-+# endif
- # if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
- #    define IA64
- #    define mach_type_known
-@@ -601,8 +609,14 @@
- #   ifdef NETBSD
- #	define OS_TYPE "NETBSD"
- #	define HEURISTIC2
--	extern char etext[];
--#	define DATASTART ((ptr_t)(etext))
-+#	ifdef __ELF__
-+#	  define DATASTART GC_data_start
-+#	  define DYNAMIC_LOADING
-+#	else
-+	  extern char etext[];
-+#	  define DATASTART ((ptr_t)(etext))
-+#       endif
-+#   define USE_GENERIC_PUSH_REGS
- #   endif
- #   ifdef LINUX
- #       define OS_TYPE "LINUX"
-@@ -1794,6 +1808,15 @@
- #	define PREFETCH_FOR_WRITE(x) \
- 	  __asm__ __volatile__ ("	prefetchw	%0": : "m"(*(char *)(x)))
- #   endif
-+#   ifdef NETBSD
-+#	define OS_TYPE "NETBSD"
-+#	define HEURISTIC2
-+#	define DATASTART GC_data_start
-+#	define ELFCLASS32 32
-+#	define ELFCLASS64 64
-+#	define ELF_CLASS ELFCLASS64
-+#       define DYNAMIC_LOADING
-+#   endif
- # endif
- 
- #if defined(LINUX) && defined(REDIRECT_MALLOC)
diff --git a/devel/boehm-gc/patches/patch-af b/devel/boehm-gc/patches/patch-af
index f9e161b82d2..bb1bc62b464 100644
--- a/devel/boehm-gc/patches/patch-af
+++ b/devel/boehm-gc/patches/patch-af
@@ -1,7 +1,7 @@
-# $NetBSD: patch-af,v 1.7 2003/08/17 05:01:59 kei Exp $
+$NetBSD: patch-af,v 1.8 2004/07/09 00:18:54 recht Exp $
 
---- Makefile.in.orig	Sun Jun 22 07:47:00 2003
-+++ Makefile.in	Wed Jul 23 23:48:40 2003
+--- Makefile.in.orig	2004-03-25 01:46:35.000000000 +0100
++++ Makefile.in	2004-04-04 14:43:08.000000000 +0200
 @@ -170,6 +170,9 @@
  include/gc_pthread_redirects.h include/gc_config_macros.h \
  include/leak_detector.h include/gc_typed.h @addincludes@
@@ -12,17 +12,17 @@
  
  EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h
  
-@@ -541,6 +544,13 @@
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+@@ -540,6 +543,13 @@
  	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
  	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
-+	done
+ 	done
 +	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)/private
 +	@list='$(include_PRIVATE_HEADERS)'; for p in $$list; do \
 +	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 +	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/private/$$f"; \
 +	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/private/$$f; \
- 	done
++	done
  
  uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/devel/boehm-gc/patches/patch-ag b/devel/boehm-gc/patches/patch-ag
deleted file mode 100644
index 325b58ffbb9..00000000000
--- a/devel/boehm-gc/patches/patch-ag
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2003/12/03 00:14:16 recht Exp $
-
---- os_dep.c.orig	2003-06-13 21:11:00.000000000 +0200
-+++ os_dep.c	2003-11-29 00:34:48.000000000 +0100
-@@ -121,7 +121,7 @@
- # include <fcntl.h>
- #endif
- 
--#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX)
-+#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX) || defined(NETBSD)
- # ifdef SUNOS5SIGS
- #  include <sys/siginfo.h>
- # endif
-@@ -688,9 +688,11 @@
- 	typedef void (*handler)();
- #   endif
- 
--#   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) || defined(HURD)
-+#   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) \
-+    || defined(HURD) || defined(NETBSD)
- 	static struct sigaction old_segv_act;
--#	if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) || defined(HURD)
-+#	if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \
-+	|| defined(HURD) || defined(NETBSD)
- 	    static struct sigaction old_bus_act;
- #	endif
- #   else
-@@ -705,11 +707,11 @@
- #   endif
-     {
- #	if defined(SUNOS5SIGS) || defined(IRIX5)  \
--        || defined(OSF1) || defined(HURD)
-+        || defined(OSF1) || defined(HURD) || defined(NETBSD)
- 	  struct sigaction	act;
- 
- 	  act.sa_handler	= h;
--#	  ifdef SUNOS5SIGS
-+#	  if defined(SUNOS5SIGS) || defined(NETBSD)
-             act.sa_flags          = SA_RESTART | SA_NODEFER;
- #         else
-             act.sa_flags          = SA_RESTART;
-@@ -729,7 +731,7 @@
- #	  else
- 	        (void) sigaction(SIGSEGV, &act, &old_segv_act);
- #		if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
--		   || defined(HPUX) || defined(HURD)
-+		   || defined(HPUX) || defined(HURD) || defined(NETBSD)
- 		    /* Under Irix 5.x or HP/UX, we may get SIGBUS.	*/
- 		    /* Pthreads doesn't exist under Irix 5.x, so we	*/
- 		    /* don't have to worry in the threads case.		*/
-@@ -765,10 +767,10 @@
-     void GC_reset_fault_handler()
-     {
- #       if defined(SUNOS5SIGS) || defined(IRIX5) \
--	   || defined(OSF1) || defined(HURD)
-+	   || defined(OSF1) || defined(HURD) || defined(NETBSD)
- 	  (void) sigaction(SIGSEGV, &old_segv_act, 0);
- #	  if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
--	     || defined(HPUX) || defined(HURD)
-+	     || defined(HPUX) || defined(HURD) || defined(NETBSD)
- 	      (void) sigaction(SIGBUS, &old_bus_act, 0);
- #	  endif
- #       else
diff --git a/devel/boehm-gc/patches/patch-ah b/devel/boehm-gc/patches/patch-ah
deleted file mode 100644
index 75704722f8f..00000000000
--- a/devel/boehm-gc/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2004/04/03 10:26:14 hubertf Exp $
-
---- tests/test.c.orig	Fri Apr  2 23:11:59 2004
-+++ tests/test.c
-@@ -1256,7 +1256,7 @@ void run_one_test()
- 	FAIL;
-       }
-       if (!TEST_FAIL_COUNT(1)) {
--#	if!(defined(RS6000) || defined(POWERPC) || defined(IA64))
-+#	if!(defined(RS6000) || defined(POWERPC) || defined(IA64) || defined(M68K))
- 	  /* ON RS6000s function pointers point to a descriptor in the	*/
- 	  /* data segment, so there should have been no failures.	*/
-     	  (void)GC_printf0("GC_is_visible produced wrong failure indication\n");