From owner-svn-ports-head@FreeBSD.ORG  Wed Dec 11 03:56:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 89F319C8;
 Wed, 11 Dec 2013 03:56:10 +0000 (UTC)
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 76A3C1F6D;
 Wed, 11 Dec 2013 03:56:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBB3uABJ070785;
 Wed, 11 Dec 2013 03:56:10 GMT
 (envelope-from tabthorpe@svn.freebsd.org)
Received: (from tabthorpe@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBB3uAHK070784;
 Wed, 11 Dec 2013 03:56:10 GMT
 (envelope-from tabthorpe@svn.freebsd.org)
Message-Id: <201312110356.rBB3uAHK070784@svn.freebsd.org>
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Wed, 11 Dec 2013 03:56:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336140 - head/misc/sword
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.17
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: Wed, 11 Dec 2013 03:56:10 -0000

Author: tabthorpe
Date: Wed Dec 11 03:56:09 2013
New Revision: 336140
URL: http://svnweb.freebsd.org/changeset/ports/336140

Log:
  - Add CONFLICTS for the soon to be added misc/sword17

Modified:
  head/misc/sword/Makefile

Modified: head/misc/sword/Makefile
==============================================================================
--- head/misc/sword/Makefile	Wed Dec 11 03:50:13 2013	(r336139)
+++ head/misc/sword/Makefile	Wed Dec 11 03:56:09 2013	(r336140)
@@ -14,6 +14,8 @@ COMMENT=	Framework for manipulating Bibl
 
 LICENSE=	GPLv2
 
+CONFLICTS=	sword-1.7.*
+
 BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
 
 USES=		gmake pkgconfig