svn commit: r406846 - head/devel/etcd

[Mathieu Arnold]

+--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.

Also, unless this can't be built when the other is installed, it should be
a CONFLICTS_INSTALL.

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20160121/ec463f3a/attachment.sig>