Update to 2.2:

2.2	Bugfixes. XML processing improved. Better compatibility with
	modular X.org filesystem layout
2.1	Bugfixes. GCC 4.x compatibility patches.

4 files changed, 13 insertions, 34 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 62a890b7471..b69f6eedf6f 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/12 11:18:11 jmmv Exp $
 #
 
-DISTNAME=	libxklavier-2.0
-PKGREVISION=	1
+DISTNAME=	libxklavier-2.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 5167356c24b..f4a5d242e6b 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/04/07 09:33:55 rillig Exp $
+$NetBSD: distinfo,v 1.13 2006/03/12 11:18:11 jmmv Exp $
 
-SHA1 (libxklavier-2.0.tar.gz) = 2eae2b8013be972172374fb5cc71a4f368c41d76
-RMD160 (libxklavier-2.0.tar.gz) = a8f219a61f47ed1bb0f801d0e78512b4275e0082
-Size (libxklavier-2.0.tar.gz) = 435898 bytes
+SHA1 (libxklavier-2.2.tar.gz) = f4f125ac71b734369b1e1cc843a357005c57355d
+RMD160 (libxklavier-2.2.tar.gz) = 875a14ee466133f033266924de4d95749d1a434f
+Size (libxklavier-2.2.tar.gz) = 467577 bytes
 SHA1 (patch-aa) = bbb3a2d342e434eb06890ed5a3f26b3b753cc46b
 SHA1 (patch-ab) = e548e2117cad11e8171a0bd9c490d11a326e43a3
-SHA1 (patch-ac) = 9e3f731d524562e9e623728db0b7d13422df087b
+SHA1 (patch-ac) = 4b7cdba5dbd93d8342b96865f7f046b579677a80
 SHA1 (patch-ad) = 7cb35743da121ebed70bf4c488a61c2016c3b352
-SHA1 (patch-ae) = bfbcb0b04e8f818bd1a2c2b5592be158fd0f81da
diff --git a/x11/libxklavier/patches/patch-ac b/x11/libxklavier/patches/patch-ac
index 29b2b49017d..e7eae047320 100644
--- a/x11/libxklavier/patches/patch-ac
+++ b/x11/libxklavier/patches/patch-ac
@@ -1,18 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2005/04/07 09:33:55 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2006/03/12 11:18:11 jmmv Exp $
 
---- libxklavier/xklavier.c.orig	Sat Jan  8 00:54:36 2005
-+++ libxklavier/xklavier.c	Sun Apr  3 17:42:44 2005
+--- libxklavier/xklavier.c.orig	2006-02-14 01:59:22.000000000 +0100
++++ libxklavier/xklavier.c
 @@ -1,3 +1,4 @@
 +#include <stdlib.h>
  #include <time.h>
  
  #include <X11/Xatom.h>
-@@ -773,8 +774,7 @@ void _XklEnsureVTableInited( void )
-   if ( xklVTable == NULL )
+@@ -773,7 +774,7 @@ void _XklEnsureVTableInited( void )
    {
      XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
--    /* force the crash! */
--    char *p = NULL; *p = '\0';
+     /* force the crash! */
+-    p = NULL; *p = '\0';
 +    abort();
    }
  }
diff --git a/x11/libxklavier/patches/patch-ae b/x11/libxklavier/patches/patch-ae
deleted file mode 100644
index 065bac47a55..00000000000
--- a/x11/libxklavier/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/04/07 09:33:55 rillig Exp $
-
---- libxklavier/xklavier_xmm.c.orig	Fri Jan  7 15:20:23 2005
-+++ libxklavier/xklavier_xmm.c	Sun Apr  3 17:43:18 2005
-@@ -65,11 +65,12 @@ void _XklXmmUngrabShortcuts( )
- 
- const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
- {
-+  XmmSwitchOptionPtr switchOption;
-   const char* optionName = _XklXmmGetCurrentShortcutOptionName();
-   XklDebug( 150, "Configured switch option: [%s]\n", optionName );
-   if( optionName == NULL )
-     return NULL;
--  XmmSwitchOptionPtr switchOption = allSwitchOptions;
-+  switchOption = allSwitchOptions;
-   while( switchOption->optionName != NULL )
-   {
-     if( !strcmp( switchOption->optionName, optionName ) )