git: 5a4eeed2e2cd - main - x11/xkeyboard-config: Fix pkg-plist after e6f66fef0255

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Sat, 11 Nov 2023 05:11:59 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5a4eeed2e2cd1458f8a1b14c0801f1c7e1885329

commit 5a4eeed2e2cd1458f8a1b14c0801f1c7e1885329
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-11-11 05:04:53 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-11-11 05:11:52 +0000

    x11/xkeyboard-config: Fix pkg-plist after e6f66fef0255
    
    The missing pkgconfig file broke several ports.
---
 x11/xkeyboard-config/Makefile                |  2 +-
 x11/xkeyboard-config/files/patch-meson.build | 11 +++++++++++
 x11/xkeyboard-config/pkg-plist               |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 372591dace4d..1dc29f497f17 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xkeyboard-config
 DISTVERSION=	2.40
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/data/${PORTNAME}
 
diff --git a/x11/xkeyboard-config/files/patch-meson.build b/x11/xkeyboard-config/files/patch-meson.build
new file mode 100644
index 000000000000..3c935091868d
--- /dev/null
+++ b/x11/xkeyboard-config/files/patch-meson.build
@@ -0,0 +1,11 @@
+--- meson.build.orig	2023-11-11 04:37:00 UTC
++++ meson.build
+@@ -7,7 +7,7 @@ dir_man7        = join_paths(get_option('prefix'), get
+ dir_xkb_base    = join_paths(dir_data, 'X11', 'xkb')
+ dir_xkb_rules   = join_paths(dir_xkb_base, 'rules')
+ dir_man7        = join_paths(get_option('prefix'), get_option('mandir'), 'man7')
+-dir_pkgconfig   = join_paths(dir_data, 'pkgconfig')
++dir_pkgconfig   = join_paths(get_option('prefix'), 'libdata', 'pkgconfig')
+ 
+ i18n = import('i18n')
+ 
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index 316139e5904d..55f62488e3b6 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/xkeyboard-config.pc
 man/man7/xkeyboard-config.7.gz
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
@@ -205,6 +206,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
@@ -293,6 +295,7 @@ share/X11/xkb/types/nokia
 share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
 %%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xkeyboard-config.mo
@@ -308,6 +311,7 @@ share/X11/xkb/types/pc
 %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/fur/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo