svn commit: r394263 - head/ftp/curl
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Aug 14 23:46:50 UTC 2015
Author: sunpoet
Date: Fri Aug 14 23:46:49 2015
New Revision: 394263
URL: https://svnweb.freebsd.org/changeset/ports/394263
Log:
- 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
Modified:
head/ftp/curl/Makefile
Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile Fri Aug 14 22:58:02 2015 (r394262)
+++ head/ftp/curl/Makefile Fri Aug 14 23:46:49 2015 (r394263)
@@ -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
More information about the svn-ports-all
mailing list