From 07a9d8dfb209780130723eba289f41872654e7c3 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 5 Feb 2004 06:58:02 +0000
Subject: Support a new global variable:

BUILDLINK_PREFER_PKGSRC
	This variable determines whether or not to prefer the pkgsrc
	versions of software that is also present in the base system.

	This variable is multi-state:
		defined, or "yes"	always prefer the pkgsrc versions
		not defined, or "no"	only use the pkgsrc versions if
					needed by dependency requirements

	This can also take a list of packages for which to prefer the
	pkgsrc-installed software.  The package names may be found by
	consulting the value added to BUILDLINK_PACKAGES in the
	buildlink[23].mk files for that package.
---
 databases/db/buildlink2.mk | 10 +++++++++-
 databases/db/buildlink3.mk | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'databases/db')

diff --git a/databases/db/buildlink2.mk b/databases/db/buildlink2.mk
index de5ec684459..356b3e68f74 100644
--- a/databases/db/buildlink2.mk
+++ b/databases/db/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/01 21:10:05 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/05 06:58:02 jlam Exp $
 
 .if !defined(DB_BUILDLINK2_MK)
 DB_BUILDLINK2_MK=	# defined
@@ -35,6 +35,14 @@ _NEED_DB2=			NO
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mdb)
+_NEED_DB2=	YES
+.  endif
+.endif
+
 .if ${_NEED_DB2} == "YES"
 BUILDLINK_PACKAGES+=		db
 EVAL_PREFIX+=			BUILDLINK_PREFIX.db=db
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index c1a3f892a74..ef24887b2ce 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=	${DB2_BUILDLINK3_MK}+
@@ -9,6 +9,14 @@ BUILDLINK_DEPENDS.db+=		db>=2.7.3
 BUILDLINK_PKGSRCDIR.db?=	../../databases/db
 .endif	# DB2_BUILDLINK3_MK
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mdb)
+BUILDLINK_USE_BUILTIN.db=	NO
+.  endif
+.endif
+
 .if !defined(BUILDLINK_USE_BUILTIN.db)
 BUILDLINK_USE_BUILTIN.db=	NO
 .  if defined(USE_DB185)
-- 
cgit v1.2.3