diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 0dfe174ac76..0c7d7733da0 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -3,7 +3,7 @@ HOMEPAGE =	https://www.calligra.org
 VERSION =	3.2.1
 DISTNAME =	calligra-${VERSION}
 CATEGORIES =	editors
-REVISION =	8
+REVISION =	9
 
 SHARED_LIBS =   RtfReader                 51.0 # 0.0
 SHARED_LIBS +=  basicflakes               50.0 # 0.0
@@ -46,8 +46,10 @@ MAINTAINER =	Rafael Sadowski <rsadowski@openbsd.org>
 
 # GPLv2+, LGPLv2+ and GNU FDLv1.2
 PERMIT_PACKAGE =	Yes
+
 DPB_PROPERTIES =	parallel
 
+WANTLIB += ${COMPILER_LIBCXX} ICE Imath-3_1 KChart KF5Activities
 WANTLIB += KF5Archive KF5Auth KF5AuthCore KF5Bookmarks KF5Codecs
 WANTLIB += KF5Completion KF5ConfigCore KF5ConfigGui KF5ConfigWidgets
 WANTLIB += KF5CoreAddons KF5Crash KF5DBusAddons KF5GuiAddons KF5I18n
@@ -65,9 +67,6 @@ WANTLIB += poppler poppler-qt5 qca-qt5 z
 
 MODULES =	devel/kf5
 
-# c++-17
-COMPILER =	base-clang ports-gcc
-
 BUILD_DEPENDS =	devel/boost \
 		devel/gettext,-tools \
 		devel/kf5/kdoctools \
@@ -137,8 +136,4 @@ CONFIGURE_ARGS +=	-DWITH_Cauchy=OFF \
 # Running D-Bus daemon is required
 TEST_IS_INTERACTIVE =	X11
 
-pre-configure:
-	find ${WRKSRC} -type f \( -name \*.cpp -o -name \*.h \) -exec \
-		sed -i -e 's,#include <phonon,#include <phonon4qt5/phonon,g' {} +
-
 .include <bsd.port.mk>
diff --git a/editors/calligra/pkg/PLIST b/editors/calligra/pkg/PLIST
index 6f4a54a33f9..c9852588763 100644
--- a/editors/calligra/pkg/PLIST
+++ b/editors/calligra/pkg/PLIST
@@ -220,8 +220,6 @@ lib/qt5/plugins/karbon/extensions/
 @so lib/qt5/plugins/karbon/extensions/karbon_refinepath.so
 @so lib/qt5/plugins/karbon/extensions/karbon_roundcorners.so
 @so lib/qt5/plugins/karbon/extensions/karbon_whirlpinch.so
-lib/qt5/plugins/okular/
-lib/qt5/plugins/okular/generators/
 @so lib/qt5/plugins/okular/generators/okularGenerator_doc_calligra.so
 @so lib/qt5/plugins/okular/generators/okularGenerator_docx_calligra.so
 @so lib/qt5/plugins/okular/generators/okularGenerator_odp_calligra.so
@@ -5113,7 +5111,6 @@ share/color/icc/calligra/sRGB-elle-V4-g10.icc
 share/color/icc/calligra/sRGB-elle-V4-labl.icc
 share/color/icc/calligra/sRGB-elle-V4-srgbtrc.icc
 share/color/icc/calligra/scRGB.icm
-share/config.kcfg/
 share/config.kcfg/calligrasheets.kcfg
 share/doc/HTML/ca/calligra/
 share/doc/HTML/ca/calligra/index.cache.bz2
@@ -5871,7 +5868,6 @@ share/kservices5/words_docx_thumbnail.desktop
 share/kservices5/words_msword_thumbnail.desktop
 share/kservices5/words_odt_thumbnail.desktop
 share/kservices5/words_rtf_thumbnail.desktop
-share/kxmlgui5/
 share/kxmlgui5/calligrasheets/
 share/kxmlgui5/calligrasheets/calligrasheets.rc
 share/kxmlgui5/calligrasheets/calligrasheets_readonly.rc
@@ -7972,7 +7968,6 @@ share/locale/zh_TW/LC_MESSAGES/krossmodulesheets.mo
 share/locale/zh_TW/LC_MESSAGES/krossmodulewords.mo
 share/locale/zh_TW/LC_MESSAGES/okularGenerator_odp.mo
 share/locale/zh_TW/LC_MESSAGES/okularGenerator_odt.mo
-share/metainfo/
 share/metainfo/org.kde.calligragemini.appdata.xml
 share/metainfo/org.kde.calligrasheets.appdata.xml
 share/metainfo/org.kde.calligrastage.appdata.xml