Date: Sat, 21 Nov 2020 09:37:32 +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: r555861 - in head/security/libfido2: . files Message-ID: <202011210937.0AL9bWnW013382@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Nov 21 09:37:32 2020 New Revision: 555861 URL: https://svnweb.freebsd.org/changeset/ports/555861 Log: Convert REINPLACE_CMD to patch files Added: head/security/libfido2/files/patch-CMakeLists.txt (contents, props changed) head/security/libfido2/files/patch-openbsd-compat-openbsd-compat.h (contents, props changed) Modified: head/security/libfido2/Makefile Modified: head/security/libfido2/Makefile ============================================================================== --- head/security/libfido2/Makefile Sat Nov 21 09:37:16 2020 (r555860) +++ head/security/libfido2/Makefile Sat Nov 21 09:37:32 2020 (r555861) @@ -24,10 +24,4 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e '/libcrypto/d' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|endian.h|sys/&|' ${WRKSRC}/CMakeLists.txt ${WRKSRC}/openbsd-compat/openbsd-compat.h - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/security/libfido2/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libfido2/files/patch-CMakeLists.txt Sat Nov 21 09:37:32 2020 (r555861) @@ -0,0 +1,21 @@ +--- 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() + + 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() Added: head/security/libfido2/files/patch-openbsd-compat-openbsd-compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libfido2/files/patch-openbsd-compat-openbsd-compat.h Sat Nov 21 09:37:32 2020 (r555861) @@ -0,0 +1,20 @@ +--- openbsd-compat/openbsd-compat.h.orig 2020-09-01 07:17:43 UTC ++++ openbsd-compat/openbsd-compat.h +@@ -12,7 +12,7 @@ + #endif + + #if defined(HAVE_ENDIAN_H) +-#include <endian.h> ++#include <sys/endian.h> + #endif + + #if defined(__APPLE__) && !defined(HAVE_ENDIAN_H) +@@ -33,7 +33,7 @@ + #endif /* _WIN32 && !HAVE_ENDIAN_H */ + + #if defined(__FreeBSD__) && !defined(HAVE_ENDIAN_H) +-#include <sys/endian.h> ++#include <sys/sys/endian.h> + #endif + + #include <stdlib.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011210937.0AL9bWnW013382>