Update xkeyboard-config to 1.9 (two years worth of updates/fixes/...).

Pkgsrc patches (bashisms) have been included upstream.

6 files changed, 57 insertions, 63 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 32068faf3a5..faad2073255 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2008/10/15 08:52:42 bjs Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/01 13:14:25 ghen Exp $
 #
 
-DISTNAME=	xkeyboard-config-1.4
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG:=data/}
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		xkeyboard-config-1.9
+CATEGORIES=		x11
+MASTER_SITES=		http://people.freedesktop.org/~svu/
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	bjs@NetBSD.org
-HOMEPAGE=	http://www.freedesktop.org/wiki/Software/XKeyboardConfig
-COMMENT=	X Keyboard Configuration Database
+MAINTAINER=		bjs@NetBSD.org
+HOMEPAGE=		http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+COMMENT=		X Keyboard Configuration Database
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -21,6 +21,7 @@ MAKE_JOBS_SAFE=		no
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt
+PKGCONFIG_OVERRIDE+=	xkeyboard-config.pc.in
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		XKBCOMPDIR
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index 7ed66ef190c..0a2dceaeee8 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:25:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/06/01 13:14:25 ghen 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
@@ -38,6 +39,7 @@ share/X11/xkb/geometry/kinesis
 share/X11/xkb/geometry/macintosh
 share/X11/xkb/geometry/microsoft
 share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/nokia
 share/X11/xkb/geometry/northgate
 share/X11/xkb/geometry/pc
 share/X11/xkb/geometry/sgi_vndr/O2
@@ -46,6 +48,7 @@ share/X11/xkb/geometry/sgi_vndr/indy
 share/X11/xkb/geometry/sony
 share/X11/xkb/geometry/sun
 share/X11/xkb/geometry/thinkpad
+share/X11/xkb/geometry/typematrix
 share/X11/xkb/geometry/winbook
 share/X11/xkb/keycodes.dir
 share/X11/xkb/keycodes/README
@@ -54,6 +57,7 @@ share/X11/xkb/keycodes/amiga
 share/X11/xkb/keycodes/ataritt
 share/X11/xkb/keycodes/digital_vndr/lk
 share/X11/xkb/keycodes/digital_vndr/pc
+share/X11/xkb/keycodes/empty
 share/X11/xkb/keycodes/evdev
 share/X11/xkb/keycodes/fujitsu
 share/X11/xkb/keycodes/hp
@@ -111,9 +115,11 @@ 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
 share/X11/xkb/rules/base.lst
 share/X11/xkb/rules/base.xml
 share/X11/xkb/rules/evdev
+share/X11/xkb/rules/evdev.extras.xml
 share/X11/xkb/rules/evdev.lst
 share/X11/xkb/rules/evdev.xml
 share/X11/xkb/rules/xfree86
@@ -142,8 +148,9 @@ share/X11/xkb/symbols/bd
 share/X11/xkb/symbols/be
 share/X11/xkb/symbols/bg
 share/X11/xkb/symbols/br
-share/X11/xkb/symbols/braille
+share/X11/xkb/symbols/brai
 share/X11/xkb/symbols/bt
+share/X11/xkb/symbols/bw
 share/X11/xkb/symbols/by
 share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/capslock
@@ -160,10 +167,14 @@ share/X11/xkb/symbols/digital_vndr/us
 share/X11/xkb/symbols/digital_vndr/vt
 share/X11/xkb/symbols/dk
 share/X11/xkb/symbols/ee
+share/X11/xkb/symbols/empty
 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/rs
+share/X11/xkb/symbols/extras/us
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
 share/X11/xkb/symbols/fr
@@ -187,6 +198,7 @@ share/X11/xkb/symbols/ir
 share/X11/xkb/symbols/is
 share/X11/xkb/symbols/it
 share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/ke
 share/X11/xkb/symbols/keypad
 share/X11/xkb/symbols/kg
 share/X11/xkb/symbols/kh
@@ -206,12 +218,12 @@ share/X11/xkb/symbols/macintosh_vndr/apple
 share/X11/xkb/symbols/macintosh_vndr/ch
 share/X11/xkb/symbols/macintosh_vndr/de
 share/X11/xkb/symbols/macintosh_vndr/dk
