svn commit: r451516 - in branches/2017Q4/security: openvpn openvpn-mbedtls

[Matthias Andree]

Author: mandree
Date: Sun Oct  8 09:49:33 2017
New Revision: 451516
URL: https://svnweb.freebsd.org/changeset/ports/451516

Log:
  MFH: r451515
  
  Add missing conflicts.
  
  Approved by:	ports-secteam (blanket, only touches CONFLICTS)

Modified:
  branches/2017Q4/security/openvpn-mbedtls/Makefile
  branches/2017Q4/security/openvpn/Makefile
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/security/openvpn-mbedtls/Makefile
==============================================================================
--- branches/2017Q4/security/openvpn-mbedtls/Makefile	Sun Oct  8 09:46:27 2017	(r451515)
+++ branches/2017Q4/security/openvpn-mbedtls/Makefile	Sun Oct  8 09:49:33 2017	(r451516)
@@ -5,6 +5,8 @@ PKGNAMESUFFIX=		-mbedtls
 
 COMMENT=		Secure IP/Ethernet tunnel daemon, mbedTLS-based build
 
+CONFLICTS_INSTALL=	openvpn-[0-9].* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
+
 OPTIONS_EXCLUDE=	OPENSSL PKCS11 X509ALTUSERNAME
 OPTIONS_SLAVE=		MBEDTLS
 

Modified: branches/2017Q4/security/openvpn/Makefile
==============================================================================
--- branches/2017Q4/security/openvpn/Makefile	Sun Oct  8 09:46:27 2017	(r451515)
+++ branches/2017Q4/security/openvpn/Makefile	Sun Oct  8 09:49:33 2017	(r451516)
@@ -13,7 +13,7 @@ COMMENT?=		Secure IP/Ethernet tunnel daemon
 
 LICENSE=		GPLv2
 
-CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
+CONFLICTS_INSTALL?=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]*
 
 GNU_CONFIGURE=		yes
 USES=			cpe libtool pkgconfig shebangfix tar:xz