diff --git a/devel/zanata-platform/Makefile b/devel/zanata-platform/Makefile
index 98aa234b3956..300542db5855 100644
--- a/devel/zanata-platform/Makefile
+++ b/devel/zanata-platform/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	zanata-platform
 PORTVERSION=	4.6.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/zanata/zanata-platform/releases/download/platform-${PORTVERSION}/ \
 		https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_CONNECTOR_JAVA_VERSION}/:database
 DISTFILES=	zanata-war-${PORTVERSION}.war \
 		mysql-connector-java-${MYSQL_CONNECTOR_JAVA_VERSION}.jar:database
 EXTRACT_ONLY=
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Web-based translation platform
 WWW=		http://zanata.org/
 
 LICENSE=	GPLv2 LGPL21+
 LICENSE_COMB=	multi
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 # It's needed this specific version, databases/mysql-connector-java51 is
 # currently with 5.1.47 version.
 MYSQL_CONNECTOR_JAVA_VERSION=	5.1.26
 
 PLIST_SUB=	APP_HOME=${APP_HOME}
 
 OPTIONS_DEFINE=		CLAMAV
 
 OPTIONS_SINGLE=		WF
 OPTIONS_SINGLE_WF=	WILDFLY10 WILDFLY11 WILDFLY12 WILDFLY13 WILDFLY14 \
 		WILDFLY15 WILDFLY16 WILDFLY90
 OPTIONS_DEFAULT=	WILDFLY10
 
 CLAMAV_DESC=		Clam AntiVirus
 CLAMAV_RUN_DEPENDS=	clamav>=0:security/clamav
 
 WILDFLY10_DESC=		WildFly version 10.0
 WILDFLY10_VARS=		APP_HOME=${PREFIX}/wildfly10
 WILDFLY10_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly10
 
 WILDFLY11_DESC=		WildFly version 11.0
 WILDFLY11_VARS=		APP_HOME=${PREFIX}/wildfly11
 WILDFLY11_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly11
 
 WILDFLY12_DESC=		WildFly version 12.0
 WILDFLY12_VARS=		APP_HOME=${PREFIX}/wildfly12
 WILDFLY12_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly12
 
 WILDFLY13_DESC=		WildFly version 13.0
 WILDFLY13_VARS=		APP_HOME=${PREFIX}/wildfly13
 WILDFLY13_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly13
 
 WILDFLY14_DESC=		WildFly version 14.0
 WILDFLY14_VARS=		APP_HOME=${PREFIX}/wildfly14
 WILDFLY14_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly14
 
 WILDFLY15_DESC=		WildFly version 15.0
 WILDFLY15_VARS=		APP_HOME=${PREFIX}/wildfly15
 WILDFLY15_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly15
 
 WILDFLY16_DESC=		WildFly version 16.0
 WILDFLY16_VARS=		APP_HOME=${PREFIX}/wildfly16
 WILDFLY16_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly16
 
 WILDFLY90_DESC=		WildFly version 9.0
 WILDFLY90_VARS=		APP_HOME=${PREFIX}/wildfly90
 WILDFLY90_RUN_DEPENDS=	${APP_HOME}/bin/standalone.sh:java/wildfly90
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/zanata
 	@${MKDIR} ${STAGEDIR}${APP_HOME}/standalone/deployments \
 		${STAGEDIR}${APP_HOME}/standalone/configuration
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/zanata-war-${PORTVERSION}.war \
 		${STAGEDIR}/${APP_HOME}/standalone/deployments/ROOT.war
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mysql-connector-java-${MYSQL_CONNECTOR_JAVA_VERSION}.jar \
 		${STAGEDIR}/${APP_HOME}/standalone/deployments/mysql-connector-java.jar
 	${INSTALL_DATA} ${FILESDIR}/standalone-zanata.xml.sample \
 		${STAGEDIR}/${APP_HOME}/standalone/configuration
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index f163639a437b..73beb07aff0d 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	clamd
+PORTREVISION=	1
 
 COMMENT=	ClamAV based antivirus plugin for Claws Mail
 WWW=		https://www.claws-mail.org/plugins.php
 
 RUN_DEPENDS=	clamd:security/clamav
 
 CLAWS_PLUGINS_BUILD=	${PORTNAME}
 
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index 6f75534550e6..0a872e19376b 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -1,211 +1,211 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	25
 
 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_armv6=		fails to build: ./tools/config2header: Error code 1
 BROKEN_armv7=		fails to build: ./tools/config2header: Error code 1
 BROKEN_riscv64=		fails to build: lib/imapopts.c: Error 1
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http
 
 USES=		cpe libtool perl5 ssl
 USE_RC_SUBR=	imapd
 GNU_CONFIGURE=	yes
 CYRUS_PREFIX=	${PREFIX}/cyrus
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${CYRUS_PREFIX} \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb=${BDB_LIB_NAME} \
 		--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 BDB CLAMAV HTTP IDLED LDAP MURDER MYSQL \
 			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP SQLITE DOCS \
 			EXAMPLES
 OPTIONS_DEFAULT=	BDB IDLED
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 HTTP_DESC=		Enable HTTP (beta quality)
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libjansson.so:devel/jansson \
 			libical.so:devel/libical
 HTTP_USES=		gnome pkgconfig
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USE=		OPENLDAP=yes
 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_ON=	--with-mysql=yes \
 			--with-mysql-libdir=${LOCALBASE}/lib/mysql \
 			--with-mysql-incdir=${LOCALBASE}/include/mysql
 NETSCAPEHACK_DESC=	Enable X-NETSCAPE extensions
 NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack
 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}
 
 OPTIONS_RADIO=			GSSAPI
 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
 
 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=	imtest installsieve lmtptest mupdatetest nntptest pop3test \
 		sieveshell sivtest smtptest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron chk_cyrus ctl_cyrusdb ctl_deliver ctl_mboxlist \
 		cvt_cyrusdb cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \
 		cyr_synclog deliver fud idled imapd ipurge lmtpd master \
 		mbexamine mbpath notifyd pop3d quota reconstruct rmnews \
 		smmapd squatter sync_client sync_reset sync_server 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
 
 CONFS=		cmu-backend.conf cmu-frontend.conf normal.conf prefork.conf \
 		small.conf
 
 .include <bsd.port.options.mk>
 
 .if empty(${PORT_OPTIONS:MBDB})
 BDB_LIB_NAME=	no
 .endif
 
 PLIST_SUB+=	CLAMAV="@comment "
 
 .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
 
 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}/master/conf/normal.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 		${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 		${STAGEDIR}${CYRUS_PREFIX}/bin/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} 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}
 
 # there are already files in EXAMPLESDIR at that point, so no
 # need to create it.
 post-install-EXAMPLES-on:
 .for f in ${CONFS:Nnormal.conf}
 	${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
 		${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 832da8b0f116..6a3caeefdaf0 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,220 +1,220 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.0.17
-PORTREVISION=	2
+PORTREVISION=	3
 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
 GNU_CONFIGURE=	yes
 CYRUS_PREFIX=	${PREFIX}/cyrus
 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_USE=		OPENLDAP=yes
 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} 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 5ae3d4d47ff4..b32226d46817 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,232 +1,232 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.2.10
-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 \
 		libpcre.so:devel/pcre \
 		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
 GNU_CONFIGURE=	yes
 CYRUS_PREFIX=	${PREFIX}/cyrus
 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 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_USE=		OPENLDAP=yes
 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
 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
 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
 
 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
 .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
 .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} 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 5fe436571cf2..f5a375816b83 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,253 +1,253 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.4.4
-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 \
 		libpcre.so:devel/pcre \
 		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
 GNU_CONFIGURE=	yes
 CYRUS_PREFIX=	${PREFIX}/cyrus
 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 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_USE=		OPENLDAP=yes
 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
 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
 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
 
 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
 .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
 .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} 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/dspam/Makefile b/mail/dspam/Makefile
