From owner-svn-ports-head@freebsd.org  Mon Jul 17 15:31:06 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
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 468DED95DF1;
 Mon, 17 Jul 2017 15:31:06 +0000 (UTC)
 (envelope-from dbaio@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 1483D648EB;
 Mon, 17 Jul 2017 15:31:06 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6HFV5S0012602;
 Mon, 17 Jul 2017 15:31:05 GMT (envelope-from dbaio@FreeBSD.org)
Received: (from dbaio@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HFV5uW012601;
 Mon, 17 Jul 2017 15:31:05 GMT (envelope-from dbaio@FreeBSD.org)
Message-Id: <201707171531.v6HFV5uW012601@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbaio set sender to
 dbaio@FreeBSD.org using -f
From: "Danilo G. Baio" <dbaio@FreeBSD.org>
Date: Mon, 17 Jul 2017 15:31:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r446079 - head/security/softhsm2
X-SVN-Group: ports-head
X-SVN-Commit-Author: dbaio
X-SVN-Commit-Paths: head/security/softhsm2
X-SVN-Commit-Revision: 446079
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jul 2017 15:31:06 -0000

Author: dbaio
Date: Mon Jul 17 15:31:04 2017
New Revision: 446079
URL: https://svnweb.freebsd.org/changeset/ports/446079

Log:
  security/softhsm2: Combine if statements

Modified:
  head/security/softhsm2/Makefile

Modified: head/security/softhsm2/Makefile
==============================================================================
--- head/security/softhsm2/Makefile	Mon Jul 17 15:18:36 2017	(r446078)
+++ head/security/softhsm2/Makefile	Mon Jul 17 15:31:04 2017	(r446079)
@@ -45,11 +45,7 @@ CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
 
 .include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT:Mlibressl*}
-CONFIGURE_ARGS+=	--disable-gost
-.endif
-
-.if ${SSL_DEFAULT:Mopenssl-devel}
+.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl-devel}
 CONFIGURE_ARGS+=	--disable-gost
 .endif