4 files changed, 7 insertions, 27 deletions

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 8c7866cc5a6b..09f5fd7b9c81 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	akonadi
-PORTVERSION=	1.11.0
-PORTREVISION=	2
+PORTVERSION=	1.12.0
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=	KDE
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 86a47761b88c..872f98daca25 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/akonadi-1.11.0.tar.bz2) = 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d
-SIZE (KDE/akonadi-1.11.0.tar.bz2) = 235101
+SHA256 (KDE/akonadi-1.12.0.tar.bz2) = 35243793b73e8028973c101c68ef80a8a54be0fe9aa562c9473e73b4657fea26
+SIZE (KDE/akonadi-1.12.0.tar.bz2) = 250974
diff --git a/databases/akonadi/files/patch-git_938e9231 b/databases/akonadi/files/patch-git_938e9231
deleted file mode 100644
index 70ae21707e9e..000000000000
--- a/databases/akonadi/files/patch-git_938e9231
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 938e923143364a2786a0b5bd3e303b1dcd82dfe3
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Sun Dec 22 19:25:17 2013 +0100
-
-    Remove -fno-check-new from CXX_FLAGS
-    
-    This flag is not supported by Clang and generates a warning or build error
-    when using Clang. The overhead of non-null check should be minimal.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e18608a..f22921c 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -241,7 +241,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc" OR (CMAKE_CXX_COMP
- 
-   # more aggressive warnings and C++11 support
-   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -fno-common")
- 
-   # debugfull target
-   set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline" CACHE STRING "Flags used by the C++ compiler during debugfull builds." FORCE)
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 2e5b5fc2d49d..dd306db2ede5 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -5,12 +5,14 @@ bin/akonadi_rds
 bin/akonadictl
 bin/akonadiserver
 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
@@ -19,11 +21,12 @@ lib/cmake/Akonadi/AkonadiTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
 lib/libakonadiprotocolinternals.so
 lib/libakonadiprotocolinternals.so.1
-lib/libakonadiprotocolinternals.so.1.11.0
+lib/libakonadiprotocolinternals.so.1.12.0
 libdata/pkgconfig/akonadi.pc
 share/config/akonadi/mysql-global-mobile.conf
 share/config/akonadi/mysql-global.conf
 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
 share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml