diff --git a/mail/bogofilter-bdb/Makefile b/mail/bogofilter-bdb/Makefile
index 0c0cdfc099bc..a103d66dc421 100644
--- a/mail/bogofilter-bdb/Makefile
+++ b/mail/bogofilter-bdb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bogofilter
-DISTVERSION=	1.2.5
-PORTREVISION?=	5
+DISTVERSION=	1.3.0.rc1
+PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-stable/
 PKGNAMESUFFIX?=	-bdb
@@ -47,6 +47,9 @@ TEST_TARGET=	check
 BF_LIBS?=		-l${BDB_LIB_NAME}
 BF_CPPFLAGS?=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
+.if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
+CONFIGURE_ARGS+=	--with-database=db
+.endif
 .if ${PORT_OPTIONS:MUNICODE}
 BF_LIBS+=		${ICONV_LIB}
 .endif
@@ -80,7 +83,6 @@ post-install:
 .for i in README.randomtrain README.contrib
 	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/trio/AUTHORS ${STAGEDIR}${DOCSDIR}/AUTHORS.trio
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${STAGEDIR}${DOCSDIR}/xml
 	${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${STAGEDIR}${DOCSDIR}/programmer
@@ -92,7 +94,7 @@ post-install:
 	  ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
 .endfor
 .for i in dot-qmail-bogofilter-default \
-	mailfilter.example procmailrc.example vm-bogofilter.el
+	mailfilter.example vm-bogofilter.el
 	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
 .endfor
 
diff --git a/mail/bogofilter-bdb/distinfo b/mail/bogofilter-bdb/distinfo
index 480c473b12bf..eacda71cdf59 100644
--- a/mail/bogofilter-bdb/distinfo
+++ b/mail/bogofilter-bdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570829897
-SHA256 (bogofilter-1.2.5.tar.xz) = 3248a1373bff552c500834adbea4b6caee04224516ae581fb25a4c6a6dee89ea
-SIZE (bogofilter-1.2.5.tar.xz) = 801240
+TIMESTAMP = 1744986765
+SHA256 (bogofilter-1.3.0.rc1.tar.xz) = 0bc4b8300a106e7c5a4110c052272cfe64bb096ec5e7f552a44c3f41b574b29b
+SIZE (bogofilter-1.3.0.rc1.tar.xz) = 764724
diff --git a/mail/bogofilter-bdb/files/patch-configure b/mail/bogofilter-bdb/files/patch-configure
deleted file mode 100644
index 544c40f04d41..000000000000
--- a/mail/bogofilter-bdb/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
-Clang 9 no longer pretends to be GCC
-https://reviews.llvm.org/rL356931
-https://reviews.llvm.org/rL366091
-
---- configure.orig	2019-09-08 15:43:06 UTC
-+++ configure
-@@ -6464,8 +6464,8 @@ if test "$GCC" = yes && test "$ICC" = no ; then
- 	""|2.*|3.*) ;;
- 	4.*) gcc4=yes ;;
-     esac
--    case "$CC" in
--	*clang) gcc4=yes ;;
-+    case `$CC --version 2>/dev/null` in
-+	*clang*) gcc4=yes ;;
-     esac
- fi
-  if test $gcc4 = yes; then
diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile
index 753835260051..e434c2b59f3a 100644
--- a/mail/bogofilter-kc/Makefile
+++ b/mail/bogofilter-kc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bogofilter
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-kc
 
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index d0d4c27ba1b7..e855c9d8d26c 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bogofilter
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 0325280bcf93..6d2eadbb372f 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bogofilter
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	# blank, to override bogofilter-bdb's