[pkgsrc/pkgsrc-2005Q2]: pkgsrc/mk Pullup ticket 614 - requested by grant beattie

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a15ca7f3178
branches:  pkgsrc-2005Q2
changeset: 495905:7a15ca7f3178
user:      snj <snj%pkgsrc.org@localhost>
date:      Wed Jul 27 04:53:57 2005 +0000

description:
Pullup ticket 614 - requested by grant beattie
bdb infrastructure fix

Revision pulled up:
- pkgsrc/mk/bdb.buildlink3.mk   1.14

    Module Name:    pkgsrc
    Committed By:   jlam
    Date:           Thu Jul 21 02:54:51 UTC 2005

    Modified Files:
            pkgsrc/mk: bdb.buildlink3.mk

    Log Message:
    databases/db/buildlink3.mk was changed a long, long time ago to use
    "db2" as the "BUILDLINK_PACKAGES" variable.  Drop the use of
    _BDB_PKGBASE.*.  This fixes the settings for BDBBASE and BDB_LIBS if
    BDB_DEFAULT is "db2".

diffstat:

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

diffs (31 lines):

diff -r 52c08f652a31 -r 7a15ca7f3178 mk/bdb.buildlink3.mk
--- a/mk/bdb.buildlink3.mk      Wed Jul 27 04:42:18 2005 +0000
+++ b/mk/bdb.buildlink3.mk      Wed Jul 27 04:53:57 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.13 2005/01/09 23:56:21 jlam Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.13.4.1 2005/07/27 04:53:57 snj Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  bdb.buildlink3.mk will:
@@ -62,10 +62,8 @@
 BDB185_DEFAULT?=       ${BDB_DEFAULT}
 .  endif
 
-_BDB_PKGBASE.db2=              db
 _BDB_PKGSRCDIR.db2=            ../../databases/db
 .  for _bdb_ in ${_BDB_PKGS}
-_BDB_PKGBASE.${_bdb_}?=                ${_bdb_}
 _BDB_PKGSRCDIR.${_bdb_}?=      ../../databases/${_bdb_}
 .  endfor
 
@@ -88,8 +86,8 @@
 .  endif
 
 # Define some public variables to refer to package-specific variables.
-BDBBASE=       ${BUILDLINK_PREFIX.${_BDB_PKGBASE.${BDB_TYPE}}}
-BDB_LIBS=      ${BUILDLINK_LDADD.${_BDB_PKGBASE.${BDB_TYPE}}}
+BDBBASE=       ${BUILDLINK_PREFIX.${BDB_TYPE}}
+BDB_LIBS=      ${BUILDLINK_LDADD.${BDB_TYPE}}
 
 BUILD_DEFS+=   BDB_TYPE
 BUILD_DEFS+=   BDBBASE