From nobody Sat Nov 27 19:08:13 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CCFD018C7DEF; Sat, 27 Nov 2021 19:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J1h313f7wz4nxR; Sat, 27 Nov 2021 19:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F24220FF0; Sat, 27 Nov 2021 19:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ARJ8DZZ096230; Sat, 27 Nov 2021 19:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ARJ8Ddk096229; Sat, 27 Nov 2021 19:08:13 GMT (envelope-from git) Date: Sat, 27 Nov 2021 19:08:13 GMT Message-Id: <202111271908.1ARJ8Ddk096229@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1867c6e684f9 - main - */yj*: Add CONFLICTS_INSTALL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1867c6e684f9012e5806b6a71d068045e94407de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638040093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWK/DLVX5WIljzurs5s/yUy1kEyAxNF0Zm6VOvwi6wk=; b=lEmvGFrgMgfYN4Ja4365UamM0v/+rnfIVvyj+fVdzti3XkCPPB50BrsEt1KrrdEva2uAVq nMaYIBeEMwmRaBhPvvDMU7oV6l1ic5y/rpm7zT+LfbIhrP6GDigeSKK6YMBXHmgjPpT/Cp vWrdOgU52CsAB7+5S5cNow7LGvSqPEnisM74snYh/9avziXGLjcBLJiORVXyjNMPMHZAN2 TrH7UfgxgFpLH5hTdFwpvz1LPmeziusDy/3SxGPIoLkvGuI4A+Ga6BRrW5iXLkPLc2W+yA 2hTUmgERCvQv3m8V7TysaE0bb6F327PT51sGmH0UDLdLcLIwf+i7mqBFNMlMTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638040093; a=rsa-sha256; cv=none; b=DjqJSIzOliuS9bZih+sr9C7m8kZ+9k3dPkfaW419fxV9MXNWgNkmVZ+CqC6e08tjr2Rjo/ LxunsLtLlX02eHX648iKctmiAa51XFZoQEVi+vUQnDLwlj0Ph8ZQ8rZ36cRMrt8+IlSx8j DXcdFT18GYN1NX4hd4m5fd87c/wn07a2irHEtsDIZAa5LvQIxeoiNpJCjYXdfiCBSp8p1E Wh4FoOkUBISO6P9fFFWlvFtoFTbe9jEY706CBdVQYUlMK8HQIcM0UD8DXyfNXTgoJ1CRD/ 8RiLwydTVwgN68lXRup/HIZeyPA/GRYVHcYIiSBQ+tRRzRZ0s0JPgNYaSQ5mWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=1867c6e684f9012e5806b6a71d068045e94407de commit 1867c6e684f9012e5806b6a71d068045e94407de Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-11-27 19:01:19 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-11-27 19:08:05 +0000 */yj*: Add CONFLICTS_INSTALL Approved by: portmgr (blanket) --- converters/yj-bruceadams/Makefile | 2 ++ converters/yj/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/converters/yj-bruceadams/Makefile b/converters/yj-bruceadams/Makefile index 7cd263e66a63..c1aeea723ae5 100644 --- a/converters/yj-bruceadams/Makefile +++ b/converters/yj-bruceadams/Makefile @@ -68,6 +68,8 @@ CARGO_CRATES= addr2line-0.16.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ yaml-rust-0.4.5 +CONFLICTS_INSTALL= yj-[0-9]*.[0-9]* + PLIST_FILES= bin/yj post-install: diff --git a/converters/yj/Makefile b/converters/yj/Makefile index e733d9155080..e326f0966ec5 100644 --- a/converters/yj/Makefile +++ b/converters/yj/Makefile @@ -15,6 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= sclevine +CONFLICTS_INSTALL= yj-bruceadams + PLIST_FILES= bin/yj GH_TUPLE= go-yaml:yaml:eeeca48fe776:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \