From owner-svn-ports-all@freebsd.org Thu Aug 20 07:06:13 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 031769BE603; Thu, 20 Aug 2015 07:06:13 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE0DE9FE; Thu, 20 Aug 2015 07:06:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7K76CB9088821; Thu, 20 Aug 2015 07:06:12 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7K76CKd088820; Thu, 20 Aug 2015 07:06:12 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201508200706.t7K76CKd088820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 20 Aug 2015 07:06:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394836 - head/ftp/curl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 07:06:13 -0000 Author: sunpoet Date: Thu Aug 20 07:06:11 2015 New Revision: 394836 URL: https://svnweb.freebsd.org/changeset/ports/394836 Log: - Convert to new options dependency helper Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Thu Aug 20 07:05:19 2015 (r394835) +++ head/ftp/curl/Makefile Thu Aug 20 07:06:11 2015 (r394836) @@ -20,13 +20,16 @@ OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL PO OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP CA_BUNDLE_DESC= Install CA bundle for OpenSSL +CA_BUNDLE_IMPLIES= OPENSSL COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking GSSAPI_BASE_DESC= GSSAPI support via base system (Kerberos required) GSSAPI_HEIMDAL_DESC= GSSAPI support via security/heimdal GSSAPI_MIT_DESC= GSSAPI support via security/krb5 GSSAPI_NONE_DESC= Disable GSSAPI support +LDAPS_IMPLIES= LDAP LIBSSH2_DESC= SCP/SFTP support via libssh2 +LIBSSH2_IMPLIES= OPENSSL RESOLV_DESC= DNS resolving options THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support @@ -148,26 +151,14 @@ WOLFSSL_LIB_DEPENDS= libwolfssl.so:${POR .include -.if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL} -IGNORE= only supports CA bundle with OpenSSL -.endif - .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif -.if !${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MLDAPS} -IGNORE= only supports LDAPS with LDAP -.endif - .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL .endif -.if ${PORT_OPTIONS:MLIBSSH2} && !${PORT_OPTIONS:MOPENSSL} -IGNORE= only supports LIBSSH2 with OpenSSL -.endif - .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