From 898b44b9de528ebc1eabee512ba229da0cbbbf13 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 14 Oct 2013 13:14:18 +0000
Subject: [PATCH] Update to 1.10.3 (and support staging).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This release is particularly important for people using PostgreSQL as
Akonadi's backend (note this is not the default), as Qt 4.8.5 and older
versions of Akonadi do not play well.

Full list of changes:
- Fix crash when there are no flags to update during flags change
- Fix crash on Akonadi shutdown when using PostgreSQL
- Fix notification to clients about database upgrade
- Send dummy requests to MySQL from time to time to keep the connection
  alive
- Bug #277839 – Fix problem with too long socket paths
- Bug #323977 – Check minimum MySQL version at runtime
- Bug #252120, Bug #322931 – Use text instead of bytea column type for
  QString in PostgreSQL
---
 databases/akonadi/Makefile  | 6 +++---
 databases/akonadi/distinfo  | 4 ++--
 databases/akonadi/pkg-plist | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index f34c243df4d5..75c76e9b2c5e 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -2,11 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	akonadi
-PORTVERSION=	1.10.2
+PORTVERSION=	1.10.3
 CATEGORIES=	databases kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/src
 DIST_SUBDIR=	KDE
+DISTVERSIONSUFFIX=	-1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Storage server for KDE-Pim
@@ -27,7 +29,6 @@ CMAKE_ARGS+=	-DAKONADI_BUILD_TESTS:BOOL=FALSE \
 		-DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \
 		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
 
@@ -40,7 +41,6 @@ SQLITE_DESC=	Enable SQLite backend
 
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index b1b1036c8dd8..8bfdd6b88b57 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/akonadi-1.10.2.tar.bz2) = f3d50d5ab8070e7ceb9e64ac5eaa5f47a451071e27328219fe93bc9eeb3e32ca
-SIZE (KDE/akonadi-1.10.2.tar.bz2) = 227993
+SHA256 (KDE/akonadi-1.10.3-1.tar.bz2) = a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0
+SIZE (KDE/akonadi-1.10.3-1.tar.bz2) = 228633
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 6a188de42ce1..0337565fe7c9 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -19,7 +19,7 @@ lib/cmake/Akonadi/AkonadiTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
 lib/libakonadiprotocolinternals.so
 lib/libakonadiprotocolinternals.so.1
-lib/libakonadiprotocolinternals.so.1.10.2
+lib/libakonadiprotocolinternals.so.1.10.3
 libdata/pkgconfig/akonadi.pc
 share/config/akonadi/mysql-global-mobile.conf
 share/config/akonadi/mysql-global.conf