git: bd3ca94b9d6b - main - sysutils/kf6-kwallet: rework coinstallability with KF5 kwallet

The branch main has been updated by makc:

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

commit bd3ca94b9d6beed6172ea985c3b60b65eee632fc
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-03-18 22:08:55 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-03-18 22:08:55 +0000

    sysutils/kf6-kwallet: rework coinstallability with KF5 kwallet
    
    kwalletd6 provides both kwalletd5 and kwalletd6 D-Bus services.
---
 sysutils/kf6-kwallet/Makefile  | 7 +------
 sysutils/kf6-kwallet/pkg-plist | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sysutils/kf6-kwallet/Makefile b/sysutils/kf6-kwallet/Makefile
index 54f601fe7000..929f0465a6a3 100644
--- a/sysutils/kf6-kwallet/Makefile
+++ b/sysutils/kf6-kwallet/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kwallet
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,9 +20,4 @@ USE_KDE=	colorscheme config coreaddons crash dbusaddons i18n \
 USE_QT=		base
 USE_XORG=	x11
 
-# fix conflict with sysutils/kf5-kwallet
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/share/dbus-1/services/org.kde.kwalletd5.service
-
-
 .include <bsd.port.mk>
diff --git a/sysutils/kf6-kwallet/pkg-plist b/sysutils/kf6-kwallet/pkg-plist
index 17f24daebe53..48e0a2b28e93 100644
--- a/sysutils/kf6-kwallet/pkg-plist
+++ b/sysutils/kf6-kwallet/pkg-plist
@@ -15,7 +15,7 @@ lib/libKF6WalletBackend.so.6
 lib/libKF6WalletBackend.so.%%KDE_FRAMEWORKS_VERSION%%
 share/applications/org.kde.kwalletd6.desktop
 share/dbus-1/interfaces/kf6_org.kde.KWallet.xml
-@comment share/dbus-1/services/org.kde.kwalletd5.service
+share/dbus-1/services/org.kde.kwalletd5.service
 share/dbus-1/services/org.kde.kwalletd6.service
 share/knotifications6/kwalletd6.notifyrc
 share/locale/ar/LC_MESSAGES/kwallet6-query.mo