git: 86349a45e976 - main - x11-wm/sway: disable wordexp(3) workaround on -CURRENT

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=86349a45e9763cba310a33310e0585e15652e69b

commit 86349a45e9763cba310a33310e0585e15652e69b
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-09-06 23:45:52 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-09-07 00:22:08 +0000

    x11-wm/sway: disable wordexp(3) workaround on -CURRENT
---
 x11-wm/sway/Makefile                                          | 11 ++++++++++-
 .../files/{patch-common_stringop.c => extra-patch-wordexp}    |  0
 x11-wm/swayfx/Makefile                                        | 11 ++++++++++-
 .../files/{patch-common_stringop.c => extra-patch-wordexp}    |  0
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 9b0f8f7f029e..caf623eafae1 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -50,6 +50,15 @@ SWAYBG_RUN_DEPENDS=	swaybg:x11/swaybg
 X11_USE=		XORG=xcb
 X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 
+.include <bsd.port.options.mk>
+
+# https://github.com/freebsd/freebsd-src/pull/1675
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305503 \
+ || ${OSVERSION} >= 1400000 && ${OSVERSION} < 1403505 \
+ || ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500052)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-wordexp
+.endif
+
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
@@ -58,7 +67,7 @@ post-patch:
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
-.if exists(${.CURDIR}/files/patch-common_stringop.c)
+.if exists(${.CURDIR}/files/extra-patch-wordexp)
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328
 	@${REINPLACE_CMD} -e 's/_POSIX_C_SOURCE=200809L/_XOPEN_SOURCE=700/' \
 		${WRKSRC}/meson.build
diff --git a/x11-wm/sway/files/patch-common_stringop.c b/x11-wm/sway/files/extra-patch-wordexp
similarity index 100%
rename from x11-wm/sway/files/patch-common_stringop.c
rename to x11-wm/sway/files/extra-patch-wordexp
diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile
index 6d9cf7561faa..f53808ea6c88 100644
--- a/x11-wm/swayfx/Makefile
+++ b/x11-wm/swayfx/Makefile
@@ -53,6 +53,15 @@ SWAYBG_RUN_DEPENDS=	swaybg:x11/swaybg
 X11_USE=		XORG=xcb
 X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 
+.include <bsd.port.options.mk>
+
+# https://github.com/freebsd/freebsd-src/pull/1675
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305503 \
+ || ${OSVERSION} >= 1400000 && ${OSVERSION} < 1403505 \
+ || ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500052)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-wordexp
+.endif
+
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
@@ -61,7 +70,7 @@ post-patch:
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
-.if exists(${.CURDIR}/files/patch-common_stringop.c)
+.if exists(${.CURDIR}/files/extra-patch-wordexp)
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328
 	@${REINPLACE_CMD} -e 's/_POSIX_C_SOURCE=200809L/_XOPEN_SOURCE=700/' \
 		${WRKSRC}/meson.build
diff --git a/x11-wm/swayfx/files/patch-common_stringop.c b/x11-wm/swayfx/files/extra-patch-wordexp
similarity index 100%
rename from x11-wm/swayfx/files/patch-common_stringop.c
rename to x11-wm/swayfx/files/extra-patch-wordexp