git: 3561b8967a35 - main - x11/xkeyboard-config: Update to 2.32

[Gleb Popov]

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3561b8967a35cdeadd8fb46e1824b90c1891a451

commit 3561b8967a35cdeadd8fb46e1824b90c1891a451
Author:     Evgeniy Khramtsov <evgeniy at khramtsov.org>
AuthorDate: 2021-05-30 10:45:37 +0000
Commit:     Gleb Popov <arrowd at FreeBSD.org>
CommitDate: 2021-05-30 16:18:25 +0000

    x11/xkeyboard-config: Update to 2.32
    
    Make X11 optional.
    
    PR:             254584
    Tested by:      arrowd
    Approved by:    x11 (maintainer-timeout)
---
 x11/xkeyboard-config/Makefile | 10 ++++++----
 x11/xkeyboard-config/distinfo |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index e5d0f9cfb432..6b9774a40331 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.31
+PORTVERSION=	2.32
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/data/${PORTNAME}
 
@@ -9,8 +9,6 @@ COMMENT=	X Keyboard Configuration Database
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xkbcomp:x11/xkbcomp
-
 USES=		gmake gnome localbase pathfix perl5 python:3.5+,build \
 		shebangfix xorg-cat:data
 
@@ -23,13 +21,17 @@ SHEBANG_FILES=	rules/merge.py \
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 
-OPTIONS_DEFINE=	ETERSOFT NLS
+OPTIONS_DEFINE=	ETERSOFT NLS X11
+OPTIONS_DEFAULT=X11
 ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-tools iconv
 ETERSOFT_EXTRA_PATCHES=	${FILESDIR}/etersoft-patch-symbols-typo
+X11_BUILD_DEPENDS=	xkbcomp:x11/xkbcomp
+X11_CONFIGURE_OFF=	--disable-runtime-deps
+X11_DESC=		XKB keyboard description compiler support
 
 .include <bsd.port.options.mk>
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 681000943795..d3ca9d7cfb35 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602286104
-SHA256 (xorg/data/xkeyboard-config-2.31.tar.bz2) = da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3
-SIZE (xorg/data/xkeyboard-config-2.31.tar.bz2) = 1705328
+TIMESTAMP = 1616779267
+SHA256 (xorg/data/xkeyboard-config-2.32.tar.bz2) = 1feee317ba39b91902b0cbd2987c0c73e6afbfc8f4c096367a5c86c216c036a8
+SIZE (xorg/data/xkeyboard-config-2.32.tar.bz2) = 1742570