From nobody Wed Mar 20 03:03:08 2024 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 4Tztgw4Fxzz5DlDJ; Wed, 20 Mar 2024 03:03:08 +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 4Tztgw2sX3z4lBl; Wed, 20 Mar 2024 03:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710903788; 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=h+mLKi3MLldb1oaDzdJQJFdtUxCqKUE/K0ysxO0OvFM=; b=oG3FBoCi4l8mmDcLT8FR46CNyV93TYkMS4ezlDTDAlah6COmtwyNxXulAogVwd8adEedca 2InZrTemiKp3YmFRL/8nawJkrOqxLMvEg1pvV67gCo9wHxxKs2LhBRkeiPaHhXjTDQOP3P +dRi9zVBZ7ntdTxhEVZcF2da7s8HQdilwwjKaWBORqYe8N0lMuwgSFexE6CU0d/E7/Zfs1 gzWzivtI7ifo2NwK4+9INk/cC4ijmhqEUae9OWwkzveztuiWnj0sJk17eEAUdTKhGS2qSe lPlb46ZkU5hD73H3ESHwAEox+wKqYNBxuZr60kD1O8Oi9wsX1jsX7WKrpI8QaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710903788; a=rsa-sha256; cv=none; b=J3fx0vuVAOVbH5Ya3larYTO4B+MGLRsmXMTSDz2ZBspalgF0FToAxZrvuxHluFMe3IlpOl OnMA94a/evfni+YWbt4/yTsowXoQ1OOcu3+znupvJceG2r3pqVb5REkS28qUxevgJ+bbs+ nFZfCEMfXyG2S1ebzLnQ2QX5d92jD0y9qnY+C43RhE5b/0ULSDCu2aEMJNZk/4jIn+RduN qCgLrMNNZGeRg4T7nIxXpXLAUcwYY4JxlJwE8jQlbzwtJEXdA8EpSop18amKr4pUNzdq9D 4iWcANTj9JjrIJoDh+UAcXXEnjz9TK76x8aPqW3pcD6nFRKt8ffpe25ywzo/sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710903788; 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=h+mLKi3MLldb1oaDzdJQJFdtUxCqKUE/K0ysxO0OvFM=; b=yYjgFJewrhWWptUq5T6uk1vNp/1Op1fdY3krNWMy1Zc9P7Z2UHDpi3hoXofxFL329LW31I dgsIDJwFM0vyHqOqQYCPcr09IPGHOZFG+9wNiNyo2oWFS3Qrh86J7HBAkfpDb9lu5XSYB6 yuPmKELcvOvVO3bj3sxZSN8JYoI0e6NO49w08xx0jFllaGmLZQjSgUC8BPsjLS7QkWTGgf j5SxwTlPDS5IlWFbBab2WPhc6L66Vwhoh2JPsiFyt/+QIyullLKoOo0RaY/vHeInIDbQuH QYfU7VLg1riCXJ4ya1qBjY2PC1Ro3akcm7Sb1hDdrtKSpO1+jYm83ll72eUCJQ== 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 4Tztgw2TJGzZlQ; Wed, 20 Mar 2024 03:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42K338JQ070974; Wed, 20 Mar 2024 03:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K338ev070970; Wed, 20 Mar 2024 03:03:08 GMT (envelope-from git) Date: Wed, 20 Mar 2024 03:03:08 GMT Message-Id: <202403200303.42K338ev070970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: b4dedc91e8a0 - main - net/rdist6: Register conflict with the new net/rdist7 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4dedc91e8a04fffdd486ec53158b811105cffe1 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4dedc91e8a04fffdd486ec53158b811105cffe1 commit b4dedc91e8a04fffdd486ec53158b811105cffe1 Author: Cy Schubert AuthorDate: 2024-03-20 03:01:59 +0000 Commit: Cy Schubert CommitDate: 2024-03-20 03:02:33 +0000 net/rdist6: Register conflict with the new net/rdist7 --- net/rdist6/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index d93c11f7e69a..77d4343a6eac 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -11,6 +11,8 @@ WWW= https://www.magnicomp.com/ LICENSE= BSD4CLAUSE +CONFLICTS= rdist7 + MAKE_JOBS_UNSAFE= yes # Years ago base FreeBSD maintained /usr/bin/rdist, but since then it was