5 files changed, 51 insertions, 42 deletions

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index b3d13de1a11d..8b389eae002e 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -5,20 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	akonadi
-PORTVERSION=	1.6.2
+PORTVERSION=	1.7.2
 CATEGORIES=	databases kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/src/
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Storage server for kdepim
+COMMENT=	Storage server for KDE-Pim
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/lgpl-license
 
-LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
-		soprano.4:${PORTSDIR}/textproc/soprano
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 # Let process generate meaningful backtrace on core dump.
 LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
@@ -27,30 +26,31 @@ USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib network qtestlib dbus gui sql \
 		qmake_build moc_build rcc_build uic_build
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime
+USE_KDE4=	kdehier kdeprefix sharedmime automoc4 soprano
 KDE4_BUILDENV=	yes
 CMAKE_ARGS+=	-DAKONADI_BUILD_TESTS:BOOL=FALSE \
 		-DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \
 		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
-MAKE_JOBS_SAFE=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
 
-OPTIONS=	PGSQL "Enable PostgreSQL backend" off \
-		SQLITE "Enable SQLite backend (unused in KDE)" off
-#		MYSQL "Enable MySQL backend" on
+OPTIONS=	MYSQL "Install MySQL plugin and server (recommended)" on \
+		PGSQL "Install PostgreSQL plugin" off \
+		SQLITE "Enable SQLite backend (unused)" off
 
 .include <bsd.port.options.mk>
 
-# Should we enable this option, remember to make SQLite non-optional.
-#.ifndef(WITHOUT_MYSQL)
+.ifndef(WITHOUT_MYSQL)
 USE_MYSQL=	server
 QT_COMPONENTS+=	sql-mysql_run
-#.else
-#CMAKE_ARGS+=	-DDATABASE_BACKEND:STRING="SQLITE"
-#.endif
+.endif
 
 .ifdef(WITH_PGSQL)
+# Do not add a dependency on PostgreSQL server as someone preferring
+# it over MySQL might like to use some advanced configuration like a
+# remote server.
+#USE_PGSQL=	server
 QT_COMPONENTS+=	sql-pgsql_run
 .endif
 
@@ -70,7 +70,7 @@ post-patch:
 		${PATCH_WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \
 		${PATCH_WRKSRC}/server/CMakeLists.txt
-	# Prevent updating mime during build.
+	# Prevent updating MIME during build.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 4b23ffb0ea8a..3689167b4b6e 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/akonadi-1.6.2.tar.bz2) = 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
-SIZE (KDE/akonadi-1.6.2.tar.bz2) = 211347
+SHA256 (KDE/akonadi-1.7.2.tar.bz2) = 4b7217a847c6859a529f07bf456127dab4aac69694982ca449a80da510832b1f
+SIZE (KDE/akonadi-1.7.2.tar.bz2) = 210944
diff --git a/databases/akonadi/files/patch-server__src__nepomuk__queryserviceclient.h b/databases/akonadi/files/patch-server__src__nepomuk__queryserviceclient.h
new file mode 100644
index 000000000000..6340f9ae2192
--- /dev/null
+++ b/databases/akonadi/files/patch-server__src__nepomuk__queryserviceclient.h
@@ -0,0 +1,28 @@
+commit 1ce93440f9dbfcd01a3f4c11119f120e82a7dfb2
+Author: Christophe Giboudeaux <cgiboudeaux@gmx.com>
+Date:   Sat Jan 21 18:29:43 2012 +0100
+
+    Build with Clang.
+
+diff --git a/server/src/nepomuk/queryserviceclient.h b/server/src/nepomuk/queryserviceclient.h
+index a0e7517..3c551a0 100644
+--- ./server/src/nepomuk/queryserviceclient.h
++++ ./server/src/nepomuk/queryserviceclient.h
+@@ -78,7 +78,7 @@ namespace Nepomuk {
+              *
+              * \sa QueryParser
+              */
+-            bool query( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() );
++            bool query(const QString& query, const QHash<QString, QString> &encodedRps = ( QHash<QString, QString>() ) );
+ 
+             /**
+              * Start a query using the Nepomuk user query language.
+@@ -96,7 +96,7 @@ namespace Nepomuk {
+              * 
+              * \sa query(const QString&), close()
+              */
+-            bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() );
++            bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = ( QHash<QString, QString>() ) );
+ 
+             /**
+              * Close the client, thus stop to monitor the query
diff --git a/databases/akonadi/pkg-descr b/databases/akonadi/pkg-descr
index 8fd63775257c..ffe67538de29 100644
--- a/databases/akonadi/pkg-descr
+++ b/databases/akonadi/pkg-descr
@@ -1,25 +1,6 @@
-Akonadi - The PIM Storage Service
+The Akonadi framework is responsible for providing applications with a
+centralized database to store, index and retrieve the user's personal
+information. This includes the user's emails, contacts, calendars,
+events, journals, alarms, notes, etc.
 
-    * Common PIM data cache
-	o Type agnostic design
-	o Extensible
-	o Generic offline access, change recording and replay
-	o Generic conflict detection and resolution
-	o Resources are groupable by profile
-	o Items composed of independently retrievable multiple parts
-	o Zero-copy retrieval possible
-
-    * Concurrent access allows background activity independent of UI client
-        o Syncing mail, calendar, addressbooks to remote servers
-	o Syncing with mobile devices
-	o Permits semantic desktop infrastructure to access PIM data
-	o Archiving
-	o Indexing
-	o Out-of-process search
-    * Multi-process design
-        o Crash isolation
-	o Large items can't block whole system
-	o Linkage by IPC allows proprietary components
-	o Thin client installations can share components for scalability
-
-WWW:	http://pim.kde.org/akonadi/
+WWW: http://pim.kde.org/akonadi
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 68c3570dfa68..31176ca4dc37 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -17,7 +17,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.6.2
+lib/libakonadiprotocolinternals.so.1.7.2
 libdata/pkgconfig/akonadi.pc
 share/config/akonadi/mysql-global-mobile.conf
 share/config/akonadi/mysql-global.conf