From 610be7430a62328a4329ed9f4049b9580d9352d3 Mon Sep 17 00:00:00 2001 From: olgeni Date: Fri, 7 Jul 2017 13:29:39 +0000 Subject: Update CONFLICTS_INSTALL for etcd ports. --- devel/etcd/Makefile | 2 +- devel/etcd31/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'devel') diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index a0b7d773c3ef..269baf9aee1f 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -13,7 +13,7 @@ COMMENT= Highly-available key value store and service discovery LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd3-* +CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd31-* coreos-etcd32-* PORTSCOUT= limit:^2.* diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile index 6e228f9fecbc..304265f3baf7 100644 --- a/devel/etcd31/Makefile +++ b/devel/etcd31/Makefile @@ -13,7 +13,7 @@ COMMENT= Highly-available key value store and service discovery LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* +CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd32-* USES= go GO_PKGNAME= github.com/coreos/etcd -- cgit