Update to xkeyboard-config 2.0.

Changes: Bugfixes (17), updated/new translations, some new layouts and models.

pkgsrc: 4 patches included upstream.

7 files changed, 10 insertions, 108 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index bbdacb79fd0..57ccc3b7b26 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/09/01 12:55:49 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/10/16 13:13:18 ghen Exp $
 #
 
-DISTNAME=		xkeyboard-config-1.9
-PKGREVISION=		1
+DISTNAME=		xkeyboard-config-2.0
 CATEGORIES=		x11
 MASTER_SITES=		http://people.freedesktop.org/~svu/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index 0a2dceaeee8..9c01765a552 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/06/01 13:14:25 ghen Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/10/16 13:13:18 ghen Exp $
 share/X11/xkb/compat.dir
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
@@ -142,6 +142,7 @@ share/X11/xkb/symbols/al
 share/X11/xkb/symbols/altwin
 share/X11/xkb/symbols/am
 share/X11/xkb/symbols/ara
+share/X11/xkb/symbols/at
 share/X11/xkb/symbols/az
 share/X11/xkb/symbols/ba
 share/X11/xkb/symbols/bd
@@ -173,7 +174,9 @@ share/X11/xkb/symbols/es
 share/X11/xkb/symbols/et
 share/X11/xkb/symbols/eurosign
 share/X11/xkb/symbols/extras/apl
+share/X11/xkb/symbols/extras/ir
 share/X11/xkb/symbols/extras/rs
+share/X11/xkb/symbols/extras/ru
 share/X11/xkb/symbols/extras/us
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 56717d55dd9..232527b77f5 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.7 2010/09/01 12:55:49 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/10/16 13:13:18 ghen Exp $
 
-SHA1 (xkeyboard-config-1.9.tar.bz2) = 2a3f29d003c0fe23cb6c8b4389bb7002c66b557c
-RMD160 (xkeyboard-config-1.9.tar.bz2) = a5d5561b4bcfc3c442c0b8c82ee4478d9e630398
-Size (xkeyboard-config-1.9.tar.bz2) = 650829 bytes
-SHA1 (patch-aa) = 726b7edd02f7b15b3cc89f40e2131c0851fa3179
-SHA1 (patch-ab) = dc866ef4e8ca977045cc522d1aabb8157970d277
-SHA1 (patch-ac) = c32c2a278ffc5a98138430b8ecf9e5c1d50d2d39
-SHA1 (patch-ad) = 19135615c78e5bd44b8d62a3b29fbec0d77fa0d0
+SHA1 (xkeyboard-config-2.0.tar.bz2) = 3959678edd23368d208738e979dc5a605c155bee
+RMD160 (xkeyboard-config-2.0.tar.bz2) = d8dcddff34ab96c2e85b2ebfafa8edb287df4d6a
+Size (xkeyboard-config-2.0.tar.bz2) = 656757 bytes
diff --git a/x11/xkeyboard-config/patches/patch-aa b/x11/xkeyboard-config/patches/patch-aa
deleted file mode 100644
index 211bf20baa8..00000000000
--- a/x11/xkeyboard-config/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/09/01 12:55:50 wiz Exp $
-
-Fix syntax error.
-https://bugs.freedesktop.org/show_bug.cgi?id=29887
-
---- symbols/in.orig	2010-03-08 23:08:20.000000000 +0000
-+++ symbols/in
-@@ -85,7 +85,7 @@ xkb_symbols "deva" {
- 	key <AB10> { [ U092f, U095f, slash, question ] };
- 
- 	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
--	include "nbsp(zwnj3zwj4)";
-+	include "nbsp(zwnj3zwj4)"
- };
- 
- //Name		:	Bolnagri (Combined)
-@@ -1263,7 +1263,7 @@ xkb_symbols "olpc" {
-   key <AB10> { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
- 
-   // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
--  include "nbsp(zwnj3zwj4)";
-+  include "nbsp(zwnj3zwj4)"
- 
-   include "group(olpc)"
- };
diff --git a/x11/xkeyboard-config/patches/patch-ab b/x11/xkeyboard-config/patches/patch-ab
deleted file mode 100644
index 9aff5017116..00000000000
--- a/x11/xkeyboard-config/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2010/09/01 12:55:50 wiz Exp $
-
-Fix syntax error.
-https://bugs.freedesktop.org/show_bug.cgi?id=29887
-
---- symbols/ir.orig	2010-02-01 23:00:18.000000000 +0000
-+++ symbols/ir
-@@ -18,11 +18,11 @@ partial default alphanumeric_keys
- xkb_symbols "pes" {
-     name[Group1]= "Iran";
- 
--    include "ir(pes_part_basic)";
--    include "ir(pes_part_ext)";
-+    include "ir(pes_part_basic)"
-+    include "ir(pes_part_ext)"
- 
--    include "nbsp(zwnj2nb3nnb4)";
--    include "level3(ralt_switch)";
-+    include "nbsp(zwnj2nb3nnb4)"
-+    include "level3(ralt_switch)"
- };
- 
- 
-@@ -30,11 +30,11 @@ partial alphanumeric_keys
- xkb_symbols "pes_keypad" {
-     name[Group1]= "Iran - Persian, with Persian Keypad";
- 
--    include "ir(pes_part_basic)";
--    include "ir(pes_part_keypad)";
-+    include "ir(pes_part_basic)"
-+    include "ir(pes_part_keypad)"
- 
--    include "nbsp(zwnj2nb3nnb4)";
--    include "level3(ralt_switch)";
-+    include "nbsp(zwnj2nb3nnb4)"
-+    include "level3(ralt_switch)"
- };
- 
- partial hidden alphanumeric_keys
diff --git a/x11/xkeyboard-config/patches/patch-ac b/x11/xkeyboard-config/patches/patch-ac
deleted file mode 100644
index ed8933c3534..00000000000
--- a/x11/xkeyboard-config/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/09/01 12:55:50 wiz Exp $
-
-Fix syntax error.
-https://bugs.freedesktop.org/show_bug.cgi?id=29887
-
---- symbols/lk.orig	2010-02-01 23:00:18.000000000 +0000
-+++ symbols/lk
-@@ -74,7 +74,7 @@ xkb_symbols "sin_phonetic" {
-   key <AB10> { [ any, any, 0x0100200d, NoSymbol ] };
- 
-   // Space
--  include "nbsp(zwnj2nb3s)";
-+  include "nbsp(zwnj2nb3s)"
- 
-   include "level3(ralt_switch)"
- };
diff --git a/x11/xkeyboard-config/patches/patch-ad b/x11/xkeyboard-config/patches/patch-ad
deleted file mode 100644
index a7c8621d9e7..00000000000
--- a/x11/xkeyboard-config/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2010/09/01 12:55:50 wiz Exp $
-
-Fix syntax error.
-https://bugs.freedesktop.org/show_bug.cgi?id=29887
-
---- symbols/sy.orig	2010-02-01 23:00:18.000000000 +0000
-+++ symbols/sy
-@@ -68,7 +68,7 @@ xkb_symbols "syc" {
-     // End Alphanumeric Section
- 
-     // Space
--    include "nbsp(zwnj2)";
-+    include "nbsp(zwnj2)"
-     
-     // Begin Modifier Mappings
-