CVS commit: xsrc/external/mit/xkeyboard-config/dist

2021-04-26 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 03:38:48 UTC 2021

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in at in ir
lk pl sy
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: sl-c3x00
ws003sh ws007sh ws011sh ws020sh

Log Message:
merge xkeyboard-config 2.32, reduce local diffs


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/lk
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/pl
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/sy
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.19 xsrc/external/mit/xkeyboard-config/dist/configure:1.20
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.19	Sun Feb 23 11:14:17 2020
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Tue Apr 27 03:38:48 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.29.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.29'
-PACKAGE_STRING='xkeyboard-config 2.29'
+PACKAGE_VERSION='2.32'
+PACKAGE_STRING='xkeyboard-config 2.32'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.29 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.32 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.29:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.32:";;
esac
   cat <<\_ACEOF
 
@@ -1497,7 +1497,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.29
+xkeyboard-config configure 2.32
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1677,7 +1677,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.29, which was
+It was created by xkeyboard-config $as_me 2.32, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2025,7 +2025,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
+ # change version in meson.build as well
 
 am__api_version='1.16'
 
@@ -2542,7 +2542,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.29'
+ VERSION='2.32'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7051,7 +7051,10 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/jolla_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2020-02-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Feb 23 11:14:18 UTC 2020

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/rules: base.lo_s.part
base.ml_s.part base.o_k.part
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/rules: HDR evdev.lists.part
merge.sh
xsrc/external/mit/xkeyboard-config/dist/rules/bin: Makefile.am
Makefile.in ml1_s.sh ml1v1_s.sh ml1v_s.sh ml_s.sh mln_s.sh
mlnvn_s.sh mlv_s.sh

Log Message:
merge xkeyboard-config 2.29.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/HDR
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lists.part
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/merge.sh
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1v1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1v_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/mln_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/mlnvn_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/mlv_s.sh
cvs rdiff -u -r1.1.1.10 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/Makefile.in
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.18 xsrc/external/mit/xkeyboard-config/dist/configure:1.19
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.18	Sat Jun  1 07:11:53 2019
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Sun Feb 23 11:14:17 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.27.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.29.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.27'
-PACKAGE_STRING='xkeyboard-config 2.27'
+PACKAGE_VERSION='2.29'
+PACKAGE_STRING='xkeyboard-config 2.29'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -636,6 +636,15 @@ DEPS_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_PLATFORM
+PYTHON_EXEC_PREFIX
+PYTHON_PREFIX
+PYTHON_VERSION
+PYTHON
 HAVE_XSLTPROC_FALSE
 HAVE_XSLTPROC_TRUE
 XSLTPROC
@@ -748,6 +757,7 @@ with_libintl_prefix
 host_alias
 target_alias
 XSLTPROC
+PYTHON
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -1299,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.27 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.29 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1370,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.27:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.29:";;
esac
   cat <<\_ACEOF
 
@@ -1404,6 +1414,7 @@ Optional Packages:
 
 Some influential environment variables:
   XSLTPROCPath to xsltproc command
+  PYTHON  the Python interpreter
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
   directories to add to pkg-config's search path
@@ -1486,7 +1497,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.27
+xkeyboard-config configure 2.29
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2019-03-06 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar  6 10:58:36 UTC 2019

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
merge xkeyboard-config 2.26.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xkeyboard-config/dist/config.guess \
xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.8 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.9
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.8	Sun Dec 30 09:17:52 2018
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess	Wed Mar  6 10:58:36 2019
@@ -1,8 +1,8 @@
-#!/bin/sh
+#! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2017-08-08'
+timestamp='2018-03-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-08-08'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2017-08-08'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to .
 
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version  print version number, then exit
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)echo "int x;" > $dummy.c ;
+ ,,)echo "int x;" > "$dummy.c" ;
 	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 	 CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
 	# If the system lacks a compiler, then just pick glibc.
 	# We could probably try harder.
 	LIBC=gnu
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	eval "$set_cc_for_build"
+	cat <<-EOF > "$dummy.c"
 	#include 
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+	# If ldd exists, use it to detect musl libc.
+	if command -v ldd >/dev/null && \
+		ldd --version 2>&1 | grep -q ^musl
+	then
+	LIBC=musl
+	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# portion of the name.  We always set it to 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2018-12-30 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 09:17:53 UTC 2018

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in in ir lk

Log Message:
merge xkeyboard-config 2.25.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/config.guess \
xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/lk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.8
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess	Sun Dec 30 09:17:52 2018
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
Index: xsrc/external/mit/xkeyboard-config/dist/config.sub
diff -u xsrc/external/mit/xkeyboard-config/dist/config.sub:1.7 xsrc/external/mit/xkeyboard-config/dist/config.sub:1.8
--- xsrc/external/mit/xkeyboard-config/dist/config.sub:1.7	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/config.sub	Sun Dec 30 09:17:52 2018
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.15 xsrc/external/mit/xkeyboard-config/dist/configure:1.16
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.15	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Sun Dec 30 09:17:52 2018
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.23.1.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.25.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.23.1'
-PACKAGE_STRING='xkeyboard-config 2.23.1'
+PACKAGE_VERSION='2.25'
+PACKAGE_STRING='xkeyboard-config 2.25'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.23.1 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.25 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.23.1:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.25:";;
esac
   cat <<\_ACEOF
 
@@ -1511,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.23.1
+xkeyboard-config configure 2.25
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1654,7 +1654,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.23.1, which was
+It was created by xkeyboard-config $as_me 2.25, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2519,7 +2519,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.23.1'
+ VERSION='2.25'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7406,7 +7406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkeyboard-config $as_me 2.23.1, which was
+This file was extended by xkeyboard-config $as_me 2.25, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -7463,7 +7463,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || 

CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

2018-04-25 Thread Kamil Rytarowski
Module Name:xsrc
Committed By:   kamil
Date:   Wed Apr 25 18:55:19 UTC 2018

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: pl

Log Message:
Fix the Polish keymap in xkeyboard-config

Cherry-pick a patch from upstream BugZilla

Bug 104904 - Polish symbols file broken by typo
-- https://bugs.freedesktop.org/show_bug.cgi?id=104904

