Re: git: 3be82964f866 - main - Mk/bsd.port.mk: mark FreeBSD 13.4 as unsupported.

On Thu, Jul 03, 2025 at 11:31:16PM +0200, Jan Beich wrote:
> Rene Ladan <rene@freebsd.org> writes:
> 
> > On Thu, Jul 03, 2025 at 10:36:36PM +0200, Jan Beich wrote:
> >
> >> Rene Ladan <rene@freebsd.org> writes:
> >> 
> >> > On Wed, Jul 02, 2025 at 03:03:11PM +0200, Jan Beich wrote:
> >> >> Rene Ladan <rene@FreeBSD.org> writes:
> >> >> > -# XXX Drop after FreeBSD 13.4 EOL around 2026-01-31
> >> >> > -# https://cgit.freebsd.org/src/commit/?id=af93fea71038
> >> >> > -.if !exists(/usr/include/sys/timerfd.h)
> >> >> > -LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
> >> >> > -.endif
> >> >> 
> >> >> Likely needs to be reverted as <sys/timerfd.h> doesn't exist in 13.5.
> >> >> The XXX line was written under assumption 13.4 would be the last version
> >> >> from /stable/13 i.e., before re@ accelerated -RELEASE pace[1].
> >> >> 
> >> > Ah, I didn't check if timerfd.h exists on 13.5. What would be the easiest
> >> > route to revert this part?
> >> 
> >> Do you mean Git commands?
> >> 
> >>   $ git revert -n 3be82964f866
> >> 
> >> then either
> >> 
> >>   $ git reset && git add -e
> >>   <remove unrelated hunks in a text editor>
> >> 
> >> or
> >> 
> >>   $ git reset -p
> >>   <press "n" which hunks to undo>
> >> 
> >> and finish with
> >> 
> >>   $ git commit
> >> 
> >> then clean up unstaged/unused files from the revert
> >> 
> >>   $ git reset --hard
> >>   $ git clean -xdf # or rm -rf lang/crystal/files/
> >> 
> >> Note, "git reset -p" is error-prone, so you may want to confirm what
> >> will end up in a commit via "git diff --cached" vs. "git diff".
> >
> > I didn't know I wanted to ask this :) But also if it would be handier
> > if you or I handles the revert.
> 
> Reverting others' commits can cause conflicts. Besides, you're best
> positioned to write the commit message.
> 
> Note, I'm still not ready to test anything on 13.5. My recently pushed
> changes were tested on 13.4 with a slightly out-of-date tree.

I tested the commit with libepoll-shim removed on a 13.5-amd64 poudriere jail
which indeed failed and got fixed with the above revert.

I committed the revert with adjusted EOL message to both main and 2025Q3.

Thanks for catching this!

Regards,
René