- Switch from Enchant to Hunspell by default: the latter is a more common

  dependency and is actually what upstream CMakeLists.txt defaults to
- Disable WebKit by default: there's no need for a messenger to pull such
  a heavy dependency unless someone really know that they're doing (there
  is an option to use lighter WebEngine instead, but it is very entangled
  with WebKit, patches welcome)
- Reword COMMENT, rearrange knob order, and assume maintainership

2 files changed, 28 insertions, 26 deletions

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 0b7e5f8579ff..727745a3bcc9 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Qt based Jabber client
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Qt-based Jabber (XMPP) client
 
 LICENSE=	GPLv2
 
@@ -16,27 +16,29 @@ LIB_DEPENDS=	libidn.so:dns/libidn \
 		libminizip.so:archivers/minizip \
 		libqca-qt5.so:devel/qca
 
-USES=		cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:5 \
-		tar:xz
+USES=		cmake compiler:c++11-lang desktop-file-utils pkgconfig \
+		qt:5 tar:xz
+USE_QT=		concurrent core dbus gui multimedia network svg widgets \
+		x11extras xml buildtools_build qmake_build imageformats_run
+USE_XORG=	ice sm x11 xcb xext xscrnsaver
 
-CMAKE_ARGS=	-DIDN_LIBRARY=${LOCALBASE}/lib/libidn.so \
-		-DIDN_INCLUDE_DIR=${LOCALBASE}/include \
-		-DUSE_WEBENGINE:BOOL=FALSE
+CMAKE_ARGS=	-DIDN_LIBRARY:FILEPATH="${LOCALBASE}/lib/libidn.so" \
+		-DIDN_INCLUDE_DIR:PATH="${LOCALBASE}/include"
 
-USE_QT=		concurrent core dbus gui multimedia network svg webkit widgets \
-		x11extras xml \
-		buildtools_build qmake_build imageformats_run
-USE_XORG=	ice sm x11 xcb xext xscrnsaver
+OPTIONS_DEFINE=	WEBKIT
+OPTIONS_RADIO=	SPELLCHECK
+OPTIONS_RADIO_SPELLCHECK=	HUNSPELL ENCHANT
+SPELLCHECK_DESC=	Spell checker backend
+OPTIONS_DEFAULT=	HUNSPELL
+OPTIONS_SUB=	yes
 
-OPTIONS_RADIO=	SPELLCHECKER
-OPTIONS_RADIO_SPELLCHECKER=	HUNSPELL ENCHANT
-OPTIONS_DEFAULT=	ENCHANT
+WEBKIT_USE=		QT=webkit
+WEBKIT_CMAKE_BOOL=	ENABLE_WEBKIT
 
-HUNSPELL_DESC=	Use hunspell for spell checking
 HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CMAKE_BOOL=	USE_HUNSPELL
 
-ENCHANT_DESC=	Use Enchant for spell checking
+ENCHANT_DESC=		Spell checking support via Enchant
 ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 ENCHANT_CMAKE_BOOL=	USE_ENCHANT
 
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index 71ee706915bc..ce6b55669456 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -404,13 +404,13 @@ share/pixmaps/psi.png
 %%DATADIR%%/sound/offline.wav
 %%DATADIR%%/sound/online.wav
 %%DATADIR%%/sound/send.wav
-%%DATADIR%%/themes/chatview/adium/Template.html
-%%DATADIR%%/themes/chatview/adium/adapter.js
-%%DATADIR%%/themes/chatview/moment-with-locales.js
-%%DATADIR%%/themes/chatview/psi/adapter.js
-%%DATADIR%%/themes/chatview/psi/classic/index.html
-%%DATADIR%%/themes/chatview/psi/classic/load.js
-%%DATADIR%%/themes/chatview/psi/new_classic/index.html
-%%DATADIR%%/themes/chatview/psi/new_classic/load.js
-%%DATADIR%%/themes/chatview/psi/new_classic/screenshot.png
-%%DATADIR%%/themes/chatview/util.js
+%%WEBKIT%%%%DATADIR%%/themes/chatview/adium/Template.html
+%%WEBKIT%%%%DATADIR%%/themes/chatview/adium/adapter.js
+%%WEBKIT%%%%DATADIR%%/themes/chatview/moment-with-locales.js
+%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/adapter.js
+%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/classic/index.html
+%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/classic/load.js
+%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/index.html
+%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/load.js
+%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/screenshot.png
+%%WEBKIT%%%%DATADIR%%/themes/chatview/util.js