Remove stray "---" that broke the parser.

Patch detected in the Gentoo portage:
x11-misc/xkeyboard-config: add patch to fix pl keyboard layout
https://github.com/gentoo/gentoo/commit/cba05e849ae9ec7289f44eb2f624030c95b83f4b


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/pl
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.1.1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.1.1.8	Sun Mar 11 20:14:53 2018
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/pl	Wed Apr 25 18:55:18 2018
@@ -497,7 +497,6 @@ partial alphanumeric_keys
include "sun_vndr/pl(sun_type6)"
 };
 
---
 //Glagolica
 partial alphanumeric_keys
 xkb_symbols "glagolica"



CVS commit: xsrc/external/mit/xkeyboard-config/dist

2018-03-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 20:16:26 UTC 2018

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
merge xkeyboard-config 2.23.1.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/config.guess \
xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.6 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.6	Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess	Sun Mar 11 20:16:25 2018
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2017-08-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to .
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	/sbin/$sysctl 2>/dev/null || \
+	/usr/sbin/$sysctl 2>/dev/null || \
+	echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	armeb) machine=armeb-unknown ;;
 	arm*) machine=arm-unknown ;;
 	sh3el) machine=shl-unknown ;;
 	sh3eb) machine=sh-unknown ;;
 	sh5el) machine=sh5le-unknown ;;
+	earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	earm*)
+		os=netbsdelf
+		;;
 	arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 		release='-gnu'
 		;;
 	*)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
 *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2017-08-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 29 07:46:43 UTC 2017

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in at in lk
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: bn

Log Message:
merge xkeyboard-config 2.21.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkeyboard-config/dist/symbols/bn
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/lk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.13 xsrc/external/mit/xkeyboard-config/dist/configure:1.14
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.13	Mon Feb 13 02:33:21 2017
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Tue Aug 29 07:46:43 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.20.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.21.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.20'
-PACKAGE_STRING='xkeyboard-config 2.20'
+PACKAGE_VERSION='2.21'
+PACKAGE_STRING='xkeyboard-config 2.21'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.20 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.20:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.21:";;
esac
   cat <<\_ACEOF
 
@@ -1511,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.20
+xkeyboard-config configure 2.21
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1654,7 +1654,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.20, which was
+It was created by xkeyboard-config $as_me 2.21, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2519,7 +2519,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.20'
+ VERSION='2.21'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7406,7 +7406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkeyboard-config $as_me 2.20, which was
+This file was extended by xkeyboard-config $as_me 2.21, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -7463,7 +7463,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/&/g'`"
 ac_cs_version="\\
-xkeyboard-config config.status 2.20
+xkeyboard-config config.status 2.21
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.12
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.11	Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am	Tue Aug 29 07:46:43 2017
@@ -5,7 +5,7 @@ symbols_DATA = \
 af al am apl \
 ara at au az \
 ba bd be \
-bg bn br brai \
+bg br brai \
 bt bw by \
 ca cd ch \
 cm cn cz \

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.13 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2017-02-12 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Mon Feb 13 02:33:22 UTC 2017

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
merge xkeyboard-config 2.20


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.12 xsrc/external/mit/xkeyboard-config/dist/configure:1.13
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.12	Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Mon Feb 13 02:33:21 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.19.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.20.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.19'
-PACKAGE_STRING='xkeyboard-config 2.19'
+PACKAGE_VERSION='2.20'
+PACKAGE_STRING='xkeyboard-config 2.20'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -598,9 +598,6 @@ INTLLIBS
 LTLIBICONV
 LIBICONV
 INTL_MACOSX_LIBS
-EGREP
-GREP
-CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -693,9 +690,6 @@ build_os
 build_vendor
 build_cpu
 build
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -765,7 +759,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
-enable_maintainer_mode
 with_xsltproc
 with_xkb_base
 with_xkb_rules_symlink
@@ -791,8 +784,7 @@ CC
 CFLAGS
 LDFLAGS
 LIBS
-CPPFLAGS
-CPP'
+CPPFLAGS'
 
 
 # Initialize some variables set by options.
@@ -1333,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.19 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1404,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.19:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.20:";;
esac
   cat <<\_ACEOF
 
@@ -1414,9 +1406,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-maintainer-mode
-  enable make rules and dependencies not useful (and
-  sometimes confusing) to the casual installer
   --enable-compat-rules  create compatibility rules
  --enable-runtime-depsuse run-time dependencies as build-time dependencies
   --disable-nls   do not use Native Language Support
@@ -1455,7 +1444,6 @@ Some influential environment variables:
   LIBSlibraries to pass to the linker, e.g. -l
   CPPFLAGS(Objective) C/C++ preprocessor flags, e.g. -I if
   you have headers in a nonstandard directory 
-  CPP C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1523,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.19
+xkeyboard-config configure 2.20
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1575,43 +1563,6 @@ fi
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# --
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-grep -v '^ *+' conftest.err >conftest.er1
-cat 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2015-07-19 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 20 05:28:25 UTC 2015

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in ir lk
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
merge xkeyboard-config 2.15.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/config.guess \
xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/lk
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.4 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.5
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.4	Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess	Mon Jul 20 05:28:25 2015
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -26,7 +24,7 @@ timestamp='2012-12-29'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 (GPLv3).
 #
-# Originally written by Per Bothner. 
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -52,9 +50,7 @@ version=\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2/dev/null` || UNAME_VERSION=unknown
 
+case ${UNAME_SYSTEM} in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat -EOF  $dummy.c
+	#include features.h
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case ${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
@@ -809,7 +826,7 @@ EOF
 *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-i*:MSYS*:*)
+*:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
 i*:windows32*:*)
@@ -857,21 +874,21 @@ EOF
 	exit ;;
 *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
 aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p'  /proc/cpuinfo` in
@@ -884,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2014-07-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 11 19:11:00 UTC 2014

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in in ir

