diff --git a/databases/p5-Search-Xapian/Makefile b/databases/p5-Search-Xapian/Makefile
index 32b473ee1c5a..b179842a8d64 100644
--- a/databases/p5-Search-Xapian/Makefile
+++ b/databases/p5-Search-Xapian/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	Search-Xapian
 PORTVERSION=	1.2.25.5
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
 		LOCAL/sunpoet \
 		CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl XS frontend to the Xapian C++ search library
 WWW=		https://metacpan.org/release/Search-Xapian
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 TEST_DEPENDS=	p5-Devel-Leak>=0:devel/p5-Devel-Leak \
 		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
 
 CC=		${CXX}
 CONFIGURE_ARGS=	XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
 
 CONFLICTS_INSTALL=	p5-Search-Xapian12 # lib/perl5/site_perl/mach/5.32/Search/Xapian.pm
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Search/Xapian/Xapian.so
 
 .include <bsd.port.mk>
diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index f348a2e05cb8..c950acc088ad 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	xapian-core
-PORTVERSION=	1.4.28
+PORTVERSION=	1.4.29
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Probabilistic text search database engine
 WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang libtool pathfix tar:xz
 
 CONFIGURE_ARGS=	ac_cv_func_snprintf=snprintf
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	xapian-core12 # include/xapian.h
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS SSE2
 SSE2_DESC=	Use SSE2 for floating point
 
 SSE2_CONFIGURE_ENABLE=	sse
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/xapian-inspect ${STAGEDIR}${PREFIX}/bin/xapian-inspect
 
 .include <bsd.port.mk>
diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo
index ae12da82e21f..9b926e2269e3 100644
--- a/databases/xapian-core/distinfo
+++ b/databases/xapian-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745177924
-SHA256 (xapian-core-1.4.28.tar.xz) = 3d0976e142217c1baba48bf89b405e674422e7e4448ae5016f67fe0dd49daa07
-SIZE (xapian-core-1.4.28.tar.xz) = 3250732
+TIMESTAMP = 1745936056
+SHA256 (xapian-core-1.4.29.tar.xz) = c55c9bc8613ad3ec2c218eafca088c218ab7cddcba7ef08f3af0e542f4e521bc
+SIZE (xapian-core-1.4.29.tar.xz) = 3250704
diff --git a/databases/xapian-core/pkg-plist b/databases/xapian-core/pkg-plist
index d36b34591856..26b37429aa33 100644
--- a/databases/xapian-core/pkg-plist
+++ b/databases/xapian-core/pkg-plist
@@ -1,542 +1,542 @@
 bin/copydatabase
 bin/quest
 bin/simpleexpand
 bin/simpleindex
 bin/simplesearch
 bin/xapian-check
 bin/xapian-compact
 bin/xapian-config
 bin/xapian-delve
 bin/xapian-inspect
 bin/xapian-metadata
 bin/xapian-pos
 bin/xapian-progsrv
 bin/xapian-replicate
 bin/xapian-replicate-server
 bin/xapian-tcpsrv
 include/xapian.h
 include/xapian/attributes.h
 include/xapian/compactor.h
 include/xapian/constants.h
 include/xapian/constinfo.h
 include/xapian/database.h
 include/xapian/dbfactory.h
 include/xapian/deprecated.h
 include/xapian/derefwrapper.h
 include/xapian/document.h
 include/xapian/enquire.h
 include/xapian/error.h
 include/xapian/errorhandler.h
 include/xapian/eset.h
 include/xapian/expanddecider.h
 include/xapian/geospatial.h
 include/xapian/intrusive_ptr.h
 include/xapian/iterator.h
 include/xapian/keymaker.h
 include/xapian/matchspy.h
 include/xapian/mset.h
 include/xapian/positioniterator.h
 include/xapian/postingiterator.h
 include/xapian/postingsource.h
 include/xapian/query.h
 include/xapian/queryparser.h
 include/xapian/registry.h
 include/xapian/stem.h
 include/xapian/termgenerator.h
 include/xapian/termiterator.h
 include/xapian/types.h
 include/xapian/unicode.h
 include/xapian/valueiterator.h
 include/xapian/valuesetmatchdecider.h
 include/xapian/version.h
 include/xapian/visibility.h
 include/xapian/weight.h
 lib/cmake/xapian/xapian-config-version.cmake
 lib/cmake/xapian/xapian-config.cmake
 lib/libxapian.so
-lib/libxapian.so.29
-lib/libxapian.so.29.14.0
+lib/libxapian.so.30
+lib/libxapian.so.30.14.1
 libdata/pkgconfig/xapian-core.pc
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/admin_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/bc_s.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/bc_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BB2Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BB2Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BB2Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25PlusWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25PlusWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25PlusWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Compactor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Compactor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1CoordWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1CoordWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1CoordWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DLHWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DLHWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DLHWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DPHWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DPHWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DPHWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseClosedError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseClosedError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseClosedError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseNotFoundError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseNotFoundError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseNotFoundError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateRangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterPrefix-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterPrefix.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterPrefix__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FieldProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FieldProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FieldProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1GreatCircleMetric-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1GreatCircleMetric.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1GreatCircleMetric__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1IfB2Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1IfB2Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1IfB2Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InL2Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InL2Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InL2Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1IneB2Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1IneB2Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1IneB2Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LMWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LMWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LMWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongCoords-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongCoords.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongCoordsIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongCoordsIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongDistanceKeyMaker-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongDistanceKeyMaker.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongDistanceKeyMaker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongDistancePostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongDistancePostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongDistancePostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongMetric-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongMetric.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LatLongMetric__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberRangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PL2PlusWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PL2PlusWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PL2PlusWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PL2Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PL2Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PL2Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Registry-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Registry.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StemImplementation-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StemImplementation.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StemImplementation__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StringValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StringValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StringValueRangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermGenerator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermGenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TfIdfWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TfIdfWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TfIdfWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Utf8Iterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Utf8Iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueRangeProcessor__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WildcardError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WildcardError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WildcardError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/closed.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/compactor_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/constants_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/constinfo_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dir_f63502d618711192f85ccb772536c6ae.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/eset_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_b.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_c.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_d.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_e.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_f.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_b.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_c.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_d.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_e.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_f.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_g.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_i.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_k.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_l.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_m.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_n.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_o.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_p.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_q.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_r.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_s.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_t.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_u.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_v.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_w.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_~.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_g.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_i.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_k.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_l.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_m.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_n.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_o.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_p.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_q.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_r.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_s.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_t.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_type.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_u.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_v.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_w.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_~.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/geospatial_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_0.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_1.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_10.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_11.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_12.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_13.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_14.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_15.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_16.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_17.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_18.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_19.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_2.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_20.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_21.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_22.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_23.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_24.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_25.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_26.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_27.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_3.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_4.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_5.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_6.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_7.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_8.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit_graph_9.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherits.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/keymaker_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/matchspy_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/menu.js
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/menudata.js
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/mset_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Auto.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Chert.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1InMemory.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Remote.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Unicode.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_type.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_f.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_fd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_g.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_h.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/open.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingsource_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/registry_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/splitbar.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/splitbard.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1LatLongCoord-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1LatLongCoord.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sync_off.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sync_on.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_a.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_ad.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_b.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_bd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_h.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valuesetmatchdecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/version_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/weight_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/xapian_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/bm25.html
 %%PORTDOCS%%%%DOCSDIR%%/collapsing.html
 %%PORTDOCS%%%%DOCSDIR%%/deprecation.html
 %%PORTDOCS%%%%DOCSDIR%%/facets.html
 %%PORTDOCS%%%%DOCSDIR%%/geospatial.html
 %%PORTDOCS%%%%DOCSDIR%%/glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
 %%PORTDOCS%%%%DOCSDIR%%/internals.html
 %%PORTDOCS%%%%DOCSDIR%%/intro_ir.html
 %%PORTDOCS%%%%DOCSDIR%%/matcherdesign.html
 %%PORTDOCS%%%%DOCSDIR%%/overview.html
 %%PORTDOCS%%%%DOCSDIR%%/postingsource.html
 %%PORTDOCS%%%%DOCSDIR%%/queryparser.html
 %%PORTDOCS%%%%DOCSDIR%%/remote.html
 %%PORTDOCS%%%%DOCSDIR%%/replication.html
 %%PORTDOCS%%%%DOCSDIR%%/scalability.html
 %%PORTDOCS%%%%DOCSDIR%%/serialisation.html
 %%PORTDOCS%%%%DOCSDIR%%/sorting.html
 %%PORTDOCS%%%%DOCSDIR%%/spelling.html
 %%PORTDOCS%%%%DOCSDIR%%/stemming.html
 %%PORTDOCS%%%%DOCSDIR%%/synonyms.html
 %%PORTDOCS%%%%DOCSDIR%%/termgenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/tests.html
 %%PORTDOCS%%%%DOCSDIR%%/valueranges.html
 share/man/man1/copydatabase.1.gz
 share/man/man1/quest.1.gz
 share/man/man1/xapian-check.1.gz
 share/man/man1/xapian-compact.1.gz
 share/man/man1/xapian-config.1.gz
 share/man/man1/xapian-delve.1.gz
 share/man/man1/xapian-metadata.1.gz
 share/man/man1/xapian-pos.1.gz
 share/man/man1/xapian-progsrv.1.gz
 share/man/man1/xapian-replicate-server.1.gz
 share/man/man1/xapian-replicate.1.gz
 share/man/man1/xapian-tcpsrv.1.gz
 %%DATADIR%%/stopwords/arabic.list
 %%DATADIR%%/stopwords/danish.list
 %%DATADIR%%/stopwords/dutch.list
 %%DATADIR%%/stopwords/english.list
 %%DATADIR%%/stopwords/finnish.list
 %%DATADIR%%/stopwords/french.list
 %%DATADIR%%/stopwords/german.list
 %%DATADIR%%/stopwords/hungarian.list
 %%DATADIR%%/stopwords/indonesian.list
 %%DATADIR%%/stopwords/italian.list
 %%DATADIR%%/stopwords/norwegian.list
 %%DATADIR%%/stopwords/portuguese.list
 %%DATADIR%%/stopwords/russian.list
 %%DATADIR%%/stopwords/spanish.list
 %%DATADIR%%/stopwords/swedish.list
diff --git a/deskutils/akonadiconsole/Makefile b/deskutils/akonadiconsole/Makefile
index b3d688f6d308..d6bec1fea24b 100644
--- a/deskutils/akonadiconsole/Makefile
+++ b/deskutils/akonadiconsole/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	akonadiconsole
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Akonadi management and debugging console
 WWW=		https://www.kde.org/
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libassuan.so:security/libassuan  \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
 		libqgpgmeqt6.so:security/gpgme-qt@qt6 \
 		libical.so:devel/libical \
 		libxapian.so:databases/xapian-core
 
 USES=		cmake compiler:c++11-lib gettext kde:6 qt:6 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons guiaddons i18n iconthemes \
 		itemmodels itemviews jobwidgets kio notifications parts \
 		service solid sonnet textwidgets unitconversion widgetsaddons \
 		windowsystem xmlgui \
 		ecm:build
 # pim components
 USE_KDE+=	akonadi akonadicalendar akonadicontacts akonadimime \
 		akonadisearch calendarcore calendarsupport contacts \
 		grantleetheme identitymanagement libkdepim libkleo messagelib \
 		mime pimcommon pimtextedit
 USE_QT=		base
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 05cc19320926..1906b5f1ea20 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	pinot
 PORTVERSION=	1.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Personal search and metasearch for the Free Desktop
 WWW=		https://github.com/FabriceColin/pinot/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils	\
 		update-mime-database:misc/shared-mime-info
 LIB_DEPENDS=	libxapian.so:databases/xapian-core		\
 		libfontconfig.so:x11-fonts/fontconfig		\
 		libfreetype.so:print/freetype2			\
 		libexttextcat-2.0.so:textproc/libexttextcat	\
 		libdbus-1.so:devel/dbus				\
 		libxml++-3.0.so:textproc/libxml++30		\
 		libboost_thread.so:devel/boost-libs		\
 		libharfbuzz.so:print/harfbuzz			\
 		libnotify.so:devel/libnotify			\
 		libexif.so:graphics/libexif			\
 		libexiv2.so:graphics/exiv2			\
 		libgmime-2.6.so:mail/gmime26			\
 		libtag.so:audio/taglib				\
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	update-mime-database:misc/shared-mime-info	\
 		antiword:textproc/antiword			\
 		xdg-open:devel/xdg-utils			\
 		catppt:textproc/catdoc				\
 		unrtf:textproc/unrtf				\
 		catdvi:print/catdvi				\
 		bash:shells/bash				\
 		${LOCALBASE}/libexec/xpdf/pdftotext:graphics/xpdf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FabriceColin
 
 USES=		compiler:c++11-lang autoreconf gettext gnome libarchive	\
 		libtool pkgconfig python shebangfix sqlite:3 ssl xorg
 USE_CXXSTD=	c++11
 USE_XORG=	pixman
 USE_GNOME=	atkmm cairo cairomm gdkpixbuf glibmm gtk30 gtkmm30	\
 		libsigc++20 libxml2 pangomm
 USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 SHEBANG_FILES=	scripts/bash/*.sh
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive	\
 		--enable-mempool=no --enable-libnotify
 CONFIGURE_ENV=	MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lboost_system
 
 OPTIONS_DEFINE=	DEBUG CHMLIB DOCS
 OPTIONS_SUB=	yes
 
 DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
 CHMLIB_DESC=		Support of Microsoft ITSS/CHM files
 CHMLIB_CONFIGURE_ON=	--enable-chmlib=yes
 CHMLIB_CONFIGURE_OFF=	--disable-chmlib
 CHMLIB_LIB_DEPENDS=	libchm.so:misc/chmlib
 
 INSTALL_TARGET=	install-strip
 DOCS=		AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO
 
 LM2FIX=		Core/pinot-index.cpp Core/pinot-index.1 Makefile.am	\
 		textcat31_conf.txt aclocal.m4 textcat3_conf.txt	\
 		textcat_conf.txt textcat32_conf.txt
 SHR2FIX=	Core/pinot-search.1
 UL2FIX=		Utils/xdgmime/xdgmime.c
 
 pre-configure:
 	${REINPLACE_CMD} -e \
 		'/<command>/s|pdftotext|${LOCALBASE}/libexec/xpdf/pdftotext|' \
 		${WRKSRC}/Tokenize/filters/external-filters.xml
 	${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|'	\
 		${LM2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|'	\
 		${SHR2FIX:S|^|${WRKSRC}/|}
 
 post-install:
 	${TOUCH} ${STAGEDIR}${DATADIR}/stopwords/.empty_file
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 1cf586c7254c..86e1f1ccb305 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	recoll
 PORTVERSION=	1.33.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	deskutils
 MASTER_SITES=	${WWW}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Personal full-text search package, based on Xapian
 WWW=		https://www.recoll.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 RUN_DEPENDS=	antiword:textproc/antiword \
 		catdoc:textproc/catdoc \
 		unrar:archivers/unrar \
 		unrtf:textproc/unrtf \
 		wpd2html:textproc/libwpd010
 
 USES=		bison compiler:c++11-lang gmake gnome iconv libtool localbase \
 		pkgconfig python shebangfix
 USE_GNOME=	libxslt
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 SHEBANG_FILES=	desktop/hotrecoll.py filters/*.py filters/rclimg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-recollq --enable-xadump
 MAKE_ENV=	PYTHON_CMD=${PYTHON_CMD}
 BINARY_ALIAS=	python2=${FALSE} python3=${PYTHON_CMD}
 
 PYDISTUTILS_PKGNAME=	Recoll
 PYDISTUTILS_PKGVERSION=	1.0
 
 PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" \
 		VERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=		ASPELL CHM DJVU IMAGE LATEX PDF PS QT5 SOUND X11MON
 OPTIONS_DEFAULT=	ASPELL CHM IMAGE PDF PS QT5 SOUND X11MON
 OPTIONS_SUB=		yes
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_OFF=	--without-aspell
 CHM_DESC=		Python bindings for Microsoft ITSS/CHM format
 CHM_LIB_DEPENDS=	libchm.so:misc/chmlib
 CHM_CONFIGURE_OFF=	--disable-python-chm
 DJVU_RUN_DEPENDS=	djvutxt:graphics/djvulibre
 IMAGE_DESC=		Store personal tags or textual descriptions in images
 IMAGE_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 LATEX_USES=		tex
 LATEX_USE=		TEX=dvipsk:run,latex:run
 PDF_RUN_DEPENDS=	pdftotext:graphics/poppler-utils
 PS_RUN_DEPENDS=		pstotext:print/pstotext
 QT5_USES=		gl qt:5
 QT5_USE=		GL=gl QT=buildtools:build,qmake:build \
 			QT=core,gui,printsupport,widgets,xml
 QT5_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
 			QTDIR="${PREFIX}"
 QT5_CONFIGURE_ON=	--disable-webkit
 QT5_CONFIGURE_OFF=	--disable-qtgui
 SOUND_RUN_DEPENDS=	mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR}
 X11MON_DESC=		X11 session monitoring support
 X11MON_USES=		fam xorg
 X11MON_USE=		XORG=ice,sm,x11
 X11MON_CONFIGURE_OFF=	--disable-x11mon
 X11MON_CONFIGURE_ON=	--with-fam
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@QMAKE@|${TRUE}|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/local/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|override const|const override|' \
 		${WRKSRC}/index/rclmonrcv.cpp
 
 pre-build-QT5-on:
 	@cd ${WRKSRC}/qtgui && \
 		${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} recoll.pro
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \
 		${STAGEDIR}${PREFIX}/lib/recoll/*.so
 # Remove systemd unit files (useless on FreeBSD)
 	@${RM} ${STAGEDIR}${DATADIR}/examples/recollindex*.service
 
 post-install-CHM-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so
 
 .include <bsd.port.mk>
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 5a1008cb0cdc..94bfaef680c8 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	doxygen
 PORTVERSION=	1.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/rel-${PORTVERSION} \
 		http://doxygen.nl/files/
 EXTRACT_SUFX=	.src.tar.gz
 
 PATCH_SITES=	https://github.com/doxygen/doxygen/commit/
 PATCHFILES=	966d69c603b5a6ae22e3132b6ecc6a39b86e52ab.patch:-p1 \
 		7b2a6027775b0158304635a98de0f9b5672f163a.patch:-p1 \
 		f3514d578633cad3e39d6787f81085e46bafbaf4.patch:-p1 \
 		8129939c312e4b5060042fdb93bd071b7b133381.patch:-p1
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Documentation system for C, C++, and other languages
 WWW=		https://www.doxygen.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		bison cmake compiler:c++17-lang cpe dos2unix \
 		iconv python shebangfix
 
 ALL_TARGET=	all
 CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
 CMAKE_ARGS+=	-DCMAKE_POLICY_DEFAULT_CMP0116=OLD  # temporary workaround for old Doxygen
 CMAKE_ARGS+=	-DCMAKE_POLICY_DEFAULT_CMP0148=OLD  # temporary workaround for old Doxygen
 
 EXTRACT_AFTER_ARGS=	--exclude '*/libmd5'
 
 DOS2UNIX_FILES=	doc/translator.py
 PLIST_FILES=	bin/doxygen
 
 OPTIONS_DEFINE=	DOCS GRAPHVIZ LATEX SEARCH QT5
 OPTIONS_DEFAULT=	GRAPHVIZ
 QT5_DESC=	Install Doxywizard GUI with Qt5
 SEARCH_DESC=	Build external search tools (doxysearch and doxyindexer)
 
 DOCS_USES=		ghostscript:build tex
 DOCS_USE=		TEX=base:build,dvipsk:build,pdftex:build
 DOCS_ALL_TARGET=	docs
 DOCS_BUILD_DEPENDS=	dot:graphics/graphviz
 DOCS_CMAKE_BOOL=	build_doc
 DOCS_PLIST_FILES=	share/man/man1/doxygen.1.gz \
 			share/man/man1/doxyindexer.1.gz \
 			share/man/man1/doxysearch.1.gz \
 			share/man/man1/doxywizard.1.gz
 
 PORTDOCS=		*
 
 GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 
 LATEX_USES=	tex
 LATEX_USE=	TEX=base,dvipsk,pdftex
 
 QT5_USES=	qt:5
 QT5_USE=	QT=core,widgets,gui,xml,qmake:build,buildtools:build
 QT5_CMAKE_BOOL=	build_wizard
 QT5_PLIST_FILES=	bin/doxywizard
 
 SEARCH_CMAKE_BOOL=	build_search
 SEARCH_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 SEARCH_PLIST_FILES=	bin/doxyindexer \
 			bin/doxysearch.cgi
 
 post-extract:	# clean up garbage in tarball
 		${RM} ${WRKSRC}/templates/html/._resize.js
 		${RM} ${WRKSRC}/src/._htmlgen.h
 		${RM} ${WRKSRC}/src/._formula.h
 
 
 .include <bsd.port.mk>
