svn commit: r322339 - in head/sysutils: qjail qjail2

[Pawel Pekala]

Author: pawel
Date: Fri Jul  5 16:21:49 2013
New Revision: 322339
URL: http://svnweb.freebsd.org/changeset/ports/322339

Log:
  Register install conflicts with version 1.x
  
  Submitted by:	maintainer via private email

Modified:
  head/sysutils/qjail/Makefile
  head/sysutils/qjail2/Makefile

Modified: head/sysutils/qjail/Makefile
==============================================================================
--- head/sysutils/qjail/Makefile	Fri Jul  5 15:37:00 2013	(r322338)
+++ head/sysutils/qjail/Makefile	Fri Jul  5 16:21:49 2013	(r322339)
@@ -14,7 +14,7 @@ NO_BUILD=	yes
 
 MAN8=		qjail.8 qjail-intro.8 qjail-howto.8
 
-CONFLICTS_INSTALL=	qjail-2.*
+CONFLICTS_INSTALL=	qjail-1.* qjail-2.*
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \

Modified: head/sysutils/qjail2/Makefile
==============================================================================
--- head/sysutils/qjail2/Makefile	Fri Jul  5 15:37:00 2013	(r322338)
+++ head/sysutils/qjail2/Makefile	Fri Jul  5 16:21:49 2013	(r322339)
@@ -15,7 +15,7 @@ LATEST_LINK=	${PORTNAME}2
 
 MAN8=		qjail.8 qjail-intro.8 qjail.conf.8 qjail-howto.8
 
-CONFLICTS_INSTALL=	qjail-3.*
+CONFLICTS_INSTALL=	qjail-1.* qjail-3.*
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \