diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-08-29 15:59:25 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-08-29 15:59:25 +0000 |
| commit | 076e51bb5bd3d73d6b47070ed5c9e6fda4b4af2f (patch) | |
| tree | b6c05c336c5864db5ec81defeb756feeac82cd06 | |
| parent | Update to 4.12.22 (diff) | |
Fixup CONFLICTS_INSTALL.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=421079
| -rw-r--r-- | sysutils/qjail2/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/qjail4/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysutils/qjail2/Makefile b/sysutils/qjail2/Makefile index 27520b485f96..05c9873cb11e 100644 --- a/sysutils/qjail2/Makefile +++ b/sysutils/qjail2/Makefile @@ -14,7 +14,7 @@ COMMENT= Utility to quickly deploy and manage jails USES= tar:bzip2 NO_BUILD= yes -CONFLICTS_INSTALL= qjail-* +CONFLICTS_INSTALL= qjail-* qjail4-* IGNORE_FreeBSD_10= Only for FreeBSD 8 and 9 IGNORE_FreeBSD_11= Only for FreeBSD 8 and 9 diff --git a/sysutils/qjail4/Makefile b/sysutils/qjail4/Makefile index ed5ad74ab60a..3899b997f843 100644 --- a/sysutils/qjail4/Makefile +++ b/sysutils/qjail4/Makefile @@ -25,7 +25,7 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail-* +CONFLICTS_INSTALL= qjail-* qjail2-* IGNORE_FreeBSD_9= Only for FreeBSD 10.x IGNORE_FreeBSD_11= Only for FreeBSD 10.x |