From owner-svn-ports-all@freebsd.org  Wed Feb 10 10:21:21 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 753D8AA42B9;
 Wed, 10 Feb 2016 10:21:21 +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 42F0A1A1C;
 Wed, 10 Feb 2016 10:21:21 +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 u1AALKe4098697;
 Wed, 10 Feb 2016 10:21:20 GMT (envelope-from gahr@FreeBSD.org)
Received: (from gahr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1AALK6b098695;
 Wed, 10 Feb 2016 10:21:20 GMT (envelope-from gahr@FreeBSD.org)
Message-Id: <201602101021.u1AALK6b098695@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: Wed, 10 Feb 2016 10:21:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408621 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2016 10:21:21 -0000

Author: gahr
Date: Wed Feb 10 10:21:19 2016
New Revision: 408621
URL: https://svnweb.freebsd.org/changeset/ports/408621

Log:
  audio/etcd: rename bin/etcd to bin/e-tcd, remove conflict with devel/etcd

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

Modified: head/audio/etcd/Makefile
==============================================================================
--- head/audio/etcd/Makefile	Wed Feb 10 09:40:48 2016	(r408620)
+++ head/audio/etcd/Makefile	Wed Feb 10 10:21:19 2016	(r408621)
@@ -3,7 +3,7 @@
 
 PORTNAME=	etcd
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/gahr \
 		http://people.freebsd.org/~gahr/distfiles/ \
@@ -12,16 +12,14 @@ MASTER_SITES=	LOCAL/gahr \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced Tiny CD, a simple ncurses-based CD player
 
-CONFLICTS_INSTALL=coreos-etcd
-
 USE_SDL=	sdl
 
 MAKE_ARGS=	INCDIR=${LOCALBASE}/include LIBDIR=${LOCALBASE}/lib \
 		SDL_LIBS="-lSDL -pthread" NCURSES_LIBS="-lncursesw"
 
-PLIST_FILES=	bin/etcd
+PLIST_FILES=	bin/e-tcd
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/etcd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/etcd ${STAGEDIR}${PREFIX}/bin/e-tcd
 
 .include <bsd.port.mk>

Modified: head/devel/etcd/Makefile
==============================================================================
--- head/devel/etcd/Makefile	Wed Feb 10 09:40:48 2016	(r408620)
+++ head/devel/etcd/Makefile	Wed Feb 10 10:21:19 2016	(r408621)
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
-CONFLICTS_INSTALL=coreos-etcdctl-0.* etcd
+CONFLICTS_INSTALL=coreos-etcdctl-0.*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos