security/xca: Update to 2.5.0

- Flavorize and add qt6 flavor

security/xca/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	xca
-PORTVERSION=	2.4.0
+PORTVERSION=	2.5.0
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/xca/releases/download/RELEASE.${PORTVERSION}/
 
@@ -10,30 +10,35 @@ WWW=		https://hohnstaedt.de/xca
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	gsed:textproc/gsed
-LIB_DEPENDS=	libltdl.so:devel/libltdl
-
-USES=		compiler:c++11-lang desktop-file-utils gmake localbase \
-		pkgconfig qt:5 shared-mime-info ssl
-BROKEN_SSL=	openssl30 openssl31
-BROKEN_SSL_REASON=	Uses deprecated and removed OpenSSL routines
-USE_QT=		buildtools:build core gui help linguist:build sql widgets
-USE_CXXSTD=	c++11
-
-GNU_CONFIGURE=	yes
-BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
-CONFIGURE_ARGS=	--with-openssl=${OPENSSLDIR} \
-		--with-qt=${PREFIX} \
-		--with-qt-version=5
+FLAVORS=		qt5 qt6
+FLAVOR?=		${FLAVORS:[1]}
+FLAVORS_SUB=		yes
+qt5_PKGNAMESUFFIX=
+qt6_PKGNAMESUFFIX=	-qt6
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
+qt6_CONFLICTS_INSTALL=	${PORTNAME}
+
+USES=		cmake compiler:c++17-lang desktop-file-utils localbase \
+		pkgconfig shared-mime-info ssl
+USE_LOCALE=	en_US.UTF-8
+
+.if ${FLAVOR} == qt5
+USES+=		qt:5
+USE_QT=		core gui help qmake sql widgets buildtools:build linguist:build
+RCCREGEXP=	\/lib\/qt5\/bin\/rcc
+CMAKE_ARG=	-DQTFIXEDVERSION:STRING=qt5
+.else
+USES+=		gl qt:6
+USE_GL=		opengl
+USE_QT=		base sqldriver-sqlite tools
+RCCREGEXP=	\/libexec\/qt6\/rcc
+CMAKE_ARG=	-DQTFIXEDVERSION:STRING=qt6
+.endif
 
 GH_ACCOUNT=	chris2511
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^CFLAGS/s|-O2 ||' \
-		${WRKSRC}/Local.mak.in
-
 .include <bsd.port.mk>

security/xca/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1620426109
-SHA256 (xca-2.4.0.tar.gz) = 66da8954fe9709ace965c6fcb1cfbb7b08ce75b7222988acb9e2b8b5fac7cf10
-SIZE (xca-2.4.0.tar.gz) = 1778572
+TIMESTAMP = 1695589720
+SHA256 (xca-2.5.0.tar.gz) = b50ef50c4850a1c1d20fce41971783cb0a2fb9155caa05300029b28b53311d37
+SIZE (xca-2.5.0.tar.gz) = 1846478

security/xca/files/patch-doc_CMakeLists.txt

