From nobody Sat Nov 11 05:11:59 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SS3hb2sTcz513J8; Sat, 11 Nov 2023 05:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SS3hb2J2mz3PGR; Sat, 11 Nov 2023 05:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699679519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evlUQTs5cjw0cu94YHR1wow16tH/y+ochksLGgeTVIo=; b=FkpueTLRZR3HaCWqwkpx432B3bLQouDIFA2s1y2pvKi5/Kv+/xYf3bSU7EvRHcNwHbYIlF e5UHLU7NRQb0DIph84gAb3mxBVY5KPMSBH3vIwsQGuFK9WNpx7RcDZKAQKgH6PxujHBZRr HXhSm9TfOiihE5pJTbosJ8UFCNE9GJWxLaVbl986oppRyYhor30Qu5QAl/+XWAf974g3TH kDYUzKpzaUlGwt7CJ4fUMGFhkmG8xlZ/X2gBbTMDNKt2DOWIZQUYAzvYzQckMKdX6wsVQ3 nfWxQpG787mggA5QhT9vQKRP+S2s58aHoNLbLqg2b4p4vvFKmDWrhvqYilXaiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699679519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evlUQTs5cjw0cu94YHR1wow16tH/y+ochksLGgeTVIo=; b=EY4n1YRe5WIua8Qf7UHg39dixKt+jnsgWXde30bG6/gU1jeteILQdArqRryywPZjGsLdah JlpMCu9xoPcW+eWYstPvkvSa0yCO9BJgZ+gA7fMv/zoAl4NUiCq2aGGgqTQxc4Hi7WpPcg UT6KdUKiVi7XVWOOlulregiKTwu7LpgYexf+rOlUllwLdlU+X5HTuuGUC1UROcFwl69JKk 5KSP7xu5gpy+vOeRvWYHCpZvuzQJiXNufvJV4xFzcZw+36o4Dn0zLqlgk+u3RbA6qbyvYu xxN8CF7CESyWzcu2tGs79+lE0Rir6+zGRzAjqwyYUUOudyz0zMsh9kbfC2CwLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699679519; a=rsa-sha256; cv=none; b=r2leDTmQ91KLRvguanqOa1+XEkS+vJzcCIqi1GfxY5byMBPvtiVKLRnBqI/zo4n+fNd3ca +bPPgBf8wIITGduEXCRyjgYj8vg90cnGqgozW3BJ8va2SW0q0YlMFg0QCqld7umeUAgBwI YsXmwcQo4VoS3Rx3J1ggYJJUIaIB7PxRrgbwdI/VLApMJjur4X0W9fDFKyKE7vNI8cw1Nr So9hIxv/3DwHspIelnRnxMCDdMw9cdP9CBma3QYXgihctfesFrrfdpo+SEDULT17fzbG+U eYNL9RY6gKOKMn0rbSQZCuRBRjmtBUe1soBhaJDCNZ8ScYlSsTbT7JNsJsn3pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SS3hb12bMzCk3; Sat, 11 Nov 2023 05:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB5BxRg034893; Sat, 11 Nov 2023 05:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB5Bx9c034890; Sat, 11 Nov 2023 05:11:59 GMT (envelope-from git) Date: Sat, 11 Nov 2023 05:11:59 GMT Message-Id: <202311110511.3AB5Bx9c034890@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 5a4eeed2e2cd - main - x11/xkeyboard-config: Fix pkg-plist after e6f66fef0255 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a4eeed2e2cd1458f8a1b14c0801f1c7e1885329 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a4eeed2e2cd1458f8a1b14c0801f1c7e1885329 commit 5a4eeed2e2cd1458f8a1b14c0801f1c7e1885329 Author: Jason E. Hale AuthorDate: 2023-11-11 05:04:53 +0000 Commit: Jason E. Hale 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