git: 644ac4ea5634 - main - devel/R-cran-conflicted: New port: Alternative Conflict Resolution Strategy

The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=644ac4ea563441e783df2f694c4f86f5179bfeb7

commit 644ac4ea563441e783df2f694c4f86f5179bfeb7
Author:     Einar Bjarni Halldórsson <einar@isnic.is>
AuthorDate: 2024-04-05 11:14:17 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
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 <bsd.port.mk>
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.