4 files changed, 11 insertions, 18 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index b3510d784de7..34c9924e40da 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	0.9
-PORTREVISION=	3
+PORTVERSION=	1.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
 DISTNAME=	xkeyboard-config-${PORTVERSION}
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index a350ba349705..2ad7f7527dd8 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (xkeyboard-config-0.9.tar.bz2) = 52afe60101ace8532881e70f6c2dc020
-SHA256 (xkeyboard-config-0.9.tar.bz2) = bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d
-SIZE (xkeyboard-config-0.9.tar.bz2) = 471807
+MD5 (xkeyboard-config-1.0.tar.bz2) = bcf08a6bf76bd5661f730d36a1d66517
+SHA256 (xkeyboard-config-1.0.tar.bz2) = 44e4765c90b4ff3791eee40bdd95ab24d5b0089e39badedc2155cf10d4072ffb
+SIZE (xkeyboard-config-1.0.tar.bz2) = 534180
diff --git a/x11/xkeyboard-config/files/patch-rules_xfree98 b/x11/xkeyboard-config/files/patch-rules_xfree98
deleted file mode 100644
index 2bb81cb603b2..000000000000
--- a/x11/xkeyboard-config/files/patch-rules_xfree98
+++ /dev/null
@@ -1,11 +0,0 @@
---- rules/xfree98.orig	Thu Jun  7 17:05:37 2007
-+++ rules/xfree98	Thu Jun  7 17:06:48 2007
-@@ -10,7 +10,7 @@
-   jp106		=	xfree98(jp106)	pc(jp106)
- 
- ! model		layout	=	symbols
--  pc98		nec/jp	=	nec/jp(pc98)
-+  pc98		nec_vndr/jp	=	nec_vndr/jp(pc98)
-   jp106		jp	=	jp
- 
- ! model		layout	=	compat		types
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index 25ef72df15c0..3face2acd4d5 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -18,7 +18,6 @@ share/X11/xkb/compat/pc98
 share/X11/xkb/compat/xfree86
 share/X11/xkb/compat/xtest
 share/X11/xkb/compat/README
-share/X11/xkb/compiled
 share/X11/xkb/geometry/digital_vndr/lk
 share/X11/xkb/geometry/digital_vndr/pc
 share/X11/xkb/geometry/digital_vndr/unix
@@ -31,6 +30,7 @@ share/X11/xkb/geometry/chicony
 share/X11/xkb/geometry/dell
 share/X11/xkb/geometry/everex
 share/X11/xkb/geometry/fujitsu
+share/X11/xkb/geometry/hhk
 share/X11/xkb/geometry/hp
 share/X11/xkb/geometry/keytronic
 share/X11/xkb/geometry/kinesis
@@ -58,7 +58,6 @@ share/X11/xkb/keycodes/fujitsu
 share/X11/xkb/keycodes/hp
 share/X11/xkb/keycodes/ibm
 share/X11/xkb/keycodes/macintosh
-share/X11/xkb/keycodes/powerpcps2
 share/X11/xkb/keycodes/sony
 share/X11/xkb/keycodes/sun
 share/X11/xkb/keycodes/xfree86
@@ -113,6 +112,7 @@ share/X11/xkb/rules/base.lst
 share/X11/xkb/rules/base.xml
 share/X11/xkb/rules/sgi
 share/X11/xkb/rules/sun
+share/X11/xkb/rules/sun.xml
 share/X11/xkb/rules/xfree98
 share/X11/xkb/rules/xkb.dtd
 share/X11/xkb/rules/xorg
@@ -124,6 +124,7 @@ share/X11/xkb/semantics/basic
 share/X11/xkb/semantics/complete
 share/X11/xkb/semantics/default
 share/X11/xkb/semantics/xtest
+share/X11/xkb/symbols/braille
 share/X11/xkb/symbols/digital_vndr/lk
 share/X11/xkb/symbols/digital_vndr/pc
 share/X11/xkb/symbols/digital_vndr/us
@@ -141,6 +142,7 @@ share/X11/xkb/symbols/macintosh_vndr/fr
 share/X11/xkb/symbols/macintosh_vndr/gb
 share/X11/xkb/symbols/macintosh_vndr/is
 share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/latam
 share/X11/xkb/symbols/macintosh_vndr/nl
 share/X11/xkb/symbols/macintosh_vndr/no
 share/X11/xkb/symbols/macintosh_vndr/pt
@@ -202,6 +204,7 @@ share/X11/xkb/symbols/dk
 share/X11/xkb/symbols/ee
 share/X11/xkb/symbols/epo
 share/X11/xkb/symbols/es
+share/X11/xkb/symbols/et
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
 share/X11/xkb/symbols/fr
@@ -229,6 +232,7 @@ share/X11/xkb/symbols/latin
 share/X11/xkb/symbols/lk
 share/X11/xkb/symbols/lt
 share/X11/xkb/symbols/lv
+share/X11/xkb/symbols/ma
 share/X11/xkb/symbols/mao
 share/X11/xkb/symbols/mk
 share/X11/xkb/symbols/mm
@@ -283,6 +287,7 @@ share/X11/xkb/types/mousekeys
 share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
 share/X11/xkb/types/README
+share/X11/xkb/xkbcomp
 @exec mkdir -p /var/lib/xkb
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb/geometry/digital_vndr