Import xkeyboard-config-20071217 (snapshot is better than maintaining

a thousand patches).  This is required for the upcoming 
modular-xorg-server-1.4.0.90 package.

17 files changed, 653 insertions, 0 deletions

diff --git a/x11/xkeyboard-config/DEINSTALL b/x11/xkeyboard-config/DEINSTALL
new file mode 100644
index 00000000000..3fa497f4a5a
--- /dev/null
+++ b/x11/xkeyboard-config/DEINSTALL
@@ -0,0 +1,13 @@
+# $NetBSD: DEINSTALL,v 1.1.1.1 2007/12/18 00:28:14 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/DESCR b/x11/xkeyboard-config/DESCR
new file mode 100644
index 00000000000..8dd41a2cf33
--- /dev/null
+++ b/x11/xkeyboard-config/DESCR
@@ -0,0 +1,6 @@
+The xkeyboard-config package provides a non-arch keyboard configuration
+database for the X Window System with support for non-standard
+keyboards, national layouts and options. The goal is to provide
+the consistent, well-structured, frequently released open source
+of X keyboard configuration data for free, open source and commercial
+X implementations. The project is targeted to XKB-based systems.
diff --git a/x11/xkeyboard-config/INSTALL b/x11/xkeyboard-config/INSTALL
new file mode 100644
index 00000000000..074b3d74e61
--- /dev/null
+++ b/x11/xkeyboard-config/INSTALL
@@ -0,0 +1,15 @@
+# $NetBSD: INSTALL,v 1.1.1.1 2007/12/18 00:28:14 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
new file mode 100644
index 00000000000..4215570eeb8
--- /dev/null
+++ b/x11/xkeyboard-config/Makefile
@@ -0,0 +1,60 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+#
+
+DISTNAME=	xkeyboard-config-20071217
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	bjs@NetBSD.org
+HOMEPAGE=	http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+COMMENT=	X Keyboard Configuration Database
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+CONFLICTS+=		xkbdata-[0-9]*
+
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		# none
+USE_TOOLS+=		gmake intltool perl:build 
+USE_TOOLS+=		msgfmt msgmerge xgettext
+
+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
+
+BUILD_DEPENDS+=		xkbcomp-[0-9]*:../../x11/xkbcomp
+MAKE_JOBS_SAFE=		no
+REPLACE_SH=		rules/merge.sh
+
+### Keymaps, rules, etc. are installed here.
+###
+XKBBASE=		${PREFIX}/share/X11/xkb
+
+### The server puts compiled keymaps in the directory below.
+###
+XKBCOMPDIR?=		${VARBASE}/db/xkb	
+
+### The package must symlink ${XKBCOMPDIR} into ${XKBBASE}. ${XKBCOMP} is
+### is the path to the xkbcomp binary we wish to use.
+###
+XKBCOMPDIR_SYMLINK=	${XKBBASE}/compiled
+XKBCOMP=		${LOCALBASE}/bin/xkbcomp
+
+BUILD_DEFS+=		VARBASE 
+BUILD_DEFS+=		XKBCOMPDIR
+
+FILES_SUBST+=		XKBBASE=${XKBBASE:Q}
+FILES_SUBST+=		XKBCOMP=${XKBCOMP:Q}
+FILES_SUBST+=		XKBCOMP_SYMLINK=${${XKBBASE}/xkbcomp:L:Q}
+FILES_SUBST+=		XKBCOMPDIR=${XKBCOMPDIR:Q}
+FILES_SUBST+=		XKBCOMPDIR_SYMLINK=${XKBCOMPDIR_SYMLINK:Q}
+
+OWN_DIRS+=		${XKBCOMPDIR}
+
+.include "../../converters/libiconv/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
new file mode 100644
index 00000000000..dd0a7b145d7
--- /dev/null
+++ b/x11/xkeyboard-config/PLIST
@@ -0,0 +1,322 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/18 00:28:14 bjs 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/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
+share/X11/xkb/compat/xfree86
+share/X11/xkb/compat/xtest
+share/X11/xkb/geometry.dir
+share/X11/xkb/geometry/README
+share/X11/xkb/geometry/amiga
+share/X11/xkb/geometry/ataritt
+share/X11/xkb/geometry/chicony
+share/X11/xkb/geometry/dell
+share/X11/xkb/geometry/digital_vndr/lk
+share/X11/xkb/geometry/digital_vndr/pc
+share/X11/xkb/geometry/digital_vndr/unix
+share/X11/xkb/geometry/everex
+share/X11/xkb/geometry/fujitsu
+share/X11/xkb/geometry/hhk
+share/X11/xkb/geometry/hp
+share/X11/xkb/geometry/keytronic
+share/X11/xkb/geometry/kinesis
+share/X11/xkb/geometry/macintosh
+share/X11/xkb/geometry/microsoft
+share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/northgate
+share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry/sgi_vndr/indigo
+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/winbook
+share/X11/xkb/keycodes.dir
+share/X11/xkb/keycodes/README
+share/X11/xkb/keycodes/aliases
+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/evdev
+share/X11/xkb/keycodes/fujitsu
+share/X11/xkb/keycodes/hp
+share/X11/xkb/keycodes/ibm
+share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/sgi_vndr/indigo
+share/X11/xkb/keycodes/sgi_vndr/indy
+share/X11/xkb/keycodes/sgi_vndr/iris
+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.lst
+share/X11/xkb/rules/base.xml
+share/X11/xkb/rules/sgi
+share/X11/xkb/rules/sun
+share/X11/xkb/rules/sun.xml
+share/X11/xkb/rules/xfree86
+share/X11/xkb/rules/xfree86.lst
+share/X11/xkb/rules/xfree86.xml
+share/X11/xkb/rules/xfree98
+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/ara
+share/X11/xkb/symbols/az
+share/X11/xkb/symbols/ba
+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/bt
+share/X11/xkb/symbols/by
+share/X11/xkb/symbols/ca
+share/X11/xkb/symbols/capslock
+share/X11/xkb/symbols/cd
+share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cn
+share/X11/xkb/symbols/compose
+share/X11/xkb/symbols/cs
+share/X11/xkb/symbols/ctrl
+share/X11/xkb/symbols/cz
+share/X11/xkb/symbols/de
+share/X11/xkb/symbols/digital_vndr/lk
+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/ee
+share/X11/xkb/symbols/epo
+share/X11/xkb/symbols/es
+share/X11/xkb/symbols/et
+share/X11/xkb/symbols/eurosign
+share/X11/xkb/symbols/fi
+share/X11/xkb/symbols/fo
+share/X11/xkb/symbols/fr
+share/X11/xkb/symbols/fujitsu_vndr/jp
+share/X11/xkb/symbols/fujitsu_vndr/us
+share/X11/xkb/symbols/gb
+share/X11/xkb/symbols/ge
+share/X11/xkb/symbols/gh
+share/X11/xkb/symbols/gn
+share/X11/xkb/symbols/gr
+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/ie
+share/X11/xkb/symbols/il
+share/X11/xkb/symbols/in
+share/X11/xkb/symbols/inet
+share/X11/xkb/symbols/iq
+share/X11/xkb/symbols/ir
+share/X11/xkb/symbols/is
+share/X11/xkb/symbols/it
+share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/keypad
+share/X11/xkb/symbols/kg
+share/X11/xkb/symbols/kh
+share/X11/xkb/symbols/kpdl
+share/X11/xkb/symbols/kr
+share/X11/xkb/symbols/kz
+share/X11/xkb/symbols/la
+share/X11/xkb/symbols/latam
+share/X11/xkb/symbols/latin
+share/X11/xkb/symbols/level3
+share/X11/xkb/symbols/level5
+share/X11/xkb/symbols/lk
+share/X11/xkb/symbols/lt
+share/X11/xkb/symbols/lv
+share/X11/xkb/symbols/ma
+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/latam
+share/X11/xkb/symbols/macintosh_vndr/nl
+share/X11/xkb/symbols/macintosh_vndr/no
+share/X11/xkb/symbols/macintosh_vndr/pt
+share/X11/xkb/symbols/macintosh_vndr/se
+share/X11/xkb/symbols/macintosh_vndr/us
+share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/mm
+share/X11/xkb/symbols/mn
+share/X11/xkb/symbols/mt
+share/X11/xkb/symbols/mv
+share/X11/xkb/symbols/nbsp
+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/np
+share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/pk
+share/X11/xkb/symbols/pl
+share/X11/xkb/symbols/pt
+share/X11/xkb/symbols/ro
+share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/se
+share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/si
+share/X11/xkb/symbols/sk
+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/cz
+share/X11/xkb/symbols/sun_vndr/de
+share/X11/xkb/symbols/sun_vndr/dk
+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/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/ru
+share/X11/xkb/symbols/sun_vndr/se
+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/us
+share/X11/xkb/symbols/sun_vndr/usb
+share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/th
+share/X11/xkb/symbols/tj
+share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/ua
+share/X11/xkb/symbols/us
+share/X11/xkb/symbols/uz
+share/X11/xkb/symbols/vn
+share/X11/xkb/symbols/xfree68_vndr/amiga
+share/X11/xkb/symbols/xfree68_vndr/ataritt
+share/X11/xkb/symbols/za
+share/X11/xkb/types.dir
+share/X11/xkb/types/README
+share/X11/xkb/types/basic
+share/X11/xkb/types/cancel
+share/X11/xkb/types/caps
+share/X11/xkb/types/complete
+share/X11/xkb/types/default
+share/X11/xkb/types/extra
+share/X11/xkb/types/iso9995
+share/X11/xkb/types/level5
+share/X11/xkb/types/mousekeys
+share/X11/xkb/types/numpad
+share/X11/xkb/types/pc
+@dirrm share/X11/xkb/types
+@dirrm share/X11/xkb/symbols/xfree68_vndr
+@dirrm share/X11/xkb/symbols/sun_vndr
+@dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sgi_vndr
+@dirrm share/X11/xkb/symbols/nec_vndr
+@dirrm share/X11/xkb/symbols/macintosh_vndr
+@dirrm share/X11/xkb/symbols/hp_vndr
+@dirrm share/X11/xkb/symbols/fujitsu_vndr
+@dirrm share/X11/xkb/symbols/digital_vndr
+@dirrm share/X11/xkb/symbols
+@dirrm share/X11/xkb/semantics
+@dirrm share/X11/xkb/rules
+@dirrm share/X11/xkb/keymap/sun_vndr
+@dirrm share/X11/xkb/keymap/sgi_vndr
+@dirrm share/X11/xkb/keymap/digital_vndr
+@dirrm share/X11/xkb/keymap
+@dirrm share/X11/xkb/keycodes/sgi_vndr
+@dirrm share/X11/xkb/keycodes/digital_vndr
+@dirrm share/X11/xkb/keycodes
+@dirrm share/X11/xkb/geometry/sgi_vndr
+@dirrm share/X11/xkb/geometry/digital_vndr
+@dirrm share/X11/xkb/geometry
+@dirrm share/X11/xkb/compat
+@dirrm share/X11/xkb
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
new file mode 100644
index 00000000000..f78217d13ba
--- /dev/null
+++ b/x11/xkeyboard-config/distinfo
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+SHA1 (xkeyboard-config-20071217.tar.bz2) = ea42385301c510e0f81c1e7c8d1873f34d3dca13
+RMD160 (xkeyboard-config-20071217.tar.bz2) = 12bfdcd9033b36912a8f698eba7f2ec7b1861079
+Size (xkeyboard-config-20071217.tar.bz2) = 435349 bytes
+SHA1 (patch-aa) = ac43d33901b10e7369bbcb478eaba07c6f792be8
+SHA1 (patch-ab) = 209d4b90ea95403f0bdee0007cd782ff16e64635
+SHA1 (patch-ac) = 66896134f0eea92d8fb9c69d596aeb13d640710d
+SHA1 (patch-ad) = 0184973c9dff5dc186a9bbe132539ddd70e25944
+SHA1 (patch-ae) = da99bb8b22299e50de5f79aed07556397b9e800e
+SHA1 (patch-af) = 27276cf3dec47f9997d750e6d56c6bc8f0f49222
+SHA1 (patch-ag) = 09df52807bd4b0a24b15236f7813c0b7c99697b1
+SHA1 (patch-ah) = 2786c64778643e3880de2fddccc20873f07765a9
+SHA1 (patch-ai) = 9ca96076a2785749a060b6625d72f57ac32bfaff
+SHA1 (patch-aj) = b0624e86a4dba582738dcef71fc97494f96a6874
+SHA1 (patch-ak) = 0fbfe2ba1fda1f522875b222bff19e302456329f
diff --git a/x11/xkeyboard-config/patches/patch-aa b/x11/xkeyboard-config/patches/patch-aa
new file mode 100644
index 00000000000..a0da6e2df59
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- rules/base.o_s.part.orig	2007-07-16 04:24:28.000000000 -0400
++++ rules/base.o_s.part
+@@ -64,6 +64,7 @@
+   keypad:legacy_wang         =	+keypad(legacy_wang)
+   keypad:oss_wang         =	+keypad(oss_wang)
+   keypad:future_wang         =	+keypad(future_wang)
++  keypad:comma          =       +keypad(comma)
+   nbsp:none             =	+nbsp(none)
+   nbsp:level2           =	+nbsp(level2)
+   nbsp:level3           =	+nbsp(level3)
diff --git a/x11/xkeyboard-config/patches/patch-ab b/x11/xkeyboard-config/patches/patch-ab
new file mode 100644
index 00000000000..a4524ad1244
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- rules/base.xml.in.orig	2007-09-26 07:56:42.000000000 -0400
++++ rules/base.xml.in
+@@ -213,6 +213,12 @@
+     </model>
+     <model>
+       <configItem>
++        <name>btc9116u</name>
++	<_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
++      </configItem>
++    </model>
++    <model>
++      <configItem>
+         <name>cherryblue</name>
+         <_description>Cherry Blue Line CyBo@rd</_description>
+       </configItem>
+@@ -3606,6 +3612,12 @@
+       </option>
+       <option>
+         <configItem>
++          <name>keypad:comma</name>
++          <_description>Force standard comma keypad</_description>
++       </configItem>
++      </option>
++      <option>
++        <configItem>
+           <name>keypad:oss</name>
+           <_description>Keypad with unicode additions (arrows and math operators)</_description>
+        </configItem>
diff --git a/x11/xkeyboard-config/patches/patch-ac b/x11/xkeyboard-config/patches/patch-ac
new file mode 100644
index 00000000000..3410db01711
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- symbols/group.orig	2007-09-26 07:56:42.000000000 -0400
++++ symbols/group
+@@ -317,3 +317,15 @@ xkb_symbols "alt_caps_toggle" {
+     };
+ };
+ 
++
++// using the group(sclk_toggle) map, pressing the Scroll Lock key
++// toggles groups.
++partial modifier_keys
++xkb_symbols "sclk_toggle" {
++  virtual_modifiers AltGr;
++  key <SCLK> {
++    virtualMods= AltGr,
++    symbols[Group1] = [ ISO_Next_Group ]
++    };
++};
++
diff --git a/x11/xkeyboard-config/patches/patch-ad b/x11/xkeyboard-config/patches/patch-ad
new file mode 100644
index 00000000000..1ccf5ca7c10
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- symbols/inet.orig	2007-09-26 07:56:42.000000000 -0400
++++ symbols/inet
+@@ -501,6 +501,18 @@ xkb_symbols "btc9019u" {
+     key <I5F>  {	[ XF86Sleep		]	};
+ };
+ 
++// BTC 9116U
++partial alphanumeric_keys
++xkb_symbols "btc9116u" {
++    key <I6A>  {	[ XF86Back		]	};
++    key <I69>  {	[ XF86Forward		]	};
++    key <I68>  {	[ XF86Stop		]	};
++    key <I02>  {	[ XF86HomePage		]	};
++    key <FK17> {	[ XF86Search		]	};
++    key <I66>  {	[ XF86Favorites		]	};
++    key <I6C>  {	[ XF86Mail		]	};
++};
++
+ // Cherry Blue Line
+ 
+ // Cherry Blue Line CyBo@rd
+@@ -2026,6 +2038,7 @@ partial xkb_symbols "apple" {
+     key <I2E>	{	[ XF86AudioLowerVolume	]	};
+     key <I30>	{	[ XF86AudioRaiseVolume	]	};
+     key <I56>   {       [ XF86RotateWindows	]	};
++    key <I5E>	{	[ XF86PowerOff		]	};
+ // Really keyboard backlight off/up/down
+     key <I57>   {       [ XF86Launch0		]	};
+     key <I58>	{	[ XF86Launch1    	]	};
diff --git a/x11/xkeyboard-config/patches/patch-ae b/x11/xkeyboard-config/patches/patch-ae
new file mode 100644
index 00000000000..c2c9ec99259
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- symbols/level3.orig	2007-09-26 07:56:42.000000000 -0400
++++ symbols/level3
+@@ -135,7 +135,7 @@ xkb_symbols "rwin_switch" {
+ // using the level3(enter_switch) map, the Enter key on the keypad
+ // temporarily chooses the third shift level.  This is especially
+ // useful for Mac laptops which miss the right Alt key.
+-partial hidden modifier_keys
++partial modifier_keys
+ xkb_symbols "enter_switch" {
+   key <KPEN> {
+     type[Group1]="ONE_LEVEL",
diff --git a/x11/xkeyboard-config/patches/patch-af b/x11/xkeyboard-config/patches/patch-af
new file mode 100644
index 00000000000..ba2fc83bfe1
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-af
@@ -0,0 +1,52 @@
+$NetBSD: patch-af,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- symbols/pl.orig	2007-07-15 18:12:12.000000000 -0400
++++ symbols/pl
+@@ -11,11 +11,14 @@ xkb_symbols "basic" {
+ 
+     name[Group1]="Poland";
+ 
++    key <AD01>  { [         q,          Q ] };
++    key <AD02>  { [         w,          W ] };
+     key <AD03>	{ [         e,          E,      eogonek,      Eogonek ]	};
+     key <AD09>	{ [         o,          O,       oacute,       Oacute ]	};
+ 
+     key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
+     key <AC02>	{ [         s,          S,       sacute,       Sacute ]	};
++    key <AC04>  { [         f,          F ] };
+ 
+     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
+     key <AB02>	{ [         x,          X,       zacute,       Zacute ]	};
+@@ -50,12 +53,15 @@ xkb_symbols "qwertz" {
+     key <AE11>	{ [      plus,   question, dead_diaeresis, questiondown ] };
+     key <AE12>	{ [apostrophe,   asterisk, dead_cedilla,  dead_ogonek ]	};
+ 
++    key <AD01>  { [         q,          Q ] };
++    key <AD02>  { [         w,          W ] };
+     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+     key <AD11>	{ [ zabovedot,     nacute,     division, dead_abovering ] };
+     key <AD12>	{ [    sacute,     cacute,     multiply,  dead_macron ]	};
+ 
+     key <AC02>	{ [         s,          S,      dstroke,      section ]	};
+     key <AC03>	{ [         d,          D,      Dstroke,          ETH ]	};
++    key <AC04>  { [         f,          F ] };
+     key <AC08>	{ [         k,          K,          kra,    ampersand ]	};
+     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
+     key <AC10>	{ [   lstroke,    Lstroke,       dollar, dead_doubleacute ] };
+@@ -136,6 +142,8 @@ xkb_symbols "csb" {
+ 
+     name[Group1]="Poland - Kashubian";
+ 
++    key <AD01>  { [         q,          Q ] };
++    key <AD02>  { [         w,          W ] };
+     key <AD03>	{ [         e,          E,      eacute,      Eacute ]	};
+     key <AD04>	{ [         r,           R,      ediaeresis,      Ediaeresis ]	};
+     key <AD06>      { [         y,          Y,      EuroSign,         cent ]        };
+@@ -146,6 +154,7 @@ xkb_symbols "csb" {
+ 
+     key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
+     key <AC02>	{ [         s,          S,      atilde,      Atilde ]	      };
++    key <AC04>  { [         f,          F ] };
+     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]      };
+ 
+     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
diff --git a/x11/xkeyboard-config/patches/patch-ag b/x11/xkeyboard-config/patches/patch-ag
new file mode 100644
index 00000000000..5597a8aead1
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- keycodes/evdev.orig	2007-09-24 17:02:14.000000000 -0400
++++ keycodes/evdev
+@@ -147,7 +147,7 @@ default xkb_keycodes "evdev" {
+ 
+ 	<HZTG> =  93;	// Hankaku/Zenkakau toggle
+ 	<HKTG> = 101;	// Hiragana/Katakana toggle
+-	<AB11> = 211;	// backslash/underscore
++	// <AB11> = 211;	// backslash/underscore
+ 	<HENK> = 100;	// Henkan
+ 	<MUHE> = 102;	// Muhenkan
+ 	<AE13> = 132;	// Yen
diff --git a/x11/xkeyboard-config/patches/patch-ah b/x11/xkeyboard-config/patches/patch-ah
new file mode 100644
index 00000000000..bc4486be61d
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- rules/base.lists.part.orig	2007-09-26 07:56:42.000000000 -0400
++++ rules/base.lists.part
+@@ -28,7 +28,7 @@
+               acpi airkey \
+               apple armada asus_laptop azonaRF2300 \
+               benqx brother \
+-              btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \
++              btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u btc9116u \
+               cherryblue cherrybluea cherryblueb cherrycyboard \
+               chicony chicony9885 \
+               compaqeak8 compaqik7 compaqik13 compaqik18 \
diff --git a/x11/xkeyboard-config/patches/patch-ai b/x11/xkeyboard-config/patches/patch-ai
new file mode 100644
index 00000000000..a595efefc67
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ai
@@ -0,0 +1,11 @@
+$NetBSD: patch-ai,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- rules/base.o_c.part.orig	2007-05-31 17:18:06.000000000 -0400
++++ rules/base.o_c.part
+@@ -1,6 +1,4 @@
+   grp_led:num		=	+lednum(group_lock)
+   grp_led:caps		=	+ledcaps(group_lock)
+   grp_led:scroll	=	+ledscroll(group_lock)
+-  grp:caps_toggle	=	+ledcaps(group_lock)
+   japan:kana_lock	=	+japan(kana_lock)
+-
diff --git a/x11/xkeyboard-config/patches/patch-aj b/x11/xkeyboard-config/patches/patch-aj
new file mode 100644
index 00000000000..d1ab8cd585c
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- configure.orig	2007-11-08 22:19:01.000000000 -0500
++++ configure
+@@ -5110,7 +5110,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-ak b/x11/xkeyboard-config/patches/patch-ak
new file mode 100644
index 00000000000..2d2995f42a9
--- /dev/null
+++ b/x11/xkeyboard-config/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+
+--- rules/merge.sh.orig	2007-11-08 22:29:35.000000000 -0500
++++ rules/merge.sh
+@@ -10,7 +10,7 @@ fi
+ > $DEST
+ 
+ for i in $*; do
+-  if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
++  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
+     echo >> $DEST;
+     read hdr
+     echo "$hdr" >> $DEST