Fix detection of Berkeley db4 if /usr/include/db.h exists and happens

to pass mutt's weak configure tests.  Fixes build with the "mutt-hcache"
option on FreeBSD-4.

3 files changed, 33 insertions, 2 deletions

diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index bac5272bc3b..2aef5d25259 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2005/08/20 21:58:00 jlam Exp $
+$NetBSD: distinfo,v 1.25 2005/09/03 03:21:23 jlam Exp $
 
 SHA1 (mutt-1.5.9i.tar.gz) = a380747b86f11b2b3bf3c4407e70bfebe6d0af02
 RMD160 (mutt-1.5.9i.tar.gz) = 888848046382b3c4e8b18eacd30af4291a7ed23d
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ag) = 97200a45130506d79d41884c130825d502806a76
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
+SHA1 (patch-al) = 9a2c61fae88c6c42534490ee19498677a355c276
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 45c9a1eb561..da1dc320c6e 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/08/02 13:15:40 tonio Exp $
+# $NetBSD: options.mk,v 1.8 2005/09/03 03:21:23 jlam Exp $
 
 # Global and legacy options
 
@@ -47,6 +47,14 @@ CONFIGURE_ARGS+=	--without-ssl
 BDB_ACCEPTED=		db4
 .  include "../../mk/bdb.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-hcache
+CONFIGURE_ARGS+=	--without-gdbm
+#
+# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
+# since the real -I and -L flags are added by buildlink already.
+#
+CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BDBBASE}/include
+CONFIGURE_ENV+=		BDB_LIB_DIR=${BDBBASE}/lib
+CONFIGURE_ENV+=		BDB_LIB=${BDB_LIBS:S/^-l//}
 .else
 CONFIGURE_ARGS+=	--disable-hcache
 .endif
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
new file mode 100644
index 00000000000..6a1134fac13
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.3 2005/09/03 03:21:23 jlam Exp $
+
+--- configure.orig	Sun Mar 13 16:36:32 2005
++++ configure
+@@ -14107,6 +14107,7 @@ if test "${with_bdb+set}" = set; then
+   withval="$with_bdb"
+   ac_bdb_prefix=$withval
+ fi;
++    if test x$BDB_INCLUDE_DIR = x -o test x$BDB_LIB_DIR = x -o test x$BDB_LIB = x; then
+     if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then
+         test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
+         for d in $ac_bdb_prefix; do
+@@ -14198,6 +14199,9 @@ echo "${ECHO_T}yes" >&6
+             echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+         fi
++    fi
++    else
++        ac_cv_dbcreate=yes
+     fi
+ 
+     if test x$ac_cv_gdbmopen = xyes; then