security/gpgme-qt: Flavorize for new Qt6 bindings

Rename security/gpgme-qt5 to security/gpgme-qt and flavorize to allow building qt5 and qt6 flavors. Adjust dependencies and bump PORTREVISION on consumers. Fix installation of optional Doxgen docs.
freebsd · May 3, 2023 · f247211 · f247211
1 parent a380970
commit f247211
Show file tree

Hide file tree

Showing 24 changed files with 173 additions and 46 deletions.
diff --git a/MOVED b/MOVED
@@ -12752,3 +12752,4 @@ databases/rocksdb-lite||2023-04-30|Has expired: Removed by upstream, see https:/
 textproc/ltxml||2023-04-30|Has expired: Unfetchable
 graphics/ImageMagick7-nox11|graphics/ImageMagick7|2023-04-30|Flavorized
 graphics/ImageMagick6-nox11|graphics/ImageMagick6|2023-04-30|Flavorized
+security/gpgme-qt5|security/gpgme-qt@qt5|2023-05-02|Flavorized to add Qt6 support
diff --git a/deskutils/akonadi-import-wizard/Makefile b/deskutils/akonadi-import-wizard/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	akonadi-import-wizard
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5 \
+		libqgpgme.so:security/gpgme-qt@qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5
 
 USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz

diff --git a/deskutils/akonadiconsole/Makefile b/deskutils/akonadiconsole/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	akonadiconsole
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan  \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5 \
+		libqgpgme.so:security/gpgme-qt@qt5 \
 		libical.so:devel/libical \
 		libxapian.so:databases/xapian-core
 

diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	akregator
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext grantlee:5 \
 		kde:5 qt:5 tar:xz xorg

diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	grantlee-editor
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib gettext grantlee:5 \
 		kde:5 qt:5 tar:xz xorg

diff --git a/deskutils/kaddressbook/Makefile b/deskutils/kaddressbook/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kaddressbook
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext grantlee:5 kde:5 \
 		qt:5 tar:xz xorg

diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kdepim-addons
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 \
 		pkgconfig qt:5 tar:xz xorg

diff --git a/deskutils/kmail-account-wizard/Makefile b/deskutils/kmail-account-wizard/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kmail-account-wizard
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext gl kde:5 \
 		qt:5 shared-mime-info tar:xz

diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kmail
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5 \
+		libqgpgme.so:security/gpgme-qt@qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5
 
 RUN_DEPENDS=	accountwizard:deskutils/kmail-account-wizard \

diff --git a/deskutils/mbox-importer/Makefile b/deskutils/mbox-importer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mbox-importer
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive auth codecs completion config configwidgets coreaddons \

diff --git a/deskutils/pim-data-exporter/Makefile b/deskutils/pim-data-exporter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pim-data-exporter
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib gettext grantlee:5 \
 		kde:5 qt:5 tar:xz xorg

diff --git a/net/akonadi-contacts/Makefile b/net/akonadi-contacts/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	akonadi-contacts
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,7 +12,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 \
 		qt:5 tar:xz xorg

diff --git a/net/kget/Makefile b/net/kget/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kget
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libKF5Torrent.so:net-p2p/libktorrent  \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 qca qt:5 \
 		shebangfix sqlite tar:xz xorg

diff --git a/net/mailcommon/Makefile b/net/mailcommon/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mailcommon
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz xorg
 USE_KDE=	archive auth codecs completion config configwidgets coreaddons \

diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	messagelib
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
-		libqgpgme.so:security/gpgme-qt5
+		libqgpgme.so:security/gpgme-qt@qt5
 
 USES=		cmake compiler:c++11-lib cpe gettext grantlee:5 kde:5 qca \
 		qt:5 tar:xz xorg

diff --git a/security/Makefile b/security/Makefile
@@ -196,7 +196,7 @@
     SUBDIR += gpgdir
     SUBDIR += gpgme
     SUBDIR += gpgme-cpp
-    SUBDIR += gpgme-qt5
+    SUBDIR += gpgme-qt
     SUBDIR += gsa
     SUBDIR += gsad
     SUBDIR += gsasl

diff --git a/security/gpgme-qt5/Makefile → security/gpgme-qt/Makefile b/security/gpgme-qt5/Makefile → security/gpgme-qt/Makefile
@@ -1,14 +1,18 @@
+.if ${FLAVOR:U} == qt5
 PORTREVISION=	0
-PKGNAMESUFFIX=	-${SLAVEPORT}
 
 COMMENT=	Gpgme Qt5 bindings
+.else
+PORTREVISION=	0
+
+COMMENT=	Gpgme Qt6 bindings
+.endif
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MASTERDIR=	${.CURDIR}/../../security/gpgme
-SLAVEPORT=	qt5
+SLAVEPORT=	qt
 BINDING_NAME=	qt
-PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/gpgme-qt5/pkg-plist → security/gpgme-qt/pkg-plist.qt5 b/security/gpgme-qt5/pkg-plist → security/gpgme-qt/pkg-plist.qt5
diff --git a/security/gpgme-qt/pkg-plist.qt6 b/security/gpgme-qt/pkg-plist.qt6
@@ -0,0 +1,105 @@
+include/QGpgME/AbstractImportJob
+include/QGpgME/AddExistingSubkeyJob
+include/QGpgME/AddUserIDJob
+include/QGpgME/ChangeExpiryJob
+include/QGpgME/ChangeOwnerTrustJob
+include/QGpgME/ChangePasswdJob
+include/QGpgME/CryptoConfig
+include/QGpgME/DN
+include/QGpgME/DataProvider
+include/QGpgME/Debug
+include/QGpgME/DecryptJob
+include/QGpgME/DecryptVerifyArchiveJob
+include/QGpgME/DecryptVerifyJob
+include/QGpgME/DefaultKeyGenerationJob
+include/QGpgME/DeleteJob
+include/QGpgME/DownloadJob
+include/QGpgME/EncryptArchiveJob
+include/QGpgME/EncryptJob
+include/QGpgME/ExportJob
+include/QGpgME/FileListDataProvider
+include/QGpgME/GpgCardJob
+include/QGpgME/HierarchicalKeyKistJob
+include/QGpgME/ImportFromKeyserverJob
+include/QGpgME/ImportJob
+include/QGpgME/Job
+include/QGpgME/KeyForMailboxJob
+include/QGpgME/KeyGenerationJob
+include/QGpgME/KeyListJob
+include/QGpgME/ListAllKeysJob
+include/QGpgME/MultiDeleteJob
+include/QGpgME/Protocol
+include/QGpgME/QGpgMENewCryptoConfig
+include/QGpgME/QuickJob
+include/QGpgME/ReceiveKeysJob
+include/QGpgME/RefreshKeysJob
+include/QGpgME/RevokeKeyJob
+include/QGpgME/SetPrimaryUserIDJob
+include/QGpgME/SignArchiveJob
+include/QGpgME/SignEncryptArchiveJob
+include/QGpgME/SignEncryptJob
+include/QGpgME/SignJob
+include/QGpgME/SignKeyJob
+include/QGpgME/SpecialJob
+include/QGpgME/TofuPolicyJob
+include/QGpgME/VerifyDetachedJob
+include/QGpgME/VerifyOpaqueJob
+include/QGpgME/WKDLookupJob
+include/QGpgME/WKDLookupResult
+include/QGpgME/WKSPublishJob
+include/qgpgme/abstractimportjob.h
+include/qgpgme/addexistingsubkeyjob.h
+include/qgpgme/adduseridjob.h
+include/qgpgme/changeexpiryjob.h
+include/qgpgme/changeownertrustjob.h
+include/qgpgme/changepasswdjob.h
+include/qgpgme/cryptoconfig.h
+include/qgpgme/dataprovider.h
+include/qgpgme/debug.h
+include/qgpgme/decryptjob.h
+include/qgpgme/decryptverifyarchivejob.h
+include/qgpgme/decryptverifyjob.h
+include/qgpgme/defaultkeygenerationjob.h
+include/qgpgme/deletejob.h
+include/qgpgme/dn.h
+include/qgpgme/downloadjob.h
+include/qgpgme/encryptarchivejob.h
+include/qgpgme/encryptjob.h
+include/qgpgme/exportjob.h
+include/qgpgme/filelistdataprovider.h
+include/qgpgme/gpgcardjob.h
+include/qgpgme/hierarchicalkeylistjob.h
+include/qgpgme/importfromkeyserverjob.h
+include/qgpgme/importjob.h
+include/qgpgme/job.h
+include/qgpgme/keyformailboxjob.h
+include/qgpgme/keygenerationjob.h
+include/qgpgme/keylistjob.h
+include/qgpgme/listallkeysjob.h
+include/qgpgme/multideletejob.h
+include/qgpgme/protocol.h
+include/qgpgme/qgpgme_export.h
+include/qgpgme/qgpgme_version.h
+include/qgpgme/qgpgmenewcryptoconfig.h
+include/qgpgme/quickjob.h
+include/qgpgme/receivekeysjob.h
+include/qgpgme/refreshkeysjob.h
+include/qgpgme/revokekeyjob.h
+include/qgpgme/setprimaryuseridjob.h
+include/qgpgme/signarchivejob.h
+include/qgpgme/signencryptarchivejob.h
+include/qgpgme/signencryptjob.h
+include/qgpgme/signjob.h
+include/qgpgme/signkeyjob.h
+include/qgpgme/specialjob.h
+include/qgpgme/tofupolicyjob.h
+include/qgpgme/verifydetachedjob.h
+include/qgpgme/verifyopaquejob.h
+include/qgpgme/wkdlookupjob.h
+include/qgpgme/wkdlookupresult.h
+include/qgpgme/wkspublishjob.h
+lib/cmake/QGpgmeQt6/QGpgmeQt6Config.cmake
+lib/cmake/QGpgmeQt6/QGpgmeQt6ConfigVersion.cmake
+lib/libqgpgmeqt6.so
+lib/libqgpgmeqt6.so.15
+lib/libqgpgmeqt6.so.15.2.1