svn commit: r542426 - head/security/openvpn

[Matthias Andree]

Author: mandree
Date: Fri Jul 17 10:30:37 2020
New Revision: 542426
URL: https://svnweb.freebsd.org/changeset/ports/542426

Log:
  security/openvpn: future proofing, PLUGINDIR now ...
  
  ...configured the official way, not hacky (which failed in openvpn-devel
  because it broke some configure tests).

Modified:
  head/security/openvpn/Makefile

Modified: head/security/openvpn/Makefile
==============================================================================
--- head/security/openvpn/Makefile	Fri Jul 17 10:14:29 2020	(r542425)
+++ head/security/openvpn/Makefile	Fri Jul 17 10:30:37 2020	(r542426)
@@ -3,7 +3,7 @@
 
 PORTNAME=		openvpn
 DISTVERSION=		2.4.9
-PORTREVISION?=		2
+PORTREVISION?=		3
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
 			https://build.openvpn.net/downloads/releases/ \
@@ -24,6 +24,9 @@ SHEBANG_FILES=		sample/sample-scripts/verify-cn \
 			sample/sample-scripts/auth-pam.pl \
 			sample/sample-scripts/ucn.pl
 CONFIGURE_ARGS+=	--enable-strict
+# set PLUGIN_LIBDIR so that unqualified plugin paths are found:
+CONFIGURE_ENV+=		PLUGINDIR="${PREFIX}/lib/openvpn/plugins"
+
 # avoid picking up CMAKE, we don't have cmocka in the tarballs.
 CONFIGURE_ENV+=		ac_cv_prog_CMAKE= CMAKE=
 
@@ -31,9 +34,6 @@ CONFIGURE_ENV+=		ac_cv_prog_CMAKE= CMAKE=
 # but do not break the plugin build if an older version is installed
 CPPFLAGS+=		-I${WRKSRC}/include -I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -Wl,--as-needed
-
-# set PLUGIN_LIBDIR so that unqualified plugin paths are found:
-CPPFLAGS+=		-DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\"
 
 OPTIONS_DEFINE=		PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \
 			TEST LZ4 LZO SMALL TUNNELBLICK ASYNC_PUSH