-share/X11/xkb/symbols/macintosh_vndr/es
 share/X11/xkb/symbols/macintosh_vndr/fi
 share/X11/xkb/symbols/macintosh_vndr/fr
 share/X11/xkb/symbols/macintosh_vndr/gb
 share/X11/xkb/symbols/macintosh_vndr/is
 share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/jp
 share/X11/xkb/symbols/macintosh_vndr/latam
 share/X11/xkb/symbols/macintosh_vndr/nl
 share/X11/xkb/symbols/macintosh_vndr/no
@@ -221,6 +233,7 @@ share/X11/xkb/symbols/macintosh_vndr/us
 share/X11/xkb/symbols/mao
 share/X11/xkb/symbols/me
 share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/ml
 share/X11/xkb/symbols/mm
 share/X11/xkb/symbols/mn
 share/X11/xkb/symbols/mt
@@ -230,6 +243,9 @@ share/X11/xkb/symbols/nec_vndr/jp
 share/X11/xkb/symbols/ng
 share/X11/xkb/symbols/nl
 share/X11/xkb/symbols/no
+share/X11/xkb/symbols/nokia_vndr/rx-44
+share/X11/xkb/symbols/nokia_vndr/rx-51
+share/X11/xkb/symbols/nokia_vndr/su-8w
 share/X11/xkb/symbols/np
 share/X11/xkb/symbols/olpc
 share/X11/xkb/symbols/pc
@@ -244,40 +260,50 @@ share/X11/xkb/symbols/sgi_vndr/jp
 share/X11/xkb/symbols/shift
 share/X11/xkb/symbols/si
 share/X11/xkb/symbols/sk
+share/X11/xkb/symbols/sn
 share/X11/xkb/symbols/sony_vndr/us
 share/X11/xkb/symbols/srvr_ctrl
-share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/ara
+share/X11/xkb/symbols/sun_vndr/be
+share/X11/xkb/symbols/sun_vndr/br
+share/X11/xkb/symbols/sun_vndr/ca
+share/X11/xkb/symbols/sun_vndr/ch
 share/X11/xkb/symbols/sun_vndr/cz
 share/X11/xkb/symbols/sun_vndr/de
 share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/ee
 share/X11/xkb/symbols/sun_vndr/es
 share/X11/xkb/symbols/sun_vndr/fi
 share/X11/xkb/symbols/sun_vndr/fr
 share/X11/xkb/symbols/sun_vndr/gb
 share/X11/xkb/symbols/sun_vndr/gr
-share/X11/xkb/symbols/sun_vndr/hu
 share/X11/xkb/symbols/sun_vndr/it
 share/X11/xkb/symbols/sun_vndr/jp
-share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/kr
 share/X11/xkb/symbols/sun_vndr/lt
 share/X11/xkb/symbols/sun_vndr/lv
 share/X11/xkb/symbols/sun_vndr/nl
 share/X11/xkb/symbols/sun_vndr/no
 share/X11/xkb/symbols/sun_vndr/pl
 share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ro
 share/X11/xkb/symbols/sun_vndr/ru
 share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/sk
 share/X11/xkb/symbols/sun_vndr/solaris
-share/X11/xkb/symbols/sun_vndr/sw
 share/X11/xkb/symbols/sun_vndr/tr
 share/X11/xkb/symbols/sun_vndr/tuv
 share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/ua
 share/X11/xkb/symbols/sun_vndr/us
-share/X11/xkb/symbols/sun_vndr/usb
 share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/terminate
 share/X11/xkb/symbols/th
 share/X11/xkb/symbols/tj
+share/X11/xkb/symbols/tm
 share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/typo
+share/X11/xkb/symbols/tz
 share/X11/xkb/symbols/ua
 share/X11/xkb/symbols/us
 share/X11/xkb/symbols/uz
@@ -296,22 +322,31 @@ share/X11/xkb/types/extra
 share/X11/xkb/types/iso9995
 share/X11/xkb/types/level5
 share/X11/xkb/types/mousekeys
+share/X11/xkb/types/nokia
 share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
 share/locale/af/LC_MESSAGES/xkeyboard-config.mo
 share/locale/az/LC_MESSAGES/xkeyboard-config.mo
 share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ca/LC_MESSAGES/xkeyboard-config.mo
