/usr/X11R7/share/X11/xkb in xkeyboard-config

[Niclas Rosenvik <nros%netbsd.org@localhost>]

Hi, the xkeyboard-config lib in src/external/xorg/lib/xkeyboard-config
has the manual page and pkg-config file point to
/usr/X11R7/share/X11/xkb
when the files are located in /usr/X11R7/lib/X11/xkb .
The pkg-config file causes build breaks in pkgsrc packages
such as inputmethod/fcitx5 and emulators/qemu.
It also breaks libxkbcommon since it is where it takes
the directory to look for keyboard data from.
I plan on commiting the changes below if no one objects to it.

Index: xkeyboard-config.pc.in
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in,v
retrieving revision 1.1
diff -u -r1.1 xkeyboard-config.pc.in
--- xkeyboard-config.pc.in	18 Oct 2022 07:36:38 -0000	1.1
+++ xkeyboard-config.pc.in	4 Feb 2023 17:25:07 -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


Index: xkeyboard-config.man
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man,v
retrieving revision 1.11
diff -u -r1.11 xkeyboard-config.man
--- xkeyboard-config.man	17 Oct 2022 07:40:23 -0000	1.11
+++ xkeyboard-config.man	4 Feb 2023 17:25:22 -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)


@xkb_base@ expands to /usr/X11R7/lib/X11/xkb in the NetBSD
build system, I have tested the changes and they produce
a man page that references the right directories and inputmethod/fcitx5
builds correctly with it.

Regards,
Niclas