Update to 2.6:

2.6:
Bryce Harrington (1):
      latin: Add dead_hook and dead_horn to J key level 3, 4

Daniel Drake (1):
      Update FR OLPC layout

Dennis Meulensteen (2):
      Commited change to add Biblical Hebrew SIL Layout amended e-mail.
      including base.extras.xml.in

Ismael Luceno (1):
      Add extra greater and less symbols to es(dvorak)

Javier Jardón (1):
      Use upstream gettext instead the GLib one

Sergey V. Udaltsov (23):
      Fixed the key AE04 in no(dvorak)
      Fixed ru(cv), wrong characters
      Added some more chars to us(hbs)
      Unneeded old stuff
      Unneed norepeat compat section
      Removing mac-specific dk(full)
      Unneeded keypad overlay compat modules
      Eliminating ISO Lock
      Unused file
      Use of dead_greek symbol in Bepo's keyboard layout
      For fr(oss), some application can't handle space caracter properly
      Added us(cz_sk_de)
      Missing file
      Japanese Dvorak layout
      Addition of characters to Hindi (Bolnagri) section
      Czech (qwerty) layout has " instead of ß in the 4th level
      Added missing tilde to dk(dvorak)
      Added a couple of missing Montenegrian chars to me variants
      Returned de(qwerty), not the same as us(de)
      The group name for it(us) fixed
      Fixed Korean layout switching keys
      pre-release sync from TP
      Preparing 2.6

Stephan Hilb (1):
      Small corrections in de(neo) layout

T Metz (1):
      Change Occitan layout inheritance to fr(oss)

2.5.1:
Since 2.5 was released in a hurry, a number of translations were not
ready. So here is a maintenance release 2.5.1 with some updated
translations and minor bugfix.

Sergey V. Udaltsov (3):
      Fixed Armenian hyphen
      prerelease translation update
      preparing 2.5.1

2.5:
Because of the high visibility security issue, xkeyboard-config
release happened 12 days earlier than expected.

In total, 15 bugs were fixes, some translations updated.

My apologies to the Translation Project, the translations that were
not submitted by today will be merged to git anyway.

2.4.1:
Peter Hutterer (1):
      rules: rename Bengali variants for 'in' to Bengali (India)

Sergey V. Udaltsov (4):
      fixed version number
      Synced description
      Fixing keys using CTRL+ALT type
      preparing emergency 2.4.1

2.4:
Here is another stable release of xkeyboard-config. A number of bugs
were fixed, some translations updated.

