git: a1654968ad97 - main - mail/cyrus-imapd34: Update to 3.4.4.

The branch main has been updated by ume:

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

commit a1654968ad97f4c743216efbafd3ba10392b24c3
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2022-06-27 12:03:17 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2022-06-27 12:06:00 +0000

    mail/cyrus-imapd34: Update to 3.4.4.
---
 mail/cyrus-imapd34/Makefile                  |  6 +++---
 mail/cyrus-imapd34/distinfo                  |  6 +++---
 mail/cyrus-imapd34/files/patch-lib__assert.h | 26 --------------------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index 21ae2fd10255..e6622fd3dcda 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.4.3
-PORTREVISION=	3
+PORTVERSION=	3.4.4
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http
+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
diff --git a/mail/cyrus-imapd34/distinfo b/mail/cyrus-imapd34/distinfo
index 4c84df6145e2..b299ce0b831f 100644
--- a/mail/cyrus-imapd34/distinfo
+++ b/mail/cyrus-imapd34/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643800935
-SHA256 (cyrus-imapd-3.4.3.tar.gz) = 1ccc9a9f0634084fb54b30a6870d993401510fbc8fd48f42d6b336d84dd9895e
-SIZE (cyrus-imapd-3.4.3.tar.gz) = 13182110
+TIMESTAMP = 1656327824
+SHA256 (cyrus-imapd-3.4.4.tar.gz) = 4fd0673c9cc3247a418a49e56b814c17f0f9371b8962b67ad247630c22b9c518
+SIZE (cyrus-imapd-3.4.4.tar.gz) = 13236335
diff --git a/mail/cyrus-imapd34/files/patch-lib__assert.h b/mail/cyrus-imapd34/files/patch-lib__assert.h
deleted file mode 100644
index 41ed1dcec7d5..000000000000
--- a/mail/cyrus-imapd34/files/patch-lib__assert.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/assert.h.orig	2022-01-23 23:38:00 UTC
-+++ lib/assert.h
-@@ -43,11 +43,23 @@
- #ifndef INCLUDED_ASSERT_H
- #define INCLUDED_ASSERT_H
- 
-+#ifndef PERL_POLLUTE
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #ifdef __STDC__
- #define assert(ex)      {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
- void assertionfailed(const char *file, int line, const char *expr);
- #else
- #define assert(ex)      {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
- 
- #endif /* INCLUDED_ASSERT_H */