Log Message:
merge xkeyboard-config 2.12.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/ir

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.9 xsrc/external/mit/xkeyboard-config/dist/configure:1.10
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.9	Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Fri Jul 11 19:11:00 2014
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.11.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.12.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.11'
-PACKAGE_STRING='xkeyboard-config 2.11'
+PACKAGE_VERSION='2.12'
+PACKAGE_STRING='xkeyboard-config 2.12'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1334,7 +1334,7 @@ if test $ac_init_help = long; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures xkeyboard-config 2.11 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1405,7 +1405,7 @@ fi
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of xkeyboard-config 2.11:;;
+ short | recursive ) echo Configuration of xkeyboard-config 2.12:;;
esac
   cat \_ACEOF
 
@@ -1524,7 +1524,7 @@ fi
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-xkeyboard-config configure 2.11
+xkeyboard-config configure 2.12
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1771,7 +1771,7 @@ cat config.log _ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.11, which was
+It was created by xkeyboard-config $as_me 2.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2636,7 +2636,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.11'
+ VERSION='2.12'
 
 
 cat confdefs.h _ACEOF
@@ -7871,7 +7871,7 @@ cat $CONFIG_STATUS \_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log=
-This file was extended by xkeyboard-config $as_me 2.11, which was
+This file was extended by xkeyboard-config $as_me 2.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -7928,7 +7928,7 @@ _ACEOF
 cat $CONFIG_STATUS _ACEOF || ac_write_fail=1
 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'`
 ac_cs_version=\\
-xkeyboard-config config.status 2.11
+xkeyboard-config config.status 2.12
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\\$ac_cs_config\\
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.10
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.9	Fri May 31 23:23:11 2013
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am	Fri Jul 11 19:11:00 2014
@@ -11,7 +11,7 @@ bt bw by \
 ca cd ch \
 cm cn cz \
 de dk \
-ee es et epo \
+ee es et epo eu \
 fi fo fr \
 gb ge gh gn \
 gr hr hu \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.10
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.9	Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in	Fri Jul 11 19:11:00 2014
@@ -363,7 +363,7 @@ bt bw by \
 ca cd ch \
 cm cn cz \
 de dk \
-ee es et epo \
+ee es et epo eu \
 fi fo fr \
 gb 

CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr

2013-06-02 Thread Thomas Klausner
Module Name:xsrc
Committed By:   wiz
Date:   Sun Jun  2 20:26:03 UTC 2013

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
Reduce unnecessary diffs to upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.3
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.2	Sat May 29 07:29:54 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in	Sun Jun  2 20:26:03 2013
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,29 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+am__dry=no; \
+case $$MAKEFLAGS in \
+  *\\[\ \	]*) \
+echo 'am--echo: ; @echo AM  OK' | $(MAKE) -f - 2/dev/null \
+  | grep '^AM OK$$' /dev/null || am__dry=yes;; \
+  *) \
+for am__flg in $$MAKEFLAGS; do \
+  case $$am__flg in \
+*=*|--*) ;; \
+*n*) am__dry=yes; break;; \
+  esac; \
+done;; \
+esac; \
+test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -34,100 +48,125 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/sharp_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+n|no|NO) false;; \
+*) (install-info --version) /dev/null 21;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo $(srcdir) | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
 $(srcdir)/*) f=`echo $$p | sed s|^$$srcdirstrip/||`;; \
 *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo $(srcdir) | sed 's/[].[^$$\\*|]//g'`
+am__nobase_strip = \
+  for p in $$list; do echo $$p; done | sed -e s|$$srcdirstrip/||
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo $$p $$p; done | \
+  sed s| $$srcdirstrip/| |;' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files[.] =  } { files[$$2] = files[$$2]   $$1; \
+if (++n[$$2] == $(am__install_max)) \
+  { print $$2, files[$$2]; n[$$2] = 0; files[$$2] =  } } \
+END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z $$files \
+|| { test ! -d $$dir  test ! -f $$dir  test ! -r $$dir; } \
+|| { echo  ( cd '$$dir'  rm -f $$files ); \
+ $(am__cd) $$dir  rm -f $$files; }; \
+  }
 am__installdirs = $(DESTDIR)$(symbolsdir)
-dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2011-07-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 11:20:20 UTC 2011

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv139

Log Message:
initial import of xkeyboard-config 2.3.  important changes include:
added symbols/apl, symbols/cm, symbols/tw
removed all symbols/extras/*

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-3

U xsrc/external/mit/xkeyboard-config/dist/install-sh
C xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
N xsrc/external/mit/xkeyboard-config/dist/symbols/tw
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
C xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
U xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
C xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/level3
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
U xsrc/external/mit/xkeyboard-config/dist/symbols/rupeesign
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2011-07-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 11:21:56 UTC 2011

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure configure.in
xsrc/external/mit/xkeyboard-config/dist/rules: base.ml_s.part
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in at in ir lk sy symbols.dir
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/rules/extras: Makefile.am
Makefile.in layoutsMapping.lst variantsMapping.lst
xsrc/external/mit/xkeyboard-config/dist/symbols/extras: Makefile.am
Makefile.in apl ir rs ru us

Log Message:
merge xkeyboard-config 2.3


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/configure \
xsrc/external/mit/xkeyboard-config/dist/configure.in
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/Makefile.in \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/layoutsMapping.lst
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/variantsMapping.lst
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/in \
xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/lk \
xsrc/external/mit/xkeyboard-config/dist/symbols/sy
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/apl \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/rs \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/us
cvs rdiff -u -r1.3 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/ir
cvs rdiff -u -r1.4 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/ru

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.6 xsrc/external/mit/xkeyboard-config/dist/configure:1.7
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.6	Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Sat Jul 23 11:21:55 2011
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.1.
+# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.3.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.1'
-PACKAGE_STRING='xkeyboard-config 2.1'
+PACKAGE_VERSION='2.3'
+PACKAGE_STRING='xkeyboard-config 2.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -662,6 +662,11 @@
 USE_COMPAT_RULES_TRUE
 CREATE_RULES_SYMLINK_FALSE
 CREATE_RULES_SYMLINK_TRUE
+DEPS_LIBS
+DEPS_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 XKBCOMP
 MAINT
 MAINTAINER_MODE_FALSE
@@ -734,12 +739,18 @@
 with_xkb_base
 with_xkb_rules_symlink
 enable_compat_rules
+enable_runtime_deps
 enable_nls
 enable_dependency_tracking
 '
   ac_precious_vars='build_alias
 host_alias
 target_alias
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+DEPS_CFLAGS
+DEPS_LIBS
 CC
 CFLAGS
 LDFLAGS
@@ -1288,7 +1299,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures xkeyboard-config 2.1 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1355,7 +1366,7 @@
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of xkeyboard-config 2.1:;;
+ short | recursive ) echo Configuration of xkeyboard-config 2.3:;;
esac
   cat \_ACEOF
 
@@ -1366,6 +1377,7 @@
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-compat-rules  create compatibility rules
+ --enable-runtime-depsuse run-time dependencies as build-time dependencies
   --disable-nls   do not use Native 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2011-02-20 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Feb 21 05:00:58 UTC 2011

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3160

Log Message:
initial import of xkeyboard-config-2.1:
- add geometry/sanwa, symbols/ph and symbols/rupeesign

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-1

U xsrc/external/mit/xkeyboard-config/dist/install-sh
C xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/by
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
U xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
U xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/level3
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
N xsrc/external/mit/xkeyboard-config/dist/symbols/rupeesign
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/al
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2011-02-20 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Feb 21 05:03:19 UTC 2011

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure configure.in
xsrc/external/mit/xkeyboard-config/dist/rules: base.ml_s.part
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in in ir symbols.dir
xsrc/external/mit/xkeyboard-config/dist/symbols/extras: ru

Log Message:
merge xkeyboard-config 2.1


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkeyboard-config/dist/configure \
xsrc/external/mit/xkeyboard-config/dist/configure.in
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/in \
xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/ru

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.5 xsrc/external/mit/xkeyboard-config/dist/configure:1.6
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.5	Sun Nov 28 07:53:08 2010
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Mon Feb 21 05:03:18 2011
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.0.
+# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.0'
-PACKAGE_STRING='xkeyboard-config 2.0'
+PACKAGE_VERSION='2.1'
+PACKAGE_STRING='xkeyboard-config 2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1288,7 +1288,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures xkeyboard-config 2.0 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1355,7 +1355,7 @@
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of xkeyboard-config 2.0:;;
+ short | recursive ) echo Configuration of xkeyboard-config 2.1:;;
esac
   cat \_ACEOF
 
@@ -1452,7 +1452,7 @@
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-xkeyboard-config configure 2.0
+xkeyboard-config configure 2.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1817,7 +1817,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.0, which was
+It was created by xkeyboard-config $as_me 2.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2633,7 +2633,7 @@
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.0'
+ VERSION='2.1'
 
 
 cat confdefs.h _ACEOF
@@ -5438,7 +5438,7 @@
 	 $srcdir/po/POTFILES.in  po/POTFILES
 
 
-ALL_LINGUAS=af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt nb nl ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW
+ALL_LINGUAS=af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW
 
 
 
@@ -6019,7 +6019,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log=
-This file was extended by xkeyboard-config $as_me 2.0, which was
+This file was extended by xkeyboard-config $as_me 2.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -6076,7 +6076,7 @@
 cat $CONFIG_STATUS _ACEOF || ac_write_fail=1
 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'`
 ac_cs_version=\\
-xkeyboard-config config.status 2.0
+xkeyboard-config config.status 2.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\\$ac_cs_config\\
 
Index: xsrc/external/mit/xkeyboard-config/dist/configure.in
diff -u xsrc/external/mit/xkeyboard-config/dist/configure.in:1.5 xsrc/external/mit/xkeyboard-config/dist/configure.in:1.6
--- xsrc/external/mit/xkeyboard-config/dist/configure.in:1.5	Sun Nov 28 07:53:08 2010
+++ xsrc/external/mit/xkeyboard-config/dist/configure.in	Mon 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-11-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 28 04:49:11 UTC 2010

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5993

Log Message:
second import of xkeyboard-config 1.9.  the 2.0 import causes issues
i haven't been able to figure out, so, revert back to what was working.

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-1-9

U xsrc/external/mit/xkeyboard-config/dist/install-sh
C xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/bw
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
C xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
U xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
C xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/al
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-11-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 28 07:51:03 UTC 2010

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv21457

Log Message:
secondary import of xkeyboard-config-2.0

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-0

U xsrc/external/mit/xkeyboard-config/dist/install-sh
C xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/es
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
C xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
U xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
C xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/al
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U xsrc/external/mit/xkeyboard-config/dist/symbols/pc
U xsrc/external/mit/xkeyboard-config/dist/symbols/lv
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-11-21 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov 22 00:27:55 UTC 2010

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv20124

Log Message:
initial import of xkeyboard-config-2.0.

this adds new symbols/at, symbols/extras/ir and symbols/extras/ru, as
well as many fixes for other configs.

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-0

U xsrc/external/mit/xkeyboard-config/dist/install-sh
C xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/es
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
C xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
U xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
C xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/al
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

2010-09-01 Thread Thomas Klausner
Module Name:xsrc
Committed By:   wiz
Date:   Wed Sep  1 12:57:39 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: in ir lk sy

Log Message:
Fix syntax error in some layout files.
From Pouya D. Tafti on pkgsrc-users.

Fixed upstream as seen in
https://bugs.freedesktop.org/show_bug.cgi?id=29887


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/in \
xsrc/external/mit/xkeyboard-config/dist/symbols/ir \
xsrc/external/mit/xkeyboard-config/dist/symbols/lk \
xsrc/external/mit/xkeyboard-config/dist/symbols/sy

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.1.1.3	Fri May 28 09:54:13 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/in	Wed Sep  1 12:57:38 2010
@@ -85,7 +85,7 @@
 	key AB10 { [ U092f, U095f, slash, question ] };
 
 	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
-	include nbsp(zwnj3zwj4);
+	include nbsp(zwnj3zwj4)
 };
 
 //Name		:	Bolnagri (Combined)
@@ -1263,7 +1263,7 @@
   key AB10 { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
 
   // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
-  include nbsp(zwnj3zwj4);
+  include nbsp(zwnj3zwj4)
 
   include group(olpc)
 };
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/ir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.1.1.3	Fri May 28 09:54:14 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/ir	Wed Sep  1 12:57:38 2010
@@ -18,11 +18,11 @@
 xkb_symbols pes {
 name[Group1]= Iran;
 
-include ir(pes_part_basic);
-include ir(pes_part_ext);
+include ir(pes_part_basic)
+include ir(pes_part_ext)
 
-include nbsp(zwnj2nb3nnb4);
-include level3(ralt_switch);
+include nbsp(zwnj2nb3nnb4)
+include level3(ralt_switch)
 };
 
 
@@ -30,11 +30,11 @@
 xkb_symbols pes_keypad {
 name[Group1]= Iran - Persian, with Persian Keypad;
 
-include ir(pes_part_basic);
-include ir(pes_part_keypad);
+include ir(pes_part_basic)
+include ir(pes_part_keypad)
 
-include nbsp(zwnj2nb3nnb4);
-include level3(ralt_switch);
+include nbsp(zwnj2nb3nnb4)
+include level3(ralt_switch)
 };
 
 partial hidden alphanumeric_keys
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/lk
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.1.1.3	Fri May 28 09:54:11 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/lk	Wed Sep  1 12:57:38 2010
@@ -74,7 +74,7 @@
   key AB10 { [ any, any, 0x0100200d, NoSymbol ] };
 
   // Space
-  include nbsp(zwnj2nb3s);
+  include nbsp(zwnj2nb3s)
 
   include level3(ralt_switch)
 };
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sy
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.1.1.3	Fri May 28 09:54:12 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sy	Wed Sep  1 12:57:38 2010
@@ -68,7 +68,7 @@
 // End Alphanumeric Section
 
 // Space
-include nbsp(zwnj2);
+include nbsp(zwnj2)
 
 // Begin Modifier Mappings
 



CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr

2010-05-30 Thread NONAKA Kimihiro
Module Name:xsrc
Committed By:   nonaka
Date:   Sun May 30 10:10:20 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: ws011sh

Log Message:
Added keypad symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.1 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.1	Tue May 25 13:12:51 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh	Sun May 30 10:10:20 2010
@@ -1,4 +1,4 @@
-// $NetBSD: ws011sh,v 1.1 2010/05/25 13:12:51 nonaka Exp $
+// $NetBSD: ws011sh,v 1.2 2010/05/30 10:10:20 nonaka Exp $
 
 partial default alphanumeric_keys
 xkb_symbols basic {
@@ -6,8 +6,8 @@
 
 	// Upper row
 	key HZTG {
-		type[Group1]=THREE_LEVEL,
-		symbols[Group1]= [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ]
+		type[Group1] = THREE_LEVEL,
+		symbols[Group1] = [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ]
 	};
 
 	key AD01 { [ q, Q, quotedbl ] };
@@ -55,7 +55,6 @@
 	key SPCE { [ space ] };
 	// End alphanumeric section
 	
-	// keypad
 	key UP { [ Up, Up, Prior ] };
 	key LEFT { [ Left, Left, Home ] };
 	key DOWN { [ Down, Down, Next ] };
@@ -63,5 +62,17 @@
 
 	key ESC { [ Escape ] };
 
+	// keypad
+	key KP1 { [ 1 ] };
+	key KP2 { [ 2 ] };
+	key KP3 { [ 3 ] };
+	key KP4 { [ 4 ] };
+	key KP5 { [ 5 ] };
+	key KP6 { [ 6 ] };
+	key KP7 { [ 7 ] };
+	key KP8 { [ 8 ] };
+	key KP9 { [ 9 ] };
+	key KP0 { [ 0 ] };
+
 	include level3(ralt_switch)
 };



CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-29 Thread NONAKA Kimihiro
Module Name:xsrc
Committed By:   nonaka
Date:   Sat May 29 07:29:54 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure configure.in
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
sharp_vndr was added to the build object.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/configure \
xsrc/external/mit/xkeyboard-config/dist/configure.in
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/configure:1.2
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.1.1.3	Fri May 28 09:54:08 2010
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Sat May 29 07:29:54 2010
@@ -5437,7 +5437,7 @@
 
 
 
-ac_config_files=$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile symbols/extras/Makefile types/Makefile xkeyboard-config.pc xkeyboard-config.spec docs/Makefile
+ac_config_files=$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile symbols/extras/Makefile types/Makefile xkeyboard-config.pc xkeyboard-config.spec docs/Makefile
 
 cat confcache \_ACEOF
 # This file is a shell script that caches the results of configure
Index: xsrc/external/mit/xkeyboard-config/dist/configure.in
diff -u xsrc/external/mit/xkeyboard-config/dist/configure.in:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/configure.in:1.2
--- xsrc/external/mit/xkeyboard-config/dist/configure.in:1.1.1.3	Fri May 28 09:54:06 2010
+++ xsrc/external/mit/xkeyboard-config/dist/configure.in	Sat May 29 07:29:54 2010
@@ -70,6 +70,7 @@
 symbols/nec_vndr/Makefile
 symbols/nokia_vndr/Makefile
 symbols/sgi_vndr/Makefile
+symbols/sharp_vndr/Makefile
 symbols/sony_vndr/Makefile
 symbols/sun_vndr/Makefile
 symbols/xfree68_vndr/Makefile

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.1.1.3	Fri May 28 09:54:16 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in	Sat May 29 07:29:54 2010
@@ -226,7 +226,7 @@
 top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr extras
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.1 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.1	Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in	Sat May 29 07:29:54 2010
@@ -189,7 +189,11 @@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/sharp_vndr
 dist_symbols_DATA = \
-us

CVS commit: xsrc/external/mit/xkeyboard-config/dist/rules

2010-05-29 Thread NONAKA Kimihiro
Module Name:xsrc
Committed By:   nonaka
Date:   Sat May 29 07:35:01 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base base.ml_s.part
evdev

Log Message:
The rule of W-ZERO3 was added again.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkeyboard-config/dist/rules/evdev

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/rules/base
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base:1.6 xsrc/external/mit/xkeyboard-config/dist/rules/base:1.7
--- xsrc/external/mit/xkeyboard-config/dist/rules/base:1.6	Fri May 28 14:21:04 2010
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base	Sat May 29 07:35:01 2010
@@ -357,6 +357,11 @@
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
+  sl-c3x00	*			=	pc+sharp_vndr/sl-c3x00(basic)
+  ws003sh	*			=	pc+sharp_vndr/ws003sh(basic)
+  ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
+  ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)
+  ws020sh	*			=	pc+sharp_vndr/ws020sh(basic)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
 

Index: xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.1.1.3 xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.2
--- xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.1.1.3	Fri May 28 09:54:26 2010
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part	Sat May 29 07:35:01 2010
@@ -36,5 +36,10 @@
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
+  sl-c3x00	*			=	pc+sharp_vndr/sl-c3x00(basic)
+  ws003sh	*			=	pc+sharp_vndr/ws003sh(basic)
+  ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
+  ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)
+  ws020sh	*			=	pc+sharp_vndr/ws020sh(basic)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)

Index: xsrc/external/mit/xkeyboard-config/dist/rules/evdev
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/evdev:1.3 xsrc/external/mit/xkeyboard-config/dist/rules/evdev:1.4
--- xsrc/external/mit/xkeyboard-config/dist/rules/evdev:1.3	Fri May 28 14:21:04 2010
+++ xsrc/external/mit/xkeyboard-config/dist/rules/evdev	Sat May 29 07:35:01 2010
@@ -346,6 +346,11 @@
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
+  sl-c3x00	*			=	pc+sharp_vndr/sl-c3x00(basic)
+  ws003sh	*			=	pc+sharp_vndr/ws003sh(basic)
+  ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
+  ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)
+  ws020sh	*			=	pc+sharp_vndr/ws020sh(basic)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
 



CVS commit: xsrc/external/mit/xkeyboard-config/dist/rules

2010-05-29 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Sat May 29 07:58:35 UTC 2010

Removed Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base base.lst evdev
evdev.lst

Log Message:
Move compiled files from dist directory to reachover directory (suggested
by mrg).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base.lst \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lst
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/evdev

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 09:50:36 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir

Log Message:
Restore original (1.4 distfile) order to ease merges.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.5
--- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4	Tue May 25 13:12:51 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir	Fri May 28 09:50:36 2010
@@ -1,3 +1,5 @@
+-dp- a--- mn(basic)
+--p- a--- mn(olpc)
 --p- -m-- compose(ralt)
 --p- -m-- compose(lwin)
 --p- -m-- compose(rwin)
@@ -5,12 +7,6 @@
 --p- -m-- compose(rctrl)
 --p- -m-- compose(caps)
 --p- -m-- compose(102)
--dp- a--- mn(basic)
---p- a--- mn(olpc)
---p-  eurosign(e)
---p-  eurosign(2)
---p-  eurosign(4)
---p-  eurosign(5)
 -d--  de(basic)
 --p- a--- de(nodeadkeys)
 --p- a--- de(deadgraveacute)
@@ -32,10 +28,10 @@
 --p- a--- ro(std)
 --p- a--- ro(std_cedilla)
 --p- a--- ro(winkeys)
---p- --kf srvr_ctrl(xfree86)
---p- --k- srvr_ctrl(stdkeypad)
---p- ---f srvr_ctrl(fkey2vt)
---p- --kf srvr_ctrl(no_srvr_keys)
+--p-  eurosign(e)
+--p-  eurosign(2)
+--p-  eurosign(4)
+--p-  eurosign(5)
 -dp- a--- me(basic)
 --p- a--- me(cyrillic)
 --p- a--- me(cyrillicyz)
@@ -71,7 +67,10 @@
 --p- a--- be(Sundeadkeys)
 --p- a--- be(nodeadkeys)
 --p- a--- be(wang)
-  sony_vndr/us(nwp5461)
+--p- --kf srvr_ctrl(xfree86)
+--p- --k- srvr_ctrl(stdkeypad)
+--p- ---f srvr_ctrl(fkey2vt)
+--p- --kf srvr_ctrl(no_srvr_keys)
 -dp- a--- ba(basic)
 --p- a--- ba(us)
 --p- a--- ba(alternatequotes)
@@ -101,9 +100,35 @@
 --p- a---g--- gr(extended)
 --p- a---g--- gr(polytonic)
 --p- a---g--- gr(nodeadkeys)
--dp-  sun_vndr/solaris(defaults)
---p-  sun_vndr/solaris(keynames)
---p-  sun_vndr/solaris(xf86keynames)
+  sony_vndr/us(nwp5461)
+-dp-  hu(basic)
+--p-  hu(standard)
+--p-  hu(nodeadkeys)
+--p-  hu(qwerty)
+--p-  hu(101_qwertz_comma_dead)
+--p-  hu(101_qwertz_comma_nodead)
+--p-  hu(101_qwertz_dot_dead)
+--p-  hu(101_qwertz_dot_nodead)
+--p-  hu(101_qwerty_comma_dead)
+--p-  hu(101_qwerty_comma_nodead)
+--p-  hu(101_qwerty_dot_dead)
+--p-  hu(101_qwerty_dot_nodead)
+--p-  hu(102_qwertz_comma_dead)
+--p-  hu(102_qwertz_comma_nodead)
+--p-  hu(102_qwertz_dot_dead)
+--p-  hu(102_qwertz_dot_nodead)
+--p-  hu(102_qwerty_comma_dead)
+--p-  hu(102_qwerty_comma_nodead)
+--p-  hu(102_qwerty_dot_dead)
+--p-  hu(102_qwerty_dot_nodead)
+h-p- a--- hu(def_102)
+h-p- a--- hu(def_101)
+h-p- a--- hu(def_qwertz)
+h-p- a--- hu(def_qwerty)
+h-p- --k- hu(def_dot)
+h-p- a--- hu(def_dead)
+h-p- a--- hu(def_nodead)
+h-p- a--- hu(def_common)
   sun_vndr/de(type4)
   sun_vndr/fi(basic)
   sun_vndr/ko(type4)
@@ -117,6 +142,9 @@
   sun_vndr/gr(type5)
 -dp- a--- sun_vndr/hu(type5)
   sun_vndr/cz(type5)
+-dp-  sun_vndr/solaris(defaults)
+--p-  sun_vndr/solaris(keynames)
+--p-  sun_vndr/solaris(xf86keynames)
 -dp- a--- sun_vndr/lt(type5)
   sun_vndr/jp(basic)
   sun_vndr/jp(type4)
@@ -180,35 +208,6 @@
   sun_vndr/usb(sun_usb)
   sun_vndr/ru(basic)
 --p-  sun_vndr/ru(type6)
--dp-  hu(basic)
---p-  hu(standard)
---p-  hu(nodeadkeys)
---p-  hu(qwerty)
---p-  hu(101_qwertz_comma_dead)
---p-  hu(101_qwertz_comma_nodead)
---p-  hu(101_qwertz_dot_dead)
---p-  hu(101_qwertz_dot_nodead)
---p-  hu(101_qwerty_comma_dead)
---p-  hu(101_qwerty_comma_nodead)
---p-  hu(101_qwerty_dot_dead)
---p-  hu(101_qwerty_dot_nodead)
---p-  hu(102_qwertz_comma_dead)
---p-  hu(102_qwertz_comma_nodead)
---p- 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 09:55:02 UTC 2010

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10477

Log Message:
Initial import of xkeyboard-config-1.9

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-1-9

U xsrc/external/mit/xkeyboard-config/dist/install-sh
U xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
U xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
N xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
N xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
N xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
N xsrc/external/mit/xkeyboard-config/dist/symbols/bw
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
N xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
N xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
N xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
U xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/al
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U xsrc/external/mit/xkeyboard-config/dist/symbols/pc
U xsrc/external/mit/xkeyboard-config/dist/symbols/lv
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 10:01:08 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
symbols.dir
Added Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base.lo_s.part
base.o_k.part
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/po: s...@latn.po
xsrc/external/mit/xkeyboard-config/dist/rules: base base.l2_s.part
base.l3_s.part base.l4_s.part base.lst evdev evdev.lst
xsrc/external/mit/xkeyboard-config/dist/rules/compat: layoutRename.lst
ln_s.sh lnv_s.sh ml1_s.sh ml1v1_s.sh ml1v_s.sh ml_s.sh mlv_s.sh
variantRename.lst
xsrc/external/mit/xkeyboard-config/dist/symbols: braille
xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr: es
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr: cs hu ko sw
usb

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/po/s...@latn.po
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l2_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l3_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l4_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lst
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lst
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/layoutRename.lst
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ln_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/lnv_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/mlv_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/variantRename.lst
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/braille
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/es
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/cs \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/hu \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/ko \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/sw \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/usb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.3
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.2	Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am	Fri May 28 10:01:08 2010
@@ -1,12 +1,12 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr extras
 
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \
 am ara az \
-be bd \
-bg br ba \
-bt by braille \
+ba bd be \
+bg br brai \
+bt bw by \
 ca cd \
 ch cn cz \
 de dk \
@@ -16,21 +16,24 @@
 gr hr hu \
 ie il in iq \
 ir is it jp \
-kg kh kr kz \
+ke kg kh \
+kr kz \
 la latam latin \
 lk lt lv \
-ma mao me mk \
-mm mn mt mv \
+ma mao me \
+mk ml mm \
+mn mt mv \
 ng nl no np \
 pc pk pl pt \
 ro rs ru \
-se si sk \
+se si sk sn \
 sy th \
-tj tr \
+terminate \
+tj tm tr tz \
 ua us uz vn \
 za \
-altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+altwin capslock compose ctrl empty eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
 dir_data = $(dist_symbols_DATA)
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.6
--- 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-25 Thread NONAKA Kimihiro
Module Name:xsrc
Committed By:   nonaka
Date:   Tue May 25 13:12:51 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base
xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.am
Added Files:
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: ws011sh
ws020sh

Log Message:
Added keyboard config files for Sharp WS011SH/WS020SH.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/rules/base
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base:1.3 xsrc/external/mit/xkeyboard-config/dist/rules/base:1.4
--- xsrc/external/mit/xkeyboard-config/dist/rules/base:1.3	Sat May 15 15:33:30 2010
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base	Tue May 25 13:12:51 2010
@@ -309,6 +309,8 @@
   sl-c3x00   	*			=	pc+sharp_vndr/sl-c3x00(basic)
   ws003sh   	*			=	pc+sharp_vndr/ws003sh(basic)
   ws007sh   	*			=	pc+sharp_vndr/ws007sh(basic)
+  ws011sh   	*			=	pc+sharp_vndr/ws011sh(basic)
+  ws020sh   	*			=	pc+sharp_vndr/ws020sh(basic)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4
--- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.3	Sat May 15 15:33:30 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir	Tue May 25 13:12:51 2010
@@ -851,3 +851,5 @@
 -dp- a--- sharp_vndr/sl-c3x00(basic)
 -dp- a--- sharp_vndr/ws003sh(basic)
 -dp- a--- sharp_vndr/ws007sh(basic)
+-dp- a--- sharp_vndr/ws011sh(basic)
+-dp- a--- sharp_vndr/ws020sh(basic)

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.3
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.2	Sat May 15 15:33:30 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am	Tue May 25 13:12:51 2010
@@ -3,4 +3,6 @@
 dist_symbols_DATA = \
 sl-c3x00 \
 ws003sh \
-ws007sh
+ws007sh \
+ws011sh \
+ws020sh

Added files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh
diff -u /dev/null xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh:1.1
--- /dev/null	Tue May 25 13:12:51 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh	Tue May 25 13:12:51 2010
@@ -0,0 +1,67 @@
+// $NetBSD: ws011sh,v 1.1 2010/05/25 13:12:51 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols basic {
+	name[Group1]= Sharp WS011SH;
+
+	// Upper row
+	key HZTG {
+		type[Group1]=THREE_LEVEL,
+		symbols[Group1]= [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ]
+	};
+
+	key AD01 { [ q, Q, quotedbl ] };
+	key AD02 { [ w, W, numbersign ] };
+	key AD03 { [ e, E, dollar ] };
+	key AD04 { [ r, R, percent ] };
+	key AD05 { [ t, T, ampersand ] };
+	key AD06 { [ y, Y, 1 ] };
+	key AD07 { [ u, U, 2 ] };
+	key AD08 { [ i, I, 3 ] };
+	key AD09 { [ o, O, underscore ] };
+	key AD10 { [ p, P, at ] };
+	key BKSP { [ BackSpace, BackSpace, Delete ] };
+	
+	key TAB { [ Tab, Tab, Escape ] };
+	key AC01 { [ a, A, bracketleft ] };
+	key AC02 { [ s, S, apostrophe ] };
+	key AC03 { [ d, D, parenleft ] };
+	key AC04 { [ f, F, parenright ] };
+	key AC05 { [ g, G, asterisk ] };
+	key AC06 { [ h, H, 4 ] };
+	key AC07 { [ j, J, 5 ] };
+	key AC08 { [ k, K, 6 ] };
+	key AC09 { [ l, L, plus ] };
+	key AE11 { [ minus, equal, backslash ] };
+	key AE02 { [ grave, braceleft, braceright ] };
+
+	key LFSH { [ Shift_L ] };
+	key AB01 { [ z, Z, bracketright ] };
+	key AB02 { [ x, X, asciicircum ] };
+	key AB03 { [ c, C, asciitilde ] };
+	key AB04 { [ v, V, bar ] };
+	key AB05 { [ b, B, 7 ] };
+	key AB06 { [ n, N, 8 ] };
+	key AB07 { [ m, M, 9 ] };
+	key AB08 { [ comma, less, semicolon ] };
+	key AB09 { [ period, greater, colon ] };
+	key AB10 { [ slash, question, 0 ] };
+	key RTSH { [ Shift_R ] };
+	key RTRN { [ Return ] };
+
+	key RALT { [ ISO_Level3_Shift ] };
+
+	key LCTL { [ Control_L ] };
+	key SPCE { [ space ] };
+	// End alphanumeric section
+	
+	// keypad
+	key UP { [ Up, Up, Prior ] };
+	key LEFT { [ Left, Left, Home 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-15 Thread NONAKA Kimihiro
Module Name:xsrc
Committed By:   nonaka
Date:   Sat May 15 15:33:30 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base
xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.am
Added Files:
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: ws003sh
ws007sh

Log Message:
Added keyboard config files for Sharp WS003SH/WS007SH.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/rules/base
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base:1.2 xsrc/external/mit/xkeyboard-config/dist/rules/base:1.3
--- xsrc/external/mit/xkeyboard-config/dist/rules/base:1.2	Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base	Sat May 15 15:33:30 2010
@@ -307,6 +307,8 @@
   olpc		*			=	olpc+%l%(v)
   thinkpad   	br			=	pc+br(thinkpad)
   sl-c3x00   	*			=	pc+sharp_vndr/sl-c3x00(basic)
+  ws003sh   	*			=	pc+sharp_vndr/ws003sh(basic)
+  ws007sh   	*			=	pc+sharp_vndr/ws007sh(basic)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.3
--- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.2	Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir	Sat May 15 15:33:30 2010
@@ -849,3 +849,5 @@
 --p- a--- gh(hausa)
 --p- a--- gh(generic)
 -dp- a--- sharp_vndr/sl-c3x00(basic)
+-dp- a--- sharp_vndr/ws003sh(basic)
+-dp- a--- sharp_vndr/ws007sh(basic)

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.1 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.1	Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am	Sat May 15 15:33:30 2010
@@ -1,4 +1,6 @@
 symbolsdir = $(xkb_base)/symbols/sharp_vndr
 
 dist_symbols_DATA = \
-sl-c3x00
+sl-c3x00 \
+ws003sh \
+ws007sh

Added files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh
diff -u /dev/null xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh:1.1
--- /dev/null	Sat May 15 15:33:30 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh	Sat May 15 15:33:30 2010
@@ -0,0 +1,73 @@
+// $NetBSD: ws003sh,v 1.1 2010/05/15 15:33:30 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols basic {
+	name[Group1]= Sharp WS003SH;
+
+	// Upper row
+	key AE01 { [ 1, exclam ] };
+	key AE02 { [ 2, quotedbl ] };
+	key AE03 { [ 3, numbersign ] };
+	key AE04 { [ 4, dollar ] };
+	key AE05 { [ 5, percent ] };
+	key AE06 { [ 6, ampersand ] };
+	key AE07 { [ 7, quoteright, quoteleft ] };
+	key AE08 { [ 8, parenleft, braceleft ] };
+	key AE09 { [ 9, parenright, braceright ] };
+	key AE10 { [ 0 ] };
+	key AE11 { [ minus, equal, backslash ] };
+	key BKSP { [ BackSpace, BackSpace, Delete ] };
+
+	key AD01 { [ q, Q ] };
+	key AD02 { [ w, W, asciicircum ] };
+	key AD03 { [ e, E, asciitilde ] };
+	key AD04 { [ r, R, bar ] };
+	key AD05 { [ t, T ] };
+	key AD06 { [ y, Y ] };
+	key AD07 { [ u, U, bracketleft ] };
+	key AD08 { [ i, I, bracketright ] };
+	key AD09 { [ o, O, underscore ] };
+	key AD10 { [ p, P, at ] };
+	
+	key TAB { [ Tab, Tab, Escape ] };
+
+	key AC01 { [ a, A ] };
+	key AC02 { [ s, S ] };
+	key AC03 { [ d, D ] };
+	key AC04 { [ f, F ] };
+	key AC05 { [ g, G ] };
+	key AC06 { [ h, H ] };
+	key AC07 { [ j, J ] };
+	key AC08 { [ k, K, plus ] };
+	key AC09 { [ l, L, asterisk ] };
+
+	key LFSH { [ Shift_L ] };
+	key AB01 { [ z, Z ] };
+	key AB02 { [ x, X ] };
+	key AB03 { [ c, C ] };
+	key AB04 { [ v, V ] };
+	key AB05 { [ b, B ] };
+	key AB06 { [ n, N ] };
+	key AB07 { [ m, M ] };
+	key AB08 { [ comma, semicolon, less ] };
+	key AB09 { [ period, colon, greater ] };
+	key AB10 { [ slash, question ] };
+	key RTSH { [ Shift_R ] };
+	key RTRN { [ Return ] };
+
+	key RALT { [ ISO_Level3_Shift ] };
+
+	key LCTL { [ Control_L ] };
+	key SPCE { [ space ] };
+	// End alphanumeric section
+	
+	// keypad
+	key UP { [ Up, Up, Prior