diff --git a/devel/libkiwix/Makefile b/devel/libkiwix/Makefile
index cbcdcc08bdfb..a06f2dc06173 100644
--- a/devel/libkiwix/Makefile
+++ b/devel/libkiwix/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	libkiwix
 DISTVERSION=	14.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://download.kiwix.org/release/libkiwix/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Software library to read and write ZIM files
 WWW=		https://github.com/kiwix/libkiwix
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # 'googletest' dependency is only necessary for Meson's 'test' target, but it
 # must be present as soon as configure time.
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
 		googletest>0:devel/googletest
 
 LIB_DEPENDS=	libzim.so:devel/libzim \
 		libpugixml.so:textproc/pugixml \
 		libaria2.so:www/aria2 \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libctpp2.so:textproc/ctpp2 \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		compiler:c++17-lang meson pkgconfig python shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	libkiwix13
 
 SHEBANG_FILES=	scripts/format_code.sh
 SHEBANG_REGEX=	./scripts/kiwix.*[^.].
 
 CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
 CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/libkiwix13/Makefile b/devel/libkiwix13/Makefile
index 2a4186939d7a..4d4215c4cc0c 100644
--- a/devel/libkiwix13/Makefile
+++ b/devel/libkiwix13/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	libkiwix
 DISTVERSION=	13.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	13
 MASTER_SITES=	https://download.kiwix.org/release/libkiwix/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Software library to read and write ZIM files, version 13
 WWW=		https://github.com/kiwix/libkiwix
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # 'googletest' dependency is only necessary for Meson's 'test' target, but it
 # must be present as soon as configure time.
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
 		googletest>0:devel/googletest
 
 LIB_DEPENDS=	libzim.so:devel/libzim \
 		libpugixml.so:textproc/pugixml \
 		libaria2.so:www/aria2 \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libctpp2.so:textproc/ctpp2 \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		compiler:c++17-lang meson pkgconfig python shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	libkiwix
 
 SHEBANG_FILES=	scripts/format_code.sh
 SHEBANG_REGEX=	./scripts/kiwix.*[^.].
 
 CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
 CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
