summaryrefslogtreecommitdiff
path: root/x11/Xfixes
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-07-11 14:42:03 +0000
committerjoerg <joerg@pkgsrc.org>2006-07-11 14:42:03 +0000
commit19338c63c50ffb698124e28db5047d5a795ae162 (patch)
tree0190bc57d36fec416f1e9fd1df7dfdccaaa161e1 /x11/Xfixes
parenteaed07817ebc9c3e05c54db101b70d95c9dfea76 (diff)
downloadpkgsrc-19338c63c50ffb698124e28db5047d5a795ae162.tar.gz
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@
Diffstat (limited to 'x11/Xfixes')
-rw-r--r--x11/Xfixes/buildlink3.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 26a67e891fb..6a1a6b6ffc9 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 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}+
XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+
@@ -21,3 +27,5 @@ BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes
.include "../../x11/fixesproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif