Rework the Berkeley DB detection in buildlink3:

  * Add a db1.builtin.mk file that detects whether DB-1.85 functionality
    exists in the base system, and remove the distinction between
    "native" and the other Berkeley DB packages -- we now refer to
    db[1234].  This paves the way for any future databases/db1 package.

  * USE_DB185 shouldn't need to be set by any packages -- its correct
    value is now automatically determined by bdb.buildlink3.mk depending
    on whether we explicitly request db1 or not.  By default, if you
    include bdb.buildlink3.mk, you want DB-1.85 functionality and
    USE_DB185 defaults to "yes", but if you explicitly remove db1 from
    the list of acceptable DBs, then USE_DB185 defaults to "no".

  * Set BDB_LIBS to the library options needed to link against the DB
    library when bdb.buildlink3.mk is included.

  * We only add the DB library to the linker command automatically if
    we want DB-1.85 functionality; otherwise assume that the package
    configure process can figure out how to probe for the correct
    headers and libraries.

Edit package Makefiles to nuke redundant settings of USE_DB185.

6 files changed, 14 insertions, 24 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 779f8f4d3b8..5091add303c 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/10/26 05:41:41 snj Exp $
+# $NetBSD: Makefile,v 1.23 2004/11/15 17:54:49 jlam Exp $
 
 DISTNAME=	bogofilter-0.92.8
 CATEGORIES=	mail
@@ -23,6 +23,7 @@ CONF_FILES=		${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
 REPLACE_PERL=		src/bogoupgrade
 
 USE_DB185=		YES
+BDB_ACCEPTED=		db4
 
-.include "../../databases/db4/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 0356f953e4b..b3cea336b39 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/11/15 15:34:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/15 17:54:49 jlam Exp $
 #
 
 DISTNAME=	cucipop-1.31
@@ -35,7 +35,7 @@ PKG_SUPPORTED_OPTIONS=	db
 .if !empty(PKG_OPTIONS:Mdb)
 BDB_ACCEPTED=	db2
 CFLAGS+=	-DUSE_DB
-MAKE_ENV+=	LIBS=${BUILDLINK_LIBS.${BDB_TYPE}}
+MAKE_ENV+=	LIBS=${BDB_LIBS}
 .  include "../../mk/bdb.buildlink3.mk"
 .endif
 
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 0e6d7d016a8..73729a2c29b 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.25 2004/11/15 17:54:49 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.1.15
 PKGREVISION=		4
@@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
-USE_DB185=		no
 AUTOCONF_REQD=		2.13
 
 USE_PKGINSTALL=		yes
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 11a826af526..76205795f33 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/10/17 22:07:32 recht Exp $
+# $NetBSD: Makefile,v 1.24 2004/11/15 17:54:49 jlam Exp $
 
 DISTNAME=	cyrus-imapd-2.2.8
 PKGREVISION=	4
@@ -14,7 +14,6 @@ USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
-USE_DB185=		no
 BDB_ACCEPTED=		db4 db3
 
 USE_PKGINSTALL=		yes
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 7a5615610e4..25fab10e86d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/29 05:59:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.15 2004/11/15 17:54:49 jlam Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	3
@@ -18,7 +18,7 @@ USE_PERL5=	YES
 USE_PKGINSTALL=	YES
 
 BUILD_DEFS+=		EXIM_USER EXIM_GROUP
-BUILD_DEFS+=		EXIM_DB.db1 EXIM_DB.mysql EXIM_DB.pgsql
+BUILD_DEFS+=		EXIM_DB.mysql EXIM_DB.pgsql
 
 PKG_SYSCONFSUBDIR?=	exim
 EGDIR=			${PREFIX}/share/examples/exim
@@ -42,14 +42,6 @@ FILES_SUBST+=		GZCAT="${GZCAT}"
 
 _LOOKUP_LIBS+=		${LDFLAGS}
 
-# default to using db1 on platforms which have it.
-EXIM_DB.db1?=		YES
-.if ${EXIM_DB.db1} == "YES"
-USE_DB185=		YES
-.endif
-# does not compile with db4
-BDB_ACCEPTED=	native db3 db2
-
 .if defined(EXIM_DB.mysql) && ${EXIM_DB.mysql} == "YES"
 LOOKUP_INCLUDE+=	-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 LOOKUP_LIBS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
@@ -66,11 +58,9 @@ MAKE_ENV+=		LOOKUP_PGSQL=YES
 .  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
-# buildlink3 decides which libdb to use on this platform.
+BDB_ACCEPTED=	db1 db3 db2	# does not compile with db4
 .include "../../mk/bdb.buildlink3.mk"
-DBMLIB+=		${BUILDLINK_CPPFLAGS.bdb}
-DBMLIB+=		${BUILDLINK_LDFLAGS.bdb}
-DBMLIB+=		${BUILDLINK_LIBS.bdb}
+DBMLIB+=		${BDB_LIBS}
 
 MAKE_ENV+=		DBMLIB=${DBMLIB:Q}
 MAKE_ENV+=		LOOKUP_INCLUDE="${LOOKUP_INCLUDE}"
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 25469a97780..cdf0db06ea0 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/15 17:54:49 jlam Exp $
 
 DISTNAME=	maildrop-1.3.9
 PKGREVISION=	2
@@ -12,6 +12,7 @@ DEPENDS+=	courier-maildir>=0.45.6:../../mail/courier-maildir
 
 USE_BUILDLINK3=	yes
 USE_DB185=	yes
+BDB_ACCEPTED=	db2
 USE_LANGUAGES=	c c++
 
 .include "../../mail/courier-auth/Makefile.common"
@@ -29,6 +30,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.postfix ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/maildroptips.txt ${DOCDIR}
 
-.include "../../databases/db/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"