index 98c9c8eb0261..cf79e22c0951 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,585 +1,585 @@
 # Note to committers: If don't commit a maintainer patch and as a result PKGNAME
 # or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
 # Thanks.
 
 PORTNAME=	dspam
 PORTVERSION=	3.10.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	danny@dannywarren.com
 COMMENT=	Bayesian spam filter
 WWW=		http://dspam.sourceforge.net/
 
 LICENSE=	AGPLv3
 
 USERS=		dspam
 GROUPS=		dspam
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
 		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
 		QMAIL WEBUI LIGHTTPD DOCS EXAMPLES SETUID
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	HASH MYSQL MYSQL_COMPRESS MYSQL_LOCAL \
 			PGSQL PGSQL_LOCAL SQLITE2 SQLITE3
 
 OPTIONS_RADIO=		LDA
 OPTIONS_RADIO_LDA=	CYRUS23 CYRUS24 \
 			DOVECOT2 EXIM MAILDROP PROCMAIL SAFECAT SENDMAIL
 
 OPTIONS_DEFAULT=	SYSLOG DEBUG DAEMON CLAMAV CLAMAV_LOCAL \
 			HASH MYSQL MYSQL_COMPRESS PGSQL SQLITE3
 
 VERBOSE_DEBUG_DESC=	Debug in LOGDIR/dspam.debug
 BNR_DEBUG_DESC=		Debug for Bayesian Noise Reduction
 PREF_EXT_DESC=		Preferences in database not in files
 DAEMON_DESC=		Daemonize dspam; speaks LMTP or DLMTP
 CLAMAV_DESC=		ClamAV support
 CLAMAV_LOCAL_DESC=	RUN_DEPEND on ClamAV
 MYSQL_DESC=		MySQL 5.X.x as back-end
 MYSQL_COMPRESS_DESC=	Compress dspam <--> MySQL
 MYSQL_LOCAL_DESC=	RUN_DEPEND on MySQL server
 PGSQL_DESC=		PostgreSQL as back-end
 PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
 SQLITE2_DESC=		SQLite v2.x as back-end
 SQLITE3_DESC=		SQLite v3.x as back-end
 HASH_DESC=		Hash driver
 EXTERNAL_LOOKUP_DESC=	RCPT verification via extlookup
 USER_HOMEDIR_DESC=	Store user data in ~/.dspam
 TRUSTED_USERS_DESC=	Disable trusted user security
 VIRT_USERS_DESC=	Virtual users (needs SQL back-end)
 LONG_USERNAMES_DESC=	Usernames longer that OS supports
 LARGE_SCALE_DESC=	File structure for large scale
 DOMAIN_SCALE_DESC=	File structure for multiple domains
 CYRUS23_DESC=		Cyrus's 2.3 deliver as LDA
 CYRUS24_DESC=		Cyrus's 2.4 deliver as LDA
 DOVECOT2_DESC=		Dovecot 2.2 dovecot-lda as LDA
 EXIM_DESC=		Exim as local delivery agent
 MAILDROP_DESC=		Maildrop as local delivery agent
 PROCMAIL_DESC=		Procmail as local delivery agent
 SAFECAT_DESC=		Safecat as local delivery agent
 SENDMAIL_DESC=		Sendmail as local delivery agent
 NICESENDMAIL_DESC=	Play nice with sendmail server
 POSTFIX_MBC_DESC=	Dspam as mailbox_command in Postfix
 QMAIL_DESC=		Play nice with Qmail mail server
 WEBUI_DESC=		Install WebUI (RUN_DEPEND on Apache/Lighttpd)
 LIGHTTPD_DESC=		RUN_DEPEND on Lighttpd instead of Apache
 SETUID_DESC=		Run as root:mail with setuid (insecure)
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5 libtool pathfix shebangfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # Dead upstream. Don't expect a proper fix for clang11.
 CFLAGS+=	-fcommon
 
 SHEBANG_FILES=	src/tools/dspam_logrotate \
 		src/tools/dspam_notify.in \
 		src/tools/dspam_train.in \
 		webui/cgi-bin/templates/*/strings.pl \
 		webui/cgi-bin/templates/strings.pl \
 		webui/cgi-bin/*.cgi \
 		webui/cgi-bin/*.pl
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
 STRIP=
 .endif
 
 PKGMESSAGE=	${WRKSRC}/README.FreeBSD
 
 CONFLICTS=	dspam-devel
 
 SIGNATURE_LIFE?=	15
 
 .include <bsd.port.options.mk>
 
 _VAR_DIR=	/var
 
 RUN_DIR?=	${_VAR_DIR}/run/dspam
 
 LOG_DIR?=	${_VAR_DIR}/log/dspam
 LOGFILE?=	${LOG_DIR}/dspam.log
 
 .if ${PORT_OPTIONS:MSETUID}
 DSPAM_OWNER?=	root
 DSPAM_GROUP?=	mail
 DSPAM_MODE?=	4510
 .else
 DSPAM_OWNER?=	${USERS}
 DSPAM_GROUP?=	${GROUPS}
 DSPAM_MODE?=	0555
 .endif
 
 DSPAM_ETC?=	${LOCALBASE}/etc
 DSPAM_HOME?=	${_VAR_DIR}/db/dspam
 DSPAM_HOME_OWNER?=	${DSPAM_OWNER}
 DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
 DSPAM_HOME_MODE?=	0770
 DSPAM_SAMPLE_MODE?=	0640
 
 PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
 		DSPAM_OWNER=${DSPAM_OWNER} \
 		DSPAM_GROUP=${DSPAM_GROUP} \
 		DSPAM_MODE=${DSPAM_MODE} \
 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE} \
 		DSPAM_SAMPLE_MODE=${DSPAM_SAMPLE_MODE}
 
 CONFIGURE_ARGS+=	--sysconfdir=${DSPAM_ETC}
 CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
 PLIST_SUB+=	LOG_DIR=${LOG_DIR}
 PLIST_SUB+=	RUN_DIR=${RUN_DIR}
 
 CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
 CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
 CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
 PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}
 
 CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
 # we set DSPAM_MODE at the end as some LDAs want specific mode
 PLIST_SUB+=	DSPAM_OWNER=${DSPAM_OWNER} \
 		DSPAM_GROUP=${DSPAM_GROUP} \
 		DSPAM_MODE=${DSPAM_MODE}
 
 _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
 		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
 		-e 's,%%PORTNAME%%,${PORTNAME},g' \
 		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \
 		-e '/^%%FreeBSD/D'
 
 .if ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--enable-syslog
 .else
 CONFIGURE_ARGS+=	--disable-syslog
 CONFIGURE_ARGS+=	--with-logfile=${LOGFILE}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MVERBOSE_DEBUG}
 CONFIGURE_ARGS+=	--enable-verbose-debug
 .endif
 
 .if ${PORT_OPTIONS:MBNR_DEBUG}
 CONFIGURE_ARGS+=	--enable-bnr-debug
 .endif
 
 .if ${PORT_OPTIONS:MPREF_EXT}
 CONFIGURE_ARGS+=	--enable-preferences-extension
 .endif
 
 .if ${PORT_OPTIONS:MDAEMON}
 CONFIGURE_ARGS+=	--enable-daemon
 USE_RC_SUBR=	${PORTNAME}
 _SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
 SUB_LIST+=	DSPAM_HOME=${DSPAM_HOME}
 SUB_LIST+=	DSPAM_OWNER=${DSPAM_OWNER}
 SUB_LIST+=	DSPAM_GROUP=${DSPAM_GROUP}
 .else
 _SED_SCRIPT+=	-e '/%%DAEMON%%/D'
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 CONFIGURE_ARGS+=	--enable-clamav
 .	if ${PORT_OPTIONS:MCLAMAV_LOCAL}
 RUN_DEPENDS+=	clamav>=0:security/clamav
 SUB_LIST+=	CLAMD=clamd
 .	else
 SUB_LIST+=	CLAMD=
 .	endif
 .endif
 
 # we need to know if we are building statically or dynamically for the plist
 _DBDRV_COUNT=	# blank, but defined so we can check against it
 _DBDRV=		pgsql_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv,
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 CONFIGURE_ARGS+=	--with-pgsql-includes=${LOCALBASE}/include \
 			--with-pgsql-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	PGSQL=""
 #PKGNAMESUFFIX=	-pgsql
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .	if ${PORT_OPTIONS:MPGSQL_LOCAL}
 WANT_PGSQL=	server
 SUB_LIST+=	PGSQL=postgresql
 .	else
 SUB_LIST+=	PGSQL=
 .	endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 _DBDRV:=	${_DBDRV:S/pgsql_drv,//}
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE3}
 USES+=		sqlite:3
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 PLIST_SUB+=	SQLITE3=""
 .else
 _DBDRV:=	${_DBDRV:S/sqlite3_drv,//}
 PLIST_SUB+=	SQLITE3="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE2}
 USES+=		sqlite:2
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 PLIST_SUB+=	SQLITE2=""
 .else
 _DBDRV:=	${_DBDRV:S/sqlite_drv,//}
 PLIST_SUB+=	SQLITE2="@comment "
 .endif
 
 .if ${USES:Msqlite*}
 CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include \
 			--with-sqlite-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	SQLITE=""
 .else
 PLIST_SUB+=	SQLITE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MHASH}
 PLIST_SUB+=	HASH=""
 #PKGNAMESUFFIX=	-css
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .else
 _DBDRV:=	${_DBDRV:S/hash_drv,//}
 PLIST_SUB+=	HASH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USES+=		mysql
 CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 PLIST_SUB+=	MYSQL=""
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .	if ${PORT_OPTIONS:MMYSQL_COMPRESS}
 CONFIGURE_ARGS+=	--enable-client-compression
 .	endif
 .	if ${PORT_OPTIONS:MMYSQL_LOCAL}
 WANT_MYSQL=	server
 SUB_LIST+=	MYSQL=mysql
 .	else
 SUB_LIST+=	MYSQL=
 .	endif
 .else
 _DBDRV:=	${_DBDRV:S/mysql_drv,//}
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 # now we have all the db backends the user wants and we remove last ','
 CONFIGURE_ARGS+=	--with-storage-driver=${_DBDRV:S/,$//}
 
 .if ${_DBDRV_COUNT} != "o"
 PLIST_SUB+=	DYNAMIC=""
 .else
 PLIST_SUB+=	DYNAMIC="@comment "
 .endif
 
 .if %{PORT_OPTIONS:MSETUID}
 PLIST_SUB+=	SETUID=""
 PLIST_SUB+=	NOSETUID="@comment "
 .else
 PLIST_SUB+=	SETUID="@comment "
 PLIST_SUB+=	NOSETUID=""
 .endif
 
 .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}
 CONFIGURE_ARGS+=	--enable-external-lookup
 USE_OPENLDAP=	YES
 .endif
 
 .if ${PORT_OPTIONS:MUSER_HOMEDIR}
 CONFIGURE_ARGS+=	--enable-homedir
 .endif
 
 .if ${PORT_OPTIONS:MTRUSTED_USERS}
 CONFIGURE_ARGS+=	--disable-trusted-user-security
 .endif
 
 .if ${PORT_OPTIONS:MVIRT_USERS}
 CONFIGURE_ARGS+=	--enable-virtual-users
 .endif
 
 .if ${PORT_OPTIONS:MLONG_USERNAMES}
 CONFIGURE_ARGS+=	--enable-long-usernames
 .endif
 .if ${PORT_OPTIONS:MLARGE_SCALE}
 CONFIGURE_ARGS+=	--enable-large-scale
 .endif
 .if ${PORT_OPTIONS:MDOMAIN_SCALE}
 CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
 .if ${PORT_OPTIONS:MCYRUS23}
 RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:mail/cyrus-imapd23
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MCYRUS24}
 RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:mail/cyrus-imapd24
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
 RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/dovecot-lda:mail/dovecot
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/libexec/dovecot/dovecot-lda'
 .endif
 
 .if ${PORT_OPTIONS:MEXIM}
 .	if ${PORT_OPTIONS:MMYSQL}
 _EXIM_EXT=	-mysql
 .	elif ${PORT_OPTIONS:MPGSQL}
 _EXIM_EXT=	-postgresql
 .	endif
 RUN_DEPENDS+=	exim:mail/exim${_EXIM_EXT}
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/exim'
 .endif
 
 .if ${PORT_OPTIONS:MMAILDROP}
 RUN_DEPENDS+=	maildrop:mail/maildrop
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop'
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
 RUN_DEPENDS+=	procmail:mail/procmail
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail'
 .endif
 
 .if ${PORT_OPTIONS:MSAFECAT}
 RUN_DEPENDS+=	safecat:sysutils/safecat
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/safecat tmp new'
 .endif
 
 .if ${PORT_OPTIONS:MSENDMAIL} && exists(/usr/sbin/sendmail)
 CONFIGURE_ARGS+=	--with-delivery-agent=/usr/sbin/sendmail
 .else
 .if ${PORT_OPTIONS:MSENDMAIL} && exists(${LOCALBASE}/sbin/sendmail)
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/sendmail'
 .	endif
 .endif
 
 .if ${PORT_OPTIONS:MNICESENDMAIL}
 DSPAM_MODE=	4511
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX_MBC}
 DSPAM_MODE=	4511
 .endif
 
 .if ${PORT_OPTIONS:MQMAIL}
 DSPAM_MODE=	4511
 .endif
 
 .ifdef(DSPAM_MODE)
 CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .endif
 
 .if ${PORT_OPTIONS:MWEBUI}
 .	if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
 .	else
 USES+=		apache:2.2+
 .	endif
 LIB_DEPENDS+=	libgd.so:graphics/gd
 RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD
 RUN_DEPENDS+=	p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS+=	p5-GD-Graph3d>=0:graphics/p5-GD-Graph3d
 RUN_DEPENDS+=	p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 PLIST_SUB+=	WebUI=""
 _SED_SCRIPT+=	-e 's/%%WebUI%%//g'
 _SED_SCRIPT+=	-e 's,%%WWWDIR%%,${WWWDIR},g'
 PLIST_SUB+=	WWWDIR=${WWWDIR_REL}
 .else
 PLIST_SUB+=	WebUI="@comment "
 _SED_SCRIPT+=	-e '/%%WebUI%%/D'
 .endif
 
 _DOCS=	CHANGELOG LICENSE README README.FreeBSD RELEASE.NOTES UPGRADING
 _DOCSL=	courier.txt exim.txt markov.txt mysql_drv.txt pgsql_drv.txt \
 	pop3filter.txt postfix.txt qmail.txt relay.txt sendmail.txt \
 	sqlite_drv.txt
 
 pre-everything::
 .ifndef(MAINT)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
 	@${ECHO_CMD} "###########################################################################"
 	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PORTNAME}-${PORTVERSION}/,/^#####/p"
 	@${ECHO_CMD} ""
 .endif
 
 pre-extract:
 .ifndef(MAINT)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Define vars below before make-ing if you need:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
 	@${ECHO_CMD} "DSPAM_OWNER=${DSPAM_OWNER} (default: root)"
 	@${ECHO_CMD} "DSPAM_GROUP=${DSPAM_GROUP} (default: mail)"
 	@${ECHO_CMD} "DSPAM_MODE=${DSPAM_MODE}"
 	@${ECHO_CMD} "DSPAM_ETC=${DSPAM_ETC} (default: ${PREFIX}/etc"
 	@${ECHO_CMD} "DSPAM_HOME=${DSPAM_HOME} (default: ${_VAR_DIR}/db/dspam)"
 	@${ECHO_CMD} "DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER}"
 	@${ECHO_CMD} "DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP}"
 	@${ECHO_CMD} "DSPAM_HOME_MODE=${DSPAM_HOME_MODE} (default: 0770)"
 	@${ECHO_CMD} "LOG_DIR=${LOG_DIR} (default: ${_VAR_DIR}/log/dspam)"
 	@${ECHO_CMD} "RUN_DIR=${RUN_DIR} (default: ${_VAR_DIR}/run/dspam)"
 .	ifdef(WITHOUT_SYSLOG)
 	@${ECHO_CMD} "LOGFILE=${LOGFILE} (default: ${_VAR_DIR}/log/dspam/dspam.log)"
 .	endif
 .if ${PORT_OPTIONS:MWEBUI}
 		@${ECHO_CMD} "Define WWWDIR before making if you need the WebUI files"
 		@${ECHO_CMD} "installed in other place that this installation's default"
 		@${ECHO_CMD} "${WWWDIR}"
 .	endif
 	@${ECHO_CMD} ""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' \
 		${WRKSRC}/src/tools.mysql_drv/purge.sql
 	@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' \
 		${WRKSRC}/src/tools.mysql_drv/purge-4.1.sql
 	@${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' \
 		${WRKSRC}/src/tools.pgsql_drv/purge.sql
 	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" \
 		${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
 	@${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
 		 ${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
 	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \
 		${WRKSRC}/src/tools/dspam_train.in \
 		${WRKSRC}/src/tools/dspam_notify.in
 	@${TEST} ${MYSQL_FLAVOUR} == mariadb && ${REINPLACE_CMD} -e \
 		's,&& defined(CR_ERROR_FIRST),,' ${WRKSRC}/configure || :
 
 pre-configure:
 .if ${PORT_OPTIONS:MVIRT_USERS} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MHASH} )
 	@${ECHO_CMD} "You need MySQL, POSTGRESQL or HASH for virtual users."
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MPREF_EXT} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} )
 	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MDAEMON} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MHASH} )
 	@${ECHO_CMD} "You need MySQL, PostgreSQL or Hash for Daemon mode, because multithreading support is needed"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MSQLITE*} )
 	@${ECHO_CMD} "You need MySQL, Postgres or SQLite for EXTERNAL_LOOKUP."
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MUSER_HOMEDIR} && ${PORT_OPTIONS:MWEBUI}
 	@${ECHO_CMD} "USER_HOMEDIR and WebUI are incopatible"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MDOMAIN_SCALE} && ${PORT_OPTIONS:MLARGE_SCALE}
 	@${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MLIGHTTPD} && ! ${PORT_OPTIONS:MWEBUI}
 	@${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not using WebUI"
 	@${FALSE}
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 .if ${PORT_OPTIONS:MMYSQL}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
 	cd  ${WRKSRC}/src/tools.mysql_drv && \
 		${INSTALL_DATA} mysql_objects-4.1.sql \
 			mysql_objects-space.sql \
 			mysql_objects-speed.sql \
 			purge-4.1.sql purge.sql \
 			virtual_user_aliases.sql \
 			virtual_users.sql ${STAGEDIR}${EXAMPLESDIR}/mysql
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pgsql
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/pgsql
 .endif
 .if ${PORT_OPTIONS:MSQLITE*}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sqlite
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/sqlite
 .endif
 .endif	# PORT_OPTIONS:MEXAMPLES
 
 .if ${PORT_OPTIONS:MWEBUI}
 	${MV} ${WRKSRC}/webui/cgi-bin/configure.pl ${WRKSRC}/webui/cgi-bin/configure.pl.sample
 	cd ${WRKSRC}/webui/cgi-bin && ${MKDIR} ${STAGEDIR}${WWWDIR} && \
 		${INSTALL_SCRIPT} configure.pl.sample ${STAGEDIR}${WWWDIR}/ && \
 		${INSTALL_SCRIPT} *.cgi ${STAGEDIR}${WWWDIR} && \
 		${INSTALL_DATA} rgb.txt ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/webui/htdocs && \
 		${INSTALL_DATA} base.css dspam-logo-small.gif ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/webui/cgi-bin && \
 		${INSTALL_DATA} default.prefs ${STAGEDIR}${WWWDIR}/default.prefs.sample
 	cd ${WRKSRC}/webui/cgi-bin && \
 		${INSTALL_DATA} admins ${STAGEDIR}${WWWDIR}/admins.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}/templates && cd ${WRKSRC}/webui/cgi-bin/templates && \
 		${INSTALL_DATA} *.html ${STAGEDIR}${WWWDIR}/templates/ && \
 		${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/ && \
 		for _dir in de es-es fr he pt-br ro; do \
 			${INSTALL_DATA} -d ${STAGEDIR}${WWWDIR}/templates/$${_dir} && \
 			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \
 				${INSTALL_DATA} *.html ${STAGEDIR}${WWWDIR}/templates/$${_dir}; \
 		done && \
 		for _dir in de es-es pt-br; do \
 			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \
 				${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/$${_dir}/; \
 		done
 .endif
 
 	@${SED} ${_SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${STAGEDIR}${DOCSDIR}
 	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING
 .endif
 
 	@${MKDIR} ${STAGEDIR}${DSPAM_HOME}
 .for _file in firstrun.txt firstspam.txt quarantinefull.txt
 	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
 	then\
 		cd ${WRKSRC}/txt && \
 		${MV} ${_file} ${_file}.sample;\
 	fi
 	cd ${WRKSRC}/txt && \
 		${INSTALL_DATA} ${_file}.sample ${STAGEDIR}${DSPAM_HOME}
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${RUN_DIR}
 	@${MKDIR} ${STAGEDIR}${LOG_DIR}
 
 	@${CAT} ${WRKSRC}/README.FreeBSD
 
 .include <bsd.port.mk>
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index e8bb5868b2c3..fd32a601fd8b 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,194 +1,195 @@
 PORTNAME=	MailScanner
 DISTVERSION=	5.3.4-3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	.nix
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/MailScanner/v5/releases/download/${DISTVERSION}/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
 WWW=		https://www.mailscanner.info
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
 	p5-IO-Stringy>=0:devel/p5-IO-Stringy \
 	p5-DBI>=0:databases/p5-DBI \
 	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 	p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
 	p5-HTML-Parser>=0:www/p5-HTML-Parser \
 	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
 	p5-Convert-TNEF>=0:converters/p5-Convert-TNEF \
 	p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
 	p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
 	p5-Net-Ident>=0:net/p5-Net-Ident \
 	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
 	p5-DBI>=0:databases/p5-DBI \
 	p5-TimeDate>=0:devel/p5-TimeDate \
 	p5-Filesys-Df>=0:sysutils/p5-Filesys-Df \
 	p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
 	p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
 	p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
 	p5-Inline>=0:devel/p5-Inline \
 	p5-Inline-C>=0:devel/p5-Inline-C \
 	p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient \
 	p5-Mail-SPF>=0:mail/p5-Mail-SPF \
 	p5-Net-CIDR-Lite>=0:net/p5-Net-CIDR-Lite \
 	p5-Net-DNS-Resolver-Programmable>=0:dns/p5-Net-DNS-Resolver-Programmable \
 	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
 	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
 	p5-Test-Manifest>=0:devel/p5-Test-Manifest \
 	p5-URI>=0:net/p5-URI \
 	p5-IO-String>=0:devel/p5-IO-String \
 	p5-Business-ISBN>=0:misc/p5-Business-ISBN \
 	p5-Business-ISBN-Data>=0:misc/p5-Business-ISBN-Data \
 	p5-Data-Dump>=0:devel/p5-Data-Dump \
 	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
 	p5-IP-Country>=0:net/p5-IP-Country \
 	curl:ftp/curl
 
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		bash:shells/bash \
 		tnef:converters/tnef \
 		wget:ftp/wget
 
 CONFLICTS=	MailScanner-devel
 
 USES=		cpe perl5 shebangfix
 SHEBANG_GLOB=	* usr/lib/MailScanner/init/* usr/lib/MailScanner/wrapper/* \
 		usr/sbin/* usr/share/MailScanner/perl/MailScanner/*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C,-[0-9]+,,}
 SUB_FILES=	MailScanner.8 pkg-message pkg-install
 SUB_LIST=	DATADIR=${DATADIR} \
 		PERL=${PERL} \
 		PKGVERSION=${PKGVERSION} \
 		PORTVERSION=${PORTVERSION} \
 		ETC_FILES="${ETC_FILES}" \
 		MCP_FILES="${MCP_FILES}"
 
 OPTIONS_DEFINE=		SPAMASSASSIN CLAMAV DOCS
 SPAMASSASSIN_DESC=	Install SpamAssassin
 CLAMAV_DESC=		Install ClamAV
 
 OPTIONS_DEFAULT=	SPAMASSASSIN CLAMAV
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSPAMASSASSIN}
 RUN_DEPENDS+=	spamassassin:mail/spamassassin
 PLIST_SUB+=	SPAMASSASSIN=""
 .else
 PLIST_SUB+=	SPAMASSASSIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 RUN_DEPENDS+=	clamscan:security/clamav
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 RUN_DEPENDS+=	unrar:archivers/unrar \
 		zoo:archivers/zoo \
 		unarj:archivers/unarj \
 		unace:archivers/unace \
 		lha:archivers/lha
 .endif
 
 # backwards compatibility
 .if defined(NO_SPAMASSASSIN_SYMLINK)
 WITHOUT_SPAMASSASSIN_SYMLINK=${NO_SPAMASSASSIN_SYMLINK}
 .endif
 
 .if defined(WITHOUT_SPAMASSASSIN_SYMLINK) || ! ${PORT_OPTIONS:MSPAMASSASSIN}
 PLIST_SUB+=	SPAMASSASSIN_SYMLINK="@comment "
 SUB_LIST+=	WITHOUT_SPAMASSASSIN_SYMLINK=yes
 .else
 PLIST_SUB+=	SPAMASSASSIN_SYMLINK=""
 SUB_LIST+=	WITHOUT_SPAMASSASSIN_SYMLINK=no
 .endif
 
 DOC_FILES=	README
 ETC_FILES=	MailScanner.conf filename.rules.conf \
 		archives.filename.rules.conf archives.filetype.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf \
 		phishing.safe.sites.conf \
 		phishing.bad.sites.conf \
 		country.domains.conf
 MCP_FILES=	mcp.spamassassin.conf \
 		10_example.cf
 
 USE_RC_SUBR=	mailscanner mta
 
 post-patch:
 	${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \
 	    ${WRKSRC}/usr/lib/MailScanner/wrapper/bitdefender-wrapper \
 	    ${WRKSRC}/usr/lib/MailScanner/wrapper/clamav-wrapper
 
 do-build:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
 		-e 's,/usr/bin/bash,${LOCALBASE}/bin/bash,g' \
 		-e 's,/bin/sed,/usr/bin/sed,g' \
 		-e 's,/etc/init.d/mailscanner,${LOCALBASE}/etc/rc.d/mailscanner,g' \
 		-e 's,/etc/mail/,${LOCALBASE}/etc/mail/,g'		\
 		-e 's,/usr/share/MailScanner,${DATADIR},g' \
 		-e 's,/usr/lib/MailScanner/reports,${DATADIR}/reports,g' \
 		-e 's,/etc/MailScanner,${PREFIX}/etc/MailScanner,g'	\
 		-e 's,/usr/sbin/ms-,${PREFIX}/sbin/ms-,g' \
 		-e 's,/usr/lib/MailScanner,${PREFIX}/lib/MailScanner,g'	\
 		-e 's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g'	\
 		-e 's,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g' \
 		-e 's,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g'	\
 		-e 's,/usr/bin/unzip,${UNZIP_CMD},g'				\
 		-e 's,/usr/bin/wget,${LOCALBASE}/bin/wget,g'		\
 		-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g'		\
 		-e 's,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g' \
 		-e 's,/bin/gunzip,/usr/bin/gunzip,g' \
 		-e 's,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g' \
 		-e 's,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g' \
 		-e 's,/usr/local/share/clamav,/var/db/clamav,g' \
 		-e 's,/bin/false,/usr/bin/false,'
 
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/*
 	@${REINPLACE_CMD} -e 's,/usr$$,&/local,' \
 		${WRKSRC}/etc/${PORTNAME}/virus.scanners.conf
 	@${FIND} ${WRKSRC} \( -name "*.bak" -or -name "*.orig" \) -delete
 
 do-install:
 	(cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}/${PREFIX}/sbin)
 	${RLN} ${STAGEDIR}${PREFIX}/sbin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/rules
 	(cd ${WRKSRC}/etc/MailScanner && ${FIND} . -type f -depth 1 -exec \
 		${INSTALL_DATA} {} \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/{}.sample \;)
 	cd ${WRKSRC}/etc/MailScanner/rules \
 		&& ${INSTALL_DATA} EXAMPLES README \
 			${STAGEDIR}${PREFIX}/etc/MailScanner/rules
 .for RULES in spam.whitelist.rules bounce.rules max.message.size.rules
 	${INSTALL_DATA} ${WRKSRC}/etc/MailScanner/rules/${RULES} \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/rules/${RULES}.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/mcp
 .for FILE in ${MCP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/MailScanner/mcp/${FILE} \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d
 	${INSTALL_DATA} ${WRKSRC}/etc/MailScanner/conf.d/README \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d/README
 	(cd ${WRKSRC}/usr/share/MailScanner && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DATADIR})
 	for f in ${STAGEDIR}${DATADIR}/reports/*/*; do \
 		${MV} $${f} $${f}.sample; \
 	done
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib
 	(cd ${WRKSRC}/usr/lib/MailScanner && ${COPYTREE_BIN} . \
 		${STAGEDIR}${PREFIX}/lib/MailScanner)
 	cd ${WRKDIR} && \
 		${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 6d91a2ac646a..b3db87fea697 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	mimedefang
 PORTVERSION=	2.84
-PORTREVISION=	1
+PORTREVISION=	2
 
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/ \
 		http://fossies.org/linux/misc/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Milter based anti-spam and anti-virus filtering program
 WWW=		https://www.mimedefang.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
 	p5-IO-Stringy>=0:devel/p5-IO-Stringy \
 	p5-MIME-Tools>=5.417:mail/p5-MIME-Tools \
 	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 	spamassassin>=3.0:mail/spamassassin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cpe perl5 shebangfix
 perl_OLD_CMD=	perl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
 			--with-confsubdir=mimedefang \
 			--with-user=${MIMEDEFANG_USER} \
 			--with-spooldir=${SPOOLDIR} \
 			--with-quarantinedir=${QUARANTINEDIR} \
 			--with-ipheader \
 			--prefix=${PREFIX}
 CONFIGURE_ENV+=		PERL=${PERL}
 
 SUB_FILES=	pkg-message
 
 PLIST_SUB+=	USER="${MIMEDEFANG_USER}" \
 		GROUP="${MIMEDEFANG_GROUP}" \
 		MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
 		MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"
 
 MIMEDEFANG_USER?=	mailnull
 MIMEDEFANG_GROUP?=	mailnull
 SPOOLDIR?=		/var/spool/MIMEDefang
 QUARANTINEDIR?=		/var/spool/MD-Quarantine
 CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 
 OPTIONS_DEFINE=	CLAMAV DOCS EXAMPLES
 OPTIONS_DEFAULT=	CLAMAV
 
 CLAMAV_DESC=	Enable Clamav
 
 CLAMAV_BUILD_DEPENDS=		clamscan:security/clamav
 CLAMAV_RUN_DEPENDS=		clamscan:security/clamav
 CLAMAV_CONFIGURE_ENABLE=	antivirus clamav clamd
 
 .include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 CONFIGURE_ARGS+=	--with-milterinc=${MILTERBASE}/include --with-milterlib=${MILTERBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/fgrep -e/d' ${WRKSRC}/configure
 
 pre-install:
 	@${REINPLACE_CMD} -e '/LOCAL_STATE_DIR/s,/var/lib,/var/db,' ${WRKSRC}/mimedefang.pl
 
 post-install:
 	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
 		suggested-minimum-filter-for-windows-clients README ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Clamd/Makefile b/mail/p5-Clamd/Makefile
index da838199894e..37c4363bdb08 100644
--- a/mail/p5-Clamd/Makefile
+++ b/mail/p5-Clamd/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	Clamd
 PORTVERSION=	1.04
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Connect to local clamd(8) service and send commands
 WWW=		https://metacpan.org/release/Clamd
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	clamd:security/clamav
 
 USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/mail/py-fuglu/Makefile b/mail/py-fuglu/Makefile
index 4d54587a000b..ef5c5a0f4bdd 100644
--- a/mail/py-fuglu/Makefile
+++ b/mail/py-fuglu/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	fuglu
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Mail scanning daemon for Postfix written in Python
 WWW=		https://fuglu.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	postfix:mail/postfix \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rarfile>0:archivers/py-rarfile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lzma>0:archivers/py-lzma@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 USE_RC_SUBR=	fuglu
 
 NO_ARCH=	yes
 
 LOGDIR=		/var/log/fuglu
 PLIST_DIRS+=	${LOGDIR}
 
 OPTIONS_DEFINE=		BEAUTIFULSOUP CLAMAV DKIM MAGIC SPAMASSASSIN SPF SQL
 OPTIONS_DEFAULT=	BEAUTIFULSOUP CLAMAV DKIM MAGIC SPAMASSASSIN SPF
 
 BEAUTIFULSOUP_DESC=	Use BeautifulSoup for improved html processing
 CLAMAV_DESC=		Use ClamAV
 DKIM_DESC=		Use DKIM (in FuGlu)
 MAGIC_DESC=		Use mime magic bindings for attachment detection
 SPAMASSASSIN_DESC=	Use SpamAssassin
 SPF_DESC=		Use SPF (in FuGlu)
 SQL_DESC=		Use SQL
 
 BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup@${PY_FLAVOR}
 CLAMAV_RUN_DEPENDS=	clamd:security/clamav
 DKIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${PY_FLAVOR}
 MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${PY_FLAVOR}
 SPAMASSASSIN_RUN_DEPENDS=	spamassassin>=0:mail/spamassassin
 SPF_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR}
 SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${PY_FLAVOR}
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|'/etc|'etc|g" ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e "s|=/etc|=${PREFIX}/etc|g" ${WRKSRC}/conf/fuglu.conf.dist
 	@${REINPLACE_CMD} -e "s|'/etc|'${PREFIX}/etc|g" \
 		${WRKSRC}/compareconfig.py \
 		${WRKSRC}/src/fuglu/plugins/actionoverride.py \
 		${WRKSRC}/src/fuglu/plugins/archive.py \
 		${WRKSRC}/src/fuglu/plugins/attachment.py \
 		${WRKSRC}/src/fuglu/plugins/domainauth.py \
 		${WRKSRC}/src/fuglu/plugins/p_fraction.py \
 		${WRKSRC}/src/fuglu/plugins/p_skipper.py \
 		${WRKSRC}/src/fuglu/plugins/script.py \
 		${WRKSRC}/src/startscript/fuglu \
 		${WRKSRC}/src/tools/fuglu_conf \
 		${WRKSRC}/src/tools/fuglu_debug
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${LOGDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 0c73862ade84..fdb2fb08f1d8 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	qsheff-II
 DISTVERSION=	2.1-r3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/qsheff/ \
 		SF/qsheff/qsheff/II-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qmail-queue replacement to filter mail traffic
 WWW=		http://www.enderunix.org/qsheff/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_13=	ld: error: duplicate symbol: CUSTOM_PROG
 BROKEN_FreeBSD_14=	ld: error: duplicate symbol: CUSTOM_PROG
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:mail/ripmime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		qmail
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qmaildir=${QMAIL_PREFIX}
 
 DOCS=		README AUTHORS ChangeLog INSTALL THANKS TODO
 EXAMPLES=	sample-OK.msg sample-SPAM.msg sample-VIRUS.msg
 CONTRIB=	README qq-custom-error-patch.diff qq-patch.diff \
 		qsheff-patch.diff
 FILES=		handbook.en.txt handbook.tr.txt spamass-qsheff.en.html
 ETCFILES=	install-wrapper.sh uninstall-wrapper.sh qsheff.attach-default \
 		qsheff.conf-default qsheff.ignore-default qsheff.rules-default
 
 OPTIONS_DEFINE=	CLAMAV SPAMTAG VIRUSTAG DISABLELOCAL SYSLOG BACKUP \
 		CUSTOMERROR DEBUG DOCS EXAMPLES
 OPTIONS_DEFAULT=	CLAMAV
 
 CLAMAV_DESC=		Integrate with ClamAV
 SPAMTAG_DESC=		Spam tagging
 VIRUSTAG_DESC=		Virus tagging
 DISABLELOCAL_DESC=	Disable filters for local users
 BACKUP_DESC=		Logging of incoming/outgoing mail
 CUSTOMERROR_DESC=	Custom error patch
 
 CLAMAV_BUILD_DEPENDS=	${LOCALBASE}/bin/clamdscan:security/clamav
 CLAMAV_RUN_DEPENDS=	${CLAMAV_BUILD_DEPENDS}
 CLAMAV_CONFIGURE_ON=	--with-clamav --with-clamd-socket=/var/run/clamav/clamd
 
 SPAMTAG_CONFIGURE_ON=	--enable-spam-tag
 VIRUSTAG_CONFIGURE_ON=	--enable-virus-tag
 SYSLOG_CONFIGURE_ON=	--enable-syslog
 DISABLELOCAL_CONFIGURE_ON=--disable-local-users
 BACKUP_CONFIGURE_ON=	--enable-backup
 CUSTOMERROR_CONFIGURE_ON=--enable-custom-error
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS=""/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's/ -ansi//' ${WRKSRC}/src/Makefile.in
 
 post-build-CLAMAV-off:
 	@${REINPLACE_CMD} -e '/enable_clamd/s|1|0|' \
 		${WRKSRC}/etc/qsheff.conf-default
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qsheff ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${ETCFILES:S,^,${WRKSRC}/etc/,} ${STAGEDIR}${ETCDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/doc
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/samples/,} \
 		${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${CONTRIB:S,^,${WRKSRC}/contrib/,} \
 		${STAGEDIR}${EXAMPLESDIR}/contrib
 
 .include <bsd.port.mk>
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index 278e5715a2a9..c4b641232cc6 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -1,131 +1,131 @@
 PORTNAME=	simscan
 PORTVERSION=	1.4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast Content/Anti-virus Scanner for qmail Written in C
 WWW=		https://www.inter7.com/?page=simscan
 
 USES=		qmail:build
 
 GNU_CONFIGURE=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 WORKDIR?=	${QMAIL_PREFIX}/${PORTNAME}
 QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
 
 SUB_FILES=	pkg-message
 
 SUB_LIST=	QMAIL_PREFIX=${QMAIL_PREFIX} \
 		SIMSCAN_DIR=${PORTNAME}
 PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX} \
 		SIMSCAN_DIR=${PORTNAME}
 
 OPTIONS_DEFINE=	CLAMAV RIPMIME SPAMD USER DOMAIN ATTACH DROPMSG PASSTHRU HEADERS DSPAM DOCS
 OPTIONS_DEFAULT=	CLAMAV RIPMIME
 CLAMAV_DESC=	Support for ClamAV Virus Scanning
 RIPMIME_DESC=	Ripmime Processing (if Clamav ScanMail disabled)
 SPAMD_DESC=	Support for SpamAssassin Spam Filtering
 USER_DESC=	Turn On Per User SpamAssassin (required SPAMD)
 DOMAIN_DESC=	Turn On Per Domain Based Checking
 ATTACH_DESC=	Turn On Attachment Scanning (required CLAMAV)
 DROPMSG_DESC=	Drop Message in Case of Virus Found
 PASSTHRU_DESC=	Pass Spam Thru, Do Not Reject (required SPAMD)
 HEADERS_DESC=	Add a Received Line With Versions of Scanners
 DSPAM_DESC=	Turn on DSPAM scanning
 
 CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \
 		--enable-qmaildir=${QMAIL_PREFIX} \
 		--enable-spamc-user=n \
 		--enable-workdir=${WORKDIR} \
 		--enable-user=nobody
 
 CLAMAV_CONFIGURE_OFF=	--enable-clamav=n
 CLAMAV_BUILD_DEPENDS=	clamdscan:security/clamav
 
 RIPMIME_CONFIGURE_OFF=	--disable-ripmime
 RIPMIME_BUILD_DEPENDS=	ripmime:mail/ripmime
 RIPMIME_RUN_DEPENDS=	ripmime:mail/ripmime
 
 SPAMD_BUILD_DEPENDS=	spamassassin:mail/spamassassin
 SPAMD_CONFIGURE_ON=	--enable-spam=y \
 			--enable-spamassassin-path=${LOCALBASE}/bin/spamassassin
 
 USER_CONFIGURE_ON=	--enable-spamc-user=y
 
 DOMAIN_CONFIGURE_ON=	--enable-per-domain=y
 
 ATTACH_CONFIGURE_ON=	--enable-attach=y
 
 DROPMSG_CONFIGURE_ON=	--enable-dropmsg=y
 
 PASSTHRU_CONFIGURE_ON=	--enable-spam-passthru=y
 
 HEADERS_CONFIGURE_ON=	--enable-received=y \
 			--enable-sigtool-path=${LOCALBASE}/bin/sigtool
 
 DSPAM_CONFIGURE_ON=	--enable-dspam=y
 DSPAM_BUILD_DEPENDS=	dspam:mail/dspam
 
 .if defined(SPAM_HITS)
 CONFIGURE_ARGS+=--enable-spam-hits=${SPAM_HITS}
 .endif
 
 .if defined(QUARANTINE_DIR)
 CONFIGURE_ARGS+=--enable-quarantinedir=${QUARANTINE_DIR}
 .endif
 
 .if defined(SPAMC_ARGS)
 CONFIGURE_ARGS+=--enable-spamc-args=${SPAMC_ARGS}
 .endif
 
 .if defined(QMAIL_QUEUE)
 CONFIGURE_ARGS+=--enable-qmail-queue=${QMAIL_QUEUE}
 .endif
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,($f/daily.cvd"),\1 || test -d "$$f/daily.inc",' \
 		${WRKSRC}/configure
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/cdb/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/cdb/conf-ld
 	@${ECHO_CMD} ${STAGEDIR}${PREFIX} > ${WRKSRC}/cdb/conf-home
 	@${REINPLACE_CMD} -E -e 's|@qmaildir@|$$(DESTDIR)@qmaildir@|' \
 	    -e 's|@workdir@|$$(DESTDIR)@workdir@|' \
 	    -e '/ch(mod|own)/d' \
 	    ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
 	@${ECHO_MSG} "You may also use the following build options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "QMAIL_PREFIX	Base qmail directory. Default is ${QMAIL_PREFIX}"
 	@${ECHO_MSG} "WORKDIR		Directory to unpack emails. Default is ${QMAIL_PREFIX}/${PORTNAME}"
 	@${ECHO_MSG} "QMAIL_QUEUE	Define full path and name of the qmail-queue program"
 	@${ECHO_MSG} "		Incoming mail is passed to this program after being"
 	@${ECHO_MSG} "		scanned by SimScan. Default is ${QMAIL_PREFIX}/bin/qmail-queue"
 	@${ECHO_MSG} "SPAMC_ARGS	Define the arguments to pass to spamc."
 	@${ECHO_MSG} "		Be sure to place quotes around the options you define"
 	@${ECHO_MSG} "SPAM_HITS	Reject spam only above this hit level"
 	@${ECHO_MSG} "		Default is 10.0. Useful without PASSTHRU option"
 	@${ECHO_MSG} "QUARANTINE_DIR	Directory to keep spam and/or infected emails"
 	@${ECHO_MSG} "		Default is disabled"
 	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
 	@${ECHO_MSG} ""
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/bin
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios-check_clamav/Makefile b/net-mgmt/nagios-check_clamav/Makefile
index 68ca9d851fc6..9f91fc573621 100644
--- a/net-mgmt/nagios-check_clamav/Makefile
+++ b/net-mgmt/nagios-check_clamav/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	check_clamav
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 PKGNAMEPREFIX=	nagios-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nagios plugin that verifies ClamAV local signature database revision
 WWW=		http://bsd.phoenix.az.us/projects/check_clamav
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	check_clamav
 
 RUN_DEPENDS+=	${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins \
 		clamav>=0:security/clamav \
 		p5-Net-DNS>=0:dns/p5-Net-DNS
 
 PLIST_FILES=	libexec/nagios/check_clamav
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL_SCRIPT} ${WRKSRC}/check_clamav \
 		${STAGEDIR}${PREFIX}/libexec/nagios/check_clamav
 
 .include <bsd.port.mk>
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index 2121decc2f09..3d6937cb94ce 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	clamassassin
 PORTVERSION=	1.2.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	http://jameslick.com/clamassassin/
 
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Simple virus filter wrapper for ClamAV
 WWW=		http://drivel.com/clamassassin/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	sigtool:security/clamav \
 		formail:mail/procmail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_FILES=	bin/clamassassin
 
 GNU_CONFIGURE=	yes
 # Woky configure script doesn't actually respect prefix
 # Instead, it looks for 'bindir'... so set that.
 CONFIGURE_ARGS=	--bindir=${STAGEDIR}${PREFIX}/bin
 
 OPTIONS_DEFINE=	CLAMDSCAN SUBREWRITE
 OPTIONS_DEFAULT=	CLAMDSCAN
 CLAMDSCAN_DESC=		Scanning using clamd
 SUBREWRITE_DESC=	Mail subject rewriting
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLAMDSCAN}
 CONFIGURE_ARGS+=	--enable-clamdscan
 .endif
 
 .if ${PORT_OPTIONS:MSUBREWRITE}
 CONFIGURE_ARGS+=	--enable-subject-rewrite
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile
index d5afe8775b94..02fe64e94803 100644
--- a/security/clamav-unofficial-sigs/Makefile
+++ b/security/clamav-unofficial-sigs/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	clamav-unofficial-sigs
 PORTVERSION=	7.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	freebsd@mnd.sc
 COMMENT=	Update script for third-party ClamAV databases
 WWW=		https://github.com/extremeshok/clamav-unofficial-sigs
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 COMMON_DEPENDS=	clamscan:security/clamav \
 		rsync:net/rsync \
 		curl:ftp/curl \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		bash:shells/bash
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	extremeshok
 SHEBANG_FILES=	clamav-unofficial-sigs.sh
 USE_PERL5=	run
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${CP} ${FILESDIR}/manpage.conf ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' ${WRKSRC}/manpage.conf
 
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/clamav-unofficial-sigs.sh
 
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/bash ./clamav-unofficial-sigs.sh -c manpage.conf --install-man)
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/clamav-unofficial-sigs.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/clamav-unofficial-sigs.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/master.conf ${STAGEDIR}${ETCDIR}/master.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/config/os/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/config/user.conf ${STAGEDIR}${ETCDIR}/user.conf.sample
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} INSTALL.md LICENSE README.md ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index f13692a4bb09..89a843ba1c1d 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,140 +1,135 @@
 PORTNAME=	clamav
-DISTVERSION=	0.105.1
-DISTVERSIONSUFFIX=	-3
-PORTREVISION=	5
+DISTVERSION=	1.0.0
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Open-source (GPL) anti-virus engine (Regular Feature Release)
 WWW=		https://www.clamav.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT} \
-		tomsfastmath>0:math/tomsfastmath
+BUILD_DEPENDS=	${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT}
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjson-c.so:devel/json-c \
 		libmspack.so:archivers/libmspack \
 		libpcre2-8.so:devel/pcre2
 
 USES=		cmake cpe gnome iconv ncurses pkgconfig ssl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
 CMAKE_ARGS=	-DDATABASE_DIRECTORY:STRING=${_DBDIR}
-CMAKE_ON=	ENABLE_EXTERNAL_MSPACK ENABLE_EXTERNAL_TOMSFASTMATH
+CMAKE_ON=	ENABLE_EXTERNAL_MSPACK
 
 TEST_TARGET=	check
 
 CONFLICTS_INSTALL=	clamav-lts
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	CHMOD=${CHMOD} \
 		CHOWN=${CHOWN} \
 		CLAMAV_CLAMD_PIDFILE=${_CLAMAV_CLAMD_PIDFILE} \
 		CLAMAV_CLAMD_SOCKET=${_CLAMAV_CLAMD_SOCKET} \
 		CLAMAV_MILTER_SOCKET=${_CLAMAV_MILTER_SOCKET} \
 		CLAMAVGROUP=${_CLAMAVGROUP} \
 		CLAMAVUSER=${_CLAMAVUSER} \
 		DBDIR=${_DBDIR} \
 		LOGDIR=${_LOGDIR} \
 		RUNDIR=${_RUNDIR}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
 USERS=		${_CLAMAVUSER}
 GROUPS=		${_CLAMAVGROUP} mail
 
 PLIST_SUB+=	CLAMAVGROUP=${_CLAMAVGROUP} \
 		CLAMAVUSER=${_CLAMAVUSER} \
 		DBDIR=${_DBDIR} \
 		LOGDIR=${_LOGDIR} \
 		RUNDIR=${_RUNDIR}
 
 OPTIONS_DEFINE=	ARC ARJ DOCS EXPERIMENTAL LHA MILTER STDERR TESTS UNRAR UNZOO
 
 OPTIONS_DEFAULT=	ARC ARJ MILTER UNRAR UNZOO
 OPTIONS_SUB=		yes
 
 ARC_DESC=		Enable arch archives support
 ARJ_DESC=		Enable arj archives support
 EXPERIMENTAL_DESC=	Build experimental code
 LHA_DESC=		Enable lha archives support
 MILTER_DESC=		Compile the milter interface
 STDERR_DESC=		Print logs to stderr instead of stdout
 TESTS_DESC=		Build with test enabled (`make test` requires it)
 UNZOO_DESC=		Enable zoo archives support
 
 ARC_RUN_DEPENDS=		arc:archivers/arc
 ARJ_RUN_DEPENDS=		arj:archivers/arj
 EXPERIMENTAL_CMAKE_BOOL=	ENABLE_EXPERIMENTAL
 LHA_RUN_DEPENDS=		lha:archivers/lha
 .if !exists(/usr/lib/libmilter.so)
 MILTER_LIB_DEPENDS=		libmilter.so:mail/libmilter
 .endif
 MILTER_USE=			RC_SUBR=clamav-milter
 .if !exists(/usr/lib/libmilter.so)
 MILTER_USE+=			localbase
 .endif
 MILTER_CMAKE_BOOL=		ENABLE_MILTER
 STDERR_EXTRA_PATCHES=		${FILESDIR}/extra-patch-common_output.c
 TESTS_BUILD_DEPENDS=		${LOCALBASE}/include/check.h:devel/check
 TESTS_USES=			python:build
 TESTS_CMAKE_BOOL=		ENABLE_TESTS
 UNRAR_CMAKE_BOOL=		ENABLE_UNRAR
 UNZOO_RUN_DEPENDS=		unzoo:archivers/unzoo
 
 _CLAMAVUSER?=	clamav
 _CLAMAVGROUP?=	clamav
 
 _CLAMAV_CLAMD_SOCKET?=	${_RUNDIR}/clamd.sock
 _CLAMAV_CLAMD_PIDFILE?=	${_RUNDIR}/clamd.pid
 _CLAMAV_MILTER_SOCKET?=	${_RUNDIR}/clmilter.sock
 
 _DBDIR=		/var/db/clamav
 _LOGDIR=	/var/log/clamav
 _RUNDIR=	/var/run/clamav
 
 _SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' -e \
 		's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${_LOGDIR}/\3|' \
 		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${_RUNDIR}/\2|' -e \
 		's|^\#?(LocalSocket) .*$$|\1 ${_CLAMAV_CLAMD_SOCKET}|' -e \
 		's|^\#?(User) .*$$|\1 ${_CLAMAVUSER}|' -e \
 		's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' -e \
 		's|^\#?(ScanMail).*$$|\1 yes|' -e \
 		's|^\#?(DatabaseDirectory) .*$$|\1 ${_DBDIR}|' -e \
 		's|^\#?(DatabaseOwner) .*$$|\1 ${_CLAMAVUSER}|' -e \
 		's|^\#?(FixStaleSocket).*$$|\1 yes|' -e \
 		's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' -e \
 		's|^\#?(MilterSocket) */tmp.*$$|\1 ${_CLAMAV_MILTER_SOCKET}|' \
 		-e 's|^\#?(ClamdSocket).*$$|\1 unix:${_CLAMAV_CLAMD_SOCKET}|'
 
 post-patch:
 	@${REINPLACE_CMD} ${_SED_CONF} \
 		${WRKSRC}/etc/clamd.conf.sample \
 		${WRKSRC}/etc/freshclam.conf.sample \
 		${WRKSRC}/etc/clamav-milter.conf.sample
 
 post-install:
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
 	@${MKDIR} ${STAGEDIR}${_DBDIR} \
 		  ${STAGEDIR}${_LOGDIR} \
 		  ${STAGEDIR}${_RUNDIR}
 
 post-install-DOCS-on:
 	${MV} ${STAGEDIR}${PREFIX}/share/doc/ClamAV ${STAGEDIR}${DOCSDIR}
 
 post-install-DOCS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ClamAV
 
 pre-test-TESTS-off:
 	@${ECHO_MSG} '******************************************************************' && \
 	${ECHO_MSG} '***** You need to enable TESTS option to execute `make test` *****' && \
 	${ECHO_MSG} '******************************************************************' && \
 	${FALSE}
 
 .include <bsd.port.mk>
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index ccad662acd8a..ae765b22d8f3 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668559826
-SHA256 (clamav-0.105.1-3.tar.gz) = 86d832917185c3512e639297e3d727be6b64a56e32a33b3a1522b98d7c725075
-SIZE (clamav-0.105.1-3.tar.gz) = 29583081
+TIMESTAMP = 1669679113
+SHA256 (clamav-1.0.0.tar.gz) = bda39bb856902e6dd6077ea313a3eb8beccd487e0082a95917877f2b299cd86e
+SIZE (clamav-1.0.0.tar.gz) = 31191624
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index b7234e352f76..ca56d6a3f34d 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -1,172 +1,172 @@
 bin/clamav-config
 bin/clambc
 bin/clamconf
 bin/clamdscan
 bin/clamdtop
 bin/clamscan
 bin/clamsubmit
 bin/freshclam
 bin/sigtool
 include/clamav-config.h
 include/clamav-types.h
 include/clamav-version.h
 include/clamav.h
 include/libfreshclam.h
 lib/libclamav.so
