psi: add all deps for Qt5, clean up options.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sun Nov 18 14:18:22 2018 +0100
Changeset:	29f36ac2822d2844986bff1cd3f6120915a640f6

Modified Files:
	psi/Makefile
	psi/options.mk

Log Message:
psi: add all deps for Qt5, clean up options.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=29f36ac2822d2844986bff1cd3f6120915a640f6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 psi/Makefile   | 21 ++++++++-------------
 psi/options.mk | 42 +++++++++---------------------------------
 2 files changed, 17 insertions(+), 46 deletions(-)

diffs:
diff --git a/psi/Makefile b/psi/Makefile
index 38519d8c6a..14ca7f7f86 100644
--- a/psi/Makefile
+++ b/psi/Makefile
@@ -15,20 +15,12 @@ DEPENDS+=	qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
 DIST_SUBDIR=	${DISTNAME}
 DISTFILES=	${DEFAULT_DISTFILES}
 
+USE_CMAKE=	yes
 USE_TOOLS+=	gmake unzip pkg-config
-USE_LANGUAGES=	c c++03
-USE_LIBTOOL=	yes
-HAS_CONFIGURE=	yes
+USE_LANGUAGES=	c c++11
 
 CONFIG_SHELL=	${SH}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--qtdir=${QTDIR}
-CONFIGURE_ARGS+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
-CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2}/lib
-CONFIGURE_ARGS+=	--with-qca-inc=${BUILDLINK_PREFIX.qca2}/include
-
 #
 # a group of scripts that aren't to be installed, and aren't used
 # by the pkgsrc system.  But they all have the non-standard
@@ -73,7 +65,10 @@ post-install:
 
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/qca2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.7.0
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../security/qca2-qt5/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/psi/options.mk b/psi/options.mk
index bb6bde0017..47dd26efba 100644
--- a/psi/options.mk
+++ b/psi/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.psi
-PKG_SUPPORTED_OPTIONS+=	aspell enchant dbus whiteboard xscreensaver
-PKG_SUGGESTED_OPTIONS+=	aspell enchant
+PKG_SUPPORTED_OPTIONS+=	hunspell enchant
+PKG_SUGGESTED_OPTIONS+=	enchant
 
 # from an idea stolen from ../../misc/openoffice3.
 PSI_SUPPORTED_LANGUAGES=be cs de eo es es-es fr it ja mk pl pt-br ru \
@@ -27,42 +27,18 @@ PLIST.${lang} = yes
 . endif
 .endfor
 
-# enable aspell
-.if !empty(PKG_OPTIONS:Maspell)
-CONFIGURE_ARGS+=	--with-aspell-inc=${BUILDLINK_PREFIX.aspell}/include
-CONFIGURE_ARGS+=	--with-aspell-lib=${BUILDLINK_PREFIX.aspell}/lib
-.include "../../textproc/aspell/buildlink3.mk"
+# enable hunspell
+.if !empty(PKG_OPTIONS:Mhunspell)
+CMAKE_ARGS+=	-DUSE_HUNSPELL:BOOL=TRUE
+.include "../../textproc/hunspell/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-aspell
+CMAKE_ARGS+=	-DUSE_HUNSPELL:BOOL=FALSE
 .endif
 
 # enable enchant
 .if !empty(PKG_OPTIONS:Menchant)
+CMAKE_ARGS+=	-DUSE_ENCHANT:BOOL=TRUE
 .include "../../textproc/enchant2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-enchant
+CMAKE_ARGS+=	-DUSE_ENCHANT:BOOL=FALSE
 .endif
-
-# enable qdbus
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-qdbus
-.endif
-
-# enable whiteboarding
-.if !empty(PKG_OPTIONS:Mwhiteboard)
-CONFIGURE_ARGS+=	--enable-whiteboarding
-.endif
-
-# enable xscreensaver extension
-.if empty(PKG_OPTIONS:Mxscreensaver)
-CONFIGURE_ARGS+=	--disable-xss
-.endif
-
-# enable growl
-# .if empty(PKG_OPTIONS:Mgrowl)
-# CONFIGURE_ARGS+=	--with-growl=${BUILDLINK_PREFIX.growl}
-# .else
-# CONFIGURE_ARGS+=	--disable-growl
-# .endif