Update to 2.4.11.

4 files changed, 7 insertions, 25 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index d8b17e4bf7c2..b618dbae952f 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.10
-PORTREVISION=	1
+PORTVERSION=	2.4.11
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 #MASTER_SITES=	http://www.cyrusimap.org/releases/snapshots/
@@ -15,6 +15,9 @@ MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		pcre.0:${PORTSDIR}/devel/pcre
 
@@ -38,9 +41,6 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 MAKE_JOBS_UNSAFE=	yes
 
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-
 OPTIONS=	AUTOCREATE	"Use autocreate INBOX patch (UoA)"	off \
 		AUTOSIEVE	"Use autosievefolder patch (UoA)"	off \
 		BDB		"Use Berkeley DB"			on \
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index fe063bbbf2c0..3cfe418cc10d 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,5 +1,5 @@
-SHA256 (cyrus-imapd-2.4.10.tar.gz) = 2f5b5c6e524df9005df4a700c958bb99a21c4450485374e38a3d18010bc87317
-SIZE (cyrus-imapd-2.4.10.tar.gz) = 2430196
+SHA256 (cyrus-imapd-2.4.11.tar.gz) = fe6bbcfd7abe459a0aa88922ef81e41a98dc93b0cf2408b7086356b3ee4c7f70
+SIZE (cyrus-imapd-2.4.11.tar.gz) = 2446611
 SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 1130e80b6604901ba8cf887c792fa8e4ef181b4cfc212720bcfc984163fe8a13
 SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74039
 SHA256 (cyrus-imapd-2.4.4-autosieve-0.6.0.patch) = 4d09a328dac698ea09b9c7d0df577a4e8386c9a867fdc71180a43db2b39cbff6
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in
index 86d29ddd1ed8..51559f2c7662 100644
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ b/mail/cyrus-imapd24/files/extra-patch-configure.in
@@ -20,12 +20,3 @@ diff -u configure.in.orig configure.in
  		LIBS="$LIBS -lpcre -lpcreposix";
  		AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
  		AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
-@@ -1171,7 +1171,7 @@
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --
-     case "${target_os}" in
--        linux*|netbsd*)
-+        linux*|netbsd*|freebsd*)
-             AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
-             eval `${PERL} -V:cccdlflags`
-             PERL_CCCDLFLAGS="$cccdlflags"
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index a9df80eff38e..94d8573f7ae1 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -20,12 +20,3 @@ diff -u configure.orig configure
  		LIBS="$LIBS -lpcre -lpcreposix";
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-@@ -10493,7 +10493,7 @@
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-     case "${target_os}" in
--        linux*|netbsd*)
-+        linux*|netbsd*|freebsd*)
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
- $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
-             eval `${PERL} -V:cccdlflags`