Index: databases/akonadi/Makefile
===================================================================
--- databases/akonadi/Makefile
+++ databases/akonadi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	akonadi
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	databases kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,60 +23,17 @@
 		kio service windowsystem widgetsaddons xmlgui \
 		designerplugin:build ecm:build \
 		designerplugin:run
-USE_QT=		concurrent core dbus designer gui network sql testlib widgets xml \
+USE_QT=		concurrent core dbus designer gui network sql sql-mysql:run \
+		sql-pgsql:run sql-sqlite3:run testlib widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
+CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \
+		-DMYSQLD_EXECUTABLE:FILEPATH="${LOCALBASE}/libexec/mysqld"
+CMAKE_ON=	AKONADI_BUILD_MYSQL
 
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_MULTI=		DB
-OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
-OPTIONS_SUB=		yes
-OPTIONS_DEFAULT=	MYSQL
-
-MYSQL_DESC=		Install MySQL Qt plugin and server
-MYSQL_USES=	mysql:server qt:5
-MYSQL_USE=		QT=sql-mysql:run
-MYSQL_CMAKE_BOOL=	AKONADI_BUILD_MYSQL
-
-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.
-#PGSQL_USE=	PGSQL=server
-PGSQL_USES=	qt:5
-PGSQL_USE=		QT=sql-pgsql:run
-PGSQL_CMAKE_BOOL=	AKONADI_BUILD_PGSQL
-
-SQLITE_DESC=		Enable SQLite backend
-SQLITE_USES=		qt:5 sqlite:3
-SQLITE_USE=		QT=sql-sqlite3:run
-SQLITE_CMAKE_BOOL=	AKONADI_BUILD_QSQLITE
-
-.include <bsd.port.options.mk>
-
-# Multiple backends may be enabled, but there can be only
-# one default. Set a default (the user can change it locally)
-# based on the selected backends, preferring MySQL (if enabled).
-#
-# If you build this port with only a single backend selected,
-# that one will be the default. This is useful for users of SQLite.
-.if ${PORT_OPTIONS:MMYSQL}
-CMAKE_ARGS+=	-DDATABASE_BACKEND=MYSQL
-.else
-.  if ${PORT_OPTIONS:MPGSQL}
-CMAKE_ARGS+=	-DDATABASE_BACKEND=POSTGRES
-.  else
-.    if ${PORT_OPTIONS:MSQLITE}
-CMAKE_ARGS+=	-DDATABASE_BACKEND=SQLITE
-.    else
-# Nothing else selected, very odd
-CMAKE_ARGS+=	-DDATABASE_BACKEND=MYSQL
-.    endif
-.  endif
-.endif
 
 post-patch:
 # To avoid overflow, MySQL settings need to be lower than
Index: databases/akonadi/pkg-plist
===================================================================
--- databases/akonadi/pkg-plist
+++ databases/akonadi/pkg-plist
@@ -345,7 +345,7 @@
 %%QT_MKSPECDIR%%/modules/qt_AkonadiXml.pri
 %%QT_PLUGINDIR%%/designer/akonadiwidgets.so
 %%QT_PLUGINDIR%%/pim5/akonadi/akonadi_test_searchplugin.so
-%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
+%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
 %%DATADIR%%/agents/knutresource.desktop
 share/config.kcfg/resourcebase.kcfg
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml