. update to version 7.2d;

. organize as master and slave ports;
. while I'm here: support stage.

PR:		ports/175590  [1]
		ports/176011  [2]
		ports/176716  [3]

Submitted by:	KATO Tsuguru <tkato432@yahoo.com>    [1]
		Vitaly Magerya <vmagerya@gmail.com>  [2]
		Hirohisa Yamaguchi <umq@ueo.co.jp>   [3]

11 files changed, 161 insertions, 266 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index a3ceee2283e1..0a66c8e2ed76 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,51 +1,113 @@
 # Created by: Mike McGaughey <mmcg@cs.monash.edu.au>
 # $FreeBSD$
 
-PORTNAME=	boehm-gc
-PORTVERSION=	7.1
-PORTREVISION=	0
+PORTNAME=	gc
+PORTVERSION=	7.2d
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
-DISTNAME=	gc-${PORTVERSION:S/.a/alpha/}
+PKGNAMEPREFIX=	boehm-
+.ifdef GC_VARIANT
+PKGNAMESUFFIX=	-${GC_VARIANT}
+.endif
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Garbage collection and memory leak detection for C and C++
 
+LICENSE=	BDWGC
+LICENSE_NAME=	Boehm-Demers-Weiser Garbage Collector License
+LICENSE_FILE=	${WRKSRC}/doc/README
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 GNU_CONFIGURE=	yes
-USES=	pathfix
+USES=		pathfix
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-cplusplus --disable-static --disable-threads
+CONFIGURE_ARGS=	--enable-cplusplus --disable-static
 MAKE_JOBS_UNSAFE=	yes
+
+WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
+
 OPTIONS_DEFINE=	DEBUG
 
-NO_STAGE=	yes
+.ifdef GC_VARIANT
+INSTLIBS=	cord gc gccpp
+PLIST=		${NONEXISTENT}
+PLIST_FILES=	${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so.${SOVER},g} \
+		${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so,g} \
+		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
+RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc
+SOVER=		1
+. if ${GC_VARIANT} == "redirect"
+CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc
+. endif
+. if ${GC_VARIANT} == "threaded"
+CONFIGURE_ARGS+=--enable-threads=posix --disable-redirect-malloc
+OPTIONS_DEFINE+=PARALLEL_MARK
+PARALLEL_MARK_DESC=	Parallel-thread marking (faster for SMP)
+. endif
+.else
+CONFIGURE_ARGS+=--disable-threads --disable-redirect-malloc
+OPTIONS_DEFINE+=DOCS
+PORTDOCS=	*
+.endif
+
 .include <bsd.port.pre.mk>
 
+NOT_FOR_ARCHS=	ia64
+
 .if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-gc-debug
-PKGNAMESUFFIX:=		${PKGNAMESUFFIX}+fulldebug
+CONFIGURE_ARGS+=--enable-gc-debug
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+fulldebug
 .endif
 
-MAN3=		gc.3
+.if ! ${PORT_OPTIONS:MDOCS}
+CONFIGURE_ARGS+=--datarootdir=${WRKDIR}/doc
+.endif
 
-.if ${ARCH} == "ia64"
-BROKEN=	Does not compile on ia64
+.if defined(GC_VARIANT) && ${GC_VARIANT} == "threaded"
+. if ${PORT_OPTIONS:MPARALLEL_MARK}
+CONFIGURE_ARGS+=--enable-parallel-mark
+. endif
 .endif
 
