xkeyboard-config: update to 2.6

3 files changed, 10 insertions, 69 deletions

diff --git a/xkeyboard-config/.footprint b/xkeyboard-config/.footprint
index fda6e552..8b047782 100644
--- a/xkeyboard-config/.footprint
+++ b/xkeyboard-config/.footprint
@@ -1,25 +1,24 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man7/
+-rw-r--r--	root/root	usr/man/man7/xkeyboard-config.7.gz
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/X11/
 drwxr-xr-x	root/root	usr/share/X11/xkb/
 -rw-r--r--	root/root	usr/share/X11/xkb/compat.dir
 drwxr-xr-x	root/root	usr/share/X11/xkb/compat/
--rw-r--r--	root/root	usr/share/X11/xkb/compat/README
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/accessx
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/basic
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/caps
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/complete
--rw-r--r--	root/root	usr/share/X11/xkb/compat/default
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/iso9995
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/japan
--rw-r--r--	root/root	usr/share/X11/xkb/compat/keypad
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/ledcaps
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/lednum
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/ledscroll
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/level5
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/misc
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/mousekeys
--rw-r--r--	root/root	usr/share/X11/xkb/compat/norepeat
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/olpc
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/pc
 -rw-r--r--	root/root	usr/share/X11/xkb/compat/pc98
@@ -28,7 +27,6 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/compat/
 lrwxrwxrwx	root/root	usr/share/X11/xkb/compiled -> /var/lib/xkb
 -rw-r--r--	root/root	usr/share/X11/xkb/geometry.dir
 drwxr-xr-x	root/root	usr/share/X11/xkb/geometry/
--rw-r--r--	root/root	usr/share/X11/xkb/geometry/README
 -rw-r--r--	root/root	usr/share/X11/xkb/geometry/amiga
 -rw-r--r--	root/root	usr/share/X11/xkb/geometry/ataritt
 -rw-r--r--	root/root	usr/share/X11/xkb/geometry/chicony
@@ -61,7 +59,6 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/geometry/sgi_vndr/
 -rw-r--r--	root/root	usr/share/X11/xkb/geometry/winbook
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes.dir
 drwxr-xr-x	root/root	usr/share/X11/xkb/keycodes/
--rw-r--r--	root/root	usr/share/X11/xkb/keycodes/README
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes/aliases
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes/amiga
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes/ataritt
@@ -82,55 +79,7 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/keycodes/sgi_vndr/
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes/sun
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes/xfree86
 -rw-r--r--	root/root	usr/share/X11/xkb/keycodes/xfree98
--rw-r--r--	root/root	usr/share/X11/xkb/keymap.dir
-drwxr-xr-x	root/root	usr/share/X11/xkb/keymap/
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/README
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/amiga
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/ataritt
-drwxr-xr-x	root/root	usr/share/X11/xkb/keymap/digital_vndr/
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/digital_vndr/us
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/macintosh
-drwxr-xr-x	root/root	usr/share/X11/xkb/keymap/sgi_vndr/
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/be
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/bg
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/ca
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/ch
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/cz
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/de
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/dk
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/dvorak
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/es
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/fi
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/fr
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/gb
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/hu
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/it
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/jp
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/no
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/pl
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/pt
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/ru
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/se
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/sk
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/th
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sgi_vndr/us
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sony
-drwxr-xr-x	root/root	usr/share/X11/xkb/keymap/sun_vndr/
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/all
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/de
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/es
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/fi
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/fr
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/no
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/pl
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/ru
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/se
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/uk
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/sun_vndr/us
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/xfree86
--rw-r--r--	root/root	usr/share/X11/xkb/keymap/xfree98
 drwxr-xr-x	root/root	usr/share/X11/xkb/rules/
