3 files changed, 38 insertions, 11 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index a9404a1dda4c..4cc4e171a1f9 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -43,17 +43,21 @@ USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
-.if ${USE_BDB_VER} == 41
-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+.if ${USE_BDB_VER} == 3
+LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db3 --with-bdb=db3
 .elif ${USE_BDB_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-.elif ${USE_BDB_VER} == 3
-LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db4 --with-bdb=db4
+.elif ${USE_BDB_VER} == 41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41
+.elif ${USE_BDB_VER} == 42
+LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
 .else
-BROKEN=		"WITH_BDB_VER must be 3, 4 or 41"
+BROKEN=		"WITH_BDB_VER must be 3, 4, 41 or 42"
 .endif
-CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
-		--with-bdb=db${USE_BDB_VER}
 
 .if defined(WITHOUT_SKIPLIST)
 CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
index f8b4d889dc4a..1ecdc62288cd 100644
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
@@ -1,7 +1,7 @@
 Index: aclocal.m4
 diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig	Wed Oct 29 02:24:46 2003
-+++ aclocal.m4	Wed Oct 29 04:28:37 2003
+--- aclocal.m4.orig	Thu Jan 15 23:36:46 2004
++++ aclocal.m4	Sat Jan 17 22:58:54 2004
 @@ -505,7 +505,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -11,7 +11,16 @@ diff -u aclocal.m4.orig aclocal.m4
            do
              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
                dblib="berkeley"; break, dblib="no")
-@@ -1664,7 +1664,7 @@
+@@ -547,7 +547,7 @@
+ 	dnl Note that FreeBSD puts it in a wierd place
+         dnl (but they should use with-bdb-incdir)
+         AC_CHECK_HEADER(db.h,
+-                        CYRUS_BERKELEY_DB_CHK_LIB(),
++                        BDB_LIBADD="$BDB_LIBADD -l$with_bdb"; dblib="berkeley",
+                         dblib="no")
+ 
+ 	CPPFLAGS=$cmu_save_CPPFLAGS
+@@ -1786,7 +1786,7 @@
    LIB_UCDSNMP=""
    if test "$with_ucdsnmp" != no; then
      AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?])
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index 2088891edc95..17f80a114033 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,7 +1,7 @@
 Index: configure
 diff -u configure.orig configure
 --- configure.orig	Thu Jan 15 23:36:50 2004
-+++ configure	Fri Jan 16 04:03:09 2004
++++ configure	Sat Jan 17 21:11:14 2004
 @@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -11,6 +11,20 @@ diff -u configure.orig configure
            do
              as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -6589,11 +6589,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char db_create ();
++#include <db.h>
+ int
+ main ()
+ {
+-db_create ();
++db_create (0, 0, 0);
+   ;
+   return 0;
+ }
 @@ -13854,7 +13854,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF