[pkgsrc/trunk]: pkgsrc/x11 Don't use the builtin framework for the various Xo...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71a6be290e0f
branches:  trunk
changeset: 515956:71a6be290e0f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 11 14:42:03 2006 +0000

description:
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:

 x11/Xcomposite/buildlink3.mk       |  10 +++++++++-
 x11/Xfixes/buildlink3.mk           |  10 +++++++++-
 x11/Xrandr-mixedcase/buildlink3.mk |  10 +++++++++-
 x11/Xrender/buildlink3.mk          |  10 +++++++++-
 x11/compositeproto/buildlink3.mk   |  10 +++++++++-
 x11/fixesproto/buildlink3.mk       |  10 +++++++++-
 x11/randrproto/buildlink3.mk       |  10 +++++++++-
 x11/renderproto/buildlink3.mk      |  10 +++++++++-
 x11/xcursor/buildlink3.mk          |  11 ++++++++++-
 x11/xextproto/buildlink3.mk        |  10 +++++++++-
 x11/xorg-libs/builtin.mk           |  11 +----------
 x11/xproto/buildlink3.mk           |  10 +++++++++-
 12 files changed, 101 insertions(+), 21 deletions(-)

diffs (259 lines):

diff -r d139d9f0a462 -r 71a6be290e0f x11/Xcomposite/buildlink3.mk
--- a/x11/Xcomposite/buildlink3.mk      Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/Xcomposite/buildlink3.mk      Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/Xfixes/buildlink3.mk
--- a/x11/Xfixes/buildlink3.mk  Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/Xfixes/buildlink3.mk  Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/Xrandr-mixedcase/buildlink3.mk
--- a/x11/Xrandr-mixedcase/buildlink3.mk        Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/Xrandr-mixedcase/buildlink3.mk        Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/Xrender/buildlink3.mk
--- a/x11/Xrender/buildlink3.mk Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/Xrender/buildlink3.mk Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .include "../../x11/renderproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/compositeproto/buildlink3.mk
--- a/x11/compositeproto/buildlink3.mk  Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/compositeproto/buildlink3.mk  Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/fixesproto/buildlink3.mk
--- a/x11/fixesproto/buildlink3.mk      Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/fixesproto/buildlink3.mk      Tue Jul 11 14:42:03 2006 +0000
@@ -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_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/randrproto/buildlink3.mk
--- a/x11/randrproto/buildlink3.mk      Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/randrproto/buildlink3.mk      Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .endif # RANDRPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/renderproto/buildlink3.mk
--- a/x11/renderproto/buildlink3.mk     Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/renderproto/buildlink3.mk     Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .endif # RENDERPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/xcursor/buildlink3.mk
--- a/x11/xcursor/buildlink3.mk Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/xcursor/buildlink3.mk Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/xextproto/buildlink3.mk
--- a/x11/xextproto/buildlink3.mk       Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/xextproto/buildlink3.mk       Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .endif # XEXTPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r d139d9f0a462 -r 71a6be290e0f x11/xorg-libs/builtin.mk
--- a/x11/xorg-libs/builtin.mk  Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/xorg-libs/builtin.mk  Tue Jul 11 14:42:03 2006 +0000
@@ -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_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 -r d139d9f0a462 -r 71a6be290e0f x11/xproto/buildlink3.mk
--- a/x11/xproto/buildlink3.mk  Tue Jul 11 14:39:29 2006 +0000
+++ b/x11/xproto/buildlink3.mk  Tue Jul 11 14:42:03 2006 +0000
@@ -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 @@
 .endif # XPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+
+.endif