From owner-svn-ports-all@freebsd.org  Tue Sep 13 14:24:47 2016
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 3CC1FBD9249;
 Tue, 13 Sep 2016 14:24:47 +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 E414FB60;
 Tue, 13 Sep 2016 14:24:46 +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 u8DEOklh099743;
 Tue, 13 Sep 2016 14:24:46 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DEOjBo099740;
 Tue, 13 Sep 2016 14:24:45 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609131424.u8DEOjBo099740@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 13 Sep 2016 14:24:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r422012 - in head: ftp/curl security/softhsm2
 security/stunnel
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Sep 2016 14:24:47 -0000

Author: marino
Date: Tue Sep 13 14:24:45 2016
New Revision: 422012
URL: https://svnweb.freebsd.org/changeset/ports/422012

Log:
  LibreSSL checks: Check for libressl-devel option too
  
  Approved by:	SSL blanket

Modified:
  head/ftp/curl/Makefile
  head/security/softhsm2/Makefile
  head/security/stunnel/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Tue Sep 13 14:22:07 2016	(r422011)
+++ head/ftp/curl/Makefile	Tue Sep 13 14:24:45 2016	(r422012)
@@ -153,7 +153,7 @@ IGNORE=		only supports LDAPS with SSL
 IGNORE=		GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
 
-.if ${SSL_DEFAULT} == libressl
+.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

Modified: head/security/softhsm2/Makefile
==============================================================================
--- head/security/softhsm2/Makefile	Tue Sep 13 14:22:07 2016	(r422011)
+++ head/security/softhsm2/Makefile	Tue Sep 13 14:24:45 2016	(r422012)
@@ -40,7 +40,7 @@ CRYP_OPEN_CONFIGURE_ON=	--with-crypto-ba
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT} == libressl
+.if ${SSL_DEFAULT:Mlibressl*}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 

Modified: head/security/stunnel/Makefile
==============================================================================
--- head/security/stunnel/Makefile	Tue Sep 13 14:22:07 2016	(r422011)
+++ head/security/stunnel/Makefile	Tue Sep 13 14:24:45 2016	(r422012)
@@ -76,11 +76,11 @@ LDFLAGS+=	-lpthread
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT} == libressl
+.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT:Mlibressl*}
 IGNORE=		LibreSSL does not support FIPS standard
 .endif
 
-.if ${SSL_DEFAULT} == libressl
+.if ${SSL_DEFAULT:Mlibressl*}
 NO_PACKAGE=	The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries
 .endif