svn commit: r408621 - in head: audio/etcd devel/etcd

[Pietro Cerutti]

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 at 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