Index: x11/libxkbcommon/Makefile
===================================================================
--- x11/libxkbcommon/Makefile
+++ x11/libxkbcommon/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libxkbcommon
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.1
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 DIST_SUBDIR=	xorg/lib
@@ -12,24 +12,28 @@
 
 RUN_DEPENDS=	xkeyboard-config>0:x11/xkeyboard-config
 
-USES=		bison gnome meson pkgconfig tar:xz
+USES=		bison compiler:c11 gnome meson pkgconfig tar:xz
 USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
 MESON_ARGS=	-Denable-docs=false \
-		-Denable-wayland=false \
-		-Dx-locale-root="${PREFIX}/lib/X11/locale"
+		-Dx-locale-root="${PREFIX}/lib/X11/locale" \
+		${MESON_ARGS_${OPSYS}_${OSREL:R}}
+MESON_ARGS_FreeBSD_11=	-Ddefault-rules=xorg
 
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
+OPTIONS_DEFINE=	EVDEV WAYLAND X11
+OPTIONS_DEFAULT=EVDEV WAYLAND X11
 OPTIONS_SUB=	yes
 
+EVDEV_DESC=		Interactive debugger for XKB keymaps for evdev
+EVDEV_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
+EVDEV_USES=		localbase
+
+WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_MESON_TRUE=	enable-wayland
+
 X11_USES=	xorg
 X11_USE=	XORG=xcb
 X11_MESON_TRUE=	enable-x11
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1200000
-MESON_ARGS+=	-Ddefault-rules=xorg
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11/libxkbcommon/distinfo
===================================================================
--- x11/libxkbcommon/distinfo
+++ x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614458944
-SHA256 (xorg/lib/libxkbcommon-1.1.0.tar.xz) = 412cfcca596f92914ea1a66ad244804d73a5ff20b6d86459951e7ad20576c246
-SIZE (xorg/lib/libxkbcommon-1.1.0.tar.xz) = 439488
+TIMESTAMP = 1617812871
+SHA256 (xorg/lib/libxkbcommon-1.2.1.tar.xz) = e833a7d3024c9bb9d5eb2b20f6d5de08865541f21bb7ba227c83cbd236691fb3
+SIZE (xorg/lib/libxkbcommon-1.2.1.tar.xz) = 453172
Index: x11/libxkbcommon/pkg-plist
===================================================================
--- x11/libxkbcommon/pkg-plist
+++ x11/libxkbcommon/pkg-plist
@@ -20,10 +20,14 @@
 libdata/pkgconfig/xkbregistry.pc
 libexec/xkbcommon/xkbcli-compile-keymap
 libexec/xkbcommon/xkbcli-how-to-type
+%%EVDEV%%libexec/xkbcommon/xkbcli-interactive-evdev
+%%WAYLAND%%libexec/xkbcommon/xkbcli-interactive-wayland
 %%X11%%libexec/xkbcommon/xkbcli-interactive-x11
 libexec/xkbcommon/xkbcli-list
 man/man1/xkbcli-compile-keymap.1.gz
 man/man1/xkbcli-how-to-type.1.gz
+%%EVDEV%%man/man1/xkbcli-interactive-evdev.1.gz
+%%WAYLAND%%man/man1/xkbcli-interactive-wayland.1.gz
 %%X11%%man/man1/xkbcli-interactive-x11.1.gz
 man/man1/xkbcli-list.1.gz
 man/man1/xkbcli.1.gz