Create a new variable PREFER_NATIVE that has the opposite semantics

as PREFER_PKGSRC.  Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE.  If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.

12 files changed, 161 insertions, 41 deletions

diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index a4e80734cc5..96240fc9fd3 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=	# defined
@@ -31,8 +31,18 @@ _NEED_BINUTILS=		NO
 _NEED_BINUTILS=		YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_BINUTILS} == "YES"
+_NEED_BINUTILS=		NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_BINUTILS=		YES
+.endif
+.if !empty(PREFER_NATIVE:Mbinutils) && \
+    ${_BUILTIN_BINUTILS} == "YES"
+_NEED_BINUTILS=		NO
+.endif
+.if !empty(PREFER_PKGSRC:Mbinutils)
 _NEED_BINUTILS=		YES
 .endif
 
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 4dd4af7b804..0a763e11927 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -43,8 +43,18 @@ BUILDLINK_USE_BUILTIN.binutils=	YES
 BUILDLINK_USE_BUILTIN.binutils=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mbinutils) && \
+    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mbinutils)
 BUILDLINK_USE_BUILTIN.binutils=	NO
 .endif
 
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 458a25bc3f0..1a093544492 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
@@ -20,8 +20,18 @@ _NEED_CDK=	NO
 _NEED_CDK=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mcdk)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_CDK} == "YES"
+_NEED_CDK=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_CDK=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mcdk) && \
+    ${_BUILTIN_CDK} == "YES"
+_NEED_CDK=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mcdk)
 _NEED_CDK=	YES
 .endif
 
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index 07592619993..bcbe65a48ea 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.29 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.30 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
@@ -47,8 +47,18 @@ _NEED_GNU_GETTEXT=	NO
 _NEED_GNU_GETTEXT=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_GETTEXT} == "YES"
+_NEED_GNU_GETTEXT=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_GNU_GETTEXT=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mgettext) && \
+    ${_BUILTIN_GETTEXT} == "YES"
+_NEED_GNU_GETTEXT=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mgettext)
 _NEED_GNU_GETTEXT=	YES
 .endif
 
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 9ed24b3d317..2016856b231 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -56,8 +56,18 @@ BUILDLINK_USE_BUILTIN.gettext=	YES
 BUILDLINK_USE_BUILTIN.gettext=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.gettext=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.gettext=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mgettext) && \
+    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.gettext=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mgettext)
 BUILDLINK_USE_BUILTIN.gettext=	NO
 .endif
 
diff --git a/devel/libevent/buildlink2.mk b/devel/libevent/buildlink2.mk
index 78634ad0da9..d2a528ae8ee 100644
--- a/devel/libevent/buildlink2.mk
+++ b/devel/libevent/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 02:35:06 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libevent.
 #
@@ -17,13 +17,23 @@ _BUILTIN_LIBEVENT=	NO
 .endif
 
 .if ${_BUILTIN_LIBEVENT} == "YES"
-_NEED_LIBEVENT=		NO
+_NEED_LIBEVENT=	NO
 .else
-_NEED_LIBEVENT=		YES
+_NEED_LIBEVENT=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mlibevent)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_LIBEVENT} == "YES"
+_NEED_LIBEVENT=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_LIBEVENT=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mlibevent) && \
+    ${_BUILTIN_LIBEVENT} == "YES"
+_NEED_LIBEVENT=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mlibevent)
 _NEED_LIBEVENT=	YES
 .endif
 
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
index 1455fcc4305..71eb42bbb51 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/devel/ncurses/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.19 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.20 2004/02/12 02:35:06 jlam Exp $
 #
 # Optionally define:
 #
@@ -62,14 +62,24 @@ MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses}
 .endif
 
 .if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
-_NEED_NCURSES=		NO
+_NEED_NCURSES=	NO
 .else
-_NEED_NCURSES=		YES
+_NEED_NCURSES=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mncurses)
-_NEED_NCURSES=		YES
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_NCURSES} == "YES"
+_NEED_NCURSES=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_NCURSES=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mncurses) && \
+    ${_BUILTIN_NCURSES} == "YES"
+_NEED_NCURSES=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mncurses)
+_NEED_NCURSES=	YES
 .endif
 
 .if ${_NEED_NCURSES} == "YES"
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index d3f3df47188..e3a8854f906 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -97,8 +97,18 @@ BUILDLINK_USE_BUILTIN.ncurses=	YES
 BUILDLINK_USE_BUILTIN.ncurses=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mncurses)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.ncurses=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.ncurses=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mncurses) && \
+    !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.ncurses=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mncurses)
 BUILDLINK_USE_BUILTIN.ncurses=	NO
 .endif
 
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
index f395cbe82c7..8e2bc27d47d 100644
--- a/devel/readline/buildlink2.mk
+++ b/devel/readline/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/02/12 02:35:06 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -37,8 +37,18 @@ _NEED_GNU_READLINE=	NO
 _NEED_GNU_READLINE=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mreadline)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_READLINE} == "YES"
+_NEED_GNU_READLINE=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_GNU_READLINE=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mreadline) && \
+    ${_BUILTIN_READLINE} == "YES"
+_NEED_GNU_READLINE=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mreadline)
 _NEED_GNU_READLINE=	YES
 .endif
 
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index f64d39b6e48..b16b90e848b 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -45,8 +45,18 @@ BUILDLINK_USE_BUILTIN.readline=	YES
 BUILDLINK_USE_BUILTIN.readline=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mreadline)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.readline=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.readline=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mreadline) && \
+    !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.readline=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mreadline)
 BUILDLINK_USE_BUILTIN.readline=	NO
 .endif
 
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index 90bb8cc6efd..0a156635c07 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
@@ -65,8 +65,18 @@ BUILDLINK_USE_BUILTIN.zlib=	YES
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mzlib)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${BUILDLINK_IS_BUILTIN.zlib} == "YES"
+BUILDLINK_USE_BUILTIN.zlib=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mzlib) && \
+    ${BUILDLINK_IS_BUILTIN.zlib} == "YES"
+BUILDLINK_USE_BUILTIN.zlib=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mzlib)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
 
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 7b6653a13ff..c6175d794bf 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -75,8 +75,18 @@ BUILDLINK_USE_BUILTIN.zlib=	YES
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mzlib)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.zlib=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mzlib) && \
+    !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.zlib=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mzlib)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif