From nobody Sat Apr 6 14:52:28 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 4VBdcX4018z5GmRC; Sat, 6 Apr 2024 14:52:28 +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 4VBdcX2x70z4lsP; Sat, 6 Apr 2024 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712415148; 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=8+GT+m/bcX90Syh2YErpqtSUlngUuCv/kZ5Hxujiodo=; b=LqHgZZo95+nGwJoTHBjQiuecFuJEUj6mHhkpe9PjdjjxsOGKu+fZqWQPr4LRwR87s2vcR4 Lv8mH2gaTVol2rb/SHGpntdYJJ/HjR/KEA+81tYLSykLYwzG04dyxVYac+onjdLBrmtHgv QUQk2aWBBbhWfuV63y9/oCSffNfmPiuxhJ1iqzDKgrWpz8PBn3cDuy6RkydHflavF71vcI tmnTrUvJO534WQdn0MhV7hSaffJnH0lbSBD8K9RDroZobtAmeYymvWcXUz5cjcrsMzIGUV WAIHjpfmucbGKkTJFicgUHuSyDr1dblJjBR2tM+mYQKWewPk3/wDOSG+rQU0Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712415148; a=rsa-sha256; cv=none; b=ctRjjU/EJtPcjAVZZ56t3945ZVJLfX1FmGoCjVIhbZHxcHZG1TuwBsSoS+QjJGDjYo9IoF 10XyNQnnXULoJnIXUSkEK3BjhJ1OkFvUVPfbkHy/4ozTYY5SO15vC//D07/FZI7ZGB5L22 0pi77xaXF9gbnx+GCHts81+Xp8yoRQVDW/tMlYgkajtGileyJMmLJ8uvE8RqeqBjo7/gnr J7tfD8ZbSlBOKrThcGBn5F4KIaDFzukSQClYZhz8n8iYUhte2WyI2N0u3MA/otCvZ/Bf+V OA478JeOi3+csG02eIE8LxsUT2YZXrhzwZwhFsrHNRztaNVBQBck0cyKtBHIMQ== 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=1712415148; 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=8+GT+m/bcX90Syh2YErpqtSUlngUuCv/kZ5Hxujiodo=; b=LQXK7yasmULWBkAZ/Q3yAitVP2hE2wgQbGajuff2Ga7j4dzv3RVtwse0vaZ9vH9WCn5e7z LvpSjthYBlJMZP926jbDVmNJM34E1Uk+Ivb8vB8V/2/nBDbPBrhui8DQgDrH/QYsHNSKV0 TFPatCOfm45TF3QyuMsc8ZYv4uZ9h5ggtdPpgjR1/LlftNJAejBUC7hUizrcQ/2xrxH8+S W94T7ehRK81pds568yiOTyikIeMGGxBapZIooSqJ+5+OKjHnVfbyAvWn3gCA4Kjj6DicwM oWMgbERAWjnIHsT0ov7hNu/CROpYVi6ycN7NyOyjIXdVC+kSUZE3Tiw/RrqnxQ== 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 4VBdcX29xXzp6y; Sat, 6 Apr 2024 14:52:28 +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 436EqSfO085995; Sat, 6 Apr 2024 14:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436EqSX0085992; Sat, 6 Apr 2024 14:52:28 GMT (envelope-from git) Date: Sat, 6 Apr 2024 14:52:28 GMT Message-Id: <202404061452.436EqSX0085992@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 644ac4ea5634 - main - devel/R-cran-conflicted: New port: Alternative Conflict Resolution Strategy 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 644ac4ea563441e783df2f694c4f86f5179bfeb7 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=644ac4ea563441e783df2f694c4f86f5179bfeb7 commit 644ac4ea563441e783df2f694c4f86f5179bfeb7 Author: Einar Bjarni Halldórsson AuthorDate: 2024-04-05 11:14:17 +0000 Commit: Nuno Teixeira CommitDate: 2024-04-06 14:42:36 +0000 devel/R-cran-conflicted: New port: Alternative Conflict Resolution Strategy - Submitter becomes maintainer R's default conflict management system gives the most recently loaded package precedence. This can make it hard to detect conflicts, particularly when they arise because a package update creates ambiguity that did not previously exist. 'conflicted' takes a different approach, making every conflict an error and forcing you to choose which function to use. WWW: https://conflicted.r-lib.org/ Differential Revision: https://reviews.freebsd.org/D43735 --- devel/Makefile | 1 + devel/R-cran-conflicted/Makefile | 22 ++++++++++++++++++++++ devel/R-cran-conflicted/distinfo | 3 +++ devel/R-cran-conflicted/pkg-descr | 5 +++++ 4 files changed, 31 insertions(+) diff --git a/devel/Makefile b/devel/Makefile index 176877050e4f..f5d08c92bf84 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -33,6 +33,7 @@ SUBDIR += R-cran-clisymbols SUBDIR += R-cran-clock SUBDIR += R-cran-collapse + SUBDIR += R-cran-conflicted SUBDIR += R-cran-covr SUBDIR += R-cran-cpp11 SUBDIR += R-cran-crayon diff --git a/devel/R-cran-conflicted/Makefile b/devel/R-cran-conflicted/Makefile new file mode 100644 index 000000000000..96d724c6db46 --- /dev/null +++ b/devel/R-cran-conflicted/Makefile @@ -0,0 +1,22 @@ +PORTNAME= conflicted +DISTVERSION= 1.2.0 +CATEGORIES= devel +DISTNAME= ${PORTNAME}_${DISTVERSION} + +MAINTAINER= einar@isnic.is +COMMENT= Alternative Conflict Resolution Strategy +WWW= https://conflicted.r-lib.org/ + +LICENSE= MIT + +CRAN_DEPENDS= R-cran-cli>=3.4.0:devel/R-cran-cli \ + R-cran-memoise>0:devel/R-cran-memoise \ + R-cran-rlang>=1.0.0:devel/R-cran-rlang +BUILD_DEPENDS= ${CRAN_DEPENDS} +RUN_DEPENDS= ${CRAN_DEPENDS} +TEST_DEPENDS= R-cran-dplyr>0:math/R-cran-dplyr \ + R-cran-testthat>0:devel/R-cran-testthat + +USES= cran:auto-plist + +.include diff --git a/devel/R-cran-conflicted/distinfo b/devel/R-cran-conflicted/distinfo new file mode 100644 index 000000000000..aa95a605b56f --- /dev/null +++ b/devel/R-cran-conflicted/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1706912127 +SHA256 (conflicted_1.2.0.tar.gz) = c99b86bb52da3e7d1f4d96d70c77304d0434db5bd906edd8d743e89ac9223088 +SIZE (conflicted_1.2.0.tar.gz) = 17071 diff --git a/devel/R-cran-conflicted/pkg-descr b/devel/R-cran-conflicted/pkg-descr new file mode 100644 index 000000000000..356b6eab278c --- /dev/null +++ b/devel/R-cran-conflicted/pkg-descr @@ -0,0 +1,5 @@ +R's default conflict management system gives the most recently loaded package +precedence. This can make it hard to detect conflicts, particularly when they +arise because a package update creates ambiguity that did not previously exist. +'conflicted' takes a different approach, making every conflict an error and +forcing you to choose which function to use.