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

environment overrides all other settings.

3 files changed, 54 insertions, 48 deletions

diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index c08966469bd..d26c3e04bab 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -80,29 +80,31 @@ BUILDLINK_IS_BUILTIN.MesaLib!=	\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.MesaLib=${BUILDLINK_IS_BUILTIN.MesaLib}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib=	YES
-.else
-BUILDLINK_USE_BUILTIN.MesaLib=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.MesaLib)
+.  if !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.MesaLib=	NO
-.endif
-.if !empty(PREFER_NATIVE:MMesaLib) && \
-    !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS])
+.  endif
+
+.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+      !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib=	YES
-.endif
-.if !empty(PREFER_PKGSRC:MMesaLib)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib=	NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS])
+.  endif
+.  if !empty(PREFER_NATIVE:MMesaLib) && \
+      !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib=	YES
+.  endif
+.  if !empty(PREFER_PKGSRC:MMesaLib)
+BUILDLINK_USE_BUILTIN.MesaLib=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[nN][oO])
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 8b8a87d7829..58860fc6992 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -59,29 +59,31 @@ BUILDLINK_IS_BUILTIN.freetype2!=	\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.freetype2=${BUILDLINK_IS_BUILTIN.freetype2}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]I)
+.if !empty(BUILDLINK_CHECK_BUILTIN.freetype2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.freetype2=	YES
-.else
-BUILDLINK_USE_BUILTIN.freetype2=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.freetype2)
+.  if !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]I)
 BUILDLINK_USE_BUILTIN.freetype2=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.freetype2=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mfreetype2) && \
-    !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS])
+.  endif
+
+.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+      !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.freetype2=	YES
-.endif
-.if !empty(PREFER_PKGSRC:Mfreetype2)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.freetype2=	NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.freetype2:M[yY][eE][sS])
+.  endif
+.  if !empty(PREFER_NATIVE:Mfreetype2) && \
+      !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.freetype2=	YES
+.  endif
+.  if !empty(PREFER_PKGSRC:Mfreetype2)
+BUILDLINK_USE_BUILTIN.freetype2=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[nN][oO])
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 9d564bc993d..90739f0c13a 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -54,29 +54,31 @@ BUILDLINK_IS_BUILTIN.glu!=	\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.glu=${BUILDLINK_IS_BUILTIN.glu}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu=	YES
-.else
-BUILDLINK_USE_BUILTIN.glu=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.glu)
+.  if !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.glu=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mglu) && \
-    !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS])
+.  endif
+
+.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+      !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu=	YES
-.endif
-.if !empty(PREFER_PKGSRC:Mglu)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu=	NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS])
+.  endif
+.  if !empty(PREFER_NATIVE:Mglu) && \
+      !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu=	YES
+.  endif
+.  if !empty(PREFER_PKGSRC:Mglu)
+BUILDLINK_USE_BUILTIN.glu=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.glu:M[nN][oO])