Update to 3.9. Set LICENSE to gnu-lgpl-v2.

Several small bugs fixed, including memleak and crash under NX

4 files changed, 14 insertions, 57 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 9dd88abdf6a..7e1b7d13c47 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2008/12/20 23:31:54 jmcneill Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/13 12:32:08 wiz Exp $
 #
 
-DISTNAME=	libxklavier-3.8
-PKGREVISION=	1
+DISTNAME=	libxklavier-3.9
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://freedesktop.org/Software/LibXklavier
 COMMENT=	High-level API for the X Keyboard Extension (XKB)
 
+LICENSE=	gnu-lgpl-v2
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index f261653e5cb..bed7708bc89 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.18 2008/11/24 14:14:52 wiz Exp $
+$NetBSD: distinfo,v 1.19 2009/05/13 12:32:08 wiz Exp $
 
-SHA1 (libxklavier-3.8.tar.bz2) = 2c30ecc46cf0a909566cee29f1c477aaf38c5019
-RMD160 (libxklavier-3.8.tar.bz2) = 0c853a18056193802e74a7f30f3df1eef1820e5d
-Size (libxklavier-3.8.tar.bz2) = 343107 bytes
-SHA1 (patch-aa) = 12d28635a144de5dcdb9b8c2c89a6c9ac9b542c7
-SHA1 (patch-ab) = 6004e800ee0607ddcfcec71b51ed8327b7f73f44
+SHA1 (libxklavier-3.9.tar.bz2) = f093950923361310f80c2c434f7cc1a17c09f301
+RMD160 (libxklavier-3.9.tar.bz2) = b92ce43e0c18183029aaf3d94b8960c022854f5d
+Size (libxklavier-3.9.tar.bz2) = 339409 bytes
+SHA1 (patch-ab) = b8392f20cd8950a133e26d85466ec8842bf0ac4e
 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
deleted file mode 100644
index 57e55d8669f..00000000000
--- a/x11/libxklavier/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2008/10/24 23:22:06 jnemeth Exp $
-
---- configure.orig	2008-09-05 12:50:11.000000000 -0700
-+++ configure
-@@ -14110,9 +14110,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; }
--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; }
- else
-@@ -16745,8 +16745,8 @@ fi
- 
- echo '**********************************************************'
- echo '  Libxklavier is configured with the following backends:'
--if test "$enable_xkb_support" == "yes" ; then
--  if test "$libxkbfile_present" == "yes" ; then
-+if test "$enable_xkb_support" = "yes" ; then
-+  if test "$libxkbfile_present" = "yes" ; then
-     echo "    XKB, libxkbfile is present"
-     echo "         default ruleset: $xkb_default_ruleset"
-     echo "         base: $xkb_base"
-@@ -16755,12 +16755,12 @@ if test "$enable_xkb_support" == "yes" ;
-     echo "    XKB, libxkbfile is NOT present"
-   fi
- fi
--if test "$enable_xmodmap_support" == "yes" ; then
-+if test "$enable_xmodmap_support" = "yes" ; then
-   echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
-   echo "             base: $xmodmap_base"
- fi
- 
--if test "$enable_gtk_doc" == "yes" ; then
-+if test "$enable_gtk_doc" = "yes" ; then
-   echo "  gtk-doc enabled"
- else
-   echo "  gtk-doc disabled"
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
index 10f411c0012..cd202547c58 100644
--- a/x11/libxklavier/patches/patch-ab
+++ b/x11/libxklavier/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2008/11/24 14:14:53 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2009/05/13 12:32:08 wiz Exp $
 
---- Makefile.in.orig	2008-11-17 00:47:46.000000000 +0000
+--- Makefile.in.orig	2009-03-18 21:42:15.000000000 +0000
 +++ Makefile.in
-@@ -210,7 +210,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -212,7 +212,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = libxklavier doc tests
 +SUBDIRS = libxklavier doc
  EXTRA_DIST = libxklavier.spec libxklavier.spec.in \
               autogen.sh \
-              CREDITS libxklavier.pc.in gtk-doc.make \
+              CREDITS libxklavier.pc.in \