From 93fc264d719265f738d72b6d81be2ee13ad85fdc Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 11 Jul 2006 14:42:03 +0000
Subject: Don't use the builtin framework for the various Xorg components when
 X11_TYPE=xorg. Let them include x11.buildlink3.mk directly. Remove the manual
 USE_BUILTIN declarations from xorg-libs/b3.mk. This fixes a symmetry in the
 dependency list depending on whether xorg-libs is installed already or not.

Discussed with jlam@
---
 x11/Xcomposite/buildlink3.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'x11/Xcomposite')

diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index b749830b204..344ab211568 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/11 14:42:03 joerg Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} == "xorg"
+.include "../../mk/x11.buildlink3.mk"
+.else
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XCOMPOSITE_BUILDLINK3_MK:=	${XCOMPOSITE_BUILDLINK3_MK}+
@@ -22,3 +28,5 @@ BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
 .include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+
+.endif
-- 
cgit v1.2.3