diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index e2d65850c35f..89deab0ae110 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-mysql
 
 COMMENT=	MySQL support for the Courier authentication library
 CATEGORIES=	databases mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index affdc8daa96a..a50cbe4eee87 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/databases/courier-authlib-pgsql/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-pgsql
 
 COMMENT=	PostgreSQL support for the Courier authentication library
 CATEGORIES=	databases mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-sqlite/Makefile b/databases/courier-authlib-sqlite/Makefile
index d101942b6ac9..576eb2bf1782 100644
--- a/databases/courier-authlib-sqlite/Makefile
+++ b/databases/courier-authlib-sqlite/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-sqlite
 
 COMMENT=	SQLite support for the Courier authentication library
 CATEGORIES=	databases mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index fc72491b8cf8..ede6ad4f7787 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/Makefile
@@ -1,11 +1,11 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-userdb
 
 COMMENT=	Userdb support for the Courier authentication library
 CATEGORIES=	databases mail
 
 CONFLICTS_INSTALL=	courier-authlib-usergdbm # lib/courier-authlib/libauthuserdb.so
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index 814d58f99334..aac9214a1067 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/Makefile
@@ -1,11 +1,11 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-usergdbm
 
 COMMENT=	Userdb support for the Courier authentication library
 CATEGORIES=	databases mail
 
 CONFLICTS_INSTALL=	courier-authlib-userdb # lib/courier-authlib/libauthuserdb.so
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/courier-unicode/Makefile b/devel/courier-unicode/Makefile
index 50b9e9875742..003462fb8fdb 100644
--- a/devel/courier-unicode/Makefile
+++ b/devel/courier-unicode/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	courier-unicode
-PORTVERSION=	2.2.6
+PORTVERSION=	2.3.0
 CATEGORIES=	devel mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Courier implementation of Unicode Standard related algorithms
 WWW=		https://www.courier-mta.org/unicode/
 
 LICENSE=	GPLv3
 
 USES=		compiler:c++11-lang iconv libtool localbase:ldflags \
 		perl5 tar:bzip2
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/courier-unicode/distinfo b/devel/courier-unicode/distinfo
index dd0af4c90675..238b84b49285 100644
--- a/devel/courier-unicode/distinfo
+++ b/devel/courier-unicode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670179507
-SHA256 (courier-unicode-2.2.6.tar.bz2) = 513f68066ed192ace630f601984c565b5c1d1c81d98c6478ebe4edb3a15be03a
-SIZE (courier-unicode-2.2.6.tar.bz2) = 598551
+TIMESTAMP = 1704477082
+SHA256 (courier-unicode-2.3.0.tar.bz2) = c9d9a7d368baa216d109c42389964946f988ac919460d7a3828bf99b7e50820d
+SIZE (courier-unicode-2.3.0.tar.bz2) = 657354
diff --git a/devel/courier-unicode/pkg-plist b/devel/courier-unicode/pkg-plist
index f8c170fdde1c..e6874c7a3574 100644
--- a/devel/courier-unicode/pkg-plist
+++ b/devel/courier-unicode/pkg-plist
@@ -1,135 +1,156 @@
 include/courier-unicode-categories-tab.h
 include/courier-unicode-script-tab.h
 include/courier-unicode.h
 lib/libcourier-unicode.a
 lib/libcourier-unicode.so
-lib/libcourier-unicode.so.7
-lib/libcourier-unicode.so.7.0.0
+lib/libcourier-unicode.so.8
+lib/libcourier-unicode.so.8.0.0
 man/man3/unicode::bidi.3.gz
 man/man3/unicode::bidi_calc.3.gz
 man/man3/unicode::bidi_calc_types.3.gz
 man/man3/unicode::bidi_cleanup.3.gz
 man/man3/unicode::bidi_combinings.3.gz
 man/man3/unicode::bidi_embed.3.gz
 man/man3/unicode::bidi_embed_paragraph_level.3.gz
 man/man3/unicode::bidi_get_direction.3.gz
 man/man3/unicode::bidi_logical_order.3.gz
 man/man3/unicode::bidi_needs_embed.3.gz
 man/man3/unicode::bidi_override.3.gz
 man/man3/unicode::bidi_reorder.3.gz
 man/man3/unicode::canonical.3.gz
 man/man3/unicode::compose.3.gz
 man/man3/unicode::compose_default_callback.3.gz
 man/man3/unicode::decompose.3.gz
 man/man3/unicode::decompose_default_reallocate.3.gz
 man/man3/unicode::iconvert::convert.3.gz
 man/man3/unicode::iconvert::convert_tocase.3.gz
 man/man3/unicode::iconvert::fromu.3.gz
 man/man3/unicode::iconvert::tou.3.gz
 man/man3/unicode::iso_8859_1.3.gz
 man/man3/unicode::linebreak_callback_base.3.gz
 man/man3/unicode::linebreak_callback_save_buf.3.gz
 man/man3/unicode::linebreak_iter.3.gz
 man/man3/unicode::linebreakc_callback_base.3.gz
 man/man3/unicode::linebreakc_iter.3.gz
 man/man3/unicode::tolower.3.gz
 man/man3/unicode::toupper.3.gz
 man/man3/unicode::ucs_2.3.gz
 man/man3/unicode::ucs_4.3.gz
 man/man3/unicode::utf_8.3.gz
 man/man3/unicode::wordbreak.3.gz
 man/man3/unicode::wordbreak_callback_base.3.gz
 man/man3/unicode_bidi.3.gz
 man/man3/unicode_bidi_bracket_type.3.gz
 man/man3/unicode_bidi_calc.3.gz
 man/man3/unicode_bidi_calc_levels.3.gz
 man/man3/unicode_bidi_calc_types.3.gz
 man/man3/unicode_bidi_cleaned_size.3.gz
 man/man3/unicode_bidi_cleanup.3.gz
 man/man3/unicode_bidi_combinings.3.gz
 man/man3/unicode_bidi_direction.3.gz
 man/man3/unicode_bidi_embed.3.gz
 man/man3/unicode_bidi_embed_paragraph_level.3.gz
 man/man3/unicode_bidi_logical_order.3.gz
 man/man3/unicode_bidi_mirror.3.gz
 man/man3/unicode_bidi_needs_embed.3.gz
 man/man3/unicode_bidi_reorder.3.gz
 man/man3/unicode_bidi_setbnl.3.gz
 man/man3/unicode_bidi_type.3.gz
 man/man3/unicode_canonical.3.gz
 man/man3/unicode_category_lookup.3.gz
 man/man3/unicode_ccc.3.gz
 man/man3/unicode_compose.3.gz
 man/man3/unicode_composition_apply.3.gz
 man/man3/unicode_composition_deinit.3.gz
 man/man3/unicode_composition_init.3.gz
 man/man3/unicode_convert.3.gz
 man/man3/unicode_convert_deinit.3.gz
 man/man3/unicode_convert_fromu_init.3.gz
 man/man3/unicode_convert_fromu_tobuf.3.gz
 man/man3/unicode_convert_fromutf8.3.gz
 man/man3/unicode_convert_init.3.gz
 man/man3/unicode_convert_tobuf.3.gz
 man/man3/unicode_convert_tocase.3.gz
 man/man3/unicode_convert_tocbuf_fromutf8_init.3.gz
 man/man3/unicode_convert_tocbuf_init.3.gz
 man/man3/unicode_convert_tocbuf_toutf8_init.3.gz
 man/man3/unicode_convert_tou_init.3.gz
 man/man3/unicode_convert_tou_tobuf.3.gz
 man/man3/unicode_convert_toutf8.3.gz
 man/man3/unicode_convert_uc.3.gz
 man/man3/unicode_decompose.3.gz
 man/man3/unicode_decompose_reallocate_size.3.gz
 man/man3/unicode_decomposition_deinit.3.gz
 man/man3/unicode_decomposition_init.3.gz
 man/man3/unicode_default_chset.3.gz
