Update to libxklavier 3.7.

3.7     A couple of essential bugfixes. Now all translated strings are in
        UTF-8 (even in 8-bit locales).
3.6     Added API for countries and languages

5 files changed, 21 insertions, 23 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 9aa61f58f34..6da6d065314 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2008/07/14 12:56:19 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/24 23:21:20 jnemeth Exp $
 #
 
-DISTNAME=	libxklavier-3.5
+DISTNAME=	libxklavier-3.7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 
@@ -19,13 +19,11 @@ USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libxklavier.pc.in
 
 CONFIGURE_ARGS+=	--enable-xkb-support
-CONFIGURE_ARGS+=	--enable-xmm-support
-
-BUILDLINK_TRANSFORM+=	rm:-Werror
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxklavier/PLIST b/x11/libxklavier/PLIST
index 12456444742..f998a63b162 100644
--- a/x11/libxklavier/PLIST
+++ b/x11/libxklavier/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/16 16:41:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/24 23:21:20 jnemeth Exp $
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
 include/libxklavier/xkl_config_registry.h
@@ -7,16 +7,16 @@ include/libxklavier/xkl_engine_marshal.h
 include/libxklavier/xklavier.h
 lib/libxklavier.la
 lib/pkgconfig/libxklavier.pc
+share/gtk-doc/html/libxklavier/XklConfigItem.html
+share/gtk-doc/html/libxklavier/XklConfigRec.html
+share/gtk-doc/html/libxklavier/XklConfigRegistry.html
+share/gtk-doc/html/libxklavier/XklEngine.html
 share/gtk-doc/html/libxklavier/ch01.html
 share/gtk-doc/html/libxklavier/ch02.html
 share/gtk-doc/html/libxklavier/home.png
 share/gtk-doc/html/libxklavier/index.html
 share/gtk-doc/html/libxklavier/index.sgml
 share/gtk-doc/html/libxklavier/left.png
-share/gtk-doc/html/libxklavier/libxklavier-XklConfigItem.html
-share/gtk-doc/html/libxklavier/libxklavier-XklConfigRec.html
-share/gtk-doc/html/libxklavier/libxklavier-XklConfigRegistry.html
-share/gtk-doc/html/libxklavier/libxklavier-XklEngine.html
 share/gtk-doc/html/libxklavier/libxklavier-xklavier.html
 share/gtk-doc/html/libxklavier/libxklavier.devhelp
 share/gtk-doc/html/libxklavier/libxklavier.devhelp2
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index c94635a61d3..66b95f74cef 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2008/04/16 16:41:37 drochner Exp $
+$NetBSD: distinfo,v 1.17 2008/10/24 23:21:20 jnemeth Exp $
 
-SHA1 (libxklavier-3.5.tar.gz) = c9e318f31c5ac5895aae01069c53c7f7ab554b13
-RMD160 (libxklavier-3.5.tar.gz) = b1b9fc5f700f356ad4f369411cee9fa6d64e5528
-Size (libxklavier-3.5.tar.gz) = 448663 bytes
-SHA1 (patch-aa) = 855dd7bf3927926971997a3415800684a538ec0c
-SHA1 (patch-ab) = dfdbadd45de1521ad5bc03a23c9bd0ae7f9b5626
+SHA1 (libxklavier-3.7.tar.gz) = 695e67d670fd95825eb117134ddb12fee97f3a41
+RMD160 (libxklavier-3.7.tar.gz) = 7259b1301cf0f9b6157e46a2628cbab72d5e050e
+Size (libxklavier-3.7.tar.gz) = 416044 bytes
+SHA1 (patch-aa) = 12d28635a144de5dcdb9b8c2c89a6c9ac9b542c7
+SHA1 (patch-ab) = 2fd43369a95ce69125322d279b697338c6c6f416
 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
index 5ae82c49c2a..57e55d8669f 100644
--- a/x11/libxklavier/patches/patch-aa
+++ b/x11/libxklavier/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2008/04/16 16:41:38 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2008/10/24 23:22:06 jnemeth Exp $
 
---- configure.orig	2007-09-04 22:21:30.000000000 +0200
+--- configure.orig	2008-09-05 12:50:11.000000000 -0700
 +++ configure
-@@ -22403,9 +22403,9 @@ fi
+@@ -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; }
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.7 2008/04/16 16:41:38 drochner Exp $
    { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
  else
-@@ -24256,8 +24258,8 @@ fi
+@@ -16745,8 +16745,8 @@ fi
  
  echo '**********************************************************'
  echo '  Libxklavier is configured with the following backends:'
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.7 2008/04/16 16:41:38 drochner Exp $
      echo "    XKB, libxkbfile is present"
      echo "         default ruleset: $xkb_default_ruleset"
      echo "         base: $xkb_base"
-@@ -24266,12 +24268,12 @@ if test "$enable_xkb_support" == "yes" ;
+@@ -16755,12 +16755,12 @@ 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 b86057677df..82469cfad49 100644
--- a/x11/libxklavier/patches/patch-ab
+++ b/x11/libxklavier/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2008/04/16 16:41:38 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2008/10/24 23:22:06 jnemeth Exp $
 
 --- Makefile.in.orig	2008-02-28 15:49:53.000000000 +0100
 +++ Makefile.in
-@@ -219,7 +219,7 @@ sbindir = @sbindir@
+@@ -217,7 +217,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@