Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the

environment overrides all other settings.

5 files changed, 110 insertions, 100 deletions

diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 0a763e11927..e240ae1c192 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -37,33 +37,35 @@ BUILDLINK_IS_BUILTIN.binutils=	NO
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.binutils=${BUILDLINK_IS_BUILTIN.binutils}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.binutils=	YES
-.else
-BUILDLINK_USE_BUILTIN.binutils=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.binutils)
+.  if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.binutils=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.binutils=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mbinutils) && \
-    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+.  endif
+
+.  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:Mbinutils)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.binutils=	NO
-.endif
-
-.if defined(USE_BINUTILS)
+.  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
+.  endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.binutils=	YES
+.  if defined(USE_BINUTILS)
+BUILDLINK_USE_BUILTIN.binutils=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 2016856b231..9855b406820 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -50,33 +50,35 @@ BUILDLINK_IS_BUILTIN.gettext=	NO
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.gettext=${BUILDLINK_IS_BUILTIN.gettext}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.gettext:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.gettext=	YES
-.else
-BUILDLINK_USE_BUILTIN.gettext=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.gettext)
+.  if !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.gettext=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.gettext=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mgettext) && \
-    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+.  endif
+
+.  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:Mgettext)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.gettext=	NO
-.endif
-
-.if defined(USE_GNU_GETTEXT)
+.  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
+.  endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.gettext:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.gettext=	YES
+.  if defined(USE_GNU_GETTEXT)
+BUILDLINK_USE_BUILTIN.gettext=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index f34004151d5..ecca05c1389 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/02/17 16:02:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -91,36 +91,38 @@ BUILDLINK_IS_BUILTIN.ncurses=	NO
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.ncurses=	YES
-.else
-BUILDLINK_USE_BUILTIN.ncurses=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.ncurses)
+.  if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.ncurses=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.ncurses=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mncurses) && \
-    !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+.  endif
+
+.  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:Mncurses)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.ncurses=	NO
-.endif
-
-.if defined(USE_NCURSES)
-.  if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \
-      !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS])
+.  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
-.endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.ncurses=	YES
+.  if defined(USE_NCURSES)
+.    if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \
+        !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.ncurses=	NO
+.    endif
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[nN][oO])
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 973f7714165..483077bacc3 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/17 15:57:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=	${READLINE_BUILDLINK3_MK}+
@@ -98,37 +98,39 @@ BUILDLINK_IS_BUILTIN.readline=	NO
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.readline=${BUILDLINK_IS_BUILTIN.readline}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.readline:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.readline=	YES
-.else
-BUILDLINK_USE_BUILTIN.readline=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.readline)
+.  if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.readline=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.readline=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mreadline) && \
-    !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS])
+.  endif
+
+.  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:Mreadline)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.readline=	NO
-.endif
-
-.if defined(USE_GNU_READLINE)
-.  if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) && \
-      !empty(_BLNK_LIBREADLINE_FOUND:M[nN][oO]) && \
-      !empty(_BLNK_LIBEDIT_FOUND:M[yY][eE][sS])
+.  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
-.endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.readline:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.readline=	YES
+.  if defined(USE_GNU_READLINE)
+.    if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) && \
+        !empty(_BLNK_LIBREADLINE_FOUND:M[nN][oO]) && \
+        !empty(_BLNK_LIBEDIT_FOUND:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.readline=	NO
+.    endif
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.readline:M[nN][oO])
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index c6175d794bf..c9f47b1d6e7 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -69,33 +69,35 @@ BUILDLINK_IS_BUILTIN.zlib!=	\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.zlib=${BUILDLINK_IS_BUILTIN.zlib}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.zlib=	YES
-.else
-BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.zlib)
+.  if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.zlib=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.zlib=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mzlib) && \
-    !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS])
+.  endif
+
+.  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:Mzlib)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.zlib=	NO
-.endif
-
-.if defined(USE_ZLIB)
+.  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
+.  endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.zlib=	YES
+.  if defined(USE_ZLIB)
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO])