svn commit: r406846 - head/devel/etcd

[Pietro Cerutti]

On 2016-01-21 12:02, Mathieu Arnold wrote:
> +--On 21 janvier 2016 11:00:16 +0000 Pietro Cerutti <gahr at FreeBSD.org>
> wrote:
> | Author: gahr
> | Date: Thu Jan 21 11:00:16 2016
> | New Revision: 406846
> | URL: https://svnweb.freebsd.org/changeset/ports/406846
> |
> | Log:
> |   devel/etcd: no need for glob in CONFLICTS
> |
> | Modified:
> |   head/devel/etcd/Makefile
> |
> | Modified: head/devel/etcd/Makefile
> | 
> =========================================================================
> | ===== --- head/devel/etcd/Makefile	Thu Jan 21 10:53:13 2016	(r406845)
> | +++ head/devel/etcd/Makefile	Thu Jan 21 11:00:16 2016	(r406846)
> | @@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> |
> |  BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
> |
> | -CONFLICTS=	coreos-etcdctl-0.* etcd-*
> | +CONFLICTS=	coreos-etcdctl-0.* etcd
> 
> Unless things have changed a lot, conflicts are matched against the 
> package
> name, which is foo-1.0, so, globs are needed.

Thanks for implying that I haven't tested that my CONFLICTS line. I did 
test it, and it works.

Thanks for wasting my time having me go and figure out how the actual 
check works. It uses pkg query -g. pkg query -g "%n-%v" etcd --> 
etcd-1.0.1_2

Next time you do that, ok?

-- 
Pietro Cerutti
gahr at FreeBSD.org