pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Use the correct PKGBASE when referring to the "db2"...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9ec37ae1175
branches:  trunk
changeset: 470660:b9ec37ae1175
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 11 08:33:52 2004 +0000

description:
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.

diffstat:

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

diffs (26 lines):

diff -r 411c50026596 -r b9ec37ae1175 mk/bdb.buildlink3.mk
--- a/mk/bdb.buildlink3.mk      Thu Mar 11 08:31:51 2004 +0000
+++ b/mk/bdb.buildlink3.mk      Thu Mar 11 08:33:52 2004 +0000
@@ -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_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_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"



Home | Main Index | Thread Index | Old Index