NEW: kde.port.mk

Rafael Sadowski Wed, 17 Jul 2024 13:03:33 -0700

Would like to merge x11/kde-applications/kde-applications.port.mk to use
it in all KDE ports:


The main reason is to have the versions also in meta/kde:

MODKDE_GEAR_VERSION ?=          24.05.2
MODKDE_PLASMA_VERSION ?=        6.1.3

Full diff that has gone through a whole bulk build.

Objections? Feedback?

diff --git a/audio/pulseaudio-qt/Makefile b/audio/pulseaudio-qt/Makefile
index e8467ce4f64..01b055d8ffd 100644
--- a/audio/pulseaudio-qt/Makefile
+++ b/audio/pulseaudio-qt/Makefile
@@ -19,8 +19,7 @@ PERMIT_PACKAGE =      Yes
 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui glib-2.0
 WANTLIB += intl m
 
-MODULES =      x11/kde-applications \
-               devel/kf6
+MODULES =      x11/kde
 
 BUILD_DEPENDS =        audio/pulseaudio
 
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 0e1a1d99509..9c3bc983465 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -3,7 +3,8 @@ USE_WXNEEDED =          Yes
 COMMENT =      IDE for C, C++, Python, QML/JavaScript and PHP
 
 CATEGORIES =   devel x11
-DISTNAME =     kdevelop-${MODKDE_VERSION}
+
+DISTNAME =     kdevelop-${MODKDE_GEAR_VERSION}
 REVISION =     0
 
 HOMEPAGE =     https://www.kdevelop.org/
@@ -51,10 +52,9 @@ WANTLIB += svn_subr-1 svn_wc-1
 
 WANTLIB += llvm${MODCLANG_VERSION}/lib/clang
 
