Update to 2.4.5.

5 files changed, 46 insertions, 14 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 7a69a884ce49..37baa02233b0 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTVERSION=	2.4.5
+#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 55689efc39fb..070ca410a105 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cyrus-imapd-2.4.4.tar.gz) = 8008d96672cf3db986ba1bfb90d85368a466cd3fb54800c76f12e19a7700ba9b
-SIZE (cyrus-imapd-2.4.4.tar.gz) = 2413958
+SHA256 (cyrus-imapd-2.4.5.tar.gz) = 2938894727c7be20f1f1a38c0734c6cbcc35adbc35765b2b0937c170955058d4
+SIZE (cyrus-imapd-2.4.5.tar.gz) = 2371680
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in
index 9b6d7932c017..f218a50ca87b 100644
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ b/mail/cyrus-imapd24/files/extra-patch-configure.in
@@ -1,17 +1,26 @@
 Index: configure.in
 diff -u configure.in.orig configure.in
---- configure.in.orig	2010-11-26 15:06:26.364699467 +0900
-+++ configure.in	2010-11-26 15:27:53.983587395 +0900
+--- 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)
  
- 	AC_CHECK_HEADERS(pcreposix.h rxposix.h)
+ 	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"
+ 	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?])
- 	else 
-@@ -1145,7 +1145,7 @@
+ 		AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
+@@ -1157,7 +1157,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 76c769f66c62..84eb12b760ca 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -1,17 +1,26 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	2010-11-26 15:06:26.419690432 +0900
-+++ configure	2010-11-26 15:27:39.897910842 +0900
-@@ -7162,7 +7162,7 @@
+--- configure.orig	2010-11-30 03:25:07.756687818 +0900
++++ configure	2010-11-30 03:26:18.670893394 +0900
+@@ -7156,7 +7156,7 @@
+ fi
  
- done
  
 -	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"
+ 	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
-@@ -10411,7 +10411,7 @@
+@@ -10446,7 +10446,7 @@
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
diff --git a/mail/cyrus-imapd24/files/patch-imap::sync_server.c b/mail/cyrus-imapd24/files/patch-imap::sync_server.c
new file mode 100644
index 000000000000..b89dcd60dd00
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-imap::sync_server.c
@@ -0,0 +1,14 @@
+Index: imap/sync_server.c
+diff -u -p imap/sync_server.c.orig imap/sync_server.c
+--- imap/sync_server.c.orig	2010-11-29 22:28:06.000000000 +0900
++++ imap/sync_server.c	2010-11-30 03:36:56.729726291 +0900
+@@ -47,6 +47,9 @@
+ 
+ #include <config.h>
+ 
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif