Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xkeyboard-config/dist initial import of xkeyb...
details: https://anonhg.NetBSD.org/xsrc/rev/416bf82c1d8e
branches: trunk
changeset: 10180:416bf82c1d8e
user: mrg <mrg%NetBSD.org@localhost>
date: Wed Mar 06 10:57:48 2019 +0000
description:
initial import of xkeyboard-config-2.26
diffstat:
external/mit/xkeyboard-config/dist/Makefile.in | 15 +-
external/mit/xkeyboard-config/dist/NEWS | 3 +
external/mit/xkeyboard-config/dist/aclocal.m4 | 257 +-
external/mit/xkeyboard-config/dist/compat/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/compile | 10 +-
external/mit/xkeyboard-config/dist/configure.ac | 2 +-
external/mit/xkeyboard-config/dist/docs/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/geometry/Makefile.in | 15 +-
external/mit/xkeyboard-config/dist/geometry/digital_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/geometry/sgi_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/install-sh | 45 +-
external/mit/xkeyboard-config/dist/keycodes/Makefile.in | 15 +-
external/mit/xkeyboard-config/dist/keycodes/digital_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/man/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/missing | 16 +-
external/mit/xkeyboard-config/dist/po/ca.po | 2337 ++++----
external/mit/xkeyboard-config/dist/po/cs.po | 2204 +++---
external/mit/xkeyboard-config/dist/po/da.po | 1844 +++---
external/mit/xkeyboard-config/dist/po/de.po | 2125 +++---
external/mit/xkeyboard-config/dist/po/eo.po | 2479 ++++----
external/mit/xkeyboard-config/dist/po/fi.po | 2306 ++++---
external/mit/xkeyboard-config/dist/po/fr.po | 4 +-
external/mit/xkeyboard-config/dist/po/hr.po | 2338 ++++----
external/mit/xkeyboard-config/dist/po/nl.po | 1973 +++---
external/mit/xkeyboard-config/dist/po/pl.po | 2337 ++++----
external/mit/xkeyboard-config/dist/po/ru.po | 2350 ++++----
external/mit/xkeyboard-config/dist/po/sv.po | 2348 ++++----
external/mit/xkeyboard-config/dist/po/tr.po | 2346 ++++----
external/mit/xkeyboard-config/dist/po/uk.po | 2855 ++++-----
external/mit/xkeyboard-config/dist/rules/Makefile.in | 15 +-
external/mit/xkeyboard-config/dist/rules/base.extras.xml.in | 23 +-
external/mit/xkeyboard-config/dist/rules/base.lists.base.part | 2 +-
external/mit/xkeyboard-config/dist/rules/base.xml.in | 87 +-
external/mit/xkeyboard-config/dist/rules/bin/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/rules/compat/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/rules/evdev.extras.xml.in | 23 +-
external/mit/xkeyboard-config/dist/rules/evdev.xml.in | 87 +-
external/mit/xkeyboard-config/dist/symbols/am | 4 +-
external/mit/xkeyboard-config/dist/symbols/br | 4 +-
external/mit/xkeyboard-config/dist/symbols/brai | 41 +-
external/mit/xkeyboard-config/dist/symbols/ch | 2 +-
external/mit/xkeyboard-config/dist/symbols/cz | 2 +-
external/mit/xkeyboard-config/dist/symbols/de | 6 +-
external/mit/xkeyboard-config/dist/symbols/digital_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/eu | 79 +-
external/mit/xkeyboard-config/dist/symbols/fi | 4 +-
external/mit/xkeyboard-config/dist/symbols/fr | 49 +-
external/mit/xkeyboard-config/dist/symbols/fujitsu_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/gb | 38 +
external/mit/xkeyboard-config/dist/symbols/hp_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/hu | 2 +-
external/mit/xkeyboard-config/dist/symbols/ie | 2 +-
external/mit/xkeyboard-config/dist/symbols/inet | 3 +-
external/mit/xkeyboard-config/dist/symbols/it | 2 +-
external/mit/xkeyboard-config/dist/symbols/jolla_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/latam | 124 +
external/mit/xkeyboard-config/dist/symbols/lv | 2 +-
external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/ch | 2 +-
external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/it | 2 +-
external/mit/xkeyboard-config/dist/symbols/nec_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/nl | 2 +-
external/mit/xkeyboard-config/dist/symbols/no | 2 +-
external/mit/xkeyboard-config/dist/symbols/nokia_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/nokia_vndr/rx-44 | 2 +-
external/mit/xkeyboard-config/dist/symbols/nokia_vndr/rx-51 | 2 +-
external/mit/xkeyboard-config/dist/symbols/nokia_vndr/su-8w | 6 +-
external/mit/xkeyboard-config/dist/symbols/pt | 44 +-
external/mit/xkeyboard-config/dist/symbols/ro | 6 +-
external/mit/xkeyboard-config/dist/symbols/ru | 35 +-
external/mit/xkeyboard-config/dist/symbols/se | 2 +-
external/mit/xkeyboard-config/dist/symbols/sgi_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/sony_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/sun_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/symbols/sun_vndr/nl | 2 +-
external/mit/xkeyboard-config/dist/symbols/sun_vndr/ro | 2 +-
external/mit/xkeyboard-config/dist/symbols/sun_vndr/sk | 2 +-
external/mit/xkeyboard-config/dist/symbols/tw | 2 +-
external/mit/xkeyboard-config/dist/symbols/us | 6 +-
external/mit/xkeyboard-config/dist/symbols/xfree68_vndr/Makefile.in | 13 +-
external/mit/xkeyboard-config/dist/types/Makefile.in | 13 +-
82 files changed, 15944 insertions(+), 15273 deletions(-)
diffs (truncated from 64790 to 300 lines):
diff -r 82d74fdf211e -r 416bf82c1d8e external/mit/xkeyboard-config/dist/Makefile.in
--- a/external/mit/xkeyboard-config/dist/Makefile.in Wed Mar 06 01:14:10 2019 +0000
+++ b/external/mit/xkeyboard-config/dist/Makefile.in Wed Mar 06 10:57:48 2019 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -168,7 +168,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -415,8 +415,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -557,7 +557,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -r 82d74fdf211e -r 416bf82c1d8e external/mit/xkeyboard-config/dist/NEWS
--- a/external/mit/xkeyboard-config/dist/NEWS Wed Mar 06 01:14:10 2019 +0000
+++ b/external/mit/xkeyboard-config/dist/NEWS Wed Mar 06 10:57:48 2019 +0000
@@ -1,3 +1,6 @@
+2.26 Bugzilla moved to gitlab as well
+ 19 commits
+ Translations updated
2.25 Moving to gitlab
16 commits
Translations updated
diff -r 82d74fdf211e -r 416bf82c1d8e external/mit/xkeyboard-config/dist/aclocal.m4
--- a/external/mit/xkeyboard-config/dist/aclocal.m4 Wed Mar 06 01:14:10 2019 +0000
+++ b/external/mit/xkeyboard-config/dist/aclocal.m4 Wed Mar 06 10:57:48 2019 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -556,7 +556,7 @@
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
-dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@@ -593,7 +593,7 @@
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.19.0])
+m4_define([vers_have], [1.19.2])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -670,6 +670,17 @@
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_PROG_SED])
+case $host_os in
+ solaris*)
+ # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
+ # check for a man page file found in later versions that use
+ # traditional section numbers instead
+ AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
+ [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
+ ;;
+ *) SYSV_MAN_SECTIONS=false ;;
+esac
+
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
fi
@@ -685,9 +696,9 @@
fi
if test x$FILE_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) FILE_MAN_SUFFIX=4 ;;
- *) FILE_MAN_SUFFIX=5 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
@@ -695,9 +706,9 @@
fi
if test x$MISC_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) MISC_MAN_SUFFIX=5 ;;
- *) MISC_MAN_SUFFIX=7 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
@@ -705,9 +716,9 @@
fi
if test x$DRIVER_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) DRIVER_MAN_SUFFIX=7 ;;
- *) DRIVER_MAN_SUFFIX=4 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
@@ -715,9 +726,9 @@
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) ADMIN_MAN_SUFFIX=1m ;;
- *) ADMIN_MAN_SUFFIX=8 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
esac
fi
if test x$ADMIN_MAN_DIR = x ; then
@@ -978,13 +989,24 @@
fi])
# Test for the ability of xmlto to generate a text target
+#
+# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
+# following test for empty XML docbook files.
+# For compatibility reasons use the following empty XML docbook file and if
+# it fails try it again with a non-empty XML file.
have_xmlto_text=no
cat > conftest.xml << "EOF"
EOF
AS_IF([test "$have_xmlto" = yes],
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
[have_xmlto_text=yes],
- [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+ [# Try it again with a non-empty XML file.
+ cat > conftest.xml << "EOF"
+<x></x>
+EOF
+ AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+ [have_xmlto_text=yes],
+ [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
rm -f conftest.xml
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
@@ -2380,8 +2402,9 @@
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
-|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
-echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
+touch \$(top_srcdir)/INSTALL; \
+echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
AC_SUBST([INSTALL_CMD])
]) # XORG_INSTALL
dnl Copyright 2005 Red Hat, Inc
@@ -2442,14 +2465,15 @@
#
#
AC_DEFUN([XORG_CHANGELOG], [
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
+touch \$(top_srcdir)/ChangeLog; \
+echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
AC_SUBST([CHANGELOG_CMD])
]) # XORG_CHANGELOG
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -2461,10 +2485,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -2480,14 +2504,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -2539,7 +2563,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -2570,7 +2594,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -2761,13 +2785,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file 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.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -2775,49 +2798,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
Home |
Main Index |
Thread Index |
Old Index