+share/locale/crh/LC_MESSAGES/xkeyboard-config.mo
 share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
 share/locale/da/LC_MESSAGES/xkeyboard-config.mo
+share/locale/de/LC_MESSAGES/xkeyboard-config.mo
 share/locale/el/LC_MESSAGES/xkeyboard-config.mo
 share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
+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/hu/LC_MESSAGES/xkeyboard-config.mo
+share/locale/id/LC_MESSAGES/xkeyboard-config.mo
 share/locale/it/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/ru/LC_MESSAGES/xkeyboard-config.mo
 share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
@@ -319,10 +354,10 @@ share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
 share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
 share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
 share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sr@Latn/LC_MESSAGES/xkeyboard-config.mo
 share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
 share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
 share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
 share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
 share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
 share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
+share/pkgconfig/xkeyboard-config.pc
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 7c68a385892..7b06f68a7d1 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/10/15 08:52:42 bjs Exp $
+$NetBSD: distinfo,v 1.6 2010/06/01 13:14:25 ghen Exp $
 
-SHA1 (xkeyboard-config-1.4.tar.bz2) = 7ad0ff286233b3569ea38ab951f61efb2e4745b9
-RMD160 (xkeyboard-config-1.4.tar.bz2) = c6c655c58b25ff81df48064eb29d2e7142b2556d
-Size (xkeyboard-config-1.4.tar.bz2) = 559151 bytes
-SHA1 (patch-aa) = 1f6ec615b0915c5d08ac7ddbf2d35948b8859d85
-SHA1 (patch-ab) = c8225979ce3b0e06b02ee71d6675588844ca3e81
-SHA1 (patch-ac) = 1adb014877c3cef1138a57915b5779eca683365f
+SHA1 (xkeyboard-config-1.9.tar.bz2) = 2a3f29d003c0fe23cb6c8b4389bb7002c66b557c
+RMD160 (xkeyboard-config-1.9.tar.bz2) = a5d5561b4bcfc3c442c0b8c82ee4478d9e630398
+Size (xkeyboard-config-1.9.tar.bz2) = 650829 bytes
diff --git a/x11/xkeyboard-config/patches/patch-aa b/x11/xkeyboard-config/patches/patch-aa
deleted file mode 100644
index dcdb10ab562..00000000000
--- a/x11/xkeyboard-config/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/12/19 04:10:44 bjs Exp $
-
---- rules/merge.sh.orig	2007-12-18 18:04:26.000000000 -0500
-+++ rules/merge.sh
-@@ -11,7 +11,7 @@ basename=`basename $0`
- echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
- 
- for i in $*; do
--  if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
-+  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
-     echo >> $DEST;
-     read hdr
-     echo "$hdr" >> $DEST
diff --git a/x11/xkeyboard-config/patches/patch-ab b/x11/xkeyboard-config/patches/patch-ab
deleted file mode 100644
index e99377c30c9..00000000000
--- a/x11/xkeyboard-config/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/12/19 04:10:44 bjs Exp $
-
---- configure.in.orig	2007-10-02 17:51:04.000000000 -0400
-+++ configure.in
-@@ -91,7 +91,7 @@ else
-   echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
- fi
- 
--if test "$enable_compat_rules" == "yes" ; then
-+if test "$enable_compat_rules" = "yes" ; then
-   echo "    Compatibility rules are included"
- else
-   echo "    Compatibility rules are not included"
diff --git a/x11/xkeyboard-config/patches/patch-ac b/x11/xkeyboard-config/patches/patch-ac
deleted file mode 100644
index 5f847c426c0..00000000000
--- a/x11/xkeyboard-config/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/02/07 06:31:35 bjs Exp $
-
---- configure.orig	2008-02-07 01:24:54.000000000 -0500
-+++ configure
-@@ -7458,7 +7460,7 @@ else
-   echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
- fi
- 
--if test "$enable_compat_rules" == "yes" ; then
-+if test "$enable_compat_rules" = "yes" ; then
-   echo "    Compatibility rules are included"
- else
-   echo "    Compatibility rules are not included"