2 files changed, 43 insertions, 16 deletions

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 3991d478c07e..c63b5f15e830 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	akonadi
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	databases kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/src/
@@ -19,33 +20,59 @@ LICENSE_FILE=	${WRKSRC}/lgpl-license
 
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 		soprano.4:${PORTSDIR}/textproc/soprano
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
-
-# Let process generate meaningful backtrace on core dump
+# Let process generate meaningful backtrace on core dump.
 LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
-CMAKE_ARGS+=	-DAKONADI_BUILD_TESTS:BOOL=FALSE \
-		-DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \
-		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
+BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
 USE_BZIP2=	yes
-USE_SQLITE=	3
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib network qtestlib dbus sql \
+QT_COMPONENTS=	corelib network qtestlib dbus gui sql \
 		qmake_build moc_build rcc_build uic_build
-USE_MYSQL=	server
 USE_KDE4=	kdeprefix kdehier automoc4 sharedmime
 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
 
 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
+
+.include <bsd.port.options.mk>
+
+# Should we enable this option, remember to make SQLite non-optional.
+#.ifndef(WITHOUT_MYSQL)
+USE_MYSQL=	server
+QT_COMPONENTS+=	sql-mysql_run
+#.else
+#CMAKE_ARGS+=	-DDATABASE_BACKEND:STRING="SQLITE"
+#.endif
+
+.ifdef(WITH_PGSQL)
+QT_COMPONENTS+=	sql-pgsql_run
+.endif
+
+.ifdef(WITH_SQLITE)
+USE_SQLITE=	3
+PLIST_SUB+=	SQLITE=""
+.else
+PLIST_SUB+=	SQLITE="@comment "
+.endif
+
 post-patch:
-	${REINPLACE_CMD} -e '/akonadi.pc/s|pkgconfig|../libdata/pkgconfig|' \
+.ifndef(WITH_SQLITE)
+	${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' \
+	${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \
 		${PATCH_WRKSRC}/server/CMakeLists.txt
-	#prevent updating mime during build
-	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
+	# Prevent updating mime during build.
+	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 
 post-install:
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index da355603e26c..bfb8c036114b 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -42,5 +42,5 @@ share/mime/packages/akonadi-mime.xml
 @dirrmtry include/akonadi
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsqlite3.so
+%%SQLITE%%@cwd %%QT_PREFIX%%
+%%SQLITE%%%%QT_PLUGINDIR_REL%%/sqldrivers/libqsqlite3.so