4 files changed, 3 insertions, 48 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 6bbb06097717..8840d0d7fb59 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.11
+PORTVERSION=	2.4.12
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
@@ -142,7 +142,6 @@ CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in
 .if ${OSVERSION} >= 800037
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
 .endif
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 3cfe418cc10d..07acf1e8037e 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,5 +1,5 @@
-SHA256 (cyrus-imapd-2.4.11.tar.gz) = fe6bbcfd7abe459a0aa88922ef81e41a98dc93b0cf2408b7086356b3ee4c7f70
-SIZE (cyrus-imapd-2.4.11.tar.gz) = 2446611
+SHA256 (cyrus-imapd-2.4.12.tar.gz) = b33c348d4d8c0b4d7dd4cd114d2cc53dde6c49be359e9dfd6ce0069cc536366f
+SIZE (cyrus-imapd-2.4.12.tar.gz) = 2450099
 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
deleted file mode 100644
index 51559f2c7662..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig	2011-06-03 15:10:38.476221147 +0900
-+++ configure.in	2011-06-03 15:12:46.807038121 +0900
-@@ -403,7 +403,7 @@
- 
- 	if test "$testpcre" != "no"; then
- 	    AC_CHECK_HEADER(pcreposix.h)
--	    if test "$ac_cv_header_pcreposix_h" == "yes"; then
-+	    if test "$ac_cv_header_pcreposix_h" = "yes"; then
- 		    AC_MSG_CHECKING(for utf8 enabled pcre)
- 		    AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
- #ifndef REG_UTF8
-@@ -415,7 +415,7 @@
- 	    fi
- 	fi
- 
--	if test "$cyrus_cv_pcre_utf8" == "yes"; then
-+	if test "$cyrus_cv_pcre_utf8" = "yes"; then
- 		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?])
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
deleted file mode 100644
index 94d8573f7ae1..000000000000
--- a/mail/cyrus-imapd24/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	2011-06-03 15:15:41.385220512 +0900
-+++ configure	2011-06-03 15:17:06.591153858 +0900
-@@ -7201,7 +7201,7 @@
- fi
- 
- 
--	    if test "$ac_cv_header_pcreposix_h" == "yes"; then
-+	    if test "$ac_cv_header_pcreposix_h" = "yes"; then
- 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 enabled pcre" >&5
- $as_echo_n "checking for utf8 enabled pcre... " >&6; }
- 		    if ${cyrus_cv_pcre_utf8+:} false; then :
-@@ -7229,7 +7229,7 @@
- 	    fi
- 	fi
- 
--	if test "$cyrus_cv_pcre_utf8" == "yes"; then
-+	if test "$cyrus_cv_pcre_utf8" = "yes"; then
- 		LIBS="$LIBS -lpcre -lpcreposix";
- 
- $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h