From nobody Sat Aug 27 09:53:55 2022
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MFBqS1Sldz4b1F8;
Sat, 27 Aug 2022 09:53:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4MFBqS1D4xz3tDb;
Sat, 27 Aug 2022 09:53:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1661594036;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6X00suBH+WMUKUB5wRw7PqEyEXEtQvtMgXUoWDPY5SE=;
b=Qsd7j7KeNCruWN7F/bpMFia7CL1bTvPRkswNRysobQ+N1YLnvRS40U4EoR5uNbIGr96I9s
UfMvJDiVsFA185yoxb4bzLPViyseZZGxCBJwon5GnY0DQJfOxAhLpx61qqudt4iL3bbaER
+0t0GPY4WudVwevT6xCUQx18/Muwlsbmxc/lmRemUxSa+yiasGNVMDBdvAc0zTD27t9ATe
rHp+6AyT+Ofn3Cw0EioI9GRF8kGKGQz1/J5TO9VujPhdtlebctkMPFvTBX1ix7jCfHQb9H
MQNY6FLEM1vf16NYiZGS50IswrR/4ElvFk2wZySPzbw4EWJ490jFeT6KDJBWZg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MFBqS0GpCzjgW;
Sat, 27 Aug 2022 09:53:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27R9rt49098227;
Sat, 27 Aug 2022 09:53:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27R9rta0098226;
Sat, 27 Aug 2022 09:53:55 GMT
(envelope-from git)
Date: Sat, 27 Aug 2022 09:53:55 GMT
Message-Id: <202208270953.27R9rta0098226@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Subject: git: 400762247806 - main - security/qtkeychain: add flavors for Qt 5 and Qt 6
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tcberner
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 400762247806d6e6371e70edf99ead80d75a41ff
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1661594036;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6X00suBH+WMUKUB5wRw7PqEyEXEtQvtMgXUoWDPY5SE=;
b=RacSsGotUlyULtqm+PR8ZL2h2y2OcqE0noVPlf//8vlejsv1oztui79jS4Q7yKlJF3+sMo
p7PItdT8wB53gjeDIN0CxwUzfR/9MVXLFfsMtvTrqlH5CdslC9bR9kkw01VzrehdPrRJE+
URKljuas3sFzCYDvTTC8RcDvI4pchIPjmCeFjbCKyLpwpLzYUrHNnOApZi0DQ/WvFlQ2Ue
0Robs+PRCK05MlL1zxdYo8mKJNQv5wnSMZe/RvZZL1p9jG3UelNijk+/y9StPfx89JdGMk
9f547kDd5NiKgdjqCba+1sgsipj+jh65iqTAFOXyOcMLRbNH42FxcJk0q/36BQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661594036; a=rsa-sha256; cv=none;
b=HmraPiZBlFbo6X5A5DgDmjyl+f47J27kY323lv2MDX8ZamYGE1Mc51iUtiKdcsUMT5sfr+
TuxLD9xE+WDA6HhJqdzcL1MXdwFQ2ccOmsb7+kwrDfigVtCfxbePmsYy51EwJJMhZQZmcM
f3k4YeaAP6C5S7z2bdROJGukmKic1nJ1sPFx2RBJrY2aqBn6ZxCd74G2zeRHKwlDf43HMI
aFDUNsRpxHkpEiyOCd+vyeDDv9FV3kk3IkgK2ysCQ9iPzrBWWh+Zt8XZPf/e2R322sCRhc
cyolQHlgmXB3wu5GDygUkF/JLJ8iTttncr/SH04xcuG3L+r4RqALMZOe2PwWWw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=400762247806d6e6371e70edf99ead80d75a41ff
commit 400762247806d6e6371e70edf99ead80d75a41ff
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-08-27 09:28:05 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-08-27 09:53:23 +0000
security/qtkeychain: add flavors for Qt 5 and Qt 6
Approved by: arrowd
Differential Revision: https://reviews.freebsd.org/D36375
---
astro/kstars/Makefile | 3 ++-
audio/mixxx/Makefile | 4 ++--
deskutils/akonadi-import-wizard/Makefile | 3 ++-
deskutils/charmtimetracker/Makefile | 4 ++--
deskutils/kdepim-runtime/Makefile | 4 ++--
deskutils/kmail/Makefile | 3 ++-
deskutils/nextcloudclient/Makefile | 4 ++--
deskutils/owncloudclient/Makefile | 3 ++-
deskutils/pim-sieve-editor/Makefile | 3 ++-
graphics/qgis-ltr/Makefile | 4 ++--
graphics/qgis/Makefile | 4 ++--
mail/trojita/Makefile | 4 ++--
net-im/chatterino2/Makefile | 4 ++--
net-im/neochat/Makefile | 3 ++-
net-im/nheko/Makefile | 4 ++--
net-im/quaternion/Makefile | 4 ++--
net-im/ruqola/Makefile | 3 ++-
net-im/spectral/Makefile | 4 ++--
net/kio-gdrive/Makefile | 3 ++-
net/kldap/Makefile | 3 ++-
net/kmailtransport/Makefile | 3 ++-
security/qtkeychain/Makefile | 23 ++++++++++++++++++----
.../patch-cmake_Modules_ECMGeneratePriFile.cmake | 11 +++++++++++
security/qtkeychain/pkg-plist | 20 +++++++++----------
24 files changed, 82 insertions(+), 46 deletions(-)
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 6caa55cc4f75..498c3e243410 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kstars
DISTVERSION= 3.6.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/stable/${PORTNAME}
@@ -11,7 +12,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
libindidriver.so:devel/indi \
- libqt5keychain.so:security/qtkeychain \
+ libqt5keychain.so:security/qtkeychain@qt5 \
libraw.so:graphics/libraw \
libsecret-1.so:security/libsecret \
libstellarsolver.so:astro/stellarsolver \
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index f3c7479b9800..6c0518b17c35 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mixxx
DISTVERSION= 2.3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MAINTAINER= acm@FreeBSD.org
@@ -71,7 +71,7 @@ OPUS_LIB_DEPENDS= libopus.so:audio/opus \
libopusfile.so:audio/opusfile
OPUS_CMAKE_BOOL= OPUS
QTKEYCHAIN_DESC= Secure credentials storage for Live Broadcasting profiles
-QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
+QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
QTKEYCHAIN_CMAKE_BOOL= QTKEYCHAIN
WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
WAVPACK_CMAKE_BOOL= WAVPACK
diff --git a/deskutils/akonadi-import-wizard/Makefile b/deskutils/akonadi-import-wizard/Makefile
index 591324efb699..e0bd30131b86 100644
--- a/deskutils/akonadi-import-wizard/Makefile
+++ b/deskutils/akonadi-import-wizard/Makefile
@@ -1,5 +1,6 @@
PORTNAME= akonadi-import-wizard
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5 \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index 4daedc7486cb..1ae5f2a4d607 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -1,6 +1,6 @@
PORTNAME= charmtimetracker
DISTVERSION= 1.12.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils
# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -13,7 +13,7 @@ COMMENT= Time tracker
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib pkgconfig qt:5 xorg
CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION}
diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile
index b6d010f43f32..ca6aaa096bef 100644
--- a/deskutils/kdepim-runtime/Makefile
+++ b/deskutils/kdepim-runtime/Makefile
@@ -1,6 +1,6 @@
PORTNAME= kdepim-runtime
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +13,7 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
libkolabxml.so:textproc/libkolabxml \
libsasl2.so:security/cyrus-sasl2 \
libxerces-c-3.2.so:textproc/xerces-c3 \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:noninja compiler:c++11-lib gettext kde:5 qca qt:5 \
shared-mime-info tar:xz
diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile
index 9f8d471360e0..c48695274977 100644
--- a/deskutils/kmail/Makefile
+++ b/deskutils/kmail/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kmail
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5 \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
RUN_DEPENDS= accountwizard:deskutils/kmail-account-wizard \
akonadiimportwizard:deskutils/akonadi-import-wizard \
diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
index 1aadc00f9675..396c9f988fb6 100644
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nextcloudclient
PORTVERSION= 3.5.3
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= deskutils
@@ -11,7 +11,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= inkscape:graphics/inkscape
LIB_DEPENDS= libinotify.so:devel/libinotify \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \
gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \
diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
index 4d4832f40bbe..12a3c8d3ed25 100644
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@@ -1,6 +1,7 @@
PORTNAME= owncloudclient
DISTVERSION= 2.8.2
DISTVERSIONSUFFIX= .4246
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/
DISTNAME= ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX}
@@ -15,7 +16,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libinotify.so:devel/libinotify \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:noninja compiler:c++11-lib desktop-file-utils gmake \
iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \
diff --git a/deskutils/pim-sieve-editor/Makefile b/deskutils/pim-sieve-editor/Makefile
index 9e18800dab43..252409b39dfa 100644
--- a/deskutils/pim-sieve-editor/Makefile
+++ b/deskutils/pim-sieve-editor/Makefile
@@ -1,11 +1,12 @@
PORTNAME= pim-sieve-editor
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Mail sieve editor
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs config configwidgets coreaddons crash \
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 3f8650a94160..ec4578892875 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,6 +1,6 @@
PORTNAME= qgis
DISTVERSION= 3.22.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/
PKGNAMESUFFIX= -ltr
@@ -47,7 +47,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libprotobuf-lite.so:devel/protobuf \
libqjson-qt5.so:devel/qjson \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
- libqt5keychain.so:security/qtkeychain \
+ libqt5keychain.so:security/qtkeychain@qt5 \
libqwt6.so:x11-toolkits/qwt6 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index de2cb256d8d3..06dfa580e51a 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,6 +1,6 @@
PORTNAME= qgis
DISTVERSION= 3.26.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/
@@ -45,7 +45,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libprotobuf-lite.so:devel/protobuf \
libqjson-qt5.so:devel/qjson \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
- libqt5keychain.so:security/qtkeychain \
+ libqt5keychain.so:security/qtkeychain@qt5 \
libqwt6.so:x11-toolkits/qwt6 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \
diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 551fb6c55206..9112bc187b59 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -1,6 +1,6 @@
PORTNAME= trojita
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/src/
@@ -10,7 +10,7 @@ COMMENT= Fast cross-platform IMAP e-mail client using Qt 5 toolkit
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
USE_LDCONFIG= yes
diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile
index 145e698ce8ed..2f1f70d6b48b 100644
--- a/net-im/chatterino2/Makefile
+++ b/net-im/chatterino2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= chatterino2
PORTVERSION= 2.3.4
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= net-im
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= rapidjson>0:devel/rapidjson \
websocketpp>=0:devel/websocketpp
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= compiler:c++17-lang gl pkgconfig qmake qt:5 ssl
USE_QT= concurrent core gui multimedia network svg widgets \
diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile
index 7f290791fd0a..66c49194c18b 100644
--- a/net-im/neochat/Makefile
+++ b/net-im/neochat/Makefile
@@ -1,5 +1,6 @@
PORTNAME= neochat
DISTVERSION= 22.04
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= KDE/stable/plasma-mobile/${DISTVERSION}
@@ -10,7 +11,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-only.txt
LIB_DEPENDS= libcmark.so:textproc/cmark \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient \
kquickimageeditor>=0.2.0:graphics/kquickimageeditor \
${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro
diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile
index 4b76d9a1e9ce..6c93522abf98 100644
--- a/net-im/nheko/Makefile
+++ b/net-im/nheko/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nheko
DISTVERSIONPREFIX=v
DISTVERSION= 0.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@@ -21,7 +21,7 @@ LIB_DEPENDS= \
liblmdb.so:databases/lmdb \
libmatrix_client.so:net-im/mtxclient \
libolm.so:security/olm \
- libqt5keychain.so:security/qtkeychain \
+ libqt5keychain.so:security/qtkeychain@qt5 \
libspdlog.so:devel/spdlog
USES= cmake compiler:c++17-lang desktop-file-utils \
diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile
index 9615bd1d89b7..1ea703bb31c8 100644
--- a/net-im/quaternion/Makefile
+++ b/net-im/quaternion/Makefile
@@ -1,6 +1,6 @@
PORTNAME= Quaternion
DISTVERSION= 0.0.95-beta3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Matrix IM client based on Qt technologies
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libsecret-1.so:security/libsecret
BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient
# Quotient is a static lib, doesn't need to be in RUN_DEPENDS
diff --git a/net-im/ruqola/Makefile b/net-im/ruqola/Makefile
index 5e9306e80c35..2244b9cc5627 100644
--- a/net-im/ruqola/Makefile
+++ b/net-im/ruqola/Makefile
@@ -1,6 +1,7 @@
PORTNAME= ruqola
MASTER_SITES= KDE/stable/${PORTNAME}/
DISTVERSION= 1.7.4
+PORTREVISION= 1
CATEGORIES= net-im kde
MAINTAINER= kde@FreeBSD.org
@@ -9,7 +10,7 @@ COMMENT= Rocket.Chat client
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libsecret-1.so:security/libsecret
USES= cmake compiler:c++11-lang gnome kde:5 localbase:ldflags qt:5 tar:xz
diff --git a/net-im/spectral/Makefile b/net-im/spectral/Makefile
index fcfb6d146307..216b70d5f404 100644
--- a/net-im/spectral/Makefile
+++ b/net-im/spectral/Makefile
@@ -1,6 +1,6 @@
PORTNAME= spectral
PORTVERSION= 817
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Glossy Matrix IM client based on Qt technologies
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libcmark.so:textproc/cmark
USES= cmake compiler:c++17-lang gl pkgconfig qt:5 tar:bz2
diff --git a/net/kio-gdrive/Makefile b/net/kio-gdrive/Makefile
index 365be67ad68e..3690e8c6a8c4 100644
--- a/net/kio-gdrive/Makefile
+++ b/net/kio-gdrive/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kio-gdrive
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -8,7 +9,7 @@ COMMENT= KDE IOSlave for accessing gdrive
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
+LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libaccounts-qt5.so:net-im/libaccounts-qt5 \
libkaccounts.so:net-im/kaccounts-integration
RUN_DEPENDS= kaccounts-providers>=0:net-im/kaccounts-providers
diff --git a/net/kldap/Makefile b/net/kldap/Makefile
index 4bbd45d60e18..07f9be6ce654 100644
--- a/net/kldap/Makefile
+++ b/net/kldap/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kldap
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -8,7 +9,7 @@ COMMENT= LDAP access API for KDE
LICENSE= LGPL21
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons i18n kio widgetsaddons service \
diff --git a/net/kmailtransport/Makefile b/net/kmailtransport/Makefile
index 11b10809d24b..4b2e4cd21b6b 100644
--- a/net/kmailtransport/Makefile
+++ b/net/kmailtransport/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kmailtransport
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -8,7 +9,7 @@ COMMENT= KDE library to managing mail transport
LICENSE= LGPL21
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
- libqt5keychain.so:security/qtkeychain
+ libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons i18n \
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index 036e9bb8f271..a862aa980934 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -1,7 +1,9 @@
PORTNAME= qtkeychain
DISTVERSIONPREFIX= v
DISTVERSION= 0.13.2
+PORTREVISION= 1
CATEGORIES= security
+PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= arrowd@FreeBSD.org
COMMENT= Platform independent Qt API for storing passwords
@@ -9,13 +11,24 @@ COMMENT= Platform independent Qt API for storing passwords
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:5
+FLAVORS= qt5 qt6
+FLAVOR?= qt5
+
+USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:${FLAVOR:S/qt//}
+_WITH_QT6_qt5= OFF
+_WITH_QT6_qt6= ON
+CMAKE_ARGS= -DBUILD_WITH_QT6=${_WITH_QT6_${FLAVOR}} \
+ -DQT_MKSPECDIR_REL=${QT_MKSPECDIR_REL}
USE_GITHUB= yes
-USE_QT= core dbus buildtools_build qmake_build
+_USE_QT_qt5= core dbus buildtools_build qmake_build
+_USE_QT_qt6= base
+USE_QT= ${_USE_QT_${FLAVOR}}
GH_ACCOUNT= frankosterfeld
USE_LDCONFIG= yes
OPTIONS_SUB= yes
-PLIST_SUB= VERSION=${PORTVERSION}
+PLIST_SUB= VERSION=${PORTVERSION} \
+ QT_VER=${FLAVOR:S/qt//}
+
OPTIONS_DEFINE= LIBSECRET NLS
OPTIONS_DEFAULT= LIBSECRET NLS
@@ -24,7 +37,9 @@ LIBSECRET_DESC= Enable libsecret backend
LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret
LIBSECRET_CMAKE_BOOL= LIBSECRET_SUPPORT
-NLS_USE= qt=linguisttools_build
+_QT_LINGUIST_qt5= linguisttools_build
+_QT_LINGUIST_qt6= tools_build
+NLS_USE= qt=${_QT_LINGUIST_${FLAVOR}}
NLS_CMAKE_BOOL= BUILD_TRANSLATIONS
.include <bsd.port.mk>
diff --git a/security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake b/security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake
new file mode 100644
index 000000000000..2ea456dc68d9
--- /dev/null
+++ b/security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake
@@ -0,0 +1,11 @@
+--- cmake/Modules/ECMGeneratePriFile.cmake.orig 2022-08-27 09:22:23 UTC
++++ cmake/Modules/ECMGeneratePriFile.cmake
+@@ -92,7 +92,7 @@ else()
+ query_qmake(qt_host_data_dir QT_HOST_DATA)
+ set(ECM_MKSPECS_INSTALL_DIR ${qt_host_data_dir}/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
+ else()
+- set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
++ set(ECM_MKSPECS_INSTALL_DIR ${QT_MKSPECDIR_REL}/modules CACHE PATH "The directory where mkspecs will be installed to.")
+ endif()
+
+ function(ECM_GENERATE_PRI_FILE)
diff --git a/security/qtkeychain/pkg-plist b/security/qtkeychain/pkg-plist
index ec2191b384d7..84ebad9bbca1 100644
--- a/security/qtkeychain/pkg-plist
+++ b/security/qtkeychain/pkg-plist
@@ -1,13 +1,13 @@
-include/qt5keychain/keychain.h
-include/qt5keychain/qkeychain_export.h
-lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
-lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
-lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake
-lib/libqt5keychain.so
-lib/libqt5keychain.so.%%VERSION%%
-lib/libqt5keychain.so.1
-%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri
+include/qt%%QT_VER%%keychain/keychain.h
+include/qt%%QT_VER%%keychain/qkeychain_export.h
+lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainConfig.cmake
+lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainConfigVersion.cmake
+lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainLibraryDepends.cmake
+lib/libqt%%QT_VER%%keychain.so
+lib/libqt%%QT_VER%%keychain.so.%%VERSION%%
+lib/libqt%%QT_VER%%keychain.so.1
+%%QT_MKSPECDIR%%/modules/qt_Qt%%QT_VER%%Keychain.pri
%%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_de.qm
%%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_fr.qm
%%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_ro.qm