svn commit: r390796 - head/ftp/curl

[Tijl Coosemans]

On Mon, 29 Jun 2015 02:10:59 +0800 Sunpoet Po-Chuan Hsieh <sunpoet at freebsd.org> wrote:
> On Mon, Jun 29, 2015 at 1:52 AM, Tijl Coosemans <tijl at freebsd.org> wrote:
>> On Sun, 28 Jun 2015 16:49:08 +0000 (UTC) Sunpoet Po-Chuan Hsieh
>> <sunpoet at FreeBSD.org> wrote:
>>> 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
>>
>> Is it possible to add a different GSSAPI option to OPTIONS_DEFAULT
>> depending on defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE)
>>  && exists(${LOCALBASE}/lib/libcrypto.so)?
> 
> How about this?
> 
> Index: Makefile
> ===================================================================
> --- Makefile    (revision 390806)
> +++ Makefile    (working copy)
> @@ -3,7 +3,7 @@
> 
>  PORTNAME=      curl
>  PORTVERSION=   7.43.0
> -PORTREVISION=  2
> +PORTREVISION=  3
>  CATEGORIES=    ftp www
>  MASTER_SITES=  http://curl.haxx.se/download/ \
>                 LOCAL/sunpoet
> @@ -19,7 +19,7 @@
>  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 GSSAPI_BASE IPV6 OPENSSL PROXY
> RESOLV THREADED_RESOLVER TLS_SRP
> +OPTIONS_DEFAULT=       CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV
> THREADED_RESOLVER TLS_SRP
>  CA_BUNDLE_DESC=                Install CA bundle for OpenSSL
>  COOKIES_DESC=          Cookies support
>  CURL_DEBUG_DESC=       cURL debug memory tracking
> @@ -32,6 +32,12 @@
>  THREADED_RESOLVER_DESC=        Threaded DNS resolver
>  TLS_SRP_DESC=          TLS-SRP (Secure Remote Password) support
> 
> +.if defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) &&
> exists(${LOCALBASE}/lib/libcrypto.so))
> +OPTIONS_DEFAULT+=      GSSAPI_NONE
> +.else
> +OPTIONS_DEFAULT+=      GSSAPI_BASE
> +.endif
> +
>  CONFIGURE_ARGS+=--disable-werror \
>                 --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
>                 --without-axtls

LOCALBASE isn't defined yet.  I think it would be acceptable to add
LOCALBASE?=/usr/local in front of the .if block in this case.