git: 426c0efca9f0 - main - security/distcache: unbreak the build when using OpenSSL from ports

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=426c0efca9f0077e2ce01d73ed890edfffb3989a

commit 426c0efca9f0077e2ce01d73ed890edfffb3989a
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-07-22 09:52:54 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-07-22 09:53:03 +0000

    security/distcache: unbreak the build when using OpenSSL from ports
    
    While appropriate --with-ssl=${OPENSSLBASE} switch is passed to the
    configure script, the SSLeay_version -> OpenSSL_version adjustment
    was performed not relative to ${OPENSSLINC}, which is wrong.  Also,
    this check cannot be executed at `post-patch' because OpenSSL from
    ports is not yet available at this early stage.
    
    PR:     236820
---
 security/distcache/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index ab15fa121028..28688e72397c 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -23,8 +23,8 @@ PORTDOCS=	ANNOUNCE BUGS CHANGES FAQ README
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${GREP} -q 'define SSLeay_version' /usr/include/openssl/crypto.h \
+pre-configure:	# yes, post-patch won't work in this case
+	@${GREP} -q 'define SSLeay_version' ${OPENSSLINC}/openssl/crypto.h \
 	    && ${REINPLACE_CMD} -e 's,SSLeay_version,OpenSSL_version,' \
 		${WRKSRC}/ssl/configure || :