diff --git a/biology/bifrost/Makefile b/biology/bifrost/Makefile
index 8820ddfa0631..082d27df32e6 100644
--- a/biology/bifrost/Makefile
+++ b/biology/bifrost/Makefile
@@ -1,23 +1,34 @@
 PORTNAME=	bifrost
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.5
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Parallel construction, indexing and querying of de Bruijn graphs
 WWW=		https://github.com/pmelsted/bifrost
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le riscv64
 ONLY_FOR_ARCHS_REASON=	Requires a 64-bit processor
 
 USES=		cmake
 USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DCOMPILATION_ARCH=${CPUTYPE:UOFF}
 
+CXXFLAGS+=	-Wno-unqualified-std-cast-call
+
 GH_ACCOUNT=	pmelsted
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# Build fails with clang19, but succeeds with gcc13
+# Have not figured out where this sz_link member is even supposed to come from
+# DataStorage.tcc:81:69: error: no member named 'sz_link' in 'DataStorage<Unitig_data_t>'
+.if ${OSVERSION} > 1500000
+USE_GCC=	yes
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/biology/bifrost/files/patch-CMakeLists.txt b/biology/bifrost/files/patch-CMakeLists.txt
index 27893b9ec44d..4d49c5a270cc 100644
--- a/biology/bifrost/files/patch-CMakeLists.txt
+++ b/biology/bifrost/files/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2023-08-12 14:26:29 UTC
+--- CMakeLists.txt.orig	2024-03-15 15:20:17 UTC
 +++ CMakeLists.txt
-@@ -46,7 +46,6 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
+@@ -56,7 +56,6 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
  		set(CMAKE_EXE_LINKER_FLAGS "-pg")
  	else(CMAKE_BUILD_TYPE MATCHES Profile)
  		message("Build type: Release")
 -		add_compile_options(-O3)
  	endif(CMAKE_BUILD_TYPE MATCHES Profile)
  endif(CMAKE_BUILD_TYPE MATCHES Debug)