git: eef49b8e794c - main - www/dooble: update to 2023.04.20

The branch main has been updated by fernape:

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

commit eef49b8e794c35ed8e13b7d91986db537945a98e
Author:     Eric Camachat <eric@camachat.org>
AuthorDate: 2023-04-22 10:50:14 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-04-24 16:25:39 +0000

    www/dooble: update to 2023.04.20
    
    ChangeLog: https://github.com/textbrowser/dooble/releases/tag/2023.04.20
    
    Flavorize port (qt5, qt6)
    
    2023.04.10 Release Notes
     * AdGuard DNS file processing. Dooble will now allow importing of
       https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt. Basic
       interpretation is included. For example, ||url^ is blocked. All other entries
       are ignored. Please see Data/dooble_filter.txt.
     * Include default HTTP agent string in About.
     * Listen on fullScreenRequested() signal and accept the request. Address, menu
       bar, and status bar widgets will be hidden. Other widgets (find, page
       notifications, etc.) will remain visible. The Escape key may be used to exit a
       full-screen mode.
     * Native dialogs.
     * Non-modal import dialog on MacOS. The dialog offers a simple explanation of
       the import process.
     * Qt 6.5 LTS.
     * Replaced Q_OS_MAC with Q_OS_MACOS.
     * Updated Data/dooble_accepted_or_blocked_domains.txt.
    
    2023.04.10 Release Notes
     * Avoid native file dialogs.
     * FreeBSD and Qt 6.4. Dooble does not provide support for non-LTS. This is a
       brief exception.
     * Set a page's address text as soon as possible.
    
    PR:             270850
    Reported by:    eric@camachat.org (maintainer)
---
 www/dooble/Makefile | 18 +++++++++++++++---
 www/dooble/distinfo |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index f46b2274ca23..d2590983ab21 100644
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	dooble
-DISTVERSION=	2023.04.01
+DISTVERSION=	2023.04.20
 CATEGORIES=	www
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Dooble Web Browser
@@ -9,14 +10,23 @@ WWW=		https://textbrowser.github.io/dooble/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:5 ssl \
+FLAVORS=	qt5 qt6
+FLAVOR?=	${FLAVORS:[1]}
+qt5_CONFLICTS_INSTALL=	qt6
+qt6_CONFLICTS_INSTALL=	qt5
+
+USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:${FLAVOR:S/qt//} ssl \
 		tar xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	textbrowser
 USE_GL=		gl
+.if ${FLAVOR} == qt5
 USE_QT=		concurrent core declarative gui location network printsupport \
 		sql webchannel webengine widgets xml sql-sqlite3:run \
 		buildtools:build qmake:build
+. elif ${FLAVOR} == qt6
+USE_QT=		base charts webchannel webengine
+.endif
 USE_XORG=	xcb
 
 QMAKE_SOURCE_PATH=	${PORTNAME}.pro
@@ -27,17 +37,19 @@ PLIST_FILES=	${PREFIX}/share/applications/${PORTNAME}.desktop \
 
 .include <bsd.port.pre.mk>
 
+.if ${FLAVOR:U} == qt5
 QT5_VER_MINOR=	${QT5_VERSION:C/^[0-9]+\.//:C/\..+$//}
 .if ${QT5_VER_MINOR} < 15
 BROKEN=		Qt 5.15 or higher required, using 5.${QT5_VER_MINOR} now
 .endif
+.endif
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 		${INSTALL_DATA} ${WRKSRC}/Icons/Logo/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 		desktop-file-edit --remove-category=Web --add-category=Network --add-category=WebBrowser ${WRKSRC}/${PORTNAME}.desktop
-		desktop-file-edit --set-key=Exec --set-value=${PREFIX}/bin/${PORTNAME} ${WRKSRC}/${PORTNAME}.desktop
+		desktop-file-edit --set-key=Exec --set-value="/usr/bin/env QTWEBENGINE_DICTIONARIES_PATH=${QT_DATADIR}/qtwebengine_dictionaries ${PREFIX}/bin/${PORTNAME}" ${WRKSRC}/${PORTNAME}.desktop
 		desktop-file-edit --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png ${WRKSRC}/${PORTNAME}.desktop
 		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index 56f85a48e9fa..d8accc5d5559 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680379072
-SHA256 (textbrowser-dooble-2023.04.01_GH0.tar.gz) = e5db6cec9e281a7a054c64f5211ed72606117407ea4bb939762ad297fa8a8f3b
-SIZE (textbrowser-dooble-2023.04.01_GH0.tar.gz) = 92588583
+TIMESTAMP = 1682008357
+SHA256 (textbrowser-dooble-2023.04.20_GH0.tar.gz) = 5425a5ad6753c08df061a8b78fa4aba035a915327d7b967eab3f0a6479eb869c
+SIZE (textbrowser-dooble-2023.04.20_GH0.tar.gz) = 93786166