. update to version 7.2e;

. remove patches which have been incorporated upstream.

Reported by:	Ivan Maidanski <ivmai@mail.ru> (via e-mail)

5 files changed, 3 insertions, 102 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 0a66c8e2ed76..b484b0d1ccc1 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gc
-PORTVERSION=	7.2d
+PORTVERSION=	7.2e
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index f3a0f83a0ade..d6b604ccca7c 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gc-7.2d.tar.gz) = d9fe0ae8650d43746a48bfb394cab01a319f3809cee19f8ebd16aa985b511c5e
-SIZE (gc-7.2d.tar.gz) = 1263064
+SHA256 (gc-7.2e.tar.gz) = 09315b48a82d600371207691126ad058c04677281ac318d86fa84c98c3c9af4b
+SIZE (gc-7.2e.tar.gz) = 1291186
diff --git a/devel/boehm-gc/files/patch-configure b/devel/boehm-gc/files/patch-configure
deleted file mode 100644
index 0435d607e406..000000000000
--- a/devel/boehm-gc/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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"
-     ;;
-+ sparc*-*-freebsd*)
-+    machdep="mach_dep.lo sparc_mach_dep.lo"
-+    ;;
-  sparc-sun-solaris2.3)
-     machdep="mach_dep.lo sparc_mach_dep.lo"
- 
diff --git a/devel/boehm-gc/files/patch-include-private-gcconfig.h b/devel/boehm-gc/files/patch-include-private-gcconfig.h
deleted file mode 100644
index e3ffdc8b2740..000000000000
--- a/devel/boehm-gc/files/patch-include-private-gcconfig.h
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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) && !defined(OPENBSD) \
--        && !defined(DARWIN) && !defined(_WIN32) && !defined(__CEGCC__)
-+        && !defined(DARWIN) && !defined(_WIN32) && !defined(__CEGCC__) \
-+        && !defined(FREEBSD)
- #      define NOSYS
- #      define mach_type_known
- #    endif
-@@ -359,10 +360,18 @@
- #   define I386
- #   define mach_type_known
- # endif
--# if defined(FREEBSD) && defined(__x86_64__)
-+# 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(__arm__)
-+#   define ARM32
-+#   define mach_type_known
-+# endif
- # 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
-+#   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 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
deleted file mode 100644
index e929fc37dceb..000000000000
--- a/devel/boehm-gc/files/patch-os_dep.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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;
- 
-           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 (si -> si_code == EXC_DSI \
-+          || si -> si_code == SEGV_ACCERR)
-+#     else
-+#       define CODE_OK (si -> si_code == BUS_PAGE_FAULT \
-           || si -> si_code == SEGV_ACCERR)
-+#     endif
- #   elif defined(OSF1)
- #     define CODE_OK (si -> si_code == 2 /* experimentally determined */)
- #   elif defined(IRIX5)