From owner-svn-ports-head@freebsd.org Sat Oct 24 11:18:06 2015 Return-Path: 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 0301DA1D39F; Sat, 24 Oct 2015 11:18:06 +0000 (UTC) (envelope-from mandree@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 C1F77764; Sat, 24 Oct 2015 11:18:05 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9OBI4YT091069; Sat, 24 Oct 2015 11:18:04 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9OBI4ad091068; Sat, 24 Oct 2015 11:18:04 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201510241118.t9OBI4ad091068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 24 Oct 2015 11:18:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400118 - head/security/openvpn 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 11:18:06 -0000 Author: mandree Date: Sat Oct 24 11:18:04 2015 New Revision: 400118 URL: https://svnweb.freebsd.org/changeset/ports/400118 Log: Handle OpenSSL/PolarSSL options in the right way, such that it is maintainable if we add more SSL libs in the future. To fix fall-out from r399858 and r399982. Modified: head/security/openvpn/Makefile Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Sat Oct 24 11:13:16 2015 (r400117) +++ head/security/openvpn/Makefile Sat Oct 24 11:18:04 2015 (r400118) @@ -49,10 +49,11 @@ X509ALTUSERNAME_CONFIGURE_ENABLE= x509-a X509ALTUSERNAME_PREVENTS= POLARSSL X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead -POLARSSL_LIB_DEPENDS= libpolarssl.so:${PORTSDIR}/security/polarssl +OPENSSL_USE= openssl=yes +OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl + +POLARSSL_LIB_DEPENDS= libpolarssl.so:${PORTSDIR}/security/polarssl POLARSSL_CONFIGURE_ON= --with-crypto-library=polarssl -POLARSSL_USE_OFF= openssl=yes -POLARSSL_CONFIGURE_OFF= --with-crypto-library=openssl USE_RC_SUBR= openvpn USE_LDCONFIG= ${PREFIX}/lib