-SITES =        ${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =        ${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 
-MODULES =      x11/kde-applications \
-               devel/kf5 \
+MODULES =      x11/kde \
                lang/clang \
                lang/python
 
@@ -125,7 +125,7 @@ LIB_DEPENDS =       ${MODCLANG_LIB_DEPENDS} \
                devel/kf5/threadweaver \
                devel/subversion \
                x11/grantlee-qt5>=5.3 \
-               x11/kde-applications/libkomparediff2>=${MODKDE_VERSION} \
+               x11/kde-applications/libkomparediff2>=${MODKDE_GEAR_VERSION} \
                x11/kde-applications/okteta>=0.26.1v0 \
                x11/qt5/qtdeclarative \
                x11/qt5/qtlocation \
diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile
index d2e2b6c93cd..53d1be0b2c6 100644
--- a/editors/ghostwriter/Makefile
+++ b/editors/ghostwriter/Makefile
@@ -3,7 +3,7 @@ USE_WXNEEDED =  Yes
 
 COMMENT =      distraction-free Markdown editor
 
-DISTNAME =     ghostwriter-${MODKDE_VERSION}
+DISTNAME =     ghostwriter-${MODKDE_GEAR_VERSION}
 
 CATEGORIES =   editors
 
@@ -20,10 +20,9 @@ WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5Svg Qt5WebChannel 
Qt5WebEngineCore
 WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5Xml c hunspell-1.7
 WANTLIB += m
 
-SITES =        ${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =        ${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 
-MODULES =              x11/kde-applications \
-                       devel/kf5
+MODULES =              x11/kde
 
 MODKDE_KF5 =           Yes
 
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index a016b75da7f..d327e7a9315 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -1,12 +1,12 @@
 COMMENT =      scanning application for KDE
 
-DISTNAME =     skanlite-${MODKDE_VERSION}
+DISTNAME =     skanlite-${MODKDE_GEAR_VERSION}
 
 CATEGORIES =   graphics
 
 HOMEPAGE =     https://kde.org/applications/graphics/org.kde.skanlite
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX = .tar.xz
 
 MAINTAINER =   Rafael Sadowski <rsadow...@openbsd.org>
@@ -21,8 +21,7 @@ WANTLIB += KF5Sane KF5Service KF5Solid KF5WidgetsAddons 
KF5WindowSystem
 WANTLIB += KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network
 WANTLIB += Qt5Widgets Qt5Xml X11 c m
 
-MODULES =      x11/kde-applications \
-               devel/kf5
+MODULES =      x11/kde
 
 MODEKDE_KF5 =  Yes
 
@@ -46,7 +45,7 @@ LIB_DEPENDS = devel/kf5/kauth \
                devel/kf5/kwindowsystem \
                devel/kf5/kxmlgui \
                devel/kf5/solid \
-               x11/kde-applications/libksane>=${MODKDE_VERSION}
+               x11/kde-applications/libksane>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/meta/kde/Makefile b/meta/kde/Makefile
index 7616bb9692f..4d2bbb8537a 100644
--- a/meta/kde/Makefile
+++ b/meta/kde/Makefile
@@ -1,4 +1,4 @@
-PKGNAME =              kde-${MODKDE_VERSION}
+PKGNAME =              kde-${MODKDE_GEAR_VERSION}
 
 COMMENT-accessibility =        KDE accessibility applications
 COMMENT-admin =                KDE system administrator tools
@@ -15,21 +15,20 @@ COMMENT-utils =             KDE utilities
 COMMENT-plasma =       KDE Plasma desktop meta-package (base installation)
 COMMENT-plasma-extras =        KDE Plasma desktop meta-package (full 
installation)
 
-PKGNAME-accessibility =        kde-accessibility-${MODKDE_VERSION}
-PKGNAME-admin =                kde-admin-${MODKDE_VERSION}
-PKGNAME-education =    kde-education-${MODKDE_VERSION}
-PKGNAME-games =                kde-games-${MODKDE_VERSION}
-PKGNAME-graphics =     kde-graphics-${MODKDE_VERSION}
-PKGNAME-main =         kde-${MODKDE_VERSION}
-PKGNAME-multimedia =   kde-multimedia-${MODKDE_VERSION}
-PKGNAME-network =      kde-network-${MODKDE_VERSION}
-PKGNAME-pim =          kde-pim-${MODKDE_VERSION}
-PKGNAME-development =  kde-development-${MODKDE_VERSION}
-PKGNAME-utils =                kde-utils-${MODKDE_VERSION}
-
-PLASMA_VERSION =       6.1.3
-PKGNAME-plasma =       kde-plasma-${PLASMA_VERSION}
-PKGNAME-plasma-extras =        kde-plasma-extras-${PLASMA_VERSION}
+PKGNAME-accessibility =        kde-accessibility-${MODKDE_GEAR_VERSION}
+PKGNAME-admin =                kde-admin-${MODKDE_GEAR_VERSION}
+PKGNAME-education =    kde-education-${MODKDE_GEAR_VERSION}
+PKGNAME-games =                kde-games-${MODKDE_GEAR_VERSION}
+PKGNAME-graphics =     kde-graphics-${MODKDE_GEAR_VERSION}
+PKGNAME-main =         kde-${MODKDE_GEAR_VERSION}
+PKGNAME-multimedia =   kde-multimedia-${MODKDE_GEAR_VERSION}
+PKGNAME-network =      kde-network-${MODKDE_GEAR_VERSION}
+PKGNAME-pim =          kde-pim-${MODKDE_GEAR_VERSION}
+PKGNAME-development =  kde-development-${MODKDE_GEAR_VERSION}
+PKGNAME-utils =                kde-utils-${MODKDE_GEAR_VERSION}
+
+PKGNAME-plasma =       kde-plasma-${MODKE_PLASMA_VERSION}
+PKGNAME-plasma-extras =        kde-plasma-extras-${MODKE_PLASMA_VERSION}
 
 MULTI_PACKAGES +=      -main \
                        -games \
@@ -48,7 +47,7 @@ MULTI_PACKAGES +=     -plasma \
 
 HOMEPAGE =     https://kde.org
 
-MODULES =      x11/kde-applications
+MODULES =      x11/kde
 
 WANTLIB-accessibility =
 LIB_DEPENDS-accessibility =
@@ -346,17 +345,17 @@ RUN_DEPENDS-main = \
        x11/kde-applications/kipi-plugins \
        x11/kde-applications/konqueror \
        x11/kde-applications/konsole \
-       ${BUILD_PKGPATH},-accessibility=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-admin=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-development=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-education=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-games=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-graphics=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-multimedia=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-network=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-network=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-pim=${MODKDE_VERSION} \
-       ${BUILD_PKGPATH},-utils=${MODKDE_VERSION}
+       ${BUILD_PKGPATH},-accessibility=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-admin=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-development=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-education=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-games=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-graphics=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-multimedia=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-network=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-network=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-pim=${MODKDE_GEAR_VERSION} \
+       ${BUILD_PKGPATH},-utils=${MODKDE_GEAR_VERSION}
 
 WANTLIB-plasma =
 LIB_DEPENDS-plasma =
@@ -409,7 +408,7 @@ RUN_DEPENDS-plasma += \
 
 # extra apps
 RUN_DEPENDS-plasma-extras += \
-               ${BUILD_PKGPATH},-plasma=${PLASMA_VERSION} \
+               ${BUILD_PKGPATH},-plasma=${MODKE_PLASMA_VERSION} \
                net/kdeconnect-kde \
                x11/kde-applications/ark \
                x11/kde-applications/gwenview \
diff --git a/net/kdeconnect-kde/Makefile b/net/kdeconnect-kde/Makefile
index 02cd7ecd6ec..115766db392 100644
--- a/net/kdeconnect-kde/Makefile
+++ b/net/kdeconnect-kde/Makefile
@@ -1,6 +1,6 @@
 COMMENT =      KDE app that allows your devices to communicate
 
-DISTNAME =     kdeconnect-kde-${MODKDE_VERSION}
+DISTNAME =     kdeconnect-kde-${MODKDE_GEAR_VERSION}
 
 SHARED_LIBS += kdeconnectcore          6.0 # 1.4
 SHARED_LIBS += kdeconnectpluginkcm     1.0 # 1.4
@@ -27,11 +27,10 @@ WANTLIB += Qt6WaylandClient Qt6Widgets Qt6Xml SM X11 Xext 
Xtst
 WANTLIB += c crypto dbus-1 fakekey m wayland-client wayland-cursor
 WANTLIB += xkbcommon
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX =         .tar.xz
 
-MODULES =      x11/kde-applications \
-               devel/kf6 \
+MODULES =      x11/kde \
                lang/python
 
 MODPY_RUNDEP = No
diff --git a/net/konversation/Makefile b/net/konversation/Makefile
index 7ee047c3e37..88298deb268 100644
--- a/net/konversation/Makefile
+++ b/net/konversation/Makefile
@@ -1,6 +1,6 @@
 COMMENT =      IRC client for KDE
 
-DISTNAME =     konversation-${MODKDE_VERSION}
+DISTNAME =     konversation-${MODKDE_GEAR_VERSION}
 
 CATEGORIES =   net
 
@@ -22,11 +22,10 @@ WANTLIB += Qt6Network Qt6Widgets Qt6Xml X11 c m qca-qt6
 # LGPLv2.1+, GPLv2+, GPLv3
 PERMIT_PACKAGE =       Yes
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX = .tar.xz
 
-MODULES =      x11/kde-applications \
-               devel/kf6 \
+MODULES =      x11/kde \
                lang/python
 
 BUILD_DEPENDS =        devel/gettext,-tools \
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index 87255f10929..28d63bc1be3 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -2,7 +2,7 @@ USE_WXNEEDED =  Yes
 
 COMMENT =      BitTorrent Client
 
-DISTNAME =     ktorrent-${MODKDE_VERSION}
+DISTNAME =     ktorrent-${MODKDE_GEAR_VERSION}
 
 SHARED_LIBS +=  ktcore                    3.0 # 0.0
 
@@ -31,11 +31,10 @@ WANTLIB += Qt6Quick Qt6WebChannel Qt6WebEngineCore 
Qt6WebEngineWidgets
 WANTLIB += Qt6Widgets Qt6Xml X11 c gcrypt gmp m maxminddb phonon4qt6
 WANTLIB += tag
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX = .tar.xz
 
-MODULES =              x11/kde-applications \
-                       devel/kf6
+MODULES =              x11/kde
 
 BUILD_DEPENDS =                devel/gettext,-tools \
                        devel/boost
@@ -76,7 +75,7 @@ LIB_DEPENDS =         audio/taglib \
                        devel/kf6/sonnet \
                        devel/kf6/syndication \
                        multimedia/phonon,qt6 \
-                       net/libktorrent>=${MODKDE_VERSION} \
+                       net/libktorrent>=${MODKDE_GEAR_VERSION} \
                        net/libmaxminddb \
                        security/libgcrypt \
                        x11/qt6/qt5compat \
diff --git a/net/libktorrent/Makefile b/net/libktorrent/Makefile
index 316e29064b1..4ed95381662 100644
--- a/net/libktorrent/Makefile
+++ b/net/libktorrent/Makefile
@@ -1,6 +1,6 @@
 COMMENT =      KTorrent engine
 
-DISTNAME =     libktorrent-${MODKDE_VERSION}
+DISTNAME =     libktorrent-${MODKDE_GEAR_VERSION}
 
 CATEGORIES =   net
 
@@ -16,11 +16,10 @@ WANTLIB += Qt6Xml gcrypt gmp m
 # LGPLv2.1+, GPLv2+, GPLv3
 PERMIT_PACKAGE =       Yes
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX = .tar.xz
 
-MODULES =      x11/kde-applications \
-               devel/kf6
+MODULES =      x11/kde
 
 BUILD_DEPENDS =        devel/boost \
                devel/gettext,-tools \
diff --git a/net/neochat/Makefile b/net/neochat/Makefile
index 1af0dd057a4..8d669553e2a 100644
--- a/net/neochat/Makefile
+++ b/net/neochat/Makefile
@@ -1,8 +1,8 @@
 COMMENT =      client for Matrix chat
-DISTNAME =     neochat-${MODKDE_VERSION}
+DISTNAME =     neochat-${MODKDE_GEAR_VERSION}
 CATEGORIES=    net
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX = .tar.xz
 
 HOMEPAGE =     https://apps.kde.org/de/neochat/
@@ -21,8 +21,7 @@ WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick 
Qt6QuickControls2
 WANTLIB += Qt6Sql Qt6WebView Qt6Widgets QuotientQt6 X11 c cmark
 WANTLIB += icuuc m olm qt6keychain
 
-MODULES =      x11/kde-applications \
-               devel/kf6
+MODULES =      x11/kde
 
 RUN_DEPENDS =  devel/desktop-file-utils \
                devel/kf6/kitemmodels \
diff --git a/x11/kde-applications/Makefile.inc 
b/x11/kde-applications/Makefile.inc
index 7427eb56a9f..3758189e229 100644
--- a/x11/kde-applications/Makefile.inc
+++ b/x11/kde-applications/Makefile.inc
@@ -14,21 +14,14 @@ MAINTAINER ?=               Rafael Sadowski 
<rsadow...@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 \
+MODULES :=             x11/kde \
                        ${MODULES}
 
 # usual KDE rules:
 # LGPLv2.1+, GPLv2+, GPLv3
 PERMIT_PACKAGE ?=      Yes
 
-VERSION ?=             ${MODKDE_VERSION}
+VERSION ?=             ${MODKDE_GEAR_VERSION}
 
 SITES ?=               ${SITE_KDE:=stable/release-service/${VERSION}/src/}
 EXTRACT_SUFX ?=                .tar.xz
diff --git a/x11/kde-applications/akonadi-calendar-tools/Makefile 
b/x11/kde-applications/akonadi-calendar-tools/Makefile
index 3ba06922f95..16a89291692 100644
--- a/x11/kde-applications/akonadi-calendar-tools/Makefile
+++ b/x11/kde-applications/akonadi-calendar-tools/Makefile
@@ -26,10 +26,10 @@ LIB_DEPENDS =       devel/kf6/kconfig \
                devel/kf6/ki18n \
                devel/kf6/kitemmodels \
                devel/kf6/kwidgetsaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/calendarsupport>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/calendarsupport>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/akonadi-calendar/Makefile 
b/x11/kde-applications/akonadi-calendar/Makefile
index 54db05f5eaf..3523a58d197 100644
--- a/x11/kde-applications/akonadi-calendar/Makefile
+++ b/x11/kde-applications/akonadi-calendar/Makefile
@@ -42,20 +42,20 @@ LIB_DEPENDS =       devel/kf6/kcalendarcore \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/akonadi-contacts/Makefile 
b/x11/kde-applications/akonadi-contacts/Makefile
index 93468304013..1af5a5ea5fd 100644
--- a/x11/kde-applications/akonadi-contacts/Makefile
+++ b/x11/kde-applications/akonadi-contacts/Makefile
@@ -42,9 +42,9 @@ LIB_DEPENDS = devel/kf6/kcodecs \
                devel/kf6/solid \
                devel/kf6/sonnet \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/akonadi-import-wizard/Makefile 
b/x11/kde-applications/akonadi-import-wizard/Makefile
index 72cde751765..815527b9971 100644
--- a/x11/kde-applications/akonadi-import-wizard/Makefile
+++ b/x11/kde-applications/akonadi-import-wizard/Makefile
@@ -49,21 +49,21 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/libassuan \
                security/qtkeychain,qt6 \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION} \
-               x11/kde-applications/mailimporter>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailimporter>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 CXXFLAGS +=    -I${LOCALBASE}/include/KPim5/MessageViewer
 
diff --git a/x11/kde-applications/akonadi-mime/Makefile 
b/x11/kde-applications/akonadi-mime/Makefile
index 74bbc7c1f4a..c058b9eee3f 100644
--- a/x11/kde-applications/akonadi-mime/Makefile
+++ b/x11/kde-applications/akonadi-mime/Makefile
@@ -29,8 +29,8 @@ LIB_DEPENDS = devel/kf6/kconfig \
                devel/kf6/kitemmodels \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/akonadi-notes/Makefile 
b/x11/kde-applications/akonadi-notes/Makefile
index 6d238b40c8d..b7df2ef08ff 100644
--- a/x11/kde-applications/akonadi-notes/Makefile
+++ b/x11/kde-applications/akonadi-notes/Makefile
@@ -12,7 +12,7 @@ MODKDE_TRANSLATIONS = yes
 BUILD_DEPENDS =        devel/kf6/kcodecs
 
 LIB_DEPENDS =  devel/kf6/ki18n \
-               x11/kde-applications/kmime>=${MODKDE_VERSION}
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/akonadi-search/Makefile 
b/x11/kde-applications/akonadi-search/Makefile
index 7c60dd3ad18..3fd8d0e30e8 100644
--- a/x11/kde-applications/akonadi-search/Makefile
+++ b/x11/kde-applications/akonadi-search/Makefile
@@ -35,9 +35,9 @@ LIB_DEPENDS = databases/xapian-core \
                devel/kf6/kwidgetsaddons \
                textproc/ktextaddons \
                x11/qt6/qtdeclarative \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/akonadi/Makefile 
b/x11/kde-applications/akonadi/Makefile
index 53ecbab5c3e..9d20d33af3f 100644
--- a/x11/kde-applications/akonadi/Makefile
+++ b/x11/kde-applications/akonadi/Makefile
@@ -57,7 +57,7 @@ LIB_DEPENDS =         archivers/xz \
                        devel/kf6/kxmlgui \
                        net/libaccounts-qt,qt6 \
                        textproc/libxml \
-                       
x11/kde-applications/kf6-kaccounts-integration>=${MODKDE_VERSION}
+                       
x11/kde-applications/kf6-kaccounts-integration>=${MODKDE_GEAR_VERSION}
 
 CONFIGURE_ARGS =       -DDATABASE_BACKEND=SQLITE
 
diff --git a/x11/kde-applications/akonadiconsole/Makefile 
b/x11/kde-applications/akonadiconsole/Makefile
index 5612e11b4f9..fd86416cc08 100644
--- a/x11/kde-applications/akonadiconsole/Makefile
+++ b/x11/kde-applications/akonadiconsole/Makefile
@@ -51,20 +51,20 @@ LIB_DEPENDS =       databases/xapian-core \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-search>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/calendarsupport>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-search>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/calendarsupport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/akregator/Makefile 
b/x11/kde-applications/akregator/Makefile
index 96f464f83d1..523999c04a5 100644
--- a/x11/kde-applications/akregator/Makefile
+++ b/x11/kde-applications/akregator/Makefile
@@ -39,16 +39,16 @@ MODKF5_I18N_CONFLICT = yes
 BUILD_DEPENDS =        devel/boost \
                devel/kf6/kitemviews \
                devel/kf6/ktexteditor \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION}
 
 RUN_DEPENDS =  devel/kf6/kitemviews \
                devel/kf6/ktexteditor \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcmutils \
                devel/kf6/kcodecs \
@@ -79,16 +79,16 @@ LIB_DEPENDS =       devel/kf6/kcmutils \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kontactinterface>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kontactinterface>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/audiocd-kio/Makefile 
b/x11/kde-applications/audiocd-kio/Makefile
index e88ab6f8303..09376f0d866 100644
--- a/x11/kde-applications/audiocd-kio/Makefile
+++ b/x11/kde-applications/audiocd-kio/Makefile
@@ -29,8 +29,8 @@ LIB_DEPENDS = audio/cdparanoia \
                devel/kf6/ki18n \
                devel/kf6/kio \
                devel/kf6/kwidgetsaddons \
-               x11/kde-applications/kf6-libkcddb>=${MODKDE_VERSION} \
-               x11/kde-applications/kf6-libkcompactdisc>=${MODKDE_VERSION} \
+               x11/kde-applications/kf6-libkcddb>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kf6-libkcompactdisc>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 MODCMAKE_LDFLAGS =     -L${X11BASE}/lib -L${LOCALBASE}/lib
diff --git a/x11/kde-applications/bomber/Makefile 
b/x11/kde-applications/bomber/Makefile
index 6b0d30e0297..5eab336edd7 100644
--- a/x11/kde-applications/bomber/Makefile
+++ b/x11/kde-applications/bomber/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/bovo/Makefile 
b/x11/kde-applications/bovo/Makefile
index a26374e92de..f955328282c 100644
--- a/x11/kde-applications/bovo/Makefile
+++ b/x11/kde-applications/bovo/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/calendarsupport/Makefile 
b/x11/kde-applications/calendarsupport/Makefile
index ad3f0951c85..f97ba3e94dc 100644
--- a/x11/kde-applications/calendarsupport/Makefile
+++ b/x11/kde-applications/calendarsupport/Makefile
@@ -19,7 +19,7 @@ MODKF5_L10N_CONFLICT = yes
 
 BUILD_DEPENDS =        devel/boost
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcalendarcore \
                devel/kf6/kcodecs \
@@ -38,13 +38,13 @@ LIB_DEPENDS =       devel/kf6/kcalendarcore \
                devel/kf6/kwidgetsaddons \
                devel/kf6/solid \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-notes>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-notes>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/cantor/Makefile 
b/x11/kde-applications/cantor/Makefile
index bd359ae22f4..6731c80e42c 100644
--- a/x11/kde-applications/cantor/Makefile
+++ b/x11/kde-applications/cantor/Makefile
@@ -85,7 +85,7 @@ LIB_DEPENDS = devel/gettext,-runtime \
 LIB_DEPENDS += math/R
 WANTLIB += lib/R/lib/R lib/R/lib/Rblas lib/R/lib/Rlapack
 
-#x11/kde-applications/analitza>=${MODKDE_VERSION}
+#x11/kde-applications/analitza>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/dolphin-plugins/Makefile 
b/x11/kde-applications/dolphin-plugins/Makefile
index 6cfb2facb02..81e05374218 100644
--- a/x11/kde-applications/dolphin-plugins/Makefile
+++ b/x11/kde-applications/dolphin-plugins/Makefile
@@ -33,6 +33,6 @@ LIB_DEPENDS = devel/kf6/kbookmarks \
                devel/kf6/solid \
                devel/kf6/sonnet \
                devel/kf6/syntax-highlighting \
-               x11/kde-applications/dolphin>=${MODKDE_VERSION}
+               x11/kde-applications/dolphin>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/dolphin/Makefile 
b/x11/kde-applications/dolphin/Makefile
index e3e1e3de0b9..1a2238ed557 100644
--- a/x11/kde-applications/dolphin/Makefile
+++ b/x11/kde-applications/dolphin/Makefile
@@ -32,10 +32,10 @@ BUILD_DEPENDS =     print/poppler,-qt6 \
 
 RUN_DEPENDS =  devel/kf6/kfilemetadata \
                misc/shared-mime-info \
-               x11/kde-applications/ffmpegthumbs>=${MODKDE_VERSION} \
-               x11/kde-applications/kdesdk-thumbnailers>=${MODKDE_VERSION} \
-               x11/kde-applications/kf6-kio-extras>=${MODKDE_VERSION} \
-               x11/kde-applications/konsole>=${MODKDE_VERSION}
+               x11/kde-applications/ffmpegthumbs>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kdesdk-thumbnailers>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kf6-kio-extras>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/konsole>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/attica \
                devel/kf6/kbookmarks \
@@ -69,7 +69,7 @@ LIB_DEPENDS = devel/kf6/attica \
                multimedia/phonon,qt6 \
                x11/xkbcommon
 
-#x11/kde-applications/baloo-widgets>=${MODKDE_VERSION}
+#x11/kde-applications/baloo-widgets>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/eventviews/Makefile 
b/x11/kde-applications/eventviews/Makefile
index 53be8cae13a..37b3c0315a1 100644
--- a/x11/kde-applications/eventviews/Makefile
+++ b/x11/kde-applications/eventviews/Makefile
@@ -19,7 +19,7 @@ MODKF5_L10N_CONFLICT = yes
 BUILD_DEPENDS =        textproc/libxslt \
                devel/boost
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcalendarcore \
                devel/kf6/kcodecs \
@@ -37,12 +37,12 @@ LIB_DEPENDS =       devel/kf6/kcalendarcore \
                devel/kf6/kservice \
                devel/kf6/kwidgetsaddons \
                graphics/kdiagram-qt6 \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/calendarsupport>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/calendarsupport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/filelight/Makefile 
b/x11/kde-applications/filelight/Makefile
index d8b4ae449a2..2ac1bd18fb0 100644
--- a/x11/kde-applications/filelight/Makefile
+++ b/x11/kde-applications/filelight/Makefile
@@ -24,12 +24,12 @@ BUILD_DEPENDS =     devel/kf6/kitemviews \
                devel/kf6/qqc2-desktop-style \
                devel/kf6/kirigami \
                graphics/kirigami-addons \
-               x11/kde-applications/kqtquickcharts>=${MODKDE_VERSION}
+               x11/kde-applications/kqtquickcharts>=${MODKDE_GEAR_VERSION}
 
 RUN_DEPENDS =  devel/kf6/qqc2-desktop-style \
                devel/kf6/kirigami \
                graphics/kirigami-addons \
-               x11/kde-applications/kqtquickcharts>=${MODKDE_VERSION}
+               x11/kde-applications/kqtquickcharts>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcolorscheme \
                devel/kf6/kcompletion \
diff --git a/x11/kde-applications/granatier/Makefile 
b/x11/kde-applications/granatier/Makefile
index 23caa43394a..bcc2d4fbc7f 100644
--- a/x11/kde-applications/granatier/Makefile
+++ b/x11/kde-applications/granatier/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS = devel/kf6/kconfig \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/grantlee-editor/Makefile 
b/x11/kde-applications/grantlee-editor/Makefile
index a4112497272..44f267253af 100644
--- a/x11/kde-applications/grantlee-editor/Makefile
+++ b/x11/kde-applications/grantlee-editor/Makefile
@@ -30,7 +30,7 @@ MODKF5_I18N_CONFLICT = yes
 BUILD_DEPENDS =        devel/boost \
                devel/kf6/ktexteditor
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/karchive \
                devel/kf6/kcolorscheme \
@@ -54,15 +54,15 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/gwenview/Makefile 
b/x11/kde-applications/gwenview/Makefile
index 79f15a17d8e..81e62b6a688 100644
--- a/x11/kde-applications/gwenview/Makefile
+++ b/x11/kde-applications/gwenview/Makefile
@@ -29,9 +29,9 @@ BUILD_DEPENDS =       wayland/wayland-protocols \
                wayland/plasma-wayland-protocols
 
 RUN_DEPENDS =  devel/kf6/kfilemetadata \
-               x11/kde-applications/ffmpegthumbs>=${MODKDE_VERSION} \
-               x11/kde-applications/kdesdk-thumbnailers>=${MODKDE_VERSION} \
-               x11/kde-applications/kf6-kio-extras>=${MODKDE_VERSION}
+               x11/kde-applications/ffmpegthumbs>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kdesdk-thumbnailers>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kf6-kio-extras>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/baloo \
                devel/kf6/kbookmarks \
@@ -65,7 +65,7 @@ LIB_DEPENDS = devel/kf6/baloo \
                math/cfitsio \
                multimedia/phonon,qt6 \
                wayland/wayland \
-               x11/kde-applications/kf6-libkdcraw>=${MODKDE_VERSION} \
+               x11/kde-applications/kf6-libkdcraw>=${MODKDE_GEAR_VERSION} \
                x11/kde-plasma/plasma-activities \
                x11/qt6/qtsvg \
                x11/qt6/qtwayland \
diff --git a/x11/kde-applications/incidenceeditor/Makefile 
b/x11/kde-applications/incidenceeditor/Makefile
index 0b23583fc5a..f15c3f537f0 100644
--- a/x11/kde-applications/incidenceeditor/Makefile
+++ b/x11/kde-applications/incidenceeditor/Makefile
@@ -47,21 +47,21 @@ LIB_DEPENDS =       graphics/kdiagram-qt6 \
                devel/kf6/solid \
                devel/kf6/sonnet \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/calendarsupport>=${MODKDE_VERSION} \
-               x11/kde-applications/eventviews>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kldap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/calendarsupport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/eventviews>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kldap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/kaccounts-providers/Makefile 
b/x11/kde-applications/kaccounts-providers/Makefile
index c909ad71244..f1d5099b62b 100644
--- a/x11/kde-applications/kaccounts-providers/Makefile
+++ b/x11/kde-applications/kaccounts-providers/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS = devel/kf6/kcoreaddons \
                devel/kf6/kio \
                devel/kf6/kpackage \
                net/libaccounts-qt,qt6 \
-               
x11/kde-applications/kf6-kaccounts-integration>=${MODKDE_VERSION} \
+               
x11/kde-applications/kf6-kaccounts-integration>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/kaddressbook/Makefile 
b/x11/kde-applications/kaddressbook/Makefile
index 997f276ede6..038b77dd3d9 100644
--- a/x11/kde-applications/kaddressbook/Makefile
+++ b/x11/kde-applications/kaddressbook/Makefile
@@ -29,7 +29,7 @@ MODKF5_I18N_CONFLICT = yes
 
 BUILD_DEPENDS =        devel/boost
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcmutils \
                devel/kf6/kcolorscheme \
@@ -51,15 +51,15 @@ LIB_DEPENDS =       devel/kf6/kcmutils \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-search>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kontactinterface>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-search>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kontactinterface>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/kajongg/Makefile 
b/x11/kde-applications/kajongg/Makefile
index 87a159b5095..a6397b4c0cb 100644
--- a/x11/kde-applications/kajongg/Makefile
+++ b/x11/kde-applications/kajongg/Makefile
@@ -14,12 +14,12 @@ MODKDE_DOCS = yes
 
 BUILD_DEPENDS =        devel/kf6/kconfig \
                devel/kf6/kpty \
-               x11/kde-applications/libkmahjongg>=${MODKDE_VERSION} \
+               x11/kde-applications/libkmahjongg>=${MODKDE_GEAR_VERSION} \
                devel/py-twisted${MODPY_FLAVOR} \
                x11/py-qt5${MODPY_FLAVOR}
 
 RUN_DEPENDS =  devel/py-twisted${MODPY_FLAVOR} \
-               x11/kde-applications/libkmahjongg>=${MODKDE_VERSION} \
+               x11/kde-applications/libkmahjongg>=${MODKDE_GEAR_VERSION} \
                audio/vorbis-tools \
                x11/py-qt5${MODPY_FLAVOR}
 
diff --git a/x11/kde-applications/kalarm/Makefile 
b/x11/kde-applications/kalarm/Makefile
index a764969c702..c4aa88ef37f 100644
--- a/x11/kde-applications/kalarm/Makefile
+++ b/x11/kde-applications/kalarm/Makefile
@@ -30,11 +30,11 @@ WANTLIB += Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Widgets 
Qt6Xml
 WANTLIB += X11 c canberra m
 
 BUILD_DEPENDS =        devel/boost \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION}
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION}
 
 RUN_DEPENDS =  x11/dbus,-suid \
-               x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION}
+               x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  audio/libcanberra \
                devel/kf6/kauth \
@@ -69,14 +69,14 @@ LIB_DEPENDS =       audio/libcanberra \
                devel/kf6/solid \
                devel/kf6/sonnet \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kalgebra/Makefile 
b/x11/kde-applications/kalgebra/Makefile
index d50de4b694e..373f8027bfc 100644
--- a/x11/kde-applications/kalgebra/Makefile
+++ b/x11/kde-applications/kalgebra/Makefile
@@ -41,7 +41,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/readline \
-               x11/kde-applications/analitza>=${MODKDE_VERSION} \
+               x11/kde-applications/analitza>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/kanagram/Makefile 
b/x11/kde-applications/kanagram/Makefile
index 485291e4867..1180d3ebd32 100644
--- a/x11/kde-applications/kanagram/Makefile
+++ b/x11/kde-applications/kanagram/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS = devel/kf6/attica \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/sonnet \
-               x11/kde-applications/libkeduvocdocument>=${MODKDE_VERSION} \
+               x11/kde-applications/libkeduvocdocument>=${MODKDE_GEAR_VERSION} 
\
                x11/qt6/qtdeclarative \
                x11/qt6/qtmultimedia \
                x11/qt6/qtspeech
diff --git a/x11/kde-applications/kapman/Makefile 
b/x11/kde-applications/kapman/Makefile
index d7e60bd8c4b..196536de0e4 100644
--- a/x11/kde-applications/kapman/Makefile
+++ b/x11/kde-applications/kapman/Makefile
@@ -27,6 +27,6 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kxmlgui \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION}
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kate/Makefile 
b/x11/kde-applications/kate/Makefile
index 7ba9db8dc21..7f731423ed6 100644
--- a/x11/kde-applications/kate/Makefile
+++ b/x11/kde-applications/kate/Makefile
@@ -24,8 +24,8 @@ MODKDE_TRANSLATIONS = yes
 MODKDE_DOCS = yes
 
 RUN_DEPENDS =  devel/kf6/sonnet,-aspell \
-               x11/kde-applications/kf6-kio-extras>=${MODKDE_VERSION} \
-               x11/kde-applications/konsole>=${MODKDE_VERSION}
+               x11/kde-applications/kf6-kio-extras>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/konsole>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/attica \
                devel/gettext,-runtime \
diff --git a/x11/kde-applications/katomic/Makefile 
b/x11/kde-applications/katomic/Makefile
index 252e22f34c9..472008fc747 100644
--- a/x11/kde-applications/katomic/Makefile
+++ b/x11/kde-applications/katomic/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS = devel/kf6/attica \
                devel/kf6/knewstuff \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kblackbox/Makefile 
b/x11/kde-applications/kblackbox/Makefile
index 415fd409755..ef519c1547b 100644
--- a/x11/kde-applications/kblackbox/Makefile
+++ b/x11/kde-applications/kblackbox/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS = devel/kf6/karchive \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/sonnet \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kblocks/Makefile 
b/x11/kde-applications/kblocks/Makefile
index 545fd1c85be..be3d1abf324 100644
--- a/x11/kde-applications/kblocks/Makefile
+++ b/x11/kde-applications/kblocks/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kbounce/Makefile 
b/x11/kde-applications/kbounce/Makefile
index 2e436fd6222..987f18d0001 100644
--- a/x11/kde-applications/kbounce/Makefile
+++ b/x11/kde-applications/kbounce/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kbreakout/Makefile 
b/x11/kde-applications/kbreakout/Makefile
index 578ce7b411d..353ba9194b3 100644
--- a/x11/kde-applications/kbreakout/Makefile
+++ b/x11/kde-applications/kbreakout/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kcalutils/Makefile 
b/x11/kde-applications/kcalutils/Makefile
index 9810e93f659..a3cfc74047d 100644
--- a/x11/kde-applications/kcalutils/Makefile
+++ b/x11/kde-applications/kcalutils/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS +=        devel/kf6/kcalendarcore \
                devel/kf6/kiconthemes \
                devel/kf6/ktexttemplate \
                devel/kf6/kwidgetsaddons \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION}
+               x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/kdegraphics-thumbnailers/Makefile 
b/x11/kde-applications/kdegraphics-thumbnailers/Makefile
index 52f69696001..ab1087cb1da 100644
--- a/x11/kde-applications/kdegraphics-thumbnailers/Makefile
+++ b/x11/kde-applications/kdegraphics-thumbnailers/Makefile
@@ -12,8 +12,8 @@ LIB_DEPENDS = devel/kf6/karchive \
                devel/kf6/kcoreaddons \
                devel/kf6/kio \
                devel/kf6/kservice \
-               
x11/kde-applications/kf6-kdegraphics-mobipocket>=${MODKDE_VERSION} \
-               x11/kde-applications/kf6-libkdcraw>=${MODKDE_VERSION} \
-               x11/kde-applications/kf6-libkexiv2>=${MODKDE_VERSION}
+               
x11/kde-applications/kf6-kdegraphics-mobipocket>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kf6-libkdcraw>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kf6-libkexiv2>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kdepim-addons/Makefile 
b/x11/kde-applications/kdepim-addons/Makefile
index e849c96a048..745c8790fed 100644
--- a/x11/kde-applications/kdepim-addons/Makefile
+++ b/x11/kde-applications/kdepim-addons/Makefile
@@ -85,34 +85,34 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/libassuan \
                textproc/discount \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-import-wizard>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-notes>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/calendarsupport>=${MODKDE_VERSION} \
-               x11/kde-applications/eventviews>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/incidenceeditor>=${MODKDE_VERSION} \
-               x11/kde-applications/kaddressbook>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kitinerary>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/kpkpass>=${MODKDE_VERSION} \
-               x11/kde-applications/ktnef>=${MODKDE_VERSION} \
-               x11/kde-applications/libgravatar>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/libksieve>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION} \
-               x11/kde-applications/mailimporter>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/akonadi-import-wizard>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-notes>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/calendarsupport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/eventviews>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/incidenceeditor>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kaddressbook>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kitinerary>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpkpass>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/ktnef>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libgravatar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libksieve>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailimporter>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/kdepim-runtime/Makefile 
b/x11/kde-applications/kdepim-runtime/Makefile
index 1c9ede593b0..ccfb46a4881 100644
--- a/x11/kde-applications/kdepim-runtime/Makefile
+++ b/x11/kde-applications/kdepim-runtime/Makefile
@@ -77,20 +77,20 @@ LIB_DEPENDS =       devel/kf6/kbookmarks \
                security/qca-qt6 \
                security/qtkeychain,qt6 \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-notes>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kldap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmbox>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkgapi>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-notes>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kldap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmbox>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkgapi>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtmultimedia \
                x11/qt6/qtnetworkauth \
