From f2b0bc7f191b8371554ed9c7ec4db1e5594a0867 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 9 Aug 2009 08:04:24 +0000
Subject: Update to 4.0:

4.0	Support for "extras" in xkeyboard-config, small bugfixes and build
	fixes
---
 x11/libxklavier/Makefile         |  4 ++--
 x11/libxklavier/PLIST            |  3 ++-
 x11/libxklavier/distinfo         | 10 +++++-----
 x11/libxklavier/patches/patch-ab |  8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'x11')

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c592196c513..7a4cd928092 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2009/08/09 08:04:24 wiz Exp $
 #
 
-DISTNAME=	libxklavier-3.9
+DISTNAME=	libxklavier-4.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/libxklavier/PLIST b/x11/libxklavier/PLIST
index e0fc6fafe79..fb8bc253a78 100644
--- a/x11/libxklavier/PLIST
+++ b/x11/libxklavier/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:25:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/08/09 08:04:24 wiz Exp $
+include/libxklavier/xkl-enum-types.h
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
 include/libxklavier/xkl_config_registry.h
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index bed7708bc89..1239aee8119 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2009/05/13 12:32:08 wiz Exp $
+$NetBSD: distinfo,v 1.20 2009/08/09 08:04:24 wiz Exp $
 
-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 (libxklavier-4.0.tar.bz2) = 37c6e9fb8b436d6a646a6eea09cf196baad28756
+RMD160 (libxklavier-4.0.tar.bz2) = e99904f7886701c7d37177999dff87261fd94ef3
+Size (libxklavier-4.0.tar.bz2) = 354149 bytes
+SHA1 (patch-ab) = 02f3f5adf6ec9d4c6dd985ca0d9869f963f9e445
 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
index cd202547c58..2f76c632c76 100644
--- a/x11/libxklavier/patches/patch-ab
+++ b/x11/libxklavier/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.9 2009/05/13 12:32:08 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2009/08/09 08:04:24 wiz Exp $
 
---- Makefile.in.orig	2009-03-18 21:42:15.000000000 +0000
+--- Makefile.in.orig	2009-06-28 13:09:35.000000000 +0000
 +++ Makefile.in
-@@ -212,7 +212,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -216,7 +216,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = libxklavier doc tests
 +SUBDIRS = libxklavier doc
  EXTRA_DIST = libxklavier.spec libxklavier.spec.in \
-- 
cgit v1.2.3