From owner-svn-ports-head@freebsd.org Mon Apr 23 14:59:54 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84B72FA3321; Mon, 23 Apr 2018 14:59:54 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 295CB70EED; Mon, 23 Apr 2018 14:59:54 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2340925B69; Mon, 23 Apr 2018 14:59:54 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3NExrrc035436; Mon, 23 Apr 2018 14:59:53 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3NExrBQ035433; Mon, 23 Apr 2018 14:59:53 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201804231459.w3NExrBQ035433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Mon, 23 Apr 2018 14:59:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468094 - in head/devel: etcd etcd31 etcd32 X-SVN-Group: ports-head X-SVN-Commit-Author: olgeni X-SVN-Commit-Paths: in head/devel: etcd etcd31 etcd32 X-SVN-Commit-Revision: 468094 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 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: Mon, 23 Apr 2018 14:59:54 -0000 Author: olgeni Date: Mon Apr 23 14:59:53 2018 New Revision: 468094 URL: https://svnweb.freebsd.org/changeset/ports/468094 Log: Actually document conflicts with devel/etcd33 in devel/etcd, etcd31, and etcd32 (r468093). Modified: head/devel/etcd/Makefile head/devel/etcd31/Makefile head/devel/etcd32/Makefile Modified: head/devel/etcd/Makefile ============================================================================== --- head/devel/etcd/Makefile Mon Apr 23 14:58:02 2018 (r468093) +++ head/devel/etcd/Makefile Mon Apr 23 14:59:53 2018 (r468094) @@ -13,7 +13,7 @@ COMMENT= Highly-available key value store and service LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd31-* coreos-etcd32-* +CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd31-* coreos-etcd32-* coreos-etcd33-* PORTSCOUT= limit:^2.* Modified: head/devel/etcd31/Makefile ============================================================================== --- head/devel/etcd31/Makefile Mon Apr 23 14:58:02 2018 (r468093) +++ head/devel/etcd31/Makefile Mon Apr 23 14:59:53 2018 (r468094) @@ -13,7 +13,7 @@ COMMENT= Highly-available key value store and service LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd32-* +CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd32-* coreos-etcd33-* USES= go GO_PKGNAME= github.com/coreos/etcd Modified: head/devel/etcd32/Makefile ============================================================================== --- head/devel/etcd32/Makefile Mon Apr 23 14:58:02 2018 (r468093) +++ head/devel/etcd32/Makefile Mon Apr 23 14:59:53 2018 (r468094) @@ -13,7 +13,7 @@ COMMENT= Highly-available key value store and service LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-* +CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-* coreos-etcd33-* USES= go GO_PKGNAME= github.com/coreos/etcd