summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-03-10 18:35:57 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-03-10 18:35:57 +0000
commit209f159867205a6256e0949ff7140ff8e4902d69 (patch)
tree95ff77c987d7e4e76dc1bb96eb4d1d5708e96254
parent64fc9d9bfd3c909c2dd9eab086bb4b2177ac16fb (diff)
Disable doc formatting tools explicitely
-rw-r--r--kdrive/Makefile.bsd-wrapper6
-rw-r--r--lib/libXdmcp/Makefile.bsd-wrapper4
-rw-r--r--xserver/Makefile.bsd-wrapper3
3 files changed, 8 insertions, 5 deletions
diff --git a/kdrive/Makefile.bsd-wrapper b/kdrive/Makefile.bsd-wrapper
index 94187913a..2ff066b59 100644
--- a/kdrive/Makefile.bsd-wrapper
+++ b/kdrive/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2011/09/17 13:39:31 shadchin Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2012/03/10 18:35:56 matthieu Exp $
.include <bsd.xconf.mk>
@@ -11,14 +11,14 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-xkb-path=${XKB_PATH} \
--with-xkb-output=/var/db/xkb \
--with-default-xkb-rules=${XKB_RULES} \
- --with-dri-driver-path=${LIBDIR}/modules/dri \
--enable-dri \
--disable-xorg \
--enable-xcsecurity \
--enable-kdrive \
--disable-dmx \
--disable-xnest \
- --disable-xvfb
+ --disable-xvfb \
+ --without-fop --without-xmlto --without-xsltproc
realinstall:
(cd hw/kdrive/ephyr ; make install)
diff --git a/lib/libXdmcp/Makefile.bsd-wrapper b/lib/libXdmcp/Makefile.bsd-wrapper
index ad6de7a0c..e01891cdd 100644
--- a/lib/libXdmcp/Makefile.bsd-wrapper
+++ b/lib/libXdmcp/Makefile.bsd-wrapper
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2009/10/31 17:53:31 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2012/03/10 18:35:56 matthieu Exp $
SHARED_LIBS= Xdmcp 10.0
+CONFIGURE_ARGS += --without-fop --without-xmlto --without-xsltproc
+
.include <bsd.xorg.mk>
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 60c221288..9db2956e1 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.41 2012/02/07 19:46:11 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.42 2012/03/10 18:35:56 matthieu Exp $
.include <bsd.xconf.mk>
@@ -40,6 +40,7 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \
--enable-install-setuid --enable-privsep \
--enable-xcsecurity \
+ --without-fop --without-xmlto --without-xsltproc \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
--disable-unit-tests \
${DRI_OPTION}