diff options
| -rw-r--r-- | audio/etcd/Makefile | 2 | ||||
| -rw-r--r-- | devel/etcd/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/audio/etcd/Makefile b/audio/etcd/Makefile index d82bcab65ed5..508946dd0bda 100644 --- a/audio/etcd/Makefile +++ b/audio/etcd/Makefile @@ -12,6 +12,8 @@ MASTER_SITES= LOCAL/gahr \ MAINTAINER= ports@FreeBSD.org COMMENT= Enhanced Tiny CD, a simple ncurses-based CD player +CONFLICTS= coreos-etcd + USE_SDL= sdl MAKE_ARGS= INCDIR=${LOCALBASE}/include LIBDIR=${LOCALBASE}/lib \ diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index d678f4a9da38..56e15453fa51 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/go:${PORTSDIR}/lang/go -CONFLICTS= coreos-etcdctl-0.* +CONFLICTS= coreos-etcdctl-0.* etcd-* USE_GITHUB= yes GH_ACCOUNT= coreos |