Update to xkeyboard-config 2.7

ok matthieu@, mpi@

9 files changed, 30 insertions, 36 deletions

diff --git a/data/xkeyboard-config/Makefile.inc b/data/xkeyboard-config/Makefile.inc
index 2b27a22c4..aa8331a23 100644
--- a/data/xkeyboard-config/Makefile.inc
+++ b/data/xkeyboard-config/Makefile.inc
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2011/10/16 17:18:56 shadchin Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2012/10/06 15:41:12 shadchin Exp $
 
 XKC_TOP?=	../../..
 XKB_DIR=	${.CURDIR}/${XKC_TOP}/dist/xkeyboard-config
 XKB_BASE=	${DESTDIR}${X11BASE}/share/X11/xkb
-XKBCOMP=	xkbcomp
 
 INSTALL_DIR=	${INSTALL} -d -o root -g wheel -m ${DIRMODE}
 
@@ -16,10 +15,6 @@ install:	${DATA} install-files _SUBDIRUSE
 		echo ${INSTALL_DATA} ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; \
 		${INSTALL_DATA} ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; \
 	done
-.if defined(DIR_DATA)
-	cd ${XKB_BASE}/${XKB_SUBDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/${DIR_DATA} '*'
-	${INSTALL_DATA} ${DIR_DATA} ${XKB_BASE}
-.endif
 .else
 install:	install-files _SUBDIRUSE
 .endif
@@ -28,9 +23,4 @@ install:	install-files _SUBDIRUSE
 install-files:
 .endif
 
-.if defined(DIR_DATA) && !target(clean)
-clean:
-	rm -f ${DIR_DATA}
-.endif
-
 .PATH: ${XKB_DIR}/${XKB_SUBDIR}
diff --git a/data/xkeyboard-config/compat/Makefile b/data/xkeyboard-config/compat/Makefile
index 6b7186a99..188eeaf49 100644
--- a/data/xkeyboard-config/compat/Makefile
+++ b/data/xkeyboard-config/compat/Makefile
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2012/06/10 16:30:14 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/10/06 15:41:12 shadchin Exp $
 
 XKB_SUBDIR=	compat
-DIR_DATA=	compat.dir
 
 DATA =	accessx basic caps complete iso9995 japan ledcaps lednum ledscroll \
 	level5 misc mousekeys olpc pc pc98 xfree86 xtest README
diff --git a/data/xkeyboard-config/geometry/Makefile b/data/xkeyboard-config/geometry/Makefile
index 5f0c83eb5..b999f493e 100644
--- a/data/xkeyboard-config/geometry/Makefile
+++ b/data/xkeyboard-config/geometry/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.3 2011/03/12 10:16:01 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/10/06 15:41:12 shadchin Exp $
 
 SUBDIR=		digital_vndr sgi_vndr
 
 XKB_SUBDIR=	geometry
-DIR_DATA=	geometry.dir
 
 DATA=	amiga ataritt chicony dell everex fujitsu hhk hp keytronic kinesis \
 	macintosh microsoft nec nokia northgate pc sanwa sony thinkpad sun \
diff --git a/data/xkeyboard-config/keycodes/Makefile b/data/xkeyboard-config/keycodes/Makefile
index 6c6fafdf6..01a02bd53 100644
--- a/data/xkeyboard-config/keycodes/Makefile
+++ b/data/xkeyboard-config/keycodes/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/10/06 15:41:13 shadchin Exp $
 
 SUBDIR=		digital_vndr sgi_vndr
 
 XKB_SUBDIR=	keycodes
-DIR_DATA=	keycodes.dir
 
 DATA=	aliases amiga ataritt empty evdev fujitsu hp ibm macintosh sony sun \
 	xfree86 xfree98 README
diff --git a/data/xkeyboard-config/man/xkeyboard-config.7 b/data/xkeyboard-config/man/xkeyboard-config.7
index 9a68cd06c..a6647ad9a 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.6" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.7" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -614,6 +614,7 @@ no(smi)	Northern Saami (Norway)
 no(smi_nodeadkeys)	Northern Saami (Norway, eliminate dead keys)
 no(mac)	Norwegian (Macintosh)
 no(mac_nodeadkeys)	Norwegian (Macintosh, eliminate dead keys)
+no(colemak)	Norwegian (Colemak)
 
 _
 pl	Polish
@@ -869,6 +870,10 @@ ph(dvorak)	Filipino (Dvorak Latin)
 ph(dvorak-bay)	Filipino (Dvorak Baybayin)
 
 _
+md	Moldavian
+md(gag)	Gagauz
+
+_
 
 .TE
 .SH OPTIONS
diff --git a/data/xkeyboard-config/pc/Makefile b/data/xkeyboard-config/pc/Makefile
index 59277aec9..a5e739af1 100644
--- a/data/xkeyboard-config/pc/Makefile
+++ b/data/xkeyboard-config/pc/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.1 2012/09/28 19:49:12 matthieu Exp $
- 
+#	$OpenBSD: Makefile,v 1.2 2012/10/06 15:41:13 shadchin Exp $
+
 XKC_TOP =		../../..
-PACKAGE_VERSION =	2.6
+PACKAGE_VERSION =	2.7
 PKGCONFIG =		xkeyboard-config.pc
-EXTRA_PKGCONFIG_SUBST = -e 's,@VERSION@,${PACKAGE_VERSION},g' \
+EXTRA_PKGCONFIG_SUBST =	-e 's,@VERSION@,${PACKAGE_VERSION},g' \
 			-e 's,@xkb_base@,${XKB_BASE},g'
 
 install: install-pc
- 
+
 .include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/symbols/Makefile b/data/xkeyboard-config/symbols/Makefile
index ceb0b325e..eae038763 100644
--- a/data/xkeyboard-config/symbols/Makefile
+++ b/data/xkeyboard-config/symbols/Makefile
@@ -1,21 +1,17 @@
-#	$OpenBSD: Makefile,v 1.8 2011/07/01 14:25:24 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.9 2012/10/06 15:41:13 shadchin Exp $
 
 SUBDIR=		digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \
-		nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+		nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr
 
 XKB_SUBDIR=	symbols
-DIR_DATA=	symbols.dir
 
 DATA=	ad af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cm 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
-
-# OpenBSD customization
-DATA+=	zaurus
+	it jp ke kg kh kr kz la latam latin lk lt lv ma mao md 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/sharp_vndr/Makefile b/data/xkeyboard-config/symbols/sharp_vndr/Makefile
new file mode 100644
index 000000000..5871bad96
--- /dev/null
+++ b/data/xkeyboard-config/symbols/sharp_vndr/Makefile
@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2012/10/06 15:41:13 shadchin Exp $
+
+XKB_SUBDIR=	symbols/sharp_vndr
+
+DATA=	sl-c3x00 ws003sh ws007sh ws011sh ws020sh
+
+.include <bsd.xorg.mk>
diff --git a/data/xkeyboard-config/types/Makefile b/data/xkeyboard-config/types/Makefile
index 03eb53beb..82c153b69 100644
--- a/data/xkeyboard-config/types/Makefile
+++ b/data/xkeyboard-config/types/Makefile
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/10/06 15:41:13 shadchin Exp $
 
 XKB_SUBDIR=	types
-DIR_DATA=	types.dir
 
 DATA=	basic cancel caps complete default extra iso9995 level5 mousekeys \
 	nokia numpad pc README