diff --git a/mail/bogofilter-bdb/Makefile b/mail/bogofilter-bdb/Makefile
index 031f3d5f4c96..29b056233fe4 100644
--- a/mail/bogofilter-bdb/Makefile
+++ b/mail/bogofilter-bdb/Makefile
@@ -1,100 +1,99 @@
 PORTNAME=	bogofilter
 DISTVERSION=	1.2.5
 PORTREVISION?=	4
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-stable/
 PKGNAMESUFFIX?=	-bdb
 
 MAINTAINER?=	mandree@FreeBSD.org
 COMMENT=	Fast, teachable, learning spam detector
 WWW=		https://bogofilter.sourceforge.io/
 
 LICENSE=	GPLv2
 
-DEPRECATED=	The Berkeley DB database interface is obsolescent.
-EXPIRATION_DATE=2025-06-30
-
 .if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
 # building master port
 USES+=		bdb:5+
+DEPRECATED=	The Berkeley DB database interface is obsolescent.
+EXPIRATION_DATE=2025-06-30
 .endif
 
 OPTIONS_DEFINE=		GSL UNICODE DOCS
 OPTIONS_DEFAULT=	GSL UNICODE
 GSL_DESC=		Link with system-wide GSL dynamically (recommended)
 UNICODE_DESC=		Normalize tokens to Unicode (UTF-8) (recommended)
 
 CONFLICTS_INSTALL?=	bogofilter-sqlite bogofilter bogofilter-kc
 
 USES+=		cpe perl5 shebangfix tar:xz
 SHEBANG_FILES=	contrib/randomtrain.sh contrib/scramble.sh \
 		src/tests/unsort.pl contrib/*.pl
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	bogofilter_project
 
 UNICODE_USES=	iconv
 UNICODE_CONFIGURE_ENABLE=	unicode
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 GSL_CONFIGURE_OFF=	--with-included-gsl
 
 PORTDOCS=	*
 
 TEST_TARGET=	check
 
 .include <bsd.port.pre.mk>
 
 BF_LIBS?=		-l${BDB_LIB_NAME}
 BF_CPPFLAGS?=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 .if ${PORT_OPTIONS:MUNICODE}
 BF_LIBS+=		${ICONV_LIB}
 .endif
 CPPFLAGS+=	${BF_CPPFLAGS}
 LIBS+=		-L${LOCALBASE}/lib ${BF_LIBS}
 CONFIGURE_ENV+=	PERL="${PERL}"
 INSTALL_TARGET=	install-strip prefix=${PREFIX} mandir=${PREFIX}/share/man
 
 post-patch:
 	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
 		-e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
 		${WRKSRC}/src/tests/Makefile.in
 
 post-build:
 	cd ${WRKSRC}/src && ${SETENVI} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \
 		|| { r=$$? ; head -n30000 ${WRKSRC}/src/tests/test-suite.log ; exit $$r ; }
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 .for i in html programmer xml
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 .for i in AUTHORS COPYING INSTALL NEWS README README.git \
 	doc/README.validation TODO GETTING.STARTED \
 	RELEASE.NOTES doc/README.db doc/README.sqlite \
 	doc/integrating-with-postfix doc/integrating-with-qmail \
 	doc/bogofilter-tuning.HOWTO.html doc/bogofilter-SA-* \
 	doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
 	  ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .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
 	${INSTALL_PROGRAM} ${WRKSRC}/bogogrep ${STAGEDIR}${PREFIX}/bin/
 .for i in bfproxy.pl bogofilter-milter.pl bogo.R bogofilter-qfe.sh \
 		mime.get.rfc822.pl parmtest.sh printmaildir.pl \
 		bogominitrain.pl \
 		randomtrain.sh scramble.sh spamitarium.pl stripsearch.pl trainbogo.sh
 	  ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
 .endfor
 .for i in dot-qmail-bogofilter-default \
 	mailfilter.example procmailrc.example vm-bogofilter.el
 	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile
index d0cd0eb7ddc6..572d21cb044a 100644
--- a/mail/bogofilter-kc/Makefile
+++ b/mail/bogofilter-kc/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	bogofilter
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-kc
 
 MAINTAINER=	mandree@FreeBSD.org
 
 LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 CONFLICTS_INSTALL=	bogofilter bogofilter-lmdb bogofilter-sqlite
 
 CONFIGURE_ARGS=	--with-database=kyotocabinet
 BF_CPPFLAGS=	-I${LOCALBASE}/include
 BF_LIBS=
 DESCR=		${PKGDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../bogofilter-bdb
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index e224d59e023d..c7cd4d807d33 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	bogofilter
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
 MAINTAINER=	mandree@FreeBSD.org
 
 USES=		sqlite
 CONFLICTS_INSTALL=	bogofilter bogofilter-lmdb bogofilter-kc
 
 CONFIGURE_ARGS=	--with-database=sqlite
 BF_CPPFLAGS=	-I${LOCALBASE}/include
 BF_LIBS=
 DESCR=		${PKGDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../bogofilter-bdb
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 4b29b9cb59df..08ed7edaa967 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	bogofilter
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	# blank, to override bogofilter-bdb's
 
 MAINTAINER=	mandree@FreeBSD.org
 
 LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 CONFLICTS_INSTALL=	bogofilter-bdb bogofilter-kc bogofilter-sqlite
 
 CONFIGURE_ARGS=	--with-database=lmdb
 BF_CPPFLAGS=	-I${LOCALBASE}/include
 BF_LIBS=
 DESCR=		${PKGDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../bogofilter-bdb
 
 .include "${MASTERDIR}/Makefile"