diff options
Diffstat (limited to 'security/libfido2')
| -rw-r--r-- | security/libfido2/Makefile | 9 | ||||
| -rw-r--r-- | security/libfido2/files/extra-patch-openssl | 26 |
2 files changed, 1 insertions, 34 deletions
diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile index edfba955c1eb..e1f38b4b97ce 100644 --- a/security/libfido2/Makefile +++ b/security/libfido2/Makefile @@ -23,11 +23,4 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -# Skip libcrypto.pc while using OpenSSL from base system on older FreeBSD versions which does not skip this file -.if ${SSL_DEFAULT} == base && !exists(/usr/libdata/pkgconfig/libcrypto.pc) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/libfido2/files/extra-patch-openssl b/security/libfido2/files/extra-patch-openssl deleted file mode 100644 index 6cab9adce02d..000000000000 --- a/security/libfido2/files/extra-patch-openssl +++ /dev/null @@ -1,26 +0,0 @@ ---- CMakeLists.txt.orig 2022-01-17 12:42:03 UTC -+++ CMakeLists.txt -@@ -196,14 +196,10 @@ if(MSVC) - else() - include(FindPkgConfig) - pkg_search_module(CBOR libcbor) -- pkg_search_module(CRYPTO libcrypto) - pkg_search_module(ZLIB zlib) - - if(NOT CBOR_FOUND AND NOT HAVE_CBOR_H) - message(FATAL_ERROR "could not find libcbor") -- endif() -- if(NOT CRYPTO_FOUND AND NOT HAVE_OPENSSLV_H) -- message(FATAL_ERROR "could not find libcrypto") - endif() - if(NOT ZLIB_FOUND) - message(FATAL_ERROR "could not find zlib") ---- src/libfido2.pc.in.orig 2022-01-17 12:42:03 UTC -+++ src/libfido2.pc.in -@@ -7,6 +7,5 @@ Name: @PROJECT_NAME@ - Description: A FIDO2 library - URL: https://github.com/yubico/libfido2 - Version: @FIDO_VERSION@ --Requires: libcrypto - Libs: -L${libdir} -lfido2 - Cflags: -I${includedir} |