svn commit: r421262 - head/devel/etcd

[Jimmy Olgeni]

Author: olgeni
Date: Fri Sep  2 10:19:05 2016
New Revision: 421262
URL: https://svnweb.freebsd.org/changeset/ports/421262

Log:
  Register conflict with devel/etcd3 in devel/etcd.

Modified:
  head/devel/etcd/Makefile

Modified: head/devel/etcd/Makefile
==============================================================================
--- head/devel/etcd/Makefile	Fri Sep  2 10:14:38 2016	(r421261)
+++ head/devel/etcd/Makefile	Fri Sep  2 10:19:05 2016	(r421262)
@@ -2,6 +2,7 @@
 
 PORTNAME=	etcd
 PORTVERSION=	2.3.7
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
-CONFLICTS_INSTALL=coreos-etcdctl-0.*
+CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd3-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos