From owner-svn-ports-all@freebsd.org Tue Sep 13 15:37:01 2016 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 6E60BBD97E3; Tue, 13 Sep 2016 15:37:01 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3F7B3F17; Tue, 13 Sep 2016 15:37:01 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DFb0nP027143; Tue, 13 Sep 2016 15:37:00 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DFb012027142; Tue, 13 Sep 2016 15:37:00 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609131537.u8DFb012027142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 13 Sep 2016 15:37:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422020 - 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.23 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: Tue, 13 Sep 2016 15:37:01 -0000 Author: marino Date: Tue Sep 13 15:37:00 2016 New Revision: 422020 URL: https://svnweb.freebsd.org/changeset/ports/422020 Log: ftp/curl: Remove redundant ports SSL + base GSSAPI check If one tries to use the base gssapi with SSL from ports, gssapi.mk will add an IGNORE entry. Suggested by: mat Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Tue Sep 13 15:34:28 2016 (r422019) +++ head/ftp/curl/Makefile Tue Sep 13 15:37:00 2016 (r422020) @@ -154,9 +154,6 @@ IGNORE= GSSAPI_BASE is not compatible w .endif .if ${SSL_DEFAULT:Mlibressl*} -.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} -IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options -.endif .if ${PORT_OPTIONS:MTLS_SRP} IGNORE= unsupported TLS-SRP in LibreSSL .endif