Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its

value outside of buildlink-related files.

12 files changed, 48 insertions, 60 deletions

diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index c2f655cb330..5ab21aef507 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 07:06:15 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=	# defined
@@ -31,10 +31,9 @@ _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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mbinutils)
 _NEED_BINUTILS=		YES
 .  endif
 .endif
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index c21c4b03c97..46d803f9743 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -18,10 +18,9 @@ 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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mbinutils)
 BUILDLINK_USE_BUILTIN.binutils=	NO
 .  endif
 .endif
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index a68692c197e..7abe50a0981 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 07:06:16 jlam Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
@@ -14,10 +14,9 @@ _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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mcdk)
 _NEED_CDK=	YES
 .  endif
 .endif
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index 427ceedefd1..d43c97108c7 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.26 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.27 2004/02/05 07:06:15 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
@@ -46,10 +46,9 @@ _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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mgettext)
 _NEED_GNU_GETTEXT=	YES
 .  endif
 .endif
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 9e797d8fdef..3eb540c8900 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -20,10 +20,9 @@ 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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mgettext)
 BUILDLINK_USE_BUILTIN.gettext=	NO
 .  endif
 .endif
diff --git a/devel/libevent/buildlink2.mk b/devel/libevent/buildlink2.mk
index 5f5b1d62abb..edf04710db9 100644
--- a/devel/libevent/buildlink2.mk
+++ b/devel/libevent/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libevent.
 #
@@ -14,10 +14,9 @@ _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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mlibevent)
 _NEED_LIBEVENT=	YES
 .  endif
 .endif
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
index 42d6307d36e..a55e5f53c2e 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/devel/ncurses/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.16 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.17 2004/02/05 07:06:15 jlam Exp $
 #
 # Optionally define:
 #
@@ -50,10 +50,9 @@ _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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mncurses)
 _NEED_NCURSES=	YES
 .  endif
 .endif
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index b0423baa6db..3457dcca648 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/05 07:06:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -40,10 +40,9 @@ 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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mncurses)
 BUILDLINK_USE_BUILTIN.ncurses=	NO
 .  endif
 .endif
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
index bdc16dcb45d..993db1bdae4 100644
--- a/devel/readline/buildlink2.mk
+++ b/devel/readline/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:06:15 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -36,10 +36,9 @@ _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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mreadline)
 _NEED_GNU_READLINE=	YES
 .  endif
 .endif
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index cfc0acd08e2..6d8f65509cd 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -26,10 +26,9 @@ 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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mreadline)
 BUILDLINK_USE_BUILTIN.readline=	NO
 .  endif
 .endif
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index e0e43e3fdfc..443a4638338 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
@@ -17,10 +17,9 @@ 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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mzlib)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .  endif
 .endif
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 6106e99cc0b..024a10f6007 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -22,10 +22,9 @@ 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)
+.if defined(PREFER_PKGSRC)
+.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:Mzlib)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .  endif
 .endif