Index: head/x11-fonts/fcft/Makefile
===================================================================
--- head/x11-fonts/fcft/Makefile	(revision 558861)
+++ head/x11-fonts/fcft/Makefile	(revision 558862)
@@ -1,31 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	fcft
 DISTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
+
+PATCH_SITES=	https://codeberg.org/dnkl/${PORTNAME}/commit/
+PATCHFILES+=	0b330d7ff91f.patch:-p1 # avoid patch conflict
+PATCHFILES+=	e30e9f295b79.patch:-p1 # fnottctl quit crashfix
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Simple library for font loading and glyph rasterization
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	tllist>=1.0.1:devel/tllist \
 		scdoc:textproc/scdoc
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	pixman
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	HARFBUZZ
 OPTIONS_DEFAULT=HARFBUZZ
 
 HARFBUZZ_DESC=		HarfBuzz for text shaping
 HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 HARFBUZZ_MESON_ENABLED=	text-shaping
 
 .include <bsd.port.mk>
Index: head/x11-fonts/fcft/distinfo
===================================================================
--- head/x11-fonts/fcft/distinfo	(revision 558861)
+++ head/x11-fonts/fcft/distinfo	(revision 558862)
@@ -1,3 +1,7 @@
 TIMESTAMP = 1608296676
 SHA256 (fcft-2.3.2.tar.gz) = 726fdebb1d29bc40c665015666fd9037981c0b4d0ba3ecafa1994053091e7fa8
 SIZE (fcft-2.3.2.tar.gz) = 313133
+SHA256 (0b330d7ff91f.patch) = c3ac993323e189622157f46ae3fdac7a7df22365e15e11f5c68cbbc333262963
+SIZE (0b330d7ff91f.patch) = 821
+SHA256 (e30e9f295b79.patch) = ce5b1031ff07b842aaa418be7dc5e90947ffbb482ce7e709e471d13deee8dd46
+SIZE (e30e9f295b79.patch) = 1624