4 files changed, 53 insertions, 13 deletions
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 58ae99ab19e..c08966469bd 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -86,8 +86,18 @@ BUILDLINK_USE_BUILTIN.MesaLib=	YES
 BUILDLINK_USE_BUILTIN.MesaLib=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:MMesaLib)
+.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:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.MesaLib=	NO
+.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
 
diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk
index 0f442ad7bfa..fed2614cd76 100644
--- a/graphics/freetype2/buildlink2.mk
+++ b/graphics/freetype2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.16 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.17 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(FREETYPE2_BUILDLINK2_MK)
 FREETYPE2_BUILDLINK2_MK=	# defined
@@ -45,7 +45,7 @@ _BUILTIN_FREETYPE2!=	\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	_BUILTIN_FREETYPE=${_BUILTIN_FREETYPE}
+MAKEFLAGS+=	_BUILTIN_FREETYPE2=${_BUILTIN_FREETYPE2}
 .endif
 
 .if !empty(_BUILTIN_FREETYPE2:M[yY][eE][sS])
@@ -54,8 +54,18 @@ _NEED_FREETYPE2=	NO
 _NEED_FREETYPE2=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mfreetype2)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_FREETYPE2} == "YES"
+_NEED_FREETYPE2=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_FREETYPE2=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mfreetype2) && \
+    ${_BUILTIN_FREETYPE2} == "YES"
+_NEED_FREETYPE2=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mfreetype2)
 _NEED_FREETYPE2=	YES
 .endif
 
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 7ddaad003c6..8b8a87d7829 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -65,8 +65,18 @@ BUILDLINK_USE_BUILTIN.freetype2=	YES
 BUILDLINK_USE_BUILTIN.freetype2=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mfreetype2)
+.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:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.freetype2=	NO
+.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
 
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 290e9b871c1..9d564bc993d 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -60,8 +60,18 @@ BUILDLINK_USE_BUILTIN.glu=	YES
 BUILDLINK_USE_BUILTIN.glu=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mglu)
+.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:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.glu=	NO
+.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