From 555f2ef6ff897896e1ce29759e30656b54e6f569 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 19 Feb 2004 18:51:01 +0000
Subject: Move the settings, which force the use of builtin versions of
 dependencies if the builtin version of the package is being used, into a
 global location so that they're always executed.

---
 fonts/Xft2/buildlink3.mk | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'fonts/Xft2')

diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 1152cc85e32..1835b6dc8a7 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:53:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/19 18:51:01 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
@@ -124,12 +124,15 @@ BUILDLINK_DEPENDS+=		Xft2
 .  endif
 .endif
 
-.if !empty(XFT2_BUILDLINK3_MK:M+)
-.  if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[yY][eE][sS])
-BUILDLINK_PREFIX.Xft2=			${X11BASE}
-BUILDLINK_FILES.Xft2+=			lib/pkgconfig/xft.pc
+.if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.fontconfig=	yes
 BUILDLINK_USE_BUILTIN.Xrender=		yes
+.endif
+
+.if !empty(XFT2_BUILDLINK3_MK:M+)
+.  if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[yY][eE][sS])
+BUILDLINK_PREFIX.Xft2=	${X11BASE}
+BUILDLINK_FILES.Xft2+=	lib/pkgconfig/xft.pc
 .  endif
 USE_X11=	yes
 .  if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[nN][oO])
-- 
cgit v1.2.3