Updated xkeyboard-config to 2.18.

Aleksei Gutikov (1):
      Add Ctrl+Win keyboard layout switch.

Benno Schulenberg (2):
      rules: Giving the caps:ctrl_modifier option a distinctive description.
      Sorting the Caps Lock options in a consistent manner.

Egbert Eich (1):
      symbols: add explicit definition for Group2 to win_space_toggle

Henning W (1):
      Added Bone layout (including the q/eszett variant) and Neo
qwertz/qwerty

Sergey Udaltsov (10):
      Added the Ruble signe
      Added us(carpalx)
      Add Algerian layout with variants
      Added some Asian layouts
      Added US layout for IBM Arabic 238L
      Synced descriptions
      Added Armenian dram sign to Armenian phonetic
      Fixed ISO codes for Jawi
      Pre-release refresh
      Release 2.18

3 files changed, 12 insertions, 8 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index fbe38e0f73f..d00be6d6bff 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2016/01/27 06:33:47 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2016/06/06 11:34:46 wiz Exp $
 
-DISTNAME=		xkeyboard-config-2.17
+DISTNAME=		xkeyboard-config-2.18
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=data/${PKGBASE}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index fab5ea58fb3..34b00e1bf60 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/01/27 06:33:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/06/06 11:34:46 wiz Exp $
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic
@@ -97,6 +97,7 @@ share/X11/xkb/symbols/ba
 share/X11/xkb/symbols/bd
 share/X11/xkb/symbols/be
 share/X11/xkb/symbols/bg
+share/X11/xkb/symbols/bn
 share/X11/xkb/symbols/br
 share/X11/xkb/symbols/brai
 share/X11/xkb/symbols/bt
@@ -117,6 +118,7 @@ share/X11/xkb/symbols/digital_vndr/pc
 share/X11/xkb/symbols/digital_vndr/us
 share/X11/xkb/symbols/digital_vndr/vt
 share/X11/xkb/symbols/dk
+share/X11/xkb/symbols/dz
 share/X11/xkb/symbols/ee
 share/X11/xkb/symbols/empty
 share/X11/xkb/symbols/epo
@@ -138,6 +140,7 @@ share/X11/xkb/symbols/group
 share/X11/xkb/symbols/hp_vndr/us
 share/X11/xkb/symbols/hr
 share/X11/xkb/symbols/hu
+share/X11/xkb/symbols/id
 share/X11/xkb/symbols/ie
 share/X11/xkb/symbols/il
 share/X11/xkb/symbols/in
@@ -189,6 +192,7 @@ share/X11/xkb/symbols/mm
 share/X11/xkb/symbols/mn
 share/X11/xkb/symbols/mt
 share/X11/xkb/symbols/mv
+share/X11/xkb/symbols/my
 share/X11/xkb/symbols/nbsp
 share/X11/xkb/symbols/nec_vndr/jp
 share/X11/xkb/symbols/ng
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index b2db875c9c9..2a987069b1f 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2016/01/27 06:33:47 wiz Exp $
+$NetBSD: distinfo,v 1.22 2016/06/06 11:34:46 wiz Exp $
 
-SHA1 (xkeyboard-config-2.17.tar.bz2) = 0cf363f22952704a9b19434dc9d3cbbcd1f0788e
-RMD160 (xkeyboard-config-2.17.tar.bz2) = 046d2d85a737099fd3ddae350524722be1aa083c
-SHA512 (xkeyboard-config-2.17.tar.bz2) = 375a38fde9befef0c779b7593c17e3889abf5cf73c66e9ff37f58ea65ca6065bad2835a4187321b88187a1922e47ae086663851906c6082860da8096c7e828b1
-Size (xkeyboard-config-2.17.tar.bz2) = 973675 bytes
+SHA1 (xkeyboard-config-2.18.tar.bz2) = d41335ec37b363ddaf2f0dcb121436dfc627ced5
+RMD160 (xkeyboard-config-2.18.tar.bz2) = 5afdda855b36390cea175f30cc64f2003244a5e7
+SHA512 (xkeyboard-config-2.18.tar.bz2) = 5415fadf66a8e2b671029f4d1cd6726a522d347abe87a0f4f33fa85662dd2dc2348fc7402c53281ad2a8615c61eb447760d16d7dac426df19d0834d05b81f548
+Size (xkeyboard-config-2.18.tar.bz2) = 978557 bytes