git: 4ab8ef59ed13 - main - mail/cyrus-imapd34: Update to 3.4.7.

The branch main has been updated by ume:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ab8ef59ed134bd61f4433c72cae9ad78a823722

commit 4ab8ef59ed134bd61f4433c72cae9ad78a823722
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2024-03-15 13:54:09 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2024-03-15 13:58:16 +0000

    mail/cyrus-imapd34: Update to 3.4.7.
    
    Relnotes:       https://www.cyrusimap.org/3.4/imap/download/release-notes/3.4/x/3.4.7.html
---
 mail/cyrus-imapd34/Makefile | 31 +++++++++++++++++++++----------
 mail/cyrus-imapd34/distinfo |  6 +++---
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index 30ed79f48b41..b3c75282e273 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.4.6
-PORTREVISION=	4
+PORTVERSION=	3.4.7
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
@@ -23,7 +23,6 @@ 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
@@ -54,7 +53,7 @@ CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
-			MYSQL NNTP PGSQL REPLICATION SQLITE SQUAT SRS \
+			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU SQLITE SQUAT SRS
 .if ${FLAVOR:U} == http
@@ -100,6 +99,11 @@ MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
+PCRE2_DESC=		Use PCRE2 rather than PCRE
+PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
+PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
+PCRE2_CONFIGURE_ON=	--disable-pcre
+PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
@@ -151,16 +155,19 @@ CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
-		pop3test sieveshell sivtest smtptest
+		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
-		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb 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
+		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
+		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
+		cyr_deny cyr_df cyr_expire cyr_info cyr_synclog cyr_userseen \
+		cyr_virusscan cyradm cyrdump deliver fud idled imapd ipurge \
+		lmtpd lmtpproxyd master mbexamine mbpath mbtool notifyd pop3d \
+		pop3proxyd promstatsd proxyd ptdump ptexpire ptloader quota \
+		reconstruct restore sievec sieved smmapd timsieved tls_prune \
+		unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
@@ -183,10 +190,14 @@ CONFIGURE_ARGS+=--disable-gssapi
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
+MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
+.if ${PORT_OPTIONS:MMURDER}
+CYRUS_MAN8+=	mupdate
+.endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
diff --git a/mail/cyrus-imapd34/distinfo b/mail/cyrus-imapd34/distinfo
index 9afe30c2a0f0..986ce4ee823f 100644
--- a/mail/cyrus-imapd34/distinfo
+++ b/mail/cyrus-imapd34/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695637963
-SHA256 (cyrus-imapd-3.4.6.tar.gz) = 646bd9fc530aa2a0d49fe239045a5707a9fdb88f881a6893a659cd594051e0cc
-SIZE (cyrus-imapd-3.4.6.tar.gz) = 13288546
+TIMESTAMP = 1710506943
+SHA256 (cyrus-imapd-3.4.7.tar.gz) = 8be5abdc8392de9e217a6c4c0b24132d16cf9f68e42c071ec9d4b9fdca44da38
+SIZE (cyrus-imapd-3.4.7.tar.gz) = 13411396