From owner-svn-ports-all@freebsd.org  Sun Jun 28 16:49:09 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
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 2026698F84E;
 Sun, 28 Jun 2015 16:49:09 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from svn.freebsd.org (svn.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 10C881008;
 Sun, 28 Jun 2015 16:49:09 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5SGn8at010516;
 Sun, 28 Jun 2015 16:49:08 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5SGn8Ld010515;
 Sun, 28 Jun 2015 16:49:08 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201506281649.t5SGn8Ld010515@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 28 Jun 2015 16:49:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r390796 - 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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2015 16:49:09 -0000

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

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Sun Jun 28 16:46:02 2015	(r390795)
+++ head/ftp/curl/Makefile	Sun Jun 28 16:49:08 2015	(r390796)
@@ -162,14 +162,15 @@ IGNORE=		only supports LDAPS with SSL
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL} && ( \
-	defined(WITH_OPENSSL_PORT) || \
-	(!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) || \
-	(defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"))
-.if ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE=		GSSAPI_BASE is set, which is not compatible with OpenSSL/LibreSSL from ports. Set GSSAPI_NONE or do not use ports SSL.
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)))
+IGNORE=		GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
-.if ${PORT_OPTIONS:MTLS_SRP} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
+
+.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
+.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
 .endif