From owner-svn-ports-head@FreeBSD.ORG  Tue Sep  3 18:51:58 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F3AF1D7E;
 Tue,  3 Sep 2013 18:51:57 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E102A2EC7;
 Tue,  3 Sep 2013 18:51:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r83Ipv8a038680;
 Tue, 3 Sep 2013 18:51:57 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r83IpvB4038679;
 Tue, 3 Sep 2013 18:51:57 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201309031851.r83IpvB4038679@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Tue, 3 Sep 2013 18:51:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326199 - head/sysutils/qjail
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Sep 2013 18:51:58 -0000

Author: pawel
Date: Tue Sep  3 18:51:57 2013
New Revision: 326199
URL: http://svnweb.freebsd.org/changeset/ports/326199

Log:
  Re-add mistakenly removed CONFLICTS_INSTALL line

Modified:
  head/sysutils/qjail/Makefile

Modified: head/sysutils/qjail/Makefile
==============================================================================
--- head/sysutils/qjail/Makefile	Tue Sep  3 18:43:02 2013	(r326198)
+++ head/sysutils/qjail/Makefile	Tue Sep  3 18:51:57 2013	(r326199)
@@ -15,6 +15,8 @@ SUB_FILES=	pkg-message
 
 MAN8=		qjail.8 qjail-intro.8 qjail-howto.8
 
+CONFLICTS_INSTALL=	qjail-2.*
+
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|'