diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index feae31864363..aad5a04d62c5 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -1,66 +1,73 @@
 PORTNAME=	scribus
 PORTVERSION=	1.5.8
 PORTREVISION=	22
 CATEGORIES=	print editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
 		http://www.scribus.net/downloads/${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Comprehensive desktop publishing program (development version)
 WWW=		https://www.scribus.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libboost_thread.so:devel/boost-libs \
 		libhunspell-1.7.so:textproc/hunspell \
 		libcairo.so:graphics/cairo \
 		librevenge-0.0.so:textproc/librevenge \
 		libcups.so:print/cups \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libmspub-0.1.so:print/libmspub01 \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libfreetype.so:print/freetype2 \
 		libtiff.so:graphics/tiff \
 		libpoppler.so:graphics/poppler \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpodofo09.so:graphics/podofo09 \
 		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libqxp-0.0.so:textproc/libqxp \
 		libzmf-0.0.so:graphics/libzmf
 
 USES=		cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \
 		jpeg pkgconfig python qt:5 shared-mime-info tar:xz
 USE_QT=		buildtools:build core declarative gui linguisttools:build \
 		network opengl printsupport qmake:build widgets xml
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 USE_GNOME=	libxml2
 
 CMAKE_ARGS+=	-DWANT_HUNSPELL=YES \
 		-DWANT_CPP17=YES \
 		-DCMAKE_COLOR_MAKEFILE:BOOL=ON
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
 # Patch sources to force using include files installed by graphics/podofo09
 post-patch:
 	@${REINPLACE_CMD} -e '/^[\t ]*#include/s|podofo/podofo.h|podofo09/podofo.h|' \
 		${WRKSRC}/scribus/plugins/import/ps/importps.cpp \
 		${WRKSRC}/scribus/plugins/import/ai/importai.cpp \
 		${WRKSRC}/scribus/imagedataloaders/scimgdataloader_pdf.cpp \
 		${WRKSRC}/scribus/pdflib_core.h \
 		${WRKSRC}/scribus/pdf_analyzer.h
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
+		${WRKSRC}/scribus/desaxe/digester.cpp
+.endif
+
 
 post-install:
 		${LN} -sf ../share/icons/1_5_1/scribus.png \
 			${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp b/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp
deleted file mode 100644
index db186823e4bd..000000000000
--- a/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- scribus/desaxe/digester.cpp.orig	2023-07-31 21:07:27 UTC
-+++ scribus/desaxe/digester.cpp
-@@ -448,7 +448,11 @@ automata::NFA<nfa_state_t, token_t>* RuleState::create
- 	return nfa;
- }
- 
-+#if __cplusplus >= 201703L // ISO C++ 2017 or newer.
-+struct CreateDFAState : public std::__unary_function <std::set<nfa_state_t>, dfa_state_t> {
-+#else
- struct CreateDFAState : public std::unary_function <std::set<nfa_state_t>, dfa_state_t> {
-+#endif
- 
- 	CreateDFAState(const std::vector<rule_t>& rules, const std::vector<nfa_state_t>& accepting) 
- 	: n(0), rules_(rules), accepting_(accepting)