From owner-svn-ports-head@freebsd.org  Thu Jan 21 10:47:27 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 36264A8A7AA;
 Thu, 21 Jan 2016 10:47:27 +0000 (UTC)
 (envelope-from gahr@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 05C451888;
 Thu, 21 Jan 2016 10:47:26 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LAlQVe075513;
 Thu, 21 Jan 2016 10:47:26 GMT (envelope-from gahr@FreeBSD.org)
Received: (from gahr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LAlP66075511;
 Thu, 21 Jan 2016 10:47:25 GMT (envelope-from gahr@FreeBSD.org)
Message-Id: <201601211047.u0LAlP66075511@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gahr set sender to
 gahr@FreeBSD.org using -f
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 21 Jan 2016 10:47:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r406844 - in head: audio/etcd devel/etcd
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.20
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, 21 Jan 2016 10:47:27 -0000

Author: gahr
Date: Thu Jan 21 10:47:25 2016
New Revision: 406844
URL: https://svnweb.freebsd.org/changeset/ports/406844

Log:
  audio/etcd, devel/etcd: mutual CONFLICT because of bin/etcd

Modified:
  head/audio/etcd/Makefile
  head/devel/etcd/Makefile

Modified: head/audio/etcd/Makefile
==============================================================================
--- head/audio/etcd/Makefile	Thu Jan 21 10:45:01 2016	(r406843)
+++ head/audio/etcd/Makefile	Thu Jan 21 10:47:25 2016	(r406844)
@@ -12,6 +12,8 @@ MASTER_SITES=	LOCAL/gahr \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced Tiny CD, a simple ncurses-based CD player
 
+CONFLICTS=	coreos-etcd
+
 USE_SDL=	sdl
 
 MAKE_ARGS=	INCDIR=${LOCALBASE}/include LIBDIR=${LOCALBASE}/lib \

Modified: head/devel/etcd/Makefile
==============================================================================
--- head/devel/etcd/Makefile	Thu Jan 21 10:45:01 2016	(r406843)
+++ head/devel/etcd/Makefile	Thu Jan 21 10:47:25 2016	(r406844)
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
-CONFLICTS=	coreos-etcdctl-0.*
+CONFLICTS=	coreos-etcdctl-0.* etcd-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos