diff --git a/x11-wm/hyprland-devel/Makefile b/x11-wm/hyprland-devel/Makefile
index 59142f4c05d2..f3c69cfe63f7 100644
--- a/x11-wm/hyprland-devel/Makefile
+++ b/x11-wm/hyprland-devel/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24.1-105
 DISTVERSIONSUFFIX=	-g62213229
 CATEGORIES=	x11-wm wayland
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor that doesn't sacrifice on its looks (development snapshot) #'
 WWW=		https://hyprland.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.25:graphics/wayland-protocols \
 		wlroots>=0.16.0.346<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c++11-lib gl gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl opengl
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	hyprwm
 GH_PROJECT=	Hyprland
 GH_TUPLE=	hyprwm:hyprland-protocols:4d29e48:hyprland_protocols/subprojects/hyprland-protocols \
 		canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86
 MESON_ARGS=	-Dsystemd=disabled
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \
 		-e "/GIT_COMMIT_HASH/s/run_command.*/'${DISTVERSIONFULL}'/" \
-		-e "/GIT_COMMIT_MESSAGE/s/run_command.*/'?'/" \
+		-e "/GIT_COMMIT_MESSAGE/d" \
 		-e "/GIT_DIRTY/s/run_command.*/'portbld'/" \
 		-e "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \
 		${WRKSRC}/meson.build
 # Respect PREFIX for wallpapers
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/render/OpenGL.cpp
 # Respect LOCALBASE for xdg-desktop-portal-hyprland installation
 	@${REINPLACE_CMD} 's,/usr/share,${LOCALBASE}/share,g' \
 		${WRKSRC}/src/Compositor.cpp
 
 .ifdef GH_TUPLE
 post-configure:
 	@${REINPLACE_CMD} 's/meson install/& \
 		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
 .endif
 
 # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo)
 .if ${CXX} == c++ && exists(/usr/lib/libc++.so)
 .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
 USES+=		llvm:min=16,build
 PATH:=		${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CPP="${CPP}"
 CMAKE_BIN=	${LOCALBASE}/bin/cmake
 
 # XXX Move into separate port and standardize via USES
 GH_TUPLE+=	llvm:llvm-project:llvmorg-16.0.1:libcxx
 CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
 # Don't link against new libc++ as it's not necessary
 #LDFLAGS+=	-nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
 
 pre-configure:	bundled-libcxx
 bundled-libcxx:
 	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 		-DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
 		-DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
 		-B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
 	@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
 .endif
 .endif # exists(/usr/lib/libc++.so)
 
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index ae1f42316f7a..c1e6919c4302 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24.1
 PORTREVISION=	2
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	efee6a1cda27.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2026
 PATCHFILES+=	8944db49be38.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/2065
 PATCHFILES+=	63841c8aac8c.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2066
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #'
 WWW=		https://hyprland.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.25:graphics/wayland-protocols \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c++11-lib gl gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl opengl
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	hyprwm
 GH_PROJECT=	Hyprland
 GH_TUPLE=	hyprwm:hyprland-protocols:d7d403b:hyprland_protocols/subprojects/hyprland-protocols \
 		canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86
 MESON_ARGS=	-Dsystemd=disabled
 
 CONFLICTS_INSTALL=	${PORTNAME}-devel
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \
 		-e "/GIT_COMMIT_HASH/s/run_command.*/'${DISTVERSIONFULL}'/" \
-		-e "/GIT_COMMIT_MESSAGE/s/run_command.*/'?'/" \
+		-e "/GIT_COMMIT_MESSAGE/d" \
 		-e "/GIT_DIRTY/s/run_command.*/'portbld'/" \
 		-e "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \
 		${WRKSRC}/meson.build
 # Respect PREFIX for wallpapers
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/render/OpenGL.cpp
 # Respect LOCALBASE for xdg-desktop-portal-hyprland installation
 	@${REINPLACE_CMD} 's,/usr/share,${LOCALBASE}/share,g' \
 		${WRKSRC}/src/Compositor.cpp
 
 .ifdef GH_TUPLE
 post-configure:
 	@${REINPLACE_CMD} 's/meson install/& \
 		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
 .endif
 
 # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo)
 .if ${CXX} == c++ && exists(/usr/lib/libc++.so)
 .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
 USES+=		llvm:min=16,build
 PATH:=		${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CPP="${CPP}"
 CMAKE_BIN=	${LOCALBASE}/bin/cmake
 
 # XXX Move into separate port and standardize via USES
 GH_TUPLE+=	llvm:llvm-project:llvmorg-16.0.1:libcxx
 CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
 # Don't link against new libc++ as it's not necessary
 #LDFLAGS+=	-nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
 
 pre-configure:	bundled-libcxx
 bundled-libcxx:
 	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 		-DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
 		-DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
 		-B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
 	@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
 .endif
 .endif # exists(/usr/lib/libc++.so)
 
 .include <bsd.port.mk>
diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile
index f037808c149d..1d5e15833ec1 100644
--- a/x11/hyprpaper/Makefile
+++ b/x11/hyprpaper/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	hyprpaper
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Blazing fast Wayland wallpaper utility with IPC controls
 WWW=		https://github.com/hyprwm/hyprpaper
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe sparc64
 NOT_FOR_ARCHS_REASON=	only little-endian is supported
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 
 USES=		compiler:c++11-lib cmake gnome jpeg localbase:ldflags pkgconfig
 USE_GNOME=	cairo
 USE_GITHUB=	yes
 GH_ACCOUNT=	hyprwm
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
 # Extract (snapshot) version from the port instead of Git
 	@${REINPLACE_CMD} -i .nogit -e '/Get git info/,/^#$$/d' \
 		-e 's/$${GIT_BRANCH}/main/' \
 		-e 's/$${GIT_COMMIT_HASH}/${GH_TAGNAME}/' \
-		-e 's/$${GIT_COMMIT_MESSAGE}/?/' \
+		-e '/$${GIT_COMMIT_MESSAGE}/d' \
 		-e 's/$${GIT_DIRTY}/portbld/' \
 		${WRKSRC}/CMakeLists.txt
 # https://clang.llvm.org/cxx_status.html#cxx23
 	@${REINPLACE_CMD} -e 's/c++23/c++2b/' \
 		${WRKSRC}/CMakeLists.txt
 # Drop unused dependencies
 	@${REINPLACE_CMD} 's/ wlroots//' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's/ pango pangocairo//' \
 		-e '/OpenGL/d; /GLESv2/d' \
 		-e '/ rt)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 pre-configure:
 	@${SETENV} ${MAKE_ENV} ${GMAKE} protocols -C${WRKSRC}
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11/hyprpicker/Makefile b/x11/hyprpicker/Makefile
index 181e78316ebb..487e3fced9e2 100644
--- a/x11/hyprpicker/Makefile
+++ b/x11/hyprpicker/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	hyprpicker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.0
 PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Color picker and magnifier for Wayland
 WWW=		https://github.com/hyprwm/hyprpicker
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 
 USES=		compiler:c++11-lib cmake gnome jpeg localbase:ldflags pkgconfig
 USE_GNOME=	cairo
 USE_GITHUB=	yes
 GH_ACCOUNT=	hyprwm
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=	CLIPBOARD
 OPTIONS_DEFAULT=CLIPBOARD
 
 CLIPBOARD_DESC=		Copy to clipboard support
 CLIPBOARD_RUN_DEPENDS=	wl-copy:x11/wl-clipboard
 
 post-patch:
 # Extract (snapshot) version from the port instead of Git
 	@${REINPLACE_CMD} -i .nogit -e '/Get git info/,/^#$$/d' \
 		-e 's/$${GIT_BRANCH}/main/' \
 		-e 's/$${GIT_COMMIT_HASH}/${GH_TAGNAME}/' \
-		-e 's/$${GIT_COMMIT_MESSAGE}/?/' \
+		-e '/$${GIT_COMMIT_MESSAGE}/d' \
 		-e 's/$${GIT_DIRTY}/portbld/' \
 		${WRKSRC}/CMakeLists.txt
 # https://clang.llvm.org/cxx_status.html#cxx23
 	@${REINPLACE_CMD} -e 's/c++23/c++17/' \
 		${WRKSRC}/CMakeLists.txt
 # Drop unused dependencies
 	@${REINPLACE_CMD} 's/ wlroots//' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's/ pango pangocairo//' \
 		-e 's/ libjpeg//' \
 		-e '/OpenGL/d; /GLESv2/d' \
 		-e '/pthread/d; /CMAKE_THREAD_LIBS_INIT/d' \
 		-e '/ rt)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 pre-configure:
 	@${SETENV} ${MAKE_ENV} ${GMAKE} protocols -C${WRKSRC}
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>