Index: head/audio/etcd/Makefile
===================================================================
--- head/audio/etcd/Makefile	(revision 406856)
+++ head/audio/etcd/Makefile	(revision 406857)
@@ -1,27 +1,27 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	1.0.1
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/gahr \
 		http://people.freebsd.org/~gahr/distfiles/ \
 		http://www.gahr.ch/etcd/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced Tiny CD, a simple ncurses-based CD player
 
-CONFLICTS=	coreos-etcd
+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
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/etcd ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/devel/etcd/Makefile
===================================================================
--- head/devel/etcd/Makefile	(revision 406856)
+++ head/devel/etcd/Makefile	(revision 406857)
@@ -1,40 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	2.2.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
-CONFLICTS=	coreos-etcdctl-0.* etcd
+CONFLICTS_INSTALL=coreos-etcdctl-0.* etcd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
 do-build:
 	cd ${WRKSRC}; ${SH} build
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcd ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcdctl ${STAGEDIR}${PREFIX}/bin/
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>