Index: head/x11/fnott/Makefile
===================================================================
--- head/x11/fnott/Makefile	(revision 558846)
+++ head/x11/fnott/Makefile	(revision 558847)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	fnott
 DISTVERSION=	1.0.0
 CATEGORIES=	x11
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
-PATCH_SITES=	https://github.com/jbeich/${PORTNAME}/commit/
-PATCHFILES+=	3b2cc4b817a2.patch:-p1 # i386
-PATCHFILES+=	a9c864a0ae05.patch:-p1 # Clang
-PATCHFILES+=	b2bc271ff5b3.patch:-p1 # CLOCK_BOOTTIME
-PATCHFILES+=	c27c03bb3e70.patch:-p1 # memfd_create
-PATCHFILES+=	062ddc9612b8.patch:-p1 # _POSIX_C_SOURCE
-PATCHFILES+=	a1a06b71a2ee.patch:-p1 # epoll-shim
+PATCH_SITES=	https://codeberg.org/dnkl/${PORTNAME}/commit/
+PATCHFILES+=	fa88218b3aab.patch:-p1 # i386
+PATCHFILES+=	89b0ebf950ac.patch:-p1 # Clang
+PATCHFILES+=	70320c12d4f2.patch:-p1 # CLOCK_BOOTTIME
+PATCHFILES+=	b18d23338a86.patch:-p1 # memfd_create
+PATCHFILES+=	4dbfa266ecc3.patch:-p1 # _POSIX_C_SOURCE
+PATCHFILES+=	ad36c1beefe6.patch:-p1 # epoll-shim
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Keyboard-driven notification daemon for wlroots-based compositors
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		tllist>=1.0.1:devel/tllist \
 		wayland-protocols>0:graphics/wayland-protocols \
 		scdoc:textproc/scdoc
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libepoll-shim.so:devel/libepoll-shim \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libfcft.so:x11-fonts/fcft
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_XORG=	pixman
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 # XXX Drop after FreeBSD 12.1 EOL
 .if exists(/usr/lib/clang/8.0.1)
 # notification.c:545:13: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
 CFLAGS+=	-Wno-error=missing-braces
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},g' \
 		${WRKSRC}/xdg.c
 
 .include <bsd.port.mk>
Index: head/x11/fnott/distinfo
===================================================================
--- head/x11/fnott/distinfo	(revision 558846)
+++ head/x11/fnott/distinfo	(revision 558847)
@@ -1,15 +1,15 @@
 TIMESTAMP = 1608120163
 SHA256 (fnott-1.0.0.tar.gz) = eae79fe7d8ff980a32dc98bb7884d0a85a7ac7916900d0a194ac3f480d421f24
 SIZE (fnott-1.0.0.tar.gz) = 97790
