[pkgsrc/trunk]: pkgsrc/databases Always pass the location of the db[34] heade...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed25b3c3e5d4
branches:  trunk
changeset: 471728:ed25b3c3e5d4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 30 16:19:51 2004 +0000

description:
Always pass the location of the db[34] headers since we install them in a
non-standard location.  Also match the new USE_DB185 behaviour where it
defaults to "yes".

diffstat:

 databases/db3/buildlink3.mk |  5 +++--
 databases/db4/buildlink3.mk |  9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 63045b2be0b4 -r ed25b3c3e5d4 databases/db3/buildlink3.mk
--- a/databases/db3/buildlink3.mk       Tue Mar 30 16:12:38 2004 +0000
+++ b/databases/db3/buildlink3.mk       Tue Mar 30 16:19:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/22 18:18:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/03/30 16:19:51 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=    ${DB3_BUILDLINK3_MK}+
@@ -15,9 +15,10 @@
 .if !empty(DB3_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.db3+=                db3>=2.9.2
 BUILDLINK_PKGSRCDIR.db3?=      ../../databases/db3
-.  if defined(USE_DB185)
 BUILDLINK_INCDIRS.db3?=                include/db3
 BUILDLINK_TRANSFORM+=          l:db-3:db3
+USE_DB185?=                    yes
+.  !empty(USE_DB185:M[yY][eE][sS])
 BUILDLINK_TRANSFORM+=          l:db:db3
 .  endif
 .endif # DB3_BUILDLINK3_MK
diff -r 63045b2be0b4 -r ed25b3c3e5d4 databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk       Tue Mar 30 16:12:38 2004 +0000
+++ b/databases/db4/buildlink3.mk       Tue Mar 30 16:19:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/03/22 18:18:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/03/30 16:20:19 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=    ${DB4_BUILDLINK3_MK}+
@@ -15,13 +15,14 @@
 .if !empty(DB4_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.db4+=                db4>=4.2.52
 BUILDLINK_PKGSRCDIR.db4?=      ../../databases/db4
-.  if defined(USE_DB185)
+BUILDLINK_INCDIRS.db4?=                include/db4
+BUILDLINK_TRANSFORM+=          l:db-4:db4
+USE_DB185?=                    yes
+.  if !empty(USE_DB185:M[yY][eE][sS])
 #
 # Older db4 packages didn't enable the db-1.85 compatibility API.
 #
 BUILDLINK_DEPENDS.db4+=                db4>=4.2.52nb1
-BUILDLINK_INCDIRS.db4?=                include/db4
-BUILDLINK_TRANSFORM+=          l:db-4:db4
 BUILDLINK_TRANSFORM+=          l:db:db4
 .  endif
 .endif # DB4_BUILDLINK3_MK