Drop FreeBSD < 14.0-BETA5 <sys/timerfd.h> workarounds

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273373 https://cgit.freebsd.org/src/commit/?h=releng/14.0&id=7454117918cd https://lists.freebsd.org/archives/freebsd-stable/2023-October/001533.html Old -CURRENT, -STABLE, -RELENG snapshots were never supported in ports/. This reverts commit 4458b6d. This reverts commit f295903. This reverts commit d7c8303. This reverts commit 5725600. This reverts commit f4c28b4. This reverts commit 1639286. This reverts commit b8948f8. This reverts commit 5e70841. This reverts commit 600ca97.
freebsd · Oct 7, 2023 · 19ba14b · 19ba14b
1 parent 6f62438
commit 19ba14b
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 70 deletions.
diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile
@@ -30,12 +30,6 @@ MAKE_JOBS_UNSAFE=	yes
 
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
-CFLAGS+=	-D__BSD_VISIBLE -D__XSI_VISIBLE
-.endif
-
 post-patch:
 # libusb can be disabled via src.conf(5), so detect via pkg-config
 	@${REINPLACE_CMD} -e 's/\(libusb-1\.0\) >= 1\.0\.[0-9]*/\1/' \

diff --git a/devel/p5-IO-AIO/files/patch-AIO.xs b/devel/p5-IO-AIO/files/patch-AIO.xs
@@ -1,18 +1,6 @@
---- AIO.xs.orig	2022-09-28 08:22:50 UTC
+--- AIO.xs.orig	2022-09-25 16:29:50 UTC
 +++ AIO.xs
-@@ -169,9 +169,11 @@
- # include <sys/eventfd.h>
- #endif
-
-+#define cv condvar_cv
- #if HAVE_TIMERFD
- # include <sys/timerfd.h>
- #endif
-+#undef cv
-
- #if HAVE_RLIMITS
-   #include <sys/time.h>
-@@ -2926,7 +2928,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef)
+@@ -2924,7 +2924,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef)
  	OUTPUT: RETVAL
 
  int

diff --git a/x11/libinput/files/patch-tools_libinput-record.c b/x11/libinput/files/patch-tools_libinput-record.c
diff --git a/x11/mako/Makefile b/x11/mako/Makefile
@@ -37,12 +37,6 @@ MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ENABLED=	icons
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
-CFLAGS+=	-D__BSD_VISIBLE -D__XSI_VISIBLE
-.endif
-
 post-patch:
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},g' \

diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
@@ -78,12 +78,6 @@ WEBP_MESON_ENABLED=	webp
 ZSH_MESON_ENABLED=	zsh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
-CFLAGS+=	-D__BSD_VISIBLE -D__XSI_VISIBLE
-.endif
-
 post-patch:
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \

diff --git a/x11/sxmo-wayout/Makefile b/x11/sxmo-wayout/Makefile
@@ -30,12 +30,6 @@ MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
-CFLAGS+=	-D__BSD_VISIBLE -D__XSI_VISIBLE
-.endif
-
 post-install:
 # Rename to avoid conflict with x11/wayout
 	${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \

diff --git a/x11/wmenu/Makefile b/x11/wmenu/Makefile
@@ -29,10 +29,4 @@ LDFLAGS+=	`pkg-config --libs epoll-shim`
 PLIST_FILES=	bin/wmenu \
 		man/man1/wmenu.1.gz
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
-CFLAGS+=	-D__BSD_VISIBLE -D__XSI_VISIBLE
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile
@@ -45,12 +45,6 @@ MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}.5.gz
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
-CFLAGS+=	-D__BSD_VISIBLE -D__XSI_VISIBLE
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/${PORTNAME}.5.scd