From 6fe286cb37242fd05a73f300b336d380e61cc38e Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 31 Aug 2016 21:49:37 +0000 Subject: Remove the CONFLICTS_INSTALL lines, they can't conflict, they can't be installed at the same time. Submitted by: maintainer Sponsored by: Absolight --- sysutils/qjail/Makefile | 2 -- sysutils/qjail2/Makefile | 2 -- sysutils/qjail4/Makefile | 2 -- 3 files changed, 6 deletions(-) (limited to 'sysutils') diff --git a/sysutils/qjail/Makefile b/sysutils/qjail/Makefile index af9bdaefccd2..c131d619b959 100644 --- a/sysutils/qjail/Makefile +++ b/sysutils/qjail/Makefile @@ -24,8 +24,6 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail[24]-* - IGNORE_FreeBSD_9= Only for FreeBSD 11+ IGNORE_FreeBSD_10= Only for FreeBSD 11+ diff --git a/sysutils/qjail2/Makefile b/sysutils/qjail2/Makefile index 63365d8293b7..f3688cbd0f54 100644 --- a/sysutils/qjail2/Makefile +++ b/sysutils/qjail2/Makefile @@ -14,8 +14,6 @@ COMMENT= Utility to quickly deploy and manage jails USES= tar:bzip2 NO_BUILD= yes -CONFLICTS_INSTALL= qjail-* qjail4-* - IGNORE_FreeBSD_10= Only for FreeBSD 8 and 9 IGNORE_FreeBSD_11= Only for FreeBSD 8 and 9 IGNORE_FreeBSD_12= Only for FreeBSD 8 and 9 diff --git a/sysutils/qjail4/Makefile b/sysutils/qjail4/Makefile index 3899b997f843..ad00816ca1b4 100644 --- a/sysutils/qjail4/Makefile +++ b/sysutils/qjail4/Makefile @@ -25,8 +25,6 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail-* qjail2-* - IGNORE_FreeBSD_9= Only for FreeBSD 10.x IGNORE_FreeBSD_11= Only for FreeBSD 10.x IGNORE_FreeBSD_12= Only for FreeBSD 10.x -- cgit