Index | Thread | Search

From:
Rafael Sadowski <rafael@sizeofvoid.org>
Subject:
Fix conflicts between kf6-kaccounts-integration and kaccounts-integration
To:
ports <ports@openbsd.org>
Date:
Mon, 27 May 2024 11:03:40 +0200

Download raw body.

Thread
I have seen this conflict and hope the following diff fixes the problem.

Collision in kf6-kaccounts-integration-24.02.1: the following files already exist
        /usr/local/share/applications/kcm_kaccounts.desktop (kaccounts-integration-23.08.4 and kf6-kaccounts-integration-24.02.1)
        /usr/local/share/locale/ar/LC_MESSAGES/kaccounts-integration.mo (kaccounts-integration-23.08.4 and kf6-kaccounts-integration-24.02.1)

Feedback, ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kf6-kaccounts-integration/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile	20 May 2024 06:38:56 -0000	1.3
+++ Makefile	27 May 2024 09:01:10 -0000
@@ -2,6 +2,7 @@ COMMENT =	library and QML module for Acc

 DISTNAME =	kaccounts-integration-${VERSION}
 PKGNAME =	kf6-kaccounts-integration-${VERSION}
+REVISION =	0

 CATEGORIES =	net devel

Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	16 Apr 2024 19:30:14 -0000	1.1.1.1
+++ pkg/PLIST	27 May 2024 09:01:10 -0000
@@ -1,3 +1,4 @@
+@conflict kaccounts-integration-<=24.02.1
 include/KAccounts6/
 include/KAccounts6/KAccounts/
 include/KAccounts6/KAccounts/AccountServiceToggleJob