Update to 0.4.0

CHangelog:
libxkbcommon 0.4.0
==================

- Add a new add-on library, xkbcommon-x11, to support creating keymaps
  with the XKB X11 protocol, by querying the X server directly.
  See the xkbcommon/xkbcommon-x11.h header file for more details.
  This library requires libxcb-xkb >= 1.10, and is enabled by default.
  It can be disabled with the --disable-x11 configure switch.
  Distributions are encouraged to split the necessary files for this
  library (libxkbcommon-x11.so, xkbcommon-x11.pc, xkbcommon/xkbcommon-x11.h)
  to a separate package, such that the main package does not depend on
  X11 libraries.

- Fix the keysym <-> name lookup table to not require huge amounts of
  relocations.

- Fix a bug in the keysym <-> name lookup, whereby lookup might fail in
  some rare cases.

- Reduce memory usage during keymap compilation.

- New API:
  New keysyms from xproto 7.0.25 (German T3 layout keysyms).
  XKB_MOD_NAME_NUM for the usual NumLock modifier.
  xkb_x11_* types and functions, XKB_X11_* constants.

5 files changed, 37 insertions, 99 deletions

diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index b8f545aeb6e..5a3d88e0453 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/01/14 18:52:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/03 16:01:19 ryoon Exp $
 
-DISTNAME=	libxkbcommon-0.3.2
-PKGREVISION=	2
+DISTNAME=	libxkbcommon-0.4.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xkbcommon.org/download/
 EXTRACT_SUFX=	.tar.xz
@@ -19,5 +18,7 @@ PKGCONFIG_OVERRIDE+=	xkbcommon.pc.in
 
 .include "options.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.10
+.include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xkeyboard-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxkbcommon/PLIST b/x11/libxkbcommon/PLIST
index 4396952a014..c004a504da8 100644
--- a/x11/libxkbcommon/PLIST
+++ b/x11/libxkbcommon/PLIST
@@ -1,96 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/18 18:51:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/02/03 16:01:19 ryoon Exp $
 include/xkbcommon/xkbcommon-compat.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
+include/xkbcommon/xkbcommon-x11.h
 include/xkbcommon/xkbcommon.h
+lib/libxkbcommon-x11.la
 lib/libxkbcommon.la
+lib/pkgconfig/xkbcommon-x11.pc
 lib/pkgconfig/xkbcommon.pc
-${PLIST.doc}share/doc/libxkbcommon/annotated.html
-${PLIST.doc}share/doc/libxkbcommon/annotated.js
-${PLIST.doc}share/doc/libxkbcommon/bc_s.png
-${PLIST.doc}share/doc/libxkbcommon/bdwn.png
-${PLIST.doc}share/doc/libxkbcommon/classes.html
-${PLIST.doc}share/doc/libxkbcommon/closed.png
-${PLIST.doc}share/doc/libxkbcommon/dir_000000.html
-${PLIST.doc}share/doc/libxkbcommon/dir_000000.js
-${PLIST.doc}share/doc/libxkbcommon/doxygen.css
-${PLIST.doc}share/doc/libxkbcommon/doxygen.png
-${PLIST.doc}share/doc/libxkbcommon/dynsections.js
-${PLIST.doc}share/doc/libxkbcommon/files.html
-${PLIST.doc}share/doc/libxkbcommon/files.js
-${PLIST.doc}share/doc/libxkbcommon/ftv2blank.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2cl.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2doc.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2folderclosed.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2folderopen.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2lastnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2link.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2mlastnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2mnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2mo.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2node.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2ns.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2plastnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2pnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2splitbar.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2vertline.png
-${PLIST.doc}share/doc/libxkbcommon/functions.html
-${PLIST.doc}share/doc/libxkbcommon/functions_func.html
-${PLIST.doc}share/doc/libxkbcommon/functions_type.html
-${PLIST.doc}share/doc/libxkbcommon/functions_vars.html
-${PLIST.doc}share/doc/libxkbcommon/globals.html
-${PLIST.doc}share/doc/libxkbcommon/globals_defs.html
-${PLIST.doc}share/doc/libxkbcommon/globals_enum.html
-${PLIST.doc}share/doc/libxkbcommon/globals_eval.html
-${PLIST.doc}share/doc/libxkbcommon/globals_func.html
-${PLIST.doc}share/doc/libxkbcommon/globals_type.html
-${PLIST.doc}share/doc/libxkbcommon/group__components.html
-${PLIST.doc}share/doc/libxkbcommon/group__components.js
-${PLIST.doc}share/doc/libxkbcommon/group__context.html
-${PLIST.doc}share/doc/libxkbcommon/group__context.js
-${PLIST.doc}share/doc/libxkbcommon/group__include-path.html
-${PLIST.doc}share/doc/libxkbcommon/group__include-path.js
-${PLIST.doc}share/doc/libxkbcommon/group__keymap.html
-${PLIST.doc}share/doc/libxkbcommon/group__keymap.js
-${PLIST.doc}share/doc/libxkbcommon/group__keysyms.html
-${PLIST.doc}share/doc/libxkbcommon/group__keysyms.js
-${PLIST.doc}share/doc/libxkbcommon/group__logging.html
-${PLIST.doc}share/doc/libxkbcommon/group__logging.js
-${PLIST.doc}share/doc/libxkbcommon/group__state.html
-${PLIST.doc}share/doc/libxkbcommon/group__state.js
-${PLIST.doc}share/doc/libxkbcommon/index.html
-${PLIST.doc}share/doc/libxkbcommon/jquery.js
-${PLIST.doc}share/doc/libxkbcommon/modules.html
-${PLIST.doc}share/doc/libxkbcommon/modules.js
-${PLIST.doc}share/doc/libxkbcommon/nav_f.png
-${PLIST.doc}share/doc/libxkbcommon/nav_g.png
-${PLIST.doc}share/doc/libxkbcommon/nav_h.png
-${PLIST.doc}share/doc/libxkbcommon/navtree.css
-${PLIST.doc}share/doc/libxkbcommon/navtree.js
-${PLIST.doc}share/doc/libxkbcommon/navtreeindex0.js
-${PLIST.doc}share/doc/libxkbcommon/navtreeindex1.js
-${PLIST.doc}share/doc/libxkbcommon/open.png
-${PLIST.doc}share/doc/libxkbcommon/resize.js
-${PLIST.doc}share/doc/libxkbcommon/structxkb__context.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__context.js
-${PLIST.doc}share/doc/libxkbcommon/structxkb__keymap.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__keymap.js
-${PLIST.doc}share/doc/libxkbcommon/structxkb__rule__names.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__rule__names.js
-${PLIST.doc}share/doc/libxkbcommon/structxkb__state.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__state.js
-${PLIST.doc}share/doc/libxkbcommon/sync_off.png
-${PLIST.doc}share/doc/libxkbcommon/sync_on.png
-${PLIST.doc}share/doc/libxkbcommon/tab_a.png
-${PLIST.doc}share/doc/libxkbcommon/tab_b.png
-${PLIST.doc}share/doc/libxkbcommon/tab_h.png
-${PLIST.doc}share/doc/libxkbcommon/tab_s.png
-${PLIST.doc}share/doc/libxkbcommon/tabs.css
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-compat_8h_source.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-keysyms_8h_source.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h.js
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h_source.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h.js
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h_source.html
diff --git a/x11/libxkbcommon/buildlink3.mk b/x11/libxkbcommon/buildlink3.mk
index 7ae620f2ec1..d9bf16f3152 100644
--- a/x11/libxkbcommon/buildlink3.mk
+++ b/x11/libxkbcommon/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/12/13 14:47:33 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/02/03 16:01:19 ryoon Exp $
 
 BUILDLINK_TREE+=	libxkbcommon
 
 .if !defined(LIBXKBCOMMON_BUILDLINK3_MK)
 LIBXKBCOMMON_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libxkbcommon+=	libxkbcommon>=0.3.2
+BUILDLINK_API_DEPENDS.libxkbcommon+=	libxkbcommon>=0.4.0
 BUILDLINK_PKGSRCDIR.libxkbcommon?=	../../x11/libxkbcommon
 .endif	# LIBXKBCOMMON_BUILDLINK3_MK
 
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 69d80f737fd..2f664dcaed9 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/12/13 14:47:33 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/02/03 16:01:19 ryoon Exp $
 
-SHA1 (libxkbcommon-0.3.2.tar.xz) = 7bfe39fef420d072a84fd295f0c5bb049f8d30b9
-RMD160 (libxkbcommon-0.3.2.tar.xz) = 9165dff78851edf15d28cd008691a80fd7a54021
-Size (libxkbcommon-0.3.2.tar.xz) = 521228 bytes
+SHA1 (libxkbcommon-0.4.0.tar.xz) = c57796f21baf5e31b2b8d44eb37b9e26f41c612c
+RMD160 (libxkbcommon-0.4.0.tar.xz) = d36a049f4e1222aa1910e2c263c6225be696f5b0
+Size (libxkbcommon-0.4.0.tar.xz) = 546180 bytes
+SHA1 (patch-configure) = 65899d379730cfac5b25ab52ef554a877e2c0b03
diff --git a/x11/libxkbcommon/patches/patch-configure b/x11/libxkbcommon/patches/patch-configure
new file mode 100644
index 00000000000..b1364397219
--- /dev/null
+++ b/x11/libxkbcommon/patches/patch-configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2014/02/03 16:01:19 ryoon Exp $
+
+--- configure.orig	2014-02-02 23:44:04.000000000 +0000
++++ configure
+@@ -18735,7 +18735,7 @@ else
+   enable_x11=yes
+ fi
+ 
+-if test "x$enable_x11" == xyes; then
++if test "x$enable_x11" = xyes; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XKB" >&5
+@@ -18810,7 +18810,7 @@ $as_echo "yes" >&6; }
+ 
+ fi
+ fi
+- if test "x$enable_x11" == xyes; then
++ if test "x$enable_x11" = xyes; then
+   ENABLE_X11_TRUE=
+   ENABLE_X11_FALSE='#'
+ else