diff options
author | joerg <joerg> | 2006-07-11 14:42:03 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-07-11 14:42:03 +0000 |
commit | 93fc264d719265f738d72b6d81be2ee13ad85fdc (patch) | |
tree | 0190bc57d36fec416f1e9fd1df7dfdccaaa161e1 | |
parent | 54427882210692b679df0b7808ed41b4a7ff7783 (diff) | |
download | pkgsrc-93fc264d719265f738d72b6d81be2ee13ad85fdc.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@
-rw-r--r-- | x11/Xcomposite/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/Xfixes/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/Xrandr-mixedcase/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/Xrender/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/compositeproto/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/fixesproto/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/randrproto/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/renderproto/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/xcursor/buildlink3.mk | 11 | ||||
-rw-r--r-- | x11/xextproto/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/xorg-libs/builtin.mk | 11 | ||||
-rw-r--r-- | x11/xproto/buildlink3.mk | 10 |
12 files changed, 101 insertions, 21 deletions
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 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 diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index b082d456b91..7eae8dde86b 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 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}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -21,3 +27,5 @@ BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr .include "../../x11/Xrender/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 53560886741..8de04a33690 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.41 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -21,3 +27,5 @@ BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender .include "../../x11/renderproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk index 1cd74ed2730..f7162feef43 100644 --- a/x11/compositeproto/buildlink3.mk +++ b/x11/compositeproto/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else BUILDLINK_DEPMETHOD.compositeproto?= build @@ -22,3 +28,5 @@ BUILDLINK_PKGSRCDIR.compositeproto?= ../../x11/compositeproto .include "../../x11/xproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk index 1bac58735ce..415b3d95638 100644 --- a/x11/fixesproto/buildlink3.mk +++ b/x11/fixesproto/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else BUILDLINK_DEPMETHOD.fixesproto?= build @@ -23,3 +29,5 @@ BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk index 073d16dbc29..a42bdb83f17 100644 --- a/x11/randrproto/buildlink3.mk +++ b/x11/randrproto/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else BUILDLINK_DEPMETHOD.randrproto?= build @@ -19,3 +25,5 @@ BUILDLINK_PKGSRCDIR.randrproto?= ../../x11/randrproto .endif # RANDRPROTO_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk index 59b7f2e2673..c7eb818f8cd 100644 --- a/x11/renderproto/buildlink3.mk +++ b/x11/renderproto/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RENDERPROTO_BUILDLINK3_MK:= ${RENDERPROTO_BUILDLINK3_MK}+ @@ -18,3 +24,5 @@ BUILDLINK_DEPMETHOD.renderproto?= build .endif # RENDERPROTO_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 090a03d215c..48205230303 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -23,3 +30,5 @@ BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor .include "../../x11/Xrender/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk index c37fdbe7a09..c7a88b4ae32 100644 --- a/x11/xextproto/buildlink3.mk +++ b/x11/xextproto/buildlink3.mk @@ -1,4 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else BUILDLINK_DEPMETHOD.xextproto?= build @@ -19,3 +25,5 @@ BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto .endif # XEXTPROTO_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk index 64c85603964..12d933b92aa 100644 --- a/x11/xorg-libs/builtin.mk +++ b/x11/xorg-libs/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.6 2006/04/18 19:48:30 reed Exp $ +# $NetBSD: builtin.mk,v 1.7 2006/07/11 14:42:04 joerg Exp $ BUILTIN_PKG:= xorg-libs @@ -70,13 +70,4 @@ BUILDLINK_PREFIX.xorg-libs= ${X11BASE} BUILDLINK_FILES.xorg-libs+= lib/pkgconfig/xorg-libs.pc . endif -# XXX -# XXX xorg-libs provides some X11 pieces that pkgsrc should currently -# XXX treat as "built-in" so that extra dependencies on the pkgsrc -# XXX versions aren't pulled in. -# XXX -USE_BUILTIN.Xfixes= yes -USE_BUILTIN.Xcomposite= yes -USE_BUILTIN.renderproto= yes - .endif # CHECK_BUILTIN.xorg-libs diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk index ecba2dcb864..5ae03d1d82c 100644 --- a/x11/xproto/buildlink3.mk +++ b/x11/xproto/buildlink3.mk @@ -1,8 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/07/11 14:42:04 joerg Exp $ # # This Makefile fragment is included by packages that use xproto. # +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XPROTO_BUILDLINK3_MK:= ${XPROTO_BUILDLINK3_MK}+ @@ -21,3 +27,5 @@ BUILDLINK_DEPMETHOD.xproto?= build .endif # XPROTO_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif |