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.

12 files changed, 108 insertions, 12 deletions

diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index dee91c66b4a..c2f655cb330 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/10/28 15:54:31 heinz Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=	# defined
@@ -31,6 +31,14 @@ _NEED_BINUTILS=          YES
 .  endfor
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mbinutils)
+_NEED_BINUTILS=		YES
+.  endif
+.endif
+
 .if ${_NEED_BINUTILS} == "YES"
 BUILDLINK_PACKAGES+=		binutils
 BUILDLINK_PREFIX.binutils=	${LOCALBASE}
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index ee8d5e0818c..c21c4b03c97 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:02 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -18,6 +18,14 @@ BUILDLINK_CHECK_BUILTIN.binutils?=	NO
 BUILDLINK_IS_BUILTIN.binutils=	YES
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mbinutils)
+BUILDLINK_USE_BUILTIN.binutils=	NO
+.  endif
+.endif
+
 .if defined(USE_BINUTILS)
 BUILDLINK_USE_BUILTIN.binutils=	NO
 .endif
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 928bbd85a58..a68692c197e 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
@@ -14,6 +14,14 @@ _NEED_CDK=		NO
 _NEED_CDK=		YES
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mcdk)
+_NEED_CDK=	YES
+.  endif
+.endif
+
 .if ${_NEED_CDK} == "YES"
 BUILDLINK_PACKAGES+=		cdk
 EVAL_PREFIX+=			BUILDLINK_PREFIX.cdk=cdk
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index c60b8cbe0e9..427ceedefd1 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.25 2004/01/15 23:04:00 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.26 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
@@ -46,6 +46,14 @@ _NEED_GNU_GETTEXT=	YES
 .  endfor
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mgettext)
+_NEED_GNU_GETTEXT=	YES
+.  endif
+.endif
+
 .if ${_NEED_GNU_GETTEXT} == "YES"
 BUILDLINK_PACKAGES+=			gettext
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gettext=gettext-lib
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 96dfba1cc96..9e797d8fdef 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -20,6 +20,14 @@ BUILDLINK_IS_BUILTIN.gettext=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mgettext)
+BUILDLINK_USE_BUILTIN.gettext=	NO
+.  endif
+.endif
+
 .if defined(USE_GNU_GETTEXT)
 BUILDLINK_USE_BUILTIN.gettext=	NO
 .endif
diff --git a/devel/libevent/buildlink2.mk b/devel/libevent/buildlink2.mk
index 8920f73681f..5f5b1d62abb 100644
--- a/devel/libevent/buildlink2.mk
+++ b/devel/libevent/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/06/23 13:28:53 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libevent.
 #
@@ -14,6 +14,14 @@ _NEED_LIBEVENT=		NO
 _NEED_LIBEVENT=		YES
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mlibevent)
+_NEED_LIBEVENT=	YES
+.  endif
+.endif
+
 .if ${_NEED_LIBEVENT} == "YES"
 BUILDLINK_PACKAGES+=			libevent
 BUILDLINK_DEPENDS.libevent?=		libevent>=0.6
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
index e07c70a21d7..42d6307d36e 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/devel/ncurses/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.15 2003/12/30 23:14:18 cjep Exp $
+# $NetBSD: buildlink2.mk,v 1.16 2004/02/05 06:58:03 jlam Exp $
 #
 # Optionally define:
 #
@@ -50,6 +50,14 @@ _NEED_NCURSES=		YES
 .  endfor
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mncurses)
+_NEED_NCURSES=	YES
+.  endif
+.endif
+
 .if ${_NEED_NCURSES} == "YES"
 BUILDLINK_PACKAGES+=		ncurses
 EVAL_PREFIX+=			BUILDLINK_PREFIX.ncurses=ncurses
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index f7ef5fdab0b..b0423baa6db 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -40,6 +40,14 @@ BUILDLINK_IS_BUILTIN.ncurses!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses="${BUILDLINK_IS_BUILTIN.ncurses}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mncurses)
+BUILDLINK_USE_BUILTIN.ncurses=	NO
+.  endif
+.endif
+
 .if defined(USE_NCURSES)
 BUILDLINK_USE_BUILTIN.ncurses=	NO
 .endif
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
index 1cc23a00d14..bdc16dcb45d 100644
--- a/devel/readline/buildlink2.mk
+++ b/devel/readline/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 21:46:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -36,6 +36,14 @@ _NEED_GNU_READLINE=	YES
 .  endfor
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mreadline)
+_NEED_GNU_READLINE=	YES
+.  endif
+.endif
+
 .if ${_NEED_GNU_READLINE} == "YES"
 BUILDLINK_PACKAGES+=		readline
 EVAL_PREFIX+=			BUILDLINK_PREFIX.readline=readline
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 48a538dff39..cfc0acd08e2 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:03 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -26,6 +26,14 @@ BUILDLINK_IS_BUILTIN.readline=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mreadline)
+BUILDLINK_USE_BUILTIN.readline=	NO
+.  endif
+.endif
+
 .if defined(USE_GNU_READLINE)
 BUILDLINK_USE_BUILTIN.readline=	NO
 .endif
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index 9baa9cb6b80..e0e43e3fdfc 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/01/19 23:11:19 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
@@ -17,6 +17,14 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mzlib)
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.  endif
+.endif
+
 .if defined(USE_ZLIB)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 169b3edd3ab..6106e99cc0b 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/26 02:39:17 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -22,6 +22,14 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mzlib)
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.  endif
+.endif
+
 .if defined(USE_ZLIB)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif