Force to detect correct library when ${SASL_DBTYPE}=="berkeley".

Reported by David Carrel in pkgsrc-users@.

5 files changed, 41 insertions, 10 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 97a9bcce839..5f1a6f0054b 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/23 00:12:41 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/11/02 13:02:39 obache Exp $
 
 .include "Makefile.common"
 
@@ -15,6 +15,7 @@ BUILD_DEFS+=		SASL_DBTYPE
 .if ${SASL_DBTYPE} == "berkeley"
 USE_DB185=		no
 .  include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ENV+=	BDB_TYPE=${BDB_TYPE:Q}
 .endif
 
 CONFIGURE_ARGS+=	--with-dblib=${SASL_DBTYPE:Q}
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 9a7a2c61ff0..deae129ace8 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.16 2006/10/04 12:07:53 obache Exp $
+$NetBSD: distinfo,v 1.17 2006/11/02 13:02:39 obache Exp $
 
 SHA1 (cyrus-sasl-2.1.22.tar.gz) = d23454ab12054714ab97d229c86cb934ce63fbb1
 RMD160 (cyrus-sasl-2.1.22.tar.gz) = 086e20d01588cb86decad001244b72a37223354c
 Size (cyrus-sasl-2.1.22.tar.gz) = 1609278 bytes
 SHA1 (patch-aa) = a20fca0058a04d00debb78d8cc051ec8d8f57af2
-SHA1 (patch-ab) = e1cb24eb8888ae93846efbb5ef42028ac52a44bd
+SHA1 (patch-ab) = f5cf383ec9e417101bcf133b819f7c28aa1b4588
 SHA1 (patch-ac) = 1b653bee1a1b98e8e197911cc193c2c9b6d9f736
-SHA1 (patch-ad) = c3fe38777a281b6800115711b732254f72887107
+SHA1 (patch-ad) = 462eb7c9ff1c7138897d3778b3a50f2c4dbca51b
 SHA1 (patch-ae) = ac9403e8cdbebb8be04947c9ff8a7505002b3a36
 SHA1 (patch-ag) = 6a2713504078dad681dcc6f7ba296972d03d5b15
 SHA1 (patch-ah) = 595e58bd756e75bda5f25a19119f2fc7c27bc7d9
-SHA1 (patch-ai) = 8b09b26e66f64895de069ebccb582d6d5f38287d
+SHA1 (patch-ai) = 04ff2f7f2d8a69db3d8e6451b50021f0c5516a97
 SHA1 (patch-ak) = e76a0ac7559845ed374c63f0261df9817e383ac1
 SHA1 (patch-al) = d1bfddb749b2f234d3750e3a83bf800bdba4cec4
 SHA1 (patch-ap) = eb87cd283f99da69916a7eb251000f2d9254f17d
diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab
index 796eb200cdf..a5278e249e6 100644
--- a/security/cyrus-sasl/patches/patch-ab
+++ b/security/cyrus-sasl/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.6 2006/10/04 12:07:53 obache Exp $
+$NetBSD: patch-ab,v 1.7 2006/11/02 13:02:39 obache Exp $
 
 --- aclocal.m4.orig	2006-05-18 15:30:08.000000000 -0400
 +++ aclocal.m4
-@@ -1696,7 +1696,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+@@ -1691,12 +1691,12 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	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"
  	    AC_TRY_LINK([#include <db.h>],
  	    [db_create(NULL, NULL, 0);],
diff --git a/security/cyrus-sasl/patches/patch-ad b/security/cyrus-sasl/patches/patch-ad
index 11af30062c4..4a1b51f38ad 100644
--- a/security/cyrus-sasl/patches/patch-ad
+++ b/security/cyrus-sasl/patches/patch-ad
@@ -1,8 +1,14 @@
-$NetBSD: patch-ad,v 1.4 2006/04/18 17:41:30 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2006/11/02 13:02:39 obache Exp $
 
 --- cmulocal/berkdb.m4.orig	2005-04-26 15:14:07.000000000 -0400
 +++ cmulocal/berkdb.m4
-@@ -218,7 +218,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+@@ -213,12 +213,12 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	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"
  	    AC_TRY_LINK([#include <db.h>],
  	    [db_create(NULL, NULL, 0);],
diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai
index 3f7d1004633..2dea2ffbd3b 100644
--- a/security/cyrus-sasl/patches/patch-ai
+++ b/security/cyrus-sasl/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.6 2006/10/04 12:07:53 obache Exp $
+$NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $
 
 --- configure.orig	2006-05-18 15:30:13.000000000 -0400
 +++ configure
@@ -20,6 +20,15 @@ $NetBSD: patch-ai,v 1.6 2006/10/04 12:07:53 obache Exp $
  ac_aux_dir=
  for ac_dir in config $srcdir/config; do
    if test -f $ac_dir/install-sh; then
+@@ -5125,7 +5121,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
 @@ -5156,7 +5152,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -29,6 +38,15 @@ $NetBSD: patch-ai,v 1.6 2006/10/04 12:07:53 obache Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5882,7 +5878,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
 @@ -5913,7 +5909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5