- Update to 7.1.

7 files changed, 74 insertions, 103 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 6edebf1077e8..a688ddccd624 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	boehm-gc
-PORTVERSION=	6.8
+PORTVERSION=	7.1
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
-DISTNAME=	gc${PORTVERSION:S/.a/alpha/}
+DISTNAME=	gc-${PORTVERSION:S/.a/alpha/}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Garbage collection and memory leak detection for C and C++
 
-USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnometarget
+USE_GNOME=	gnometarget gnomehack
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-cplusplus
+CONFIGURE_ARGS=	--enable-cplusplus --disable-static
 OPTIONS=	REDIRECT "Define malloc(3)-family replacements" off \
-		FULLDEBUG "full-debug support (see documentation)" off \
+		FULLDEBUG "Debugging support (see documentation)" off \
 		THREADING "POSIX thread support" off \
 		PARALLEL_MARK "Parallel-thread marking (faster for SMP)" off
 
@@ -44,19 +43,26 @@ CONFIGURE_ARGS+=	--enable-redirect-malloc
 PKGNAMESUFFIX:=		${PKGNAMESUFFIX}+redirect
 .endif
 .if defined(WITH_FULLDEBUG)
-CONFIGURE_ARGS+=	--enable-full-debug
+CONFIGURE_ARGS+=	--enable-gc-debug
 PKGNAMESUFFIX:=		${PKGNAMESUFFIX}+fulldebug
 .endif
 
 MAN3=		gc.3
 
 .if ${ARCH} == "ia64"
-BROKEN=		"Does not compile on ia64"
+BROKEN=	"Does not compile on ia64"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
 
+#
+# Get rid of .la and static library files
+#
+post-configure:
+	@${REINPLACE_CMD} -E -e \
+	'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${PREFIX}/man/man3/gc.3
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 2335a9cb4dc8..d4f8223a8eb4 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gc6.8.tar.gz) = 418d38bd9c66398386a372ec0435250e
-SHA256 (gc6.8.tar.gz) = 448f8e4c6ee8c80eac059cf1c9379d20c388bcb900fc0796cd2a44d1dcbbae69
-SIZE (gc6.8.tar.gz) = 756879
+MD5 (gc-7.1.tar.gz) = 2ff9924c7249ef7f736ecfe6f08f3f9b
+SHA256 (gc-7.1.tar.gz) = e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
+SIZE (gc-7.1.tar.gz) = 1077714
diff --git a/devel/boehm-gc/files/patch-doc:Makefile.in b/devel/boehm-gc/files/patch-Makefile.in
index 025b8857b7ca..5021e88488f3 100644
--- a/devel/boehm-gc/files/patch-doc:Makefile.in
+++ b/devel/boehm-gc/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Mon May 16 20:28:05 2005
-+++ doc/Makefile.in	Fri Jun 17 21:24:36 2005
-@@ -30,7 +30,7 @@
+--- Makefile.in.orig	2009-10-20 01:25:20.000000000 +0400
++++ Makefile.in	2009-10-20 01:25:30.000000000 +0400
+@@ -75,7 +75,7 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -8,4 +8,4 @@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
+ top_builddir = .
diff --git a/devel/boehm-gc/files/patch-dbg_mlc.c b/devel/boehm-gc/files/patch-dbg_mlc.c
index a3995703c004..52a801da9c3a 100644
--- a/devel/boehm-gc/files/patch-dbg_mlc.c
+++ b/devel/boehm-gc/files/patch-dbg_mlc.c
@@ -1,6 +1,6 @@
---- dbg_mlc.c.orig	Tue May 13 16:59:49 2003
-+++ dbg_mlc.c	Wed May 12 20:13:19 2004
-@@ -414,6 +414,23 @@
+--- dbg_mlc.c.orig	2009-10-20 00:34:39.000000000 +0400
++++ dbg_mlc.c	2009-10-20 00:41:22.000000000 +0400
+@@ -456,10 +456,34 @@
      GC_register_displacement((word)sizeof(oh) + offset);
  }
  
@@ -21,13 +21,11 @@
 +#define GC_caller_func(ad, symp, offp)
 +#endif
 +