index 073c4522d801..7fb5eaf877f7 100644
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	libzim
 DISTVERSION=	9.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://download.openzim.org/release/libzim/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Reference implementation of the ZIM specification
 WWW=		https://wiki.openzim.org/wiki/Libzim
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # 'googletest' dependency is only necessary for Meson's 'test' target, but it
 # must be present as soon as configure time.
 BUILD_DEPENDS=	googletest>0:devel/googletest
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libzstd.so:archivers/zstd
 
 # Python is necessary for the build against Xapian and for Meson's 'test' target
 # as well, for which it must be present as soon as configure time.
 USES=		compiler:c++17-lang meson pkgconfig python:build tar:xz
 USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD:T} python3-config=${PYTHON_CMD:T}-config
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION} DISTMAJ=${DISTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 7ca153b3a69d..1c9ad192cd74 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,220 +1,220 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.0.18
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	30
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
 WWW=		https://www.cyrusimap.org/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/imapopts.c: Error 1
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \
 			MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \
 			DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 HTTP_DESC=		Enable HTTP support
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 			libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LMDB_DESC=		Use LMDB backend
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_WITH=	lmdb
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb cyr_backup \
 		cyr_buildinfo cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \
 		cyr_synclog cyr_virusscan deliver fud idled imapd ipurge lmtpd \
 		master mbexamine mbpath mbtool notifyd pop3d quota reconstruct \
 		restore smmapd timsieved tls_prune unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/masssievec
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
index 0eaf2efdfbbc..0dd447f7c632 100644
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,273 +1,273 @@
 PORTNAME=	cyrus-imapd
 DISTVERSION=	3.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	310
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libical.so:devel/libical
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/cyr_cd.sh imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED JMAP LDAP \
 			MURDER MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT \
 			SRS XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED PCRE2 READLINE_GNU REPLICATION SQLITE \
 			SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLD2_DESC=		Use CLD2
 CLD2_CONFIGURE_WITH=	cld2
 CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
 HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli \
 			libwslay_shared.so:www/wslay \
 			libzstd.so:archivers/zstd
 HTTP_BUILD_DEPENDS=	xxd:sysutils/xxd
 HTTP_RUN_DEPENDS=	${HTTP_BUILD_DEPENDS}
 HTTP_CONFIGURE_ENV=	WSLAY_CFLAGS="-I${LOCALBASE}/include" \
 			WSLAY_LIBS="-L${LOCALBASE}/lib -lwslay_shared"
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 # XXX: HTTP requires JMAP
 HTTP_IMPLIES=		JMAP
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 JMAP_DESC=		Enable JMAP support
 JMAP_CONFIGURE_ENABLE=	jmap
 JMAP_IMPLIES=		HTTP XAPIAN
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
 		notifyd pop3d pop3proxyd promstatsd proxyd ptdump ptexpire \
 		ptloader quota reconstruct relocate_by_id restore sievec \
 		sieved smmapd timsieved tls_prune unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::Shell \
 		Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index e0bbfccee465..f5589ebab3f5 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,243 +1,243 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	32
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
 WWW=		https://www.cyrusimap.org/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[013-] cyrus-imapd3[013-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/promdatagen snmp/snmpgen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SNMP SQLITE SQUAT \
 			SRS XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT SRS
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 HTTP_DESC=		Enable HTTP support
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 			libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_synclog cyr_userseen \
 		cyr_virusscan cyradm cyrdump deliver fud idled imapd ipurge \
 		lmtpd lmtpproxyd master mbexamine mbpath mbtool notifyd pop3d \
 		pop3proxyd promstatsd proxyd ptdump ptexpire ptloader quota \
 		reconstruct restore sievec sieved smmapd timsieved tls_prune \
 		unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index 74368dfcd778..f061e0ac1ca6 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,264 +1,264 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	34
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-35-] cyrus-imapd3[0-35-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU SQLITE SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 
 # OPTIONS_DEFINE+=	CLD2
 # OPTIONS_DEFAULT+=	CLD2
 # CLD2_DESC=		Use CLD2
 # CLD2_CONFIGURE_WITH=	cld2
 # CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 # 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 # CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 
 HTTP_DESC=		Enable HTTP support
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 			libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_synclog cyr_userseen \
 		cyr_virusscan cyradm cyrdump deliver fud idled imapd ipurge \
 		lmtpd lmtpproxyd master mbexamine mbpath mbtool notifyd pop3d \
 		pop3proxyd promstatsd proxyd ptdump ptexpire ptloader quota \
 		reconstruct restore sievec sieved smmapd timsieved tls_prune \
 		unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 19a6b554453b..9ce077fa3a9d 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -1,265 +1,265 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	36
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libical.so:devel/libical
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/cyr_cd.sh imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU SQLITE SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLD2_DESC=		Use CLD2
 CLD2_CONFIGURE_WITH=	cld2
 CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
 HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli \
 			libwslay_shared.so:www/wslay \
 			libzstd.so:archivers/zstd
 HTTP_CONFIGURE_ENV=	WSLAY_CFLAGS="-I${LOCALBASE}/include" \
 			WSLAY_LIBS="-L${LOCALBASE}/lib -lwslay_shared"
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
 		notifyd pop3d pop3proxyd promstatsd proxyd ptdump ptexpire \
 		ptloader quota reconstruct relocate_by_id restore sievec \
 		sieved smmapd timsieved tls_prune unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::Shell \
 		Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile
index 46979e2c78b0..58a01f8f6fb9 100644
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -1,267 +1,267 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	38
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libical.so:devel/libical
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/cyr_cd.sh imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU REPLICATION SQLITE \
 			SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLD2_DESC=		Use CLD2
 CLD2_CONFIGURE_WITH=	cld2
 CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
 HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli \
 			libwslay_shared.so:www/wslay \
 			libzstd.so:archivers/zstd
 HTTP_CONFIGURE_ENV=	WSLAY_CFLAGS="-I${LOCALBASE}/include" \
 			WSLAY_LIBS="-L${LOCALBASE}/lib -lwslay_shared"
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
 		notifyd pop3d pop3proxyd promstatsd proxyd ptdump ptexpire \
 		ptloader quota reconstruct relocate_by_id restore sievec \
 		sieved smmapd timsieved tls_prune unexpunge
 
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::Shell \
 		Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-fts-flatcurve/Makefile b/mail/dovecot-fts-flatcurve/Makefile
index 938e0e796df3..74e8ad43eb3b 100644
--- a/mail/dovecot-fts-flatcurve/Makefile
+++ b/mail/dovecot-fts-flatcurve/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	fts-flatcurve
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
 MAINTAINER=	martin@waschbuesch.de
 COMMENT=	Dovecot FTS plugin based on Xapian
 WWW=		https://github.com/slusarz/dovecot-fts-flatcurve
 
 LICENSE=	LGPL21
 
 FLAVORS=        default mysql pgsql
 FLAVOR?=        ${FLAVORS[1]}
 mysql_PKGNAMESUFFIX=    -mysql
 pgsql_PKGNAMESUFFIX=    -pgsql
 BUILD_DEPENDS=  dovecot>=2.3.17:mail/dovecot@default
 RUN_DEPENDS=    dovecot>=2.3.17:mail/dovecot@default
 .if ${FLAVOR:U} == mysql
 BUILD_DEPENDS=  dovecot-mysql>=2.3.17:mail/dovecot@mysql
 RUN_DEPENDS=    dovecot-mysql>=2.3.17:mail/dovecot@mysql
 .endif
 .if ${FLAVOR:U} == pgsql
 BUILD_DEPENDS=  dovecot-pgsql>=2.3.17:mail/dovecot@pgsql
 RUN_DEPENDS=    dovecot-pgsql>=2.3.17:mail/dovecot@pgsql
 .endif
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core
 
 USES=		autoreconf libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	slusarz
 GH_PROJECT=	dovecot-fts-flatcurve
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	include/dovecot-fts-flatcurve/fts-flatcurve-config.h \
 		lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.a \
 		lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.so \
 		lib/dovecot/lib21_fts_flatcurve_plugin.a \
 		lib/dovecot/lib21_fts_flatcurve_plugin.so
 
 post-install:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_flatcurve_plugin.so
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index 2eca715e5e1c..e17be77beb5e 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	fts-xapian
 DISTVERSION=	1.8.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/grosjo/fts-xapian/releases/download/${DISTVERSIONFULL}/
 PKGNAMEPREFIX=	dovecot-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Dovecot FTS plugin based on Xapian
 WWW=		https://github.com/grosjo/fts-xapian
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core
 RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 
 USES=		autoreconf compiler:c++11-lang libtool pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONFULL}
 
 PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
 		lib/dovecot/lib21_fts_xapian_plugin.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 30c874bd3704..ac6aecbee224 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	mu
 PORTVERSION=	1.8.13
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
 WWW=		https://www.djcbsoftware.nl/code/mu/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libgmime-3.0.so:mail/gmime30 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libjson-glib-1.0.so:devel/json-glib
 
 USES=		autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
 		libtool makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-mu4e
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS GUILE
 OPTIONS_DEFAULT=	DOCS GUILE
 OPTIONS_SUB=		yes
 
 GUILE_USES=		guile:3.0
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
 
 post-install:
 	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
 	    ${STAGEDIR}${PREFIX}/bin
 
 post-install-GUILE-on:
 	${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
 	    ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 83095591a518..7d74916fcfad 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	notmuch
 DISTVERSION=	0.39
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT?=	Thread-based email index, search and tagging application
 WWW?=		https://notmuchmail.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
 
 .ifndef MASTERDIR
 LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
 		libsexp.so:devel/sfsexp \
 		libtalloc.so:devel/talloc \
 		libxapian.so:databases/xapian-core
 TEST_DEPENDS=	${LOCALBASE}/bin/gdb:devel/gdb \
 		bash:shells/bash \
 		dtach:misc/dtach \
 		emacs:editors/emacs@nox \
 		gbase64:sysutils/coreutils \
 		gdate:sysutils/coreutils \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gwc:sysutils/coreutils
 
 USES=		gmake gnome pkgconfig python:build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 .endif
 
 USES+=		tar:xz
 
 .ifndef MASTERDIR
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${PREFIX}/share/man \
 		--prefix=${PREFIX} \
 		--with-bash-completion \
 		--with-retry-lock \
 		--with-zsh-completion \
 		--without-emacs
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		TEST_GDB=${LOCALBASE}/bin/gdb \
 		V=1
 TEST_TARGET=	test
 .endif
 
 PKGDIR=		${.CURDIR}
 .ifndef MASTERDIR
 PORTSCOUT=	limit:^[0-9\.]*$$
 .endif
 
 PATCH_WRKSRC=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}
 
 .ifndef MASTERDIR
 OPTIONS_DEFINE=		DOXYGEN MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_USES=			perl5
 DOXYGEN_CONFIGURE_WITH=		api-docs
 MANPAGES_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
 # Install bash completions without incurring a dependency on
 # shells/bash-completion.
 post-configure:
 	${REINPLACE_CMD} \
 		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
 		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
 		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
 		${WRKSRC}/Makefile.config
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
 
 # Keep poudriere-testport(8) happy.
 post-install-MANPAGES-on:
 	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/notmuch-emacs-mua.1.gz
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/akonadi-search/Makefile b/net/akonadi-search/Makefile
index adb3203e158c..9a85ca9bbf74 100644
--- a/net/akonadi-search/Makefile
+++ b/net/akonadi-search/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	akonadi-search
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries and daemons to implement searching in Akonadi
 WWW=		https://www.kde.org/
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
 USES=		cmake compiler:c++11-lib gettext kde:6 qt:6 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
 		i18n itemmodels kcmutils ktextaddons libplasma package runner \
 		service widgetsaddons \
 		ecm:build
 # pim components
 USE_KDE+=	akonadi akonadimime calendarcore contacts mime
 USE_QT=		base
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index f19b66b5eaf0..273be8e965af 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	khelpcenter
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 application to show KDE application documentation
 WWW=		https://projects.kde.org/projects/kde/workspace/khelpcenter
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext gnome \
 		kde:6 python:env,run qt:6 shebangfix tar:xz xorg
 USE_GNOME=	libxml2
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons dbusaddons i18n itemmodels itemviews jobwidgets \
 		kcmutils kio parts service solid sonnet texttemplate \
 		textwidgets widgetsaddons windowsystem xmlgui \
 		ecm:build
 # This port depends on doctools; we need the entities and such for runtime
 # documentation support, where all the other KDE Plasma parts need it
 # only for the build-time documentation-generation.
 USE_KDE+=	doctools
 USE_QT=		base webengine
 USE_XORG=	x11
 SHEBANG_FILES=	searchhandlers/khc_mansearch.py
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/textproc/goldendict-ng/Makefile b/textproc/goldendict-ng/Makefile
index 42b20d1bb43e..a8ca6b9c82ba 100644
--- a/textproc/goldendict-ng/Makefile
+++ b/textproc/goldendict-ng/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	goldendict-ng
 DISTVERSIONPREFIX=	v
 DISTVERSION=	25.05.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	Advanced dictionary lookup program, supporting many formats
 WWW=		https://xiaoyifang.github.io/goldendict-ng/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 		libfmt.so:devel/libfmt \
 		libhunspell-1.7.so:textproc/hunspell \
 		liblzo2.so:archivers/lzo2 \
 		libopencc.so:chinese/opencc \
 		libtomlplusplus.so:devel/tomlplusplus \
 		libvorbis.so:audio/libvorbis \
 		libxapian.so:databases/xapian-core \
 		libzim.so:devel/libzim
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:6 \
 		xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	xiaoyifang
 GH_TAGNAME=	2a2b0e16
 USE_GL=		opengl
 USE_QT=		5compat base declarative multimedia positioning svg webchannel \
 		webengine tools:build
 USE_XORG=	ice sm x11 xext xtst
 
 CMAKE_ON=		USE_ALTERNATIVE_NAME USE_SYSTEM_FMT USE_SYSTEM_TOML
 CONFIGURE_WRKSRC=	${WRKSRC}/build_dir
 
 OPTIONS_DEFINE=		EPWING
 OPTIONS_DEFAULT=	EPWING
 
 EPWING_DESC=		Japanese EPWING dictionary format support
 EPWING_LIB_DEPENDS=	libeb.so:japanese/eb
 EPWING_CMAKE_OFF=	-DWITH_EPWING_SUPPORT=OFF
 
 .include <bsd.port.mk>