Make sure that the right libdb is actually picked up by the configure

script.

3 files changed, 18 insertions, 7 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 83fd45c7ad5..0123e826bec 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/21 06:56:21 rh Exp $
 
 DISTNAME=	cyrus-imapd-2.2.12
 CATEGORIES=	mail
@@ -124,6 +124,8 @@ PERL5_PACKLIST= \
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
+CONFIGURE_ENV+=	BDB_TYPE=${BDB_TYPE}
+
 # Only imap/mupdate needs to be build with pthreads support, so selectively
 # enable it via patches for just that one program.
 #
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 96bac5f00a6..a3b6f89e755 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2005/05/21 03:31:26 rh Exp $
+$NetBSD: distinfo,v 1.18 2005/05/21 06:56:21 rh Exp $
 
 SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06
 RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 6e3349b3d20231022838a1534cade189a8d89586
 SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1
 SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
 SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
-SHA1 (patch-af) = 3bd6217395161e84b0191c24fbe93ad28d6291f0
+SHA1 (patch-af) = de3c788417eaf8d7febd4903af4828c9a6e63e3d
 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 e95b89b4355..686a71d0942 100644
--- a/mail/cyrus-imapd/patches/patch-af
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -1,8 +1,17 @@
-$NetBSD: patch-af,v 1.7 2005/03/02 21:42:48 wiz Exp $
+$NetBSD: patch-af,v 1.8 2005/05/21 06:56:21 rh Exp $
 
---- configure.orig	Tue Nov 23 19:55:47 2004
-+++ configure	Sun Nov 28 14:34:29 2004
-@@ -13532,6 +13532,7 @@
+--- configure.orig	2005-02-15 03:59:46.000000000 +1000
++++ configure
+@@ -6612,7 +6612,7 @@ if test $ac_cv_header_db_h = yes; then
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${BDB_TYPE} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -13549,6 +13549,7 @@ elif test "${with_perl}" != "no"; then
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"