Upgrade to version 4.12

5 files changed, 146 insertions, 183 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 14b5c50677bc..14374ce31296 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -3,13 +3,14 @@
 # Date created:		15 November 1996
 # Whom:			Mike McGaughey <mmcg@cs.monash.edu.au>
 #
-# $Id$
+# $Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp $
 #
 
-DISTNAME=	gc4.10
-PKGNAME=	boehm-gc-4.10
+DISTNAME=	gc4.12
+PKGNAME=	boehm-gc-4.12
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.parc.xerox.com/pub/gc/
+MASTER_SITES=	ftp://ftp.parc.xerox.com/pub/gc/ \
+		http://reality.sgi.com/employees/boehm_mti/gc_source/
 
 MAINTAINER=	mmcg@cs.monash.edu.au
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 807a74ecb716..0c47a099b7f4 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1 +1 @@
-MD5 (gc4.10.tar.gz) = 8281966ed48e630d64f0ebc00f68d617
+MD5 (gc4.12.tar.gz) = 4bd802b9f586cac4a841b4730a6f3449
diff --git a/devel/boehm-gc/files/patch-aa b/devel/boehm-gc/files/patch-aa
index 4094520cbbd8..5b9e5ca7b761 100644
--- a/devel/boehm-gc/files/patch-aa
+++ b/devel/boehm-gc/files/patch-aa
@@ -1,90 +1,66 @@
-*** Makefile.orig	Mon Feb 19 09:45:47 1996
---- Makefile	Fri Nov 15 14:19:11 1996
-***************
-*** 13,19 ****
-  #  The above doesn't work with gas, which doesn't run cpp.
-  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
-  
-! CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DSILENT
-  
-  # Setjmp_test may yield overly optimistic results when compiled
-  # without optimization.
---- 13,45 ----
-  #  The above doesn't work with gas, which doesn't run cpp.
-  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
-  
-! # We want this to be a drop-in linkable library, hence the -DREDIRECT.
-! # The new c++-t and c++-nt (test and notest) are because we don't want
-! # to fill anyone's log with leak messages! - MMCG
-! 
-! CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DSILENT \
-!     	-DREDIRECT_MALLOC=GC_malloc
-! 
-! LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
-! 
-! all: gc.a gctest
-! 
-! FreeBSD-pkg-all: fbsd-libgc.a fbsd-libleak.a
-! 
-! fbsd-libgc.a:
-! 	make CFLAGS="$(CFLAGS)" clean c++-t
-! 	mv gc.a fbsd-libgc.a
-! 
-! fbsd-libleak.a:
-! 	make CFLAGS="$(LEAKFLAGS)" clean c++-nt
-! 	mv gc.a fbsd-libleak.a
-! 
-! FreeBSD-pkg-install: FreeBSD-pkg-all
-! 	${CP} fbsd-libgc.a libgc.a
-! 	${CP} fbsd-libleak.a libleak.a
-! 	${INSTALL_DATA} libleak.a libgc.a ${PREFIX}/lib
-! 	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
-! 	${INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
-  
-  # Setjmp_test may yield overly optimistic results when compiled
-  # without optimization.
-***************
-*** 124,131 ****
-  # 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 config.h mach_dep.o $(SRCS)
-  	make -f PCR-Makefile depend
-  	make -f PCR-Makefile
---- 150,155 ----
-***************
-*** 170,182 ****
-  	./if_mach SPARC SUNOS5 $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -lthread -ldl
-  	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a
-  
-  c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
-  	rm -f on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 touch on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(AR) ru gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(RANLIB) gc.a || cat /dev/null
-- 	./test_cpp 1
-  
-  dyn_load_sunos53.o: dyn_load.c
-  	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
---- 194,211 ----
-  	./if_mach SPARC SUNOS5 $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -lthread -ldl
-  	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a
-  
-+ 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 on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 touch on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(AR) ru gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(RANLIB) gc.a || cat /dev/null
-  
-  dyn_load_sunos53.o: dyn_load.c
-  	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
+--- Makefile.orig	Wed Aug 20 17:17:10 1997
++++ Makefile	Mon Apr  6 03:21:15 1998
+@@ -15,7 +15,33 @@
+ #  Under Irix 6, you will have to specify the ABI for as if you specify
+ #  it for the C compiler.
+ 
+-CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DSILENT
++# We want this to be a drop-in linkable library, hence the -DREDIRECT.
++# The new c++-t and c++-nt (test and notest) are because we don't want
++# to fill anyone's log with leak messages! - MMCG
++
++CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DATOMIC_UNCOLLECTABLE \
++		-DNO_EXECUTE_PERMISSION -DSILENT -DREDIRECT_MALLOC=GC_malloc
++
++LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
++
++all: gc.a gctest
++
++FreeBSD-pkg-all: fbsd-libgc.a fbsd-libleak.a
++
++fbsd-libgc.a:
++	make CFLAGS="$(CFLAGS)" clean c++-t
++	mv gc.a fbsd-libgc.a
++
++fbsd-libleak.a:
++	make CFLAGS="$(LEAKFLAGS)" clean c++-nt
++	mv gc.a fbsd-libleak.a
++
++FreeBSD-pkg-install: FreeBSD-pkg-all
++	${CP} fbsd-libgc.a libgc.a
++	${CP} fbsd-libleak.a libleak.a
++	${INSTALL_DATA} libleak.a libgc.a ${PREFIX}/lib
++	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
++	${INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
+ 
+ # Setjmp_test may yield overly optimistic results when compiled
+ # without optimization.
+@@ -162,8 +188,6 @@
+ # 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 config.h mach_dep.o $(SRCS)
+ 	make -f PCR-Makefile depend
+ 	make -f PCR-Makefile
+@@ -210,13 +234,18 @@
+ 	./if_mach HP_PA "" $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld
+ 	./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 on_sparc_sunos5
+ 	./if_mach SPARC SUNOS5 touch on_sparc_sunos5
+ 	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
+ 	./if_not_there on_sparc_sunos5 $(AR) ru gc.a gc_cpp.o
+ 	./if_not_there on_sparc_sunos5 $(RANLIB) gc.a || cat /dev/null
+-	./test_cpp 1
+ 	echo > c++
+ 
+ dyn_load_sunos53.o: dyn_load.c
diff --git a/devel/boehm-gc/files/patch-ab b/devel/boehm-gc/files/patch-ab
index 6790f5583e27..478dc38bb619 100644
--- a/devel/boehm-gc/files/patch-ab
+++ b/devel/boehm-gc/files/patch-ab
@@ -1,72 +1,62 @@
-*** gc.man.orig	Fri Nov 15 08:56:14 1996
---- gc.man	Fri Nov 15 09:30:14 1996
-***************
-*** 9,15 ****
-  ... malloc(...) ...
-  .br
-  .sp
-! cc ... gc.a
-  .LP
-  .SH DESCRIPTION
-  .I GC_malloc
---- 9,17 ----
-  ... malloc(...) ...
-  .br
-  .sp
-! cc ... -lgc
-! .sp
-! cc ... -lleak
-  .LP
-  .SH DESCRIPTION
-  .I GC_malloc
-***************
-*** 67,72 ****
---- 69,116 ----
-  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.
-  .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
-+ .SH "PORT INFORMATION"
-+ .LP
-+ In this (FreeBSD package) installation,
-+ .I gc.h
-+ and
-+ .I gc_cpp.h
-+ will probably be found in
-+ .I /usr/local/include,
-+ and the libraries in
-+ .I /usr/local/lib.
-+ .LP
-+ These libraries have been compiled as drop-in replacements
-+ for malloc and free (which is to say, all malloc
-+ calls will allocate garbage-collectable data).
-+ There is no need to include "gc.h" in your C files unless you want
-+ access to the debugging (and other) functions defined there,
-+ or unless you want to explicitly use
-+ .I GC_malloc_uncollectable
-+ for some allocations.
-+ Just link against them whenever you want either garbage
-+ collection or leak detection.
-+ .LP
-+ The C++ header file, "gc_cpp.h",
-+ .I is
-+ necessary for C++ programs, to obtain the appropriate
-+ definitions of the
-+ .I new
-+ and
-+ .I delete
-+ operators.
-+ The comments in both of these header files presently
-+ provide far better documentation
-+ for the package than this man page;
-+ look there for more information.
-+ .LP
-+ Both libraries are compiled without (explicit) support
-+ for the experimental
-+ .I gc
-+ extension of
-+ .I g++.
-+ This may or may not make a difference.
-  .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.)
+--- gc.man.orig	Mon Feb 12 14:34:12 1996
++++ gc.man	Mon Apr  6 03:23:32 1998
+@@ -9,7 +9,9 @@
+ ... malloc(...) ...
+ .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.
+ .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
++.SH "PORT INFORMATION"
++.LP
++In this (FreeBSD package) installation,
++.I gc.h
++and
++.I gc_cpp.h
++will probably be found in
++.I /usr/local/include,
++and the libraries in
++.I /usr/local/lib.
++.LP
++These libraries have been compiled as drop-in replacements
++for malloc and free (which is to say, all malloc
++calls will allocate garbage-collectable data).
++There is no need to include "gc.h" in your C files unless you want
++access to the debugging (and other) functions defined there,
++or unless you want to explicitly use
++.I GC_malloc_uncollectable
++for some allocations.
++Just link against them whenever you want either garbage
++collection or leak detection.
++.LP
++The C++ header file, "gc_cpp.h",
++.I is
++necessary for C++ programs, to obtain the appropriate
++definitions of the
++.I new
++and
++.I delete
++operators.
++The comments in both of these header files presently
++provide far better documentation
++for the package than this man page;
++look there for more information.
++.LP
++Both libraries are compiled without (explicit) support
++for the experimental
++.I gc
++extension of
++.I g++.
++This may or may not make a difference.
+ .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.)
diff --git a/devel/boehm-gc/files/patch-ac b/devel/boehm-gc/files/patch-ac
index 621e0519eea9..cdf66cc9d107 100644
--- a/devel/boehm-gc/files/patch-ac
+++ b/devel/boehm-gc/files/patch-ac
@@ -1,25 +1,21 @@
---- gc_priv.h.orig	Fri Feb  9 14:36:32 1996
-+++ gc_priv.h	Thu Apr  2 17:37:22 1998
-@@ -49,13 +49,18 @@
+--- gc_priv.h.orig	Wed Aug 20 16:22:54 1997
++++ gc_priv.h	Mon Apr  6 03:25:55 1998
+@@ -49,6 +49,10 @@
  #   include "gc_hdrs.h"
  # endif
  
--# if !defined(bool)
--    typedef int bool;
 +# ifdef __cplusplus
-+#   define TRUE true
-+#   define FALSE false
++#	define TRUE true
++#	define FALSE false
 +# else
-+#   if !defined(bool)
-+	typedef int bool;
-     /* This is problematic with C++ implementations that define bool. */
-     /* But those usually treat it correctly as an empty declaration.  */
-+#   endif
-+#   define TRUE 1
-+#   define FALSE 0
+ # if !defined(bool) && !defined(__cplusplus)
+     typedef int bool;
+     /* This is problematic with C++ implementations that do not define bool. */
+@@ -67,6 +71,7 @@
  # endif
--# define TRUE 1
--# define FALSE 0
+ # define TRUE 1
+ # define FALSE 0
++# endif
  
  typedef char * ptr_t;	/* A generic pointer to which we can add	*/
  			/* byte displacements.				*/