Date: Fri, 17 Jun 2016 17:27:12 -0700 From: Craig Leres <leres@ee.lbl.gov> To: Mathieu Arnold <mat@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: 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... Message-ID: <7586b623-caf2-9615-0e91-b3741295aec8@ee.lbl.gov> In-Reply-To: <201606161323.u5GDNDIu077213@repo.freebsd.org> References: <201606161323.u5GDNDIu077213@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------3D38F7597EF76FF4BF1C8A02 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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 --------------3D38F7597EF76FF4BF1C8A02 Content-Type: text/plain; charset=UTF-8; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" 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/,$$//;}' \ --------------3D38F7597EF76FF4BF1C8A02--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7586b623-caf2-9615-0e91-b3741295aec8>