 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2011/08/14 13:25:21 obache Exp $
+# $NetBSD: Makefile,v 1.12 2011/09/09 12:09:34 obache Exp $
-DISTNAME=	cyrus-imapd-2.4.10
+DISTNAME=	cyrus-imapd-2.4.11
 PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://cyrusimap.org/releases/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.cyrusimap.org/
 COMMENT=	Cyrus IMAP server
 #LICENSE=	original-bsd # like license
 PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=		perl makedepend

 @@ -1,23 +1,21 @@
-$NetBSD: distinfo,v 1.11 2011/07/06 09:45:45 obache Exp $
+$NetBSD: distinfo,v 1.12 2011/09/09 12:09:34 obache Exp $
-SHA1 (cyrus-imapd-2.4.10.tar.gz) = b6cb51d67f2b49536ba92daae471d7817929c482
+SHA1 (cyrus-imapd-2.4.11.tar.gz) = 24fdaf0e57d5c3bdb63b7dcca29fe6df535c6102
-RMD160 (cyrus-imapd-2.4.10.tar.gz) = d7ffe3ad56b9e565dc7e1b764d4bb0a597ce9696
+RMD160 (cyrus-imapd-2.4.11.tar.gz) = 0bb30f7d8c655a03366a8ce59f5a708c30d34ec1
-Size (cyrus-imapd-2.4.10.tar.gz) = 2430196 bytes
+Size (cyrus-imapd-2.4.11.tar.gz) = 2446611 bytes
-SHA1 (patch-aa) = c6dc9d4df5b5f49e1aaaf7a554764ff857638829
+SHA1 (patch-aa) = c0bd73b9443dc34755428ff7f0813341dd11c448
-SHA1 (patch-ab) = a692ae6d85b7121bb9af32cb12ae17417b12affe
+SHA1 (patch-ab) = 2c5c1f695bfba9ac310d7a441097399e260e12e9
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
 SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
 SHA1 (patch-af) = 51ffc6cc37822ea4828eb987039593900f2f1ef0
 SHA1 (patch-ag) = 533f146e9ee276af7b8ab716da2f3d4af5f60639
 SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
 SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
 SHA1 (patch-aj) = 14f293489a816d2282f0d1a7b289d5a775c74c24
 SHA1 (patch-ak) = 2e8a105b30d2c0c38f523020bf79d7e26cfa235b
 SHA1 (patch-al) = 0eaef55760e9a071802bba157a00bdacc84c1932
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
 SHA1 (patch-an) = 94aac408657e2315246c7cdaac2524c68eeb7c24
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
 SHA1 (patch-aq) = db1741cfaaf155d60ac446945be1e54f271e602b
 SHA1 (patch-ar) = 4ac95c029794afba0f4d398643f354b71efd9ac3
 SHA1 (patch-imap_mailbox.c) = 9f71ae5df3a6ebf024e9bd9e4dfb0c140d0d3d95

 @@ -1,38 +1,29 @@
-$NetBSD: patch-aa,v 1.5 2011/06/22 01:05:37 obache Exp $
+$NetBSD: patch-aa,v 1.6 2011/09/09 12:09:34 obache Exp $
---- configure.in.orig	2011-06-21 19:50:39.000000000 +0000
+--- configure.in.orig	2011-09-08 18:57:42.000000000 +0000
 +++ configure.in
 @@ -403,7 +403,7 @@ if test "$sievedir" != "no"; then
  	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,13 +415,13 @@ if test "$sievedir" != "no"; then
  	    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?])
  	else
  		AC_CHECK_HEADERS(rxposix.h)
 -		if test "$ac_cv_header_rxposix_h" == "yes"; then
 +		if test "$ac_cv_header_rxposix_h" = "yes"; then
  			LIBS="$LIBS -lrx"
  			AC_DEFINE(ENABLE_REGEX, [],
  				  [Do we have a regex library?])
@@ -1171,7 +1171,7 @@ dnl add perl cccdlflags when building li
  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*|dragonfly*)
              AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
              eval `${PERL} -V:cccdlflags`
              PERL_CCCDLFLAGS="$cccdlflags"

 @@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.5 2011/07/06 09:45:45 obache Exp $
+$NetBSD: patch-ab,v 1.6 2011/09/09 12:09:34 obache Exp $
---- configure.orig	2011-07-04 15:06:30.000000000 +0000
+--- configure.orig	2011-09-08 19:03:38.000000000 +0000
 +++ configure
 @@ -7201,7 +7201,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
  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 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
  	    fi
  	fi
 @@ -19,22 +19,13 @@ $NetBSD: patch-ab,v 1.5 2011/07/06 09:45
 +	if test "$cyrus_cv_pcre_utf8" = "yes"; then
  		LIBS="$LIBS -lpcre -lpcreposix";
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
 @@ -7250,7 +7250,7 @@ fi
  done
 -		if test "$ac_cv_header_rxposix_h" == "yes"; then
 +		if test "$ac_cv_header_rxposix_h" = "yes"; then
  			LIBS="$LIBS -lrx"
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
@@ -10493,7 +10493,7 @@ elif test "${with_perl}" != "no"; then
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
 -        linux*|netbsd*)
 +        linux*|netbsd*|freebsd*|dragonfly*)
              { $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`