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

environment overrides all other settings.

2 files changed, 36 insertions, 32 deletions

diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 64bf108ebba..3b72cb9dad6 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/17 16:48:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
@@ -90,29 +90,31 @@ BUILDLINK_IS_BUILTIN.Xft2!=	\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.Xft2=${BUILDLINK_IS_BUILTIN.Xft2}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.Xft2=	YES
-.else
-BUILDLINK_USE_BUILTIN.Xft2=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.Xft2)
+.  if !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.Xft2=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.Xft2=	NO
-.endif
-.if !empty(PREFER_NATIVE:MXft2) && \
-    !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS])
+.  endif
+
+.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+      !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.Xft2=	YES
-.endif
-.if !empty(PREFER_PKGSRC:MXft2)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.Xft2=	NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[yY][eE][sS])
+.  endif
+.  if !empty(PREFER_NATIVE:MXft2) && \
+      !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.Xft2=	YES
+.  endif
+.  if !empty(PREFER_PKGSRC:MXft2)
+BUILDLINK_USE_BUILTIN.Xft2=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[nN][oO])
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index 11f198032be..f1042c82f02 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/18 14:58:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
@@ -64,29 +64,31 @@ MAKEFLAGS+=	\
 	BUILDLINK_IS_BUILTIN.fontconfig=${BUILDLINK_IS_BUILTIN.fontconfig}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.fontconfig=	YES
-.else
-BUILDLINK_USE_BUILTIN.fontconfig=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.fontconfig)
+.  if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.fontconfig=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.fontconfig=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mfontconfig) && \
-    !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
+.  endif
+
+.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+      !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.fontconfig=	YES
-.endif
-.if !empty(PREFER_PKGSRC:Mfontconfig)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.fontconfig=	NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS])
+.  endif
+.  if !empty(PREFER_NATIVE:Mfontconfig) && \
+      !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.fontconfig=	YES
+.  endif
+.  if !empty(PREFER_PKGSRC:Mfontconfig)
+BUILDLINK_USE_BUILTIN.fontconfig=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[nN][oO])