CVS commit: pkgsrc/x11/xkeyboard-config

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Oct 19 13:06:07 UTC 2023

Modified Files:
        pkgsrc/x11/xkeyboard-config: Makefile PLIST distinfo
        pkgsrc/x11/xkeyboard-config/patches: patch-meson.build

Log Message:
xkeyboard-config: update to 2.40.

2.40    123 commits
        Translations updated


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/xkeyboard-config/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xkeyboard-config/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xkeyboard-config/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/xkeyboard-config/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xkeyboard-config/Makefile
diff -u pkgsrc/x11/xkeyboard-config/Makefile:1.56 pkgsrc/x11/xkeyboard-config/Makefile:1.57
--- pkgsrc/x11/xkeyboard-config/Makefile:1.56   Mon Aug 14 05:25:36 2023
+++ pkgsrc/x11/xkeyboard-config/Makefile        Thu Oct 19 13:06:07 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2023/08/14 05:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2023/10/19 13:06:07 wiz Exp $
 
-DISTNAME=              xkeyboard-config-2.39
-PKGREVISION=           1
+DISTNAME=              xkeyboard-config-2.40
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=data/${PKGBASE}/}
 EXTRACT_SUFX=          .tar.xz
@@ -11,6 +10,8 @@ HOMEPAGE=             https://www.freedesktop.org/w
 COMMENT=               X Keyboard Configuration Database
 
 TOOL_DEPENDS+=         xkbcomp-[0-9]*:../../x11/xkbcomp
+# generated man page is rather useless
+#TOOL_DEPENDS+=                libxslt-[0-9]*:../../textproc/libxslt
 
 CONFLICTS+=            xkbdata-[0-9]*
 

Index: pkgsrc/x11/xkeyboard-config/PLIST
diff -u pkgsrc/x11/xkeyboard-config/PLIST:1.23 pkgsrc/x11/xkeyboard-config/PLIST:1.24
--- pkgsrc/x11/xkeyboard-config/PLIST:1.23      Wed Jun 28 09:49:11 2023
+++ pkgsrc/x11/xkeyboard-config/PLIST   Thu Oct 19 13:06:07 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2023/06/28 09:49:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2023/10/19 13:06:07 wiz Exp $
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic
@@ -186,7 +186,6 @@ share/X11/xkb/symbols/macintosh_vndr/no
 share/X11/xkb/symbols/macintosh_vndr/pt
 share/X11/xkb/symbols/macintosh_vndr/se
 share/X11/xkb/symbols/macintosh_vndr/us
-share/X11/xkb/symbols/mao
 share/X11/xkb/symbols/md
 share/X11/xkb/symbols/me
 share/X11/xkb/symbols/mk
@@ -205,6 +204,7 @@ share/X11/xkb/symbols/nokia_vndr/rx-44
 share/X11/xkb/symbols/nokia_vndr/rx-51
 share/X11/xkb/symbols/nokia_vndr/su-8w
 share/X11/xkb/symbols/np
+share/X11/xkb/symbols/nz
 share/X11/xkb/symbols/olpc
 share/X11/xkb/symbols/parens
 share/X11/xkb/symbols/pc

Index: pkgsrc/x11/xkeyboard-config/distinfo
diff -u pkgsrc/x11/xkeyboard-config/distinfo:1.41 pkgsrc/x11/xkeyboard-config/distinfo:1.42
--- pkgsrc/x11/xkeyboard-config/distinfo:1.41   Wed Jun 28 09:49:11 2023
+++ pkgsrc/x11/xkeyboard-config/distinfo        Thu Oct 19 13:06:07 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.41 2023/06/28 09:49:11 wiz Exp $
+$NetBSD: distinfo,v 1.42 2023/10/19 13:06:07 wiz Exp $
 
-BLAKE2s (xkeyboard-config-2.39.tar.xz) = 65ac243f6a9cf7e5ed32d208b2a1167a0b70cefc6821a47cfe1dd1b2a1287135
-SHA512 (xkeyboard-config-2.39.tar.xz) = 4690a0291c1f8c2c53b84984221a60a935c9b7cfc8ae20a8740403571f3704dedf06e5755b45775a15a5df21ebd2acac3ff785ff19f54d792ae359c4c6d60756
-Size (xkeyboard-config-2.39.tar.xz) = 896112 bytes
-SHA1 (patch-meson.build) = 0fc63dac9019f9e180be3f95dee70d3dfd80e486
+BLAKE2s (xkeyboard-config-2.40.tar.xz) = ccdd9d42d8d924dbe7706e39d7f830d8c0aa0ee9bdb694ee6fd8c4ccbdbd685b
+SHA512 (xkeyboard-config-2.40.tar.xz) = 00c965e747169194d9a8d1ed0dfd544988c70df6a69888c50a06b4e266ce7047a8696ce408b9a7ba91e7e6b9679ab6e5f014308dbbf0a9c6be0e948d7646f878
+Size (xkeyboard-config-2.40.tar.xz) = 893584 bytes
+SHA1 (patch-meson.build) = 9960506273a0206b4f9ee9a22b4f10dd9d27511e

Index: pkgsrc/x11/xkeyboard-config/patches/patch-meson.build
diff -u pkgsrc/x11/xkeyboard-config/patches/patch-meson.build:1.1 pkgsrc/x11/xkeyboard-config/patches/patch-meson.build:1.2
--- pkgsrc/x11/xkeyboard-config/patches/patch-meson.build:1.1   Mon Oct 17 14:54:00 2022
+++ pkgsrc/x11/xkeyboard-config/patches/patch-meson.build       Thu Oct 19 13:06:07 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-meson.build,v 1.1 2022/10/17 14:54:00 ryoon Exp $
+$NetBSD: patch-meson.build,v 1.2 2023/10/19 13:06:07 wiz Exp $
 
 * Do not find xsltproc from textproc/libxslt.
 
---- meson.build.orig   2022-10-04 16:32:15.000000000 +0000
+--- meson.build.orig   2023-10-05 19:26:07.000000000 +0000
 +++ meson.build
 @@ -36,6 +36,7 @@ endforeach
  subdir('rules')
@@ -12,10 +12,11 @@ $NetBSD: patch-meson.build,v 1.1 2022/10
  xsltproc = find_program('xsltproc', required: false)
  if xsltproc.found()
    man_substs = configuration_data()
-@@ -57,5 +58,6 @@ if xsltproc.found()
-                           install_dir: dir_man7)
- 
+@@ -59,6 +60,7 @@ if xsltproc.found()
+   verify_group_names = find_program('tests/verify-group-names.sh')
+   test('verify group names', verify_group_names)
  endif
 +endif
  
- subdir('po')
+ # pytest suite
+ pymod = import('python')