From 0ca94c19951423c719ccbc51378cb664f12a2f2c Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 2 Jun 2011 17:16:34 +0000
Subject: [PATCH] Adapt after the XKB layouts switch to xkeyboard-config.

---
 x11/gnome/libxklavier/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/x11/gnome/libxklavier/Makefile b/x11/gnome/libxklavier/Makefile
index c16da2328fd..adff8aad8be 100644
--- a/x11/gnome/libxklavier/Makefile
+++ b/x11/gnome/libxklavier/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.29 2011/05/16 20:42:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2011/06/02 17:16:34 ajacoutot Exp $
 
 COMMENT=		utility library for XKB
 
 GNOME_PROJECT=		libxklavier
 GNOME_VERSION=		5.1
 
+REVISION=		0
+
 SHARED_LIBS +=  xklavier             17.0     # .17.0
 
 HOMEPAGE=		http://www.freedesktop.org/wiki/Software/LibXklavier
@@ -27,7 +29,8 @@ LIB_DEPENDS=		devel/glib2 \
 			textproc/libxml
 
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-xkb-base="${SYSCONFDIR}/X11/xkb/" \
+			--disable-gtk-doc \
+			--with-xkb-base="${X11BASE}/share/X11/xkb/" \
 			--with-xkb-bin-base="${X11BASE}/bin/" \
 			--with-xmodmap-base="${LOCALBASE}/share/xmodmap"
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \