Date: Sun, 3 Feb 2019 21:04:24 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492078 - head/security/ipsec-tools Message-ID: <201902032104.x13L4OBB015840@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Sun Feb 3 21:04:24 2019 New Revision: 492078 URL: https://svnweb.freebsd.org/changeset/ports/492078 Log: Fix build on 12-stable when using OpenSSL from port. PR: 232169 Submitted by: Michael Grimm <trashcan@ellael.org> Modified: head/security/ipsec-tools/Makefile Modified: head/security/ipsec-tools/Makefile ============================================================================== --- head/security/ipsec-tools/Makefile Sun Feb 3 20:46:35 2019 (r492077) +++ head/security/ipsec-tools/Makefile Sun Feb 3 21:04:24 2019 (r492078) @@ -85,7 +85,7 @@ NATT_EXTRA_PATCHES= ${FILESDIR}/natt.diff # Need to be patched for openssl-1.1.1 (default after 1200080) .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl BUILD_DEPENDS+= automake>=0:devel/automake . endif .endif @@ -95,7 +95,7 @@ post-patch: # Need to be patched for openssl-1.1.1 (default after 1200080) .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl post-configure: @${REINPLACE_CMD} -e "s/automake-1.14/automake-1.16/g" ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \ ${WRKSRC}/*/*/Makefile @@ -121,7 +121,7 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/src/racoon/doc/* ${STAGEDIR}/${DOCSDIR} .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ipsec-tools PLIST_FILES+= include/racoon/openssl_compat.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902032104.x13L4OBB015840>