Support Berkeley DB 4.2.

Since our db42 requires to include db.h to use. existing configure
script cannot detect our db42.  AC_CHECK_LIB() simply test if a
function exists. :(

Requested by:	Dmitry Sorokin <dmitry_sorokin@yahoo.ca>

4 files changed, 80 insertions, 18 deletions

diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 0fe99c22aa9f..bdbaf815cd4f 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -45,17 +45,20 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-saslauthd
 
 .if defined(WITH_BDB_VER)
-.if ${WITH_BDB_VER} == 41
-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
-CONFIGURE_ARGS+=--with-bdb=db41 --with-bdb-incdir=${PREFIX}/include/db41
+.if ${WITH_BDB_VER} == 3
+LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db3 --with-bdb=db3
 .elif ${WITH_BDB_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-CONFIGURE_ARGS+=--with-bdb=db4 --with-bdb-incdir=${PREFIX}/include/db4
-.elif ${WITH_BDB_VER} == 3
-LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
-CONFIGURE_ARGS+=--with-bdb=db3 --with-bdb-incdir=${PREFIX}/include/db3
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db4 --with-bdb=db4
+.elif ${WITH_BDB_VER} == 41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41
+.elif ${WITH_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-dblib=berkeley --with-bdb-libdir=${PREFIX}/lib
 .else
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 5bbf56d276ab..ccd28ebd63ac 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -53,17 +53,20 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-saslauthd
 
 .if defined(WITH_BDB_VER)
-.if ${WITH_BDB_VER} == 41
-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
-CONFIGURE_ARGS+=--with-bdb=db41 --with-bdb-incdir=${PREFIX}/include/db41
+.if ${WITH_BDB_VER} == 3
+LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db3 --with-bdb=db3
 .elif ${WITH_BDB_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-CONFIGURE_ARGS+=--with-bdb=db4 --with-bdb-incdir=${PREFIX}/include/db4
-.elif ${WITH_BDB_VER} == 3
-LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
-CONFIGURE_ARGS+=--with-bdb=db3 --with-bdb-incdir=${PREFIX}/include/db3
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db4 --with-bdb=db4
+.elif ${WITH_BDB_VER} == 41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41
+.elif ${WITH_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-dblib=berkeley --with-bdb-libdir=${PREFIX}/lib
 SASLDB_NAME=	sasldb2
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index 7f65813ed65f..78dacf05e598 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,7 +1,7 @@
 Index: configure
 diff -u configure.orig configure
 --- configure.orig	Tue Dec  2 01:35:06 2003
-+++ configure	Tue Dec  2 12:15:15 2003
++++ configure	Sat Jan 17 23:21:19 2004
 @@ -1575,6 +1575,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
@@ -19,6 +19,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
+@@ -5156,11 +5157,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;
+ }
 @@ -5935,7 +5936,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -28,6 +42,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
+@@ -5959,11 +5960,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;
+ }
 @@ -7187,6 +7188,8 @@
    SASLAUTHD_TRUE='#'
    SASLAUTHD_FALSE=
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index 71f5afce9731..30f51c89425c 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -1,7 +1,7 @@
 Index: saslauthd/configure
 diff -u saslauthd/configure.orig saslauthd/configure
 --- saslauthd/configure.orig	Tue Dec  2 01:35:11 2003
-+++ saslauthd/configure	Tue Dec  2 14:02:53 2003
++++ saslauthd/configure	Sat Jan 17 23:23:56 2004
 @@ -1523,6 +1523,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
@@ -37,6 +37,20 @@ diff -u saslauthd/configure.orig saslauthd/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
+@@ -7508,11 +7509,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;
+ }
 @@ -8287,7 +8288,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -46,3 +60,17 @@ diff -u saslauthd/configure.orig saslauthd/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
+@@ -8311,11 +8312,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;
+ }