svn commit: r434968 - head/ftp/curl

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Mon Feb 27 17:10:05 2017
New Revision: 434968
URL: https://svnweb.freebsd.org/changeset/ports/434968

Log:
  Cosmetic change

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Mon Feb 27 16:51:23 2017	(r434967)
+++ head/ftp/curl/Makefile	Mon Feb 27 17:10:05 2017	(r434968)
@@ -19,8 +19,7 @@ OPTIONS_SINGLE=	GSSAPI
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	CA_BUNDLE COOKIES HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
-OPTIONS_DEFAULT+=	GSSAPI_${"${SSL_DEFAULT}" == "base":?BASE:NONE}
+OPTIONS_DEFAULT=	CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
 CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 CA_BUNDLE_IMPLIES=	OPENSSL
 COOKIES_DESC=		Cookies support
@@ -118,7 +117,7 @@ RTMP_CONFIGURE_WITH=	librtmp
 RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_USES=		pkgconfig
 SMB_CONFIGURE_ENABLE=	smb
-THREADED_RESOLVER_CONFIGURE_ENABLE=	threaded-resolver
+THREADED_RESOLVER_CONFIGURE_ENABLE=	pthreads threaded-resolver
 TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	cyassl
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
@@ -133,11 +132,9 @@ IGNORE=		only supports TLS-SRP with eith
 IGNORE=		only supports LDAPS with SSL
 .endif
 
-.if ${SSL_DEFAULT:Mlibressl*}
-.if ${PORT_OPTIONS:MTLS_SRP}
+.if ${PORT_OPTIONS:MTLS_SRP} && ${SSL_DEFAULT:Mlibressl*}
 IGNORE=		unsupported TLS-SRP in LibreSSL
 .endif
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in