svn commit: r400118 - head/security/openvpn

[Matthias Andree]

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