There was interesting feature added: producing manual pages ("man
xkeyboard-config") using XSL.

2.3:
After some mess related to GNOME3 release, I am proud to present the
scheduled release of xkeyboard-config. A number of bugs were closed.
Troubled descriptions that went to 2.2, polished seriously. Thanks to
TP, a number of translations were seriously updated.

This release is recommended to use over 2.2 and 2.2.1. For people
still using gnome2 (or Ubuntu, up to 11.04) it is visually more
pleasant to stick to 2.1.

2.2.1:
Just a couple of days after 2.2.

Since X.org was very kind to release libx11 1.4.3 (which is required
for xkeyboard-config 2.2), that exposed one serious issue in the build
process of xkeyboard-config
So, here is 2.2.1 - just a build fix.

This release is highly recommended (realistically - required) for GNOME3.

2.2:
With this release, I am breaking (only once, hopefully) the sequence
of scheduled release of xkeyboard-config.

This release is highly recommended (realistically - required) for GNOME3.

The most important change in this release is totally redesigned
approach to user-visible descriptions. That huge work (reworking ALL
descriptions!) was done by William Jon McCann of RedHat.

After those changes were made, it took a lot of work from the
Translation Project guys to update the translations. I want to thank
all translators who found some time last week to work on
xkeyboard-config.

My special gratitude goes to Catalan, Danish, German, Italian, Korean,
Polish, Russian (go Russia!), Spanish, Swedish and Ukrainian
translators - they covered whopping 100% (933 lines)!

Additional change that might affect you: the run-time dependencies of
xkeyboard-config are checked at the build time. If that annoys you -
use --disable-runtime-deps.

There are also some new layouts, variants, model - usual stuff...

2.1:
Here comes 2.1 - evolutionary successor of 2.0

Again, some tweaks and additions, here and there. Updated 12
translations, thanks to TP.

6 files changed, 39 insertions, 96 deletions

diff --git a/x11/xkeyboard-config/DEINSTALL b/x11/xkeyboard-config/DEINSTALL
deleted file mode 100644
index 4de1e33df83..00000000000
--- a/x11/xkeyboard-config/DEINSTALL
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2007/12/19 04:10:43 bjs Exp $
-
-XKBCOMP_SYMLINK="@XKBCOMP_SYMLINK@"
-XKBCOMPDIR="@XKBCOMPDIR@"
-XKBCOMPDIR_SYMLINK="@XKBCOMPDIR_SYMLINK@"
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f ${XKBCOMPDIR_SYMLINK};
-	${RM} -rf ${XKBCOMPDIR};
-	${RM} -f ${XKBCOMP_SYMLINK};
-	;;
-esac
diff --git a/x11/xkeyboard-config/INSTALL b/x11/xkeyboard-config/INSTALL
deleted file mode 100644
index 7e22e4014c0..00000000000
--- a/x11/xkeyboard-config/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2007/12/19 04:10:43 bjs Exp $
-
-XKBBASE="@XKBBASE@"
-XKBCOMP="@XKBCOMP@"
-XKBCOMP_SYMLINK="@XKBCOMP_SYMLINK@"
-XKBCOMPDIR="@XKBCOMPDIR@"
-XKBCOMPDIR_SYMLINK="@XKBCOMPDIR_SYMLINK@"
-
-case ${STAGE} in
-POST-INSTALL)
-	${MKDIR} ${XKBCOMPDIR} && \
-	${LN} -sf ${XKBCOMPDIR} ${XKBCOMPDIR_SYMLINK};
-	${LN} -sf ${XKBCOMP} ${XKBCOMP_SYMLINK};
-	;;
-esac
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 9f76540312b..c2c93f8df81 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2011/04/22 13:45:16 obache Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/14 17:10:00 wiz Exp $
 #
 
-DISTNAME=		xkeyboard-config-2.0
-PKGREVISION=		1
+DISTNAME=		xkeyboard-config-2.6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=data/${PKGBASE}/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,7 +20,7 @@ MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake intltool msgfmt
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 PKGCONFIG_OVERRIDE+=	xkeyboard-config.pc.in
 
 BUILD_DEFS+=		VARBASE
@@ -29,9 +28,7 @@ BUILD_DEFS+=		XKBCOMPDIR
 
 CONFIGURE_ARGS+=	--with-xkb-rules-symlink=xfree86,xorg
 CONFIGURE_ARGS+=	--with-xkb-base=${XKBBASE:Q}
-### In pkgsrc, we do this with INSTALL/DEINSTALL scripts.
-###
-CONFIGURE_ARGS+=	--disable-xkbcomp-symlink
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 ###
 REPLACE_SH=		rules/merge.sh
 ###
@@ -60,4 +57,8 @@ OWN_DIRS+=		${XKBCOMPDIR}
 BUILDLINK_DEPMETHOD.gettext=	build	# for the configure only
 .include "../../devel/gettext-lib/buildlink3.mk"
 
+BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.4.3
+.include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_API_DEPENDS.xproto+=	xproto>=7.0.20
+.include "../../x11/xproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index 9c01765a552..2e21aef2691 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,21 +1,18 @@
-@comment $NetBSD: PLIST,v 1.7 2010/10/16 13:13:18 ghen Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/07/14 17:10:00 wiz Exp $
 share/X11/xkb/compat.dir
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic
 share/X11/xkb/compat/caps
 share/X11/xkb/compat/complete
-share/X11/xkb/compat/default
 share/X11/xkb/compat/iso9995
 share/X11/xkb/compat/japan
-share/X11/xkb/compat/keypad
 share/X11/xkb/compat/ledcaps
 share/X11/xkb/compat/lednum
 share/X11/xkb/compat/ledscroll
 share/X11/xkb/compat/level5
 share/X11/xkb/compat/misc
 share/X11/xkb/compat/mousekeys