+.ifdef GC_VARIANT
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's,libgc\.la,libgc-${GC_VARIANT}.la,g ; \
+		s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \
+		s,libcord\.la,libcord-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
+
+do-install:
+.for LIB in ${INSTLIBS}
+	${INSTALL_DATA} ${WRKSRC}/.libs/lib${LIB}-${GC_VARIANT}.so.${SOVER} \
+		${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so.${SOVER}
+	${LN} -sf lib${LIB}-${GC_VARIANT}.so.${SOVER} \
+		${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/bdw-gc.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
+
+.else # ! GC_VARIANT
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
+	@${REINPLACE_CMD} \
+		-e "s|(datadir)/@PACKAGE@|(datadir)/doc/@PACKAGE@|" \
+		${WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${STAGEDIR}${MAN3PREFIX}/man/man3/gc.3
+
+.endif
 
-#
 # 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
-
-test: build
+regression-test: build
 	cd ${WRKSRC} && ${MAKE} check
 
 .include <bsd.port.post.mk>
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 278e5b4aa6ae..f3a0f83a0ade 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gc-7.1.tar.gz) = e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
-SIZE (gc-7.1.tar.gz) = 1077714
+SHA256 (gc-7.2d.tar.gz) = d9fe0ae8650d43746a48bfb394cab01a319f3809cee19f8ebd16aa985b511c5e
+SIZE (gc-7.2d.tar.gz) = 1263064
diff --git a/devel/boehm-gc/files/patch-Makefile.in b/devel/boehm-gc/files/patch-Makefile.in
deleted file mode 100644
index 5021e88488f3..000000000000
--- a/devel/boehm-gc/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
diff --git a/devel/boehm-gc/files/patch-ab b/devel/boehm-gc/files/patch-ab
index fe08615d5565..fd480b5acd75 100644
--- a/devel/boehm-gc/files/patch-ab
+++ b/devel/boehm-gc/files/patch-ab
@@ -1,7 +1,7 @@
---- doc/gc.man.orig	Mon Oct  8 10:23:01 2001
-+++ doc/gc.man	Mon Oct  8 10:28:31 2001
-@@ -9,7 +9,7 @@
- ... malloc(...) ...
+--- doc/gc.man.orig	2012-07-25 14:54:48.000000000 +0300
++++ doc/gc.man	2012-07-25 14:57:40.000000000 +0300
+@@ -11,7 +11,7 @@
+ void * GC_realloc(void *ptr, size_t size);
  .br
  .sp
 -cc ... gc.a
@@ -9,11 +9,10 @@
  .LP
  .SH DESCRIPTION
  .I GC_malloc
-@@ -67,6 +67,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.
+@@ -88,6 +88,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 (FreeBSD package) installation,
@@ -55,6 +54,7 @@
 +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/files/patch-configure b/devel/boehm-gc/files/patch-configure
index f3da144f1931..0435d607e406 100644
--- a/devel/boehm-gc/files/patch-configure
+++ b/devel/boehm-gc/files/patch-configure
@@ -1,12 +1,22 @@
---- configure.orig	2009-12-19 14:02:54.000000000 +0300
-+++ configure	2009-12-19 14:04:13.000000000 +0300
-@@ -6161,6 +6161,9 @@
-  sparc-*-netbsd*)
-     machdep="mach_dep.lo sparc_netbsd_mach_dep.lo"
+--- configure.orig	2012-07-25 14:48:53.000000000 +0300
++++ configure	2012-07-25 14:53:59.000000000 +0300
+@@ -4965,6 +4965,9 @@
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
+ $as_echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
+         $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
++        if test "${enable_parallel_mark}" = yes; then
++          $as_echo "#define PARALLEL_MARK 1" >>confdefs.h
++        fi
+ 
+         INCLUDES="$INCLUDES -pthread"
+         ;;
+@@ -5508,6 +5511,9 @@
+  sparc*-*-openbsd*)
+     machdep="mach_dep.lo sparc_mach_dep.lo"
      ;;
-+ sparc64-*-freebsd*)
++ sparc*-*-freebsd*)
 +    machdep="mach_dep.lo sparc_mach_dep.lo"
 +    ;;
   sparc-sun-solaris2.3)
      machdep="mach_dep.lo sparc_mach_dep.lo"
