Update to 1.2.4.

1.2.4:
Alan Coopersmith (3):
      Make sure to leave room for trailing nil byte in yyGetNumber
      Delete redundant redeclarations of extern Atoms in symbols.c
      xkbcomp 1.2.4

Andreas Wettstein (1):
      include resets group compatibility modifiers #43091

Jeremy Huddleston (6):
      Include strings.h for strcasecmp and string.h for strdup
      Add missing _X_NORETURN to uFatalError
      Fix -Wformat warnings
      Correct our zeroing out of the row in InitRowInfo
      Silence -Wshadow warnings
      Silence -Wparentheses-equality

Peter Hutterer (2):
      Print version number on -version.
      Add .pc file for version export

1.2.3:
There was a pretty bad problem with the 1.2.2 release, which quite
effectively crushed Any+AnyOfOrNone(All) interp mappings, in that
xkeyboard-config actually relied on an explicit Any+AnyOfOrNone(All)
mapping to function.  1.2.3 builds on the previous 1.2.2 fix to allow
explicit Any+AnyOfOrNone(All) mappings, while still ignoring interp
mappings whose keysyms could not be found.

I've regression-tested this against xkbcomp 1.1.1 by comparing the
results of compiling every layout (primary variants only) in
xkeyboard-config, and there were no differences at all.

Distributions are strongly recommended to push 1.2.3 instead of 1.2.2,
whose tarballs have been removed from the archive.

1.2.2:
This is an semi-urgent bugfix release for the two commits of mine, which
fix a particularly bad failure in the compat code.  If you had a
SymInterpret definition (i.e. to map a keysym to an action, as used for
VT switch and others) with an unknown keycode, every key that wasn't
already mapped to an action would get mapped to your new action.

So, for example, if you had XF86LogWinTree mapped to the PrWins action,
and a libX11 that was unaware of the new symbol, every key aside from VT
switching, zapping, pointer keys and modifiers, would dump the window
tree to your X log, and do nothing else.

Distributions are strongly, strongly recommended to upgrade, including
in stable series.

1.2.1:
This release allows the uploading of keymaps per-keyboard using the -i flag
(which wasn't hooked up to anything before).

Example usage:
   xkbcomp -i 12 qwerty.xkb :0
   xkbcomp -i 13 azerty.xkb :0

The above will load a qwerty and azerty map in to the keyboards 12 and 13,
respectively. Watch out for bug 21859 though.
http://bugs.freedesktop.org/show_bug.cgi?id=21859

Aside from this new feature, we have the usual cleanups in the build system.

1.2.0:
This release provides performance improvements and bug fixes, mixed in
with the usual recent collection of build configuration improvements and
janitorial cleanups.

3 files changed, 10 insertions, 8 deletions

diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index d76ec5a598e..c29be614413 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/11/09 18:50:16 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2012/06/03 17:51:53 wiz Exp $
 #
 
-DISTNAME=		xkbcomp-1.1.1
+DISTNAME=		xkbcomp-1.2.4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=		.tar.bz2
@@ -15,9 +15,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
+PKGCONFIG_OVERRIDE=	xkbcomp.pc.in
+
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkbcomp/PLIST b/x11/xkbcomp/PLIST
index 455c43aa6d2..6cf32d0e81e 100644
--- a/x11/xkbcomp/PLIST
+++ b/x11/xkbcomp/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/07 17:23:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/06/03 17:51:53 wiz Exp $
 bin/xkbcomp
+lib/pkgconfig/xkbcomp.pc
 man/man1/xkbcomp.1
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
index 4b98b9aefc8..f045851fb77 100644
--- a/x11/xkbcomp/distinfo
+++ b/x11/xkbcomp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/11/09 18:50:16 tnn Exp $
+$NetBSD: distinfo,v 1.7 2012/06/03 17:51:53 wiz Exp $
 
-SHA1 (xkbcomp-1.1.1.tar.bz2) = aeb733c495d7afd42136bf8ae5c6e792c63f0b4b
-RMD160 (xkbcomp-1.1.1.tar.bz2) = 6fcf2d4838ed8b006511d4cd7fcdcbac61c0cdbf
-Size (xkbcomp-1.1.1.tar.bz2) = 219481 bytes
+SHA1 (xkbcomp-1.2.4.tar.bz2) = 695d2f2824884d9e54aa1419282ae167fdea163b
+RMD160 (xkbcomp-1.2.4.tar.bz2) = 70409dc04e8a452b0e5b172cd54a169cc160070a
+Size (xkbcomp-1.2.4.tar.bz2) = 242185 bytes