From 6307bde7a7258ed4e5753e449b7a171bbd37c29b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 11 Mar 2004 08:33:52 +0000
Subject: Use the correct PKGBASE when referring to the "db2" package.  Also
 remove a pasto that caused using the native bdb to also depend on db4.

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

(limited to 'mk/bdb.buildlink3.mk')

diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
index 53d42ddc0c2..066cf9dd064 100644
--- a/mk/bdb.buildlink3.mk
+++ b/mk/bdb.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.1 2004/03/10 18:06:06 jlam Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.2 2004/03/11 08:33:52 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  db.buildlink3.mk will:
@@ -43,7 +43,7 @@ _BDB_ACCEPTED=	${BDB_ACCEPTED}
 _BDB_OK.${_bdb_}=	yes
 .    if !defined(_BDB_INSTALLED.${_bdb_})
 _BDB_INSTALLED.${_bdb_}!=	\
-	if ${PKG_INFO} -qe ${_bdb_}; then				\
+	if ${PKG_INFO} -qe ${_BDB_PKGBASE.${_bdb_}}; then		\
 		${ECHO} "yes";						\
 	else								\
 		${ECHO} "no";						\
@@ -111,7 +111,6 @@ BUILDLINK_PACKAGES+=		db-native
 BUILDLINK_INCDIRS.db-native?=	${_BDB_INCDIRS}
 BUILDLINK_TRANSFORM?=		${_BDB_TRANSFORM}
 BDBBASE=	${BUILDLINK_PREFIX.db-native}
-.      include "../../databases/db4/buildlink3.mk"
 .    elif ${BDB_TYPE} == "db4"
 BDBBASE=	${BUILDLINK_PREFIX.db4}
 .      include "../../databases/db4/buildlink3.mk"
-- 
cgit v1.2.3