Date: Sun, 28 Apr 2024 14:49:59 +0200 From: Emanuel Haupt <ehaupt@FreeBSD.org> To: Nuno Teixeira <eduardo@freebsd.org> Cc: Emanuel Haupt <ehaupt@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX Message-ID: <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> In-Reply-To: <CAFDf7UJ1xcJLL5t%2BK6VGtN7T4vA9a4TtoRR9pr2N34EcRUO85g@mail.gmail.com> References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <CAFDf7UJ1xcJLL5t%2BK6VGtN7T4vA9a4TtoRR9pr2N34EcRUO85g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Nuno Teixeira <eduardo@freebsd.org> wrote: > Hello Emanuel, > > I did the same for my ports and I'm doing it when it applies to ports > from PRs updates. > Today I found a problem when I tried to cherry-pick a port without > GNU_CONFIGURE_MANPREFIX fix as it appears that 2024Q2 doesn't have > 9fd7ee1cdf6c applied. > > I've checked Mk/bsd.port.mk and it remains pointed to man and not > share/man. > > Am I missing something? I was thinking that 2024Q2 was delayd because > of this... > > Here is a case where I did remove manprefix fix and tried to > cherry-pick to quarterly. > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278589 > > Cheers, That's the problem with sweeping commits: eventually, you make it impossible to use cherry-pick because that would end up including the entire commit, along with all other Makefiles it touched. In the past, I've simply committed the change manually in the quarterly branch (git commit, git push). Since 2024Q2 was branched before the GNU_CONFIGURE_MANPREFIX change, you'll need to keep the band-aid in the quarterly branch for this cycle.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20240428144959.4fe9e4e0ca163f1dc7b4788a>