From b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Thu, 27 Nov 2025 19:07:15 +0100
Subject: [PATCH] git-arc: Don't require devel/arcanist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of invoking just “arc”, which requires devel/arcanist, which
conflicts with archivers/arc, invoke the underlying script installed by
devel/arcanist-lib.

Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D53942
---
 tools/tools/git/git-arc.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
index fa618cdcbc2..f33a7333479 100644
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -171,6 +171,20 @@ get_bool_config()
     test "$(git config --bool --get $1 2>/dev/null || echo $2)" != "false"
 }
 
+#
+# Invoke the actual arc command.  This allows us to only rely on the
+# devel/arcanist-lib port, which installs the actual script, rather than
+# the devel/arcanist-port, which installs a symlink in ${LOCALBASE}/bin
+# but conflicts with the archivers/arc port.
+#
+: ${LOCALBASE:=$(sysctl -n user.localbase)}
+: ${LOCALBASE:=/usr/local}
+: ${ARC_CMD:=${LOCALBASE}/lib/php/arcanist/bin/arc}
+arc()
+{
+    ${ARC_CMD} "$@"
+}
+
 #
 # Filter the output of call-conduit to remove the warnings that are generated
 # for some installations where openssl module is mysteriously installed twice so