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.

5 files changed, 32 insertions, 17 deletions

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])
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index b3c9194bec0..a46b3db1225 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/18 16:53:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/19 18:51:01 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
@@ -98,13 +98,16 @@ BUILDLINK_DEPENDS+=		fontconfig
 .  endif
 .endif
 
-.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
-.  if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS])
-BUILDLINK_PREFIX.fontconfig=		${X11BASE}
-BUILDLINK_FILES.fontconfig+=		lib/pkgconfig/fontconfig.pc
+.if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.zlib=		yes
 BUILDLINK_USE_BUILTIN.freetype2=	yes
 BUILDLINK_USE_BUILTIN.expat=		yes
+.endif
+
+.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
+.  if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS])
+BUILDLINK_PREFIX.fontconfig=	${X11BASE}
+BUILDLINK_FILES.fontconfig+=	lib/pkgconfig/fontconfig.pc
 .  endif
 
 USE_X11=			yes
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 88e4d82b267..1388f8aeae9 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/18 16:53:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/19 18:51:01 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -124,11 +124,14 @@ BUILDLINK_DEPENDS+=		Xrandr
 .  endif
 .endif
 
+.if !empty(BUILDLINK_USE_BUILTIN.Xrandr:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.randrext=	yes
+BUILDLINK_USE_BUILTIN.Xrender=	yes
+.endif
+
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
 .  if !empty(BUILDLINK_USE_BUILTIN.Xrandr:M[yY][eE][sS])
 BUILDLINK_PREFIX.Xrandr=	${X11BASE}
-BUILDLINK_USE_BUILTIN.randrext=	yes
-BUILDLINK_USE_BUILTIN.Xrender=	yes
 .  endif
 USE_X11=	yes
 .  if !empty(BUILDLINK_CHECK_BUILTIN.Xrandr:M[nN][oO])
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 6636022a56d..892d4f3bda9 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2004/02/18 16:53:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2004/02/19 18:51:01 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -126,10 +126,13 @@ BUILDLINK_DEPENDS+=		Xrender
 .  endif
 .endif
 
+.if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.render=	yes
+.endif
+
 .if !empty(XRENDER_BUILDLINK3_MK:M+)
 .  if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[yY][eE][sS])
 BUILDLINK_PREFIX.Xrender=	${X11BASE}
-BUILDLINK_USE_BUILTIN.render=	yes
 .  endif
 USE_X11=	yes
 .  if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[nN][oO])
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index bd1c42df907..3f4f55c9118 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/18 16:53:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/19 18:51:01 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
@@ -87,12 +87,15 @@ BUILDLINK_DEPENDS+=	xcursor
 .  endif
 .endif
 
+.if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.Xrender=	yes
+.endif
+
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
 .  if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS])
 BUILDLINK_PREFIX.xcursor=	${X11BASE}
 BUILDLINK_FILES.xcursor+=	lib/pkgconfig/xcursor.pc
-BUILDLINK_USE_BUILTIN.Xrender=	yes
 .  endif
 
 USE_X11=			yes