From owner-svn-ports-all@freebsd.org Sun Jun 28 18:40:08 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 BCC6C98F471; Sun, 28 Jun 2015 18:40:08 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay119.isp.belgacom.be (mailrelay119.isp.belgacom.be [195.238.20.146]) by mx1.freebsd.org (Postfix) with ESMTP id CEB7212CB; Sun, 28 Jun 2015 18:40:07 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=wisUSL2q+2X910teRg2xg/30tBFW7lBMAi45pEFXNHU= c=1 sm=2 a=6I5d2MoRAAAA:8 a=UJ5Y5Z__AAAA:8 a=GqhbqZf_A_tgCfOdgNkA:9 a=CjuIK1q_8ugA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BQBgAVP5BV/++YsFtcgxFUUg29NYFmhXgCgRw6EwEBAQEBAQGBCoQjAQEEOg8NIxALFAQJDxYPKh4GE4gzAQjERQEBAQEBAQEDAQEBAQEBARuLSoRTMwcYhBMBBJQEhFmGe4F9jy2HEiaDfDwxgkgBAQE Received: from 239.152-176-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.176.152.239]) by relay.skynet.be with ESMTP; 28 Jun 2015 20:40:06 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id t5SIe5p9003705; Sun, 28 Jun 2015 20:40:05 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 28 Jun 2015 20:40:05 +0200 From: Tijl Coosemans To: Sunpoet Po-Chuan Hsieh Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r390796 - head/ftp/curl Message-ID: <20150628204005.0010937e@kalimero.tijl.coosemans.org> In-Reply-To: References: <201506281649.t5SGn8Ld010515@svn.freebsd.org> <20150628195214.6ba59433@kalimero.tijl.coosemans.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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: Sun, 28 Jun 2015 18:40:08 -0000 On Mon, 29 Jun 2015 02:10:59 +0800 Sunpoet Po-Chuan Hsieh wrote: > On Mon, Jun 29, 2015 at 1:52 AM, Tijl Coosemans wrote: >> On Sun, 28 Jun 2015 16:49:08 +0000 (UTC) Sunpoet Po-Chuan Hsieh >> 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.