git: 2e506b24a927 - main - devel/qca: Update to 2.3.9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Jun 2024 06:06:15 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2e506b24a9273b5ee2d3638a82fdc88c486d59f1
commit 2e506b24a9273b5ee2d3638a82fdc88c486d59f1
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-06-25 05:44:20 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-06-25 06:06:08 +0000
devel/qca: Update to 2.3.9
Add support for the rest of the plugins.
Improve Makefile order.
---
devel/qca/Makefile | 61 ++++++++++++++++++++++++++++++++++-------------------
devel/qca/distinfo | 6 +++---
devel/qca/pkg-plist | 5 +++++
3 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index 0750a0b96647..d8c2c8fb614f 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -1,6 +1,5 @@
PORTNAME= qca
-DISTVERSION= 2.3.8
-PORTREVISION= 1
+DISTVERSION= 2.3.9
CATEGORIES= devel
MASTER_SITES= KDE/stable/qca/${PORTVERSION}
PKGNAMESUFFIX= -${FLAVOR}
@@ -12,53 +11,71 @@ WWW= https://api.kde.org/qca/html/index.html
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-FLAVORS= qt5 qt6
-FLAVOR?= qt5
-
BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-USES= cmake compiler:c++11-lang qt:${FLAVOR:S/qt//} tar:xz
-CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no \
- -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
- -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features
-CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
-USE_LDCONFIG= yes
+FLAVORS= qt5 qt6
+FLAVOR?= qt5
-CMAKE_ARGS+= -DQCA_SUFFIX=${FLAVOR} \
- -D${FLAVOR:tu}:BOOL=TRUE
+USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig \
+ qt:${FLAVOR:S/qt//} tar:xz
+USE_LDCONFIG= yes
_USE_QT_qt5= core buildtools:build qmake:build
_USE_QT_qt6= 5compat base
USE_QT= ${_USE_QT_${FLAVOR}}
+CMAKE_ARGS= -DBUILD_PLUGINS=none \
+ -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
+ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
+ -DQCA_SUFFIX=${FLAVOR} \
+ -D${FLAVOR:tu}:BOOL=TRUE
+CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
+
_PLIST_SUB_qt5= QT5_ONLY=""
-_PLIST_SUB_qt6= QT5_ONLY="@comment "
+_PLIST_SUB_qt6= QT5_ONLY="@comment "
PLIST_SUB= SHLIB_VER=${PORTVERSION} \
QCA_QT_VERSION=${FLAVOR} \
${_PLIST_SUB_${FLAVOR}}
-OPTIONS_DEFINE= BOTAN GNUPG OPENSSL SASL TEST
+OPTIONS_DEFINE= BOTAN GCRYPT GNUPG LOGGER NSS OPENSSL PKCS11 SASL SOFTSTORE TEST
OPTIONS_DEFAULT=GNUPG OPENSSL
OPTIONS_SUB= yes
-BOTAN_CMAKE_ON= -DWITH_botan_PLUGIN=yes
BOTAN_DESC= Build with Botan crypto library
BOTAN_LIB_DEPENDS= libbotan-2.so:security/botan2
-BOTAN_USES= pkgconfig
+BOTAN_CMAKE_ON= -DWITH_botan_PLUGIN=yes
+
+GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
+GCRYPT_CMAKE_ON= -DWITH_gcrypt_PLUGIN=yes
-GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes
GNUPG_RUN_DEPENDS= gpg2:security/gnupg
+GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes
+
+LOGGER_DESC= Simple logger writer
+LOGGER_CMAKE_ON= -DWITH_logger_PLUGIN=yes
+
+NSS_LIB_DEPENDS= libnspr4.so:devel/nspr \
+ libnss3.so:security/nss
+NSS_CMAKE_ON= -DWITH_nss_PLUGIN=yes
-OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes
OPENSSL_USES= ssl
+OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes
+
+PKCS11_DESC= Smartcard integration
+PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper
+PKCS11_CMAKE_ON= -DWITH_pkcs11_PLUGIN=yes
+PKCS11_IMPLIES= OPENSSL
-SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
+SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes
+
+SOFTSTORE_DESC= Simple persistent certificate store
+SOFTSTORE_CMAKE_ON= -DWITH_softstore_PLUGIN=yes
-TEST_CMAKE_BOOL= BUILD_TESTS
-TEST_TEST_TARGET= test
_TEST_USE_qt5= QT=network:build,testlib:build
_TEST_USE_qt6= # Network and Test included in base
TEST_USE= ${_TEST_USE_${FLAVOR}}
+TEST_CMAKE_BOOL= BUILD_TESTS
+TEST_TEST_TARGET= test
.include <bsd.port.mk>
diff --git a/devel/qca/distinfo b/devel/qca/distinfo
index cff572a9f354..a42f599aad16 100644
--- a/devel/qca/distinfo
+++ b/devel/qca/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704852871
-SHA256 (qca-2.3.8.tar.xz) = 48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264
-SIZE (qca-2.3.8.tar.xz) = 761340
+TIMESTAMP = 1719288772
+SHA256 (qca-2.3.9.tar.xz) = c555d5298cdd7b6bafe2b1f96106f30cfa543a23d459d50c8a91eac33c476e4e
+SIZE (qca-2.3.9.tar.xz) = 765256
diff --git a/devel/qca/pkg-plist b/devel/qca/pkg-plist
index 10bb4fbdcc44..83a1c5f80ab8 100644
--- a/devel/qca/pkg-plist
+++ b/devel/qca/pkg-plist
@@ -26,8 +26,13 @@ lib/libqca-%%QCA_QT_VERSION%%.so.2
lib/libqca-%%QCA_QT_VERSION%%.so.%%SHLIB_VER%%
%%BOTAN%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-botan.so
%%SASL%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-cyrus-sasl.so
+%%GCRYPT%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-gcrypt.so
%%GNUPG%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-gnupg.so
+%%LOGGER%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-logger.so
+%%NSS%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-nss.so
+%%PKCS11%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-pkcs11.so
%%OPENSSL%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-ossl.so
+%%SOFTSTORE%%lib/qca-%%QCA_QT_VERSION%%/crypto/libqca-softstore.so
%%QT5_ONLY%%%%QT_MKSPECDIR%%/features/crypto.prf
%%QT5_ONLY%%libdata/pkgconfig/qca2-%%QCA_QT_VERSION%%.pc
share/man/man1/qcatool-%%QCA_QT_VERSION%%.1.gz