Sync with xkeyboard-config 2.2.1

ok ok shadchin@ matthieu@

4 files changed, 11 insertions, 62 deletions

diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile
index 4715f777e..abb2bb8c6 100644
--- a/data/xkeyboard-config/rules/Makefile
+++ b/data/xkeyboard-config/rules/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2011/01/10 14:42:48 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.4 2011/04/10 17:10:21 jasper Exp $
 
-SUBDIR=		compat extras
+SUBDIR=		compat
 
 XKB_SUBDIR=	rules
 
diff --git a/data/xkeyboard-config/rules/extras/Makefile b/data/xkeyboard-config/rules/extras/Makefile
deleted file mode 100644
index bb51e0148..000000000
--- a/data/xkeyboard-config/rules/extras/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2011/01/10 14:42:48 shadchin Exp $
-
-XKB_SUBDIR=	rules/extras
-
-EXTRAS_PARTS=	base.ml2_s.part base.ml3_s.part base.ml4_s.part \
-		base.ml2v2_s.part base.ml3v3_s.part base.ml4v4_s.part \
-		base.ml_s.part base.ml1_s.part base.mlv_s.part \
-		base.ml1v1_s.part base.ml_s.part
-
-depend all:	${EXTRAS_PARTS}
-
-base.ml2_s.part:	${LST_FILES}
-	sh ${BINDIR}/mln_s.sh 2 ${SRCDIR}
-
-base.ml3_s.part:	${LST_FILES}
-	sh ${BINDIR}/mln_s.sh 3 ${SRCDIR}
-
-base.ml4_s.part:	${LST_FILES}
-	sh ${BINDIR}/mln_s.sh 4 ${SRCDIR}
-
-base.ml2v2_s.part:	${LST_FILES}
-	sh ${BINDIR}/mlnvn_s.sh 2 ${SRCDIR}
-
-base.ml3v3_s.part:	${LST_FILES}
-	sh ${BINDIR}/mlnvn_s.sh 3 ${SRCDIR}
-
-base.ml4v4_s.part:	${LST_FILES}
-	sh ${BINDIR}/mlnvn_s.sh 4 ${SRCDIR}
-
-base.ml_s.part:	${LST_FILES}
-	sh ${BINDIR}/ml_s.sh ${SRCDIR}
-
-base.ml1_s.part:	${LST_FILES}
-	sh ${BINDIR}/ml1_s.sh ${SRCDIR}
-
-base.mlv_s.part:	${LST_FILES}
-	sh ${BINDIR}/mlv_s.sh ${SRCDIR}
-
-base.ml1v1_s.part:	${LST_FILES}
-	sh ${BINDIR}/ml1v1_s.sh ${SRCDIR}
-
-clean:
-	rm -f ${EXTRAS_PARTS}
-
-.include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/symbols/Makefile b/data/xkeyboard-config/symbols/Makefile
index 607f50de7..f18a85a2a 100644
--- a/data/xkeyboard-config/symbols/Makefile
+++ b/data/xkeyboard-config/symbols/Makefile
@@ -1,17 +1,18 @@
-#	$OpenBSD: Makefile,v 1.3 2011/03/12 10:16:01 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.4 2011/04/10 17:10:21 jasper Exp $
 
 SUBDIR=		digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \
-		nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+		nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
 XKB_SUBDIR=	symbols
 DIR_DATA=	symbols.dir
 
-DATA=	ad af al am ara at az ba bd be bg br brai bt bw by ca cd ch cn cz de \
-	dk ee es et epo fi fo fr gb ge gh gn gr hr hu ie il in iq ir is it jp \
-	ke kg kh kr kz la latam latin lk lt lv ma mao me mk ml mm mn mt mv ng \
-	nl no np pc ph pk pl pt ro rs ru se si sk sn sy th terminate tj tm tr \
-	tz ua us uz vn za altwin capslock compose ctrl empty eurosign rupeesign \
-	group inet keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
+DATA=	ad af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cn cz \
+	de dk ee es et epo fi fo fr gb ge gh gn gr hr hu ie il in iq ir is it \
+	jp ke kg kh kr kz la latam latin lk lt lv ma mao me mk ml mm mn mt mv \
+	ng nl no np pc ph pk pl pt ro rs ru se si sk sn sy th terminate tj tm \
+	tw tr tz ua us uz vn za altwin capslock compose ctrl empty eurosign \
+	rupeesign group inet keypad kpdl level3 level5 nbsp olpc shift \
+	srvr_ctrl typo
 
 .include <bsd.xorg.mk>
 .include <bsd.subdir.mk>
diff --git a/data/xkeyboard-config/symbols/extras/Makefile b/data/xkeyboard-config/symbols/extras/Makefile
deleted file mode 100644
index 7b14bf525..000000000
--- a/data/xkeyboard-config/symbols/extras/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2011/01/10 14:42:48 shadchin Exp $
-
-XKB_SUBDIR=	symbols/extras
-
-DATA=	apl ir rs ru us
-
-.include <bsd.xorg.mk>