From owner-svn-ports-all@FreeBSD.ORG  Fri Jul  5 16:21:50 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6116FEF5;
 Fri,  5 Jul 2013 16:21:50 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4A8351651;
 Fri,  5 Jul 2013 16:21:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65GLoXE092932;
 Fri, 5 Jul 2013 16:21:50 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65GLn4J092930;
 Fri, 5 Jul 2013 16:21:49 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201307051621.r65GLn4J092930@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 5 Jul 2013 16:21:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322339 - in head/sysutils: qjail qjail2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 16:21:50 -0000

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} \