From faed7092a835a334a9ff0f95b1a29630948b7e93 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 26 Mar 2004 18:48:52 +0000
Subject: Reverse the use of USE_DB185 in bdb.buildlink3.mk -- it defaults to
 "yes" and packages that can't use the DB-1.85 API should set it to "no". This
 makes the native DB the preferred DB if it exists.

---
 mk/bdb.buildlink3.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'mk')

diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
index 24d3a9a4936..5d354b5c5f1 100644
--- a/mk/bdb.buildlink3.mk
+++ b/mk/bdb.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.4 2004/03/26 18:48:52 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  db.buildlink3.mk will:
@@ -52,20 +52,25 @@ MAKEFLAGS+=	_BDB_INSTALLED.${_bdb_}=${_BDB_INSTALLED.${_bdb_}}
 .    endif
 .  endfor
 
+USE_DB185?=		yes
 _BDB_OK.native?=	no
 _BDB_INSTALLED.native?=	no
-.  if defined(USE_DB185)
-.    if exists(/usr/include/db.h)
+.  if exists(/usr/include/db.h)
 _BDB_OK.native=		yes
 _BDB_INSTALLED.native=	yes
 _BDB_INCDIRS=		include
 _BDB_TRANSFORM=		# empty
-.    elif exists(/usr/include/db1/db.h)
+.  elif exists(/usr/include/db1/db.h)
 _BDB_OK.native=		yes
 _BDB_INSTALLED.native=	yes
 _BDB_INCDIRS=		include/db1
 _BDB_TRANSFORM=		l:db:db1
-.    endif
+.  endif
+.  if !empty(USE_DB185:M[nN][oO])
+_BDB_OK.native=		no
+_BDB_INSTALLED.native=	no
+_BDB_INCDIRS=		# empty
+_BDB_TRANSFORM=		# empty
 .  endif
 
 .  if !defined(_BDB_TYPE)
-- 
cgit v1.2.3