From 62ec5a77b7dbf7ebeb76731c6bdad78ed14481c8 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 29 Mar 2014 14:27:12 +0000
Subject: [PATCH] Install the evdev rules for xkbdata. Note that only the rules
 are installed, there is no evdev compat whatsoever in OpenBSD (yet?). This is
 needed for gnome to prevent fucking up keyboard rules.

discussed with and ok matthieu@
---
 data/xkeyboard-config/rules/Makefile | 61 +++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile
index ab75bf8c9..76b4868b9 100644
--- a/data/xkeyboard-config/rules/Makefile
+++ b/data/xkeyboard-config/rules/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2012/09/28 19:00:00 espie Exp $
+#	$OpenBSD: Makefile,v 1.9 2014/03/29 14:27:12 ajacoutot Exp $
 
 SUBDIR=		compat
 
@@ -42,9 +42,46 @@ BASE_PARTS=	base.hdr.part base.lists.part \
 		HDR base.o_c.part \
 		HDR base.o_t.part
 
-BASE_RULES=		base base.lst base.xml base.extras.xml
+EVDEV_PARTS=	base.hdr.part base.lists.part \
+		compat/base.lists.part \
+		HDR evdev.m_k.part \
+		HDR base.l1_k.part \
+		HDR base.l_k.part \
+		HDR base.o_k.part \
+		HDR base.ml_g.part \
+		HDR base.m_g.part \
+		HDR compat/base.mlv_s.part   base.mlv_s.part \
+		HDR compat/base.ml_s.part    base.ml_s.part  \
+		HDR compat/base.ml1_s.part   base.ml1_s.part \
+		HDR compat/base.ml1v1_s.part \
+		HDR compat/base.ml2_s.part    base.ml2_s.part  \
+		HDR compat/base.ml3_s.part    base.ml3_s.part  \
+		HDR compat/base.ml4_s.part    base.ml4_s.part  \
+		HDR compat/base.ml2v2_s.part  \
+		HDR compat/base.ml3v3_s.part  \
+		HDR compat/base.ml4v4_s.part  \
+		HDR evdev.m_s.part \
+		HDR compat/base.lv_c.part   \
+		HDR compat/base.l1v1_c.part \
+		HDR compat/base.l2v2_c.part \
+		HDR compat/base.l3v3_c.part \
+		HDR compat/base.l4v4_c.part \
+		HDR base.ml_c.part \
+		HDR base.ml1_c.part \
+		HDR base.m_t.part \
+		HDR base.lo_s.part \
+		HDR base.l1o_s.part \
+		HDR base.l2o_s.part \
+		HDR base.l3o_s.part \
+		HDR base.l4o_s.part \
+		HDR compat/base.o_s.part     base.o_s.part \
+		HDR base.o_c.part \
+		HDR base.o_t.part
 
-all:	parts_done ${BASE_RULES} _SUBDIRUSE
+BASE_RULES=		base base.lst base.xml base.extras.xml
+EVDEV_RULES=		evdev evdev.lst evdev.xml evdev.extras.xml
+
+all:	parts_done ${BASE_RULES} ${EVDEV_RULES} _SUBDIRUSE
 
 parts_done:
 	cd ${.CURDIR} && exec ${MAKE} depend
@@ -66,15 +103,27 @@ base.xml:	base.xml.in
 base.extras.xml:	base.extras.xml.in
 	sed -e 's,<_,<,g' -e 's,</_,</,g' ${XKB_DIR}/${XKB_SUBDIR}/base.extras.xml.in > $@
 
-install-files:	${BASE_RULES}
+evdev:	${EVDEV_PARTS}
+	HDR="${XKB_DIR}/${XKB_SUBDIR}/HDR" ${SHELL} ${XKB_DIR}/${XKB_SUBDIR}/merge.sh $@ ${EVDEV_PARTS}
+
+evdev.lst:	evdev.xml
+	perl ${XKB_DIR}/${XKB_SUBDIR}/xml2lst.pl < evdev.xml > $@
+
+evdev.xml:	evdev.xml.in
+	sed -e 's,<_,<,g' -e 's,</_,</,g' ${XKB_DIR}/${XKB_SUBDIR}/evdev.xml.in > $@
+
+evdev.extras.xml:	evdev.extras.xml.in
+	sed -e 's,<_,<,g' -e 's,</_,</,g' ${XKB_DIR}/${XKB_SUBDIR}/evdev.extras.xml.in > $@
+
+install-files:	${BASE_RULES} ${EVDEV_RULES}
 	test -z ${XKB_BASE}/${XKB_SUBDIR} || ${INSTALL_DIR} ${XKB_BASE}/${XKB_SUBDIR}
-	@for f in ${BASE_RULES}; do  \
+	@for f in ${BASE_RULES} ${EVDEV_RULES}; do  \
 		echo ${INSTALL_DATA} $$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; \
 		${INSTALL_DATA} $$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; \
 	done
 
 clean:	_SUBDIRUSE
-	rm -f ${BASE_RULES} parts_done
+	rm -f ${BASE_RULES} ${EVDEV_RULES} parts_done
 
 .include <bsd.xorg.mk>
 .include <bsd.subdir.mk>