-share/X11/xkb/compat/norepeat
 share/X11/xkb/compat/olpc
 share/X11/xkb/compat/pc
 share/X11/xkb/compat/pc98
@@ -42,6 +39,7 @@ share/X11/xkb/geometry/nec
 share/X11/xkb/geometry/nokia
 share/X11/xkb/geometry/northgate
 share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sanwa
 share/X11/xkb/geometry/sgi_vndr/O2
 share/X11/xkb/geometry/sgi_vndr/indigo
 share/X11/xkb/geometry/sgi_vndr/indy
@@ -70,49 +68,6 @@ share/X11/xkb/keycodes/sony
 share/X11/xkb/keycodes/sun
 share/X11/xkb/keycodes/xfree86
 share/X11/xkb/keycodes/xfree98
-share/X11/xkb/keymap.dir
-share/X11/xkb/keymap/README
-share/X11/xkb/keymap/amiga
-share/X11/xkb/keymap/ataritt
-share/X11/xkb/keymap/digital_vndr/us
-share/X11/xkb/keymap/macintosh
-share/X11/xkb/keymap/sgi_vndr/be
-share/X11/xkb/keymap/sgi_vndr/bg
-share/X11/xkb/keymap/sgi_vndr/ca
-share/X11/xkb/keymap/sgi_vndr/ch
-share/X11/xkb/keymap/sgi_vndr/cz
-share/X11/xkb/keymap/sgi_vndr/de
-share/X11/xkb/keymap/sgi_vndr/dk
-share/X11/xkb/keymap/sgi_vndr/dvorak
-share/X11/xkb/keymap/sgi_vndr/es
-share/X11/xkb/keymap/sgi_vndr/fi
-share/X11/xkb/keymap/sgi_vndr/fr
-share/X11/xkb/keymap/sgi_vndr/gb
-share/X11/xkb/keymap/sgi_vndr/hu
-share/X11/xkb/keymap/sgi_vndr/it
-share/X11/xkb/keymap/sgi_vndr/jp
-share/X11/xkb/keymap/sgi_vndr/no
-share/X11/xkb/keymap/sgi_vndr/pl
-share/X11/xkb/keymap/sgi_vndr/pt
-share/X11/xkb/keymap/sgi_vndr/ru
-share/X11/xkb/keymap/sgi_vndr/se
-share/X11/xkb/keymap/sgi_vndr/sk
-share/X11/xkb/keymap/sgi_vndr/th
-share/X11/xkb/keymap/sgi_vndr/us
-share/X11/xkb/keymap/sony
-share/X11/xkb/keymap/sun_vndr/all
-share/X11/xkb/keymap/sun_vndr/de
-share/X11/xkb/keymap/sun_vndr/es
-share/X11/xkb/keymap/sun_vndr/fi
-share/X11/xkb/keymap/sun_vndr/fr
-share/X11/xkb/keymap/sun_vndr/no
-share/X11/xkb/keymap/sun_vndr/pl
-share/X11/xkb/keymap/sun_vndr/ru
-share/X11/xkb/keymap/sun_vndr/se
-share/X11/xkb/keymap/sun_vndr/uk
-share/X11/xkb/keymap/sun_vndr/us
-share/X11/xkb/keymap/xfree86
-share/X11/xkb/keymap/xfree98
 share/X11/xkb/rules/README
 share/X11/xkb/rules/base
 share/X11/xkb/rules/base.extras.xml
@@ -130,17 +85,13 @@ share/X11/xkb/rules/xkb.dtd
 share/X11/xkb/rules/xorg
 share/X11/xkb/rules/xorg.lst
 share/X11/xkb/rules/xorg.xml
-share/X11/xkb/semantics.dir
-share/X11/xkb/semantics/basic
-share/X11/xkb/semantics/complete
-share/X11/xkb/semantics/default
-share/X11/xkb/semantics/xtest
 share/X11/xkb/symbols.dir
 share/X11/xkb/symbols/ad
 share/X11/xkb/symbols/af
 share/X11/xkb/symbols/al
 share/X11/xkb/symbols/altwin
 share/X11/xkb/symbols/am
