Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.120
diff -u -r1.120 Makefile
--- Makefile	8 Nov 2005 16:51:08 -0000	1.120
+++ Makefile	13 Nov 2005 12:06:55 -0000
@@ -54,20 +54,11 @@
 		--with-saslauthd=${SASLAUTHD_RUNPATH}
 
 .if defined(WITH_BDB_VER)
-.if ${WITH_BDB_VER} == 4
-USE_BDB=	40
-.elif ${WITH_BDB_VER} == 42
-BDB_SUFFIX=	-4.2
-.elif ${WITH_BDB_VER} == 43
-BDB_SUFFIX=	-4.3
-.elif ${WITH_BDB_VER} != 3 && ${WITH_BDB_VER} != 41
-BROKEN=		"WITH_BDB_VER must be 3, 4, 41, 42 or 43"
-.endif
-USE_BDB?=	${WITH_BDB_VER}
-BDB_SUFFIX?=	${WITH_BDB_VER}
+USE_BDB=	40+
+BROKEN_WITH_BDB=	2
 CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
-		--with-bdb-incdir=${LOCALBASE}/include/db${WITH_BDB_VER} \
-		--with-bdb=db${BDB_SUFFIX}
+		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
+		--with-bdb=${BDB_LIB_NAME}
 SASLDB_NAME=	sasldb2
 .else
 CONFIGURE_ARGS+=--with-dblib=ndbm