Index: head/sysutils/qjail2/Makefile
===================================================================
--- head/sysutils/qjail2/Makefile	(revision 421078)
+++ head/sysutils/qjail2/Makefile	(revision 421079)
@@ -1,48 +1,48 @@
 # Created by: Joe Barbish
 # $FreeBSD$
 
 PORTNAME=	qjail
 PORTVERSION=	2.2
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 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
 IGNORE_FreeBSD_12=	Only for FreeBSD 8 and 9
 
 do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/qjail		\
 		${STAGEDIR}${PREFIX}/bin
 
 .for i in qjail2 qjail-jail2
 	${INSTALL_SCRIPT} ${WRKSRC}/${i}		\
 		${STAGEDIR}${PREFIX}/etc/rc.d
 .endfor
 
 .for i in qjail.conf.sample qjail.portsnap.conf
 	${INSTALL_DATA}   ${WRKSRC}/${i}		\
 		${STAGEDIR}${PREFIX}/etc
 .endfor
 
 .for i in qjail qjail-intro qjail.conf qjail-howto
 	${INSTALL_MAN}    ${WRKSRC}/${i}.8		\
 		${STAGEDIR}${MAN8PREFIX}/man/man8
 .endfor
 
 # note examples are mandatory. qjail will not function without them
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/			\
 	&& ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/sysutils/qjail4/Makefile
===================================================================
--- head/sysutils/qjail4/Makefile	(revision 421078)
+++ head/sysutils/qjail4/Makefile	(revision 421079)
@@ -1,51 +1,51 @@
 # Created by: Joe Barbish
 # $FreeBSD$
 
 PORTNAME=	qjail
 PORTVERSION=	4.9
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
 PKGNAMESUFFIX=  4
 
 MAINTAINER=	qjail1@a1poweruser.com
 COMMENT=	Utility to quickly deploy and manage jails
 
 LICENSE=	BERNE-CONVENTION
 LICENSE_NAME=	Berne Convention
 LICENSE_TEXT=	As per the international "Berne Convention" this work is \
 		protected and all rights reserved. \
 		Before qjail may be forked, written permission must be \
 		obtained from the author <qjail1@a1poweruser.com>. \
 		This work is provided 'AS IS' and you use it at your own risk. \
 		Redistribution and use is permitted providing this license \
 		notice is retained.
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 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
 IGNORE_FreeBSD_12=	Only for FreeBSD 10.x
 
 do-install:
 .for i in qjail qjail.vnet.be qjail.vnet.ng
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/qjail.bootime              \
 		${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_DATA}   ${WRKSRC}/qjail.portsnap.conf        \
 		${STAGEDIR}${PREFIX}/etc/qjail.portsnap.conf.sample
 .for i in qjail qjail-intro qjail-howto
 	${INSTALL_MAN}   ${WRKSRC}/${i}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 .endfor
 
 # note examples are mandatory. qjail will not function without them
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ \
 	    && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>