summaryrefslogtreecommitdiff
path: root/external/mit
diff options
context:
space:
mode:
authornros <nros@NetBSD.org>2023-02-10 13:22:58 +0000
committernros <nros@NetBSD.org>2023-02-10 13:22:58 +0000
commit5d19db2b3386aeba02537274d4014296eb71aeb5 (patch)
tree2ab2193f6d97c69cc4d0dab29d51a236a8b00d80 /external/mit
parent11c91bc5ec6f85087772ed449c9fcdae93841e36 (diff)
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 (limited to 'external/mit')
-rw-r--r--external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man22
-rw-r--r--external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in7
2 files changed, 15 insertions, 14 deletions
diff --git a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
index f0618c4a1ab..d8819ff709b 100644
--- a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
+++ b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
@@ -13,7 +13,7 @@ settings in the xorg.conf(5).
.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 @@ See the libxkbcommon documentation for details.
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 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspace
.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 --git a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
index 220305a2bdf..4c9189e1017 100644
--- a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
+++ b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
@@ -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