mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

security/gpgme-qt: Flavorize for new Qt6 bindings

Browse Source 
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.
This commit is contained in:
Jason E. Hale 2023-05-02 22:51:49 -04:00
parent a3809705ca
commit f247211eb7
24 changed files with 173 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -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

4
deskutils/akonadi-import-wizard/Makefile
View File

@ -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

4
deskutils/akonadiconsole/Makefile
View File

@ -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

4
deskutils/akregator/Makefile
View File

@ -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

4
deskutils/grantlee-editor/Makefile
View File

@ -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

4
deskutils/kaddressbook/Makefile
View File

@ -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

4
deskutils/kdepim-addons/Makefile
View File

@ -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

4
deskutils/kmail-account-wizard/Makefile
View File

@ -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

4
deskutils/kmail/Makefile
View File

@ -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 \

4
deskutils/mbox-importer/Makefile
View File

@ -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 \

4
deskutils/pim-data-exporter/Makefile
View File

@ -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

4
net/akonadi-contacts/Makefile
View File

@ -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

4
net/kget/Makefile
View File

@ -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

4
net/mailcommon/Makefile
View File

@ -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 \

4
net/messagelib/Makefile
View File

@ -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

2
security/Makefile
View File

@ -196,7 +196,7 @@
SUBDIR += gpgdir
SUBDIR += gpgme
SUBDIR += gpgme-cpp
SUBDIR += gpgme-qt5
SUBDIR += gpgme-qt
SUBDIR += gsa
SUBDIR += gsad
SUBDIR += gsasl

10
security/gpgme-qt5/Makefile → security/gpgme-qt/Makefile
View File

@ -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"

0
security/gpgme-qt5/pkg-plist → security/gpgme-qt/pkg-plist.qt5
View File

105
security/gpgme-qt/pkg-plist.qt6 Normal file
View File

@ -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

29
security/gpgme/Makefile
View File

@ -64,17 +64,34 @@ CONFIGURE_ARGS+=--enable-languages="cpp"
NO_TEST= yes
. endif
. if ${SLAVEPORT} == "qt5"
. if ${SLAVEPORT} == "qt"
LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp
FLAVORS= qt5 qt6
FLAVOR?= ${FLAVORS:[1]}
qt5_PKGNAMESUFFIX= -qt5
qt6_PKGNAMESUFFIX= -qt6
qt5_PLIST= ${.CURDIR}/pkg-plist.qt5
qt6_PLIST= ${.CURDIR}/pkg-plist.qt6
qt5_CONFLICTS_INSTALL= gpgme-qt6
qt6_CONFLICTS_INSTALL= gpgme-qt5
. if ${FLAVOR:U} == "qt5"
USES+= compiler:c++11-lib pkgconfig qt:5
USE_QT= buildtools:build core
CONFIGURE_ARGS+=--enable-languages="cpp qt"
DOCSDIR= ${PORTNAME}${PKGNAMESUFFIX}
USE_QT= buildtools:build core
TEST_USE= QT=testlib:build
. else
USES+= compiler:c++17-lang pkgconfig qt:6
USE_QT= base
USE_CXXSTD= c++17
. endif
CONFIGURE_ARGS+=--enable-languages="cpp ${FLAVOR}"
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
OPTIONS_DEFINE+= DOXYGEN
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \
dot:graphics/graphviz
TEST_USE= QT=testlib:build
. endif
. if ${SLAVEPORT} == "python"
@ -95,7 +112,7 @@ post-patch:
.if defined(SLAVEPORT)
@${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \
${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g'
. if ${SLAVEPORT} == "qt5"
. if ${SLAVEPORT} == "qt"
@${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \
${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g'
. endif

4
security/kleopatra/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= kleopatra
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -12,7 +12,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgme.so:security/gpgme \
libgpg-error.so:security/libgpg-error \
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 gettext kde:5 \
shared-mime-info qt:5 tar:xz xorg

4
security/libkleo/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= libkleo
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -11,7 +11,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
LIB_DEPENDS= libassuan.so:security/libassuan \
libgpg-error.so:security/libgpg-error \
libgpgme.so:security/gpgme \
libqgpgme.so:security/gpgme-qt5 \
libqgpgme.so:security/gpgme-qt@qt5 \
libgpgmepp.so:security/gpgme-cpp
RUN_DEPENDS= ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils

4
sysutils/kf5-kwallet/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= kwallet
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@ -10,7 +10,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
libgpgme.so:security/gpgme \
libqgpgme.so:security/gpgme-qt5 \
libqgpgme.so:security/gpgme-qt@qt5 \
libgpgmepp.so:security/gpgme-cpp
USES= cmake compiler:c++11-lib gettext kde:5 qca qt:5 tar:xz xorg

4
sysutils/plasma-pass/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= plasma-pass
DISTVERSION= 1.2.1
MASTER_SITES= KDE/stable/${PORTNAME}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils kde
MAINTAINER= kde@FreeBSD.org
@ -16,7 +16,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
liboath.so:security/oath-toolkit \
libqgpgme.so:security/gpgme-qt5
libqgpgme.so:security/gpgme-qt@qt5
RUN_DEPENDS= pass:sysutils/password-store
USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz