git: 6ac05e225b23 - main - kde.mk: prepare for switching to Plasma 6 and KF6 based KDE Applications

From: Max Brazhnikov <makc_at_FreeBSD.org>
Date: Thu, 23 Jan 2025 17:11:08 UTC
The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6ac05e225b23fc5ce566d41db384c9af727068a5

commit 6ac05e225b23fc5ce566d41db384c9af727068a5
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-01-23 17:08:18 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-01-23 17:08:18 +0000

    kde.mk: prepare for switching to Plasma 6 and KF6 based KDE Applications
    
    To avoid conflict between KF5 and KF6 ports always use KF6 kapidox and
    the latest Plasma sounds samples.
---
 Mk/Uses/kde.mk                        | 6 ++++--
 x11/kf5-frameworkintegration/Makefile | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 8025e65b38c7..ecb94179d4be 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -383,7 +383,8 @@ kde-activities-stats_LIB5=	libKF${_KDE_VERSION}ActivitiesStats.so
 kde-activities-stats_LIB6=	libPlasmaActivitiesStats.so
 kde-activities-stats_LIB=	${kde-activities-stats_LIB${_KDE_VERSION}}
 
-kde-apidox_PORT=		devel/kf${_KDE_VERSION}-kapidox
+# Use KApiDox tools from KDE Frameworks 6
+kde-apidox_PORT=		devel/kf6-kapidox
 kde-apidox_PATH=		${KDE_PREFIX}/bin/kapidox-generate
 kde-apidox_TYPE=		run
 
@@ -543,7 +544,8 @@ kde-notifications_LIB=		libKF${_KDE_VERSION}Notifications.so
 kde-notifyconfig_PORT=		devel/kf${_KDE_VERSION}-knotifyconfig
 kde-notifyconfig_LIB=		libKF${_KDE_VERSION}NotifyConfig.so
 
-kde-oxygen-sounds_PORT=		audio/plasma${_KDE_VERSION}-oxygen-sounds
+# Use the latest sounds from Plasma 6
+kde-oxygen-sounds_PORT=		audio/plasma6-oxygen-sounds
 kde-oxygen-sounds_PATH=		${KDE_PREFIX}/share/sounds/Oxygen-Sys-Log-In.ogg
 kde-oxygen-sounds_TYPE=		run
 
diff --git a/x11/kf5-frameworkintegration/Makefile b/x11/kf5-frameworkintegration/Makefile
index 0a4fb0be3ff4..d5926c872dcf 100644
--- a/x11/kf5-frameworkintegration/Makefile
+++ b/x11/kf5-frameworkintegration/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	frameworkintegration
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org