Update to 3.2:

3.2	Some bugfixes.
3.1	Straghten the licensing terms. Some bugfixes.

5 files changed, 29 insertions, 27 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index a342fdef6e0..32e469abc1d 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/15 19:26:33 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/04/19 21:39:17 wiz Exp $
 #
 
-DISTNAME=	libxklavier-3.0
+DISTNAME=	libxklavier-3.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 5e5ade0e0f3..486246b384a 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/09/15 15:11:52 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2007/04/19 21:39:17 wiz Exp $
 
-SHA1 (libxklavier-3.0.tar.gz) = 22e4499d86abc4afc9fe1d6a07b29fafa782cc78
-RMD160 (libxklavier-3.0.tar.gz) = 7835f0a4369198a9fc91077687917c2b29b05d80
-Size (libxklavier-3.0.tar.gz) = 460992 bytes
-SHA1 (patch-aa) = 83ae57cc299371f67a93a74e728443343e03a8b4
-SHA1 (patch-ab) = c517c6d4f8a2ff92d49f58104fcb80de26cbf242
-SHA1 (patch-ac) = 220d519659bf40305093b52617ccaab905f1341d
+SHA1 (libxklavier-3.2.tar.gz) = 4169a021201e8ccb9a771d1321a8d1e5bba1fd51
+RMD160 (libxklavier-3.2.tar.gz) = 4d4654b6fffe5cedd6c6f268ffe364b40417e881
+Size (libxklavier-3.2.tar.gz) = 466656 bytes
+SHA1 (patch-aa) = d01d9e9b7935202a67c0403dda4067c26bc9bb08
+SHA1 (patch-ab) = 651f8a6616e8771bf64272ae5d09812c8396b6a2
+SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
index be0fae7b446..035379a4c62 100644
--- a/x11/libxklavier/patches/patch-aa
+++ b/x11/libxklavier/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.5 2006/09/15 15:11:53 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/19 21:39:17 wiz Exp $
 
---- configure.orig	2006-08-30 15:57:39.000000000 +0200
+--- configure.orig	2007-03-22 21:46:19.000000000 +0000
 +++ configure
-@@ -21651,9 +21651,9 @@ fi
+@@ -22143,9 +22143,9 @@ fi
  
- echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
- echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
+ echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; }
 -if test \( "$enable_xkb_support" == "yes" -a \
 -          "$libxkbfile_present" == "yes" \) -o \
 -        "$enable_xmodmap_support" == "yes" ; then
 +if test \( "$enable_xkb_support" = "yes" -a \
 +          "$libxkbfile_present" = "yes" \) -o \
 +        "$enable_xmodmap_support" = "yes" ; then
-   echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
  else
-@@ -23531,8 +23531,8 @@ fi
+@@ -23995,8 +23995,8 @@ fi
  
  echo '**********************************************************'
  echo '  Libxklavier is configured with the following backends:'
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.5 2006/09/15 15:11:53 jmmv Exp $
      echo "    XKB, libxkbfile is present"
      echo "         default ruleset: $xkb_default_ruleset"
      echo "         base: $xkb_base"
-@@ -23540,7 +23540,7 @@ if test "$enable_xkb_support" == "yes" ;
+@@ -24005,7 +24005,7 @@ if test "$enable_xkb_support" == "yes" ;
      echo "    XKB, libxkbfile is NOT present"
    fi
  fi
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
index 4732f2ac955..e4998a0fcdd 100644
--- a/x11/libxklavier/patches/patch-ab
+++ b/x11/libxklavier/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2006/09/15 15:11:53 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2007/04/19 21:39:17 wiz Exp $
 
---- Makefile.in.orig	2006-08-30 15:59:01.000000000 +0200
+--- Makefile.in.orig	2007-03-22 21:46:18.000000000 +0000
 +++ Makefile.in
-@@ -213,7 +213,7 @@ sysconfdir = @sysconfdir@
+@@ -217,7 +217,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
 -SUBDIRS = libxklavier doc tests
 +SUBDIRS = libxklavier doc
  config_xml_DATA = xfree86.xml
diff --git a/x11/libxklavier/patches/patch-ac b/x11/libxklavier/patches/patch-ac
index baa33d8a326..7c10b982774 100644
--- a/x11/libxklavier/patches/patch-ac
+++ b/x11/libxklavier/patches/patch-ac
@@ -1,14 +1,16 @@
-$NetBSD: patch-ac,v 1.5 2006/09/15 15:11:53 jmmv Exp $
+$NetBSD: patch-ac,v 1.6 2007/04/19 21:39:18 wiz Exp $
 
---- libxklavier/xklavier.c.orig	2006-06-30 02:37:24.000000000 +0200
+--- libxklavier/xklavier.c.orig	2007-02-23 21:56:59.000000000 +0000
 +++ libxklavier/xklavier.c
-@@ -1,4 +1,5 @@
+@@ -18,6 +18,7 @@
+  */
+ 
  #include <string.h>
 +#include <stdlib.h>
  #include <time.h>
  
  #include <X11/Xatom.h>
-@@ -473,8 +474,7 @@ xkl_engine_ensure_vtable_inited(XklEngin
+@@ -492,8 +493,7 @@ xkl_engine_ensure_vtable_inited(XklEngin
  	if (xkl_engine_priv(engine, backend_id) == NULL) {
  		xkl_debug(0, "ERROR: XKL VTable is NOT initialized.\n");
  		/* force the crash! */