2 files changed, 36 insertions, 37 deletions

diff --git a/irc/quassel-core/Makefile b/irc/quassel-core/Makefile
index fa57c26872d8..2e30f40de639 100644
--- a/irc/quassel-core/Makefile
+++ b/irc/quassel-core/Makefile
@@ -1,28 +1,12 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-core
-
-COMMENT=	Qt 5 based distributed IRC client (core/server only)
-
-LIB_DEPENDS=	libqca-qt5.so:devel/qca-qt5
-
 MASTERDIR=	${.CURDIR}/../quassel
 
-USE_QT5=	buildtools_build core network qmake_build script sql sql-sqlite3_run
-CMAKE_ARGS+=	-DWITH_KDE=off \
-		-DUSE_QT5=on \
-		-DWANT_CORE=on \
-		-DWANT_QTCLIENT=off \
-		-DWANT_MONO=off
+PKGNAMESUFFIX=	-core
 
-USE_RC_SUBR=	quasselcore
-USERS=		quasselcore
-GROUPS=		${USERS}
-SUB_FILES=	pkg-message
-PLIST=		${.CURDIR}/pkg-plist
-PLIST_FILES=	bin/quasselcore
+COMMENT=	Qt 5 based distributed IRC client (core/server only)
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselcore
+OPTIONS_EXCLUDE=CLIENT MONO NLS
+OPTIONS_SLAVE=	CORE
 
 .include "${MASTERDIR}/Makefile"
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index 5d892da4110d..2dec6d28aa71 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	quassel
 PORTVERSION=	0.12.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 
 MAINTAINER=	woodsb02@FreeBSD.org
-COMMENT?=	Qt 5 based distributed IRC client (client only or monolithic binary)
+COMMENT?=	Qt 5 based distributed IRC client (client and monolithic binary)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -18,40 +18,55 @@ USES=		cmake:outsource compiler:c++11-lib cpe execinfo pkgconfig tar:bzip2
 CPE_VENDOR=	quassel-irc
 CPE_PRODUCT=	quassel_irc
 
-.if !defined(MASTERDIR)
-
-LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt5
-USE_QT5=	buildtools_build core dbus gui network phonon4 qmake_build webkit widgets
+USE_QT5=	buildtools_build core network qmake_build
 CMAKE_ARGS=	-DWITH_KDE=off \
-		-DUSE_QT5=on \
-		-DWANT_CORE=off
+		-DUSE_QT5=on
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_MULTI=		MODULE
+OPTIONS_MULTI=		MODULE DB
 MODULE_DESC=		Quassel components
-OPTIONS_MULTI_MODULE=	CLIENT MONO
-OPTIONS_DEFAULT=	CLIENT
+DB_DESC=		Database for Quassel core / monolithic
+OPTIONS_MULTI_MODULE=	CLIENT CORE MONO
+OPTIONS_MULTI_DB=	PGSQL SQLITE3
+OPTIONS_DEFAULT=	CLIENT MONO SQLITE3
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Quassel client (for use with core)
-CLIENT_CMAKE_ON=	-DWANT_QTCLIENT=on
-CLIENT_CMAKE_OFF=	-DWANT_QTCLIENT=off
+CLIENT_CMAKE_BOOL=	WANT_QTCLIENT
+CLIENT_USE=		qt5=dbus,gui,phonon4,webkit,widgets
+CLIENT_LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt5
+
+CORE_DESC=		Quassel core server (for use with client)
+CORE_CMAKE_BOOL=	WANT_CORE
+CORE_USE=		qt5=script,sql
+CORE_LIB_DEPENDS=	libqca-qt5.so:devel/qca-qt5
+CORE_SUB_FILES=		pkg-message
+CORE_VARS=		use_rc_subr=quasselcore \
+			users=quasselcore \
+			groups=quasselcore \
+			plist= # empty to allow core to override PLIST_FILES
+CORE_PLIST_FILES=	bin/quasselcore
 
 MONO_DESC=		Quassel standalone (monolithic binary: core+client combined)
-MONO_CMAKE_ON=		-DWANT_MONO=on
-MONO_CMAKE_OFF=		-DWANT_MONO=off
+MONO_CMAKE_BOOL=	WANT_MONO
+MONO_USE=		qt5=script,sql
+MONO_LIB_DEPENDS=	libqca-qt5.so:devel/qca-qt5
 
 NLS_USE=		QT5=linguisttools_build
 
+PGSQL_USE=		qt5=sql-pgsql
+
+SQLITE3_USE=		qt5=sql-sqlite3_run
+
 post-patch-NLS-off:
 	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-CLIENT-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselclient
+post-install-CORE-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselcore
 post-install-MONO-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quassel
 
-.endif
-
 .include <bsd.port.mk>