Update to 6.2alpha4. The package version is set to 6.1.994 so that future

version checking will be correct when 6.2 final is out.

Changes since 6.1:
 - Guard the test for GC_DUMP_REGULARLY in misc.c with
   "#ifndef NO_DEBUGGING".  Otherwise it fails to build with NO_DEBUGGING
   defined.  (Thanks to Manuel Serrano.)
 - Message about retrying suspend signals was incorrectly generated even when
   flag was not set.
 - Cleaned up MACOSX/NEXT root registration code.  There was apparently a
   separate ifdef case in GC_register_data_segments() for no reason.
 - Removed MPROTECT_VDB for MACOSX port, based on one negative report.
 - Arrange for gc.h and friends to be correctly installed with GNU-style
   "make install".
 - Enable the GNU-style build facility include C++ support in the library
   with --enable-cplusplus. (Thanks to Thomas Maier for some of the patch.)
 - Mark from GC_thread_key in linux_threads.c, in case that's allocated
   from the garbage collected heap, as it is with our own thread-specific
   storage implementation.  (Thanks to Jeff Sturm.)
 - Mark all free list header blocks if they are heap allocated.  This avoids
   some unnecessary tracing.  And it remains correct if we clear the
   root set. (Thanks to Jeff Sturm for identifying the bug.)
 - Improved S390/Linux support.  Add S390/Linux 64-bit support.  (Thanks
   to Ulrich Weigand.)
 - Corrected the spelling of GC_{M,C}ALLOC_EXPLICTLY_TYPED to
   GC_{M,C}ALLOC_EXPLICITLY_TYPED in gc_typed.h.  This is technically
   an interface change.  Based on the fact that nobody reported this,
   I suspect/hope there were no clients.
 - Cleaned up gc_typed.h so that (1) it adds an extern "C" declaration
   when appropriate, (2) doesn't generate references to undefined internal
   macros, and (3) allows easier manual construction of descriptors.
 - Close the file descriptor used by GC_print_address_map().
 - Set the "close-on-exec" bit for various file descriptors maintained
   for the collector's internal use.
 - Added a hack to find memory segments owned by the system allocator
   under win32.  Based on my tests, this tends to eventually find all
   segments, though it may take a while.  There appear to be cleaner,
   but slower solutions under NT/XP.  But they rely on an API that's
   unsupported under 9X.
 - Changed Linux PowerPC stack finding to LINUX_STACKBOTTOM.  (Thanks
   to Akira Tagoh for pointing out that HEURISTIC1 doesn't work on
   64-bit kernels.)
 - Added GC_set_free_space_divisor to avoid some Windows dll issues.
 - Added FIXUP_POINTER, POINTER_SHIFT, POINTER_MASK to allow preprocessing
   of candidate pointers for tagging, etc.
 - Always lock around GC_notify_full_gc().  Simplified code for
   invoking GC_notify_full_gc().
 - Changed the way DATASTART is defined on FreeBSD to be robust against
   an unmapped page after etext.  (Thanks to Hironori Sakamoto for
   tracking down the intermittent failure.)
 - Made GC_enable() and GC_disable() official.  Deprecated direct update
   of GC_dont_gc.  Changed GC_gcollect to be a noop when garbage collection
   is disabled.
 - Call GC_register_dynamic_libraries before stopping the world on Linux,
   in order to avoid a potential deadlock due to the dl_iterate_phdr lock.
 - Introduced a more general mechanism for platform-dependent code to
   decide whether the main data segment should be handled separately
   from dynamic libraries, or registered by GC_register_dynamic_libraries.
   The latter is more reliable and easier on Linux with dl_iterate_phdr.

Changes since 6.2alpha1:
 - Fixed the completely broken FreeBSD code in 6.2alpha1.  (Thanks to
   Hironori Sakamoto for the patch.)
 - Changed IRIX reference in dbg_mlc.c to IRIX5. (Thanks to Marcus Herbert.)
 - Attempted to work around the problems with .S filenames and the SGI
   compiler.  (Reported by several people. Untested.)
 - Worked around an HP/UX make issue with the GNU-style build process.
 - Fixed the --enable-cplusplus build machinery to allow builds without
   a C++ compiler.  (That was always the intent ...)
 - Changed the debugging allocation macros to explicitly pass the return
   address for Linux and XXXBSD on hardware for which we can't get stack
   traces.  Use __builtin_return_address(0) to generate it when possible.
   Some of the configuration work was cleaned up (good) and moved to gc.h
   (bad, but necessary).  This should make leak detection more useful
   on a number of platforms.  (Thanks to Fabian Thylman for the suggestion.)
 - Fixed compilation problems in dbg_mlc.c with GC_ADD_CALLER.
 - Bumped revision number for dynamic library.