-     cat >>confdefs.h <<\_ACEOF
+ 
diff --git a/devel/boehm-gc/files/patch-dbg_mlc.c b/devel/boehm-gc/files/patch-dbg_mlc.c
deleted file mode 100644
index 52a801da9c3a..000000000000
--- a/devel/boehm-gc/files/patch-dbg_mlc.c
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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);
- }
- 
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+static void GC_caller_func_offset(ad, symp, offp)
-+const GC_word ad;
-+const char **symp;
-+int *offp;
-+{
-+    Dl_info caller;
-+    if (dladdr((const void *)ad, &caller) && caller.dli_sname != NULL) {
-+      *symp = caller.dli_sname;
-+      *offp = (const char *)ad - (const char *)caller.dli_saddr;
-+    }
-+}
-+#else
-+#define GC_caller_func(ad, symp, offp)
-+#endif
-+
- void * GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
- {
-     void * result = GC_malloc(lb + DEBUG_BYTES);
--    
-+
-+#ifdef GC_ADD_CALLER
-+    if (s == NULL) {
-+      GC_caller_func_offset(ra, &s, &i);
-+      if (s == NULL)
-+        s = "unknown";
-+    }
-+#endif
-     if (result == 0) {
-         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) {
-+      GC_caller_func_offset(ra, &s, &i);
-+      if (s == NULL)
-+        s = "unknown";
-+    }
-+#endif
-     if (p == 0) return(GC_debug_malloc(lb, OPT_RA s, i));
-     if (base == 0) {
-         GC_err_printf("Attempt to reallocate invalid pointer %p\n", p);
-@@ -1041,17 +1072,21 @@
- }
- 
- #ifdef GC_ADD_CALLER
--# define RA GC_RETURN_ADDR,
-+# ifdef GC_RETURN_ADDR_PARENT
-+#  define RA GC_RETURN_ADDR_PARENT,
-+# else
-+#  define RA GC_RETURN_ADDR,
-+# endif
- #else
- # define RA
- #endif
- 
- void * GC_debug_malloc_replacement(size_t lb)
- {
--    return GC_debug_malloc(lb, RA "unknown", 0);
-+    return GC_debug_malloc(lb, RA NULL, 0);
- }
- 
- 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-dyn_load.c b/devel/boehm-gc/files/patch-dyn_load.c
deleted file mode 100644
index e8b954ecffb8..000000000000
--- a/devel/boehm-gc/files/patch-dyn_load.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- dyn_load.c.orig	Thu May  6 08:03:06 2004
-+++ dyn_load.c	Sun Oct 31 01:53:01 2004
-@@ -97,6 +97,12 @@
- #      else
- #        define ElfW(type) Elf64_##type
- #      endif
-+#    elif defined(__FreeBSD__)
-+#      if __ELF_WORD_SIZE == 32
-+#        define ElfW(type) Elf32_##type
-+#      else
-+#        define ElfW(type) Elf64_##type
-+#      endif
- #    else
- #      if !defined(ELF_CLASS) || ELF_CLASS == ELFCLASS32
- #        define ElfW(type) Elf32_##type
diff --git a/devel/boehm-gc/files/patch-include-gc.h b/devel/boehm-gc/files/patch-include-gc.h
deleted file mode 100644
index 44ee87d92268..000000000000
--- a/devel/boehm-gc/files/patch-include-gc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/gc.h.orig	Wed Jun  4 17:07:33 2003
-+++ include/gc.h	Wed May 12 20:03:22 2004
-@@ -487,6 +487,7 @@
-     /* gcc knows how to retrieve return address, but we don't know */
-     /* how to generate call stacks.				   */
- #   define GC_RETURN_ADDR (GC_word)__builtin_return_address(0)
-+#   define GC_RETURN_ADDR_PARENT (GC_word)__builtin_return_address(1)
- # else
-     /* Just pass 0 for gcc compatibility. */
- #   define GC_RETURN_ADDR 0
diff --git a/devel/boehm-gc/files/patch-include-private-gcconfig.h b/devel/boehm-gc/files/patch-include-private-gcconfig.h
index da83c49ebb91..e3ffdc8b2740 100644
--- a/devel/boehm-gc/files/patch-include-private-gcconfig.h
+++ b/devel/boehm-gc/files/patch-include-private-gcconfig.h
@@ -1,42 +1,36 @@
---- 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__)
+--- include/private/gcconfig.h.orig	2012-07-25 15:03:15.000000000 +0300
++++ include/private/gcconfig.h	2012-07-25 15:07:05.000000000 +0300
+@@ -73,7 +73,8 @@
+ # if defined(__arm) || defined(__arm__) || defined(__thumb__)
  #    define ARM32
--#    if !defined(LINUX) && !defined(NETBSD)
-+#    if !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD)
+ #    if !defined(LINUX) && !defined(NETBSD) && !defined(OPENBSD) \
+-        && !defined(DARWIN) && !defined(_WIN32) && !defined(__CEGCC__)
++        && !defined(DARWIN) && !defined(_WIN32) && !defined(__CEGCC__) \
++        && !defined(FREEBSD)
  #      define NOSYS
  #      define mach_type_known
  #    endif
-@@ -334,10 +334,26 @@
- #    define X86_64
- #    define mach_type_known
+@@ -359,10 +360,18 @@
+ #   define I386
+ #   define mach_type_known
  # endif
-+# if defined(__FreeBSD__) && defined(__amd64__)
-+#    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
+-# if defined(FREEBSD) && defined(__x86_64__)
++# if defined(FREEBSD) && defined(__amd64__)
+ #   define X86_64
+ #   define mach_type_known
  # endif
-+# if defined(FREEBSD) && defined(__powerpc__)
-+#    define POWERPC
-+#    define mach_type_known
++# if defined(FREEBSD) && defined(__ia64__)
++#   define IA64
++#   define mach_type_known
 +# endif
 +# if defined(FREEBSD) && defined(__arm__)
-+#    define ARM32
-+#    define mach_type_known
++#   define ARM32
++#   define mach_type_known
 +# endif