diff --git a/x11/kde-applications/kdiamond/Makefile 
b/x11/kde-applications/kdiamond/Makefile
index 9464fecc700..b4d16a1bea4 100644
--- a/x11/kde-applications/kdiamond/Makefile
+++ b/x11/kde-applications/kdiamond/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/knotifyconfig \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kf6-kio-extras/Makefile 
b/x11/kde-applications/kf6-kio-extras/Makefile
index 84146f02c21..edda6eb2006 100644
--- a/x11/kde-applications/kf6-kio-extras/Makefile
+++ b/x11/kde-applications/kf6-kio-extras/Makefile
@@ -64,7 +64,7 @@ LIB_DEPENDS = audio/taglib \
                net/kdsoap-ws-discovery-client \
                net/samba \
                security/libssh \
-               x11/kde-applications/kf6-libkexiv2>=${MODKDE_VERSION} \
+               x11/kde-applications/kf6-libkexiv2>=${MODKDE_GEAR_VERSION} \
                x11/kde-plasma/plasma-activities \
                x11/kde-plasma/plasma-activities-stats \
                x11/qt6/qt5compat \
diff --git a/x11/kde-applications/kfourinline/Makefile 
b/x11/kde-applications/kfourinline/Makefile
index 4914c49c39e..357a43253c9 100644
--- a/x11/kde-applications/kfourinline/Makefile
+++ b/x11/kde-applications/kfourinline/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kget/Makefile 
b/x11/kde-applications/kget/Makefile
index 9d9a684a076..b732137409f 100644
--- a/x11/kde-applications/kget/Makefile
+++ b/x11/kde-applications/kget/Makefile
@@ -33,7 +33,7 @@ BUILD_DEPENDS =       databases/sqlite3 \
 
 RUN_DEPENDS =  databases/sqlite3 \
                devel/kf6/kitemmodels \
-               x11/kde-applications/kf6-kio-extras>=${MODKDE_VERSION}
+               x11/kde-applications/kf6-kio-extras>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/gmp \
                devel/kf6/karchive \
diff --git a/x11/kde-applications/kgoldrunner/Makefile 
b/x11/kde-applications/kgoldrunner/Makefile
index 2d99dda5d76..f66054519f9 100644
--- a/x11/kde-applications/kgoldrunner/Makefile
+++ b/x11/kde-applications/kgoldrunner/Makefile
@@ -27,6 +27,6 @@ LIB_DEPENDS = devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kconfigwidgets \
                x11/qt6/qtdeclarative \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION}
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kgpg/Makefile 
b/x11/kde-applications/kgpg/Makefile
index dd300b8fc96..c59073f71d6 100644
--- a/x11/kde-applications/kgpg/Makefile
+++ b/x11/kde-applications/kgpg/Makefile
@@ -52,8 +52,8 @@ LIB_DEPENDS = devel/kf6/karchive \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                devel/kf6/sonnet \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
                x11/kde-applications/grantleetheme
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/khangman/Makefile 
b/x11/kde-applications/khangman/Makefile
index 8fa14928dd8..57d8a1bbc29 100644
--- a/x11/kde-applications/khangman/Makefile
+++ b/x11/kde-applications/khangman/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS = devel/kf6/attica \
                devel/kf6/ki18n \
                devel/kf6/knewstuff \
                devel/kf6/kwidgetsaddons \
-               x11/kde-applications/libkeduvocdocument>=${MODKDE_VERSION} \
+               x11/kde-applications/libkeduvocdocument>=${MODKDE_GEAR_VERSION} 
\
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kidentitymanagement/Makefile 
b/x11/kde-applications/kidentitymanagement/Makefile
index 39f46d9e166..f56e82b80a0 100644
--- a/x11/kde-applications/kidentitymanagement/Makefile
+++ b/x11/kde-applications/kidentitymanagement/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS = devel/kf6/kcodecs \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                textproc/ktextaddons \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/kigo/Makefile 
b/x11/kde-applications/kigo/Makefile
index 63c3367aedf..1a4c545435b 100644
--- a/x11/kde-applications/kigo/Makefile
+++ b/x11/kde-applications/kigo/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS = devel/kf6/attica \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                devel/kf6/sonnet \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/killbots/Makefile 
b/x11/kde-applications/killbots/Makefile
index de040a9c00b..1d793f26314 100644
--- a/x11/kde-applications/killbots/Makefile
+++ b/x11/kde-applications/killbots/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kimap/Makefile 
b/x11/kde-applications/kimap/Makefile
index ad20d4e3185..b67bba0512c 100644
--- a/x11/kde-applications/kimap/Makefile
+++ b/x11/kde-applications/kimap/Makefile
@@ -13,6 +13,6 @@ LIB_DEPENDS = devel/kf6/kcoreaddons \
                devel/kf6/ki18n \
                devel/kf6/kio \
                security/cyrus-sasl2 \
-               x11/kde-applications/kmime>=${MODKDE_VERSION}
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kio-extras/Makefile 
b/x11/kde-applications/kio-extras/Makefile
index c6da2029794..ac441265eaf 100644
--- a/x11/kde-applications/kio-extras/Makefile
+++ b/x11/kde-applications/kio-extras/Makefile
@@ -64,7 +64,7 @@ LIB_DEPENDS = audio/taglib \
                net/kdsoap \
                net/samba \
                security/libssh \
-               x11/kde-applications/libkexiv2>=${MODKDE_VERSION} \
+               x11/kde-applications/libkexiv2>=${MODKDE_GEAR_VERSION} \
                x11/qt5/qtsvg
 
 # Use internal, ports version is qt6 only
diff --git a/x11/kde-applications/kio-gdrive/Makefile 
b/x11/kde-applications/kio-gdrive/Makefile
index 64ae9199cde..769842a4ed7 100644
--- a/x11/kde-applications/kio-gdrive/Makefile
+++ b/x11/kde-applications/kio-gdrive/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS = devel/kf6/kcompletion \
                devel/kf6/purpose \
                devel/kf6/solid \
                net/libaccounts-qt,qt6 \
-               
x11/kde-applications/kf6-kaccounts-integration>=${MODKDE_VERSION} \
-               x11/kde-applications/libkgapi>=${MODKDE_VERSION}
+               
x11/kde-applications/kf6-kaccounts-integration>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkgapi>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kipi-plugins/Makefile 
b/x11/kde-applications/kipi-plugins/Makefile
index f99881910c9..f0738ce8565 100644
--- a/x11/kde-applications/kipi-plugins/Makefile
+++ b/x11/kde-applications/kipi-plugins/Makefile
@@ -36,7 +36,7 @@ LIB_DEPENDS = devel/kf5/kauth \
                devel/kf5/kwindowsystem \
                devel/kf5/kxmlgui \
                devel/kf5/solid \
-               x11/kde-applications/libkipi>=${MODKDE_VERSION} \
+               x11/kde-applications/libkipi>=${MODKDE_GEAR_VERSION} \
                x11/qt5/qtxmlpatterns
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kiriki/Makefile 
b/x11/kde-applications/kiriki/Makefile
index e6472cbd9f2..95478ce92cc 100644
--- a/x11/kde-applications/kiriki/Makefile
+++ b/x11/kde-applications/kiriki/Makefile
@@ -28,6 +28,6 @@ LIB_DEPENDS =  \
                devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                x11/qt6/qtdeclarative \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION}
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kitinerary/Makefile 
b/x11/kde-applications/kitinerary/Makefile
index cfedf1b904d..268f54abd99 100644
--- a/x11/kde-applications/kitinerary/Makefile
+++ b/x11/kde-applications/kitinerary/Makefile
@@ -27,8 +27,8 @@ LIB_DEPENDS = devel/kf6/karchive \
                productivity/libphonenumber \
                textproc/libxml \
                graphics/zxing-cpp \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpkpass>=${MODKDE_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpkpass>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/kjumpingcube/Makefile 
b/x11/kde-applications/kjumpingcube/Makefile
index 1606bf6c94f..be018964e18 100644
--- a/x11/kde-applications/kjumpingcube/Makefile
+++ b/x11/kde-applications/kjumpingcube/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kleopatra/Makefile 
b/x11/kde-applications/kleopatra/Makefile
index 8e5fca49fdd..c8258096c1d 100644
--- a/x11/kde-applications/kleopatra/Makefile
+++ b/x11/kde-applications/kleopatra/Makefile
@@ -56,13 +56,13 @@ LIB_DEPENDS =       devel/kf6/kcodecs \
                security/gpgme,-qt \
                security/libassuan \
                security/libgpg-error \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmbox>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/mimetreeparser>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmbox>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mimetreeparser>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/klickety/Makefile 
b/x11/kde-applications/klickety/Makefile
index 87f937dd2e7..8bae196aee2 100644
--- a/x11/kde-applications/klickety/Makefile
+++ b/x11/kde-applications/klickety/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/klines/Makefile 
b/x11/kde-applications/klines/Makefile
index c76753da5bb..ab17d097d95 100644
--- a/x11/kde-applications/klines/Makefile
+++ b/x11/kde-applications/klines/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kmahjongg/Makefile 
b/x11/kde-applications/kmahjongg/Makefile
index 3d2c4367a54..c4056c96152 100644
--- a/x11/kde-applications/kmahjongg/Makefile
+++ b/x11/kde-applications/kmahjongg/Makefile
@@ -31,8 +31,8 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
-               x11/kde-applications/libkmahjongg>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkmahjongg>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kmail-account-wizard/Makefile 
b/x11/kde-applications/kmail-account-wizard/Makefile
index 4d06d05c62c..4783e8d9afa 100644
--- a/x11/kde-applications/kmail-account-wizard/Makefile
+++ b/x11/kde-applications/kmail-account-wizard/Makefile
@@ -21,11 +21,11 @@ MODKDE_ICON_CACHE = yes
 BUILD_DEPENDS =        devel/boost \
                devel/kf6/knotifyconfig \
                devel/kf6/ktexteditor \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION}
 
 RUN_DEPENDS =  devel/kf6/knotifyconfig \
                misc/shared-mime-info \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcolorscheme \
                devel/kf6/kconfig \
@@ -37,10 +37,10 @@ LIB_DEPENDS =       devel/kf6/kcolorscheme \
                devel/kf6/kio \
                devel/kf6/kitemmodels \
                devel/kf6/kwidgetsaddons \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/kmail/Makefile 
b/x11/kde-applications/kmail/Makefile
index abc15f14ae1..3bbfd4c2989 100644
--- a/x11/kde-applications/kmail/Makefile
+++ b/x11/kde-applications/kmail/Makefile
@@ -50,11 +50,11 @@ MODKF5_I18N_CONFLICT = yes
 BUILD_DEPENDS =        devel/boost \
                devel/kf6/kwallet
 
-RUN_DEPENDS =  x11/kde-applications/akonadi-import-wizard>=${MODKDE_VERSION} \
-               x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION} \
-               x11/kde-applications/kmail-account-wizard>=${MODKDE_VERSION} \
-               x11/kde-applications/mbox-importer>=${MODKDE_VERSION} \
-               x11/kde-applications/pim-sieve-editor>=${MODKDE_VERSION} \
+RUN_DEPENDS =  
x11/kde-applications/akonadi-import-wizard>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kmail-account-wizard>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mbox-importer>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pim-sieve-editor>=${MODKDE_GEAR_VERSION} \
                devel/kf6/kwallet
 
 LIB_DEPENDS =  devel/kf6/kbookmarks \
@@ -95,27 +95,27 @@ LIB_DEPENDS =       devel/kf6/kbookmarks \
                security/libassuan \
                security/qtkeychain,qt6 \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-search>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-search>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
                x11/kde-applications/grantleetheme \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kldap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kontactinterface>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/ktnef>=${MODKDE_VERSION} \
-               x11/kde-applications/libgravatar>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/libksieve>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kldap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kontactinterface>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/ktnef>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libgravatar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libksieve>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/kmailtransport/Makefile 
b/x11/kde-applications/kmailtransport/Makefile
index 2c16eb2d3c1..4e4a9efaeb9 100644
--- a/x11/kde-applications/kmailtransport/Makefile
+++ b/x11/kde-applications/kmailtransport/Makefile
@@ -36,8 +36,8 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/solid \
                security/qtkeychain,qt6 \
-               x11/kde-applications/ksmtp>=${MODKDE_VERSION} \
-               x11/kde-applications/libkgapi>=${MODKDE_VERSION}
+               x11/kde-applications/ksmtp>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkgapi>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/kmbox/Makefile 
b/x11/kde-applications/kmbox/Makefile
index 362d0dfc3c2..59da17f9ad3 100644
--- a/x11/kde-applications/kmbox/Makefile
+++ b/x11/kde-applications/kmbox/Makefile
@@ -6,6 +6,6 @@ SHARED_LIBS +=  KPim6Mbox                 0.0 # 0.0
 
 WANTLIB += ${COMPILER_LIBCXX} KPim6Mime Qt6Core m
 
-LIB_DEPENDS =  x11/kde-applications/kmime>=${MODKDE_VERSION}
+LIB_DEPENDS =  x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kmines/Makefile 
b/x11/kde-applications/kmines/Makefile
index ca910db88d2..094e693975e 100644
--- a/x11/kde-applications/kmines/Makefile
+++ b/x11/kde-applications/kmines/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/sonnet \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/knavalbattle/Makefile 
b/x11/kde-applications/knavalbattle/Makefile
index 617c42ee972..a8162236d02 100644
--- a/x11/kde-applications/knavalbattle/Makefile
+++ b/x11/kde-applications/knavalbattle/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/sonnet \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/knetwalk/Makefile 
b/x11/kde-applications/knetwalk/Makefile
index 107a10dcc4b..87f015c6c0c 100644
--- a/x11/kde-applications/knetwalk/Makefile
+++ b/x11/kde-applications/knetwalk/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/sonnet \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/knotes/Makefile 
b/x11/kde-applications/knotes/Makefile
index ed11d9443c3..dced092f916 100644
--- a/x11/kde-applications/knotes/Makefile
+++ b/x11/kde-applications/knotes/Makefile
@@ -36,7 +36,7 @@ MODKF5_I18N_CONFLICT = yes
 
 BUILD_DEPENDS =        devel/boost
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/attica \
                devel/kf6/kbookmarks \
@@ -71,18 +71,18 @@ LIB_DEPENDS =       devel/kf6/attica \
                devel/kf6/solid \
                devel/kf6/sonnet \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-notes>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-search>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kontactinterface>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-notes>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-search>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kontactinterface>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/kolf/Makefile 
b/x11/kde-applications/kolf/Makefile
index 340cae863da..70108a8ec78 100644
--- a/x11/kde-applications/kolf/Makefile
+++ b/x11/kde-applications/kolf/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/sonnet \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kollision/Makefile 
b/x11/kde-applications/kollision/Makefile
index c18f7827778..1af2273e000 100644
--- a/x11/kde-applications/kollision/Makefile
+++ b/x11/kde-applications/kollision/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kolourpaint/Makefile 
b/x11/kde-applications/kolourpaint/Makefile
index b5ae1145f37..aac0923506f 100644
--- a/x11/kde-applications/kolourpaint/Makefile
+++ b/x11/kde-applications/kolourpaint/Makefile
@@ -36,6 +36,6 @@ LIB_DEPENDS = devel/kf6/kbookmarks \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                devel/kf6/sonnet \
-               x11/kde-applications/libksane>=${MODKDE_VERSION}
+               x11/kde-applications/libksane>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kompare/Makefile 
b/x11/kde-applications/kompare/Makefile
index 6d61e9f2dd1..a4cc4b892ea 100644
--- a/x11/kde-applications/kompare/Makefile
+++ b/x11/kde-applications/kompare/Makefile
@@ -43,7 +43,7 @@ LIB_DEPENDS = devel/kf5/kauth \
                devel/kf5/solid \
                devel/kf5/sonnet \
                devel/kf5/syntax-highlighting \
-               x11/kde-applications/libkomparediff2>=${MODKDE_VERSION}
+               x11/kde-applications/libkomparediff2>=${MODKDE_GEAR_VERSION}
 
 # XXX Checkn libkomparediff2
 
diff --git a/x11/kde-applications/konquest/Makefile 
b/x11/kde-applications/konquest/Makefile
index 9870d2716fd..e0ea0a5e643 100644
--- a/x11/kde-applications/konquest/Makefile
+++ b/x11/kde-applications/konquest/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtscxml \
                x11/qt6/qtsvg
diff --git a/x11/kde-applications/kontact/Makefile 
b/x11/kde-applications/kontact/Makefile
index 386a79ea32c..2a40975c7f6 100644
--- a/x11/kde-applications/kontact/Makefile
+++ b/x11/kde-applications/kontact/Makefile
@@ -27,11 +27,11 @@ MODKDE_DOCS = yes
 MODKF5_L10N_CONFLICT = yes
 
 BUILD_DEPENDS =        devel/boost \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
                devel/kf6/kitemmodels
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
                devel/kf6/kitemmodels
 
 LIB_DEPENDS =  devel/kf6/kcmutils \
@@ -53,10 +53,10 @@ LIB_DEPENDS =       devel/kf6/kcmutils \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                textproc/ktextaddons \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kontactinterface>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kontactinterface>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/korganizer/Makefile 
b/x11/kde-applications/korganizer/Makefile
index 82f7c462210..a2733f3b5c2 100644
--- a/x11/kde-applications/korganizer/Makefile
+++ b/x11/kde-applications/korganizer/Makefile
@@ -35,7 +35,7 @@ MODKF5_I18N_CONFLICT = yes
 
 BUILD_DEPENDS =        devel/boost
 
-RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kdepim-runtime>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/attica \
                devel/kf6/kcalendarcore \
@@ -64,25 +64,25 @@ LIB_DEPENDS =       devel/kf6/attica \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-notes>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/calendarsupport>=${MODKDE_VERSION} \
-               x11/kde-applications/eventviews>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-notes>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/calendarsupport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/eventviews>=${MODKDE_GEAR_VERSION} \
                x11/kde-applications/grantleetheme \
-               x11/kde-applications/incidenceeditor>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kldap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kontactinterface>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/incidenceeditor>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kldap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kontactinterface>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/kreversi/Makefile 
b/x11/kde-applications/kreversi/Makefile
index b1da1c71f4c..af4d7b63c7b 100644
--- a/x11/kde-applications/kreversi/Makefile
+++ b/x11/kde-applications/kreversi/Makefile
@@ -36,7 +36,7 @@ LIB_DEPENDS = devel/kf6/kbookmarks \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kshisen/Makefile 
b/x11/kde-applications/kshisen/Makefile
index 4ad39ff038c..bf5804edd1c 100644
--- a/x11/kde-applications/kshisen/Makefile
+++ b/x11/kde-applications/kshisen/Makefile
@@ -26,8 +26,8 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
-               x11/kde-applications/libkmahjongg>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkmahjongg>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/ksirk/Makefile 
b/x11/kde-applications/ksirk/Makefile
index d80353d88e6..27a39aadbda 100644
--- a/x11/kde-applications/ksirk/Makefile
+++ b/x11/kde-applications/ksirk/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS = devel/kf6/attica \
                devel/kf6/kdbusaddons \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qt5compat \
                x11/qt6/qtdeclarative \
                x11/qt6/qtmultimedia \
