devel/boehm-gc: Update to 8.0.2

(Use correct patch this time)

PR:		233976
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org> (maintainer)
Pointyhat to:	swills

4 files changed, 15 insertions, 16 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index d9f8507e1c53..f0ec9a082dc6 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gc
-PORTVERSION=	7.6.10
+PORTVERSION=	8.0.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hboehm.info/gc/gc_source/ \
 		https://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/
@@ -22,14 +22,14 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 
 GNU_CONFIGURE=	yes
-USES=		cpe libtool localbase pathfix pkgconfig
+USES=		cpe libtool pathfix pkgconfig
 CPE_VENDOR=	boehm-demers-weiser
 CPE_PRODUCT=	garbage_collector
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 # NOTE: do not --disable-static, static is useful for e.g. lang/crystal
-CONFIGURE_ARGS=	--enable-cplusplus
+CONFIGURE_ARGS=	--enable-cplusplus --enable-static
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
@@ -45,15 +45,15 @@ PLIST=		${NONEXISTENT}
 PLIST_FILES=	${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
-		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.2,} \
+		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.0,} \
 		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
-		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.5,} \
+		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.2,} \
 		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
-		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.2,} \
+		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.0,} \
 		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
 RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
 . if ${GC_VARIANT} == "redirect"
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 3515bd80f9da..0c08e9f9d0f0 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544688613
-SHA256 (gc-7.6.10.tar.gz) = 4fc766749a974700c576bbfb71b4a73b2ed746082e2fc8388bfb0b54b636af14
-SIZE (gc-7.6.10.tar.gz) = 1143650
+TIMESTAMP = 1545608814
+SHA256 (gc-8.0.2.tar.gz) = 4e8ca4b5b72a3a27971daefaa9b621f0a716695b23baa40b7eac78de2eeb51cb
+SIZE (gc-8.0.2.tar.gz) = 1159207
diff --git a/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h b/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h
index f7aefbe9ffee..30e470766a5f 100644
--- a/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h
+++ b/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h
@@ -1,9 +1,9 @@
---- include/gc_pthread_redirects.h.orig	2018-01-04 14:41:42 UTC
+--- include/gc_pthread_redirects.h.orig	2018-12-23 21:28:41 UTC
 +++ include/gc_pthread_redirects.h
-@@ -44,12 +44,8 @@
+@@ -53,12 +53,8 @@
+ # endif /* !GC_NO_DLOPEN */
  
  # ifndef GC_NO_PTHREAD_SIGMASK
- #   include <signal.h>  /* needed anyway for proper redirection */
 -#   if defined(GC_PTHREAD_SIGMASK_NEEDED) \
 -        || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) \
 -        || (_POSIX_C_SOURCE >= 199506L) || (_XOPEN_SOURCE >= 500)
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index b5949d256ca3..eca44ebc91a6 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -17,19 +17,18 @@ include/gc/gc_typed.h
 include/gc/gc_version.h
 include/gc/javaxfc.h
 include/gc/leak_detector.h
-include/gc/weakpointer.h
 include/gc_cpp.h
 lib/libcord.a
 lib/libcord.so
 lib/libcord.so.1
-lib/libcord.so.1.3.2
+lib/libcord.so.1.4.0
 lib/libgc.a
 lib/libgc.so
 lib/libgc.so.1
-lib/libgc.so.1.3.5
+lib/libgc.so.1.4.2
 lib/libgccpp.a
 lib/libgccpp.so
 lib/libgccpp.so.1
-lib/libgccpp.so.1.3.2
+lib/libgccpp.so.1.4.0
 libdata/pkgconfig/bdw-gc.pc
 man/man3/gc.3.gz