Index: head/security/libfido2/Makefile =================================================================== --- head/security/libfido2/Makefile (revision 556192) +++ head/security/libfido2/Makefile (revision 556193) @@ -1,27 +1,36 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ PORTNAME= libfido2 PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://developers.yubico.com/libfido2/Releases/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Provides library functionality for FIDO 2.0 LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcbor.so:devel/libcbor \ libhidapi.so.0:comms/hidapi USES= cmake compiler:c11 pkgconfig ssl CFLAGS+= -D_WITH_GETLINE CMAKE_ON= USE_HIDAPI PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS -.include +.include + +post-patch: +# we do not ship libcrypto.pc in base system +.if ${SSL_DEFAULT} == base + @${REINPLACE_CMD} -e '/libcrypto/d' ${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/libfido2.pc.in +.endif + +.include Index: head/security/libfido2/files/patch-CMakeLists.txt =================================================================== --- head/security/libfido2/files/patch-CMakeLists.txt (revision 556192) +++ head/security/libfido2/files/patch-CMakeLists.txt (revision 556193) @@ -1,21 +1,13 @@ --- CMakeLists.txt.orig 2020-09-01 07:17:43 UTC +++ CMakeLists.txt -@@ -72,7 +72,6 @@ if(MSVC) - else() - include(FindPkgConfig) - pkg_search_module(CBOR libcbor) -- pkg_search_module(CRYPTO libcrypto) - - # XXX workaround libcbor's missing .pc file - if(NOT CBOR_FOUND) -@@ -177,8 +176,8 @@ endif() +@@ -177,8 +177,8 @@ endif() add_definitions(-DTLS=${TLS}) -# endian.h -check_include_files(endian.h HAVE_ENDIAN_H) +# sys/endian.h +check_include_files(sys/endian.h HAVE_ENDIAN_H) if(HAVE_ENDIAN_H) add_definitions(-DHAVE_ENDIAN_H) endif()