git: f35320c28b06 - main - databases/akonadi: and net-im/kaccounts-integration: reverse dependencies

The branch main has been updated by vvd:

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

commit f35320c28b06cd55c521b9d5979d9ab5f764db4f
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2023-07-14 11:50:16 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2023-07-14 11:56:04 +0000

    databases/akonadi: and net-im/kaccounts-integration: reverse dependencies
    
    Without this patch, there is a circular dependency if Akonadi is built with
    kaccounts-integration installed, as Akonadi has an optional dependency on
    kaccounts-integration and libaccounts-qt5 that makes the port silently depend
    on libkaccounts.so and libaccounts-qt5.so. kaccounts-integration, on the
    other hand, had a dependency on Akonadi that was probably inherited from the
    Qt4 version, as the Akonadi plugin was removed from the code base in 2015.
    
    Reviewed by:            rakuco, tcberner
    Tested by:              tcberner
    Approved by:            tcberner (mentor, kde@)
    Differential Revision:  https://reviews.freebsd.org/D41019
---
 databases/akonadi/Makefile            | 5 ++++-
 net-im/kaccounts-integration/Makefile | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 7d0f3f2e79ea..035f15845ad9 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	akonadi
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	databases kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -8,7 +9,9 @@ WWW=		https://community.kde.org/KDE_PIM/Akonadi
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libkaccounts.so:net-im/kaccounts-integration \
+		libaccounts-qt5.so:net-im/libaccounts-qt5
 # Let process generate meaningful backtrace on core dump.
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile
index d06a5c382a71..e484543c04d6 100644
--- a/net-im/kaccounts-integration/Makefile
+++ b/net-im/kaccounts-integration/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kaccounts-integration
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,7 +19,6 @@ USES=		cmake compiler:c++11-lang gettext pkgconfig kde:5 \
 		qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons dbusaddons \
 		i18n iconthemes kcmutils kdeclarative kio service wallet widgetsaddons \
-		akonadi \
 		ecm:build
 USE_QT=		concurrent core dbus declarative gui network widgets xml \
 		buildtools:build qmake:build