From owner-svn-ports-all@freebsd.org Fri Aug 14 23:46:50 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 236389BAB45; Fri, 14 Aug 2015 23:46:50 +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 134A51B71; Fri, 14 Aug 2015 23:46:50 +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 t7ENknw6031764; Fri, 14 Aug 2015 23:46:49 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7ENknas031763; Fri, 14 Aug 2015 23:46:49 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201508142346.t7ENknas031763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 14 Aug 2015 23:46:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394263 - 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: Fri, 14 Aug 2015 23:46:50 -0000 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