[src/netbsd-10]: src/external/mit/xorg/lib/xkeyboard-config Pull up following...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/80e0c9f2bb46
branches:  netbsd-10
changeset: 373895:80e0c9f2bb46
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Mar 14 17:14:06 2023 +0000

description:
Pull up following revision(s) (requested by nros in ticket #120):

        external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in: revision 1.2
        external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man: revision 1.12

Fix xkb_base in the pkg-config file and mapage for xkeyboard-config

The xkbdata files are installed in /usr/X11R7/lib/X11/xkb
not /usr/X11R7/share/X11/xkb. The wrong directory causes
build failures in pkgsrc packages that use the xkb_base
variable.

Also base the datadir on the vars from bsd.x11.mk.

Also use @xkb_base@ instead of /usr/X11R7/share/lib/X11/xkb
in the manpage to show the right xkbdata directory.

diffstat:

 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man   |  22 +++++-----
 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in |   7 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diffs (68 lines):

diff -r 7be71209c0e9 -r 80e0c9f2bb46 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
--- a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man       Tue Mar 14 17:09:21 2023 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man       Tue Mar 14 17:14:06 2023 +0000
@@ -13,7 +13,7 @@
 .SH XKB DATA FILES LOAD PATHS
 
 xkeyboard-config provides the XKB data files installed in
-/usr/X11R7/share/X11/xkb. User-specific data files may be elsewhere but it depends on
+@xkb_base@. User-specific data files may be elsewhere but it depends on
 the tool whether those files are loaded. For example, the libxkbcommon
 library will by default load XKB data files from the user's home directory.
 See the libxkbcommon documentation for details.
@@ -22,7 +22,7 @@
 
 The "custom" layout is a layout that is listed as available to tools
 reading the data files but is not actually provided by xkeyboard-config.
-A user may save a layout specification in the /usr/X11R7/share/X11/xkb/symbols/custom file
+A user may save a layout specification in the @xkb_base@/symbols/custom file
 and that layout will be available to most tools interacting with the
 xkeyboard-config data files. This is primarily aimed at systems running X
 where additional lookup paths cannot easily be added.
@@ -1475,23 +1475,23 @@
 
 
 .SH FILES
-/usr/X11R7/share/X11/xkb/compat
+@xkb_base@/compat
 
-/usr/X11R7/share/X11/xkb/compiled
+@xkb_base@/compiled
 
-/usr/X11R7/share/X11/xkb/geometry
+@xkb_base@/geometry
 
-/usr/X11R7/share/X11/xkb/keycodes
+@xkb_base@/keycodes
 
-/usr/X11R7/share/X11/xkb/keymap
+@xkb_base@/keymap
 
-/usr/X11R7/share/X11/xkb/rules
+@xkb_base@/rules
 
-/usr/X11R7/share/X11/xkb/semantics
+@xkb_base@/semantics
 
-/usr/X11R7/share/X11/xkb/symbols
+@xkb_base@/symbols
 
-/usr/X11R7/share/X11/xkb/types
+@xkb_base@/types
 
 .SH SEE ALSO
 setxkbmap(1)
diff -r 7be71209c0e9 -r 80e0c9f2bb46 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
--- a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in     Tue Mar 14 17:09:21 2023 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in     Tue Mar 14 17:14:06 2023 +0000
@@ -1,6 +1,7 @@
-
-datadir=/usr/X11R7/share
-xkb_base=/usr/X11R7/share/X11/xkb
+prefix=@prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+xkb_base=@xkb_base@
 
 Name: XKeyboardConfig
 Description: X Keyboard configuration data