svn commit: r390796 - head/ftp/curl
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sun Jun 28 16:49:09 UTC 2015
Author: sunpoet
Date: Sun Jun 28 16:49:08 2015
New Revision: 390796
URL: https://svnweb.freebsd.org/changeset/ports/390796
Log:
- Rework OpenSSL/LibreSSL check
Modified:
head/ftp/curl/Makefile
Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile Sun Jun 28 16:46:02 2015 (r390795)
+++ head/ftp/curl/Makefile Sun Jun 28 16:49:08 2015 (r390796)
@@ -162,14 +162,15 @@ IGNORE= only supports LDAPS with SSL
IGNORE= only supports LIBSSH2 with OpenSSL
.endif
-.if ${PORT_OPTIONS:MOPENSSL} && ( \
- defined(WITH_OPENSSL_PORT) || \
- (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) || \
- (defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"))
-.if ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE= GSSAPI_BASE is set, which is not compatible with OpenSSL/LibreSSL from ports. Set GSSAPI_NONE or do not use ports SSL.
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)))
+IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
.endif
-.if ${PORT_OPTIONS:MTLS_SRP} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
+
+.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL}
+IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options
+.endif
+.if ${PORT_OPTIONS:MTLS_SRP}
IGNORE= unsupported TLS-SRP in LibreSSL
.endif
.endif
More information about the svn-ports-all
mailing list