Update to 2.4.1.

5 files changed, 19 insertions, 31 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index b5f197817850..6f97138362da 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 #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 122117302640..5acc4146c46e 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.4.0.tar.gz) = a05553483a7d2dba8ea2159e7cd294c9
-SHA256 (cyrus-imapd-2.4.0.tar.gz) = 2928a174e4e602f6145b7f711d15a07e65ec8fa50e6b4fe1d43620e557afa6f8
-SIZE (cyrus-imapd-2.4.0.tar.gz) = 2377376
+MD5 (cyrus-imapd-2.4.1.tar.gz) = 7fbe5d3af298c06e7b11b0ca56714259
+SHA256 (cyrus-imapd-2.4.1.tar.gz) = 94a99a2ffb57c8b07c92e35e6615d72c590333d7998e86bdce87e9a58e1ce013
+SIZE (cyrus-imapd-2.4.1.tar.gz) = 2366635
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure b/mail/cyrus-imapd24/files/extra-patch-configure
index 8e283ee68870..4d3deee12dcf 100644
--- a/mail/cyrus-imapd24/files/extra-patch-configure
+++ b/mail/cyrus-imapd24/files/extra-patch-configure
@@ -1,15 +1,17 @@
---- configure.orig	2008-04-25 14:34:53.000000000 -0400
-+++ configure	2008-09-17 18:46:12.000000000 -0400
-@@ -14921,7 +14922,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	2010-10-18 21:36:00.000000000 +0900
++++ configure	2010-10-18 23:50:45.966557478 +0900
+@@ -9501,7 +9501,7 @@
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
 +LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15391,7 +15392,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -9803,7 +9803,7 @@
      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
    elif test "$gss_impl" = "heimdal"; then
      CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index 20b75ceffceb..81f6e51577ce 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -1,13 +1,13 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	2010-10-12 10:22:49.725848550 +0900
-+++ configure	2010-10-12 11:00:05.295936060 +0900
-@@ -19686,7 +19686,7 @@
+--- configure.orig	2010-10-18 23:52:21.754710579 +0900
++++ configure	2010-10-18 23:53:29.402517775 +0900
+@@ -10372,7 +10372,7 @@
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
 -        linux*|netbsd*)
 +        linux*|netbsd*|freebsd*)
-             echo "$as_me:$LINENO: checking for perl cccdlflags needed on \"${target_os}\"" >&5
- echo $ECHO_N "checking for perl cccdlflags needed on \"${target_os}\"... $ECHO_C" >&6
+             { $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`
diff --git a/mail/cyrus-imapd24/files/patch-imap::nntpd.c b/mail/cyrus-imapd24/files/patch-imap::nntpd.c
deleted file mode 100644
index 08724551aab5..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::nntpd.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: imap/nntpd.c
-diff -u -p imap/nntpd.c.orig imap/nntpd.c
---- imap/nntpd.c.orig	2010-10-12 06:35:47.000000000 +0900
-+++ imap/nntpd.c	2010-10-12 12:18:23.780338789 +0900
-@@ -55,6 +55,9 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>