pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/mail/akonadi



Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Aug 16 03:14:34 UTC 2023

Modified Files:
        pkgsrc/mail/akonadi: Makefile PLIST buildlink3.mk distinfo options.mk
Removed Files:
        pkgsrc/mail/akonadi/patches: patch-agentserver_CMakeLists.txt
            patch-cmake_modules_FindSqlite.cmake patch-git_21465191
            patch-libs_xdgbasedirs.cpp
            patch-server_src_storage_dbconfigmysql.cpp
            patch-server_src_storage_partstreamer.cpp
            patch-server_tests_unittest_partstreamertest.cpp

Log Message:
akonadi: update to 23.04.3

qt5/kf5 version


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/mail/akonadi/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/akonadi/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/mail/akonadi/buildlink3.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/akonadi/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/akonadi/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/mail/akonadi/patches/patch-agentserver_CMakeLists.txt \
    pkgsrc/mail/akonadi/patches/patch-git_21465191 \
    pkgsrc/mail/akonadi/patches/patch-libs_xdgbasedirs.cpp \
    pkgsrc/mail/akonadi/patches/patch-server_src_storage_dbconfigmysql.cpp \
    pkgsrc/mail/akonadi/patches/patch-server_src_storage_partstreamer.cpp \
    pkgsrc/mail/akonadi/patches/patch-server_tests_unittest_partstreamertest.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/akonadi/Makefile
diff -u pkgsrc/mail/akonadi/Makefile:1.117 pkgsrc/mail/akonadi/Makefile:1.118
--- pkgsrc/mail/akonadi/Makefile:1.117  Tue Jun  6 12:41:47 2023
+++ pkgsrc/mail/akonadi/Makefile        Wed Aug 16 03:14:33 2023
@@ -1,46 +1,41 @@
-# $NetBSD: Makefile,v 1.117 2023/06/06 12:41:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.118 2023/08/16 03:14:33 markd Exp $
 
-DISTNAME=      akonadi-1.13.0
-PKGREVISION=   49
+DISTNAME=      akonadi-${KAPPSVER}
 CATEGORIES=    mail
-MASTER_SITES=  ftp://kde.mirror.anlx.net/stable/akonadi/src/
-EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=    markd%NetBSD.org@localhost
-HOMEPAGE=      https://pim.kde.org/akonadi/
-COMMENT=       The KDE PIM Storage Service
-LICENSE=       gnu-lgpl-v2.1
+HOMEPAGE=      https://community.kde.org/KDE_PIM/Akonadi
+COMMENT=       PIM layer, which provides an asynchronous API to access all kind of PIM data
+LICENSE=       gnu-lgpl-v2
 
-# BUILD_MAKE_FLAGS+= VERBOSE=1
+.include "../../meta-pkgs/kde/applications.mk"
 
-TOOL_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+DEPENDS+=      kdesignerplugin-[0-9]*:../../x11/kdesignerplugin
 
-.include "options.mk"
+CMAKE_ARGS+=   -DMYSQLD_EXECUTABLE="${PREFIX}/sbin/mysqld"
+CMAKE_ARGS+=   -DPOSTGRES_PATH="${PREFIX}/bin"
+CMAKE_ARGS+=   -DINSTALL_APPARMOR=FALSE
 
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
-USE_CMAKE=     yes
-CMAKE_ARG_PATH=        ..
-CONFIGURE_DIRS=        _build
-
-# https://bugs.gentoo.org/show_bug.cgi?id=520102
-GCC_REQD+=     4.7
-
-pre-configure:
-       ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
-       ${MKDIR} ${WRKSRC}/_build
+USE_TOOLS+=    gmake msgmerge pkg-config
 
-PKGCONFIG_OVERRIDE+=   akonadi.pc.cmake
+.include "options.mk"
 
-LDFLAGS.SunOS+=                -lsocket
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       pre-configure
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       src/server/CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/akonadi
+CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/akonadi/mysql-global.conf \
+               ${PKG_SYSCONFDIR}/xdg/akonadi/mysql-global.conf
+CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/akonadi/mysql-global-mobile.conf \
+               ${PKG_SYSCONFDIR}/xdg/akonadi/mysql-global-mobile.conf
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/libexecinfo/buildlink3.mk"
-#.include "../../textproc/soprano/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/kio/buildlink3.mk"
+.include "../../devel/kitemmodels/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/akonadi/PLIST
diff -u pkgsrc/mail/akonadi/PLIST:1.9 pkgsrc/mail/akonadi/PLIST:1.10
--- pkgsrc/mail/akonadi/PLIST:1.9       Thu Nov 13 09:44:02 2014
+++ pkgsrc/mail/akonadi/PLIST   Wed Aug 16 03:14:33 2023
@@ -1,32 +1,353 @@
-@comment $NetBSD: PLIST,v 1.9 2014/11/13 09:44:02 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/08/16 03:14:33 markd Exp $
+bin/akonadi2xml
 bin/akonadi_agent_launcher
 bin/akonadi_agent_server
 bin/akonadi_control
+bin/akonadi_knut_resource
 bin/akonadi_rds
 bin/akonadictl
+bin/akonadiselftest
 bin/akonadiserver
+bin/akonaditest
 bin/asapcat
