4 files changed, 28 insertions, 46 deletions

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 427dc91cf3b3..78f331aad5b0 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -2,13 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	akonadi
-PORTVERSION=	1.10.3
-PORTREVISION=	1
-CATEGORIES=	databases kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}/src
+PORTVERSION=	1.11.0
+CATEGORIES=	databases kde
+MASTER_SITES=	KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=	KDE
-DISTVERSIONSUFFIX=	-1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -21,8 +18,8 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
-USE_KDE4=	kdehier kdeprefix sharedmime automoc4 soprano
-USES=		cmake:outsource
+USE_KDE4=	kdehier kdeprefix automoc4 soprano
+USES=		cmake:outsource shared-mime-info compiler:c++11-lang
 USE_QT4=	corelib dbus gui network qtestlib_build sql xml \
 		moc_build qmake_build rcc_build uic_build
 USE_BZIP2=	yes
@@ -31,56 +28,40 @@ CMAKE_ARGS+=	-DAKONADI_BUILD_TESTS:BOOL=FALSE \
 		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
 USE_LDCONFIG=	yes
 
-PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
-
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+OPTIONS_SUB=	yes # SQLITE
 
 MYSQL_DESC=	Install MySQL Qt plugin and server
-PGSQL_DESC=	Install PostgreSQL Qt plugin
-SQLITE_DESC=	Enable SQLite backend
-
-OPTIONS_DEFAULT=	MYSQL
-
-.include <bsd.port.options.mk>
+MYSQL_USE=	MYSQL=server
+MYSQL_USE=	QT4=sql-mysql_run
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	server
-USE_QT4+=	sql-mysql_run
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
+PGSQL_DESC=	Install PostgreSQL Qt plugin
 # 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
-USE_QT4+=	sql-pgsql_run
-.endif
+#PGSQL_USE=	PGSQL=server
+PGSQL_USE=	QT4=sql-pgsql_run
+
+SQLITE_DESC=	Enable SQLite backend
+SQLITE_USE=	SQLITE=3
+SQLITE_CMAKE_OFF=	-DAKONADI_BUILD_QSQLITE=off
 
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	3
-PLIST_SUB+=	SQLITE=""
-.else
-PLIST_SUB+=	SQLITE="@comment "
-.endif
+OPTIONS_DEFAULT=	MYSQL
 
 post-patch:
-.if ${PORT_OPTIONS:MSQLITE} == ""
-	${REINPLACE_CMD} -e '/find_package(Sqlite)/ d' \
-		${PATCH_WRKSRC}/CMakeLists.txt
-.endif
 	${REINPLACE_CMD} -e '/akonadi.pc/ s|pkgconfig|../libdata/pkgconfig|' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \
 		${PATCH_WRKSRC}/server/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${PATCH_WRKSRC}/server/src/storage/dbconfigmysql.cpp
-	# To avoid overflow, MySQL settings need to be lower than
-	# INT_MAX / kern.hz. This setting assumes kern.hz=2000, and
-	# it's nothing but a temporary hack.
+# To avoid overflow, MySQL settings need to be lower than
+# INT_MAX / kern.hz. This setting assumes kern.hz=2000, and
+# it's nothing but a temporary hack.
 	${REINPLACE_CMD} -e '/wait_timeout/ s|31536000|1073741|' \
 		${PATCH_WRKSRC}/server/src/storage/*.conf
-	# Prevent updating MIME during build.
+# Prevent updating MIME during build.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
 		-e '/find_package(SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/CMakeLists.txt
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 8bfdd6b88b57..86a47761b88c 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/akonadi-1.10.3-1.tar.bz2) = a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0
-SIZE (KDE/akonadi-1.10.3-1.tar.bz2) = 228633
+SHA256 (KDE/akonadi-1.11.0.tar.bz2) = 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d
+SIZE (KDE/akonadi-1.11.0.tar.bz2) = 235101
diff --git a/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp b/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp
index d061fcc3f49f..ffa3aaae1de4 100644
--- a/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp
+++ b/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp
@@ -1,11 +1,11 @@
 --- ./server/src/storage/dbconfigmysql.cpp.orig	2012-06-13 02:11:19.473370856 +0200
 +++ ./server/src/storage/dbconfigmysql.cpp	2012-06-13 02:11:50.113468897 +0200
-@@ -242,7 +242,7 @@
+@@ -265,7 +265,7 @@ void DbConfigMysql::startInternalServer()
    // first run, some MySQL versions need a mysql_install_db run for that
-   const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String("akonadi/mysql-global.conf" ));
+   const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) );
    if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
--    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); 
-+    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=%%LOCALBASE%%" ); 
+-    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
++    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=%%LOCALBASE%%" );
      QProcess::execute( mMysqlInstallDbPath, arguments );
    }
  
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 20f8a5be73c8..2e5b5fc2d49d 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.3
+lib/libakonadiprotocolinternals.so.1.11.0
 libdata/pkgconfig/akonadi.pc
 share/config/akonadi/mysql-global-mobile.conf
 share/config/akonadi/mysql-global.conf
@@ -33,6 +33,7 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
+share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml
 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