summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormandree <mandree@FreeBSD.org>2011-10-04 21:58:09 +0000
committermandree <mandree@FreeBSD.org>2011-10-04 21:58:09 +0000
commit254bde03ab6d9803efd6557cdd69f43f5b21420c (patch)
treec786b13bb08fd675ef51118a1046cfd5665b18c7
parent16b137024845763b949751c03b853a4d03a50111 (diff)
downloadFreeBSD-ports-254bde03ab6d9803efd6557cdd69f43f5b21420c.zip
FreeBSD-ports-254bde03ab6d9803efd6557cdd69f43f5b21420c.tar.gz
Update and demote CONFLICTS to CONFLICTS_INSTALL.
-rw-r--r--security/openvpn/Makefile2
-rw-r--r--security/openvpn20/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index c1fe601..5ab4e9b 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -19,7 +19,7 @@ COMMENT= Secure IP/Ethernet tunnel daemon
LICENSE= GPLv2
-CONFLICTS= openvpn-devel-[0-9]* openvpn-2.0* openvpn-beta-[0-9]*
+CONFLICTS_INSTALL= openvpn-devel-[0-9]* openvpn-2.0* openvpn-beta-[0-9]*
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
index ed49502..223369f 100644
--- a/security/openvpn20/Makefile
+++ b/security/openvpn20/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= mandree@FreeBSD.org
COMMENT= Secure IP/Ethernet tunnel daemon
LATEST_LINK= openvpn20
-CONFLICTS= openvpn-2.[!0]* openvpn-devel-[0-9]*
+CONFLICTS_INSTALL= openvpn-2.[!0]* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
GNU_CONFIGURE= yes
USE_OPENSSL= yes
OpenPOWER on IntegriCloud