mail/cyrus-imapd34: Add new port of Cyrus IMAPd 3.4.

freebsd · Apr 19, 2021 · 8d23ff3 · 8d23ff3
1 parent c47de3b
commit 8d23ff3
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 45 deletions.
diff --git a/mail/Makefile b/mail/Makefile
@@ -80,6 +80,7 @@
     SUBDIR += cyrus-imapd25
     SUBDIR += cyrus-imapd30
     SUBDIR += cyrus-imapd32
+    SUBDIR += cyrus-imapd34
     SUBDIR += cyrus2courier
     SUBDIR += cyrus2dovecot
     SUBDIR += davmail

diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.2.6
-PORTREVISION=	2
+PORTVERSION=	3.4.0
+#PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
-PKGNAMESUFFIX=	32
+PKGNAMESUFFIX=	34
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -38,15 +38,15 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
-SHEBANG_FILES=	imap/promdatagen snmp/snmpgen tools/config2header \
+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 SNMP SQLITE SQUAT SRS \
+			MYSQL NNTP PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT SRS
 OPTIONS_SUB=		yes
@@ -57,6 +57,15 @@ 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 \
@@ -87,9 +96,6 @@ 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

diff --git a/mail/cyrus-imapd34/distinfo b/mail/cyrus-imapd34/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615286134
-SHA256 (cyrus-imapd-3.2.6.tar.gz) = 453958dd8b639aaada9a83c8941af2b403f76b47e4f035a8f0078170e0bacedf
-SIZE (cyrus-imapd-3.2.6.tar.gz) = 12282669
+TIMESTAMP = 1618834194
+SHA256 (cyrus-imapd-3.4.0.tar.gz) = 6a441a180d8224f496e279da7fdb24baa702800414206e5f26fc7d006b2eb2fa
+SIZE (cyrus-imapd-3.4.0.tar.gz) = 12514849
diff --git a/mail/cyrus-imapd34/files/patch-imap__tls.c b/mail/cyrus-imapd34/files/patch-imap__tls.c
diff --git a/mail/cyrus-imapd34/files/patch-imtest__imtest.c b/mail/cyrus-imapd34/files/patch-imtest__imtest.c
diff --git a/mail/cyrus-imapd34/files/patch-lib__byteorder.h b/mail/cyrus-imapd34/files/patch-lib__byteorder.h
@@ -0,0 +1,16 @@
+--- lib/byteorder.h.orig	2021-01-07 01:26:49 UTC
++++ lib/byteorder.h
+@@ -61,7 +61,12 @@
+ #  define ntohll(x) (x)
+
+ #else /* small-endian machines */
+-#  if defined(__GNUC__) && __GNUC_PREREQ(4, 3)
++#  if defined(__GNUC__) && !defined(__clang__)
++#    if __GNUC_PREREQ(4, 3)
++#      define GNUC_PREREQ_4_3 1
++#    endif
++#  endif
++#  if defined(GNUC_PREREQ_4_3)
+      /* Remove existing macros if present */
+ #    undef ntohl
+ #    undef htonl
diff --git a/mail/cyrus-imapd34/pkg-plist b/mail/cyrus-imapd34/pkg-plist
@@ -110,6 +110,7 @@ include/cyrus/mpool.h
 include/cyrus/murmurhash2.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
+include/cyrus/procinfo.h
 include/cyrus/retry.h
 include/cyrus/rfc822tok.h
 include/cyrus/sieve/sieve_err.h