From owner-svn-ports-head@freebsd.org  Sat Jun 18 00:27:14 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 759FFA771BF;
 Sat, 18 Jun 2016 00:27:14 +0000 (UTC)
 (envelope-from leres@ee.lbl.gov)
Received: from fun.ee.lbl.gov (fun.ee.lbl.gov [IPv6:2620:83:8000:102::ca])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "fun.ee.lbl.gov", Issuer "ACS 3" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A3992F1C;
 Sat, 18 Jun 2016 00:27:14 +0000 (UTC)
 (envelope-from leres@ee.lbl.gov)
Received: from ice.ee.lbl.gov (ice.ee.lbl.gov [131.243.2.213])
 (authenticated bits=0)
 by fun.ee.lbl.gov (8.15.2/8.15.2) with ESMTPSA id u5I0RCx0039936
 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO);
 Fri, 17 Jun 2016 17:27:12 -0700 (PDT)
 (envelope-from leres@ee.lbl.gov)
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...
To: Mathieu Arnold <mat@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
References: <201606161323.u5GDNDIu077213@repo.freebsd.org>
From: Craig Leres <leres@ee.lbl.gov>
Message-ID: <7586b623-caf2-9615-0e91-b3741295aec8@ee.lbl.gov>
Date: Fri, 17 Jun 2016 17:27:12 -0700
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101
 Thunderbird/45.1.1
MIME-Version: 1.0
In-Reply-To: <201606161323.u5GDNDIu077213@repo.freebsd.org>
Content-Type: multipart/mixed; boundary="------------3D38F7597EF76FF4BF1C8A02"
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 00:27:14 -0000

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--