- # ifdef __STDC__
-     GC_PTR GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
- # else
-@@ -428,6 +445,13 @@
+ void * GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
  {
-     GC_PTR result = GC_malloc(lb + DEBUG_BYTES);
-     
+     void * result = GC_malloc(lb + DEBUG_BYTES);
+-    
++
 +#ifdef GC_ADD_CALLER
 +    if (s == NULL) {
 +      GC_caller_func_offset(ra, &s, &i);
@@ -36,11 +34,11 @@
 +    }
 +#endif
      if (result == 0) {
-         GC_err_printf1("GC_debug_malloc(%ld) returning NIL (",
-         	       (unsigned long) lb);
-@@ -789,6 +813,13 @@
-     register size_t old_sz;
-     register hdr * hhdr;
+         GC_err_printf("GC_debug_malloc(%lu) returning NIL (",
+         	      (unsigned long) lb);
+@@ -764,6 +788,13 @@
+     size_t old_sz;
+     hdr * hhdr;
      
 +#ifdef GC_ADD_CALLER
 +    if (s == NULL) {
@@ -51,8 +49,8 @@
 +#endif
      if (p == 0) return(GC_debug_malloc(lb, OPT_RA s, i));
      if (base == 0) {
-         GC_err_printf1(
-@@ -1094,7 +1125,11 @@
+         GC_err_printf("Attempt to reallocate invalid pointer %p\n", p);
+@@ -1041,17 +1072,21 @@
  }
  
  #ifdef GC_ADD_CALLER
@@ -65,17 +63,14 @@
  #else
  # define RA
  #endif
-@@ -1102,12 +1137,12 @@
- GC_PTR GC_debug_malloc_replacement(lb)
- size_t lb;
+ 
+ void * GC_debug_malloc_replacement(size_t lb)
  {
 -    return GC_debug_malloc(lb, RA "unknown", 0);
 +    return GC_debug_malloc(lb, RA NULL, 0);
  }
  
- GC_PTR GC_debug_realloc_replacement(p, lb)
- GC_PTR p;
- size_t lb;
+ void * GC_debug_realloc_replacement(void *p, size_t lb)
  {
 -    return GC_debug_realloc(p, lb, RA "unknown", 0);
 +    return GC_debug_realloc(p, lb, RA NULL, 0);
diff --git a/devel/boehm-gc/files/patch-include-private-gcconfig.h b/devel/boehm-gc/files/patch-include-private-gcconfig.h
index 8be1a7ca5228..da83c49ebb91 100644
--- a/devel/boehm-gc/files/patch-include-private-gcconfig.h
+++ b/devel/boehm-gc/files/patch-include-private-gcconfig.h
@@ -1,6 +1,6 @@
---- include/private/gcconfig.h.rorig	Sat Oct 15 16:40:25 2005
-+++ include/private/gcconfig.h	Sat Oct 15 16:42:43 2005
-@@ -62,7 +62,7 @@
+--- include/private/gcconfig.h.orig	2008-02-20 22:23:00.000000000 +0300
++++ include/private/gcconfig.h	2009-10-20 01:08:38.000000000 +0400
+@@ -64,7 +64,7 @@
  /* Determine the machine type: */
  # if defined(__arm__) || defined(__thumb__)
  #    define ARM32
@@ -9,7 +9,7 @@
  #      define NOSYS
  #      define mach_type_known
  #    endif
-@@ -334,10 +334,22 @@
+@@ -334,10 +334,26 @@
  #    define X86_64
  #    define mach_type_known
  # endif
@@ -17,11 +17,14 @@
 +#    define X86_64
 +#    define mach_type_known
 +# endif
++# if defined(__FreeBSD__) && defined(__ia64__)
++#    define IA64
++#    define mach_type_known
++# endif
  # if defined(FREEBSD) && defined(__sparc__)
  #    define SPARC
  #    define mach_type_known
--#endif
-+# endif
+ # endif
 +# if defined(FREEBSD) && defined(__powerpc__)
 +#    define POWERPC
 +#    define mach_type_known
@@ -33,9 +36,9 @@
  # if defined(bsdi) && (defined(i386) || defined(__i386__))
  #    define I386
  #    define BSDI
-@@ -845,6 +857,16 @@
- #     define DATASTART GC_data_start
- #     define DYNAMIC_LOADING
+@@ -1771,6 +1787,16 @@
+ #     define OS_TYPE "MSWINCE"
+ #     define DATAEND /* not needed */
  #   endif
 +#   ifdef FREEBSD
 +#   define ALIGNMENT 4
@@ -48,41 +51,13 @@
 +#	define SEARCH_FOR_DATA_START
 +#   endif
  #   ifdef NOSYS
- #     define ALIGNMENT 4
- #     define OS_TYPE "NOSYS"
-@@ -1807,6 +1829,17 @@
- #	endif
- #       define USE_GENERIC_PUSH_REGS
+       /* __data_start is usually defined in the target linker script.  */
+       extern int __data_start[];
+@@ -1800,6 +1826,7 @@
+ #     define OS_TYPE "MSWINCE"
+ #     define DATAEND /* not needed */
  #   endif
-+#   ifdef FREEBSD
-+#   define ALIGNMENT 4
-+#       define OS_TYPE "FREEBSD"
-+#       ifdef __ELF__
-+#           define DYNAMIC_LOADING
-+#       endif
-+#       define HEURISTIC2
-+	extern char etext[];
-+#       define SEARCH_FOR_DATA_START
-+#   endif
 +		   
  #   ifdef LINUX
- #       define OS_TYPE "LINUX"
- #       define LINUX_STACKBOTTOM
-@@ -1957,6 +1990,17 @@
- #	ifdef __ELF__
- #	    define DYNAMIC_LOADING
- #	endif
-+#	define HEURISTIC2
-+	extern char etext[];
-+#	define SEARCH_FOR_DATA_START
-+#   endif
-+#   ifdef FREEBSD
-+#       define OS_TYPE "FREEBSD"
-+#       define SIG_SUSPEND SIGUSR1
-+#       define SIG_THR_RESTART SIGUSR2
-+#       ifdef __ELF__
-+#           define DYNAMIC_LOADING
-+#       endif
- #	define HEURISTIC2
- 	extern char etext[];
- #	define SEARCH_FOR_DATA_START
+ #     define OS_TYPE "LINUX"
+ #     define LINUX_STACKBOTTOM
diff --git a/devel/boehm-gc/files/patch-os_dep.c b/devel/boehm-gc/files/patch-os_dep.c
index b7f96acbc3fb..910777fe2b47 100644
--- a/devel/boehm-gc/files/patch-os_dep.c
+++ b/devel/boehm-gc/files/patch-os_dep.c
@@ -1,16 +1,16 @@
---- os_dep.c.orig	Thu May 19 20:48:49 2005
-+++ os_dep.c	Fri Jun 17 21:28:07 2005
-@@ -699,7 +699,7 @@
+--- os_dep.c.orig	2008-02-29 22:01:28.000000000 +0300
++++ os_dep.c	2009-10-20 00:48:39.000000000 +0400
+@@ -816,7 +816,7 @@
      || defined(HURD) || defined(NETBSD)
  	static struct sigaction old_segv_act;
- #	if defined(IRIX5) || defined(HPUX) \
+ #	if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \
 -	|| defined(HURD) || defined(NETBSD)
 +	|| defined(HURD) || defined(NETBSD) || defined(FREEBSD)
  	    static struct sigaction old_bus_act;
  #	endif
  #   else
-@@ -714,7 +714,7 @@
- #   endif
+@@ -826,7 +826,7 @@
+     void GC_set_and_save_fault_handler(handler h)
      {
  #	if defined(SUNOS5SIGS) || defined(IRIX5)  \
 -        || defined(OSF1) || defined(HURD) || defined(NETBSD)
@@ -18,10 +18,10 @@
  	  struct sigaction	act;
  
  	  act.sa_handler	= h;
-@@ -736,7 +736,7 @@
+@@ -846,7 +846,7 @@
  #	  else
  	        (void) sigaction(SIGSEGV, &act, &old_segv_act);
- #		if defined(IRIX5) \
+ #		if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
 -		   || defined(HPUX) || defined(HURD) || defined(NETBSD)
 +		   || defined(HPUX) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
  		    /* Under Irix 5.x or HP/UX, we may get SIGBUS.	*/
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index 393d5870e09e..dec84f42e7ad 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -1,36 +1,28 @@
+include/gc.h
 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_tiny_fl.h
 include/gc/gc_typed.h
+include/gc/gc_version.h
 include/gc/leak_detector.h
 include/gc/new_gc_alloc.h
 include/gc/weakpointer.h
-include/gc.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
-include/leak_detector.h
-lib/libgc.a
-lib/libgc.la
+lib/libcord.so
+lib/libcord.so.1
 lib/libgc.so
 lib/libgc.so.1
-lib/libgccpp.a
-lib/libgccpp.la
 lib/libgccpp.so
 lib/libgccpp.so.1
+libdata/pkgconfig/bdw-gc.pc
 share/doc/gc/README
 share/doc/gc/README.DGUX386
 share/doc/gc/README.Mac
@@ -54,12 +46,15 @@ share/doc/gc/README.sgi
 share/doc/gc/README.solaris2
 share/doc/gc/README.uts
 share/doc/gc/README.win32
+share/doc/gc/README.win64
 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/overview.html
+share/doc/gc/porting.html
 share/doc/gc/scale.html
 share/doc/gc/simple_example.html
 share/doc/gc/tree.html