svn commit: r416966 - in head: archivers/py-borgbackup databases/mariadb101-server databases/mysql57-server devel/libgit2 devel/libopkele devel/thrift-cpp dns/bind9-devel dns/bind910 dns/bind99 emu...

[Craig Leres]

On 06/16/16 06:23, Mathieu Arnold wrote:
> Author: mat
> Date: Thu Jun 16 13:23:13 2016
> New Revision: 416966
> URL: https://svnweb.freebsd.org/changeset/ports/416966
> 
> Log:
>   Fix usage of WITH_OPENSSL_BASE, WITH_OPENSSL_PORT and OPENSSL_PORT.

> Modified:

>   head/security/libssh2/Makefile   (contents, props changed)

security/libssh2 is broken for the case when GCRYPT is set:

    fun 310 # cd /usr/ports/security/libssh2 && make install
    "Makefile", line 46: Malformed conditional (${SSL_DEFAULT} == base)
    "Makefile", line 49: if-less endif
    make: fatal errors encountered -- cannot continue

The attached patch is one possible fix.

		Craig



-------------- next part --------------
Index: /usr/ports/security/libssh2/Makefile
===================================================================
--- /usr/ports/security/libssh2/Makefile	(revision 417019)
+++ /usr/ports/security/libssh2/Makefile	(working copy)
@@ -43,10 +43,12 @@
 post-patch:
 	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \
 		${WRKSRC}/libssh2.pc.in
+.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:
 	@${REINPLACE_CMD} -E -e '/Requires.private:/{s/[[:<:]]zlib[[:>:]]//;s/,,/,/;s/ ,/ /;s/,$$//;}' \