-include/akonadi/abstractsearchplugin.h
-include/akonadi/private/akonadiprotocolinternals_export.h
-include/akonadi/private/capabilities_p.h
-include/akonadi/private/imapparser_p.h
-include/akonadi/private/imapset_p.h
-include/akonadi/private/notificationmessage_p.h
-include/akonadi/private/notificationmessagev2_p.h
-include/akonadi/private/notificationmessagev3_p.h
-include/akonadi/private/protocol_p.h
-include/akonadi/private/xdgbasedirs_p.h
-lib/cmake/Akonadi/AkonadiConfig.cmake
-lib/cmake/Akonadi/AkonadiConfigVersion.cmake
-lib/cmake/Akonadi/AkonadiTargetsWithPrefix-noconfig.cmake
-lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
-lib/libakonadiprotocolinternals.so
-lib/libakonadiprotocolinternals.so.1
-lib/libakonadiprotocolinternals.so.${PKGVERSION}
-lib/pkgconfig/akonadi.pc
-${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so
-share/config/akonadi/mysql-global-mobile.conf
-share/config/akonadi/mysql-global.conf
+include/KPim5/Akonadi/akonadi/private/akonadiprivate_export.h
+include/KPim5/Akonadi/akonadi/private/capabilities_p.h
+include/KPim5/Akonadi/akonadi/private/compressionstream_p.h
+include/KPim5/Akonadi/akonadi/private/dbus_p.h
+include/KPim5/Akonadi/akonadi/private/externalpartstorage_p.h
+include/KPim5/Akonadi/akonadi/private/imapparser_p.h
+include/KPim5/Akonadi/akonadi/private/imapset_p.h
+include/KPim5/Akonadi/akonadi/private/instance_p.h
+include/KPim5/Akonadi/akonadi/private/protocol_exception_p.h
+include/KPim5/Akonadi/akonadi/private/protocol_gen.h
+include/KPim5/Akonadi/akonadi/private/protocol_p.h
+include/KPim5/Akonadi/akonadi/private/scope_p.h
+include/KPim5/Akonadi/akonadi/private/standarddirs_p.h
+include/KPim5/Akonadi/akonadi/private/tristate_p.h
+include/KPim5/AkonadiAgentBase/Akonadi/AccountsIntegration
+include/KPim5/AkonadiAgentBase/Akonadi/AgentBase
+include/KPim5/AkonadiAgentBase/Akonadi/AgentSearchInterface
+include/KPim5/AkonadiAgentBase/Akonadi/PreprocessorBase
+include/KPim5/AkonadiAgentBase/Akonadi/ResourceBase
+include/KPim5/AkonadiAgentBase/Akonadi/ResourceSettings
+include/KPim5/AkonadiAgentBase/Akonadi/TransportResourceBase
+include/KPim5/AkonadiAgentBase/akonadi/accountsintegration.h
+include/KPim5/AkonadiAgentBase/akonadi/agentbase.h
+include/KPim5/AkonadiAgentBase/akonadi/agentsearchinterface.h
+include/KPim5/AkonadiAgentBase/akonadi/akonadiagentbase_export.h
+include/KPim5/AkonadiAgentBase/akonadi/preprocessorbase.h
+include/KPim5/AkonadiAgentBase/akonadi/resourcebase.h
+include/KPim5/AkonadiAgentBase/akonadi/resourcebasesettings.h
+include/KPim5/AkonadiAgentBase/akonadi/resourcesettings.h
+include/KPim5/AkonadiAgentBase/akonadi/transportresourcebase.h
+include/KPim5/AkonadiCore/Akonadi/AbstractDifferencesReporter
+include/KPim5/AkonadiCore/Akonadi/AgentConfigurationBase
+include/KPim5/AkonadiCore/Akonadi/AgentConfigurationFactoryBase
+include/KPim5/AkonadiCore/Akonadi/AgentFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/AgentInstance
+include/KPim5/AkonadiCore/Akonadi/AgentInstanceCreateJob
+include/KPim5/AkonadiCore/Akonadi/AgentInstanceModel
+include/KPim5/AkonadiCore/Akonadi/AgentManager
+include/KPim5/AkonadiCore/Akonadi/AgentType
+include/KPim5/AkonadiCore/Akonadi/AgentTypeModel
+include/KPim5/AkonadiCore/Akonadi/Attribute
+include/KPim5/AkonadiCore/Akonadi/AttributeFactory
+include/KPim5/AkonadiCore/Akonadi/CachePolicy
+include/KPim5/AkonadiCore/Akonadi/ChangeNotification
+include/KPim5/AkonadiCore/Akonadi/ChangeRecorder
+include/KPim5/AkonadiCore/Akonadi/Collection
+include/KPim5/AkonadiCore/Akonadi/CollectionAttributesSynchronizationJob
+include/KPim5/AkonadiCore/Akonadi/CollectionColorAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionCopyJob
+include/KPim5/AkonadiCore/Akonadi/CollectionCreateJob
+include/KPim5/AkonadiCore/Akonadi/CollectionDeleteJob
+include/KPim5/AkonadiCore/Akonadi/CollectionFetchJob
+include/KPim5/AkonadiCore/Akonadi/CollectionFetchScope
+include/KPim5/AkonadiCore/Akonadi/CollectionFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/CollectionIdentificationAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionModifyJob
+include/KPim5/AkonadiCore/Akonadi/CollectionMoveJob
+include/KPim5/AkonadiCore/Akonadi/CollectionPathResolver
+include/KPim5/AkonadiCore/Akonadi/CollectionQuotaAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionStatistics
+include/KPim5/AkonadiCore/Akonadi/CollectionStatisticsJob
+include/KPim5/AkonadiCore/Akonadi/CollectionUtils
+include/KPim5/AkonadiCore/Akonadi/Control
+include/KPim5/AkonadiCore/Akonadi/DifferencesAlgorithmInterface
+include/KPim5/AkonadiCore/Akonadi/EntityAnnotationsAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityDeletedAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityDisplayAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityHiddenAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityMimeTypeFilterModel
+include/KPim5/AkonadiCore/Akonadi/EntityOrderProxyModel
+include/KPim5/AkonadiCore/Akonadi/EntityRightsFilterModel
+include/KPim5/AkonadiCore/Akonadi/EntityTreeModel
+include/KPim5/AkonadiCore/Akonadi/ExceptionBase
+include/KPim5/AkonadiCore/Akonadi/FavoriteCollectionAttribute
+include/KPim5/AkonadiCore/Akonadi/FavoriteCollectionsModel
+include/KPim5/AkonadiCore/Akonadi/GidExtractorInterface
+include/KPim5/AkonadiCore/Akonadi/IndexPolicyAttribute
+include/KPim5/AkonadiCore/Akonadi/Item
+include/KPim5/AkonadiCore/Akonadi/ItemCopyJob
+include/KPim5/AkonadiCore/Akonadi/ItemCreateJob
+include/KPim5/AkonadiCore/Akonadi/ItemDeleteJob
+include/KPim5/AkonadiCore/Akonadi/ItemFetchJob
+include/KPim5/AkonadiCore/Akonadi/ItemFetchScope
+include/KPim5/AkonadiCore/Akonadi/ItemModifyJob
+include/KPim5/AkonadiCore/Akonadi/ItemMonitor
+include/KPim5/AkonadiCore/Akonadi/ItemMoveJob
+include/KPim5/AkonadiCore/Akonadi/ItemSearchJob
+include/KPim5/AkonadiCore/Akonadi/ItemSerializerPlugin
+include/KPim5/AkonadiCore/Akonadi/ItemSync
+include/KPim5/AkonadiCore/Akonadi/Job
+include/KPim5/AkonadiCore/Akonadi/LinkJob
+include/KPim5/AkonadiCore/Akonadi/MimeTypeChecker
+include/KPim5/AkonadiCore/Akonadi/Monitor
+include/KPim5/AkonadiCore/Akonadi/NotificationSubscriber
+include/KPim5/AkonadiCore/Akonadi/PartFetcher
+include/KPim5/AkonadiCore/Akonadi/PersistentSearchAttribute
+include/KPim5/AkonadiCore/Akonadi/RecursiveCollectionFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/RecursiveItemFetchJob
+include/KPim5/AkonadiCore/Akonadi/Relation
+include/KPim5/AkonadiCore/Akonadi/RelationCreateJob
+include/KPim5/AkonadiCore/Akonadi/RelationDeleteJob
+include/KPim5/AkonadiCore/Akonadi/RelationFetchJob
+include/KPim5/AkonadiCore/Akonadi/ResourceSynchronizationJob
+include/KPim5/AkonadiCore/Akonadi/SearchCreateJob
+include/KPim5/AkonadiCore/Akonadi/SearchQuery
+include/KPim5/AkonadiCore/Akonadi/SelectionProxyModel
+include/KPim5/AkonadiCore/Akonadi/ServerManager
+include/KPim5/AkonadiCore/Akonadi/Session
+include/KPim5/AkonadiCore/Akonadi/SpecialCollectionAttribute
+include/KPim5/AkonadiCore/Akonadi/SpecialCollections
+include/KPim5/AkonadiCore/Akonadi/SpecialCollectionsDiscoveryJob
+include/KPim5/AkonadiCore/Akonadi/SpecialCollectionsRequestJob
+include/KPim5/AkonadiCore/Akonadi/StatisticsProxyModel
+include/KPim5/AkonadiCore/Akonadi/Supertrait
+include/KPim5/AkonadiCore/Akonadi/Tag
+include/KPim5/AkonadiCore/Akonadi/TagAttribute
+include/KPim5/AkonadiCore/Akonadi/TagCache
+include/KPim5/AkonadiCore/Akonadi/TagCreateJob
+include/KPim5/AkonadiCore/Akonadi/TagDeleteJob
+include/KPim5/AkonadiCore/Akonadi/TagFetchJob
+include/KPim5/AkonadiCore/Akonadi/TagFetchScope
+include/KPim5/AkonadiCore/Akonadi/TagModel
+include/KPim5/AkonadiCore/Akonadi/TagModifyJob
+include/KPim5/AkonadiCore/Akonadi/TransactionJobs
+include/KPim5/AkonadiCore/Akonadi/TransactionSequence
+include/KPim5/AkonadiCore/Akonadi/TrashFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/TrashJob
+include/KPim5/AkonadiCore/Akonadi/TrashRestoreJob
+include/KPim5/AkonadiCore/Akonadi/TrashSettings
+include/KPim5/AkonadiCore/Akonadi/UnlinkJob
+include/KPim5/AkonadiCore/Akonadi/VectorHelper
+include/KPim5/AkonadiCore/akonadi/abstractdifferencesreporter.h
+include/KPim5/AkonadiCore/akonadi/abstractsearchplugin.h
+include/KPim5/AkonadiCore/akonadi/agentconfigurationbase.h
+include/KPim5/AkonadiCore/akonadi/agentconfigurationfactorybase.h
+include/KPim5/AkonadiCore/akonadi/agentfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/agentinstance.h
+include/KPim5/AkonadiCore/akonadi/agentinstancecreatejob.h
+include/KPim5/AkonadiCore/akonadi/agentinstancemodel.h
+include/KPim5/AkonadiCore/akonadi/agentmanager.h
+include/KPim5/AkonadiCore/akonadi/agenttype.h
+include/KPim5/AkonadiCore/akonadi/agenttypemodel.h
+include/KPim5/AkonadiCore/akonadi/akonadicore_export.h
+include/KPim5/AkonadiCore/akonadi/attribute.h
+include/KPim5/AkonadiCore/akonadi/attributefactory.h
+include/KPim5/AkonadiCore/akonadi/cachepolicy.h
+include/KPim5/AkonadiCore/akonadi/changenotification.h
+include/KPim5/AkonadiCore/akonadi/changerecorder.h
+include/KPim5/AkonadiCore/akonadi/collection.h
+include/KPim5/AkonadiCore/akonadi/collectionattributessynchronizationjob.h
+include/KPim5/AkonadiCore/akonadi/collectioncolorattribute.h
+include/KPim5/AkonadiCore/akonadi/collectioncopyjob.h
+include/KPim5/AkonadiCore/akonadi/collectioncreatejob.h
+include/KPim5/AkonadiCore/akonadi/collectiondeletejob.h
+include/KPim5/AkonadiCore/akonadi/collectionfetchjob.h
+include/KPim5/AkonadiCore/akonadi/collectionfetchscope.h
+include/KPim5/AkonadiCore/akonadi/collectionfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/collectionidentificationattribute.h
+include/KPim5/AkonadiCore/akonadi/collectionmodifyjob.h
+include/KPim5/AkonadiCore/akonadi/collectionmovejob.h
+include/KPim5/AkonadiCore/akonadi/collectionpathresolver.h
+include/KPim5/AkonadiCore/akonadi/collectionquotaattribute.h
+include/KPim5/AkonadiCore/akonadi/collectionstatistics.h
+include/KPim5/AkonadiCore/akonadi/collectionstatisticsjob.h
+include/KPim5/AkonadiCore/akonadi/collectionutils.h
+include/KPim5/AkonadiCore/akonadi/config-akonadi.h
+include/KPim5/AkonadiCore/akonadi/control.h
+include/KPim5/AkonadiCore/akonadi/differencesalgorithminterface.h
+include/KPim5/AkonadiCore/akonadi/entityannotationsattribute.h
+include/KPim5/AkonadiCore/akonadi/entitydeletedattribute.h
+include/KPim5/AkonadiCore/akonadi/entitydisplayattribute.h
+include/KPim5/AkonadiCore/akonadi/entityhiddenattribute.h
+include/KPim5/AkonadiCore/akonadi/entitymimetypefiltermodel.h
+include/KPim5/AkonadiCore/akonadi/entityorderproxymodel.h
+include/KPim5/AkonadiCore/akonadi/entityrightsfiltermodel.h
+include/KPim5/AkonadiCore/akonadi/entitytreemodel.h
+include/KPim5/AkonadiCore/akonadi/exceptionbase.h
+include/KPim5/AkonadiCore/akonadi/favoritecollectionattribute.h
+include/KPim5/AkonadiCore/akonadi/favoritecollectionsmodel.h
+include/KPim5/AkonadiCore/akonadi/gidextractorinterface.h
+include/KPim5/AkonadiCore/akonadi/indexpolicyattribute.h
+include/KPim5/AkonadiCore/akonadi/item.h
+include/KPim5/AkonadiCore/akonadi/itemcopyjob.h
+include/KPim5/AkonadiCore/akonadi/itemcreatejob.h
+include/KPim5/AkonadiCore/akonadi/itemdeletejob.h
+include/KPim5/AkonadiCore/akonadi/itemfetchjob.h
+include/KPim5/AkonadiCore/akonadi/itemfetchscope.h
+include/KPim5/AkonadiCore/akonadi/itemmodifyjob.h
+include/KPim5/AkonadiCore/akonadi/itemmonitor.h
+include/KPim5/AkonadiCore/akonadi/itemmovejob.h
+include/KPim5/AkonadiCore/akonadi/itempayloadinternals_p.h
+include/KPim5/AkonadiCore/akonadi/itemsearchjob.h
+include/KPim5/AkonadiCore/akonadi/itemserializerplugin.h
+include/KPim5/AkonadiCore/akonadi/itemsync.h
+include/KPim5/AkonadiCore/akonadi/job.h
+include/KPim5/AkonadiCore/akonadi/linkjob.h
+include/KPim5/AkonadiCore/akonadi/mimetypechecker.h
+include/KPim5/AkonadiCore/akonadi/monitor.h
+include/KPim5/AkonadiCore/akonadi/notificationsubscriber.h
+include/KPim5/AkonadiCore/akonadi/partfetcher.h
+include/KPim5/AkonadiCore/akonadi/persistentsearchattribute.h
+include/KPim5/AkonadiCore/akonadi/qtest_akonadi.h
+include/KPim5/AkonadiCore/akonadi/recursivecollectionfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/recursiveitemfetchjob.h
+include/KPim5/AkonadiCore/akonadi/relation.h
+include/KPim5/AkonadiCore/akonadi/relationcreatejob.h
+include/KPim5/AkonadiCore/akonadi/relationdeletejob.h
+include/KPim5/AkonadiCore/akonadi/relationfetchjob.h
+include/KPim5/AkonadiCore/akonadi/resourcesynchronizationjob.h
+include/KPim5/AkonadiCore/akonadi/searchcreatejob.h
+include/KPim5/AkonadiCore/akonadi/searchquery.h
+include/KPim5/AkonadiCore/akonadi/selectionproxymodel.h
+include/KPim5/AkonadiCore/akonadi/servermanager.h
+include/KPim5/AkonadiCore/akonadi/session.h
+include/KPim5/AkonadiCore/akonadi/specialcollectionattribute.h
+include/KPim5/AkonadiCore/akonadi/specialcollections.h
+include/KPim5/AkonadiCore/akonadi/specialcollectionsdiscoveryjob.h
+include/KPim5/AkonadiCore/akonadi/specialcollectionsrequestjob.h
+include/KPim5/AkonadiCore/akonadi/statisticsproxymodel.h
+include/KPim5/AkonadiCore/akonadi/supertrait.h
+include/KPim5/AkonadiCore/akonadi/tag.h
+include/KPim5/AkonadiCore/akonadi/tagattribute.h
+include/KPim5/AkonadiCore/akonadi/tagcache.h
+include/KPim5/AkonadiCore/akonadi/tagcreatejob.h
+include/KPim5/AkonadiCore/akonadi/tagdeletejob.h
+include/KPim5/AkonadiCore/akonadi/tagfetchjob.h
+include/KPim5/AkonadiCore/akonadi/tagfetchscope.h
+include/KPim5/AkonadiCore/akonadi/tagmodel.h
+include/KPim5/AkonadiCore/akonadi/tagmodifyjob.h
+include/KPim5/AkonadiCore/akonadi/transactionjobs.h
+include/KPim5/AkonadiCore/akonadi/transactionsequence.h
+include/KPim5/AkonadiCore/akonadi/trashfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/trashjob.h
+include/KPim5/AkonadiCore/akonadi/trashrestorejob.h
+include/KPim5/AkonadiCore/akonadi/trashsettings.h
+include/KPim5/AkonadiCore/akonadi/unlinkjob.h
+include/KPim5/AkonadiCore/akonadi/vectorhelper.h
+include/KPim5/AkonadiCore/akonadi_version.h
+include/KPim5/AkonadiWidgets/Akonadi/AgentActionManager
+include/KPim5/AkonadiWidgets/Akonadi/AgentConfigurationDialog
+include/KPim5/AkonadiWidgets/Akonadi/AgentConfigurationWidget
+include/KPim5/AkonadiWidgets/Akonadi/AgentInstanceWidget
+include/KPim5/AkonadiWidgets/Akonadi/AgentTypeDialog
+include/KPim5/AkonadiWidgets/Akonadi/AgentTypeWidget
+include/KPim5/AkonadiWidgets/Akonadi/ClearCacheJob
+include/KPim5/AkonadiWidgets/Akonadi/CollectionComboBox
+include/KPim5/AkonadiWidgets/Akonadi/CollectionDialog
+include/KPim5/AkonadiWidgets/Akonadi/CollectionMaintenancePage
+include/KPim5/AkonadiWidgets/Akonadi/CollectionPropertiesDialog
+include/KPim5/AkonadiWidgets/Akonadi/CollectionPropertiesPage
+include/KPim5/AkonadiWidgets/Akonadi/CollectionRequester
+include/KPim5/AkonadiWidgets/Akonadi/CollectionStatisticsDelegate
+include/KPim5/AkonadiWidgets/Akonadi/ControlGui
+include/KPim5/AkonadiWidgets/Akonadi/DbAccess
+include/KPim5/AkonadiWidgets/Akonadi/ETMViewStateSaver
+include/KPim5/AkonadiWidgets/Akonadi/EntityListView
+include/KPim5/AkonadiWidgets/Akonadi/EntityTreeView
+include/KPim5/AkonadiWidgets/Akonadi/ManageAccountWidget
+include/KPim5/AkonadiWidgets/Akonadi/StandardActionManager
+include/KPim5/AkonadiWidgets/Akonadi/SubscriptionDialog
+include/KPim5/AkonadiWidgets/Akonadi/TagEditWidget
+include/KPim5/AkonadiWidgets/Akonadi/TagManagementDialog
+include/KPim5/AkonadiWidgets/Akonadi/TagSelectWidget
+include/KPim5/AkonadiWidgets/Akonadi/TagSelectionComboBox
+include/KPim5/AkonadiWidgets/Akonadi/TagSelectionDialog
+include/KPim5/AkonadiWidgets/Akonadi/TagWidget
+include/KPim5/AkonadiWidgets/akonadi/agentactionmanager.h
+include/KPim5/AkonadiWidgets/akonadi/agentconfigurationdialog.h
+include/KPim5/AkonadiWidgets/akonadi/agentconfigurationwidget.h
+include/KPim5/AkonadiWidgets/akonadi/agentinstancewidget.h
+include/KPim5/AkonadiWidgets/akonadi/agenttypedialog.h
+include/KPim5/AkonadiWidgets/akonadi/agenttypewidget.h
+include/KPim5/AkonadiWidgets/akonadi/akonadiwidgets_export.h
+include/KPim5/AkonadiWidgets/akonadi/clearcachejob.h
+include/KPim5/AkonadiWidgets/akonadi/collectioncombobox.h
+include/KPim5/AkonadiWidgets/akonadi/collectiondialog.h
+include/KPim5/AkonadiWidgets/akonadi/collectionmaintenancepage.h
+include/KPim5/AkonadiWidgets/akonadi/collectionpropertiesdialog.h
+include/KPim5/AkonadiWidgets/akonadi/collectionpropertiespage.h
+include/KPim5/AkonadiWidgets/akonadi/collectionrequester.h
+include/KPim5/AkonadiWidgets/akonadi/collectionstatisticsdelegate.h
+include/KPim5/AkonadiWidgets/akonadi/controlgui.h
+include/KPim5/AkonadiWidgets/akonadi/dbaccess.h
+include/KPim5/AkonadiWidgets/akonadi/entitylistview.h
+include/KPim5/AkonadiWidgets/akonadi/entitytreeview.h
+include/KPim5/AkonadiWidgets/akonadi/etmviewstatesaver.h
+include/KPim5/AkonadiWidgets/akonadi/manageaccountwidget.h
+include/KPim5/AkonadiWidgets/akonadi/standardactionmanager.h
+include/KPim5/AkonadiWidgets/akonadi/subscriptiondialog.h
+include/KPim5/AkonadiWidgets/akonadi/tageditwidget.h
+include/KPim5/AkonadiWidgets/akonadi/tagmanagementdialog.h
+include/KPim5/AkonadiWidgets/akonadi/tagselectioncombobox.h
+include/KPim5/AkonadiWidgets/akonadi/tagselectiondialog.h
+include/KPim5/AkonadiWidgets/akonadi/tagselectwidget.h
+include/KPim5/AkonadiWidgets/akonadi/tagwidget.h
+include/KPim5/AkonadiXml/Akonadi/XmlDocument
+include/KPim5/AkonadiXml/Akonadi/XmlReader
+include/KPim5/AkonadiXml/Akonadi/XmlWriteJob
+include/KPim5/AkonadiXml/Akonadi/XmlWriter
+include/KPim5/AkonadiXml/akonadi/akonadi-xml_export.h
+include/KPim5/AkonadiXml/akonadi/xmldocument.h
+include/KPim5/AkonadiXml/akonadi/xmlreader.h
+include/KPim5/AkonadiXml/akonadi/xmlwritejob.h
+include/KPim5/AkonadiXml/akonadi/xmlwriter.h
+lib/cmake/KF5Akonadi/KF5AkonadiConfig.cmake
+lib/cmake/KF5Akonadi/KF5AkonadiConfigVersion.cmake
+lib/cmake/KF5Akonadi/KPim5AkonadiTargets-noconfig.cmake
+lib/cmake/KF5Akonadi/KPim5AkonadiTargets.cmake
+lib/cmake/KF5Akonadi/KPimAkonadiMacros.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiConfig.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiConfigVersion.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiTargets-noconfig.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiTargets.cmake
+lib/cmake/KPim5Akonadi/KPimAkonadiMacros.cmake
+lib/libKPim5AkonadiAgentBase.so
+lib/libKPim5AkonadiAgentBase.so.5
+lib/libKPim5AkonadiAgentBase.so.5.23.3
+lib/libKPim5AkonadiCore.so
+lib/libKPim5AkonadiCore.so.5
+lib/libKPim5AkonadiCore.so.5.23.3
+lib/libKPim5AkonadiPrivate.so
+lib/libKPim5AkonadiPrivate.so.5
+lib/libKPim5AkonadiPrivate.so.5.23.3
+lib/libKPim5AkonadiWidgets.so
+lib/libKPim5AkonadiWidgets.so.5
+lib/libKPim5AkonadiWidgets.so.5.23.3
+lib/libKPim5AkonadiXml.so
+lib/libKPim5AkonadiXml.so.5
+lib/libKPim5AkonadiXml.so.5.23.3
+qt5/mkspecs/modules/qt_AkonadiAgentBase.pri
+qt5/mkspecs/modules/qt_AkonadiCore.pri
+qt5/mkspecs/modules/qt_AkonadiWidgets.pri
+qt5/mkspecs/modules/qt_AkonadiXml.pri
+qt5/plugins/designer/akonadi5widgets.so
+qt5/plugins/pim5/akonadi/akonadi_test_searchplugin.so
+qt5/plugins/sqldrivers/libqsqlite3.so
+share/akonadi/agents/knutresource.desktop
+share/config.kcfg/resourcebase.kcfg
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Search.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
@@ -42,4 +363,137 @@ share/dbus-1/interfaces/org.freedesktop.
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
 share/dbus-1/services/org.freedesktop.Akonadi.Control.service
+share/examples/kde-xdg/akonadi/mysql-global-mobile.conf
+share/examples/kde-xdg/akonadi/mysql-global.conf
+share/icons/hicolor/128x128/apps/akonadi.png
+share/icons/hicolor/16x16/apps/akonadi.png
+share/icons/hicolor/22x22/apps/akonadi.png
+share/icons/hicolor/256x256/apps/akonadi.png
+share/icons/hicolor/32x32/apps/akonadi.png
+share/icons/hicolor/48x48/apps/akonadi.png
+share/icons/hicolor/64x64/apps/akonadi.png
+share/icons/hicolor/scalable/apps/akonadi.svgz
+share/kdevappwizard/templates/akonadiresource.tar.bz2
+share/kdevappwizard/templates/akonadiserializer.tar.bz2
+share/kf5/akonadi/akonadi-xml.xsd
+share/kf5/akonadi/kcfg2dbus.xsl
+share/kf5/akonadi_knut_resource/knut-template.xml
+share/locale/ar/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ar/LC_MESSAGES/libakonadi5.mo
+share/locale/az/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/az/LC_MESSAGES/libakonadi5.mo
+share/locale/be/LC_MESSAGES/libakonadi5.mo
+share/locale/bg/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/bg/LC_MESSAGES/libakonadi5.mo
+share/locale/bs/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/bs/LC_MESSAGES/libakonadi5.mo
+share/locale/ca/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ca/LC_MESSAGES/libakonadi5.mo
+share/locale/ca@valencia/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ca@valencia/LC_MESSAGES/libakonadi5.mo
+share/locale/cs/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/cs/LC_MESSAGES/libakonadi5.mo
+share/locale/da/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/da/LC_MESSAGES/libakonadi5.mo
+share/locale/de/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/de/LC_MESSAGES/libakonadi5.mo
+share/locale/el/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/el/LC_MESSAGES/libakonadi5.mo
+share/locale/en_GB/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/en_GB/LC_MESSAGES/libakonadi5.mo
+share/locale/eo/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/eo/LC_MESSAGES/libakonadi5.mo
+share/locale/es/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/es/LC_MESSAGES/libakonadi5.mo
+share/locale/et/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/et/LC_MESSAGES/libakonadi5.mo
+share/locale/eu/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/eu/LC_MESSAGES/libakonadi5.mo
+share/locale/fi/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/fi/LC_MESSAGES/libakonadi5.mo
+share/locale/fr/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/fr/LC_MESSAGES/libakonadi5.mo
+share/locale/ga/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ga/LC_MESSAGES/libakonadi5.mo
+share/locale/gl/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/gl/LC_MESSAGES/libakonadi5.mo
+share/locale/hsb/LC_MESSAGES/libakonadi5.mo
+share/locale/hu/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/hu/LC_MESSAGES/libakonadi5.mo
+share/locale/ia/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ia/LC_MESSAGES/libakonadi5.mo
+share/locale/id/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/id/LC_MESSAGES/libakonadi5.mo
+share/locale/it/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/it/LC_MESSAGES/libakonadi5.mo
+share/locale/ja/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ja/LC_MESSAGES/libakonadi5.mo
+share/locale/ka/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ka/LC_MESSAGES/libakonadi5.mo
+share/locale/kk/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/kk/LC_MESSAGES/libakonadi5.mo
+share/locale/km/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/km/LC_MESSAGES/libakonadi5.mo
+share/locale/ko/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ko/LC_MESSAGES/libakonadi5.mo
+share/locale/lt/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/lt/LC_MESSAGES/libakonadi5.mo
+share/locale/lv/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/lv/LC_MESSAGES/libakonadi5.mo
+share/locale/mai/LC_MESSAGES/libakonadi5.mo
+share/locale/mr/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/mr/LC_MESSAGES/libakonadi5.mo
+share/locale/my/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/my/LC_MESSAGES/libakonadi5.mo
+share/locale/nb/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/nb/LC_MESSAGES/libakonadi5.mo
+share/locale/nds/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/nds/LC_MESSAGES/libakonadi5.mo
+share/locale/nl/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/nl/LC_MESSAGES/libakonadi5.mo
+share/locale/nn/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/nn/LC_MESSAGES/libakonadi5.mo
+share/locale/pa/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/pa/LC_MESSAGES/libakonadi5.mo
+share/locale/pl/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/pl/LC_MESSAGES/libakonadi5.mo
+share/locale/pt/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/pt/LC_MESSAGES/libakonadi5.mo
+share/locale/pt_BR/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/pt_BR/LC_MESSAGES/libakonadi5.mo
+share/locale/ro/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ro/LC_MESSAGES/libakonadi5.mo
+share/locale/ru/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ru/LC_MESSAGES/libakonadi5.mo
+share/locale/se/LC_MESSAGES/libakonadi5.mo
+share/locale/sk/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sk/LC_MESSAGES/libakonadi5.mo
+share/locale/sl/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sl/LC_MESSAGES/libakonadi5.mo
+share/locale/sq/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr/LC_MESSAGES/libakonadi5.mo
+share/locale/sr@ijekavian/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr@ijekavian/LC_MESSAGES/libakonadi5.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/libakonadi5.mo
+share/locale/sr@latin/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr@latin/LC_MESSAGES/libakonadi5.mo
+share/locale/sv/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sv/LC_MESSAGES/libakonadi5.mo
+share/locale/tg/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/tg/LC_MESSAGES/libakonadi5.mo
+share/locale/th/LC_MESSAGES/libakonadi5.mo
+share/locale/tr/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/tr/LC_MESSAGES/libakonadi5.mo
+share/locale/ug/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ug/LC_MESSAGES/libakonadi5.mo
+share/locale/uk/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/uk/LC_MESSAGES/libakonadi5.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/zh_CN/LC_MESSAGES/libakonadi5.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/zh_TW/LC_MESSAGES/libakonadi5.mo
 share/mime/packages/akonadi-mime.xml
+share/qlogging-categories5/akonadi.categories
+share/qlogging-categories5/akonadi.renamecategories

Index: pkgsrc/mail/akonadi/buildlink3.mk
diff -u pkgsrc/mail/akonadi/buildlink3.mk:1.37 pkgsrc/mail/akonadi/buildlink3.mk:1.38
--- pkgsrc/mail/akonadi/buildlink3.mk:1.37      Sun Jan 29 21:14:47 2023
+++ pkgsrc/mail/akonadi/buildlink3.mk   Wed Aug 16 03:14:33 2023
@@ -1,22 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.37 2023/01/29 21:14:47 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2023/08/16 03:14:33 markd Exp $
 
 BUILDLINK_TREE+=       akonadi
 
 .if !defined(AKONADI_BUILDLINK3_MK)
 AKONADI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.akonadi+=        akonadi>=0.82.0
-BUILDLINK_ABI_DEPENDS.akonadi+=        akonadi>=1.13.0nb46
+BUILDLINK_API_DEPENDS.akonadi+=        akonadi>=17.12.1
 BUILDLINK_PKGSRCDIR.akonadi?=  ../../mail/akonadi
 
-BUILDLINK_FILES.akonadi+=      lib/cmake/Akonadi/* \
-                               share/config/akonadi/*.conf \
-                               share/dbus-1/interfaces/org.freedesktop.Akonadi* \
-                               share/dbus-1/services/org.freedesktop.Akonadi* \
-                               share/mime/packages/akonadi*
-
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.endif # AKONADI_BUILDLINK3_MK
+BUILDLINK_FILES.akonadi+=      share/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
+BUILDLINK_FILES.akonadi+=      share/kf5/akonadi/kcfg2dbus.xsl
+
+.include "../../devel/kio/buildlink3.mk"
+.include "../../devel/kitemmodels/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif # AKONADI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -akonadi

Index: pkgsrc/mail/akonadi/distinfo
diff -u pkgsrc/mail/akonadi/distinfo:1.26 pkgsrc/mail/akonadi/distinfo:1.27
--- pkgsrc/mail/akonadi/distinfo:1.26   Mon May  8 00:05:21 2023
+++ pkgsrc/mail/akonadi/distinfo        Wed Aug 16 03:14:33 2023
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.26 2023/05/08 00:05:21 nikita Exp $
+$NetBSD: distinfo,v 1.27 2023/08/16 03:14:33 markd Exp $
 
-BLAKE2s (akonadi-1.13.0.tar.bz2) = bd77dc782e2c525405387b139562107f6c58eddc63652098c3a37ba549ff138d
-SHA512 (akonadi-1.13.0.tar.bz2) = 4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f
-Size (akonadi-1.13.0.tar.bz2) = 294198 bytes
-SHA1 (patch-agentserver_CMakeLists.txt) = 01249fd521e23a8cb8c7119ad9c8cd9877338c54
-SHA1 (patch-cmake_modules_FindSqlite.cmake) = 3deefae90ec3485affeda4de283d4166d85c41fc
-SHA1 (patch-git_21465191) = 735e05bfa08c113ec196049dcea035f889cd7b6d
-SHA1 (patch-libs_xdgbasedirs.cpp) = eccf2de9445ea63eb09529e077d36f43303bd0ee
-SHA1 (patch-server_src_storage_dbconfigmysql.cpp) = 1c33f20c9f3a8f616aff66f0a6d39f5c80308709
-SHA1 (patch-server_src_storage_partstreamer.cpp) = c8de60299129673d5cfb699c8c73a9275088fd61
-SHA1 (patch-server_tests_unittest_partstreamertest.cpp) = 1068831b3abeb855f759941d5e38bd86ef89cf0a
+BLAKE2s (akonadi-23.04.3.tar.xz) = 1d155123217e725738402d9a08994c5c725350000d8e77a49ef051da34246ed8
+SHA512 (akonadi-23.04.3.tar.xz) = fc9729451ac8e39c4455748a5fd9fd1efd82573c21731d60dbad59bc02e75e3653bae6469b2d04b68c360fd5f23bc49914d07d849a71a71e1349bd76ae6c8dbc
+Size (akonadi-23.04.3.tar.xz) = 1668012 bytes

Index: pkgsrc/mail/akonadi/options.mk
diff -u pkgsrc/mail/akonadi/options.mk:1.6 pkgsrc/mail/akonadi/options.mk:1.7
--- pkgsrc/mail/akonadi/options.mk:1.6  Sat May 23 13:08:51 2020
+++ pkgsrc/mail/akonadi/options.mk      Wed Aug 16 03:14:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2020/05/23 13:08:51 nia Exp $
+# $NetBSD: options.mk,v 1.7 2023/08/16 03:14:33 markd Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.akonadi
 
@@ -10,40 +10,14 @@ PKG_SUGGESTED_OPTIONS=              sqlite
 .include "../../mk/bsd.options.mk"
 
 ###
-### Use mysql backend
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-MYSQL_VERSIONS_ACCEPTED=       56
-.include "../../mk/mysql.buildlink3.mk"
-DEPENDS+=      qt4-mysql-[0-9]*:../../x11/qt4-mysql
-CMAKE_ARGS+=   -DAKONADI_BUILD_QSQLITE=off
-.  if ${_MYSQL_VERSION} == "56"
-.    include "../../databases/mysql56-server/buildlink3.mk"
-.  else
-PKG_FAIL_REASON+=      "Unknown MySQL version: ${_MYSQL_VERSION}"
-.  endif
-SUBST_CLASSES+=                mysql
-SUBST_STAGE.mysql=     pre-configure
-SUBST_MESSAGE.mysql=   Fix mysqld path.
-SUBST_FILES.mysql=     server/CMakeLists.txt
-SUBST_SED.mysql=       -e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:"
-.endif
-
-###
-### Use postgresql backend
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-.      include "../../mk/pgsql.buildlink3.mk"
-# XXX Not yet tested in pkgsrc
-.endif
-
-###
 ### Use sqlite backend
 ###
 PLIST_VARS+=   sqlite
 .if !empty(PKG_OPTIONS:Msqlite)
-.      include "../../databases/sqlite3/buildlink3.mk"
+.  include "../../databases/sqlite3/buildlink3.mk"
+CMAKE_ARGS+=   -DAKONADI_BUILD_QSQLITE:BOOL=ON
 CMAKE_ARGS+=   -DDATABASE_BACKEND=SQLITE
-CMAKE_ARGS+=   -DINSTALL_QSQLITE_IN_QT_PREFIX=true
+CMAKE_ARGS+=   -DSQLITE_INCLUDE_DIR=${BUILDLINK_PREFIX.sqlite3}/include
+CMAKE_ARGS+=   -DSQLITE_LIBRARIES=${BUILDLINK_PREFIX.sqlite3}/lib/libsqlite3.so
 PLIST.sqlite=  yes
 .endif



Home | Main Index | Thread Index | Old Index