Update to 1.10.0:

1.10.0                            09-July-2013
----------------------------------------------
- Memory optimizations
- Fix a runtime error on Windows

1.9.80                            10-June-2013
----------------------------------------------
- Update item access time less often.
- Don't try to start akonadiserver if mysqld is not installed
- Allow to fetch available items even if there are errors in some of the items.
- Properly restrict the external part removal to the deleted collection.
- Support checking the cache for payloads in the FETCH command.
- Add infrastructure to track client capabilities.
- Allow to disable the cache verification on retrieval.
- fsck: move orphaned pim items to lost+found, delete orphaned pim item flags.
- Introduce NotificationMessageV2 that supports batch operations on set of entities.
- Fix build with Boost >= 1.53.
- Fix a runtime issue with MySQL >= 5.6 (MySQL >= 5.1.3 is now the minimum version).

4 files changed, 9 insertions, 25 deletions

diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile
index 0a7d7e57702..70b639a09c9 100644
--- a/mail/akonadi/Makefile
+++ b/mail/akonadi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2013/07/04 16:51:49 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2013/07/20 15:56:18 wiz Exp $
 
-DISTNAME=	akonadi-1.9.2
+DISTNAME=	akonadi-1.10.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://kde.mirror.anlx.net/stable/akonadi/src/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/akonadi/PLIST b/mail/akonadi/PLIST
index ae856364306..90b1e66c8d6 100644
--- a/mail/akonadi/PLIST
+++ b/mail/akonadi/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2012/03/19 11:39:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/07/20 15:56:18 wiz Exp $
 bin/akonadi_agent_launcher
 bin/akonadi_agent_server
 bin/akonadi_control
 bin/akonadi_rds
 bin/akonadictl
 bin/akonadiserver
+bin/asapcat
 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/protocol_p.h
 include/akonadi/private/xdgbasedirs_p.h
 lib/cmake/Akonadi/AkonadiConfig.cmake
diff --git a/mail/akonadi/distinfo b/mail/akonadi/distinfo
index a6c5b46d885..035f53ee36e 100644
--- a/mail/akonadi/distinfo
+++ b/mail/akonadi/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2013/07/04 16:51:49 wiz Exp $
+$NetBSD: distinfo,v 1.17 2013/07/20 15:56:18 wiz Exp $
 
-SHA1 (akonadi-1.9.2.tar.bz2) = 7c71041272e5afd50d1db52ac7cc78fcddd3b019
-RMD160 (akonadi-1.9.2.tar.bz2) = 458cbb27de4bd158b9875b5ac72d05ec6cf155eb
-Size (akonadi-1.9.2.tar.bz2) = 220599 bytes
+SHA1 (akonadi-1.10.0.tar.bz2) = 97284173fc2c8c6ddd16549477e65fa0c93c717e
+RMD160 (akonadi-1.10.0.tar.bz2) = 1a9b94934584b358a025cd64daf6915c27bed704
+Size (akonadi-1.10.0.tar.bz2) = 227714 bytes
 SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e
 SHA1 (patch-server_src_nepomuk_queryserviceclient.cpp) = ac47da466a84b67fe001e6b80b5c6d93ad20b107
 SHA1 (patch-server_src_nepomuk_queryserviceclient.h) = 78b869b315a0365ccd0b309821296b48e126d363
-SHA1 (patch-shared_akapplication.h) = 4e774cef5b22b5e5e8071c111794c841cde96fe1
diff --git a/mail/akonadi/patches/patch-shared_akapplication.h b/mail/akonadi/patches/patch-shared_akapplication.h
deleted file mode 100644
index 1f80e677cc3..00000000000
--- a/mail/akonadi/patches/patch-shared_akapplication.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-shared_akapplication.h,v 1.1 2013/02/17 09:14:44 markd Exp $
-
-Work around moc inability to parse a boost macro
-
---- shared/akapplication.h.orig	2012-03-31 12:28:05.000000000 +0000
-+++ shared/akapplication.h
-@@ -23,8 +23,10 @@
- #include <QtCore/QObject>
- 
- #ifndef _WIN32_WCE
-+#ifndef Q_MOC_RUN
- #include <boost/program_options.hpp>
- #endif
-+#endif
- 
- class QCoreApplication;
- class QApplication;