+share/X11/xkb/symbols/apl
 share/X11/xkb/symbols/ara
 share/X11/xkb/symbols/at
 share/X11/xkb/symbols/az
@@ -157,6 +108,7 @@ share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/capslock
 share/X11/xkb/symbols/cd
 share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cm
 share/X11/xkb/symbols/cn
 share/X11/xkb/symbols/compose
 share/X11/xkb/symbols/ctrl
@@ -173,11 +125,6 @@ share/X11/xkb/symbols/epo
 share/X11/xkb/symbols/es
 share/X11/xkb/symbols/et
 share/X11/xkb/symbols/eurosign
-share/X11/xkb/symbols/extras/apl
-share/X11/xkb/symbols/extras/ir
-share/X11/xkb/symbols/extras/rs
-share/X11/xkb/symbols/extras/ru
-share/X11/xkb/symbols/extras/us
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
 share/X11/xkb/symbols/fr
@@ -252,12 +199,14 @@ share/X11/xkb/symbols/nokia_vndr/su-8w
 share/X11/xkb/symbols/np
 share/X11/xkb/symbols/olpc
 share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/ph
 share/X11/xkb/symbols/pk
 share/X11/xkb/symbols/pl
 share/X11/xkb/symbols/pt
 share/X11/xkb/symbols/ro
 share/X11/xkb/symbols/rs
 share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/rupeesign
 share/X11/xkb/symbols/se
 share/X11/xkb/symbols/sgi_vndr/jp
 share/X11/xkb/symbols/shift
@@ -305,6 +254,7 @@ share/X11/xkb/symbols/th
 share/X11/xkb/symbols/tj
 share/X11/xkb/symbols/tm
 share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/tw
 share/X11/xkb/symbols/typo
 share/X11/xkb/symbols/tz
 share/X11/xkb/symbols/ua
@@ -342,15 +292,19 @@ share/locale/eo/LC_MESSAGES/xkeyboard-config.mo
 share/locale/es/LC_MESSAGES/xkeyboard-config.mo
 share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
 share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
 share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 share/locale/id/LC_MESSAGES/xkeyboard-config.mo
 share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
 share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
 share/locale/ky/LC_MESSAGES/xkeyboard-config.mo
 share/locale/lt/LC_MESSAGES/xkeyboard-config.mo
 share/locale/nb/LC_MESSAGES/xkeyboard-config.mo
 share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/pl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ro/LC_MESSAGES/xkeyboard-config.mo
 share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
 share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
 share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 232527b77f5..0f8a3ef1355 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2010/10/16 13:13:18 ghen Exp $
+$NetBSD: distinfo,v 1.9 2012/07/14 17:10:00 wiz Exp $
 
-SHA1 (xkeyboard-config-2.0.tar.bz2) = 3959678edd23368d208738e979dc5a605c155bee
-RMD160 (xkeyboard-config-2.0.tar.bz2) = d8dcddff34ab96c2e85b2ebfafa8edb287df4d6a
-Size (xkeyboard-config-2.0.tar.bz2) = 656757 bytes
+SHA1 (xkeyboard-config-2.6.tar.bz2) = 9a07cf04b1a7a13be7a86ce37c9f7efe1ec5fbc2
+RMD160 (xkeyboard-config-2.6.tar.bz2) = 0efa86fc3f3ba73942925bba4af6da6462caac20
+Size (xkeyboard-config-2.6.tar.bz2) = 857799 bytes
+SHA1 (patch-po_Makefile.in.in) = a450b45dc6622c40c8e3a1f8924b577215bf4dde
diff --git a/x11/xkeyboard-config/patches/patch-po_Makefile.in.in b/x11/xkeyboard-config/patches/patch-po_Makefile.in.in
new file mode 100644
index 00000000000..f52a15f527c
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-po_Makefile.in.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-po_Makefile.in.in,v 1.1 2012/07/14 17:10:00 wiz Exp $
+
+Fix installation directory for locale files.
+
+--- po/Makefile.in.in.orig	2012-04-17 22:38:54.000000000 +0000
++++ po/Makefile.in.in
+@@ -34,7 +34,7 @@ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.