--rw-r--r--	root/root	usr/share/X11/xkb/rules/README
 -rw-r--r--	root/root	usr/share/X11/xkb/rules/base
 -rw-r--r--	root/root	usr/share/X11/xkb/rules/base.extras.xml
 -rw-r--r--	root/root	usr/share/X11/xkb/rules/base.lst
@@ -144,12 +93,6 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/rules/
 lrwxrwxrwx	root/root	usr/share/X11/xkb/rules/xorg -> base
 lrwxrwxrwx	root/root	usr/share/X11/xkb/rules/xorg.lst -> base.lst
 lrwxrwxrwx	root/root	usr/share/X11/xkb/rules/xorg.xml -> base.xml
--rw-r--r--	root/root	usr/share/X11/xkb/semantics.dir
-drwxr-xr-x	root/root	usr/share/X11/xkb/semantics/
--rw-r--r--	root/root	usr/share/X11/xkb/semantics/basic
--rw-r--r--	root/root	usr/share/X11/xkb/semantics/complete
--rw-r--r--	root/root	usr/share/X11/xkb/semantics/default
--rw-r--r--	root/root	usr/share/X11/xkb/semantics/xtest
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols.dir
 drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/ad
@@ -342,7 +285,6 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/xfree68_vndr/
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/za
 -rw-r--r--	root/root	usr/share/X11/xkb/types.dir
 drwxr-xr-x	root/root	usr/share/X11/xkb/types/
--rw-r--r--	root/root	usr/share/X11/xkb/types/README
 -rw-r--r--	root/root	usr/share/X11/xkb/types/basic
 -rw-r--r--	root/root	usr/share/X11/xkb/types/cancel
 -rw-r--r--	root/root	usr/share/X11/xkb/types/caps
@@ -355,8 +297,5 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/types/
 -rw-r--r--	root/root	usr/share/X11/xkb/types/nokia
 -rw-r--r--	root/root	usr/share/X11/xkb/types/numpad
 -rw-r--r--	root/root	usr/share/X11/xkb/types/pc
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man7/
--rw-r--r--	root/root	usr/share/man/man7/xkeyboard-config.7.gz
 drwxr-xr-x	root/root	usr/share/pkgconfig/
 -rw-r--r--	root/root	usr/share/pkgconfig/xkeyboard-config.pc
diff --git a/xkeyboard-config/.md5sum b/xkeyboard-config/.md5sum
index e278fb91..d3d91fb7 100644
--- a/xkeyboard-config/.md5sum
+++ b/xkeyboard-config/.md5sum
@@ -1 +1 @@
-8cd1d7e074a810ef21b09ea963c43ad3  xkeyboard-config-2.5.tar.bz2
+e7e31da9adb56ba52b5c18226b8cbef3  xkeyboard-config-2.6.tar.bz2
diff --git a/xkeyboard-config/Pkgfile b/xkeyboard-config/Pkgfile
index 5f7ed50b..7b522cc5 100644
--- a/xkeyboard-config/Pkgfile
+++ b/xkeyboard-config/Pkgfile
@@ -1,17 +1,18 @@
 # Description: X keyboard configuration database
 # URL: http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
-# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
+# Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
 # Depends on: xorg-xkbcomp, intltool
 
 name=xkeyboard-config
-version=2.5
+version=2.6
 release=1
-source=(http://www.x.org/releases/individual/data/$name/$name-$version.tar.bz2)
+source=(http://xorg.freedesktop.org/releases/individual/data/$name/$name-$version.tar.bz2)
 
 build() {
-	cd xkeyboard-config-$version
+	cd $name-$version
 
 	./configure --prefix=/usr \
+	            --mandir=/usr/man \
 	            --with-xkb-base=/usr/share/X11/xkb \
 	            --with-xkb-rules-symlink=xorg
 
@@ -21,4 +22,5 @@ build() {
 	rm -rf $PKG/usr/share/locale
 
 	ln -s /var/lib/xkb $PKG/usr/share/X11/xkb/compiled 
+	find $PKG -name README -delete
 }