git: 3a0a535260b5 - 2026Q3 - net/kmime: Mark conflict with KF6 kmime

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Max Brazhnikov <makc_at_FreeBSD.org>
Date: Thu, 09 Jul 2026 18:18:23 UTC

The branch 2026Q3 has been updated by makc:

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

commit 3a0a535260b5838b4f32a2dc6a60e6bac05a03a8
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2026-07-09 18:16:17 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2026-07-09 18:17:45 +0000

    net/kmime: Mark conflict with KF6 kmime
    
    (cherry picked from commit d188431fedf94fb0e54117e6f24b0708a2e121c3)
---
 net/kmime/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/kmime/Makefile b/net/kmime/Makefile
index ee93293aeeca..4e5e5bc5d38d 100644
--- a/net/kmime/Makefile
+++ b/net/kmime/Makefile
@@ -8,6 +8,8 @@ WWW=		https://www.kde.org/
 
 LICENSE=	LGPL21
 
+CONFLICTS=	kf6-kmime
+
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
 
 USES=		cmake compiler:c++11-lib gettext kde:6 qt:6 tar:xz