From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: NEW: kf6-kio-extras, kf6-ksanecore, kf6-libkcddb, kf6-libkcompactdisc, kf6-libkdcraw, kf6-libkexiv2 and incidenceeditor
To: ports <ports@openbsd.org>
Date: Fri, 26 Apr 2024 07:25:31 +0200

Now that part of the KDE6 ecosystem is in-tree we can easily build and
import new KDE6 ports. All attached ports are marked UNLONKED=kf6 so you
need BUILD_UNLINKED=kf6 in /etc/mk.conf and the following diff.

As described in the KDE release notes instructions, we need these ports
as Kf6 and Kf5. I would therefore like to import all ports with the
prefix kf6.

https://community.kde.org/KDE_Gear/24.02_Release_notes

incidenceeditor is an exception, this is a completely new port without
kf6-*. The only one that otherwise has to be imported. A new Pim6 dependnecy.


One more idea, we could also commit the following diff with: No
MODKDE_VERSION change and MODKDE_KF5 = yes as default. This should not
result in any changes.

Cheers, Rafael

diff --git a/x11/kde-applications/Makefile.inc b/x11/kde-applications/Makefile.inc
index a1f4cfdc180..d16382281a3 100644
--- a/x11/kde-applications/Makefile.inc
+++ b/x11/kde-applications/Makefile.inc
@@ -14,8 +14,14 @@ MAINTAINER ?=		Rafael Sadowski <rsadowski@openbsd.org>
 # module port, and breaks build.
 CONFIGURE_STYLE =	cmake
 
+.if defined(MODKDE_KF5) && ${MODKDE_KF5:L} == "yes"
+MODULES +=		devel/kf5
+.else
+CONFIGURE_ARGS +=	-DBUILD_WITH_QT6=ON
+MODULES +=		devel/kf6
+.endif
+
 MODULES :=		x11/kde-applications \
-			devel/kf5 \
 			${MODULES}
 
 # usual KDE rules:
@@ -25,6 +31,7 @@ PERMIT_PACKAGE ?=	Yes
 VERSION ?=		${MODKDE_VERSION}
 
 SITES ?=		${SITE_KDE:=stable/release-service/${VERSION}/src/}
+EXTRACT_SUFX ?=		.tar.xz
 
 RUN_DEPENDS +=		${MODKDE5_RUN_DEPENDS}
 BUILD_DEPENDS +=	${MODKDE5_BUILD_DEPENDS}
diff --git a/x11/kde-applications/kde-applications.port.mk b/x11/kde-applications/kde-applications.port.mk
index 5c02997c93a..50d79ac7aa9 100644
--- a/x11/kde-applications/kde-applications.port.mk
+++ b/x11/kde-applications/kde-applications.port.mk
@@ -1,4 +1,6 @@
-MODKDE_VERSION ?=		23.08.4
+MODKDE_VERSION ?=		24.02.1
+
+MODKDE_KF5 ?=			No
 
 # Set to 'yes' if there are .desktop files under share/release-service/.
 .if defined(MODKDE5_DESKTOP_FILE) && ${MODKDE5_DESKTOP_FILE:L} == "yes"
@@ -17,6 +19,11 @@ MODKDE5_BUILD_DEPENDS +=	devel/gettext,-tools
 
 # Set to 'yes' if there are icon files under share/doc/.
 .if defined(MODKDE5_DOCS) && ${MODKDE5_DOCS:L} == "yes"
+.if ${MODKDE_KF5:L} == "yes"
 MODKDE5_BUILD_DEPENDS +=	devel/kf5/kdoctools
 MODKDE5_RUN_DEPENDS +=		devel/kf5/kdoctools
+.else
+MODKDE5_BUILD_DEPENDS +=	devel/kf6/kdoctools
+MODKDE5_RUN_DEPENDS +=		devel/kf6/kdoctools
+.endif
 .endif