Date: Thu, 21 Jan 2016 10:47:25 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406844 - in head: audio/etcd devel/etcd Message-ID: <201601211047.u0LAlP66075511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Jan 21 10:47:25 2016 New Revision: 406844 URL: https://svnweb.freebsd.org/changeset/ports/406844 Log: audio/etcd, devel/etcd: mutual CONFLICT because of bin/etcd Modified: head/audio/etcd/Makefile head/devel/etcd/Makefile Modified: head/audio/etcd/Makefile ============================================================================== --- head/audio/etcd/Makefile Thu Jan 21 10:45:01 2016 (r406843) +++ head/audio/etcd/Makefile Thu Jan 21 10:47:25 2016 (r406844) @@ -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 \ Modified: head/devel/etcd/Makefile ============================================================================== --- head/devel/etcd/Makefile Thu Jan 21 10:45:01 2016 (r406843) +++ head/devel/etcd/Makefile Thu Jan 21 10:47:25 2016 (r406844) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601211047.u0LAlP66075511>