-SHA256 (3b2cc4b817a2.patch) = 07d982d05f9506d1cfa6cebcfa35b6a2e73f0577e5553efbc9daa0a072023527
-SIZE (3b2cc4b817a2.patch) = 1188
-SHA256 (a9c864a0ae05.patch) = 5bd8478ae533ce9d8e738935416263f0f5f1ebddefd7e5f0bbb5b32cf4420778
-SIZE (a9c864a0ae05.patch) = 1168
-SHA256 (b2bc271ff5b3.patch) = 9d9499a61b8d12ab64702e6acef5a8cfdd397dd0dc8311bb8ef5e4ca28e873b2
-SIZE (b2bc271ff5b3.patch) = 859
-SHA256 (c27c03bb3e70.patch) = 63f833ca4c7e1e1c3d79912a18a04c5980ca44bf60facd6020de1fc09b75254b
-SIZE (c27c03bb3e70.patch) = 2213
-SHA256 (062ddc9612b8.patch) = 94c1f59fccd174b506d60cfec6a0da8b240e81abbbe02378ae7ff97cc2e1b765
-SIZE (062ddc9612b8.patch) = 2713
-SHA256 (a1a06b71a2ee.patch) = 7ef8993a2dc10e71961689d7a35319b24e34e6080b2eb607a2a1b70d10fc8e15
-SIZE (a1a06b71a2ee.patch) = 2739
+SHA256 (fa88218b3aab.patch) = ba77ccc7bff108686dfceae4d9436f6c1ff2a858d1c261581834b5c13efa7fa6
+SIZE (fa88218b3aab.patch) = 1188
+SHA256 (89b0ebf950ac.patch) = 60786d73c40122e95f3454342312428355800f498a5b715af756b14c568fc9bf
+SIZE (89b0ebf950ac.patch) = 1168
+SHA256 (70320c12d4f2.patch) = 8f8141b94d92c643f79e8f0366d65f614a0357896d469615c75fe1d6ebe63636
+SIZE (70320c12d4f2.patch) = 859
+SHA256 (b18d23338a86.patch) = 6759bbdee47d8cefe6d57f499159058c688415e5075118bd17ed704fa0a6426e
+SIZE (b18d23338a86.patch) = 2213
+SHA256 (4dbfa266ecc3.patch) = b1f3d10bda8a373a9f15fa5affaf6e0d9203d8178a058d38fbb31b8beedbc85f
+SIZE (4dbfa266ecc3.patch) = 2713
+SHA256 (ad36c1beefe6.patch) = 01d5757b737d22c9f82a80f3758f0b6262ce8c3b453b27f07b6f86f45c250c81
+SIZE (ad36c1beefe6.patch) = 2739
Index: head/x11/fuzzel/Makefile
===================================================================
--- head/x11/fuzzel/Makefile	(revision 558846)
+++ head/x11/fuzzel/Makefile	(revision 558847)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	fuzzel
 DISTVERSION=	1.4.2
 CATEGORIES=	x11
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
-PATCH_SITES=	https://github.com/jbeich/${PORTNAME}/commit/
-PATCHFILES+=	d0ce4f2081a5.patch:-p1 # memfd_create
-PATCHFILES+=	7637fdf4133b.patch:-p1 # _POSIX_C_SOURCE
-PATCHFILES+=	816d7e5c06a3.patch:-p1 # epoll-shim
+PATCH_SITES=	https://codeberg.org/dnkl/${PORTNAME}/commit/
+PATCHFILES+=	902f8209cfe2.patch:-p1 # memfd_create
+PATCHFILES+=	452c0161f66c.patch:-p1 # _POSIX_C_SOURCE
+PATCHFILES+=	544c78f0bfdf.patch:-p1 # epoll-shim
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Application launcher for wlroots-based Wayland compositors
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	tllist>=1.0.1:devel/tllist \
 		wayland-protocols>0:graphics/wayland-protocols \
 		scdoc:textproc/scdoc
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland \
 		libfcft.so:x11-fonts/fcft \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome meson pkgconfig xorg
 USE_GNOME=	cairo librsvg2
 USE_XORG=	pixman
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		share/zsh/site-functions/_${PORTNAME}
 
 # XXX Drop after FreeBSD 12.1 EOL
 .if exists(/usr/lib/clang/8.0.1)
 # prompt.c:45:21: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
 CFLAGS+=	-Wno-error=missing-braces
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},g' \
 		${WRKSRC}/xdg.c
 
 .include <bsd.port.mk>
Index: head/x11/fuzzel/distinfo
===================================================================
--- head/x11/fuzzel/distinfo	(revision 558846)
+++ head/x11/fuzzel/distinfo	(revision 558847)
@@ -1,9 +1,9 @@
 TIMESTAMP = 1597681217
 SHA256 (fuzzel-1.4.2.tar.gz) = e4acd9afa299abd0a1995f85ffd13b05648178d71326aa1c749187f113de4817
 SIZE (fuzzel-1.4.2.tar.gz) = 77698
-SHA256 (d0ce4f2081a5.patch) = 401477768a8f7a1ca7987062152de691d58d46ebf46bd89c3ec26c661dc02289
-SIZE (d0ce4f2081a5.patch) = 2222
-SHA256 (7637fdf4133b.patch) = 8b4a8462bd191ab8bf0578d73554059d52337ba401d744ab55eeb4734266e126
-SIZE (7637fdf4133b.patch) = 2728
-SHA256 (816d7e5c06a3.patch) = 4f3a48b85fd249eea0e08b842a0536c97a6db22aafb7fd9dc2559f78258a0a8b
-SIZE (816d7e5c06a3.patch) = 2594
+SHA256 (902f8209cfe2.patch) = d0acaaa07c9c9acd22897b775162b3a0425cb4ed58931cd731a709a33c9847cf
+SIZE (902f8209cfe2.patch) = 2222
+SHA256 (452c0161f66c.patch) = e0a0551002c2604de3243fb1ca6b2362aa5c9a72901e500b6b602820ed331783
+SIZE (452c0161f66c.patch) = 2791
+SHA256 (544c78f0bfdf.patch) = 31020e1600ce9fd043d9aa4824ae4d66f853bf30177866cff140a4e3f34b4a1d
+SIZE (544c78f0bfdf.patch) = 2594