From owner-svn-ports-head@freebsd.org Sun Jun 28 18:11:46 2015 Return-Path: Delivered-To: svn-ports-head@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 2334C98F09E for ; Sun, 28 Jun 2015 18:11:46 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDECB299A for ; Sun, 28 Jun 2015 18:11:45 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by oiyy130 with SMTP id y130so104787356oiy.0 for ; Sun, 28 Jun 2015 11:11:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=0nXALch0DXffnSA0eNmkavrPagSoFruEhN+qoAT6G/M=; b=XciMXp2ozoxr9PnNk/Mfk1fh5UXBv7STKKR35ZpEqqFRfC2QTAmq6RjXnWwEowx5d2 zW0FZ3p+sSZpTTpXgFI6szRrD0Jln+E6PgDIGNeYAvUsYqmFCM4ePUY+PHHCv8PZdGk+ ZCYOgeq3j89/BO02FLlw2Znn7WmqOIzNGdjzate4z4GUqb92XCQ73iYnkzBywMO1BHoL PdTrEeMSdenPj/lOoQn/Jja33J1okRUKEtUCHQDJNtqBHzjCwQvlwl6wy7TmAWp5vGxN 8Pnziuk3LxaWvgrW5gRyu8YOpKdgzzADL4J9t5BHT6/IKKJ+Fun3As7tcK1R1h08TTrU fQbQ== X-Gm-Message-State: ALoCoQmHaRoekIcj1kdn5N2YmXjv7GreXd+Thb5eBlVkwwfNukMiXzrxP3nS2D09/A/+0dDD84d5 X-Received: by 10.202.1.209 with SMTP id 200mr10046799oib.86.1435515099134; Sun, 28 Jun 2015 11:11:39 -0700 (PDT) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.202.73.70 with HTTP; Sun, 28 Jun 2015 11:10:59 -0700 (PDT) In-Reply-To: <20150628195214.6ba59433@kalimero.tijl.coosemans.org> References: <201506281649.t5SGn8Ld010515@svn.freebsd.org> <20150628195214.6ba59433@kalimero.tijl.coosemans.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 29 Jun 2015 02:10:59 +0800 X-Google-Sender-Auth: zbVSnIzgrb9X5Bb04DJQ5sa-bMU Message-ID: Subject: Re: svn commit: r390796 - head/ftp/curl To: Tijl Coosemans Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jun 2015 18:11:46 -0000 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