qca2-qt5: Update to 2.3.5.

Detach from the qca2 build as a newer release is now required for QT5.  I was
unable to find a list of changes since 2.2.1.

6 files changed, 57 insertions, 10 deletions

diff --git a/security/qca2-qt5-gnupg/Makefile b/security/qca2-qt5-gnupg/Makefile
index ba10618417f..e83ea10e432 100644
--- a/security/qca2-qt5-gnupg/Makefile
+++ b/security/qca2-qt5-gnupg/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2022/11/23 16:21:02 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/12/01 12:47:23 jperkin Exp $
 
 PKGNAME=	qca2-qt5-gnupg-${DISTNAME:C/.*-//}
-PKGREVISION=	11
 
 COMMENT=	Cross-platform crypto API for QT5 - GnuPG plugin
 
-.include "../../security/qca2/Makefile.common"
+.include "../../security/qca2-qt5/Makefile.common"
 
 DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
 
diff --git a/security/qca2-qt5-ossl/Makefile b/security/qca2-qt5-ossl/Makefile
index 1e5b206fe2c..d48de1913dc 100644
--- a/security/qca2-qt5-ossl/Makefile
+++ b/security/qca2-qt5-ossl/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2022/11/23 16:21:02 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/12/01 12:47:23 jperkin Exp $
 
 PKGNAME=	qca2-qt5-ossl-${DISTNAME:C/.*-//}
-PKGREVISION=	11
 
 COMMENT=	Cross-platform crypto API for QT5 - OpenSSL plugin
 
-.include "../../security/qca2/Makefile.common"
+.include "../../security/qca2-qt5/Makefile.common"
 
 BUILD_DIRS=	plugins/qca-ossl
 
diff --git a/security/qca2-qt5/Makefile b/security/qca2-qt5/Makefile
index 5d03904963f..8c46b45928b 100644
--- a/security/qca2-qt5/Makefile
+++ b/security/qca2-qt5/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2022/11/23 16:18:59 adam Exp $
+# $NetBSD: Makefile,v 1.20 2022/12/01 12:47:23 jperkin Exp $
 
 PKGNAME=	qca2-qt5-${DISTNAME:C/.*-//}
-PKGREVISION=	11
 
 COMMENT=	Cross-platform crypto API for QT5
 
-.include "../../security/qca2/Makefile.common"
+.include "../../security/qca2-qt5/Makefile.common"
 
 DEPENDS+=	mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 
@@ -14,7 +13,7 @@ INSTALLATION_DIRS=	lib/pkgconfig
 CMAKE_ARGS+=	-DBUILD_PLUGINS=none
 CMAKE_ARGS+=	-DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
 
-PKGCONFIG_OVERRIDE=		lib/pkgconfig/qca2-qt5.pc 
+PKGCONFIG_OVERRIDE=		lib/pkgconfig/qca2-qt5.pc
 PKGCONFIG_OVERRIDE_STAGE=	post-configure
 
 post-install:
diff --git a/security/qca2-qt5/Makefile.common b/security/qca2-qt5/Makefile.common
new file mode 100644
index 00000000000..5e2898d1333
--- /dev/null
+++ b/security/qca2-qt5/Makefile.common
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile.common,v 1.1 2022/12/01 12:47:23 jperkin Exp $
+#
+# used by security/qca2-qt5-gnupg/Makefile
+# used by security/qca2-qt5-ossl/Makefile
+
+DISTNAME=	qca-2.3.5
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_KDE:=qca/${PKGVERSION_NOREV}/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://userbase.kde.org/QCA
+LICENSE=	gnu-lgpl-v2.1
+
+PATCHDIR=	${.CURDIR}/../../security/qca2-qt5/patches
+DISTINFO_FILE=	${.CURDIR}/../../security/qca2-qt5/distinfo
+
+USE_TOOLS+=	gmake
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+
+# install under qt5 prefix to not clash with qca 1.x
+CMAKE_ARGS+=	-DQCA_INSTALL_IN_QT_PREFIX=ON
+CMAKE_ARGS+=	-DOSX_FRAMEWORK=OFF
+CMAKE_ARGS+=	-DBUILD_TESTS=OFF
+
+SUBST_CLASSES+=		certs
+SUBST_STAGE.certs=	pre-configure
+SUBST_FILES.certs=	CMakeLists.txt
+SUBST_VARS.certs=	PREFIX
diff --git a/security/qca2-qt5/distinfo b/security/qca2-qt5/distinfo
new file mode 100644
index 00000000000..4d725616407
--- /dev/null
+++ b/security/qca2-qt5/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2022/12/01 12:47:23 jperkin Exp $
+
+BLAKE2s (qca-2.3.5.tar.xz) = 380c378b23617c316480a2f899ecc69bec50e9f0b55d495cfde6161a54277473
+SHA512 (qca-2.3.5.tar.xz) = 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
+Size (qca-2.3.5.tar.xz) = 741036 bytes
+SHA1 (patch-CMakeLists.txt) = 4867c54f8bff523233a11201bdb021e6e81a10ed
diff --git a/security/qca2-qt5/patches/patch-CMakeLists.txt b/security/qca2-qt5/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..306dbc11dc5
--- /dev/null
+++ b/security/qca2-qt5/patches/patch-CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2022/12/01 12:47:23 jperkin Exp $
+
+Add mozilla-rootcerts certstore to list
+
+--- CMakeLists.txt.orig	2018-01-31 20:15:27.000000000 +0000
++++ CMakeLists.txt
+@@ -304,6 +304,7 @@ else ( WIN32 )
+       "/etc/pki/tls/cert.pem"
+       "/etc/ssl/ca-bundle.pem"
+       "/usr/share/curl/curl-ca-bundle.crt"
++      "@PREFIX@/share/mozilla-rootcerts/cacert.pem"
+     )
+     foreach (_current_try ${toTry})
+       if(EXISTS ${_current_try})