Update to 2.6

ok jasper@, krw@, matthieu@

9 files changed, 8 insertions, 54 deletions

diff --git a/data/xkeyboard-config/Makefile b/data/xkeyboard-config/Makefile
index 8991925ed..954f6395d 100644
--- a/data/xkeyboard-config/Makefile
+++ b/data/xkeyboard-config/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.2 2011/10/16 17:18:56 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/06/10 16:30:14 shadchin Exp $
 
-SUBDIR=	compat geometry keycodes keymap man rules semantics symbols types
+SUBDIR=	compat geometry keycodes man rules symbols types
 
 build: _SUBDIRUSE
 
diff --git a/data/xkeyboard-config/compat/Makefile b/data/xkeyboard-config/compat/Makefile
index 3b27010e7..6b7186a99 100644
--- a/data/xkeyboard-config/compat/Makefile
+++ b/data/xkeyboard-config/compat/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/06/10 16:30:14 shadchin Exp $
 
 XKB_SUBDIR=	compat
 DIR_DATA=	compat.dir
 
-DATA =	accessx basic caps complete default iso9995 japan keypad ledcaps \
-	lednum ledscroll level5 misc mousekeys norepeat olpc pc pc98 xfree86 \
-	xtest README
+DATA =	accessx basic caps complete iso9995 japan ledcaps lednum ledscroll \
+	level5 misc mousekeys olpc pc pc98 xfree86 xtest README
 
 .include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/keymap/Makefile b/data/xkeyboard-config/keymap/Makefile
deleted file mode 100644
index f7e606d26..000000000
--- a/data/xkeyboard-config/keymap/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
-
-SUBDIR=		digital_vndr sgi_vndr sun_vndr
-
-XKB_SUBDIR=	keymap
-DIR_DATA=	keymap.dir
-
-DATA=	amiga ataritt macintosh sony xfree86 xfree98 README
-
-.include <bsd.xorg.mk>
-.include <bsd.subdir.mk>
diff --git a/data/xkeyboard-config/keymap/Makefile.inc b/data/xkeyboard-config/keymap/Makefile.inc
deleted file mode 100644
index 19e4b0e56..000000000
--- a/data/xkeyboard-config/keymap/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2011/06/06 19:45:44 matthieu Exp $
-XKC_TOP=	../../../..
-.include "../../Makefile.inc"
diff --git a/data/xkeyboard-config/keymap/digital_vndr/Makefile b/data/xkeyboard-config/keymap/digital_vndr/Makefile
deleted file mode 100644
index 6ec86dbff..000000000
--- a/data/xkeyboard-config/keymap/digital_vndr/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $
-
-XKB_SUBDIR=	keymap/digital_vndr
-
-DATA=	us
-
-.include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/keymap/sgi_vndr/Makefile b/data/xkeyboard-config/keymap/sgi_vndr/Makefile
deleted file mode 100644
index cd17e6471..000000000
--- a/data/xkeyboard-config/keymap/sgi_vndr/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
-
-XKB_SUBDIR=	keymap/sgi_vndr
-
-DATA=	be bg ca ch cz de dk dvorak es fi fr gb hu it jp no pl pt ru se sk th us
-
-.include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/keymap/sun_vndr/Makefile b/data/xkeyboard-config/keymap/sun_vndr/Makefile
deleted file mode 100644
index ba3d408c6..000000000
--- a/data/xkeyboard-config/keymap/sun_vndr/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
-
-XKB_SUBDIR=	keymap/sun_vndr
-
-DATA=	all de es fi fr no pl ru se uk us
-
-.include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/man/xkeyboard-config.7 b/data/xkeyboard-config/man/xkeyboard-config.7
index c14656731..9a68cd06c 100644
--- a/data/xkeyboard-config/man/xkeyboard-config.7
+++ b/data/xkeyboard-config/man/xkeyboard-config.7
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.5" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.6" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -483,6 +483,7 @@ de(mac)	German (Macintosh)
 de(mac_nodeadkeys)	German (Macintosh, eliminate dead keys)
 de(dsb)	Lower Sorbian
 de(dsb_qwertz)	Lower Sorbian (qwertz)
+de(qwerty)	German (qwerty)
 de(ru)	Russian (Germany, phonetic)
 
 _
@@ -540,6 +541,7 @@ jp(kana)	Japanese (Kana)
 jp(kana86)	Japanese (Kana 86)
 jp(OADG109A)	Japanese (OADG 109A)
 jp(mac)	Japanese (Macintosh)
+jp(dvorak)	Japanese (Dvorak)
 
 _
 kg	Kyrgyz
@@ -1244,12 +1246,8 @@ terminate:ctrl_alt_bksp	Control + Alt + Backspace
 
 /usr/X11R6/share/X11/xkb/keycodes
 
-/usr/X11R6/share/X11/xkb/keymap
-
 /usr/X11R6/share/X11/xkb/rules
 
-/usr/X11R6/share/X11/xkb/semantics
-
 /usr/X11R6/share/X11/xkb/symbols
 
 /usr/X11R6/share/X11/xkb/types
diff --git a/data/xkeyboard-config/semantics/Makefile b/data/xkeyboard-config/semantics/Makefile
deleted file mode 100644
index a0ccc4946..000000000
--- a/data/xkeyboard-config/semantics/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
-
-XKB_SUBDIR=	semantics
-DIR_DATA=	semantics.dir
-
-DATA=	basic complete default xtest
-
-.include <bsd.xorg.mk>