+man/man3/unicode_derived_case_ignorable_lookup.3.gz
+man/man3/unicode_derived_cased_lookup.3.gz
+man/man3/unicode_derived_changes_when_casefolded_lookup.3.gz
+man/man3/unicode_derived_changes_when_casemapped_lookup.3.gz
+man/man3/unicode_derived_changes_when_lowercased_lookup.3.gz
+man/man3/unicode_derived_changes_when_titlecased_lookup.3.gz
+man/man3/unicode_derived_changes_when_uppercased_lookup.3.gz
+man/man3/unicode_derived_core_properties.3.gz
+man/man3/unicode_derived_default_ignorable_code_point_lookup.3.gz
+man/man3/unicode_derived_grapheme_base_lookup.3.gz
+man/man3/unicode_derived_grapheme_extend_lookup.3.gz
+man/man3/unicode_derived_grapheme_link_lookup.3.gz
+man/man3/unicode_derived_id_continue_lookup.3.gz
+man/man3/unicode_derived_id_start_lookup.3.gz
+man/man3/unicode_derived_incb_lookup.3.gz
+man/man3/unicode_derived_lowercase_lookup.3.gz
+man/man3/unicode_derived_math_lookup.3.gz
+man/man3/unicode_derived_uppercase_lookup.3.gz
+man/man3/unicode_derived_xid_continue_lookup.3.gz
+man/man3/unicode_derived_xid_start_lookup.3.gz
 man/man3/unicode_emoji.3.gz
 man/man3/unicode_emoji_component.3.gz
 man/man3/unicode_emoji_extended_pictographic.3.gz
 man/man3/unicode_emoji_lookup.3.gz
 man/man3/unicode_emoji_modifier.3.gz
 man/man3/unicode_emoji_modifier_base.3.gz
 man/man3/unicode_emoji_presentation.3.gz
