From owner-svn-ports-head@freebsd.org  Sat Jun 18 09:02:41 2016
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 50518A77489;
 Sat, 18 Jun 2016 09:02:41 +0000 (UTC) (envelope-from mat@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 212EE2651;
 Sat, 18 Jun 2016 09:02:41 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5I92eMN062332;
 Sat, 18 Jun 2016 09:02:40 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5I92e9B062331;
 Sat, 18 Jun 2016 09:02:40 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201606180902.u5I92e9B062331@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Sat, 18 Jun 2016 09:02:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417055 - head/security/libssh2
X-SVN-Group: ports-head
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.22
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: Sat, 18 Jun 2016 09:02:41 -0000

Author: mat
Date: Sat Jun 18 09:02:40 2016
New Revision: 417055
URL: https://svnweb.freebsd.org/changeset/ports/417055

Log:
  Fix with GCRYPT option on.
  
  Submitted by:	Craig Leres
  Sponsored by:	Absolight

Modified:
  head/security/libssh2/Makefile   (contents, props changed)

Modified: head/security/libssh2/Makefile
==============================================================================
--- head/security/libssh2/Makefile	Sat Jun 18 09:01:55 2016	(r417054)
+++ head/security/libssh2/Makefile	Sat Jun 18 09:02:40 2016	(r417055)
@@ -30,22 +30,20 @@ GCRYPT_CONFIGURE_ON=	--with-libgcrypt --
 GCRYPT_CONFIGURE_OFF=	--without-libgcrypt --with-openssl
 GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
 GCRYPT_LIBS=		-L${LOCALBASE}/lib
+GCRYPT_USE_OFF=	openssl=yes
 ZLIB_CONFIGURE_WITH=	libz
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MGCRYPT}
-USE_OPENSSL=	yes
-.endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \
 		${WRKSRC}/libssh2.pc.in
-.if ${SSL_DEFAULT} == base
+.if ! ${PORT_OPTIONS:MGCRYPT}
+.  if ${SSL_DEFAULT} == base
 	@${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \
 		${WRKSRC}/configure
+.  endif
 .endif
 
 post-build: