diff options
author | sunpoet <sunpoet@FreeBSD.org> | 2015-08-15 07:46:49 +0800 |
---|---|---|
committer | sunpoet <sunpoet@FreeBSD.org> | 2015-08-15 07:46:49 +0800 |
commit | cad8c9e267c19bfce2bbb37ebef21d698a1d4c0b (patch) | |
tree | c14714faef59b9ab9e9ec6dcbcb889daf2fed0f5 /ftp | |
parent | 54ae0397866c1bf7448e6d915624126ce3c9ac13 (diff) | |
download | freebsd-ports-gnome-cad8c9e267c19bfce2bbb37ebef21d698a1d4c0b.tar.gz freebsd-ports-gnome-cad8c9e267c19bfce2bbb37ebef21d698a1d4c0b.tar.zst freebsd-ports-gnome-cad8c9e267c19bfce2bbb37ebef21d698a1d4c0b.zip |
- Adjust default GSSAPI option:
- GSSAPI_NONE if OpenSSL/LibreSSL from ports will be used instead of OpenSSL from base system
- GSSAPI_BASE if otherwise
- Bump PORTREVISION for package change
Suggested by: tijl
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/curl/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index cd915386b6c0..ae93953c7a71 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -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_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 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,13 @@ RESOLV_DESC= DNS resolving options THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support +LOCALBASE?= /usr/local +.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 |