From c9254707d27da7c9746fe334a72eb8a0930aeae1 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Mon, 2 Aug 2010 18:45:02 +0000
Subject: [PATCH] Current pixman lib doesn't build on m68k. Disable it on those
 machines. ok deraadt@

---
 lib/Makefile          | 8 ++++++--
 share/mk/bsd.xconf.mk | 9 ++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index c795e77c8..537578e9b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/05/29 17:25:11 matthieu Exp $
+# $OpenBSD: Makefile,v 1.20 2010/08/02 18:45:02 matthieu Exp $
 
 .include <bsd.xconf.mk>
 
@@ -46,7 +46,11 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp ${XCB_LIBS}\
 	libXi libXinerama libxkbfile libxkbui  \
 	libXrandr libXRes libXScrnSaver \
 	libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm \
-	libpciaccess pixman
+	libpciaccess
+
+.if ${XENOCARA_BUILD_PIXMAN:L} == "yes"
+SUBDIR+= pixman
+.endif
 
 # libdrm is needed by the via driver built on i386 only
 .if ${XENOCARA_BUILD_DRI:L} == "yes" || ${MACHINE} == "i386"
diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk
index c103c1c3f..3331d5d6f 100644
--- a/share/mk/bsd.xconf.mk
+++ b/share/mk/bsd.xconf.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xconf.mk,v 1.11 2009/08/04 15:45:41 matthieu Exp $
+# $OpenBSD: bsd.xconf.mk,v 1.12 2010/08/02 18:45:02 matthieu Exp $
 
 # Shared libs?
 .if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax"
@@ -13,3 +13,10 @@ XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
 
 # Build XCB
 XENOCARA_BUILD_XCB?=${XENOCARA_HAVE_SHARED_LIBS}
+
+# Build pixmain?
+.if ${MACHINE_ARCH} == "m68k"
+XENOCARA_BUILD_PIXMAN?=no
+.else
+XENOCARA_BUILD_PIXMAN?=yes
+.endif