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

On Wed, Jul 02, 2025 at 03:03:11PM +0200, Jan Beich wrote:
> Rene Ladan <rene@FreeBSD.org> writes:
> 
> > diff --git a/x11-toolkits/aquamarine/Makefile b/x11-toolkits/aquamarine/Makefile
> > index 5453c190d9c0..b1b223668071 100644
> > --- a/x11-toolkits/aquamarine/Makefile
> > +++ b/x11-toolkits/aquamarine/Makefile
> > @@ -31,10 +31,4 @@ USE_XORG=	pixman
> >  GH_ACCOUNT=	hyprwm
> >  PLIST_SUB=	VERSION=${DISTVERSION:C/-.*//}
> >  
> > -# 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
> > -
> >  .include <bsd.port.mk>
> > diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
> > index 4aaf25c6476e..56a25548b502 100644
> > --- a/x11-wm/hyprland/Makefile
> > +++ b/x11-wm/hyprland/Makefile
> > @@ -45,12 +45,6 @@ LDFLAGS+=	-Wl,--as-needed # GL, pango deps
> >  # Generated by "make update-hash" for commit_pins in hyprpm.toml
> >  GH_HASH=	29e2e59fdbab8ed2cc23a20e3c6043d5decb5cdc
> >  
> > -# 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
> > -
> >  OPTIONS_DEFINE=	QT6 X11
> >  OPTIONS_DEFAULT=QT6 X11
> >  
> > diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
> > index 70f297c194b6..e31a97d5aea6 100644
> > --- a/x11/swayimg/Makefile
> > +++ b/x11/swayimg/Makefile
> > @@ -32,12 +32,6 @@ PLIST_FILES=	bin/${PORTNAME} \
> >  		${DATADIR}/${PORTNAME}rc \
> >  		${NULL}
> >  
> > -# 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
> > -
> >  OPTIONS_DEFINE=	AVIF BASH GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \
> >  		OPENEXR PNG RAW SIXEL TIFF WEBP ZSH
> >  OPTIONS_DEFAULT=AVIF BASH GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \
> > diff --git a/x11/wmenu/Makefile b/x11/wmenu/Makefile
> > index b5981638437f..33a2ebd90609 100644
> > --- a/x11/wmenu/Makefile
> > +++ b/x11/wmenu/Makefile
> > @@ -18,14 +18,6 @@ LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
> >  USES=		compiler:c11 gnome meson pkgconfig
> >  USE_GNOME=	cairo pango
> >  
> > -# 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
> > -CPPFLAGS+=	`pkg-config --cflags epoll-shim`
> > -LDFLAGS+=	`pkg-config --libs epoll-shim`
> > -.endif
> > -
> >  WRKSRC=		${WRKDIR}/${PORTNAME}
> >  
> >  PLIST_FILES=	bin/wmenu \
> > diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile
> > index db96e49cef79..4c1705400d01 100644
> > --- a/x11/xdg-desktop-portal-wlr/Makefile
> > +++ b/x11/xdg-desktop-portal-wlr/Makefile
> > @@ -32,12 +32,6 @@ PLIST_FILES=	libexec/${PORTNAME} \
> >  		share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \
> >  		share/xdg-desktop-portal/portals/wlr.portal
> >  
> > -# 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
> > -
> >  OPTIONS_DEFINE=	MANPAGES
> >  OPTIONS_DEFAULT=MANPAGES
> 
> 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?

> Sorry, I forgot about the review due to lack of time. It'd take me a while to
> start testing 13.5 because all packages have to be rebuilt from scratch.
> 
> [1] https://lists.freebsd.org/archives/freebsd-announce/2024-July/000143.html

Regards,
René