git: c48cc2e2e018 - 2024Q1 - net-im/psi: Convert WEBKIT option to WEBENGINE

The branch 2024Q1 has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c48cc2e2e018aace42492267db15dbc6f742cbbb

commit c48cc2e2e018aace42492267db15dbc6f742cbbb
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-01-06 22:12:05 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-01-07 01:12:01 +0000

    net-im/psi: Convert WEBKIT option to WEBENGINE
    
    www/qt5-webkit was removed in [1], leaving the WEBKIT option broken.
    This application supports using www/qt5-webengine as an alternative
    chatlog engine, so rename the WEBKIT option to WEBENGINE to avoid
    confusion and add the required dependencies. Enabling QtWebEngine still
    requires having the ENABLE_WEBKIT CMake argument set, so this was not an
    oversight [2], as strange as it may look. In fact, psi defaults to use
    QtWebEngine if it was found when the ENABLE_WEBKIT argument is set. [3]
    
    [1] https://cgit.freebsd.org/ports/commit/?id=cb3615b528c288d90aff6aa0e7a9778f80c9e85d
    [2] https://github.com/psi-im/psi/blob/1.5/CMakeLists.txt#L44
    [3] https://github.com/psi-im/psi/blob/1.5/src/CMakeLists.txt#L17
    
    Approved by:    portmgr (blanket)
    MFH:            2024Q1
    
    (cherry picked from commit 5cdc418e76fe2f59ff50ad7a89347c9b10be3eec)
---
 net-im/psi/Makefile  |  9 +++++----
 net-im/psi/pkg-plist | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 5f7ab2e14032..4a556644ccbb 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	psi
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 
@@ -21,15 +21,16 @@ USE_XORG=	ice sm x11 xcb xext xscrnsaver
 CMAKE_ARGS=	-DIDN_LIBRARY:FILEPATH="${LOCALBASE}/lib/libidn.so" \
 		-DIDN_INCLUDE_DIR:PATH="${LOCALBASE}/include"
 
-OPTIONS_DEFINE=	WEBKIT
+OPTIONS_DEFINE=	WEBENGINE
 OPTIONS_RADIO=	SPELLCHECK
 OPTIONS_RADIO_SPELLCHECK=	HUNSPELL ENCHANT
 SPELLCHECK_DESC=	Spell checker backend
 OPTIONS_DEFAULT=	HUNSPELL
 OPTIONS_SUB=	yes
 
-WEBKIT_USE=		QT=webkit
-WEBKIT_CMAKE_BOOL=	ENABLE_WEBKIT
+WEBENGINE_DESC=		Use QtWebEngine for chatlogs
+WEBENGINE_USE=		QT=declarative,location,printsupport,webchannel,webengine
+WEBENGINE_CMAKE_BOOL=	ENABLE_WEBKIT
 
 HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CMAKE_BOOL=	USE_HUNSPELL
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index ce6b55669456..977b2999ebd5 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
-%%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
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/adium/Template.html
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/adium/adapter.js
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/moment-with-locales.js
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/adapter.js
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/classic/index.html
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/classic/load.js
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/new_classic/index.html
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/new_classic/load.js
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/new_classic/screenshot.png
+%%WEBENGINE%%%%DATADIR%%/themes/chatview/util.js