diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 8da0cc0f9940..7253b5c9860f 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,123 +1,123 @@
 PORTNAME=	gc
-DISTVERSION=	8.2.2
+DISTVERSION=	8.2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hboehm.info/gc/gc_source/ \
 		https://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	boehm-
 .ifdef GC_VARIANT
 PKGNAMESUFFIX=	-${GC_VARIANT}
 .endif
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Garbage collection and memory leak detection for C and C++
 WWW=		https://www.hboehm.info/gc/
 
 LICENSE=	BDWGC
 LICENSE_NAME=	Boehm-Demers-Weiser Garbage Collector License
 LICENSE_TEXT=	License can be found at http://www.hboehm.info/gc/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 
 USES=		cpe libtool pathfix pkgconfig
 CPE_VENDOR=	boehm-demers-weiser
 CPE_PRODUCT=	garbage_collector
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 # NOTE: do not --disable-static, static is useful for e.g. lang/crystal
 CONFIGURE_ARGS=	--enable-cplusplus \
 		--enable-mmap \
 		--enable-static
 
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
 
 OPTIONS_DEFINE=	DEBUG
 
 .ifdef GC_VARIANT
 INSTALL_TARGET=		install-exec install-pkgconfigDATA
 CORDLIBS=		cord
 GCCPPLIBS=		gccpp
 GCLIBS=			gc
 GCTBALIBS=		gctba
 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.5.0,} \
 			${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.5.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.5.1,} \
+			${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.2,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.0,} \
 			libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
 RUN_DEPENDS+=		${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
 . if ${GC_VARIANT} == "threaded"
 CONFIGURE_ARGS+=	--disable-redirect-malloc \
 			--enable-threads=posix
 OPTIONS_DEFINE+=	PARALLEL_MARK
 PARALLEL_MARK_DESC=	Parallel-thread marking (faster for SMP)
 USES+=			compiler:c11
 PLIST_FILES+=		include/gc/gc_pthread_redirects.h
 . endif
 .else
 CONFIGURE_ARGS+=	--disable-redirect-malloc \
 			--disable-threads
 OPTIONS_DEFINE+=	DOCS
 PORTDOCS=		*
 .endif
 
 DEBUG_CONFIGURE_WITH=	--enable-gc-debug
 
 .if defined(GC_VARIANT) && ${GC_VARIANT} == "threaded"
 PARALLEL_MARK_CONFIGURE_WITH=	--enable-parallel-mark
 .endif
 
 .ifdef GC_VARIANT
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's,libcord\.la,libcord-${GC_VARIANT}.la,g ; \
 		s,libgc\.la,libgc-${GC_VARIANT}.la,g ; \
 		s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \
 		s,libgctba\.la,libgctba-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
 . if ${GC_VARIANT} == "threaded"
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/gc
 	${INSTALL_DATA} ${WRKSRC}/include/gc_pthread_redirects.h \
 		${STAGEDIR}${PREFIX}/include/gc
-.endif
+. endif
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcord-${GC_VARIANT}.so.1.5.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.1
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.2
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgccpp-${GC_VARIANT}.so.1.5.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgctba-${GC_VARIANT}.so.1.5.0
 
 .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:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index aacc3b11eabe..35632ff541a6 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661591575
-SHA256 (gc-8.2.2.tar.gz) = f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0
-SIZE (gc-8.2.2.tar.gz) = 1200115
+TIMESTAMP = 1685552073
+SHA256 (gc-8.2.4.tar.gz) = 3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
+SIZE (gc-8.2.4.tar.gz) = 1210929
diff --git a/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h b/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h
deleted file mode 100644
index 30e470766a5f..000000000000
--- a/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/gc_pthread_redirects.h.orig	2018-12-23 21:28:41 UTC
-+++ include/gc_pthread_redirects.h
-@@ -53,12 +53,8 @@
- # endif /* !GC_NO_DLOPEN */
- 
- # ifndef GC_NO_PTHREAD_SIGMASK
--#   if defined(GC_PTHREAD_SIGMASK_NEEDED) \
--        || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) \
--        || (_POSIX_C_SOURCE >= 199506L) || (_XOPEN_SOURCE >= 500)
-       GC_API int GC_pthread_sigmask(int /* how */, const sigset_t *,
-                                     sigset_t * /* oset */);
--#   endif
- # endif /* !GC_NO_PTHREAD_SIGMASK */
- 
- # ifndef GC_PTHREAD_CREATE_CONST
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 c3191a098bf3..000000000000
--- a/devel/boehm-gc/files/patch-include_private_gcconfig.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/private/gcconfig.h.orig	2017-12-23 08:46:29 UTC
-+++ include/private/gcconfig.h
-@@ -188,7 +188,7 @@
- #      define EWS4800
- #    endif
- #    if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \
--        && !defined(OPENBSD)
-+        && !defined(OPENBSD) && !defined(FREEBSD)
- #      if defined(ultrix) || defined(__ultrix)
- #        define ULTRIX
- #      else
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index f3cf7d9d12f0..c67deda40255 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -1,37 +1,37 @@
 include/gc.h
 include/gc/cord.h
 include/gc/cord_pos.h
 include/gc/ec.h
 include/gc/gc.h
 include/gc/gc_allocator.h
 include/gc/gc_backptr.h
 include/gc/gc_config_macros.h
 include/gc/gc_cpp.h
 include/gc/gc_disclaim.h
 include/gc/gc_gcj.h
 include/gc/gc_inline.h
 include/gc/gc_mark.h
 include/gc/gc_tiny_fl.h
 include/gc/gc_typed.h
 include/gc/gc_version.h
 include/gc/javaxfc.h
 include/gc/leak_detector.h
 include/gc_cpp.h
 lib/libcord.a
 lib/libcord.so
 lib/libcord.so.1
 lib/libcord.so.1.5.0
 lib/libgc.a
 lib/libgc.so
 lib/libgc.so.1
-lib/libgc.so.1.5.1
+lib/libgc.so.1.5.2
 lib/libgccpp.a
 lib/libgccpp.so
 lib/libgccpp.so.1
 lib/libgccpp.so.1.5.0
 lib/libgctba.a
 lib/libgctba.so
 lib/libgctba.so.1
 lib/libgctba.so.1.5.0
 libdata/pkgconfig/bdw-gc.pc
 man/man3/gc.3.gz