-lib/libclamav.so.9
-lib/libclamav.so.9.1.0
+lib/libclamav.so.11
+lib/libclamav.so.11.0.0
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.9
-%%UNRAR%%lib/libclamunrar.so.9.1.0
+%%UNRAR%%lib/libclamunrar.so.11
+%%UNRAR%%lib/libclamunrar.so.11.0.0
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.9
-%%UNRAR%%lib/libclamunrar_iface.so.9.1.0
+%%UNRAR%%lib/libclamunrar_iface.so.11
+%%UNRAR%%lib/libclamunrar_iface.so.11.0.0
 lib/libfreshclam.so
 lib/libfreshclam.so.2
 lib/libfreshclam.so.2.0.2
 libdata/pkgconfig/libclamav.pc
 share/man/man1/clambc.1.gz
 share/man/man1/clamconf.1.gz
 share/man/man1/clamdscan.1.gz
 share/man/man1/clamdtop.1.gz
 share/man/man1/clamscan.1.gz
 share/man/man1/clamsubmit.1.gz
 share/man/man1/freshclam.1.gz
 share/man/man1/sigtool.1.gz
 share/man/man5/clamav-milter.conf.5.gz
 share/man/man5/clamd.conf.5.gz
 share/man/man5/freshclam.conf.5.gz
 share/man/man8/clamav-milter.8.gz
 share/man/man8/clamd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/404.html
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/css/font-awesome.css
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/FontAwesome.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.eot
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.svg
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.woff
 %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/Introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ace.js
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix/Appendix.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix/Authenticode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix/CvdPrivateMirror.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix/FileTypes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix/FunctionalityLevels.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix/Terminology.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ayu-highlight.css
 %%PORTDOCS%%%%DOCSDIR%%/html/book.js
 %%PORTDOCS%%%%DOCSDIR%%/html/clipboard.min.js
 %%PORTDOCS%%%%DOCSDIR%%/html/community_resources/CommunityResources.html
 %%PORTDOCS%%%%DOCSDIR%%/html/community_resources/CompileClamAV_AmazonLinux2.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/css/chrome.css
 %%PORTDOCS%%%%DOCSDIR%%/html/css/general.css
 %%PORTDOCS%%%%DOCSDIR%%/html/css/print.css
 %%PORTDOCS%%%%DOCSDIR%%/html/css/variables.css
 %%PORTDOCS%%%%DOCSDIR%%/html/editor.js
 %%PORTDOCS%%%%DOCSDIR%%/html/elasticlunr.min.js
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-cvd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-eol.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-freshclam.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-ignore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-misc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-ml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-pua.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-rust.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-safebrowsing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-scan-alerts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-uninstall.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-whichversion.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-win32.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/favicon.png
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/OPEN-SANS-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/SOURCE-CODE-PRO-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/fonts.css
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-300.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-300italic.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-600.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-600italic.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-700.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-700italic.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-800.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-800italic.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-italic.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-regular.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/source-code-pro-v11-all-charsets-500.woff2
 %%PORTDOCS%%%%DOCSDIR%%/html/highlight.css
 %%PORTDOCS%%%%DOCSDIR%%/html/highlight.js
 %%PORTDOCS%%%%DOCSDIR%%/html/images/change-fork-name.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cisco.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/clone-your-fork.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/create-a-fork.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/demon.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/flamegraph.svg
 %%PORTDOCS%%%%DOCSDIR%%/html/images/fork-is-behind.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/new-git-workflow.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/old-git-workflow.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/Contribute.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/build-installer-packages.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/clamav-git-work-flow.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/code-coverage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/development-builds.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/fuzzing-sanitizers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/github-pr-basics.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/libclamav.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/performance-profiling.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/personal-forks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/testing-pull-requests.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/tips-and-tricks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Add-clamav-user.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Community-projects.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Docker.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix-old.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Windows.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Packages.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/OnAccess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/AllowLists.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/AuthenticodeRules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/BodySignatureFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/BytecodeSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/ContainerMetadata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/DatabaseInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/DynamicConfig.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/EncryptedArchives.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/ExtendedSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/FileTypeMagic.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/HashSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/LogicalSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/PhishSigs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/SignatureNames.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/YaraRules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/ReportABug.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Scanning.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Services.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/SignatureManagement.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mark.min.js
 %%PORTDOCS%%%%DOCSDIR%%/html/mode-rust.js
 %%PORTDOCS%%%%DOCSDIR%%/html/print.html
 %%PORTDOCS%%%%DOCSDIR%%/html/searcher.js
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.json
 %%PORTDOCS%%%%DOCSDIR%%/html/theme-dawn.js
 %%PORTDOCS%%%%DOCSDIR%%/html/theme-tomorrow_night.js
 %%PORTDOCS%%%%DOCSDIR%%/html/tomorrow-night.css
 %%MILTER%%sbin/clamav-milter
 sbin/clamd
 @sample etc/clamd.conf.sample
 %%MILTER%%@sample etc/clamav-milter.conf.sample
 @sample etc/freshclam.conf.sample
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
diff --git a/security/clamfs/Makefile b/security/clamfs/Makefile
index 0a4604eda739..ca635c8332d6 100644
--- a/security/clamfs/Makefile
+++ b/security/clamfs/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	clamfs
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	anastasios@mageirias.com
 COMMENT=	User-space fs with on-access antivirus scanning
 WWW=		https://github.com/burghardt/clamfs
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	boost-libs>=1.33:devel/boost-libs
 LIB_DEPENDS=	libPocoFoundation.so:devel/poco \
 		libPocoNet.so:devel/poco \
 		libPocoXML.so:devel/poco \
 		librlog.so:devel/rlog
 RUN_DEPENDS=	clamd:security/clamav
 
 USES=		autoreconf compiler:c++11-lib fuse:3 pkgconfig
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/clamfs \
 		man/man1/clamfs.1.gz
 
 PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror ||g' ${WRKSRC}/configure.ac
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \
 		${WRKSRC}/doc/clamfs.xml ${WRKSRC}/doc/debug.xml
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/clamfs.xml ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/debug.xml ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index 59baa4262103..b16a3cdec7b6 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	clamsmtp
 PORTVERSION=	1.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://thewalter.net/stef/software/clamsmtp/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ClamAV anti-virus SMTP Filter
 WWW=		http://thewalter.net/stef/software/clamsmtp/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		gmake
 USE_RC_SUBR=	clamsmtpd
 SUB_LIST=	CLAMAV_PID_DIR=${CLAMAV_PID_DIR}
 SUB_FILES=	pkg-message
 
 CLAMAV_PID_DIR?=/var/run/clamav
 
 PORTDOCS=	README
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS LOCAL_CLAMAV EXAMPLES
 OPTIONS_DEFAULT=	LOCAL_CLAMAV
 
 LOCAL_CLAMAV_DESC=		RUN_DEPEND on security/clamav
 LOCAL_CLAMAV_RUN_DEPENDS=	clamav>=0:security/clamav
 LOCAL_CLAMAV_SUB_LIST=		CLAMD=clamd
 LOCAL_CLAMAV_SUB_LIST_OFF=	CLAMD=
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/var/run/clamav/clamd,/var/run/clamav/clamd.sock," \
 		${WRKSRC}/doc/clamsmtpd.conf \
 		${WRKSRC}/doc/clamsmtpd.conf.5 \
 		${WRKSRC}/src/clamsmtpd.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${STAGEDIR}${PREFIX}/etc/clamsmtpd.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/virus_action.sh ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 7f8c3829a8f9..9d657be48c0e 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	clamtk
 PORTVERSION=	6.14
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	security
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	GTK front-end for Clam Antivirus
 WWW=		https://dave-theunsub.github.io/clamtk/
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
 		p5-Text-CSV>=0:textproc/p5-Text-CSV \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
 		p5-JSON>=0:converters/p5-JSON \
 		clamscan:security/clamav \
 		p5-libwww>=5.822:www/p5-libwww \
 		p5-Gtk3>=0:x11-toolkits/p5-Gtk3 \
 		gnome-icon-theme>=0:misc/gnome-icon-theme \
 		icons-tango>0:x11-themes/icons-tango
 
 NO_BUILD=	yes
 USES=		gettext-runtime:run perl5 shebangfix
 USE_PERL5=	run
 USE_GITHUB=	yes
 GH_ACCOUNT=	dave-theunsub
 GH_TAGNAME=	1f026f0
 SHEBANG_FILES=	clamtk
 
 LINGUAS=	`${LS} ${WRKSRC}/po/*.mo | ${XARGS} ${BASENAME} -s .mo`
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g ; \
 		 s|/usr/share|${PREFIX}/share|g ; \
 		 s|/var/lib/clamav|/var/db/clamav|g' ${WRKSRC}/lib/*.pm
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ClamTk
 	${INSTALL_DATA} ${WRKSRC}/lib/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ClamTk
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in CHANGES DISCLAIMER README.md
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/maia/Makefile b/security/maia/Makefile
index 3e109079405a..996471ae9fe5 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -1,337 +1,337 @@
 PORTNAME=	maia
 DISTVERSION=	1.0.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
 
 MAINTAINER=	ek@purplehat.org
 COMMENT=	Web-based management system based on amavisd-new and SpamAssassin
 WWW=		http://www.maiamailguard.com/
 
 LICENSE=GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Syslog \
 		p5-MIME-Tools>=4.116:mail/p5-MIME-Tools \
 		p5-Convert-TNEF>=0.08:converters/p5-Convert-TNEF \
 		p5-Convert-UUlib>=1.08,1:converters/p5-Convert-UUlib \
 		p5-Net-CIDR-Lite>=0.18:net/p5-Net-CIDR-Lite \
 		p5-forks>=0.34:devel/p5-forks \
 		p5-Archive-Zip>=0.10:archivers/p5-Archive-Zip \
 		p5-IO-Stringy>=1.203:devel/p5-IO-Stringy \
 		p5-IO-Socket-INET6>=1.27:net/p5-IO-Socket-INET6 \
 		p5-Text-CSV>=1.02:textproc/p5-Text-CSV \
 		p5-Data-UUID>=1.148:devel/p5-Data-UUID \
 		p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \
 		p5-Net-Server>=0.93:net/p5-Net-Server
 
 USES=		perl5 shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
 GH_PROJECT=	maia_mailguard
 GH_TAGNAME=	48df5fb
 USE_PERL5=	run
 NO_ARCH=	yes
 NO_BUILD=	yes
 DOCS=	LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist
 USERS=	vscan
 GROUPS=	vscan
 MAIAHOME=	/var/maiad
 MAIAQUARANTINE?=	/var/maiad/virusmails
 PEAR_DIR?=	${LOCALBASE}/share/pear
 PLIST_SUB+=	USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX WEBHOST MYSQL LOCAL PGSQL \
 		DOVECOT2 POSTFIX PFA CLAMAV SPAMASSASSIN BDB CRYPT \
 		IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \
 		RPM ZOO UNZOO LZOP TNEF DOCS
 
 OPTIONS_DEFAULT=	MYSQL CLAMAV DOCS SPAMASSASSIN BDB IPCOUNTRY \
 			DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM ZOO
 
 APACHE_DESC=		Use Apache web server
 LIGHTTPD_DESC=		Use LighTTPD web server
 NGINX_DESC=			Use Nginx web server
 WEBHOST_DESC=		PHP, PEAR, etc... for Maia web interface
 MYSQL_DESC=		Use MySQL
 LOCAL_DESC=		All services/databases hosted locally
 PGSQL_DESC=		Use PgSQL
 DOVECOT2_DESC=		Use Dovecot 2.x IMAP/POP3
 POSTFIX_DESC=		Use Postfix MTA
 PFA_DESC=		Use Postfixadmin
 CLAMAV_DESC=		Use ClamAV anti-virus
 SPAMASSASSIN_DESC=	Use SpamAssassin
 BDB_DESC=		Use BerkeleyDB
 CRYPT_DESC=		Encryption support
 IPCOUNTRY_DESC=		SpamAssassin IP Country plugin
 DOMAINKEYS_DESC=	SpamAssassin DomainKey plugin
 SPF_DESC=		SpamAssassin SPF plugin
 DKIM_DESC=		SpamAssassin DKIM plugin
 FILE_DESC=		Use newer file(1) utility from ports
 RAR_DESC=		RAR support with archivers/rar
 UNRAR_DESC=		RAR support with archivers/unrar
 ARJ_DESC=		ARJ support with archivers/arj
 UNARJ_DESC=		ARJ support with archivers/unarj
 LHA_DESC=		LHA support with archivers/lha
 ARC_DESC=		ARC support with archivers/arc
 NOMARCH_DESC=		ARC support with archivers/nomarch
 CAB_DESC=		CAB support with archivers/cabextract
 RPM_DESC=		RPM support with archivers/rpm2cpio
 ZOO_DESC=		ZOO support with archivers/zoo
 UNZOO_DESC=		ZOO support with archivers/unzoo
 LZOP_DESC=		LZOP support with archivers/lzop
 TNEF_DESC=		Add external tnef decoder
 
 SUB_FILES=	maiad pkg-message
 SHEBANG_FILES=	maiad
 SUB_LIST+=	USERS=${USERS} \
 		GROUPS=${GROUPS} \
 		MAIAHOME=${MAIAHOME} \
 		MAIAQUARANTINE=${MAIAQUARANTINE} \
 		ETCDIR=${ETCDIR}
 USE_RC_SUBR+=	maiad
 
 .include <bsd.port.options.mk>
 
 # Code is a bit fiddly here; we can't use USE variables after pre.mk so we have
 # to duplicate some WITH_ parts like WEBHOST that use pre.mk vars as well as
 # setting USE_ variables. C'est la vie.
 
 .if ${PORT_OPTIONS:MAPACHE}
 USES+=		apache:run,2.4+
 .endif
 
 .if ${PORT_OPTIONS:MWEBHOST}
 USES+=	php
 USE_PHP=	bcmath ctype dom gettext hash iconv imap json mbstring \
 		mcrypt pdo pdo_sqlite posix session simplexml sockets \
 		sqlite3 tokenizer xml xmlreader xmlwriter xmlrpc
 
 RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
 		${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \
 		${PEAR_DIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
 		${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR} \
 		${PEAR_DIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
 		${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3@${PHP_FLAVOR} \
 		${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} \
 		${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color@${PHP_FLAVOR} \
 		${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas@${PHP_FLAVOR} \
 		${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph@${PHP_FLAVOR} \
 		${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \
 		${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \
 		${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
 		${PEAR_DIR}/MDB2/Driver/mysqli.php:databases/pear-MDB2_Driver_mysqli@${PHP_FLAVOR} \
 		${LOCALBASE}/share/smarty3-${PHP_FLAVOR}/Smarty.class.php:www/smarty3@${PHP_FLAVOR} \
 		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR}
 PLIST_SUB+=	WEBHOST=""
 .else
 PLIST_SUB+=	WEBHOST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MLOCAL}
 USES+=		mysql:server,client
 RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MLOCAL}
 USES+=	mysql:client
 RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST}
 USE_PHP+=	mysqli
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} && ${PORT_OPTIONS:MLOCAL}
 USES+=		pgsql
 WANT_PGSQL=	server
 RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MLOCAL}
 USES+=		pgsql
 RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} && ${PORT_OPTIONS:MWEBHOST}
 USE_PHP+=	pgsql
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
 RUN_DEPENDS+=	nginx:www/nginx
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
 RUN_DEPENDS+=	dovecot:mail/dovecot
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX}
 RUN_DEPENDS+=	postfix:mail/postfix
 .endif
 
 .if ${PORT_OPTIONS:MPFA}
 USES+=	php
 RUN_DEPENDS+=	postfixadmin-${PHP_FLAVOR}>=0:mail/postfixadmin
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 RUN_DEPENDS+=	clamd:security/clamav
 .endif
 
 .if ${PORT_OPTIONS:MSPAMASSASSIN}
 RUN_DEPENDS+=	spamassassin>=0:mail/spamassassin
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 RUN_DEPENDS+=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 .endif
 
 .if ${PORT_OPTIONS:MCRYPT}
 RUN_DEPENDS+=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
 		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
 		p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 .endif
 
 .if ${PORT_OPTIONS:MIPCOUNTRY}
 RUN_DEPENDS+=	p5-IP-Country>=0:net/p5-IP-Country
 .endif
 
 .if ${PORT_OPTIONS:MDOMAINKEYS}
 RUN_DEPENDS+=	p5-Mail-DomainKeys>=0:mail/p5-Mail-DomainKeys
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
 RUN_DEPENDS+=	p5-Mail-SPF>=0:mail/p5-Mail-SPF
 .endif
 
 .if ${PORT_OPTIONS:MDKIM}
 RUN_DEPENDS+=	p5-Mail-DKIM>=0:mail/p5-Mail-DKIM
 .endif
 
 .if ${PORT_OPTIONS:MFILE}
 # security fix, file > 4.21 needed
 RUN_DEPENDS+=	file>=4.21:sysutils/file
 .endif
 
 # archivers/rar is a 32-bit binary port, we don't want the install to fail
 # at that port, therefore we will block instantly here if the platform does
 # not suit rar.
 .if ${PORT_OPTIONS:MRAR}
 IA32_BINARY_PORT=	yes
 RUN_DEPENDS+=	rar:archivers/rar
 .endif
 
 .if ${PORT_OPTIONS:MUNRAR}
 RUN_DEPENDS+=	unrar:archivers/unrar
 .endif
 
 .if ${PORT_OPTIONS:MARJ}
 RUN_DEPENDS+=	arj:archivers/arj
 .endif
 
 .if ${PORT_OPTIONS:MUNARJ}
 RUN_DEPENDS+=	unarj:archivers/unarj
 .endif
 
 .if ${PORT_OPTIONS:MLHA}
 RUN_DEPENDS+=	lha:archivers/lha
 .endif
 
 .if ${PORT_OPTIONS:MARC}
 RUN_DEPENDS+=	arc:archivers/arc
 .endif
 
 .if ${PORT_OPTIONS:MNOMARCH}
 RUN_DEPENDS+=	nomarch:archivers/nomarch
 .endif
 
 .if ${PORT_OPTIONS:MCAB}
 RUN_DEPENDS+=	cabextract:archivers/cabextract
 .endif
 
 .if ${PORT_OPTIONS:MRPM}
 RUN_DEPENDS+=	rpm2cpio.pl:archivers/rpm2cpio
 .endif
 
 .if ${PORT_OPTIONS:MZOO}
 # DOS condition in 2.10.1_2
 RUN_DEPENDS+=	zoo>=2.10.1_2:archivers/zoo
 .endif
 
 .if ${PORT_OPTIONS:MUNZOO}
 RUN_DEPENDS+=	unzoo>=4.4_1:archivers/unzoo
 .endif
 
 .if ${PORT_OPTIONS:MLZOP}
 RUN_DEPENDS+=	lzop:archivers/lzop
 .endif
 
 .if ${PORT_OPTIONS:MTNEF}
 RUN_DEPENDS+=	tnef:converters/tnef
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .for m in scripts/configtest.pl scripts/expire-quarantine-cache.pl \
 	scripts/load-sa-rules.pl scripts/maiadbtool.pl \
 	scripts/process-quarantine.pl scripts/resend.pl scripts/send-quarantine-digests.pl \
 	scripts/send-quarantine-reminders.pl scripts/stats-snapshot.pl
 	@${REINPLACE_CMD} -e "s|/etc/maia/maia.conf|${ETCDIR}/maia.conf|" \
 		${WRKSRC}/${m}
 .endfor
 
 .for i in digest.tpl newuser.tpl reminder.tpl
 	${MV} ${WRKSRC}/templates/${i} ${WRKSRC}/templates/${i}.dist
 .endfor
 
 	@${REINPLACE_CMD} -e "s|daemon_user  = 'maia'|daemon_user  = '${USERS}'|" \
 		-e "s|daemon_group = 'maia'|daemon_group = '${GROUPS}'|" \
 		-e "s|/var/lib/maia|${MAIAHOME}|" \
 		${WRKSRC}/maiad.conf.dist
 
 	@${REINPLACE_CMD} -e "s|/etc/maia.conf|${ETCDIR}/maia.conf|" \
 		-e "s|username = 'maia'|username = '${USERS}'|" \
 		-e "s|/var/lib/maia|${DATADIR}|" \
 		-e "s|/usr/bin/sa-learn|${PREFIX}/bin/sa-learn|" \
 		-e "s|local_cf_dir = undef|local_cf_dir = '${PREFIX}/etc/mail/spamassassin'|" \
 		-e "s|user_rules_dir = undef|user_rules_dir = '${MAIAHOME}/.spamassassin'|" \
 		-e "s|template_dir = '/etc/maia/templates/'|template_dir = '${ETCDIR}/templates/'|" \
 		${WRKSRC}/maia.conf.dist
 
 	@${REINPLACE_CMD} -e "s|/etc/maia/maiad.conf|${ETCDIR}/maiad.conf|" \
 		-e "s|/var/lib/maia|${DATADIR}|" \
 		${WRKSRC}/maiad
 
 	@${FIND} -E ${WRKSRC} -iregex '.*(bak|~)$$' -delete
 	@${FIND} -E ${WRKSRC} -iregex '.*(gitkeep|~)$$' -delete
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web
 	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
 	${MKDIR} ${STAGEDIR}${ETCDIR}/templates
 .for i in digest.tpl newuser.tpl reminder.tpl
 	${INSTALL} -m 644 ${WRKSRC}/templates/${i}.dist ${STAGEDIR}${ETCDIR}/templates
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/maiad ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL} -m 640 ${WRKSRC}/maiad.conf.dist ${STAGEDIR}${ETCDIR}/maiad.conf.dist
 	${INSTALL} -m 640 ${WRKSRC}/maia.conf.dist ${STAGEDIR}${ETCDIR}/maia.conf.dist
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 70fa6d5febbd..42dcde36e53b 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	File-Scan-ClamAV
 PORTVERSION=	1.95
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for the clamav virus scanner
 WWW=		http://www.clamav.net/
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	clamscan:security/clamav
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/security/proftpd-mod_clamav/Makefile b/security/proftpd-mod_clamav/Makefile
index 2efe79652547..2994abe403a0 100644
--- a/security/proftpd-mod_clamav/Makefile
+++ b/security/proftpd-mod_clamav/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	mod_clamav
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.14rc2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security ftp
 PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	ClamAV ProFTPD module
 WWW=		https://github.com/jbenden/mod_clamav
 
 LICENSE=	GPLv2
 
 DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
 GIT_REVISION=	c8586c7
 
 RUN_DEPENDS+=	clamd:security/clamav
 _PROFTPD_MODULE_DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}:clamav
 _PROFTPD_MODULE_EXTRACT_ONLY=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}
 _PROFTPD_MODULE_MASTER_SITES=	https://codeload.github.com/jbenden/mod_clamav/legacy.tar.gz/v${DISTVERSION}?dummy=/:clamav
 
 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib
 
 _BUILDING_PROFTPD_MODULE=	${PORTNAME}
 
 post-extract:
 	@${CP} ${WRKDIR}/jbenden-mod_clamav-${GIT_REVISION}/mod_clamav.* ${WRKSRC}/contrib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile
index bf9a8402595f..5c24e4daeea6 100644
--- a/www/c-icap-modules/Makefile
+++ b/www/c-icap-modules/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	c-icap
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.5.x/
 PKGNAMESUFFIX=	-modules
 DISTNAME=	c_icap_modules-${PORTVERSION}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Modules for c-icap: virus_scan and srv_url_check
 WWW=		http://c-icap.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicapapi.so:www/c-icap \
 		libclamav.so:security/clamav
 
 USES=		libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--with-c-icap=${LOCALBASE} \
 		--with-clamav=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 DATADIR=	${PREFIX}/share/c_icap
 
 CFLAGS+=	-DHAVE_STRNSTR
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/c-icap
 
 .include <bsd.port.mk>
diff --git a/www/e2guardian/Makefile b/www/e2guardian/Makefile
index d9a39ed3108d..b501d663ddc7 100644
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	e2guardian
 PORTVERSION=	5.3.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	marcellocoutinho@gmail.com
 COMMENT=	Dansguardian fork with many improvements and bug fixes
 WWW=		http://e2guardian.org
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		autoreconf compiler:c++11-lang libtool localbase pkgconfig \
 		python
 USE_GITHUB=	yes
 
 USE_CXXSTD=	c++11
 USE_RC_SUBR=	e2guardian
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-logdir=/var/log \
 		--with-piddir=/var/run
 
 OPTIONS_RADIO=	AV
 OPTIONS_RADIO_AV=AVAST CLAMD KAV
 OPTIONS_DEFINE=	CLISCAN ICAP NTLM DNS EMAIL DEBUG DOCS SSL_MITM
 OPTIONS_DEFAULT=CLAMD DNS
 OPTIONS_SUB=	yes
 
 CLISCAN_DESC=	Enable support for CLI content scanners
 CLAMD_DESC=	Enable ClamD AV content scanner
 ICAP_DESC=	Enable ICAP AV content scanner support
 KAV_DESC=	Enable Kaspersky AV support
 AVAST_DESC=	Enable AvastD content scanner
 NTLM_DESC=	Include NTLM authentication plugin
 DNS_DESC=	Include DNS authetication plugin
 EMAIL_DESC=	Enable e-mail reporting support
 DEBUG_DESC=	Enable debug build mode
 SSL_MITM_DESC=	Enable support for the SSL MITM plugin
 
 CONFDIR=	${PREFIX}/etc/e2guardian
 
 CLISCAN_CONFIGURE_ENABLE=	commandline
 CLAMD_CONFIGURE_ENABLE=		clamd
 CLAMD_RUN_DEPENDS=		clamav>=0:security/clamav
 ICAP_CONFIGURE_ENABLE=		icap
 KAV_CONFIGURE_ENABLE=		kavd
 AVAST_CONFIGURE_ENABLE=		avastd
 NTLM_CONFIGURE_ENABLE=		ntlm
 NTLM_USES=			iconv
 DNS_CONFIGURE_ENABLE=		dnsauth
 EMAIL_CONFIGURE_ENABLE=		email
 DEBUG_CONFIGURE_OFF=		--with-dgdebug=off --with-newdebug=off
 DEBUG_CONFIGURE_ON=		--with-dgdebug=on --with-newdebug=on
 SSL_MITM_USES=			ssl
 SSL_MITM_CONFIGURE_ENABLE=	sslmitm
 SSL_MITM_CONFIGURE_ENV=		OPENSSL_LIBS="-lssl -lcrypto" \
 				OPENSSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \
     ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN} || \
     ${PORT_OPTIONS:MAVAST}
 PLIST_SUB+=	SCANNERS=""
 .else
 PLIST_SUB+=	SCANNERS="@comment "
 .endif
 
 SUB_FILES=	pkg-message
 
 post-install:
 	@${FIND} ${STAGEDIR}${ETCDIR} -type f \
 		\( -name '*.conf' -or -name '*list' -or -name '*.story' \) \
 		-exec ${MV} {} {}.sample \;
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/authplugins/ipgroups \
 		${STAGEDIR}${ETCDIR}/lists/authplugins/ipgroups.sample
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups \
 		${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups.sample
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/bannedrooms/default \
 		${STAGEDIR}${ETCDIR}/lists/bannedrooms/default.sample
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/domainsnobypass \
 		${STAGEDIR}${ETCDIR}/lists/domainsnobypass.sample
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/ipnobypass \
 		${STAGEDIR}${ETCDIR}/lists/ipnobypass.sample
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/urlnobypass \
 		${STAGEDIR}${ETCDIR}/lists/urlnobypass.sample
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/lists/contentscanners
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/exceptionvirusextensionlist.sample \
 		${STAGEDIR}${ETCDIR}/lists/contentscanners/
 	@${MV} ${STAGEDIR}${ETCDIR}/lists/exceptionvirussiteiplist.sample \
 		${STAGEDIR}${ETCDIR}/lists/contentscanners/
 
 .include <bsd.port.mk>