diff --git a/x11/kde-applications/ksnakeduel/Makefile 
b/x11/kde-applications/ksnakeduel/Makefile
index 6309291eba6..9efb9874ac7 100644
--- a/x11/kde-applications/ksnakeduel/Makefile
+++ b/x11/kde-applications/ksnakeduel/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/kspaceduel/Makefile 
b/x11/kde-applications/kspaceduel/Makefile
index b9c3b788b6f..b7cfcd7e250 100644
--- a/x11/kde-applications/kspaceduel/Makefile
+++ b/x11/kde-applications/kspaceduel/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/ksquares/Makefile 
b/x11/kde-applications/ksquares/Makefile
index fb0afadb3ec..59d21f4c7d1 100644
--- a/x11/kde-applications/ksquares/Makefile
+++ b/x11/kde-applications/ksquares/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/ksudoku/Makefile 
b/x11/kde-applications/ksudoku/Makefile
index 98872f55671..be702f5ee44 100644
--- a/x11/kde-applications/ksudoku/Makefile
+++ b/x11/kde-applications/ksudoku/Makefile
@@ -33,7 +33,7 @@ LIB_DEPENDS = devel/kf6/karchive \
                devel/kf6/kjobwidgets \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/ktnef/Makefile 
b/x11/kde-applications/ktnef/Makefile
index bff273824d6..46db8a5f7e9 100644
--- a/x11/kde-applications/ktnef/Makefile
+++ b/x11/kde-applications/ktnef/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS = devel/kf6/kcalendarcore \
                devel/kf6/kcontacts \
                devel/kf6/kcoreaddons \
                devel/kf6/ki18n \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION}
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/ktouch/Makefile 
b/x11/kde-applications/ktouch/Makefile
index f2b3a5e171c..a5b70eb3923 100644
--- a/x11/kde-applications/ktouch/Makefile
+++ b/x11/kde-applications/ktouch/Makefile
@@ -19,7 +19,7 @@ MODKDE_TRANSLATIONS = yes
 MODKDE_DOCS = yes
 
 #KQtQuickCharts, QtQuick plugin to render beautiful and interactive charts
-RUN_DEPENDS =  x11/kde-applications/kqtquickcharts>=${MODKDE_VERSION} \
+RUN_DEPENDS =  x11/kde-applications/kqtquickcharts>=${MODKDE_GEAR_VERSION} \
                x11/qt5/qtgraphicaleffects
 
 LIB_DEPENDS =  devel/kf5/kcmutils \
diff --git a/x11/kde-applications/ktuberling/Makefile 
b/x11/kde-applications/ktuberling/Makefile
index cfbda8f1c00..ca172dff0f6 100644
--- a/x11/kde-applications/ktuberling/Makefile
+++ b/x11/kde-applications/ktuberling/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kio \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtmultimedia \
                x11/qt6/qtsvg
diff --git a/x11/kde-applications/kubrick/Makefile 
b/x11/kde-applications/kubrick/Makefile
index e47d90f5744..e571d419bf7 100644
--- a/x11/kde-applications/kubrick/Makefile
+++ b/x11/kde-applications/kubrick/Makefile
@@ -27,6 +27,6 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                x11/qt6/qtsvg \
                x11/qt6/qtdeclarative \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION}
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/kwordquiz/Makefile 
b/x11/kde-applications/kwordquiz/Makefile
index 48bd45562ca..3f69ff36b2f 100644
--- a/x11/kde-applications/kwordquiz/Makefile
+++ b/x11/kde-applications/kwordquiz/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS = devel/kf6/attica \
                devel/kf6/ki18n \
                devel/kf6/knewstuff \
                devel/kf6/kdbusaddons \
-               x11/kde-applications/libkeduvocdocument>=${MODKDE_VERSION} \
+               x11/kde-applications/libkeduvocdocument>=${MODKDE_GEAR_VERSION} 
\
                x11/qt6/qtdeclarative \
                x11/qt6/qtmultimedia \
                x11/qt6/qtsvg
diff --git a/x11/kde-applications/libgravatar/Makefile 
b/x11/kde-applications/libgravatar/Makefile
index c0a8a169e5a..f5e54054d47 100644
--- a/x11/kde-applications/libgravatar/Makefile
+++ b/x11/kde-applications/libgravatar/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/kwidgetsaddons \
                devel/kf6/sonnet \
                textproc/ktextaddons \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/libkipi/Makefile 
b/x11/kde-applications/libkipi/Makefile
index 2e064a242d1..65d5bc24797 100644
--- a/x11/kde-applications/libkipi/Makefile
+++ b/x11/kde-applications/libkipi/Makefile
@@ -15,7 +15,7 @@ MODKDE_KF5 = yes
 BUILD_DEPENDS =        graphics/png \
                graphics/jpeg \
                graphics/tiff \
-               x11/kde-applications/libkexiv2>=${MODKDE_VERSION}
+               x11/kde-applications/libkexiv2>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf5/kauth \
                devel/kf5/kcodecs \
diff --git a/x11/kde-applications/libkleo/Makefile 
b/x11/kde-applications/libkleo/Makefile
index abe891998fd..6349264f267 100644
--- a/x11/kde-applications/libkleo/Makefile
+++ b/x11/kde-applications/libkleo/Makefile
@@ -14,7 +14,7 @@ MODKF5_I18N_CONFLICT = yes
 MODKF5_L10N_CONFLICT = yes
 
 BUILD_DEPENDS =        devel/boost \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION}
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kcodecs \
                devel/kf6/kcolorscheme \
diff --git a/x11/kde-applications/libksane/Makefile 
b/x11/kde-applications/libksane/Makefile
index 1486b375856..e06d849155f 100644
--- a/x11/kde-applications/libksane/Makefile
+++ b/x11/kde-applications/libksane/Makefile
@@ -21,6 +21,6 @@ LIB_DEPENDS = devel/kf5/ki18n \
                devel/kf5/kwallet \
                devel/kf5/kwidgetsaddons \
                devel/kf5/sonnet \
-               x11/kde-applications/ksanecore>=${MODKDE_VERSION}
+               x11/kde-applications/ksanecore>=${MODKDE_GEAR_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11/kde-applications/libksieve/Makefile 
b/x11/kde-applications/libksieve/Makefile
index 07f71714d65..9ebb6e0c831 100644
--- a/x11/kde-applications/libksieve/Makefile
+++ b/x11/kde-applications/libksieve/Makefile
@@ -44,13 +44,13 @@ LIB_DEPENDS =       devel/kf6/attica \
                devel/kf6/syntax-highlighting \
                security/cyrus-sasl2 \
                textproc/ktextaddons \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/lskat/Makefile 
b/x11/kde-applications/lskat/Makefile
index b1b23d81a2c..5d3d6b0d142 100644
--- a/x11/kde-applications/lskat/Makefile
+++ b/x11/kde-applications/lskat/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/mailcommon/Makefile 
b/x11/kde-applications/mailcommon/Makefile
index aeebeeaf4b6..d76046a6de7 100644
--- a/x11/kde-applications/mailcommon/Makefile
+++ b/x11/kde-applications/mailcommon/Makefile
@@ -54,20 +54,20 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/mailimporter>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailimporter>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                multimedia/phonon,qt6
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/mailimporter/Makefile 
b/x11/kde-applications/mailimporter/Makefile
index 9d1ecdbd292..3bdd13dee08 100644
--- a/x11/kde-applications/mailimporter/Makefile
+++ b/x11/kde-applications/mailimporter/Makefile
@@ -29,10 +29,10 @@ LIB_DEPENDS =       devel/kf6/karchive \
                devel/kf6/kio \
                devel/kf6/kwidgetsaddons \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/mbox-importer/Makefile 
b/x11/kde-applications/mbox-importer/Makefile
index bbef46f7804..eabe23cfb53 100644
--- a/x11/kde-applications/mbox-importer/Makefile
+++ b/x11/kde-applications/mbox-importer/Makefile
@@ -40,20 +40,20 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION} \
-               x11/kde-applications/mailimporter>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailimporter>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/merkuro/Makefile 
b/x11/kde-applications/merkuro/Makefile
index a56ecb1a2f9..55b8ca07802 100644
--- a/x11/kde-applications/merkuro/Makefile
+++ b/x11/kde-applications/merkuro/Makefile
@@ -72,24 +72,24 @@ LIB_DEPENDS =       devel/kf6/kcalendarcore \
                security/libassuan \
                textproc/ktextaddons \
                security/gpgme,-qt \
-               x11/kde-applications/akonadi-calendar>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kcalutils>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmbox>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/mimetreeparser>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-calendar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kcalutils>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmbox>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mimetreeparser>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/messagelib/Makefile 
b/x11/kde-applications/messagelib/Makefile
index c810df60600..bf2e5794e93 100644
--- a/x11/kde-applications/messagelib/Makefile
+++ b/x11/kde-applications/messagelib/Makefile
@@ -73,21 +73,21 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/libassuan \
                security/qca-qt6 \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-search>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmbox>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libgravatar>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-search>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmbox>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libgravatar>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtpositioning \
                x11/qt6/qtwebchannel \
diff --git a/x11/kde-applications/mimetreeparser/Makefile 
b/x11/kde-applications/mimetreeparser/Makefile
index c55739beb38..d321c79b1f1 100644
--- a/x11/kde-applications/mimetreeparser/Makefile
+++ b/x11/kde-applications/mimetreeparser/Makefile
@@ -24,9 +24,9 @@ LIB_DEPENDS = devel/kf6/kcalendarcore \
                devel/kf6/kwidgetsaddons \
                security/gpgme,-qt \
                security/libassuan \