Changes since 6.2alpha2:
 - Don't include execinfo.h in os_dep.c when it's not needed, and may not exist.

Changes since 6.2alpha3:
 - Use LINUX_STACKBOTTOM for >= glibc2.2 on Linux/MIPS.  (See Debian bug
   # 177204)
 - Integrated Jeff Sturm and Jesse Rosenstock's MACOSX threads patches.
 - Integrated Grzegorz Jakacki's substantial GNU build patch.  "Make dist"
   should now work for the GNU build process.  Documentation files
   are installed under share/gc.
 - Tweaked gc_cpp.h to again support the Borland compiler.  (Thanks to
   Rene Girard for pointing out the problems.)
 - Updated BCC_MAKEFILE (thanks to Rene Girard).
 - Added GC_ASSERT check for minimum thread stack size.
 - Added --enable-gc-assertions.
 - Added some web documentation to the distribution.  Updated it in the
   process.
 - Separate gc_conf_macros.h from gc.h.
 - Added generic GC_THREADS client-defined macro to set the appropriate
   GC_XXX_THREADS internal macro.  (gc_config_macros.h.)
 - Add debugging versions of _ignore_off_page allocation primitves.
 - Moved declarations of GC_make_closure and GC_debug_invoke_finalizer
   from gc.h to gc_priv.h.
 - Reset GC_fail_count even if only a small allocation succeeds.
 - Integrated Brian Alliet's patch for dynamic library support on Darwin.
 - gc_cpp.h's gc_cleanup destructor called GC_REGISTER_FINALIZER_IGNORE_SELF
   when it should have called the lower case version, since it was
   explicitly computing a base pointer.

5 files changed, 80 insertions, 19 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 4f09589015b..1cd49c0f3a9 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/02/17 12:32:04 kei Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/09 12:53:26 jmmv Exp $
 #
 
-DISTNAME=		gc6.1
-PKGNAME=		boehm-gc-6.1
-PKGREVISION=		2
-WRKSRC=			${WRKDIR}/gc6.1
+DISTNAME=		gc6.2alpha4
+PKGNAME=		boehm-gc-6.1.994
 CATEGORIES=		devel
 MASTER_SITES=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
@@ -36,12 +34,11 @@ post-extract:
 pre-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
 		${WRKSRC}/doc/gc.man.in > ${WRKSRC}/doc/gc.man
+
 post-install:
 	@cd ${WRKSRC}; \
 	${MAKE} -f ${WRKSRC}/Makefile.direct bsd-libleak.a
 	${INSTALL_DATA} ${WRKSRC}/bsd-libleak.a ${PREFIX}/lib/libleak.a
-	${INSTALL_DATA} ${WRKSRC}/include/gc.h ${WRKSRC}/include/gc_cpp.h \
-	    ${WRKSRC}/include/gc_backptr.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/PLIST b/devel/boehm-gc/PLIST
index faecf20a1d0..be0238aa7f6 100644
--- a/devel/boehm-gc/PLIST
+++ b/devel/boehm-gc/PLIST
@@ -1,11 +1,57 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/14 18:50:50 wiz Exp $
-include/gc.h
-include/gc_backptr.h
-include/gc_cpp.h
+@comment $NetBSD: PLIST,v 1.3 2003/05/09 12:53:26 jmmv Exp $
+include/gc/gc.h
+include/gc/gc_alloc.h
+include/gc/gc_allocator.h
+include/gc/gc_amiga_redirects.h
+include/gc/gc_backptr.h
+include/gc/gc_config_macros.h
+include/gc/gc_cpp.h
+include/gc/gc_gcj.h
+include/gc/gc_inl.h
+include/gc/gc_inline.h
+include/gc/gc_local_alloc.h
+include/gc/gc_mark.h
+include/gc/gc_pthread_redirects.h
+include/gc/gc_typed.h
+include/gc/leak_detector.h
+include/gc/new_gc_alloc.h
+include/gc/weakpointer.h
 lib/libgc.a
 lib/libgc.la
 lib/libgc.so
 lib/libgc.so.1
-lib/libgc.so.1.1
+lib/libgc.so.1.2
 lib/libleak.a
 man/man3/gc.3
+share/doc/gc/README
+share/doc/gc/README.DGUX386
+share/doc/gc/README.Mac
+share/doc/gc/README.MacOSX
+share/doc/gc/README.OS2
+share/doc/gc/README.amiga
+share/doc/gc/README.arm.cross
+share/doc/gc/README.autoconf
+share/doc/gc/README.changes
+share/doc/gc/README.contributors
+share/doc/gc/README.cords
+share/doc/gc/README.dj
+share/doc/gc/README.environment
+share/doc/gc/README.ews4800
+share/doc/gc/README.hp
+share/doc/gc/README.linux
+share/doc/gc/README.macros
+share/doc/gc/README.rs6000
+share/doc/gc/README.sgi
+share/doc/gc/README.solaris2
+share/doc/gc/README.uts
+share/doc/gc/README.win32
+share/doc/gc/barrett_diagram
+share/doc/gc/debugging.html
+share/doc/gc/gc.man
+share/doc/gc/gcdescr.html
+share/doc/gc/gcinterface.html
+share/doc/gc/leak.html
+share/doc/gc/scale.html
+share/doc/gc/tree.html
+@dirrm share/doc/gc
+@dirrm include/gc
diff --git a/devel/boehm-gc/buildlink2.mk b/devel/boehm-gc/buildlink2.mk
index 51e3cab540f..ff6f6119376 100644
--- a/devel/boehm-gc/buildlink2.mk
+++ b/devel/boehm-gc/buildlink2.mk
@@ -1,4 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 18:50:50 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/09 12:53:26 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use boehm-gc.
+#
+# This file was created automatically using createbuildlink 2.6.
+#
 
 .if !defined(BOEHM_GC_BUILDLINK2_MK)
 BOEHM_GC_BUILDLINK2_MK=	# defined
@@ -9,9 +14,7 @@ BUILDLINK_PKGSRCDIR.boehm-gc?=		../../devel/boehm-gc
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.boehm-gc=boehm-gc
 BUILDLINK_PREFIX.boehm-gc_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.boehm-gc+=	include/gc.h
-BUILDLINK_FILES.boehm-gc+=	include/gc_backptr.h
-BUILDLINK_FILES.boehm-gc+=	include/gc_cpp.h
+BUILDLINK_FILES.boehm-gc+=	include/gc/*
 BUILDLINK_FILES.boehm-gc+=	lib/libgc.*
 BUILDLINK_FILES.boehm-gc+=	lib/libleak.*
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index e8b0a4929fb..20adb9d727e 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.13 2003/02/17 14:36:46 kei Exp $
+$NetBSD: distinfo,v 1.14 2003/05/09 12:53:26 jmmv Exp $
 
-SHA1 (gc6.1.tar.gz) = 043d51316ebb7f0ac919e4a72c456f269e604d2f
-Size (gc6.1.tar.gz) = 673024 bytes
+SHA1 (gc6.2alpha4.tar.gz) = 1bf59c8fd61dbc75665ad4c5bb104f1490db84d5
+Size (gc6.2alpha4.tar.gz) = 734281 bytes
 SHA1 (patch-aa) = 5fa6985255d8e3078e53f2be7dcc0666264230fc
 SHA1 (patch-ab) = a50c81392d8ca7ffd8451f0ab471ce2bf258c660
 SHA1 (patch-ac) = 38b22813cf2861dcbc9739d70f9fefe69acf3210
 SHA1 (patch-ad) = 07595d38bc574bfabf93197bd0e574f0cf305092
+SHA1 (patch-ae) = 6e99458a388b5a408e03c133f9b1fdc8b170e87f
+SHA1 (patch-af) = 9b19eb1ceefd7fe294303d9c769ba0b395e84963
diff --git a/devel/boehm-gc/patches/patch-ae b/devel/boehm-gc/patches/patch-ae
new file mode 100644
index 00000000000..8d7b30e4bb6
--- /dev/null
+++ b/devel/boehm-gc/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.6 2003/05/09 12:53:27 jmmv Exp $
+
+--- doc/Makefile.in.orig	2003-05-09 13:17:43.000000000 +0200
++++ doc/Makefile.in
+@@ -46,7 +46,7 @@ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..