From ca49e205842a6d61afd002c3dd20cd45665d0953 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Sun, 10 Nov 2024 10:57:55 -0500 Subject: [PATCH] security/*gpgme*: Update to 1.24.0 Remove security/gpgme-qt-headers. The Qt headers have been folded back into security/gpgme-qt since they no longer conflict. https://dev.gnupg.org/T7376 --- MOVED | 1 + security/Makefile | 1 - security/gpgme-cpp/Makefile | 10 +-- security/gpgme-cpp/pkg-plist | 3 +- security/gpgme-qt-headers/Makefile | 14 ---- security/gpgme-qt-headers/pkg-plist | 102 ------------------------- security/gpgme-qt/Makefile | 10 +-- security/gpgme-qt/pkg-plist | 112 ++++++++++++++++++++++++++-- security/gpgme/Makefile | 78 ++++++++----------- security/gpgme/distinfo | 6 +- security/gpgme/pkg-plist | 3 +- security/py-gpgme/Makefile | 8 +- 12 files changed, 162 insertions(+), 186 deletions(-) delete mode 100644 security/gpgme-qt-headers/Makefile delete mode 100644 security/gpgme-qt-headers/pkg-plist diff --git a/MOVED b/MOVED index 00f71a8a51f3..c90af1902bd0 100644 --- a/MOVED +++ b/MOVED @@ -3715,3 +3715,4 @@ sysutils/dsbmd|filesystems/dsbmd|2024-11-06|Moved to new category filesystems sysutils/dsbmc-cli|filesystems/dsbmc-cli|2024-11-06|Moved to new category filesystems sysutils/dsbmc|filesystems/dsbmc|2024-11-06|Moved to new category filesystems misc/e2fsprogs-libblkid|filesystems/e2fsprogs-libblkid|2024-11-06|Moved to new category filesystems +security/gpgme-qt-headers|security/gpgme-qt|2024-11-10|Flavored headers are now installed by security/gpgme-qt diff --git a/security/Makefile b/security/Makefile index 5b7291097be7..fb675bd4ed7e 100644 --- a/security/Makefile +++ b/security/Makefile @@ -201,7 +201,6 @@ SUBDIR += gpgme SUBDIR += gpgme-cpp SUBDIR += gpgme-qt - SUBDIR += gpgme-qt-headers SUBDIR += gsa SUBDIR += gsad SUBDIR += gsasl diff --git a/security/gpgme-cpp/Makefile b/security/gpgme-cpp/Makefile index 85785e273305..e24db4919c02 100644 --- a/security/gpgme-cpp/Makefile +++ b/security/gpgme-cpp/Makefile @@ -1,11 +1,11 @@ -PORTREVISION= 1 -PKGNAMESUFFIX= -${SLAVEPORT} +PORTREVISION= 0 +PKGNAMESUFFIX= -${_GPGME_BINDING} COMMENT= Gpgme C++ bindings -MASTERDIR= ${.CURDIR}/../../security/gpgme -SLAVEPORT= cpp -BINDING_NAME= cpp +MASTERDIR= ${.CURDIR:H:H}/security/gpgme PLIST= ${.CURDIR}/pkg-plist +_GPGME_BINDING= cpp + .include "${MASTERDIR}/Makefile" diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist index eff475ae1c29..6dac54cf35f1 100644 --- a/security/gpgme-cpp/pkg-plist +++ b/security/gpgme-cpp/pkg-plist @@ -44,4 +44,5 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake lib/libgpgmepp.so lib/libgpgmepp.so.6 -lib/libgpgmepp.so.6.20.1 +lib/libgpgmepp.so.6.21.0 +libdata/pkgconfig/gpgmepp.pc diff --git a/security/gpgme-qt-headers/Makefile b/security/gpgme-qt-headers/Makefile deleted file mode 100644 index 76fbf8376bd0..000000000000 --- a/security/gpgme-qt-headers/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= -${SLAVEPORT} - -COMMENT= Shared headers for the Gpgme Qt bindings - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -MASTERDIR= ${.CURDIR}/../../security/gpgme -SLAVEPORT= qt-headers -BINDING_NAME= qt -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/security/gpgme-qt-headers/pkg-plist b/security/gpgme-qt-headers/pkg-plist deleted file mode 100644 index b1bebc07ccc1..000000000000 --- a/security/gpgme-qt-headers/pkg-plist +++ /dev/null @@ -1,102 +0,0 @@ -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/WKDRefreshJob -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/wkdrefreshjob.h -include/qgpgme/wkspublishjob.h diff --git a/security/gpgme-qt/Makefile b/security/gpgme-qt/Makefile index 7f66a998acde..f683b6a005dd 100644 --- a/security/gpgme-qt/Makefile +++ b/security/gpgme-qt/Makefile @@ -1,13 +1,13 @@ -PORTREVISION= 1 +PORTREVISION= 0 -COMMENT= Gpgme ${QT_STR} bindings +COMMENT= Gpgme Qt${FLAVOR:S|qt||} bindings LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -MASTERDIR= ${.CURDIR}/../../security/gpgme -SLAVEPORT= qt -BINDING_NAME= qt +MASTERDIR= ${.CURDIR:H:H}/security/gpgme PLIST= ${.CURDIR}/pkg-plist +_GPGME_BINDING= qt + .include "${MASTERDIR}/Makefile" diff --git a/security/gpgme-qt/pkg-plist b/security/gpgme-qt/pkg-plist index bd76da196095..862336484ac1 100644 --- a/security/gpgme-qt/pkg-plist +++ b/security/gpgme-qt/pkg-plist @@ -1,5 +1,107 @@ -lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%Config.cmake -lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%ConfigVersion.cmake -lib/libqgpgme%%qt_SUFFIX%%.so -lib/libqgpgme%%qt_SUFFIX%%.so.15 -lib/libqgpgme%%qt_SUFFIX%%.so.15.5.1 +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/AbstractImportJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/AddExistingSubkeyJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/AddUserIDJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ChangeExpiryJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ChangeOwnerTrustJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ChangePasswdJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/CryptoConfig +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DN +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DataProvider +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/Debug +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DecryptJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DecryptVerifyArchiveJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DecryptVerifyJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DefaultKeyGenerationJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DeleteJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/DownloadJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/EncryptArchiveJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/EncryptJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ExportJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/FileListDataProvider +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/GpgCardJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/HierarchicalKeyListJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ImportFromKeyserverJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ImportJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/Job +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/KeyForMailboxJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/KeyGenerationJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/KeyListJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ListAllKeysJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/MultiDeleteJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/Protocol +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/QGpgMENewCryptoConfig +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/QuickJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/ReceiveKeysJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/RefreshKeysJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/RevokeKeyJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SetPrimaryUserIDJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SignArchiveJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SignEncryptArchiveJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SignEncryptJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SignJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SignKeyJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/SpecialJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/TofuPolicyJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/VerifyDetachedJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/VerifyOpaqueJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/WKDLookupJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/WKDLookupResult +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/WKDRefreshJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/QGpgME/WKSPublishJob +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/abstractimportjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/addexistingsubkeyjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/adduseridjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/changeexpiryjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/changeownertrustjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/changepasswdjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/cryptoconfig.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/dataprovider.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/debug.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/decryptjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/decryptverifyarchivejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/decryptverifyjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/defaultkeygenerationjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/deletejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/dn.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/downloadjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/encryptarchivejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/encryptjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/exportjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/filelistdataprovider.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/gpgcardjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/hierarchicalkeylistjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/importfromkeyserverjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/importjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/job.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/keyformailboxjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/keygenerationjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/keylistjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/listallkeysjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/multideletejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/protocol.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/qgpgme_export.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/qgpgme_version.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/qgpgmenewcryptoconfig.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/quickjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/receivekeysjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/refreshkeysjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/revokekeyjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/setprimaryuseridjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/signarchivejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/signencryptarchivejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/signencryptjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/signjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/signkeyjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/specialjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/tofupolicyjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/verifydetachedjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/verifyopaquejob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/wkdlookupjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/wkdlookupresult.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/wkdrefreshjob.h +include/qgpgme-%%QGPGME_INCLUDE_SUFFIX%%/qgpgme/wkspublishjob.h +lib/cmake/QGpgme%%QGPGME_CMAKE_SUFFIX%%/QGpgme%%QGPGME_CMAKE_SUFFIX%%Config.cmake +lib/cmake/QGpgme%%QGPGME_CMAKE_SUFFIX%%/QGpgme%%QGPGME_CMAKE_SUFFIX%%ConfigVersion.cmake +lib/libqgpgme%%QGPGME_LIB_SUFFIX%%.so +lib/libqgpgme%%QGPGME_LIB_SUFFIX%%.so.15 +lib/libqgpgme%%QGPGME_LIB_SUFFIX%%.so.15.6.0 diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index eb060c52e187..91bbd28229be 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,6 +1,6 @@ PORTNAME= gpgme -PORTVERSION= 1.23.2 -PORTREVISION?= 1 +PORTVERSION= 1.24.0 +PORTREVISION?= 0 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme @@ -14,21 +14,21 @@ LICENSE_FILE?= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error -USES= compiler:c11 cpe gmake libtool localbase:ldflags tar:bzip2 +USES= compiler:c11 cpe gmake libtool localbase:ldflags pathfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CFLAGS+= -Wno-suggest-override -Wno-unknown-warning-option -INSTALL_TARGET?=install-strip +INSTALL_TARGET= install-strip TEST_TARGET= check CPE_VENDOR= gnu -.if !defined(SLAVEPORT) +.if !defined(_GPGME_BINDING) CONFIGURE_ARGS+=--enable-languages="cl" INFO= gpgme -PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README THANKS TODO +PORTDOCS= AUTHORS INSTALL NEWS README OPTIONS_DEFINE= DOCS TEST UISERVER OPTIONS_SINGLE= GNUPG @@ -51,49 +51,41 @@ UISERVER_DESC= GnuPG UI server support UISERVER_CONFIGURE_ENABLE= fd-passing .else LIB_DEPENDS+= libgpgme.so:security/gpgme -BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} -INSTALL_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} -TEST_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME}/tests +BUILD_WRKSRC= ${WRKSRC}/lang/${_GPGME_BINDING} +INSTALL_WRKSRC= ${WRKSRC}/lang/${_GPGME_BINDING} +TEST_WRKSRC= ${WRKSRC}/lang/${_GPGME_BINDING}/tests -. if ${SLAVEPORT} != "cpp" && ${SLAVEPORT} != "qt-headers" +. if ${_GPGME_BINDING} == "cpp" +USES+= compiler:c++11-lang +CONFIGURE_ARGS+=--enable-languages="cpp" +NO_TEST= yes +. else OPTIONS_DEFINE+= TEST . endif -. if ${SLAVEPORT} == "cpp" -USES+= compiler:c++11-lib -CONFIGURE_ARGS+=--enable-languages="cpp" -NO_TEST= yes -. endif - -. if ${SLAVEPORT} == "qt-headers" -CONFIGURE_ARGS+=--enable-languages="" -ALL_TARGET= all-am -INSTALL_TARGET= install-data -NO_ARCH= yes -NO_TEST= yes -. endif - -. if ${SLAVEPORT} == "qt" +. if ${_GPGME_BINDING} == "qt" LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp -RUN_DEPENDS+= ${LOCALBASE}/include/qgpgme/qgpgme_version.h:security/gpgme-qt-headers FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} qt5_PKGNAMESUFFIX= -qt5 qt6_PKGNAMESUFFIX= -qt6 -QT_STR= Qt${FLAVOR:S/qt//} - . if ${FLAVOR:U} == "qt5" -USES+= compiler:c++11-lib pkgconfig qt:5 -USE_QT= buildtools:build core +USES+= compiler:c++11-lang pkgconfig qt:5 +USE_QT= core \ + buildtools:build TEST_USE= QT=testlib:build -PLIST_SUB= QT_SUFFIX="" qt_SUFFIX="" +PLIST_SUB= QGPGME_CMAKE_SUFFIX="" \ + QGPGME_INCLUDE_SUFFIX="${FLAVOR}" \ + QGPGME_LIB_SUFFIX="" . else USES+= compiler:c++17-lang pkgconfig qt:6 USE_CXXSTD= c++17 USE_QT= base -PLIST_SUB= QT_SUFFIX="${QT_STR}" qt_SUFFIX="${FLAVOR}" +PLIST_SUB= QGPGME_CMAKE_SUFFIX="Qt${FLAVOR:S|qt||}" \ + QGPGME_INCLUDE_SUFFIX="${FLAVOR}" \ + QGPGME_LIB_SUFFIX="${FLAVOR}" . endif CONFIGURE_ARGS+=--enable-languages="cpp ${FLAVOR}" @@ -104,10 +96,9 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz . endif -. if ${SLAVEPORT} == "python" +. if ${_GPGME_BINDING} == "python" BUILD_DEPENDS+= swig:devel/swig \ ${PY_SETUPTOOLS} -RUN_DEPENDS+= ${PY_SETUPTOOLS} USES+= python USE_PYTHON= flavors CONFIGURE_ARGS+=--enable-languages="python" @@ -118,22 +109,19 @@ PLIST_SUB+= VERSION=${PORTVERSION} . endif .endif +.include + post-patch: +.if ${COMPILER_TYPE} == "clang" @${REINPLACE_CMD} -e 's|mno-direct-extern-access|fno-direct-access-external-data|g' \ ${WRKSRC}/configure -.if defined(SLAVEPORT) +.endif +.if defined(_GPGME_BINDING) @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g' -. if ${SLAVEPORT} == "qt" +. if ${_GPGME_BINDING} == "qt" @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g' - @${REINPLACE_CMD} -e 's|install-exec-am install-data-am|install-exec-am install-data-local|' \ - ${WRKSRC}/lang/qt/src/Makefile.in -. endif -. if ${SLAVEPORT} == "qt-headers" - @${REINPLACE_CMD} -e '/^all-am/s|$$(LTLIBRARIES)||' \ - -e '/^install-data-am/s|install-data-local||' \ - ${WRKSRC}/lang/qt/src/Makefile.in . endif .endif @${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \ @@ -177,7 +165,7 @@ pre-test: pre-build-TEST-on post-test: post-build-TEST-on -.if !defined(SLAVEPORT) +.if !defined(_GPGME_BINDING) post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @@ -190,4 +178,4 @@ post-install-DOXYGEN-on: @${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \ ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} -.include +.include diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index c74b1f89961f..4dbdbf965fe8 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701457438 -SHA256 (gpgme-1.23.2.tar.bz2) = 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 -SIZE (gpgme-1.23.2.tar.bz2) = 1836904 +TIMESTAMP = 1731040720 +SHA256 (gpgme-1.24.0.tar.bz2) = 61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da +SIZE (gpgme-1.24.0.tar.bz2) = 1889410 diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist index b00794b102ab..db3b13a9f6cb 100644 --- a/security/gpgme/pkg-plist +++ b/security/gpgme/pkg-plist @@ -8,7 +8,8 @@ lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp lib/libgpgme.so lib/libgpgme.so.11 -lib/libgpgme.so.11.32.1 +lib/libgpgme.so.11.33.0 libdata/pkgconfig/gpgme-glib.pc libdata/pkgconfig/gpgme.pc share/aclocal/gpgme.m4 +share/man/man1/gpgme-json.1.gz diff --git a/security/py-gpgme/Makefile b/security/py-gpgme/Makefile index fb2fb5f7daf4..b79f2dd23518 100644 --- a/security/py-gpgme/Makefile +++ b/security/py-gpgme/Makefile @@ -1,15 +1,15 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhale@FreeBSD.org COMMENT= Gpgme Python bindings -MASTERDIR= ${.CURDIR}/../../security/gpgme -SLAVEPORT= python -BINDING_NAME= python +MASTERDIR= ${.CURDIR:H:H}/security/gpgme PLIST= ${.CURDIR}/pkg-plist +_GPGME_BINDING= python + post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gpg/_gpgme*.so