From 80888e205bafafd59be9c00efff4b3fdf54586c2 Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Thu, 21 Feb 2013 17:45:32 +0000
Subject: [PATCH] after a compiler update, landisk can now handle pixman and
 thus xserver again prodded by brad@, ok matthieu@

---
 Makefile              | 4 ++--
 share/mk/bsd.xconf.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7ef8030f4..2ee03a04d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2012/12/01 21:10:42 miod Exp $
+# $OpenBSD: Makefile,v 1.51 2013/02/21 17:45:32 todd Exp $
 .include <bsd.own.mk>
 .include <bsd.xconf.mk>
 
@@ -8,7 +8,7 @@ REALAPPD=/etc/X11/app-defaults
 XCONFIG=${XSRCDIR}/etc/X11.${MACHINE}/xorg.conf
 RM?=rm
 
-.if ${MACHINE_ARCH} != "sh" && ${MACHINE_ARCH} != "vax"
+.if ${MACHINE_ARCH} != "vax"
 XSERVER= xserver
 .endif
 
diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk
index 2c339f0d8..5409d9b1d 100644
--- a/share/mk/bsd.xconf.mk
+++ b/share/mk/bsd.xconf.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xconf.mk,v 1.22 2013/02/09 21:48:07 brad Exp $
+# $OpenBSD: bsd.xconf.mk,v 1.23 2013/02/21 17:45:34 todd Exp $
 
 # Shared libs?
 .if ${MACHINE} == "vax"
@@ -12,7 +12,7 @@ XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L}
 XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
 
 # Build pixman?
-.if ${MACHINE} == "vax" || ${MACHINE} == "landisk"
+.if ${MACHINE} == "vax"
 XENOCARA_BUILD_PIXMAN?=no
 .else
 XENOCARA_BUILD_PIXMAN?=yes