+man/man3/unicode_general_category_lookup.3.gz
 man/man3/unicode_grapheme_break.3.gz
 man/man3/unicode_grapheme_break_deinit.3.gz
 man/man3/unicode_grapheme_break_init.3.gz
 man/man3/unicode_grapheme_break_next.3.gz
 man/man3/unicode_html40ent_lookup.3.gz
 man/man3/unicode_isalnum.3.gz
 man/man3/unicode_isalpha.3.gz
 man/man3/unicode_isblank.3.gz
 man/man3/unicode_isdigit.3.gz
 man/man3/unicode_isgraph.3.gz
 man/man3/unicode_islower.3.gz
 man/man3/unicode_ispunct.3.gz
 man/man3/unicode_isspace.3.gz
 man/man3/unicode_isupper.3.gz
 man/man3/unicode_lb_end.3.gz
 man/man3/unicode_lb_init.3.gz
 man/man3/unicode_lb_next.3.gz
 man/man3/unicode_lb_next_cnt.3.gz
 man/man3/unicode_lb_set_opts.3.gz
 man/man3/unicode_lbc_end.3.gz
 man/man3/unicode_lbc_init.3.gz
 man/man3/unicode_lbc_next.3.gz
 man/man3/unicode_lbc_next_cnt.3.gz
 man/man3/unicode_lbc_set_opts.3.gz
 man/man3/unicode_lc.3.gz
 man/man3/unicode_line_break.3.gz
 man/man3/unicode_locale_chset.3.gz
 man/man3/unicode_script.3.gz
 man/man3/unicode_tc.3.gz
 man/man3/unicode_u_ucs2_native.3.gz
 man/man3/unicode_u_ucs4_native.3.gz
 man/man3/unicode_uc.3.gz
 man/man3/unicode_wb_end.3.gz
 man/man3/unicode_wb_init.3.gz
 man/man3/unicode_wb_next.3.gz
 man/man3/unicode_wb_next_cnt.3.gz
 man/man3/unicode_wbscan_end.3.gz
 man/man3/unicode_wbscan_init.3.gz
 man/man3/unicode_wbscan_next.3.gz
 man/man3/unicode_word_break.3.gz
 man/man7/courier-unicode.7.gz
 share/aclocal/courier-unicode-version.m4
 share/aclocal/courier-unicode.m4
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index f06fcb399dc3..8c2865c22d70 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	cone
 DISTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
 #		http://www.lerctr.org/~ler/
 # This is for release versions, leave it in please:
 MASTER_SITES=	SF/courier/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 WWW=		https://www.courier-mta.org/cone/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 BUILD_DEPENDS=	gnupg>0:security/gnupg
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		libcourier-unicode.so:devel/courier-unicode \
 		libidn2.so:dns/libidn2
 RUN_DEPENDS=	gnupg>0:security/gnupg
 
 USES=		compiler:c++11-lang fam gettext gmake gnome iconv ldap:24 \
 		localbase:ldflags ncurses perl5 pkgconfig shebangfix ssl \
 		tar:bzip2
 USE_GNOME=	libxml2
 
 SHEBANG_FILES=	sysconftool
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
 		--with-certdb=${PREFIX}/share/cone/rootcerts \
 		--with-notice=unicode
 
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
 	@${RM} ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index 80a62713ca53..5e0d1307a2f1 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-vchkpw
 
 COMMENT=	Vpopmail/vchkpw support for the Courier authentication library
 CATEGORIES=	mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 5e27d6fc390e..000d0f8fc95a 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,134 +1,135 @@
 PORTNAME=	courier-imap
 PORTVERSION=	5.2.6
 PORTEPOCH=	2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 WWW=		https://www.courier-mta.org/imap/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
 		libcourierauth.so:security/courier-authlib-base \
 		libidn2.so:dns/libidn2 \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
 		tar:bzip2
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
 CONFLICTS=	courier imap-uw panda-imap
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
 ALL_TARGET=	all makeimapaccess makedat
 
 SUB_FILES=	pkg-message
 SUB_LIST=	CONFDIR=${CONFDIR}
 
 #
 # options available:
 #
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
 OPTIONS_DEFINE=	GDBM GNUTLS INOTIFY IPV6 TRASHQUOTA
 
 GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
 INOTIFY_DESC=	Inotify support for IDLE command
 TRASHQUOTA_DESC=	Include deleted mails in the quota
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
 .endif
 
 CONFDIR?=	${PREFIX}/etc/${PORTNAME}
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--localstatedir="${PREFIX}/var" \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--enable-workarounds-for-imap-client-bugs \
 		--enable-unicode \
 		--disable-root-check \
 		--with-locking-method=fcntl \
 		--with-notice=unicode
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_USES=		pkgconfig
 
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 IPV6_CONFIGURE_OFF=	--without-ipv6
 
 TRASHQUOTA_CONFIGURE_ON=--with-trashquota
 
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG_FACILITY}
 CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
 .endif
 
 EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		libs/imap/ChangeLog \
 		libs/imap/README.proxy \
 		libs/maildir/README.imapkeywords.html \
 		libs/maildir/README.maildirfilter.html \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt \
 		libs/tcpd/README.couriertls \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/libs/liblock/configure
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
 		-e 's|@LN_S@|${RLN}|' \
 		${WRKSRC}/Makefile.in
 
 post-patch-INOTIFY-on:
 	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& ${LOCALBASE}/lib/libinotify.a /usr/lib/libpthread.a|' \
 		${WRKSRC}/libs/maildir/Makefile.in \
 		${WRKSRC}/libs/imap/Makefile.in
 
 post-configure-INOTIFY-on:
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 8b2f31d8ac4f..61f94d1ed238 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -1,394 +1,394 @@
 PORTNAME=	courier
 PORTVERSION=	1.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	bsd@dino.sk
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 WWW=		https://www.Courier-MTA.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		wget:ftp/wget
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libpcre.so:devel/pcre \
 		libgdbm.so:databases/gdbm \
 		libcourier-unicode.so:devel/courier-unicode \
 		libpcre2-8.so:devel/pcre2
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool \
 		${LOCALBASE}/etc/mime.types:misc/mime-support \
 		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
 		ca_root_nss>=3.*:security/ca_root_nss \
 		${LOCALBASE}/bin/wget:ftp/wget
 CONFLICTS=	courier-imap-2.* couriermlm-0.* \
 		exim-4.* maildrop-1.* \
 		panda-imap-201* postfix-1.* postfix-2.* \
 		qmail-*-1.* qmail-1.* \
 		sendmail-*-8.* sendmail-8.* \
 		smail-3.* sqwebmail-3.* \
 		zmailer-2.*
 
 #
 # User-serviceable variables
 #
 # [ There's no need to add trailing ``/''s ]
 #
 # set IMAGEURL to where on the web server URL the images are found
 # set CACHEOWN to who you'd like to own the cache files
 # set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be
 #     recomended values are: /var/mail, ./Mailbox or ./Maildir
 #
 
 IMAGEURL?=	/webmail
 CACHEOWN?=	pop
 MAILDROPDEFAULT?=./Maildir
 
 # End of user-serviceable variables
 
 MAILOWN?=	courier
 MAILGRP?=	courier
 MAILUID?=	465
 MAILGID?=	465
 ETCDIR=		${PREFIX}/etc
 SYSCONFDIR=	${ETCDIR}/courier
 LIBEXECDIR=	${PREFIX}/libexec
 LOCALSTATEDIR=	/var/spool/courier
 CACHEDIR=	/var/spool/webmail
 CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
 USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl shebangfix
 USE_SUBMAKE=	yes
 USE_RC_SUBR=	courier
 SHEBANG_FILES=	courier/filters/perlfilter/perlfilter-ratelimit.pl \
 		courier/filters/perlfilter/perlfilter-wrapper.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-root-check \
 		--with-db=gdbm \
 		--enable-syslog=1 --enable-use-flock \
 		--program-transform-name=s,^,, \
 		--enable-utf7-folder-encoding \
 		--enable-unicode \
 		--with-mailuser=${MAILOWN} \
 		--with-mailgroup=${MAILGRP} \
 		--with-mailuid=${MAILUID} \
 		--with-mailgid=${MAILGID} \
 		--with-etcdir=${ETCDIR} \
 		--sysconfdir=${SYSCONFDIR} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--localstatedir=${LOCALSTATEDIR} \
 		--enable-mimetypes=${MIMETYPES} \
 		--enable-imageurl=${IMAGEURL} \
 		--with-cachedir=${CACHEDIR} \
 		--with-cacheowner=${CACHEOWN} \
 		--with-calendardir=${CALENDIR} \
 		--with-mydatadir=${SYSCONFDIR} \
 		--with-transport='${WITH_TRANSPORT}' \
 		--with-default-maildrop=${MAILDROPDEFAULT} \
 		--with-paranoid-smtpext \
 		--enable-workarounds-for-imap-client-bugs \
 		--with-notice=unicode
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip install-perms
 
 PLIST_SUB+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
 		CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \
 		CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}" \
 		MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
 		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
 		SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}"
 
 SUB_LIST:=	${PLIST_SUB}
 SUB_FILES+=	pkg-message crontab sharedindexupdate
 
 OPTIONS_DEFINE=	LDAP PROCMAIL SENDFAX UUCP IPV6 DOCS CERTSDIR
 OPTIONS_GROUP=	WEBMAIL
 OPTIONS_GROUP_WEBMAIL=	GNUPG WEBMAILRSENT WEBMAILFLAGS WEBMAILXFACE
 OPTIONS_RADIO=	ALIASES SPELL
 OPTIONS_RADIO_ALIASES=	SYSTEMALIASES EMPTYALIASES
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_DEFAULT=WEBMAILRSENT SYSTEMALIASES
 
 LDAP_DESC=	LDAP-based mail aliasing support
 GNUPG_DESC=	GNU Privacy Guard support for WebMail
 ASPELL_DESC=	ASpell support for WebMail
 ISPELL_DESC=	ISpell support for WebMail
 PROCMAIL_DESC=	Procmail local delivery support
 SENDFAX_DESC=	mgetty+sendfax support
 UUCP_DESC=	UUCP support
 CERTSDIR_DESC=	separate .pem directory for certificates
 WEBMAILRSENT_DESC=	enable Autorename Sent folder
 WEBMAILFLAGS_DESC=	webmail show flags patch
 WEBMAILXFACE_DESC=	experimental webmail X-Face patch
 SYSTEMALIASES_DESC=	symlink system /etc/aliases
 EMPTYALIASES_DESC=	create empty aliases file
 RCCONF_DESC=	modify rc.conf to enable courier/disable sendmail
 MAILCONF_DESC=	modify mailer.conf to use courier instead of sendmail
 PERIODIC_DESC=	modify/create periodic.conf
 
 .include <bsd.port.options.mk>
 
 .include "${.CURDIR}/Makefile.doc"
 
 .if ${PORT_OPTIONS:MLDAP}
 USES+=	ldap
 WITH_AUTH_LDAP=	yes
 RUN_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
 CONFIGURE_ARGS+=--with-ldapaliasd
 PLIST_SUB+=	WITHLDAP=""
 SUB_LIST+=	WITHLDAP=""
 .else
 CONFIGURE_ARGS+=--without-ldapaliasd
 PLIST_SUB+=	WITHLDAP="@comment "
 SUB_LIST+=	WITHLDAP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSYSTEMALIASES}
 PLIST_SUB+=	WITHSYSTEMALIASES=""
 SUB_LIST+=	WITHSYSTEMALIASES=""
 .else
 PLIST_SUB+=	WITHSYSTEMALIASES="@comment "
 SUB_LIST+=	WITHSYSTEMALIASES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEMPTYALIASES}
 PLIST_SUB+=	WITHEMPTYALIASES=""
 SUB_LIST+=	WITHEMPTYALIASES=""
 .else
 PLIST_SUB+=	WITHEMPTYALIASES="@comment "
 SUB_LIST+=	WITHEMPTYALIASES="@comment "
 .endif
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MGNUPG}
 BUILD_DEPENDS+=	gpg:security/gnupg
 RUN_DEPENDS+=	gpg:security/gnupg
 .else
 # This is a hack! But works well (at least partially) for me...
 CONFIGURE_ENV+=	GPG="${WRKSRC}/fakegpg"
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
 BUILD_DEPENDS+=	aspell:textproc/aspell
 RUN_DEPENDS+=	aspell:textproc/aspell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell
 .elif ${PORT_OPTIONS:MISPELL}
 BUILD_DEPENDS+=	ispell:textproc/aspell-ispell
 RUN_DEPENDS+=	ispell:textproc/aspell-ispell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
 BUILD_DEPENDS+=	procmail:mail/procmail
 RUN_DEPENDS+=	procmail:mail/procmail
 .endif
 
 .if ${PORT_OPTIONS:MSENDFAX}
 USES+=		ghostscript
 SENDFAX_DEPENDS=sendfax:comms/mgetty+sendfax \
 		pnmscale:graphics/netpbm
 BUILD_DEPENDS+=	${SENDFAX_DEPENDS}
 RUN_DEPENDS+=	${SENDFAX_DEPENDS}
 WITH_TRANSPORT+=fax
 PLIST_SUB+=	WITHFAX=""
 SUB_LIST+=	WITHFAX=""
 .else
 PLIST_SUB+=	WITHFAX="@comment "
 SUB_LIST+=	WITHFAX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUUCP}
 .if !exists(/usr/bin/uux)
 BUILD_DEPENDS+=	uux:net/freebsd-uucp
 RUN_DEPENDS+=	uux:net/freebsd-uucp
 .endif
 WITH_TRANSPORT+=uucp
 PLIST_SUB+=	WITHUUCP=""
 .else
 PLIST_SUB+=	WITHUUCP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--with-ipv6
 .else
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILXFACE}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__msg2html.c
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILFLAGS}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__folder.c ${FILESDIR}/extra-patch-libs__sqwebmail__maildir.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__maildir.h ${FILESDIR}/extra-patch-libs__sqwebmail__images__sqwebmail.css
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILRSENT}
 CONFIGURE_ARGS+=--enable-autorenamesent
 .else
 CONFIGURE_ARGS+=--disable-autorenamesent
 .endif
 
 .if ${PORT_OPTIONS:MMAILCONF}
 SUB_LIST+=	MAILCONF="y"
 .else
 SUB_LIST+=	MAILCONF="n"
 .endif
 
 .if ${PORT_OPTIONS:MRCCONF}
 SUB_LIST+=	RCCONF="y"
 .else
 SUB_LIST+=	RCCONF="n"
 .endif
 
 .if ${PORT_OPTIONS:MPERIODIC}
 SUB_LIST+=	PERIODIC="y"
 .else
 SUB_LIST+=	PERIODIC="n"
 .endif
 
 .if ${PORT_OPTIONS:MCERTSDIR}
 CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}/.pem
 PLIST_SUB+=	WITHCERTSDIR=""
 SUB_LIST+=	CERTSDIR="${SYSCONFDIR}/.pem"
 .else
 CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}
 PLIST_SUB+=	WITHCERTSDIR="@comment "
 SUB_LIST+=	CERTSDIR="${SYSCONFDIR}"
 .endif
 
 _CNFFILES=	esmtpd.cnf \
 		imapd.cnf \
 		pop3d.cnf
 
 _DISTEXFILES=	courierd.dist \
 		esmtpd-msa.dist \
 		esmtpd-ssl.dist \
 		esmtpd.dist \
 		faxcoverpage.tr.dist \
 		faxnotifyrc.dist \
 		faxrc.dist \
 		imapd-ssl.dist \
 		imapd.dist \
 		ldapaddressbook.dist \
 		ldapaliasrc.dist \
 		pop3d-ssl.dist \
 		pop3d.dist \
 		sqwebmaild.dist \
 		webmlmrc.dist
 
 pre-everything::
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 
 pre-patch:
 	${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \
 		${WRKSRC}/webadmin/*.pl \
 		${WRKSRC}/webadmin/*.pl.in \
 		${WRKSRC}/courier/webadmin/*.pl \
 		${WRKSRC}/courier/webadmin/*.pl.in
 	${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \
 		${WRKSRC}/courier/module.*/courier.config
 	${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \
 		${WRKSRC}/*/*/mk*cert.*
 	${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*.dist.in \
 		${WRKSRC}/*/*/*.dist.in
 	${REINPLACE_CMD} -e 's|^\(TLS_DHPARAMS=\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*.dist.in \
 		${WRKSRC}/*/*/*.dist.in
 	${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*/*.cnf.openssl.in
 	${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/*/Makefile.in \
 		${WRKSRC}/*/*/Makefile.in \
 		${WRKSRC}/*/*/*/Makefile.in
 	${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \
 			-e 's|; ldapaliasd="yes"||' \
 		${WRKSRC}/configure \
 		${WRKSRC}/*/configure \
 		${WRKSRC}/*/*/configure \
 		${WRKSRC}/*/*/*/configure
 	${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root	wheel/g' \
 		${WRKSRC}/courier/perms.sh.in
 	${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \
 		${WRKSRC}/courier/module.esmtp/Makefile.in
 # Avoid conflict with C++20 <version> by adding .txt suffix
 	${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure
 	${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \
 		-i .c++20 '/^version.*cat/s,/version,&.txt,' {} +
 
 pre-configure:
 # This is a hack! But works well (at least partially) for me...
 	touch ${WRKSRC}/fakegpg
 	chmod +x ${WRKSRC}/fakegpg
 
 post-build:
 	${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \
 		    -e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \
 		    -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \
 		${WRKSRC}/*/*.authpam* \
 		${WRKSRC}/*/*/*.authpam*
 	${INSTALL} -lrs ${WRKSRC}/libs/gpglib/README.html	${WRKSRC}/libs/gpglib/README.gpglib.html
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS		${WRKSRC}/libs/imap/BUGS.imap
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS.html		${WRKSRC}/libs/imap/BUGS.imap.html
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/README.proxy	${WRKSRC}/libs/imap/README.imap.proxy
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/README.proxy.html	${WRKSRC}/libs/imap/README.imap.proxy.html
 	${INSTALL} -lrs ${WRKSRC}/libs/maildrop/README.html	${WRKSRC}/libs/maildrop/README.maildrop.html
 	${INSTALL} -lrs ${WRKSRC}/libs/pcp/README.html		${WRKSRC}/libs/pcp/README.pcp.html
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS		${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS.html	${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail.html
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY	${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY.html	${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail.html
 
 post-install:
 .for _cfgfile in ${_CNFFILES}
 	-${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.cnf/.cnf.sample/g}
 .endfor
 .for _cfgfile in ${_DISTEXFILES}
 	-${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.dist/.sample/g}
 .endfor
 	${INSTALL} -lrs ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase
 	${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${HTMLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
 .endfor
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
 .endif
 .if ${PORT_OPTIONS:MCERTSDIR}
 	${MKDIR} ${STAGEDIR}${SYSCONFDIR}/.pem
 .endif
 	${RM} -r ${STAGEDIR}${DATADIR}/htmldoc
 	${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin
 	${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier
 	${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp*
 
 .include <bsd.port.mk>
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 4933f01ccd47..6ba1f956b9c5 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,134 +1,135 @@
 # You can define the following to enable further compile time
 # customizations:
 # MAILDROP_SUID=<username>,
 # MAILDROP_SGID=<groupname>     Maildrop will be installed with suid
 #				permissions for MAILDROP_SUID, and sgid
 #				permissions for MAILDROP_SGID.
 #				NOTE: must be a valid username/groupname
 #				at installation time, numeric uids/gids
 #				and non existing users will cause the
 #				installed package to miss files.
 # MAILDROP_TRUSTED_USERS=<user> Specify users allowed to use the -d option
 # MAILDROP_LOG_COLUMNS	lenght of 'File:' line in log - 8; default: 72
 # MAILDROP_MBOX_DIR=<dir>	Specify DEFAULT mailbox location
 
 PORTNAME=	maildrop
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Mail delivery agent (MDA) with filtering abilities
 WWW=		https://www.courier-mta.org/maildrop/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcourier-unicode.so:devel/courier-unicode \
 		libidn2.so:dns/libidn2 \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++11-lang cpe iconv localbase:ldflags perl5 pkgconfig \
 		tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog=1 \
 		--enable-use-flock=1 \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildirquota
 INSTALL_TARGET=	install-strip
 
 CONFLICTS=	courier-0.65* libunicode
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
 
 FIXDOCPATH=	libs/maildir/deliverquota.8.in libs/maildir/maildir.5 \
 		libs/maildir/maildiracl.1.in libs/maildir/maildirkw.1 \
 		libs/maildir/maildirmake.1.in libs/maildir/maildirquota.7 \
 
 DOCS=	AUTHORS INSTALL INSTALL.html README README.html README.postfix \
 	UPGRADE UPGRADE.html maildroptips.txt maildir/README.*
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
 OPTIONS_MULTI_AUTHLIB:=	${OPTIONS_DEFINE:NDOCS}
 OPTIONS_DEFINE=		AUTHLIB
 OPTIONS_MULTI=		AUTHLIB
 AUTHLIB_DESC=		Courier Auth Library support
 .endif
 
 OPTIONS_DEFINE+=	DOCS DOVECOTAUTH GDBM INOTIFY MAILWRAPPER
 
 DOVECOTAUTH_DESC=	Dovecot Authentication support
 INOTIFY_DESC=		Inotify support for IDLE command
 MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
 
 OPTIONS_SUB=		yes
 DOVECOTAUTH_CONFIGURE_ENABLE=	dovecotauth
 GDBM_CONFIGURE_OFF=	--with-db=db
 GDBM_CONFIGURE_ON=	--with-db=gdbm
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 MAILWRAPPER_CONFIGURE_OFF=	--enable-sendmail=/usr/sbin/sendmail
 
 .include <bsd.port.options.mk>
 
 .if defined(MAILDROP_SUID) && defined(MAILDROP_SGID)
 CONFIGURE_ARGS+=	--enable-maildrop-uid="${MAILDROP_SUID}" --enable-maildrop-gid="${MAILDROP_SGID}"
 PLIST_SUB+=		MMODE='6755' MUID='${MAILDROP_SUID}' MGID='${MAILDROP_SGID}'
 .elif defined(MAILDROP_SUID)
 CONFIGURE_ARGS+=	--enable-maildrop-uid="${MAILDROP_SUID}"
 PLIST_SUB+=		MMODE='4755' MUID='${MAILDROP_SUID}' MGID='mail'
 .elif defined(MAILDROP_SGID)
 CONFIGURE_ARGS+=	--enable-maildrop-gid="${MAILDROP_SGID}"
 PLIST_SUB+=		MMODE='2755' MGID='${MAILDROP_SGID}' MUID='root'
 .else
 PLIST_SUB+=		MMODE='' MUID='root' MGID='mail'
 .endif
 
 .if defined(MAILDROP_MBOX_DIR)
 CONFIGURE_ARGS+=	--with-default-maildrop='${MAILDROP_MBOX_DIR}'
 .endif
 
 .if defined(MAILDROP_TRUSTED_USERS)
 CONFIGURE_ARGS+=	--enable-trusted-users="${MAILDROP_TRUSTED_USERS}"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \
 		${WRKSRC}/libs/maildrop/log.C
 .for f in ${FIXDOCPATH}
 	@${REINPLACE_CMD} -e "s|\\\%\[set \$$man\.base\.url\.for\.relative\.links\]|${DOCSDIR}|" \
 		-e "s/\(maildirmake.html\)/maildrop-\1/" \
 		-e "s/\(deliverquota.html\)/maildrop-\1/" ${WRKSRC}/${f}
 .endfor
 .if ${PORT_OPTIONS:MAUTHLIB}
 	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -L${LOCALBASE}/lib/courier-authlib|' \
 		${WRKSRC}/libs/maildrop/Makefile.in
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 BUILD_DEPENDS+=	courierauthconfig:security/courier-authlib-base
 RUN_DEPENDS+=	courierauthconfig:security/courier-authlib-base
 CONFIGURE_ARGS+=	--enable-authlib
 .else
 CONFIGURE_ARGS+=	--disable-authlib
 .endif
 
 post-patch-INOTIFY-on:
 	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& ${LOCALBASE}/lib/libinotify.a /usr/lib/libpthread.a|' \
 		${WRKSRC}/libs/maildir/Makefile.in
 
 post-configure-INOTIFY-on:
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h
 
 post-install:
 .if ${PORT_OPTIONS:MDOVECOTAUTH}
 	${INSTALL_DATA} ${WRKSRC}/README.dovecotauth ${STAGEDIR}${DOCSDIR}
 .endif
 	${INSTALL_DATA} ${WRKSRC}/libs/maildir/quotawarnmsg \
 		${STAGEDIR}${PREFIX}/etc/quotawarnmsg.sample
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS:S/maildir\//libs\/&/} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index dbe3ba36df19..7e5cd224148c 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,213 +1,214 @@
 PORTNAME=	sqwebmail
 PORTVERSION=	6.2.4
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
 WWW=		https://inter7.com/sqwebmail/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		gpg:security/gnupg
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		gpg:security/gnupg
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcourier-unicode.so:devel/courier-unicode \
 		libidn2.so:dns/libidn2
 
 CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
 CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
 
 OPTIONS_DEFINE=	CACHEDIR FAM GDBM GZIP HTTPS HTTPS_LOGIN ISPELL MIMETYPES SENTRENAME CHARSET DOCS
 OPTIONS_DEFAULT=	CACHEDIR FAM GZIP SENTRENAME
 CACHEDIR_DESC=	Cache logins
 FAM_DESC=	Build in fam support for IDLE command
 GDBM_DESC=	Use gdbm db instead of system bdb
 GZIP_DESC=	Compress messages with gzip
 HTTPS_DESC=	Generate https:// URLs for all accesses
 HTTPS_LOGIN_DESC=	Generate https:// URLs only for login
 MIMETYPES_DESC=	search for a mime.types file
 SENTRENAME_DESC=	Periodic rename the Sent folder
 CHARSET_DESC=	charsets
 FAM_USES=	fam
 
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
 
 CGIBINDIR?=	www/cgi-bin-dist
 CGIBINSUBDIR?=	sqwebmail
 WEBDATADIR?=	www/data-dist
 WEBDATASUBDIR?=	sqwebmail
 IMAGEURL?=	${WEBDATASUBDIR}
 RCDIR?=		${PREFIX}/etc/rc.d
 CACHEDIR?=	/var/sqwebmail/cache
 CACHEOWNER?=	bin
 MAILOWN?=	courier
 MAILGRP?=	courier
 
 # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr)
 # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m)
 # set WITH_AUTOPURGE to something other than 7 days
 # set WITH_MAXPURGE to something other than 90 days
 #
 # The following settings are in bytes:
 # set WITH_MAXMSGSIZE to max size of messages (including attachments)
 # set WITH_MAXARGSIZE to max size of a text message (excluding attachments)
 # set WITH_MAXFORMARGSIZE to max size of attachments
 #
 # End of user variables
 
 USES=		compiler:c++11-lang gettext gmake iconv perl5 tar:bzip2 pkgconfig
 USE_RC_SUBR=	sqwebmail-sqwebmaild
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 		--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
 		--localstatedir=/var/sqwebmail \
 		--sysconfdir=${PREFIX}/etc/sqwebmail \
 		--enable-imageurl=/${IMAGEURL} \
 		--with-locking-method=fcntl \
 		--with-libintl-prefix=${LOCALBASE} \
 		${ICONV_CONFIGURE_ARG} \
 		--cache-file=${WRKDIR}/sqwebmail.cache \
 		--with-mailuser=${MAILOWN} \
 		--with-mailgroup=${MAILGRP} \
 		--with-notice=unicode
 
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
 		CGIBINSUBDIR=${CGIBINSUBDIR} \
 		WEBDATADIR=${WEBDATADIR} \
 		WEBDATASUBDIR=${WEBDATASUBDIR} \
 		MAILOWN=${MAILOWN} \
 		MAILGRP=${MAILGRP} \
 		CACHEDIR=${CACHEDIR} \
 		CACHEOWN=${CACHEOWNER}
 
 EXTRA_DOCS=	README README.logindomainlist.html README.pam \
 		libs/sqwebmail/ChangeLog \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt
 
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ! ${PORT_OPTIONS:MCACHEDIR}
 PLIST_SUB+=		CACHE="@comment "
 CONFIGURE_ARGS+=	--without-cachedir
 .else
 PLIST_SUB+=		CACHE=""
 CONFIGURE_ARGS+=	--with-cachedir=${CACHEDIR} \
 			--with-cacheowner=${CACHEOWNER}
 .endif
 
 .if ${PORT_OPTIONS:MHTTPS_LOGIN}
 CONFIGURE_ARGS+=	--enable-https=login
 .elif ${PORT_OPTIONS:MHTTPS}
 CONFIGURE_ARGS+=	--enable-https
 .endif
 
 .if ! ${PORT_OPTIONS:MSENTRENAME}
 CONFIGURE_ARGS+=	--disable-autorenamesent
 .endif
 
 .if ! ${PORT_OPTIONS:MGZIP}
 CONFIGURE_ARGS+=	--without-gzip
 .endif
 
 .if ${PORT_OPTIONS:MISPELL}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/ispell:textproc/aspell-ispell
 RUN_DEPENDS+=		${LOCALBASE}/bin/ispell:textproc/aspell-ispell
 CONFIGURE_ARGS+=	--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=	--without-ispell
 .endif
 
 .if ${PORT_OPTIONS:MMIMETYPES}
 RUN_DEPENDS+=		${LOCALBASE}/etc/mime.types:misc/mime-support
 CONFIGURE_ARGS+=	--enable-mimetypes=${LOCALBASE}/etc
 .else
 CONFIGURE_ARGS+=	--disable-mimetypes
 .endif
 
 .if ${PORT_OPTIONS:MTIMEOUTHARD}
 CONFIGURE_ARGS+=	--enable-hardtimeout=${WITH_TIMEOUTHARD}
 .endif
 
 .if ${PORT_OPTIONS:MTIMEOUTSOFT}
 CONFIGURE_ARGS+=	--enable-softtimeout=${WITH_TIMEOUTSOFT}
 .endif
 
 .if ${PORT_OPTIONS:MMAXMSGSIZE}
 CONFIGURE_ARGS+=	--with-maxmsgsize=${WITH_MAXMSGSIZE}
 .endif
 
 .if ${PORT_OPTIONS:MMAXARGSIZE}
 CONFIGURE_ARGS+=	--with-maxargsize=${WITH_MAXARGSIZE}
 .endif
 
 .if ${PORT_OPTIONS:MMAXFORMARGSIZE}
 CONFIGURE_ARGS+=	--with-maxformargsize=${WITH_MAXFORMARGSIZE}
 .endif
 
 .if ${PORT_OPTIONS:MCHARSET}
 CONFIGURE_ARGS+=	--enable-unicode
 .endif
 
 .if ${PORT_OPTIONS:MAUTOPURGE}
 CONFIGURE_ARGS+=	--enable-autopurge=${WITH_AUTOPURGE}
 .endif
 
 .if ${PORT_OPTIONS:MMAXPURGE}
 CONFIGURE_ARGS+=	--enable-maxpurge=${WITH_MAXPURGE}
 .endif
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db
 .endif
 
 post-patch:
 .if ! ${PORT_OPTIONS:MFAM}
 	@${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \
 		${WRKSRC}/libs/maildir/configure
 .endif
 	@${REINPLACE_CMD} -e 's|LIBPCRE=-lpcre|LIBPCRE="-L${LOCALBASE}/lib -lpcre"|g' \
 		${WRKSRC}/libs/maildir/configure
 
 	@${REINPLACE_CMD} -e 's|@echo|echo|g'  ${WRKSRC}/libs/maildir/configure
 
 	@${REINPLACE_CMD} -e 's|-lpcre|-L${LOCALBASE}/lib &|g' \
 		${WRKSRC}/libs/sqwebmail/Makefile.in
 
 	@${REINPLACE_CMD} -e 's|\$$(testmaildirfilter_LDADD)|& \$$(LIBPCRE)|g; \
 		s|$$(LINK) $$(maildirkw_LDFLAGS)|$$(CXXLINK) $$(maildirkw_LDFLAGS)|' \
 		${WRKSRC}/libs/maildir/Makefile.in
 
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/libs/liblock/configure
 
 	@${REINPLACE_CMD} -e 's|mkdir -p|${MKDIR}|g' ${WRKSRC}/libs/pcp/configure
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Add the following line to your /etc/crontab to make sure the"
 	@${ECHO_MSG} "sqwebmail cache directory gets cleaned up."
 	@${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl"
 	@${ECHO_MSG} ""
 
 post-install:
 	@${MV} ${STAGEDIR}/${ETCDIR}/ldapaddressbook.dist ${STAGEDIR}/${ETCDIR}/ldapaddressbook.sample
 	@${MV} ${STAGEDIR}/${ETCDIR}/sqwebmaild.dist ${STAGEDIR}/${ETCDIR}/sqwebmaild.sample
 
 .include <bsd.port.post.mk>
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index e3578ff41d05..c862bf5a5eb3 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-ldap
 
 COMMENT=	LDAP support for the Courier authentication library
 CATEGORIES=	net mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile
index d88983020dd4..7d728962dada 100644
--- a/security/courier-authlib-base/Makefile
+++ b/security/courier-authlib-base/Makefile
@@ -1,11 +1,11 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-base
 
 COMMENT=	Courier authentication library base
 CATEGORIES=	security mail
 
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index f018a299a421..edf1edc65ff9 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,211 +1,212 @@
 PORTNAME=	courier-authlib
 PORTVERSION=	0.72.0
+PORTREVISION=	1
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	SF/courier/authlib/${PORTVERSION}
 .else
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 .endif
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT?=	Meta-port for the courier authentication library
 WWW=		https://www.Courier-MTA.org/authlib/
 
 CONFLICTS=	courier-0.45*
 
 .if !defined(PKGNAMESUFFIX)
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
 PATCHDIR=	/dev/null
 
 OPTIONS_DEFINE+=	GDBM
 
 .include "${.CURDIR}/Makefile.opt"
 
 .else	# !defined(PKGNAMESUFFIX)
 
 LIB_DEPENDS+=	libltdl.so:devel/libltdl \
 		libcourier-unicode.so:devel/courier-unicode
 
 USES=		iconv gmake libtool localbase perl5 tar:bzip2
 GNU_CONFIGURE=	yes
 USE_SUBMAKE=	yes
 
 MAILOWN=	courier
 MAILGRP=	courier
 LOCALSTATEDIR=	/var
 AUTHDAEMONVAR=	${LOCALSTATEDIR}/run/authdaemond
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 USERDB?=	${PREFIX}/etc/userdb
 
 CONFIGURE_ARGS=	--enable-unicode \
 		--disable-static \
 		--without-authcustom \
 		--without-authshadow \
 		--without-authpwd \
 		--with-mailuser=${MAILOWN} \
 		--with-mailgroup=${MAILGRP} \
 		--localstatedir=${LOCALSTATEDIR} \
 		--with-authdaemonvar=${AUTHDAEMONVAR} \
 		--cache-file=${WRKDIR}/courier-authlib.cache
 
 INSTALL_TARGET=	install-strip
 
 DESCR=		${PKGDIR}/pkg-descr${PKGNAMESUFFIX}
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX:S/gdbm/db/}
 
 PLIST_SUB+=	MAILOWN=${MAILOWN} MAILGRP=${MAILGRP}
 
 AUTHMOD=	auth${PKGNAMESUFFIX:S/-//:S/gdbm/db/}
 
 .if ${AUTHMOD} == authbase
 RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 
 CONFIGURE_ARGS+=--with-base --with-authpam --with-authpipe
 
 USERS=		${MAILOWN}
 GROUPS=		${MAILGRP}
 
 OPTIONS_DEFINE+=	DOCS
 
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README \
 		README.authdebug.html README_authlib.html
 
 PLIST_SUB+=	AUTHDAEMONVAR=${AUTHDAEMONVAR}
 SUB_LIST+=	AUTHDAEMONVAR=${AUTHDAEMONVAR}
 
 .if defined(WITH_AUTHPIPE_PROG)
 CONFIGURE_ARGS+=--with-pipeprog=${WITH_AUTHPIPE_PROG}
 .endif
 
 .else
 RUN_DEPENDS+=	courierauthconfig:security/courier-authlib-base
 CONFIGURE_ARGS+=--without-base --without-authpam --without-authpipe
 REMOVE_SUBDIRS+=liblock liblog
 .endif
 
 .if ${AUTHMOD} == authuserdb
 .if ${PKGNAMESUFFIX} == -usergdbm
 CONFLICTS+=	${PORTNAME}-userdb-0.*
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-db=gdbm
 .elif ${PKGNAMESUFFIX} == -userdb
 CONFLICTS+=	${PORTNAME}-usergdbm-0.*
 CONFIGURE_ARGS+=--with-db=db
 .endif
 CONFIGURE_ARGS+=--with-userdb=${USERDB}
 .else
 CONFIGURE_ARGS+=--with-db=db --without-authuserdb
 REMOVE_SUBDIRS+=makedat userdb
 .endif
 
 .if ${AUTHMOD} == authldap
 RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 OPTIONS_DEFINE+=	DOCS
 
 DOCS=		README.ldap
 USES+=	ldap
 CONFIGURE_ARGS+=--with-authldap
 .else
 CONFIGURE_ARGS+=--without-authldap
 .endif
 
 .if ${AUTHMOD} == authmysql
 RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 OPTIONS_DEFINE+=	DOCS
 
 DOCS=		README.authmysql.html README.authmysql.myownquery
 USES+=		compiler:c11 mysql
 CONFIGURE_ARGS+=--with-authmysql \
 		--with-mysql-libs=${LOCALBASE}/lib/mysql \
 		--with-mysql-includes=${LOCALBASE}/include/mysql
 .else
 CONFIGURE_ARGS+=--without-authmysql
 .endif
 
 .if ${AUTHMOD} == authpgsql
 RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 OPTIONS_DEFINE+=	DOCS
 
 DOCS=		README.authpostgres.html
 USES+=		pgsql
 CONFIGURE_ARGS+=--with-authpgsql
 .else
 CONFIGURE_ARGS+=--without-authpgsql
 .endif
 
 .if ${AUTHMOD} == authsqlite
 RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 OPTIONS_DEFINE+=	DOCS
 
 DOCS=		README.authsqlite.html
 USES+=		pkgconfig sqlite
 CONFIGURE_ARGS+=--with-authsqlite
 .else
 CONFIGURE_ARGS+=--without-authsqlite
 .endif
 
 .if ${AUTHMOD} == authvchkpw
 BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:mail/vpopmail
 CONFIGURE_ARGS+=--with-authvchkpw
 .else
 CONFIGURE_ARGS+=--without-authvchkpw
 .endif
 
 .endif	# !defined(PKGNAMESUFFIX)
 
 .include <bsd.port.pre.mk>
 
 .if !defined(PKGNAMESUFFIX)
 
 .include "${.CURDIR}/Makefile.dep"
 
 .else	# !defined(PKGNAMESUFFIX)
 
 .if ${AUTHMOD} == authbase
 USE_RC_SUBR=	courier-authdaemond
 
 pre-everything::
 	@${ECHO_CMD}
 	@${ECHO_CMD}	"	Set WITH_AUTHPIPE_PROG to a program you want to use instead of"
 	@${ECHO_CMD}	"	authProg for libauthpipe"
 	@${ECHO_CMD}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g;  \
 		s|mysql_connect|mysql_real_connect|g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/*/configure \
 		${WRKSRC}/configure
 .for subdir in ${REMOVE_SUBDIRS}
 	@${REINPLACE_CMD} -E 's,(^(ac_subdirs_all|subdirs).*)${subdir},\1,g' \
 		${WRKSRC}/configure
 .endfor
 	@${REINPLACE_CMD} -e 's|^\(DEFAULTOPTIONS=\)""$$|\1"wbnodsn=1"|' \
 		-e 's|@ALLMODULES@|authuserdb authvchkpw authpam authldap authmysql authpgsql|' \
 		${WRKSRC}/authdaemonrc.in
 	@${REINPLACE_CMD} -e 's:^#! @EXPECT@:#!${LOCALBASE}/bin/expect:' \
 		${WRKSRC}/authsystem.passwd.in
 
 pre-configure:
 	@if [ -f "${WRKDIR}/courier-authlib.cache" -a -s "${WRKDIR}/courier-authlib.cache" ] ; then \
 		${RM} "${WRKDIR}/courier-authlib.cache" ; \
 	fi
 
 post-install:
 .if !empty(DOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .endif	# !defined(PKGNAMESUFFIX)
 
 .include <bsd.port.post.mk>