From owner-svn-ports-head@freebsd.org  Thu Sep  8 23:54:13 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E775BD2C3C;
 Thu,  8 Sep 2016 23:54:13 +0000 (UTC) (envelope-from cpm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4143920D;
 Thu,  8 Sep 2016 23:54:13 +0000 (UTC) (envelope-from cpm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88NsCvm089698;
 Thu, 8 Sep 2016 23:54:12 GMT (envelope-from cpm@FreeBSD.org)
Received: (from cpm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88NsCRC089697;
 Thu, 8 Sep 2016 23:54:12 GMT (envelope-from cpm@FreeBSD.org)
Message-Id: <201609082354.u88NsCRC089697@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org
 using -f
From: "Carlos J. Puga Medina" <cpm@FreeBSD.org>
Date: Thu, 8 Sep 2016 23:54:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421594 - head/net/grive
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Sep 2016 23:54:13 -0000

Author: cpm
Date: Thu Sep  8 23:54:12 2016
New Revision: 421594
URL: https://svnweb.freebsd.org/changeset/ports/421594

Log:
  - Register CONFLICTS between grive and grive2
  
  Submitted by:	cpm
  Reviewed by:	amdmi3, feld (mentors)
  Approved by:	amdmi3, feld (mentors)
  Differential Revision:	D7675

Modified:
  head/net/grive/Makefile

Modified: head/net/grive/Makefile
==============================================================================
--- head/net/grive/Makefile	Thu Sep  8 23:51:57 2016	(r421593)
+++ head/net/grive/Makefile	Thu Sep  8 23:54:12 2016	(r421594)
@@ -20,6 +20,8 @@ LIB_DEPENDS=	libboost_filesystem.so:deve
 		libjson-c.so:devel/json-c \
 		libyajl.so:devel/yajl
 
+CONFLICTS_INSTALL=	grive2-[0-9]*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Grive
 GH_TAGNAME=	27817e8