Introduce bsd.xconf.mk to set default config variables used

at several places in the Xenocara build in a central place instead
of duplicating the checks all over the place. ok oga@.

9 files changed, 27 insertions, 27 deletions

diff --git a/driver/xf86-video-ati/Makefile.bsd-wrapper b/driver/xf86-video-ati/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-ati/Makefile.bsd-wrapper
+++ b/driver/xf86-video-ati/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-glint/Makefile.bsd-wrapper b/driver/xf86-video-glint/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-glint/Makefile.bsd-wrapper
+++ b/driver/xf86-video-glint/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-i810/Makefile.bsd-wrapper b/driver/xf86-video-i810/Makefile.bsd-wrapper
index 9a758047c..b2204c2a2 100644
--- a/driver/xf86-video-i810/Makefile.bsd-wrapper
+++ b/driver/xf86-video-i810/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-intel/Makefile.bsd-wrapper b/driver/xf86-video-intel/Makefile.bsd-wrapper
index 08823262d..48fc0aecf 100644
--- a/driver/xf86-video-intel/Makefile.bsd-wrapper
+++ b/driver/xf86-video-intel/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-mga/Makefile.bsd-wrapper b/driver/xf86-video-mga/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-mga/Makefile.bsd-wrapper
+++ b/driver/xf86-video-mga/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-savage/Makefile.bsd-wrapper b/driver/xf86-video-savage/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-savage/Makefile.bsd-wrapper
+++ b/driver/xf86-video-savage/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-sis/Makefile.bsd-wrapper b/driver/xf86-video-sis/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-sis/Makefile.bsd-wrapper
+++ b/driver/xf86-video-sis/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-tdfx/Makefile.bsd-wrapper b/driver/xf86-video-tdfx/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-tdfx/Makefile.bsd-wrapper
+++ b/driver/xf86-video-tdfx/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif
 
diff --git a/driver/xf86-video-via/Makefile.bsd-wrapper b/driver/xf86-video-via/Makefile.bsd-wrapper
index c685b99c9..eed472873 100644
--- a/driver/xf86-video-via/Makefile.bsd-wrapper
+++ b/driver/xf86-video-via/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2008/02/02 17:19:57 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2008/03/25 23:41:50 matthieu Exp $
 
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
-.if !defined(XENOCARA_BUILD_DRI) || ${XENOCARA_BUILD_DRI:L} != "yes"
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
 CONFIGURE_ARGS+= --disable-dri
 .endif