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.

7 files changed, 7 insertions, 49 deletions

diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index 2504971e621..5cc83b00570 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -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 @@ 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 39ceb5022dd..986ac3d0f84 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -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 @@ BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
 .include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk
index cf3e752cd71..77e7f7e7179 100644
--- a/x11/compositeproto/buildlink3.mk
+++ b/x11/compositeproto/buildlink3.mk
@@ -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 @@ 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 1f176546921..da7b2bc8cd1 100644
--- a/x11/fixesproto/buildlink3.mk
+++ b/x11/fixesproto/buildlink3.mk
@@ -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_PKGSRCDIR.fixesproto?=	../../x11/fixesproto
 
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk
index 71e0923e00c..564c27d2635 100644
--- a/x11/randrproto/buildlink3.mk
+++ b/x11/randrproto/buildlink3.mk
@@ -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 @@ 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 b8f4c6873e2..844dcb58ebe 100644
--- a/x11/renderproto/buildlink3.mk
+++ b/x11/renderproto/buildlink3.mk
@@ -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 @@ BUILDLINK_DEPMETHOD.renderproto?=	build
 .endif	# RENDERPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk
index 945a88f6600..cb685af331b 100644
--- a/x11/xextproto/buildlink3.mk
+++ b/x11/xextproto/buildlink3.mk
@@ -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 @@ BUILDLINK_PKGSRCDIR.xextproto?=	../../x11/xextproto
 .include "../../x11/inputproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-
-.endif