Make PREFER_PKGSRC just yes/no or a list of packages. This makes it

simpler to understand.

12 files changed, 40 insertions, 60 deletions

diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index 5ab21aef507..557209477f9 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=	# defined
@@ -31,11 +31,9 @@ _NEED_BINUTILS=          YES
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mbinutils)
 _NEED_BINUTILS=		YES
-.  endif
 .endif
 
 .if ${_NEED_BINUTILS} == "YES"
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 46d803f9743..c5aad2b4866 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -18,11 +18,9 @@ BUILDLINK_CHECK_BUILTIN.binutils?=	NO
 BUILDLINK_IS_BUILTIN.binutils=	YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mbinutils)
 BUILDLINK_USE_BUILTIN.binutils=	NO
-.  endif
 .endif
 
 .if defined(USE_BINUTILS)
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 7abe50a0981..7277eee1aaf 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 07:06:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/02/05 07:17:15 jlam Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
 
+.include "../../mk/bsd.prefs.mk"
+
 BUILDLINK_DEPENDS.cdk?=		cdk>=4.9.9nb1
 BUILDLINK_PKGSRCDIR.cdk?=	../../devel/cdk
 
@@ -14,11 +16,9 @@ _NEED_CDK=		NO
 _NEED_CDK=		YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mcdk)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mcdk)
 _NEED_CDK=	YES
-.  endif
 .endif
 
 .if ${_NEED_CDK} == "YES"
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index d43c97108c7..729953a4d93 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.27 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.28 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
@@ -46,11 +46,9 @@ _NEED_GNU_GETTEXT=	YES
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mgettext)
 _NEED_GNU_GETTEXT=	YES
-.  endif
 .endif
 
 .if ${_NEED_GNU_GETTEXT} == "YES"
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 3eb540c8900..2373f69c7b2 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -20,11 +20,9 @@ BUILDLINK_IS_BUILTIN.gettext=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mgettext)
 BUILDLINK_USE_BUILTIN.gettext=	NO
-.  endif
 .endif
 
 .if defined(USE_GNU_GETTEXT)
diff --git a/devel/libevent/buildlink2.mk b/devel/libevent/buildlink2.mk
index edf04710db9..fdb72dc7477 100644
--- a/devel/libevent/buildlink2.mk
+++ b/devel/libevent/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:17:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libevent.
 #
@@ -8,17 +8,17 @@
 .if !defined(LIBEVENT_BUILDLINK2_MK)
 LIBEVENT_BUILDLINK2_MK=	# defined
 
+.include "../../mk/bsd.prefs.mk"
+
 .if exists(/usr/include/event.h)
 _NEED_LIBEVENT=		NO
 .else
 _NEED_LIBEVENT=		YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mlibevent)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mlibevent)
 _NEED_LIBEVENT=	YES
-.  endif
 .endif
 
 .if ${_NEED_LIBEVENT} == "YES"
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
index a55e5f53c2e..3f634b65a69 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/devel/ncurses/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2004/02/05 07:17:14 jlam Exp $
 #
 # Optionally define:
 #
@@ -50,11 +50,9 @@ _NEED_NCURSES=		YES
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mncurses)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mncurses)
 _NEED_NCURSES=	YES
-.  endif
 .endif
 
 .if ${_NEED_NCURSES} == "YES"
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 3457dcca648..92ebf9e53f8 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -40,11 +40,9 @@ BUILDLINK_IS_BUILTIN.ncurses!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses="${BUILDLINK_IS_BUILTIN.ncurses}"
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mncurses)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mncurses)
 BUILDLINK_USE_BUILTIN.ncurses=	NO
-.  endif
 .endif
 
 .if defined(USE_NCURSES)
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
index 993db1bdae4..b1b01d8dc5f 100644
--- a/devel/readline/buildlink2.mk
+++ b/devel/readline/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 07:17:14 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -36,11 +36,9 @@ _NEED_GNU_READLINE=	YES
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mreadline)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mreadline)
 _NEED_GNU_READLINE=	YES
-.  endif
 .endif
 
 .if ${_NEED_GNU_READLINE} == "YES"
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 6d8f65509cd..fd19e15c227 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -26,11 +26,9 @@ BUILDLINK_IS_BUILTIN.readline=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mreadline)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mreadline)
 BUILDLINK_USE_BUILTIN.readline=	NO
-.  endif
 .endif
 
 .if defined(USE_GNU_READLINE)
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index 443a4638338..9f2e35b843a 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
@@ -17,11 +17,9 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mzlib)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mzlib)
 BUILDLINK_USE_BUILTIN.zlib=	NO
-.  endif
 .endif
 
 .if defined(USE_ZLIB)
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 024a10f6007..fad9c1c33b5 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -22,11 +22,9 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mzlib)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mzlib)
 BUILDLINK_USE_BUILTIN.zlib=	NO
-.  endif
 .endif
 
 .if defined(USE_ZLIB)