I would like to replace devel/kf5/extra-cmake-modules and breeze-icons
with the kf6 version.

This is the recommended way and for me the first step to continue working cleanly.

- Only one version of extra-cmake-modules can be installed. The KF6
  version is backwards compatible and should also be used for KF5 builds.
- Icon packages should only ship the latest version
  - breeze-icons
  - oxygen-icons (released separately)

-- https://community.kde.org/Frameworks/6.0_Release_notes

devel/kf5/extra-cmake-modules is a pure build dependency and
breeze-icons includes only the icons for run-time.

Here is my pkg_add test process:

env TRUSTED_PKG_PATH=https://www.... doas pkg_add -D unsigned -u
accountsservice-23.13.9->23.13.9: ok
catdoc-0.95->0.95: ok
celt-0.11.1p0v1->0.11.1p0v1: ok
db-4.6.21p7v0->4.6.21p7v0: ok
docbook-4.5p4:libxml-2.12.6->2.12.6: ok
ebook-tools-0.2.2:zstd-1.5.5->1.5.6: ok
ebook-tools-0.2.2:libzip-1.8.0p0->1.8.0p0: ok
ebook-tools-0.2.2->0.2.2: ok
exiv2-0.28.2p0v0->0.28.2p0v0: ok
gobject-introspection-1.80.1:py3-cryptodome-3.20.0->3.20.0: ok
gobject-introspection-1.80.1:py3-beaker-1.11.0p0->1.11.0p0: ok
gobject-introspection-1.80.1:py3-mako-1.2.4->1.2.4: ok
gobject-introspection-1.80.1:py3-markdown-3.4.4->3.4.4: ok
gobject-introspection-1.80.1:py3-setuptools-68.0.0v0->68.0.0v0: ok
gobject-introspection-1.80.1->1.80.1: ok
gperf-3.1p0->3.1p0: ok
kaccounts-integration-23.08.4:signond-8.61p5->8.61pl0: ok
kaccounts-integration-23.08.4:kdbusaddons-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:ki18n-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:kdoctools-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:kconfig-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:kcoreaddons-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:kservice-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:kglobalaccel-5.115.0p0->5.115.0p0: ok
kaccounts-integration-23.08.4:kguiaddons-5.115.0p0->5.115.0p0: ok
breeze-icons-5.115.0->kf6-breeze-icons-6.1.0 forward dependencies:
| Dependency of kdenlive-23.08.4 on breeze-icons-* doesn't match
| Dependency of kf5-kirigami2-5.115.0p0 on breeze-icons->=5.115 doesn't match
| Dependency of kiconthemes-5.115.0p0 on breeze-icons->=5.115 doesn't match
Merging kdenlive-23.08.4->23.08.4p0 (ok)
Merging kf5-kirigami2-5.115.0p0->5.115.0p1 (ok)
Merging kiconthemes-5.115.0p0->5.115.0p1 (ok)
kaccounts-integration-23.08.4:breeze-icons-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0->kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemekaccounts-integration-23.08.4:openbsdisks2-0.5.0->0.5.0: ok
kaccounts-integration-23.08.4:solid-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:sonnet-5.115.0->5.115.0: ok
kaccounts-integration-23.08.4:polkit-qt5-0.200.0->0.200.0: ok
kaccounts-integration-23.08.4:kauth-5.115.0->5.115.0: ok
Detected loop, merging sets ok
| kxmlgui-5.115.0->5.115.0
| breeze-icons-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0->kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1
kaccounts-integration-23.08.4:breeze-icons-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0->kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-Detected loop, merging sets ok
| purpose-5.115.0->5.115.0
| breeze-icons-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0->kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kxmlgui-5.115.0
kaccounts-integration-23.08.4:breeze-icons-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kDetected loop, merging sets ok
| kdeclarative-5.115.0->5.115.0
| breeze-icons-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kxmlgui-5.115.0+purpose-5.115.0
| kaccounts-integration-23.08.4->23.08.4
breeze-icons-5.115.0+kaccounts-integration-23.08.4+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-2kaccounts-integration-23.08...:py3-cairo-1.26.0->1.26.0: ok
kaccounts-integration-23.08...:py3-gobject3-3.48.2->3.48.2: ok
kaccounts-integration-23.08...:libaccounts-glib-1.26p2->1.26p2: ok
kaccounts-integration-23.08...:libaccounts-qt-1.16p2->1.17: ok
kaccounts-integration-23.08...:qca-qt5-2.3.8->2.3.8: ok
kaccounts-integration-23.08...:kf5-kwallet-5.115.0p0->5.115.0p0: ok
Detected loop, merging sets ok
| kbookmarks-5.115.0->5.115.0
| breeze-icons-5.115.0+kaccounts-integration-23.08.4+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kxmlgui-5.115.0+purpose-5.115.0
breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kxmlgui-5.115.0+purpose-5.115.0 (proc
Detected loop, merging sets ok
| kio-5.115.0p0->5.115.0p0
| breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kxmlgui-5.115.0+purpose-5.115.0
kaccounts-integration-23.08...:kded-5.115.0->5.115.0: ok
breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kio-5.115.0p0+kxmlgui-5
Detected loop, merging sets ok
| knewstuff-5.115.0->5.115.0
| breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kio-5.115.0p0+kxmlgui-5.115.0+purpose-5.115.0
breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+knewstuff-5.115.0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kio-5
Detected loop, merging sets ok
| knotifyconfig-5.115.0->5.115.0
| breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+knewstuff-5.115.0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kio-5.115.0p0+knewstuff-5.115.0+kxmlgui-5.115.0+purpose-5.115.0
kaccounts-integration-23.08...:phonon-4.12.0->4.12.0: ok
breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+knewstuff-5.115.0+knotifyconfig-5.115.0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kicon
kaccounts-integration-23.08...:kpackage-5.115.0->5.115.0: ok
breeze-icons-5.115.0+kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+knewstuff-5.115.0+knoti
fyconfig-5.115.0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kbookmarks-5.115.0+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kicon
[kbookmarks+knotifyconfig-5.115.0]breeze-icons-5.115.0+kaccounts-integration-23.08.4+kdeclarative-5.115.0+kdenlive-23.08.4+kf5-kirigami2-5.115.0p0+kiconthemes-5.115.0p0+kio-5.115.0p0+knewstuf
f-5.115.0+kxmlgui-5.115.0+purpose-5.115.0->kaccounts-integration-23.08.4+kdeclarative-5.115.0+kdenlive-23.08.4p0+kf5-kirigami2-5.115.0p1+kf6-breeze-icons-6.1.0+kiconthemes-5.115.0p1+kio-5.115
.0p0+knewstuff-5.115.0+kxmlgui-5.115.0+purpose-5.115.0: ok
ladspa-1.17p0->1.17p0: ok
libraw-0.21.2->0.21.2: ok
Running tags: ok
Read shared items: ok

# Tested with devel/quirks
env TRUSTED_PKG_PATH=https://www.... doas pkg_add -D unsigned -u
quirks-7.17->7.19: ok
extra-cmake-modules-5.115.0->kf6-extra-cmake-modules-6.1.0: ok
Read shared items: ok


diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index c396173d28f..fc5cb3a0a67 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -2,6 +2,7 @@ COMMENT =	planetarium simulator for KDE
 
 DISTNAME =	kstars-3.6.6
 EPOCH =		0
+REVISION =	0
 
 CATEGORIES =	astro education
 
@@ -35,7 +36,7 @@ BUILD_DEPENDS =		devel/gettext,-tools \
 			x11/xplanet
 
 RUN_DEPENDS =		devel/desktop-file-utils \
-			devel/kf5/breeze-icons \
+			devel/kf6/breeze-icons \
 			devel/kf5/kdoctools \
 			x11/gtk+4,-guic \
 			x11/qt5/qtquickcontrols \
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index b774e7b79fc..165a11d659d 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -5,7 +5,7 @@ COMMENT =	visual database applications creator
 
 VERSION =	3.2.0
 DISTNAME =	kexi-${VERSION}
-REVISION =	5
+REVISION =	6
 
 SHARED_LIBS +=  kexicore3.2               0.0 # 3.2
 SHARED_LIBS +=  kexidatatable3.2          0.0 # 3.2
@@ -48,12 +48,12 @@ MODULES =		devel/cmake \
 
 BUILD_DEPENDS =		databases/postgresql,-server \
 			devel/gettext,-tools \
-			devel/kf5/breeze-icons \
+			devel/kf6/breeze-icons \
 			devel/kf5/karchive \
 			x11/kde-applications/marble
 
 RUN_DEPENDS =		devel/desktop-file-utils \
-			devel/kf5/breeze-icons \
+			devel/kf6/breeze-icons \
 			devel/kf5/kservice \
 			x11/kde-applications/marble
 
diff --git a/devel/Makefile b/devel/Makefile
index adafa1bc4cc..eba5c4d8921 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -249,6 +249,7 @@
      SUBDIR += kdiff3
      SUBDIR += keystone
      SUBDIR += kf5
+     SUBDIR += kf6
      SUBDIR += knfmt
      SUBDIR += kproperty
      SUBDIR += kreport
diff --git a/devel/kf5/Makefile b/devel/kf5/Makefile
index 7dd06539ca5..8d6aa624d87 100644
--- a/devel/kf5/Makefile
+++ b/devel/kf5/Makefile
@@ -1,5 +1,5 @@
 SUBDIR =
-SUBDIR += extra-cmake-modules
+#SUBDIR += extra-cmake-modules
 
 # do not sort blindly: items below are listed in the straight build order
 # tier docs: https://api.kde.org/frameworks/index.html
@@ -8,7 +8,7 @@ SUBDIR += extra-cmake-modules
 SUBDIR += ki18n
 SUBDIR += attica
 SUBDIR += bluez-qt
-SUBDIR += breeze-icons
+#SUBDIR += breeze-icons
 SUBDIR += kapidox
 SUBDIR += karchive
 SUBDIR += kcodecs
diff --git a/devel/kf5/kf5.port.mk b/devel/kf5/kf5.port.mk
index b730255316b..56ac4183a14 100644
--- a/devel/kf5/kf5.port.mk
+++ b/devel/kf5/kf5.port.mk
@@ -6,9 +6,8 @@ MODKF5_BUILD_TESTING ?= No
 EXTRACT_SUFX ?=		.tar.xz
 .endif
 
-.if ${PKGPATH:Ndevel/kf5/extra-cmake-modules}
-BUILD_DEPENDS +=	devel/kf5/extra-cmake-modules>=${MODKF5_VERSION}
-.endif
+BUILD_DEPENDS +=	devel/kf6/extra-cmake-modules
+CONFIGURE_ARGS +=	-DKF_IGNORE_PLATFORM_CHECK=ON
 
 .if empty(CONFIGURE_STYLE)
 CONFIGURE_STYLE =	cmake
diff --git a/devel/kf5/kiconthemes/Makefile b/devel/kf5/kiconthemes/Makefile
index e2d8faac629..55d7689210d 100644
--- a/devel/kf5/kiconthemes/Makefile
+++ b/devel/kf5/kiconthemes/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	KDE icon GUI utility library
 DISTNAME =	kiconthemes-${VERSION}
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS =	KF5IconThemes		5.6
 
@@ -11,7 +11,7 @@ WANTLIB += Qt5Widgets Qt5Xml c m
 
 BUILD_DEPENDS =	devel/gettext,-tools
 
-RUN_DEPENDS +=	devel/kf5/breeze-icons
+RUN_DEPENDS +=	devel/kf6/breeze-icons
 
 LIB_DEPENDS =	devel/kf5/karchive>=${MODKF5_VERSION} \
 		devel/kf5/kcodecs>=${MODKF5_VERSION} \
diff --git a/devel/kf5/kirigami2/Makefile b/devel/kf5/kirigami2/Makefile
index 5c84bc5a696..c6cb46d32ea 100644
--- a/devel/kf5/kirigami2/Makefile
+++ b/devel/kf5/kirigami2/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	QtQuick based components set
 DISTNAME =	kirigami2-${VERSION}
 PKGNAME =	kf5-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://api.kde.org/frameworks/kirigami/html/index.html
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS =	archivers/gtar \
 RUN_DEPENDS =	x11/qt5/qtgraphicaleffects \
 		x11/qt5/qtsvg
 
-RUN_DEPENDS +=	devel/kf5/breeze-icons
+RUN_DEPENDS +=	devel/kf6/breeze-icons
 
 LIB_DEPENDS =	x11/qt5/qtquickcontrols2 \
 		x11/qt5/qtdeclarative
diff --git a/devel/kf5/plasma-framework/Makefile b/devel/kf5/plasma-framework/Makefile
index 413fec756d1..a8df0fe8cd4 100644
--- a/devel/kf5/plasma-framework/Makefile
+++ b/devel/kf5/plasma-framework/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	core components and tools of the Plasma Workspaces
 DISTNAME =	plasma-framework-${VERSION}
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS =	KF5Plasma		12.4
 SHARED_LIBS +=	KF5PlasmaQuick		9.0
@@ -38,7 +38,7 @@ RUN_DEPENDS =	archivers/bzip2 \
 		x11/qt5/qtquickcontrols \
 		x11/qt5/qtwayland
 
-RUN_DEPENDS +=	devel/kf5/breeze-icons
+RUN_DEPENDS +=	devel/kf6/breeze-icons
 
 LIB_DEPENDS =	devel/kf5/kactivities>=${MODKF5_VERSION} \
 		devel/kf5/karchive>=${MODKF5_VERSION} \
diff --git a/devel/kf6/Makefile b/devel/kf6/Makefile
index 353d0422545..e892821f664 100644
--- a/devel/kf6/Makefile
+++ b/devel/kf6/Makefile
@@ -10,83 +10,83 @@ SUBDIR += extra-cmake-modules
 # development and renamed to oxygen-icons
 # SUBDIR += oxygen-icons
 
-SUBDIR += ki18n
-SUBDIR += attica
-SUBDIR += bluez-qt
+#SUBDIR += ki18n
+#SUBDIR += attica
+#SUBDIR += bluez-qt
 SUBDIR += breeze-icons
-SUBDIR += karchive
-SUBDIR += kcodecs
-SUBDIR += kconfig
-SUBDIR += kcoreaddons
-SUBDIR += kdbusaddons
-SUBDIR += kdnssd
-SUBDIR += kguiaddons
-SUBDIR += kidletime
-SUBDIR += kitemmodels
-SUBDIR += kitemviews
-SUBDIR += kplotting
-SUBDIR += kwidgetsaddons
-SUBDIR += kwindowsystem
-SUBDIR += solid
-SUBDIR += sonnet
-SUBDIR += threadweaver
-SUBDIR += syntax-highlighting
-SUBDIR += prison
-SUBDIR += syndication
-SUBDIR += kholidays
-SUBDIR += kcalendarcore
-SUBDIR += kquickcharts
-SUBDIR += kglobalaccel
-SUBDIR += kirigami
-SUBDIR += kstatusnotifieritem
-SUBDIR += ktexttemplate
+#SUBDIR += karchive
+#SUBDIR += kcodecs
+#SUBDIR += kconfig
+#SUBDIR += kcoreaddons
+#SUBDIR += kdbusaddons
+#SUBDIR += kdnssd
+#SUBDIR += kguiaddons
+#SUBDIR += kidletime
+#SUBDIR += kitemmodels
+#SUBDIR += kitemviews
+#SUBDIR += kplotting
+#SUBDIR += kwidgetsaddons
+#SUBDIR += kwindowsystem
+#SUBDIR += solid
+#SUBDIR += sonnet
+#SUBDIR += threadweaver
+#SUBDIR += syntax-highlighting
+#SUBDIR += prison
+#SUBDIR += syndication
+#SUBDIR += kholidays
+#SUBDIR += kcalendarcore
+#SUBDIR += kquickcharts
+#SUBDIR += kglobalaccel
+#SUBDIR += kirigami
+#SUBDIR += kstatusnotifieritem
+#SUBDIR += ktexttemplate
 
 # tier 2
-SUBDIR += kauth
-SUBDIR += kcompletion
-SUBDIR += kcrash
-SUBDIR += kdoctools
-SUBDIR += kfilemetadata
-SUBDIR += kimageformats
-SUBDIR += knotifications
-SUBDIR += kjobwidgets
-SUBDIR += kpty
-SUBDIR += kunitconversion
-SUBDIR += kpackage
+#SUBDIR += kauth
+#SUBDIR += kcompletion
+#SUBDIR += kcrash
+#SUBDIR += kdoctools
+#SUBDIR += kfilemetadata
+#SUBDIR += kimageformats
+#SUBDIR += knotifications
+#SUBDIR += kjobwidgets
+#SUBDIR += kpty
+#SUBDIR += kunitconversion
+#SUBDIR += kpackage
 #SUBDIR += kuserfeedback
 
 # tier 3
 # high contention on [kservice..kio..kdeclarative] path, be careful
-SUBDIR += kservice
-SUBDIR += kcolorscheme
-SUBDIR += kconfigwidgets
-SUBDIR += kiconthemes
-SUBDIR += kcontacts
-SUBDIR += kpeople
-SUBDIR += kwallet
-SUBDIR += ktextwidgets
-SUBDIR += kdesu
-SUBDIR += kxmlgui
-SUBDIR += kbookmarks
-SUBDIR += kded
-SUBDIR += qqc2-desktop-style
-SUBDIR += kdeclarative
-SUBDIR += knewstuff
-SUBDIR += ksvg
-SUBDIR += kio
-SUBDIR += kparts
-SUBDIR += kcmutils
-SUBDIR += baloo
-SUBDIR += knotifyconfig
-SUBDIR += ktexteditor
-SUBDIR += krunner
-SUBDIR += purpose
-SUBDIR += kdav
+#SUBDIR += kservice
+#SUBDIR += kcolorscheme
+#SUBDIR += kconfigwidgets
+#SUBDIR += kiconthemes
+#SUBDIR += kcontacts
+#SUBDIR += kpeople
+#SUBDIR += kwallet
+#SUBDIR += ktextwidgets
+#SUBDIR += kdesu
+#SUBDIR += kxmlgui
+#SUBDIR += kbookmarks
+#SUBDIR += kded
+#SUBDIR += qqc2-desktop-style
+#SUBDIR += kdeclarative
+#SUBDIR += knewstuff
+#SUBDIR += ksvg
+#SUBDIR += kio
+#SUBDIR += kparts
+#SUBDIR += kcmutils
+#SUBDIR += baloo
+#SUBDIR += knotifyconfig
+#SUBDIR += ktexteditor
+#SUBDIR += krunner
+#SUBDIR += purpose
+#SUBDIR += kdav
 
 # tier 4
 # frameworkintegration - needs AppStream 1.0. It needs a current release of
 # PackageKit for the Qt 6 library.
-SUBDIR += frameworkintegration
+#SUBDIR += frameworkintegration
 
 # corresponding software isn't ported
 #SUBDIR += modemmanager-qt
diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile
index 0832ff044cd..a41ea1ff7a3 100644
--- a/devel/zeal/Makefile
+++ b/devel/zeal/Makefile
@@ -31,7 +31,7 @@ EXTRACT_SUFX =	.tar.xz
 
 MODULES =	x11/qt6 devel/cmake
 
-BUILD_DEPENDS =	devel/kf5/extra-cmake-modules
+BUILD_DEPENDS =	devel/kf6/extra-cmake-modules
 
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+4,-guic
diff --git a/emulators/melonds/Makefile b/emulators/melonds/Makefile
index 83fbd98bbe2..17b1945238a 100644
--- a/emulators/melonds/Makefile
+++ b/emulators/melonds/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS =	archivers/libarchive \
 		devel/sdl2 \
 		net/libslirp \
 		x11/qt5/qtmultimedia
-BUILD_DEPENDS =	devel/kf5/extra-cmake-modules
+BUILD_DEPENDS =	devel/kf6/extra-cmake-modules
 RUN_DEPENDS =	x11/gtk+4,-guic \
 		devel/desktop-file-utils
 
diff --git a/net/kdeconnect-kde/Makefile b/net/kdeconnect-kde/Makefile
index 5fdf67c8221..06ab2795624 100644
--- a/net/kdeconnect-kde/Makefile
+++ b/net/kdeconnect-kde/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	KDE app that allows your devices to communicate
 
 DISTNAME =	kdeconnect-kde-${MODKDE_VERSION}
+REVISION =	0
 
 SHARED_LIBS +=	kdeconnectcore		5.0 # 1.4
 SHARED_LIBS +=	kdeconnectinterfaces	5.0 # 1.4
@@ -43,7 +44,7 @@ BUILD_DEPENDS =	devel/gettext,-tools \
 		wayland/plasma-wayland-protocols
 
 RUN_DEPENDS =	devel/desktop-file-utils \
-		devel/kf5/breeze-icons \
+		devel/kf6/breeze-icons \
 		devel/kf5/kirigami2 \
 		devel/kf5/qqc2-desktop-style \
 		sysutils/sshfs-fuse \
diff --git a/net/nextcloudclient/Makefile b/net/nextcloudclient/Makefile
index fc2588232c6..d637c4a4a37 100644
--- a/net/nextcloudclient/Makefile
+++ b/net/nextcloudclient/Makefile
@@ -38,7 +38,7 @@ BUILD_DEPENDS =		devel/gettext,-tools
 BUILD_DEPENDS +=	x11/gnome/librsvg
 
 # FindInotify.cmake
-BUILD_DEPENDS +=	devel/kf5/extra-cmake-modules
+BUILD_DEPENDS +=	devel/kf6/extra-cmake-modules
 
 # for tests, but detected during configure
 BUILD_DEPENDS +=	devel/cmocka
diff --git a/net/owncloudclient/Makefile b/net/owncloudclient/Makefile
index 7fa3d79399c..c0739a287b2 100644
--- a/net/owncloudclient/Makefile
+++ b/net/owncloudclient/Makefile
@@ -30,7 +30,7 @@ SITES.a = 	https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/ref
 
 MODULES =		devel/cmake x11/qt5
 
-BUILD_DEPENDS = 	devel/kf5/extra-cmake-modules
+BUILD_DEPENDS = 	devel/kf6/extra-cmake-modules
 RUN_DEPENDS =		devel/desktop-file-utils \
 			misc/shared-mime-info \
 			x11/gtk+4,-guic
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index 0f3c334a262..66527ad752d 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -2,7 +2,7 @@ COMMENT =	powerful batch file renamer
 
 VERSION =	5.0.2
 DISTNAME =	krename-${VERSION}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	sysutils x11
 
@@ -29,7 +29,7 @@ MODULES =	devel/kf5
 BUILD_DEPENDS =	devel/gettext,-tools
 
 RUN_DEPENDS =	devel/desktop-file-utils \
-		devel/kf5/breeze-icons \
+		devel/kf6/breeze-icons \
 		x11/gtk+4,-guic
 
 LIB_DEPENDS =	audio/taglib \
diff --git a/x11/kde-applications/kdenlive/Makefile b/x11/kde-applications/kdenlive/Makefile
index 38025196a8d..467d2e5715e 100644
--- a/x11/kde-applications/kdenlive/Makefile
+++ b/x11/kde-applications/kdenlive/Makefile
@@ -3,6 +3,7 @@ USE_WXNEEDED =	Yes
 
 COMMENT =	non-linear video editor for KDE
 DISTNAME =	kdenlive-${VERSION}
+REVISION =	0
 CATEGORIES =	multimedia
 
 WANTLIB += ${COMPILER_LIBCXX} KF5Archive KF5Attica KF5Auth KF5AuthCore
@@ -26,7 +27,7 @@ MODKDE5_DOCS = yes
 
 MODULES +=	lang/python
 
-RUN_DEPENDS =	devel/kf5/breeze-icons \
+RUN_DEPENDS =	devel/kf6/breeze-icons \
 		devel/kf5/kinit \
 		graphics/ffmpeg \
 		misc/shared-mime-info \
diff --git a/x11/kde-applications/kirigami-gallery/Makefile b/x11/kde-applications/kirigami-gallery/Makefile
index aee3eae7104..ac1a5cfcdb1 100644
--- a/x11/kde-applications/kirigami-gallery/Makefile
+++ b/x11/kde-applications/kirigami-gallery/Makefile
@@ -1,5 +1,6 @@
 COMMENT =	kirigami component gallery application
 DISTNAME =	kirigami-gallery-${VERSION}
+REVISION =	0
 CATEGORIES =	devel
 
 HOMEPAGE =	https://apps.kde.org/de/kirigami2.gallery/
@@ -15,7 +16,7 @@ BUILD_DEPENDS =	devel/kf5/kpackage \
 		x11/qt5/qtquickcontrols
 
 RUN_DEPENDS =	devel/kf5/kpackage \
-		devel/kf5/breeze-icons \
+		devel/kf6/breeze-icons \
 		devel/kf5/qqc2-desktop-style \
 		x11/qt5/qtquickcontrols
 
diff --git a/x11/kde-plasma/breeze/Makefile b/x11/kde-plasma/breeze/Makefile
index 58b47a8aef8..295fae2caf6 100644
--- a/x11/kde-plasma/breeze/Makefile
+++ b/x11/kde-plasma/breeze/Makefile
@@ -1,5 +1,6 @@
 COMMENT =		Breeze KDE desktop theme
 DISTNAME =		breeze-${VERSION}
+REVISION =		0
 
 SHARED_LIBS +=  breezecommon5         1.0 # 5.12.0
 
@@ -17,7 +18,7 @@ BUILD_DEPENDS =	devel/kf5/kpackage
 
 RUN_DEPENDS =	devel/desktop-file-utils \
 		devel/kf5/kpackage \
-		devel/kf5/breeze-icons
+		devel/kf6/breeze-icons
 
 LIB_DEPENDS =	devel/kf5/frameworkintegration \
 		devel/kf5/kauth \
diff --git a/x11/kde-plasma/oxygen/Makefile b/x11/kde-plasma/oxygen/Makefile
index 00733815775..37356faeb4f 100644
--- a/x11/kde-plasma/oxygen/Makefile
+++ b/x11/kde-plasma/oxygen/Makefile
@@ -1,5 +1,6 @@
 COMMENT =		style for Qt/KDE Applications
 DISTNAME =		oxygen-${VERSION}
+REVISION =		0
 
 SHARED_LIBS =		oxygenstyle5		1.0
 SHARED_LIBS +=		oxygenstyleconfig5	0.0
@@ -16,7 +17,7 @@ MODKDE5_TRANSLATIONS = Yes
 BUILD_DEPENDS =		devel/kf5/kpackage
 
 RUN_DEPENDS =		devel/kf5/kpackage \
-			devel/kf5/breeze-icons
+			devel/kf6/breeze-icons
 
 LIB_DEPENDS =		devel/kf5/frameworkintegration \
 			devel/kf5/kauth \
diff --git a/x11/lightly/Makefile b/x11/lightly/Makefile
index ab204bfe659..7e237d15639 100644
--- a/x11/lightly/Makefile
+++ b/x11/lightly/Makefile
@@ -5,7 +5,7 @@ GH_PROJECT =	Lightly
 GH_TAGNAME =	v0.4.1
 
 PKGNAME =	${DISTNAME:L}
-REVISION =	2
+REVISION =	3
 
 SHARED_LIBS =	lightlycommon5	0.0 # 0.4.1
 
@@ -30,7 +30,7 @@ BUILD_DEPENDS =		devel/gettext,-tools \
 
 RUN_DEPENDS =		x11/gtk+4,-guic \
 			devel/kf5/kpackage \
-			devel/kf5/breeze-icons
+			devel/kf6/breeze-icons
 
 LIB_DEPENDS =		devel/kf5/frameworkintegration \
 			devel/kf5/kauth \