-               x11/kde-applications/kmbox>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
+               x11/kde-applications/kmbox>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/okular/Makefile 
b/x11/kde-applications/okular/Makefile
index 1cf50cc5f15..335909b9408 100644
--- a/x11/kde-applications/okular/Makefile
+++ b/x11/kde-applications/okular/Makefile
@@ -65,8 +65,8 @@ LIB_DEPENDS = devel/kf6/karchive \
                print/poppler,-qt6>=23.05.0 \
                textproc/discount \
                textproc/ebook-tools \
-               
x11/kde-applications/kf6-kdegraphics-mobipocket>=${MODKDE_VERSION} \
-               x11/kde-applications/kf6-libkexiv2>=${MODKDE_VERSION} \
+               
x11/kde-applications/kf6-kdegraphics-mobipocket>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kf6-libkexiv2>=${MODKDE_GEAR_VERSION} \
                x11/kde-plasma/plasma-activities \
                x11/qt6/qtdeclarative \
                x11/qt6/qtmultimedia \
diff --git a/x11/kde-applications/palapeli/Makefile 
b/x11/kde-applications/palapeli/Makefile
index ec3ac7c661b..4b00c2b4963 100644
--- a/x11/kde-applications/palapeli/Makefile
+++ b/x11/kde-applications/palapeli/Makefile
@@ -39,7 +39,7 @@ LIB_DEPENDS = devel/kf6/karchive \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
                devel/kf6/solid \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/picmi/Makefile 
b/x11/kde-applications/picmi/Makefile
index fc3f52550fe..89b773cb2ec 100644
--- a/x11/kde-applications/picmi/Makefile
+++ b/x11/kde-applications/picmi/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS = devel/kf6/kcolorscheme \
                devel/kf6/ki18n \
                devel/kf6/kwidgetsaddons \
                devel/kf6/kxmlgui \
-               x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
+               x11/kde-applications/libkdegames>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative \
                x11/qt6/qtsvg
 
diff --git a/x11/kde-applications/pim-data-exporter/Makefile 
b/x11/kde-applications/pim-data-exporter/Makefile
index 2c5b82c73cd..a3b7076a21a 100644
--- a/x11/kde-applications/pim-data-exporter/Makefile
+++ b/x11/kde-applications/pim-data-exporter/Makefile
@@ -54,21 +54,21 @@ LIB_DEPENDS =       devel/kf6/karchive \
                security/gpgme,-qt \
                security/libassuan \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-notes>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kidentitymanagement>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
-               x11/kde-applications/libkleo>=${MODKDE_VERSION} \
-               x11/kde-applications/mailcommon>=${MODKDE_VERSION} \
-               x11/kde-applications/messagelib>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-mime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-notes>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               
x11/kde-applications/kidentitymanagement>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkleo>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/mailcommon>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/messagelib>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/pim-sieve-editor/Makefile 
b/x11/kde-applications/pim-sieve-editor/Makefile
index 669cb1b5e68..66080d04234 100644
--- a/x11/kde-applications/pim-sieve-editor/Makefile
+++ b/x11/kde-applications/pim-sieve-editor/Makefile
@@ -34,9 +34,9 @@ LIB_DEPENDS = devel/kf6/kbookmarks \
                devel/kf6/kxmlgui \
                security/qtkeychain,qt6 \
                textproc/ktextaddons \
-               x11/kde-applications/kmailtransport>=${MODKDE_VERSION} \
-               x11/kde-applications/libksieve>=${MODKDE_VERSION} \
-               x11/kde-applications/pimcommon>=${MODKDE_VERSION}
+               x11/kde-applications/kmailtransport>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libksieve>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/pimcommon>=${MODKDE_GEAR_VERSION}
 
 TEST_IS_INTERACTIVE =  X11
 
diff --git a/x11/kde-applications/pimcommon/Makefile 
b/x11/kde-applications/pimcommon/Makefile
index 2e5ee2cae72..3066550ba04 100644
--- a/x11/kde-applications/pimcommon/Makefile
+++ b/x11/kde-applications/pimcommon/Makefile
@@ -48,15 +48,15 @@ LIB_DEPENDS =       devel/kf6/attica \
                devel/kf6/purpose \
                devel/kf6/solid \
                textproc/ktextaddons \
-               x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi-search>=${MODKDE_VERSION} \
-               x11/kde-applications/akonadi>=${MODKDE_VERSION} \
-               x11/kde-applications/grantleetheme>=${MODKDE_VERSION} \
-               x11/kde-applications/kimap>=${MODKDE_VERSION} \
-               x11/kde-applications/kldap>=${MODKDE_VERSION} \
-               x11/kde-applications/kmime>=${MODKDE_VERSION} \
-               x11/kde-applications/kpimtextedit>=${MODKDE_VERSION} \
-               x11/kde-applications/libkdepim>=${MODKDE_VERSION} \
+               x11/kde-applications/akonadi-contacts>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi-search>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/akonadi>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/grantleetheme>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kimap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kldap>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kmime>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/kpimtextedit>=${MODKDE_GEAR_VERSION} \
+               x11/kde-applications/libkdepim>=${MODKDE_GEAR_VERSION} \
                x11/qt6/qtdeclarative
 
 TEST_IS_INTERACTIVE =  X11
diff --git a/x11/kde-applications/signon-kwallet-extension/Makefile 
b/x11/kde-applications/signon-kwallet-extension/Makefile
index 8be750e7abb..0500c62b678 100644
--- a/x11/kde-applications/signon-kwallet-extension/Makefile
+++ b/x11/kde-applications/signon-kwallet-extension/Makefile
@@ -8,7 +8,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL KF6Wallet Qt6Core Qt6Gui m 
signon-extension
 
 MODULES +=     textproc/intltool
 
-RUN_DEPENDS =  x11/kde-applications/kaccounts-providers>=${MODKDE_VERSION}
+RUN_DEPENDS =  x11/kde-applications/kaccounts-providers>=${MODKDE_GEAR_VERSION}
 
 LIB_DEPENDS =  devel/kf6/kwallet \
                net/signond
diff --git a/x11/kde-plasma/Makefile.inc b/x11/kde-plasma/Makefile.inc
index 46ac5ab9aa9..00fc78f5736 100644
--- a/x11/kde-plasma/Makefile.inc
+++ b/x11/kde-plasma/Makefile.inc
@@ -9,16 +9,14 @@ MAINTAINER ?=         Rafael Sadowski <rsadow...@openbsd.org>
 # module port, and breaks build.
 CONFIGURE_STYLE ?=     cmake
 
-MODULES :=             devel/kf6 \
-                       x11/kde-applications \
+MODULES :=             x11/kde \
                        ${MODULES}
 
 # usual KDE rules:
 # LGPLv2.1+, GPLv2+, GPLv3
 PERMIT_PACKAGE ?=      Yes
 
-# XXX Keep in-sync with meta/kde
-VERSION ?=             6.1.3
+VERSION ?=             ${MODKDE_PLASMA_VERSION}
 
 SITES ?=               ${SITE_KDE:=stable/plasma/${VERSION}/}
 EXTRACT_SUFX ?=                .tar.xz
diff --git a/x11/kde-applications/kde-applications.port.mk b/x11/kde/kde.port.mk
similarity index 77%
rename from x11/kde-applications/kde-applications.port.mk
rename to x11/kde/kde.port.mk
index 6bab915018f..264e5e47d18 100644
--- a/x11/kde-applications/kde-applications.port.mk
+++ b/x11/kde/kde.port.mk
@@ -1,7 +1,19 @@
-MODKDE_VERSION ?=              24.05.2
+MODKDE_GEAR_VERSION ?=         24.05.2
+MODKDE_PLASMA_VERSION ?=       6.1.3
 
 MODKDE_KF5 ?=                  No
 
+.if empty(CONFIGURE_STYLE)
+CONFIGURE_STYLE =      cmake
+.endif
+
+.if defined(MODKDE_KF5) && ${MODKDE_KF5:L} == "yes"
+MODULES +=             devel/kf5
+.else
+CONFIGURE_ARGS +=      -DBUILD_WITH_QT6=ON
+MODULES +=             devel/kf6
+.endif
+
 # Set to 'yes' if there are .desktop files under share/release-service/.
 .if defined(MODKDE_DESKTOP_FILE) && ${MODKDE_DESKTOP_FILE:L} == "yes"
 MODKDE_RUN_DEPENDS +=          devel/desktop-file-utils
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 27d852a1641..3b76fcb1b2f 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -1,13 +1,13 @@
 COMMENT =      drop-down terminal emulator based on KDE Konsole
 
-DISTNAME =     yakuake-${MODKDE_VERSION}
+DISTNAME =     yakuake-${MODKDE_GEAR_VERSION}
 EPOCH =                0
 
 CATEGORIES =   x11 sysutils
 
 HOMEPAGE =     https://kde.org/applications/system/org.kde.yakuake
 
-SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
+SITES =                
${SITE_KDE:=stable/release-service/${MODKDE_GEAR_VERSION}/src/}
 EXTRACT_SUFX = .tar.xz
 
 MAINTAINER =   Rafael Sadowski <rsadow...@openbsd.org>
@@ -24,8 +24,7 @@ WANTLIB += KF6NotifyConfig KF6Parts KF6StatusNotifierItem 
KF6WidgetsAddons
 WANTLIB += KF6WindowSystem KF6XmlGui KWaylandClient Qt6Core Qt6DBus
 WANTLIB += Qt6Gui Qt6Network Qt6Widgets Qt6Xml X11 c m xkbcommon
 
-MODULES =      x11/kde-applications \
-               devel/kf6
+MODULES =      x11/kde
 
 BUILD_DEPENDS =        devel/gettext,-tools \
                devel/kf6/kdoctools

NEW: kde.port.mk

Reply via email to