svn commit: r421079 - in head/sysutils: qjail2 qjail4

[Mathieu Arnold]

Author: mat
Date: Mon Aug 29 15:59:25 2016
New Revision: 421079
URL: https://svnweb.freebsd.org/changeset/ports/421079

Log:
  Fixup CONFLICTS_INSTALL.
  
  Sponsored by:	Absolight

Modified:
  head/sysutils/qjail2/Makefile   (contents, props changed)
  head/sysutils/qjail4/Makefile   (contents, props changed)

Modified: head/sysutils/qjail2/Makefile
==============================================================================
--- head/sysutils/qjail2/Makefile	Mon Aug 29 15:55:07 2016	(r421078)
+++ head/sysutils/qjail2/Makefile	Mon Aug 29 15:59:25 2016	(r421079)
@@ -14,7 +14,7 @@ COMMENT=	Utility to quickly deploy and m
 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

Modified: head/sysutils/qjail4/Makefile
==============================================================================
--- head/sysutils/qjail4/Makefile	Mon Aug 29 15:55:07 2016	(r421078)
+++ head/sysutils/qjail4/Makefile	Mon Aug 29 15:59:25 2016	(r421079)
@@ -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