xkeyboard-config: update to 2.37.

2.37	96 commits
	Translations updated
2.36	120 commits (most: Benno Schulenberg)
	Translations updated
2.35	45 commits
	Dropping autotools, only meson now
	Translations updated

4 files changed, 17 insertions, 24 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index ae447e006b3..179fb24e907 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2022/07/08 15:08:02 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2022/10/17 07:45:28 wiz Exp $
 
-DISTNAME=		xkeyboard-config-2.34
-PKGREVISION=		1
+DISTNAME=		xkeyboard-config-2.37
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=data/${PKGBASE}/}
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -14,11 +13,7 @@ BUILD_DEPENDS+=		xkbcomp-[0-9]*:../../x11/xkbcomp
 
 CONFLICTS+=		xkbdata-[0-9]*
 
-MAKE_JOBS_SAFE=		no
-
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake msgfmt perl pkg-config
+USE_TOOLS+=		msgfmt perl pkg-config
 PKGCONFIG_OVERRIDE+=	xkeyboard-config.pc.in
 PYTHON_FOR_BUILD_ONLY=	yes
 
@@ -27,10 +22,8 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		XKBCOMPDIR
 
-CONFIGURE_ARGS+=	--with-xkb-rules-symlink=xfree86,xorg
-CONFIGURE_ARGS+=	--with-xkb-base=${XKBBASE:Q}
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
-CONFIGURE_ARGS+=	--without-xsltproc
+MESON_ARGS+=		-Dxorg-rules-symlinks=true
+
 ###
 REPLACE_SH=		rules/merge.sh
 ###
@@ -62,4 +55,5 @@ BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.4.3
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../lang/python/tool.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index cab73acdad3..57fd567a8ea 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2021/07/15 10:56:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/10/17 07:45:28 wiz Exp $
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic
@@ -79,9 +79,6 @@ share/X11/xkb/rules/evdev
 share/X11/xkb/rules/evdev.extras.xml
 share/X11/xkb/rules/evdev.lst
 share/X11/xkb/rules/evdev.xml
-share/X11/xkb/rules/xfree86
-share/X11/xkb/rules/xfree86.lst
-share/X11/xkb/rules/xfree86.xml
 share/X11/xkb/rules/xfree98
 share/X11/xkb/rules/xkb.dtd
 share/X11/xkb/rules/xorg
@@ -100,6 +97,7 @@ share/X11/xkb/symbols/ba
 share/X11/xkb/symbols/bd
 share/X11/xkb/symbols/be
 share/X11/xkb/symbols/bg
+share/X11/xkb/symbols/bqn
 share/X11/xkb/symbols/br
 share/X11/xkb/symbols/brai
 share/X11/xkb/symbols/bt
@@ -154,7 +152,6 @@ share/X11/xkb/symbols/is
 share/X11/xkb/symbols/it
 share/X11/xkb/symbols/jolla_vndr/sbj
 share/X11/xkb/symbols/jp
-share/X11/xkb/symbols/jv
 share/X11/xkb/symbols/ke
 share/X11/xkb/symbols/keypad
 share/X11/xkb/symbols/kg
@@ -295,6 +292,7 @@ share/X11/xkb/types/nokia
 share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
 share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ar/LC_MESSAGES/xkeyboard-config.mo
 share/locale/az/LC_MESSAGES/xkeyboard-config.mo
 share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
 share/locale/ca/LC_MESSAGES/xkeyboard-config.mo
@@ -310,6 +308,7 @@ share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
 share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
 share/locale/fur/LC_MESSAGES/xkeyboard-config.mo
 share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/he/LC_MESSAGES/xkeyboard-config.mo
 share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
 share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 share/locale/id/LC_MESSAGES/xkeyboard-config.mo
diff --git a/x11/xkeyboard-config/buildlink3.mk b/x11/xkeyboard-config/buildlink3.mk
index 4afe41857bb..2457ed6186e 100644
--- a/x11/xkeyboard-config/buildlink3.mk
+++ b/x11/xkeyboard-config/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/06/28 11:38:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/10/17 07:45:28 wiz Exp $
 
 BUILDLINK_TREE+=				xkeyboard-config
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=				xkeyboard-config
 XKEYBOARD_CONFIG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xkeyboard-config+=	xkeyboard-config>=1.9
-BUILDLINK_ABI_DEPENDS.xkeyboard-config?=		xkeyboard-config>=2.34nb1
+BUILDLINK_ABI_DEPENDS.xkeyboard-config?=	xkeyboard-config>=2.34nb1
 BUILDLINK_PKGSRCDIR.xkeyboard-config?=		../../x11/xkeyboard-config
 BUILDLINK_DEPMETHOD.xkeyboard-config?=		build
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 913c11e59d3..7ed139dfea4 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2021/11/01 11:56:32 wiz Exp $
+$NetBSD: distinfo,v 1.37 2022/10/17 07:45:28 wiz Exp $
 
-BLAKE2s (xkeyboard-config-2.34.tar.bz2) = ef84877e0538b5c4028db00866f5072bec439a41a536d16f9da803ed98377ae1
-SHA512 (xkeyboard-config-2.34.tar.bz2) = cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
-Size (xkeyboard-config-2.34.tar.bz2) = 1763558 bytes
+BLAKE2s (xkeyboard-config-2.37.tar.xz) = 12cbf5400781e56f81b80c09ecedae9eb5c08c6c4dd20215ddcbe64c148e884e
+SHA512 (xkeyboard-config-2.37.tar.xz) = 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
+Size (xkeyboard-config-2.37.tar.xz) = 879744 bytes