Date: Sun, 28 Apr 2019 22:43:59 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500374 - in head/devel/qca: . files Message-ID: <201904282243.x3SMhxqD019218@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Sun Apr 28 22:43:59 2019 New Revision: 500374 URL: https://svnweb.freebsd.org/changeset/ports/500374 Log: Fix devel/qca's BOTAN option. This was missing all the moving parts to actually get the botan plugin to build. Added: head/devel/qca/files/ head/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt (contents, props changed) Modified: head/devel/qca/Makefile head/devel/qca/pkg-plist Modified: head/devel/qca/Makefile ============================================================================== --- head/devel/qca/Makefile Sun Apr 28 21:34:14 2019 (r500373) +++ head/devel/qca/Makefile Sun Apr 28 22:43:59 2019 (r500374) @@ -3,6 +3,7 @@ PORTNAME= qca PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KDE/stable/qca/${PORTVERSION} PKGNAMESUFFIX= -qt5 @@ -33,7 +34,9 @@ OPTIONS_DEFINE= BOTAN GNUPG OPENSSL SASL TEST OPTIONS_DEFAULT=GNUPG OPENSSL OPTIONS_SUB= yes +BOTAN_CMAKE_ON= -DWITH_botan_PLUGIN=yes BOTAN_LIB_DEPENDS= libbotan-2.so:security/botan2 +BOTAN_USES= pkgconfig GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes GNUPG_RUN_DEPENDS= gpg2:security/gnupg Added: head/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt Sun Apr 28 22:43:59 2019 (r500374) @@ -0,0 +1,10 @@ +--- plugins/qca-botan/CMakeLists.txt.orig 2019-04-24 12:58:14 UTC ++++ plugins/qca-botan/CMakeLists.txt +@@ -16,6 +16,7 @@ if(BOTAN_FOUND) + set_property(TARGET qca-botan PROPERTY SUFFIX ".dylib") + endif() + ++ target_link_directories(qca-botan PRIVATE ${BOTAN_LIBRARY_DIRS}) + target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES}) + + if(NOT DEVELOPER_MODE) Modified: head/devel/qca/pkg-plist ============================================================================== --- head/devel/qca/pkg-plist Sun Apr 28 21:34:14 2019 (r500373) +++ head/devel/qca/pkg-plist Sun Apr 28 22:43:59 2019 (r500374) @@ -24,6 +24,7 @@ lib/cmake/Qca-qt5/Qca-qt5Targets.cmake lib/libqca-qt5.so lib/libqca-qt5.so.2 lib/libqca-qt5.so.%%SHLIB_VER%% +%%BOTAN%%lib/qca-qt5/crypto/libqca-botan.so %%SASL%%lib/qca-qt5/crypto/libqca-cyrus-sasl.so %%GNUPG%%lib/qca-qt5/crypto/libqca-gnupg.so %%OPENSSL%%lib/qca-qt5/crypto/libqca-ossl.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904282243.x3SMhxqD019218>