From 5b5e9f3e6c9a2b22a1a6bb60c3fdabc4e1f94cc5 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Fri, 3 Nov 2006 05:06:54 +0000
Subject: Fix problem that even if select gssapi option, configure detect but
 isn't enabled.  Reported by Jukka Salmi by PR 34917.

---
 mail/cyrus-imapd/distinfo         |  4 ++--
 mail/cyrus-imapd/patches/patch-af | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'mail/cyrus-imapd')

diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 208b0b2031d..627fbde29bc 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/10/09 12:46:01 obache Exp $
+$NetBSD: distinfo,v 1.25 2006/11/03 05:06:54 obache Exp $
 
 SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4
 RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1
 SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
 SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
 SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54
-SHA1 (patch-af) = de3c788417eaf8d7febd4903af4828c9a6e63e3d
+SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea
 SHA1 (patch-al) = 6fa8967eb97f7cfdb93de86a45aa90ab3a1bd129
 SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
 SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
index 686a71d0942..fd7df2f3a45 100644
--- a/mail/cyrus-imapd/patches/patch-af
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2005/05/21 06:56:21 rh Exp $
+$NetBSD: patch-af,v 1.9 2006/11/03 05:06:54 obache Exp $
 
---- configure.orig	2005-02-15 03:59:46.000000000 +1000
+--- configure.orig	2006-04-01 00:25:50.000000000 +0900
 +++ configure
-@@ -6612,7 +6612,7 @@ if test $ac_cv_header_db_h = yes; then
+@@ -7701,7 +7701,7 @@ if test $ac_cv_header_db_h = yes; then
  	fi
  
  	saved_LIBS=$LIBS
@@ -11,7 +11,20 @@ $NetBSD: patch-af,v 1.8 2005/05/21 06:56:21 rh Exp $
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -13549,6 +13549,7 @@ elif test "${with_perl}" != "no"; then
+@@ -13460,7 +13460,11 @@ echo "${ECHO_T}$ac_cv_header_gssapi_gssa
+ 
+ fi
+ if test $ac_cv_header_gssapi_gssapi_h = yes; then
+-  :
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GSSAPI_H
++_ACEOF
++
+ else
+   { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
+ echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
+@@ -15337,6 +15341,7 @@ elif test "${with_perl}" != "no"; then
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
-- 
cgit v1.2.3