From 6732657e9b700bd4b49c74d66bb7fb40f46d3947 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 15 Nov 2004 17:54:49 +0000
Subject: 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.
---
 mail/cucipop/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mail/cucipop')

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
 
-- 
cgit v1.2.3