Date: Mon, 3 Oct 2022 08:01:55 +0200 From: Emanuel Haupt <ehaupt@FreeBSD.org> To: Po-Chuan Hsieh <sunpoet@freebsd.org> Cc: Emanuel Haupt <ehaupt@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Adam Weinberger <adamw@freebsd.org> Subject: Re: git: 17f1bb50e42a - main - shells/bash: Fix pkg-plist when NLS is turned off Message-ID: <20221003080155.b12f4418d3a7bad7a42585b7@FreeBSD.org> In-Reply-To: <CAMHz58Qe%2BY--aPCjdkM93W7NuJSc84AKzESqxvi3rr=07%2BLKkg@mail.gmail.com> References: <202210010705.29175Dvs065759@gitrepo.freebsd.org> <CAMHz58Qe%2BY--aPCjdkM93W7NuJSc84AKzESqxvi3rr=07%2BLKkg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Po-Chuan Hsieh <sunpoet@freebsd.org> wrote: > On Sat, Oct 1, 2022 at 3:05 PM Emanuel Haupt <ehaupt@freebsd.org> > wrote: > > > The branch main has been updated by ehaupt: > > > > URL: > > https://cgit.FreeBSD.org/ports/commit/?id=17f1bb50e42a45dc64fc898cd9cae905d7262bda > > > > commit 17f1bb50e42a45dc64fc898cd9cae905d7262bda > > Author: Emanuel Haupt <ehaupt@FreeBSD.org> > > AuthorDate: 2022-10-01 07:05:08 +0000 > > Commit: Emanuel Haupt <ehaupt@FreeBSD.org> > > CommitDate: 2022-10-01 07:05:08 +0000 > > > > shells/bash: Fix pkg-plist when NLS is turned off > > > > Hello, > > I thought the NLS issue was already fixed in > cc83ec0f744fb159bd48303d15c09aa0c6cb38a4 by Adam. Could you please > check again? > > Furthermore, the PLIST change is incorrect. The NLS option does not > affect the existence of header files in ${PREFIX}/include/bash/ and > binaries in ${PREFIX}/lib/bash/. I've prepared a patch [1] to revert > the PLIST change and also fix the PLIST order (incorrectly changed > in 34393efcc244fe0d4e76a8e12ae343decdf0b083). Please take a look. > Thanks. You are correct. Adam's more elegant fix (cc83ec0f744fb159bd48303d15c09aa0c6cb38a4) clashed with mine (17f1bb50e42a45dc64fc898cd9cae905d7262bda). > [1] https://people.FreeBSD.org/~sunpoet/patch/shells-bash.txt I'll commit your patch shortly (including cherry-pick to quarterly). Thank you!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20221003080155.b12f4418d3a7bad7a42585b7>