@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt.orig	2023-09-24 18:22:03 UTC
++++ doc/CMakeLists.txt
+@@ -129,7 +129,7 @@ if(SPHINX)
+
+     if (UNIX AND NOT APPLE)
+         install(FILES ${QTHELP_DEST} ${QTHELP_IDX}
+-                DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/html
++                DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
+         )
+     elseif (WIN32)
+         install(FILES ${QTHELP_DEST} ${QTHELP_IDX}

security/xca/pkg-plist

@@ -1,7 +1,42 @@
 bin/xca
-man/man1/xca.1.gz
 share/applications/xca.desktop
 share/bash-completion/completions/xca
+%%PORTDOCS%%%%DOCSDIR%%/_sources/arguments.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/certificate-input.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/certificates.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/changelog.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/commandline.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/common-actions.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/database.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/introduction.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/miscellaneous.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/object-ids.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/options.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/privatekey.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/requests.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/revocationlist.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/smartcard.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/step-by-step.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/template.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_static/_sphinx_javascript_frameworks_compat.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/alabaster.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/bigcert.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/custom.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.6.0.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/language_data.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_highlight.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/underscore-1.13.1.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
 %%PORTDOCS%%%%DOCSDIR%%/arguments.html
 %%PORTDOCS%%%%DOCSDIR%%/certificate-input.html
 %%PORTDOCS%%%%DOCSDIR%%/certificates.html
@@ -10,19 +45,40 @@ share/bash-completion/completions/xca
 %%PORTDOCS%%%%DOCSDIR%%/common-actions.html
 %%PORTDOCS%%%%DOCSDIR%%/database.html
 %%PORTDOCS%%%%DOCSDIR%%/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/certificate-input.html
+%%PORTDOCS%%%%DOCSDIR%%/html/certificates.html
+%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/commandline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/common-actions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/database.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/miscellaneous.html
+%%PORTDOCS%%%%DOCSDIR%%/html/object-ids.html
+%%PORTDOCS%%%%DOCSDIR%%/html/options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/privatekey.html
+%%PORTDOCS%%%%DOCSDIR%%/html/requests.html
+%%PORTDOCS%%%%DOCSDIR%%/html/revocationlist.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smartcard.html
+%%PORTDOCS%%%%DOCSDIR%%/html/step-by-step.html
+%%PORTDOCS%%%%DOCSDIR%%/html/template.html
+%%PORTDOCS%%%%DOCSDIR%%/html/xca.qch
+%%PORTDOCS%%%%DOCSDIR%%/html/xca.qhc
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/miscellaneous.html
 %%PORTDOCS%%%%DOCSDIR%%/object-ids.html
+%%PORTDOCS%%%%DOCSDIR%%/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/options.html
 %%PORTDOCS%%%%DOCSDIR%%/privatekey.html
 %%PORTDOCS%%%%DOCSDIR%%/requests.html
 %%PORTDOCS%%%%DOCSDIR%%/revocationlist.html
+%%PORTDOCS%%%%DOCSDIR%%/search.html
+%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
 %%PORTDOCS%%%%DOCSDIR%%/smartcard.html
 %%PORTDOCS%%%%DOCSDIR%%/step-by-step.html
 %%PORTDOCS%%%%DOCSDIR%%/template.html
-%%PORTDOCS%%%%DOCSDIR%%/xca.qch
-%%PORTDOCS%%%%DOCSDIR%%/xca.qhc
+share/man/man1/xca.1.gz
 share/mime/packages/xca.xml
 share/icons/hicolor/16x16/apps/xca.png
 share/icons/hicolor/16x16/mimetypes/x-xca-database.png
@@ -42,17 +98,21 @@ share/pixmaps/xca-32x32.xpm
 %%DATADIR%%/TLS_server.xca
 %%DATADIR%%/dn.txt
 %%DATADIR%%/eku.txt
+%%QT6%%%%DATADIR%%/i18n/xca.qm
+%%DATADIR%%/i18n/xca_bg.qm
+%%DATADIR%%/i18n/xca_de.qm
+%%DATADIR%%/i18n/xca_es.qm
+%%DATADIR%%/i18n/xca_fa.qm
+%%DATADIR%%/i18n/xca_fr.qm
+%%DATADIR%%/i18n/xca_hr.qm
+%%DATADIR%%/i18n/xca_id.qm
+%%DATADIR%%/i18n/xca_it.qm
+%%DATADIR%%/i18n/xca_ja.qm
+%%DATADIR%%/i18n/xca_nl.qm
+%%DATADIR%%/i18n/xca_pl.qm
+%%DATADIR%%/i18n/xca_pt_BR.qm
+%%DATADIR%%/i18n/xca_ru.qm
+%%DATADIR%%/i18n/xca_sk.qm
+%%DATADIR%%/i18n/xca_tr.qm
+%%DATADIR%%/i18n/xca_zh_CN.qm
 %%DATADIR%%/oids.txt
-%%DATADIR%%/xca_de.qm
-%%DATADIR%%/xca_es.qm
-%%DATADIR%%/xca_fr.qm
-%%DATADIR%%/xca_hr.qm
-%%DATADIR%%/xca_it.qm
-%%DATADIR%%/xca_ja.qm
-%%DATADIR%%/xca_nl.qm
-%%DATADIR%%/xca_pl.qm
-%%DATADIR%%/xca_pt_BR.qm
-%%DATADIR%%/xca_ru.qm
-%%DATADIR%%/xca_sk.qm
-%%DATADIR%%/xca_tr.qm
-%%DATADIR%%/xca_zh_CN.qm