[pkgsrc/trunk]: pkgsrc/x11 Unbreak build of a lot of X11 packages on systems ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67bcbd93e636
branches:  trunk
changeset: 537376:67bcbd93e636
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Jan 07 13:59:35 2008 +0000

description:
Unbreak build of a lot of X11 packages on systems which use native X11
(e.g. NetBSD with bundled XFree86). Checking whether "X11_TYPE" is "xorg"
is obsolete and *not* equivalent to checking whether we are not using
modular X.org.

diffstat:

 x11/Xcomposite/buildlink3.mk     |  8 +-------
 x11/Xfixes/buildlink3.mk         |  8 +-------
 x11/compositeproto/buildlink3.mk |  8 +-------
 x11/fixesproto/buildlink3.mk     |  8 +-------
 x11/randrproto/buildlink3.mk     |  8 +-------
 x11/renderproto/buildlink3.mk    |  8 +-------
 x11/xextproto/buildlink3.mk      |  8 +-------
 7 files changed, 7 insertions(+), 49 deletions(-)

diffs (154 lines):

diff -r d25a612df6de -r 67bcbd93e636 x11/Xcomposite/buildlink3.mk
--- a/x11/Xcomposite/buildlink3.mk      Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/Xcomposite/buildlink3.mk      Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/01/06 16:57:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2008/01/07 13:59:35 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 XCOMPOSITE_BUILDLINK3_MK:=     ${XCOMPOSITE_BUILDLINK3_MK}+
 
@@ -28,5 +24,3 @@
 .include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r d25a612df6de -r 67bcbd93e636 x11/Xfixes/buildlink3.mk
--- a/x11/Xfixes/buildlink3.mk  Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/Xfixes/buildlink3.mk  Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/01/06 16:57:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2008/01/07 13:59:35 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+
 
@@ -27,5 +23,3 @@
 .include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r d25a612df6de -r 67bcbd93e636 x11/compositeproto/buildlink3.mk
--- a/x11/compositeproto/buildlink3.mk  Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/compositeproto/buildlink3.mk  Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/06 16:57:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPMETHOD.compositeproto?=   build
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
@@ -28,5 +24,3 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r d25a612df6de -r 67bcbd93e636 x11/fixesproto/buildlink3.mk
--- a/x11/fixesproto/buildlink3.mk      Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/fixesproto/buildlink3.mk      Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.6 2008/01/06 16:57:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2008/01/07 13:59:36 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPMETHOD.fixesproto?=       build
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
@@ -29,5 +25,3 @@
 
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r d25a612df6de -r 67bcbd93e636 x11/randrproto/buildlink3.mk
--- a/x11/randrproto/buildlink3.mk      Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/randrproto/buildlink3.mk      Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/06 16:57:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPMETHOD.randrproto?=       build
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
@@ -25,5 +21,3 @@
 .endif # RANDRPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r d25a612df6de -r 67bcbd93e636 x11/renderproto/buildlink3.mk
--- a/x11/renderproto/buildlink3.mk     Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/renderproto/buildlink3.mk     Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/06 16:57:43 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 RENDERPROTO_BUILDLINK3_MK:=    ${RENDERPROTO_BUILDLINK3_MK}+
 
@@ -24,5 +20,3 @@
 .endif # RENDERPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r d25a612df6de -r 67bcbd93e636 x11/xextproto/buildlink3.mk
--- a/x11/xextproto/buildlink3.mk       Mon Jan 07 13:33:27 2008 +0000
+++ b/x11/xextproto/buildlink3.mk       Mon Jan 07 13:59:35 2008 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.7 2008/01/06 16:57:43 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPMETHOD.xextproto?=        build
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
@@ -27,5 +23,3 @@
 .include "../../x11/inputproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-
-.endif