From nobody Sat Nov 11 07:50:08 2023 X-Original-To: dev-commits-ports-main@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 4SS7C90fX0z50R4J; Sat, 11 Nov 2023 07:50:13 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SS7C908cqz4FQ5; Sat, 11 Nov 2023 07:50:13 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699689013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fRSOn7b9NHey5svA/WkjM9/8/tqVv+Ef0HStxeCZlKk=; b=GGwRoBiKnh2GXwVc2pm1/heN0xWfraj+Ov2tn5gBnvF/n08thMjooLS5hZ8SOiyrsSKi/5 In+Gn6OCzT99R8aAgB5A/985DODnWlFC9bjbE5gfD53ml6eqo4Hs9u+ZIAvCKrfK4WZLPj ccYZm0jgHFMbU6MBqGnBNSlLZ+u03ZRc+orIyd+xZ42VjTArgvSyjc/zgegquWkjee8TeJ vaV2i/NI1gEQNEcsqVWOF1oP3fw+8WtJgS1UTLu9KpGl3jPOXpaep/Wl1QtxmmO3VJ1Av5 WwZzsQbyAbMuKy/xQG4rToLoKBi/iUh0dWA4bqPUL5FiDtMW3f7oiZC6lpowVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699689013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fRSOn7b9NHey5svA/WkjM9/8/tqVv+Ef0HStxeCZlKk=; b=yxLDSvCsRB7hZ0XySAcRNoMnfbPWKpgJUt31rFsDbp9498PsuRcSvD7nEDYpcXKULQCewJ aTZgRpuQXAfNwUrtj5nk0SW3Pm42kmDSDqRMPzT0f7rGDLHSAB2MpCHWSTf41Sgr+bzlAR 7Y65AoIy7BZr3Sx2ouE41SCgtn5dEp3lgmnlmCiOEiWVYtJjM+7iUpsf8LxeWOeicApj/J 0bRva1NGXFEH9rKdF73bADV3oOlqVJ4gI6dqlNPYtnZkE3H4N8rOZ/teJ1NLZMbsMn3mvC o+nw9msceknVeCoA7PtbLoHfmnJlHPaYygmnmkhUF+dBdh5BBZVoKt/GV0swwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699689013; a=rsa-sha256; cv=none; b=IwrVeB84mV9vQFjIHgZPIODqvSmewPwG/2V1z0UxffdLos95PIPP6X63fHFWGJ7S/ugTW0 G6TZv+by6MQwVCCHUjE4B78E294+z9b7cJto+f9EOfBMOmM0dmUW7oNPC5j0kTrFaKD/W+ XfGEDfg7iZTDyJBBIzRr1osyf/X42+EAoxnsJpabep4PFAdmQLf6Gjy/DEM+K93BrNsoIM XJuhW3ZMgg7qbevYuE50CUPZgRH1ZH4wmud1/b48OEe1iU9zZQr+XxdKSIiPXzTx97N1Z3 arDSmNpsTH5Y6ZbuhqJl9hBIsLp29Vw1GC6Y4eoyYfXX84AlWlEktYg3eGQMlQ== Received: by freefall.freebsd.org (Postfix, from userid 1354) id DC9F03F7E; Sat, 11 Nov 2023 07:50:12 +0000 (UTC) From: Jan Beich To: "Jason E. Hale" Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 5a4eeed2e2cd - main - x11/xkeyboard-config: Fix pkg-plist after e6f66fef0255 In-Reply-To: <202311110511.3AB5Bx9c034890@gitrepo.freebsd.org> (Jason E. Hale's message of "Sat, 11 Nov 2023 05:11:59 GMT") References: <202311110511.3AB5Bx9c034890@gitrepo.freebsd.org> Date: Sat, 11 Nov 2023 08:50:08 +0100 Message-ID: List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain "Jason E. Hale" writes: > --- /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') Why not fix bogus *_DEPENDS in consumers? share/pkgconfig is common in ports/. See https://cgit.freebsd.org/ports/commit/?id=d48fab59daa5 and the following: $ rg -lg pkg-plist share/pkgconfig | sed s,/pkg-plist,, x11-wm/hyprland audio/xuidesigner net-mgmt/resource-agents devel/ctre devel/blueprint-compiler devel/pybind11 devel/quantum devel/librolegen devel/cli11 devel/sol2 devel/nlohmann-json net-mgmt/fence-agents devel/cli devel/xtl-quant-stack databases/mariadb105-server math/blis math/xtensor math/trlib math/cppad deskutils/libcprime deskutils/xdg-desktop-portal graphics/kseexpr