From owner-svn-ports-head@freebsd.org Thu Jan 21 11:02:36 2016 Return-Path: Delivered-To: svn-ports-head@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 BF607A8AFEE; Thu, 21 Jan 2016 11:02:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D98113D5; Thu, 21 Jan 2016 11:02:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 8AE9ABDC92; Thu, 21 Jan 2016 12:02:33 +0100 (CET) Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205]) by prod2.absolight.net (Postfix) with ESMTPA id 53F91BDC89; Thu, 21 Jan 2016 12:02:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by atuin.in.mat.cc (Postfix) with ESMTP id 0DDAA50F2179; Thu, 21 Jan 2016 12:02:33 +0100 (CET) Date: Thu, 21 Jan 2016 12:02:32 +0100 From: Mathieu Arnold To: Pietro Cerutti , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r406846 - head/devel/etcd Message-ID: In-Reply-To: <201601211100.u0LB0GVv078803@repo.freebsd.org> References: <201601211100.u0LB0GVv078803@repo.freebsd.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="==========4CA6624CAE26E58BDB1E==========" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2016 11:02:36 -0000 --==========4CA6624CAE26E58BDB1E========== Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline +--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. Also, unless this can't be built when the other is installed, it should be a CONFLICTS_INSTALL. -- Mathieu Arnold --==========4CA6624CAE26E58BDB1E========== Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ8BAEBCgBmBQJWoLrIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IshsP+wYtYnA9mEIfjS9OSzSoRbbm KuZsafz8yP6Cyoi7WZlMB7L4AtoGmTiQsAZyTH/uwDusJUZLv/UbvJouFWDG0myF UZ99EjNKtgRX0WDxYX8TE+OqCmAEUirYaAVBEzucokKTOWNC7OSZbG+nQrXBapSr vgd9aSK3h0SZomqFZPARF8fN5tmyjwGewpVYHbdk2hQVvQc+zc+5FmBohWcoXchx QLgmqOjrtdcJGBzzYrSOyOw2mMSRc6EAgzG1skFJf/s/S+czw+GNraBWksceyuXD HD095MfYncahDEf7KV7ypiT7P3cvFG9hfgvyTtV9OES2mTfaTaChBXdOhLPCmH+4 NKevQ04WNHZLzcCiXEfptLvAIO+aYTGoEJntHlwxaPKw1Rd8Am3xCAX8HNVjfSlq Io3j6ZJHWnKdJY5aQrb8fLVabO6ur6+l38f9Uv2zTatLOSgFcWCH2Wc1zbVoG3+i 4YbpV1KwBMphJR1lYWLqYD7mz2elK/lzboRHVR40T3qXnsfrW0g/JEVDjhR4V5Zu Fstpczpj/HMIDrBShFkkAPDxssY0Rtz6nrTGJ9jgZSWSca+jO0azjwVXyYjxwnBo 6JsQyBxYeszVxlCRAB13Hq7dWKFhStTX7wmkHf1x/pv0HoQyk5irYY+tt0DjCHAb Tu6/LpYoXzX9CRiMz4b9 =Jz09 -----END PGP SIGNATURE----- --==========4CA6624CAE26E58BDB1E==========--