Simple diff to migrate away kf5 prefixes in package names.
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index d9a93791a32..5eb4f5c901e 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.81
+PKGNAME = quirks-7.82
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index d7743519b08..2c40cab856e 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -604,6 +604,10 @@ my $stem_extensions = {
'kio-extras' => 'kf6-kio-extras',
'py-rcsparse' => 'py3-rcsparse',
'py3-jsonschema-spec' => 'py3-jsonschema-path',
+ 'kdepim-runtime-kf5' => 'kdepim-runtime',
+ 'kcron-kf5' => 'kcron',
+ 'dolphin-plugins-kf5' => 'dolphin-plugins',
+ 'audiocd-kio-kf5' => 'audiocd-kio',
};
my $obsolete_reason = {};
diff --git a/x11/kde-applications/audiocd-kio/Makefile
b/x11/kde-applications/audiocd-kio/Makefile
index 09376f0d866..68a3ebd2ddb 100644
--- a/x11/kde-applications/audiocd-kio/Makefile
+++ b/x11/kde-applications/audiocd-kio/Makefile
@@ -1,6 +1,5 @@
COMMENT = Kio slave for accessing audio CDs
DISTNAME = audiocd-kio-${VERSION}
-PKGNAME = audiocd-kio-kf5-${VERSION}
CATEGORIES = devel audio
SHARED_LIBS += audiocdplugins 3.0 # 5.0
diff --git a/x11/kde-applications/audiocd-kio/pkg/PLIST
b/x11/kde-applications/audiocd-kio/pkg/PLIST
index d153dd123a7..3aea1b07401 100644
--- a/x11/kde-applications/audiocd-kio/pkg/PLIST
+++ b/x11/kde-applications/audiocd-kio/pkg/PLIST
@@ -1,3 +1,4 @@
+@conflict audiocd-kio-kf5-<=24.08.3
@conflict kdebase-<4
include/audiocdplugins/
include/audiocdplugins/audiocdencoder.h
diff --git a/x11/kde-applications/dolphin-plugins/Makefile
b/x11/kde-applications/dolphin-plugins/Makefile
index 14b4089d5e3..143d2a8c4ef 100644
--- a/x11/kde-applications/dolphin-plugins/Makefile
+++ b/x11/kde-applications/dolphin-plugins/Makefile
@@ -1,6 +1,5 @@
COMMENT = Dolphin plugins
DISTNAME = dolphin-plugins-${VERSION}
-PKGNAME = dolphin-plugins-kf5-${VERSION}
CATEGORIES = x11
WANTLIB += ${COMPILER_LIBCXX} GL KF6Bookmarks KF6ColorScheme KF6Completion
diff --git a/x11/kde-applications/dolphin-plugins/pkg/PLIST
b/x11/kde-applications/dolphin-plugins/pkg/PLIST
index a50b35af148..d2533432893 100644
--- a/x11/kde-applications/dolphin-plugins/pkg/PLIST
+++ b/x11/kde-applications/dolphin-plugins/pkg/PLIST
@@ -1,3 +1,4 @@
+@conflict dolphin-plugins-kf5-<=24.08.3
lib/qt6/plugins/dolphin/vcs/
@so lib/qt6/plugins/dolphin/vcs/fileviewbazaarplugin.so
@so lib/qt6/plugins/dolphin/vcs/fileviewdropboxplugin.so
diff --git a/x11/kde-applications/kcron/Makefile
b/x11/kde-applications/kcron/Makefile
index 9f87a3b1877..71de4c18c2e 100644
--- a/x11/kde-applications/kcron/Makefile
+++ b/x11/kde-applications/kcron/Makefile
@@ -1,6 +1,5 @@
COMMENT = KDE-based GUI for cron task scheduler
DISTNAME = kcron-${VERSION}
-PKGNAME = kcron-kf5-${VERSION}
CATEGORIES = x11
WANTLIB += ${COMPILER_LIBCXX} GL KF6AuthCore KF6ColorScheme KF6Completion
diff --git a/x11/kde-applications/kcron/pkg/PLIST
b/x11/kde-applications/kcron/pkg/PLIST
index 057206d8ea4..d1ca4d1a443 100644
--- a/x11/kde-applications/kcron/pkg/PLIST
+++ b/x11/kde-applications/kcron/pkg/PLIST
@@ -1,3 +1,4 @@
+@conflict kcron-kf5-<=24.08.3
lib/qt6/plugins/plasma/
lib/qt6/plugins/plasma/kcms/
lib/qt6/plugins/plasma/kcms/systemsettings_qwidgets/
diff --git a/x11/kde-applications/kdepim-runtime/Makefile
b/x11/kde-applications/kdepim-runtime/Makefile
index 476d8c73a89..d36f14015cc 100644
--- a/x11/kde-applications/kdepim-runtime/Makefile
+++ b/x11/kde-applications/kdepim-runtime/Makefile
@@ -2,9 +2,7 @@ USE_WXNEEDED = Yes
COMMENT = KDE PIM mail related libraries
DISTNAME = kdepim-runtime-${VERSION}
-PKGNAME = kdepim-runtime-kf5-${VERSION}
CATEGORIES = devel
-REVISION = 1
SHARED_LIBS += akonadi-filestore 1.0 # 5.13.2
SHARED_LIBS += akonadi-singlefileresource 2.0 # 5.13.2
diff --git a/x11/kde-applications/kdepim-runtime/pkg/PLIST
b/x11/kde-applications/kdepim-runtime/pkg/PLIST
index a94cf0d8c41..4aa0edf2052 100644
--- a/x11/kde-applications/kdepim-runtime/pkg/PLIST
+++ b/x11/kde-applications/kdepim-runtime/pkg/PLIST
@@ -1,3 +1,4 @@
+@conflict kdepim-runtime-kf5-<=24.08.3
@bin bin/akonadi_akonotes_resource
@bin bin/akonadi_birthdays_resource
@bin bin/akonadi_contacts_resource