aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-03-23 20:55:08 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-03-23 20:55:08 +0000
commitd09304c07d3e4f646ed5c532a5c492ef72565038 (patch)
tree3199bbaa878d3b85f01b165ce00b9d3e8a522891
parent0de16635a23e6965960b395d807e838ba97d8733 (diff)
Notes
-rw-r--r--UPDATING8
-rw-r--r--x11/libxkbcommon/Makefile10
2 files changed, 12 insertions, 6 deletions
diff --git a/UPDATING b/UPDATING
index 19ff7d89c8fe..c8ac56cdeda8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -26,15 +26,15 @@ you update your ports collection, before attempting any port upgrades.
The libxkbcommon library (x11/libxkbcommon), used to handle keyboards
in some applications, most notably kde and wayland, have been switched
- to use evdev rules by default. Some keys, most notably arrow keys,
- may not work in applications using libxkbcommon if you are using
- xf86-input-keyboard rather than xf86-input-libinput.
+ to use evdev rules by default on FreeBSD 12 and later. Some keys, most
+ notably arrow keys, may not work in applications using libxkbcommon if
+ you are using xf86-input-keyboard rather than xf86-input-libinput.
If you have trouble with the keyboard keys, and if /var/log/Xorg.*.log
shows that the "kbd" or "keyboard" driver is being used, you need to
switch to legacy rules by setting the environment variable
XKB_DEFAULT_RULES to xorg.
This switch is made to match the default configuration on FreeBSD 12.1 and
- later, the default configuration on FreeBSD 11.3 still requres the legacy
+ later, the default configuration on FreeBSD 11.3 still uses the legacy
rules.
20200316:
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 886a6cd9541d..0b3bf88df2d1 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxkbcommon
PORTVERSION= 0.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= https://xkbcommon.org/download/
DIST_SUBDIR= xorg/lib
@@ -21,4 +21,10 @@ MESON_ARGS= -Denable-docs=false \
-Denable-wayland=false \
-Dx-locale-root="${PREFIX}/lib/X11/locale"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1200000
+MESON_ARGS+= -Ddefault-rules=xorg
+.endif
+
+.include <bsd.port.post.mk>