From nobody Sat Nov 11 17:57:10 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 4SSNgn228Bz50Zvb; Sat, 11 Nov 2023 17:57:25 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSNgm4njnz4Ys3; Sat, 11 Nov 2023 17:57:24 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50970c2115eso4154603e87.1; Sat, 11 Nov 2023 09:57:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699725442; x=1700330242; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a4gzcXGpPNzTLG9hgS2jK1hzol+f9IjXxRt0WJT7WCs=; b=JZritp9I5/Tdy5fsVFoVDqcAcy5udYwYvdv/H0bQZsoH2yuUND2Llen3WMWyRndGXA pX/y/UmtDkoI3gT6oVT2Sc0ZLAPQ+Se8BX8bDx+qStg2rC8OzRgFXq69Sb86AKzWfDAY BT/tgamcyGLqnk8SLOi2QvfdnzwKiCgdqlEQjdJXTmOydqVe8O0b/7lwU0uoPG7YCBdX WMMvGy0zlOUkMLAlmuTMrjeQaOrF2Y7YrwcP3h2zYpl4LYGGPfaJIZeURw77jfikldjC jUAtTc5fFlqx8pThlpZ/sSokR3PKXuEUCM72wjDUxQiSfMQiZugkUVQ9SymMFC9LX02Q Xgaw== X-Gm-Message-State: AOJu0Yws1yhr4w/U6HzfkB5IbQZlPCorcC1cbmeaOgqxEWAebeaw/jtt j4ScdnneOol4uWhlMuSHGE/HEyMDnqZWc5fOCkP9ZjKGuVA= X-Google-Smtp-Source: AGHT+IGqp4pZ9trp4TStGDsWv1ROza+oTCIzfiXHVlHBcM+P9ENy0oXJW373YNvUoSjNVjl8bzhsLKj2Yxa7qpnFUw8= X-Received: by 2002:a19:9107:0:b0:507:a58f:79ad with SMTP id t7-20020a199107000000b00507a58f79admr1403100lfd.61.1699725441556; Sat, 11 Nov 2023 09:57:21 -0800 (PST) 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 References: <202311110511.3AB5Bx9c034890@gitrepo.freebsd.org> In-Reply-To: From: "Jason E. Hale" Date: Sat, 11 Nov 2023 12:57:10 -0500 Message-ID: Subject: Re: git: 5a4eeed2e2cd - main - x11/xkeyboard-config: Fix pkg-plist after e6f66fef0255 To: Jan Beich Cc: "Jason E. Hale" , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4SSNgm4njnz4Ys3 On Sat, Nov 11, 2023 at 2:50=E2=80=AFAM Jan Beich wrot= e: > > "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 =3D join_paths(get_option('prefix'), g= et > > + dir_xkb_base =3D join_paths(dir_data, 'X11', 'xkb') > > + dir_xkb_rules =3D join_paths(dir_xkb_base, 'rules') > > + dir_man7 =3D join_paths(get_option('prefix'), get_option('mand= ir'), 'man7') > > +-dir_pkgconfig =3D join_paths(dir_data, 'pkgconfig') > > ++dir_pkgconfig =3D join_paths(get_option('prefix'), 'libdata', 'pkgc= onfig') > > Why not fix bogus *_DEPENDS in consumers? share/pkgconfig is common in po= rts/. > See https://cgit.freebsd.org/ports/commit/?id=3Dd48fab59daa5 and the foll= owing: > > $ rg -lg pkg-plist share/pkgconfig | sed s,/pkg-plist,, I was unaware that share/pkgconfig was a thing on FreeBSD until now, so thank you for that information. Just 22 ports install files there, though, which is less than 1% of all ports that install pkgconfig files, so it's really not that common. Since the pkgconfig file was missing entirely from pkg-plist after the update and share/pkgconfig looked funky to me when I initially remade pkg-plist, I just went with the location it was installed to in the previous version. The build system changed from autotools to meson, so I chalked it up to that and didn't really look deeper into it, as I was primarily focused on fixing the fallout in the 10 minutes I had before going to work because building Plasma was pretty much b0rked. So basically, I snatched someone else's pointy hat right off their head and flattened it out a bit into my own Energy Dome. Although nothing is broken at this point, improvements can be made, sure. We probably shouldn't be depending on the pc file and just depend on the package. -Jason