From owner-svn-ports-all@freebsd.org Thu Jan 21 11:36:07 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9158EA8BDFE; Thu, 21 Jan 2016 11:36:07 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from mail.ptrcrt.ch (gahr.cloud.tilaa.com [84.22.109.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F90E124D; Thu, 21 Jan 2016 11:36:04 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from webmail.ptrcrt.ch (www.gahr.ch [192.168.1.2]) by mail.ptrcrt.ch (OpenSMTPD) with ESMTPSA id a570cedf TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO; Thu, 21 Jan 2016 11:35:59 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 21 Jan 2016 12:35:59 +0100 From: Pietro Cerutti To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, owner-ports-committers@freebsd.org Subject: Re: svn commit: r406846 - head/devel/etcd Organization: The FreeBSD Project In-Reply-To: References: <201601211100.u0LB0GVv078803@repo.freebsd.org> Message-ID: X-Sender: gahr@FreeBSD.org User-Agent: Roundcube Webmail/1.1.4 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2016 11:36:07 -0000 On 2016-01-21 12:02, Mathieu Arnold wrote: > +--On 21 janvier 2016 11:00:16 +0000 Pietro Cerutti > 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@FreeBSD.org