Date: Tue, 24 Nov 2020 20:48:57 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556193 - in head/security/libfido2: . files Message-ID: <202011242048.0AOKmvAr029788@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Tue Nov 24 20:48:56 2020 New Revision: 556193 URL: https://svnweb.freebsd.org/changeset/ports/556193 Log: Skip libcrypto.pc when using SSL from base system - Bump PORTREVISION for package change Differential Revision: https://reviews.freebsd.org/D27289 Submitted by: bdrewery Modified: head/security/libfido2/Makefile head/security/libfido2/files/patch-CMakeLists.txt Modified: head/security/libfido2/Makefile ============================================================================== --- head/security/libfido2/Makefile Tue Nov 24 20:48:52 2020 (r556192) +++ head/security/libfido2/Makefile Tue Nov 24 20:48:56 2020 (r556193) @@ -3,6 +3,7 @@ PORTNAME= libfido2 PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://developers.yubico.com/libfido2/Releases/ @@ -24,4 +25,12 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +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 <bsd.port.post.mk> Modified: head/security/libfido2/files/patch-CMakeLists.txt ============================================================================== --- head/security/libfido2/files/patch-CMakeLists.txt Tue Nov 24 20:48:52 2020 (r556192) +++ head/security/libfido2/files/patch-CMakeLists.txt Tue Nov 24 20:48:56 2020 (r556193) @@ -1,14 +1,6 @@ --- 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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011242048.0AOKmvAr029788>