Update to 2.1.

Reminded by:	edwin's "FreeBSD Ports Version Check" script

5 files changed, 13 insertions, 40 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 4ca2826e3529..671d636e5099 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	2.0
-PORTREVISION=	3
+PORTVERSION=	2.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 3652abac1fa9..bd5bd603eac0 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-2.0.tar.gz) = 9257653ee3d194d9c8d669e969fe4332
-SHA256 (libxklavier-2.0.tar.gz) = fe3347ec6c58ba579d8c0ab0afcfa1058fe40850ac745107e5b4199b463e2cbe
-SIZE (libxklavier-2.0.tar.gz) = 435898
+MD5 (libxklavier-2.1.tar.gz) = 6a44ea49f958d7c9ad319edeea338798
+SHA256 (libxklavier-2.1.tar.gz) = 3bc7baa83b02ff86b632778d766f40d5c0075e61cfd708f3d8c808e4ab9971e6
+SIZE (libxklavier-2.1.tar.gz) = 452356
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
index 195b48534da1..6355d7b772e6 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -1,6 +1,6 @@
---- libxklavier/xklavier.c.orig	Tue Nov  2 16:58:48 2004
-+++ libxklavier/xklavier.c	Tue Nov 23 19:56:29 2004
-@@ -536,7 +536,7 @@
+--- libxklavier/xklavier.c.orig	Tue Dec 13 00:52:26 2005
++++ libxklavier/xklavier.c	Tue Dec 13 00:52:45 2005
+@@ -606,7 +606,7 @@
                              int level, const char format[], va_list args )
  {
    time_t now = time( NULL );
@@ -9,15 +9,3 @@
    vfprintf( stdout, format, args );
  }
  
-@@ -700,9 +700,10 @@
- {
-   if ( xklVTable == NULL )
-   {
-+    char *p;
-     XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
-     /* force the crash! */
--    char *p = NULL; *p = '\0';
-+    p = NULL; *p = '\0';
-   }
- }
- 
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c
deleted file mode 100644
index 718086305784..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxklavier/xklavier_config_xkb.c.orig	Sat Dec 10 00:04:07 2005
-+++ libxklavier/xklavier_config_xkb.c	Sat Dec 10 00:04:41 2005
-@@ -223,7 +223,7 @@ static XkbDescPtr _XklConfigGetKeyboard(
-           exit( 1 );
-         default:
-           /* parent */
--          pid = wait( &status );
-+          pid = waitpid( cpid, &status, 0 );
-           XklDebug( 150, "Return status of %d (well, started %d): %d\n", pid, cpid, status );
-           memset( (char *)&result, 0, sizeof(result) );
-           result.xkb = XkbAllocKeyboard();
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
index 6db8c55088c3..09658570e653 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
@@ -1,15 +1,12 @@
---- libxklavier/xklavier_xmm.c.orig	Tue Nov 30 02:17:37 2004
-+++ libxklavier/xklavier_xmm.c	Tue Nov 30 02:17:51 2004
-@@ -66,10 +66,11 @@
- const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+--- libxklavier/xklavier_xmm.c.orig	Tue Dec 13 00:58:22 2005
++++ libxklavier/xklavier_xmm.c	Tue Dec 13 00:58:47 2005
+@@ -66,7 +66,8 @@
+ XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void )
  {
    const char* optionName = _XklXmmGetCurrentShortcutOptionName();
+-  XmmSwitchOptionPtr switchOption = allSwitchOptions;
 +  XmmSwitchOptionPtr switchOption;
++  switchOption = allSwitchOptions;
    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 ) )