- # if defined(bsdi) && (defined(i386) || defined(__i386__))
- #    define I386
- #    define BSDI
-@@ -1771,6 +1787,16 @@
+ # if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
+ #   define I386
+ #   define mach_type_known
+@@ -1949,6 +1958,16 @@
  #     define OS_TYPE "MSWINCE"
  #     define DATAEND /* not needed */
  #   endif
@@ -46,18 +40,10 @@
 +#       ifdef __ELF__
 +#           define DYNAMIC_LOADING
 +#       endif
-+#	define HEURISTIC2
-+	extern char etext[];
-+#	define SEARCH_FOR_DATA_START
++#      define HEURISTIC2
++       extern char etext[];
++#      define SEARCH_FOR_DATA_START
 +#   endif
- #   ifdef NOSYS
-       /* __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 LINUX
- #     define OS_TYPE "LINUX"
- #     define LINUX_STACKBOTTOM
+ #   ifdef DARWIN
+       /* iPhone */
+ #     define OS_TYPE "DARWIN"
diff --git a/devel/boehm-gc/files/patch-os_dep.c b/devel/boehm-gc/files/patch-os_dep.c
index 985f52807d5d..e929fc37dceb 100644
--- a/devel/boehm-gc/files/patch-os_dep.c
+++ b/devel/boehm-gc/files/patch-os_dep.c
@@ -1,44 +1,28 @@
---- os_dep.c.orig	2008-02-29 11:01:28.000000000 -0800
-+++ os_dep.c	2010-04-01 00:50:34.000000000 -0700
-@@ -816,7 +816,7 @@
-     || defined(HURD) || defined(NETBSD)
- 	static struct sigaction old_segv_act;
- #	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
-@@ -826,7 +826,7 @@
-     void GC_set_and_save_fault_handler(handler h)
+--- os_dep.c.orig	2012-07-25 15:08:26.000000000 +0300
++++ os_dep.c	2012-07-25 15:16:54.000000000 +0300
+@@ -843,7 +843,7 @@
+     GC_INNER void GC_set_and_save_fault_handler(GC_fault_handler_t h)
      {
- #	if defined(SUNOS5SIGS) || defined(IRIX5)  \
--        || defined(OSF1) || defined(HURD) || defined(NETBSD)
-+        || defined(OSF1) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
- 	  struct sigaction	act;
+ #       if defined(SUNOS5SIGS) || defined(IRIX5) \
+-           || defined(OSF1) || defined(HURD) || defined(NETBSD)
++           || defined(OSF1) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
+           struct sigaction act;
  
- 	  act.sa_handler	= h;
-@@ -846,7 +846,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(NETBSD)
-+		   || defined(HPUX) || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
- 		    /* 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.		*/
-@@ -2713,7 +2713,13 @@
- #   include <errno.h>
- #   if defined(FREEBSD)
- #     define SIG_OK TRUE
--#     define CODE_OK (code == BUS_PAGE_FAULT)
+           act.sa_handler = h;
+@@ -3072,8 +3072,15 @@
+ #     ifndef SEGV_ACCERR
+ #       define SEGV_ACCERR 2
+ #     endif
+-#     define CODE_OK (si -> si_code == BUS_PAGE_FAULT \
 +#     if defined(POWERPC)
-+#	define AIM	/* Pretend that we're AIM. */
-+#	include <machine/trap.h>
-+#       define CODE_OK (code == EXC_DSI)
++#      define AIM      /* Pretend that we're AIM. */
++#      include <machine/trap.h>
++#       define CODE_OK (si -> si_code == EXC_DSI \
++          || si -> si_code == SEGV_ACCERR)
 +#     else
-+#       define CODE_OK (code == BUS_PAGE_FAULT)
++#       define CODE_OK (si -> si_code == BUS_PAGE_FAULT \
+           || si -> si_code == SEGV_ACCERR)
 +#     endif
  #   elif defined(OSF1)
- #     define SIG_OK (sig == SIGSEGV)
- #     define CODE_OK (code == 2 /* experimentally determined */)
+ #     define CODE_OK (si -> si_code == 2 /* experimentally determined */)
+ #   elif defined(IRIX5)
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index dec84f42e7ad..c83c9bdd293a 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -1,4 +1,5 @@
 include/gc.h
+include/gc/cord.h
 include/gc/gc.h
 include/gc/gc_allocator.h
 include/gc/gc_amiga_redirects.h
@@ -23,40 +24,5 @@ lib/libgc.so.1
 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
-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.darwin
-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/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
-@dirrm share/doc/gc
-@dirrm include/gc
+man/man3/gc.3.gz
+@dirrmtry include/gc