Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jun 2016 09:02:40 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r417055 - head/security/libssh2
Message-ID:  <201606180902.u5I92e9B062331@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606180902.u5I92e9B062331>