Date: Sat, 11 Nov 2023 12:57:10 -0500 From: "Jason E. Hale" <jhale@freebsd.org> To: Jan Beich <jbeich@freebsd.org> Cc: "Jason E. Hale" <jhale@freebsd.org>, 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 Message-ID: <CAJE75NG%2B79xapacsQTs6n9hRitHkZFW-ZQ5DU6zjYsM%2BW6rNBQ@mail.gmail.com> In-Reply-To: <r0kw-loen-wny@FreeBSD.org> References: <202311110511.3AB5Bx9c034890@gitrepo.freebsd.org> <r0kw-loen-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Nov 11, 2023 at 2:50=E2=80=AFAM Jan Beich <jbeich@freebsd.org> wrot=
e:
>
> "Jason E. Hale" <jhale@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJE75NG%2B79xapacsQTs6n9hRitHkZFW-ZQ5DU6zjYsM%2BW6rNBQ>