aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorolgeni <olgeni@FreeBSD.org>2017-07-07 21:29:39 +0800
committerolgeni <olgeni@FreeBSD.org>2017-07-07 21:29:39 +0800
commit610be7430a62328a4329ed9f4049b9580d9352d3 (patch)
tree076fc93610afd80d6213ac8a65e78e1ccede8d52 /devel
parentec8a5bf53f9357873b674d3da312d659b14a907d (diff)
downloadfreebsd-ports-gnome-610be7430a62328a4329ed9f4049b9580d9352d3.tar.gz
freebsd-ports-gnome-610be7430a62328a4329ed9f4049b9580d9352d3.tar.zst
freebsd-ports-gnome-610be7430a62328a4329ed9f4049b9580d9352d3.zip
Update CONFLICTS_INSTALL for etcd ports.
Diffstat (limited to 'devel')
-rw-r--r--devel/etcd/Makefile2
-rw-r--r--devel/etcd31/Makefile2
2 files changed, 2 insertions, 2 deletions
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