5 files changed, 27 insertions, 48 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 0dd31a6d78ef..8c930b18d22c 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.8
+PORTVERSION=	2.4.9
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 715409b15cf1..b101eaf78a7b 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,5 +1,5 @@
-SHA256 (cyrus-imapd-2.4.8.tar.gz) = 7a1ff733928276d0e42dccfb85f17e6d6d63cdc11c03e93aea19e7de798da030
-SIZE (cyrus-imapd-2.4.8.tar.gz) = 2424151
+SHA256 (cyrus-imapd-2.4.9.tar.gz) = d757bc95ca891acad3768a888a5022ab96ba72d49445aa12e26b5929822e4156
+SIZE (cyrus-imapd-2.4.9.tar.gz) = 2425065
 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 f218a50ca87b..86d29ddd1ed8 100644
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ b/mail/cyrus-imapd24/files/extra-patch-configure.in
@@ -1,26 +1,26 @@
 Index: configure.in
 diff -u configure.in.orig configure.in
---- configure.in.orig	2010-11-30 03:21:50.422738671 +0900
-+++ configure.in	2010-11-30 03:24:03.348497671 +0900
-@@ -391,7 +391,7 @@
- 	AC_CHECK_LIB(fl,main)
+--- 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 @@
  
- 	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>
+ 	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
-@@ -401,7 +401,7 @@
- 	else
- 		cyrus_cv_pcre_utf8="no"
+@@ -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?])
-@@ -1157,7 +1157,7 @@
+@@ -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
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index 84eb12b760ca..a9df80eff38e 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -1,26 +1,26 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	2010-11-30 03:25:07.756687818 +0900
-+++ configure	2010-11-30 03:26:18.670893394 +0900
-@@ -7156,7 +7156,7 @@
+--- 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
+-	    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 test "${cyrus_cv_pcre_utf8+set}" = set; then :
-@@ -7182,7 +7182,7 @@
- 	else
- 		cyrus_cv_pcre_utf8="no"
+ 		    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
-@@ -10446,7 +10446,7 @@
+@@ -10493,7 +10493,7 @@
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
diff --git a/mail/cyrus-imapd24/files/patch-perl::imap::IMAP.xs b/mail/cyrus-imapd24/files/patch-perl::imap::IMAP.xs
deleted file mode 100644
index 77ec9d76b885..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::imap::IMAP.xs
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: perl/imap/IMAP.xs
-diff -u perl/imap/IMAP.xs.orig perl/imap/IMAP.xs
---- perl/imap/IMAP.xs.orig	2011-04-13 23:35:22.000000000 +0900
-+++ perl/imap/IMAP.xs	2011-05-20 15:27:09.000000000 +0900
-@@ -68,6 +68,16 @@
- #define aTHX_
- #endif
- 
-+#ifndef sv_no
-+#define sv_no		PL_sv_no
-+#endif
-+#ifndef sv_undef
-+#define sv_undef	PL_sv_undef
-+#endif
-+#ifndef sv_yes
-+#define sv_yes		PL_sv_yes
-+#endif
-+
- /*
-  * This is the code from xsutil.c
-  */