git: 091492b83f8f - main - Revert "git-arc: add initial non-FreeBSD and `$HOME` install support"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Oct 2026 23:34:58 UTC
The branch main has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=091492b83f8f96f9b9f700c1e9d40753243fb992
commit 091492b83f8f96f9b9f700c1e9d40753243fb992
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-10-29 23:34:42 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-10-29 23:34:42 +0000
Revert "git-arc: add initial non-FreeBSD and `$HOME` install support"
This was in review and should not have been committed.
This reverts commit 010e53f7c6908bee93d1bd32fb4b1658b0f19eef.
---
tools/tools/git/Makefile | 12 +-----------
tools/tools/git/git-arc.sh | 6 ++++--
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/tools/tools/git/Makefile b/tools/tools/git/Makefile
index 3d5d05e3ce61..ee73ad178486 100644
--- a/tools/tools/git/Makefile
+++ b/tools/tools/git/Makefile
@@ -1,15 +1,5 @@
SCRIPTS= git-arc.sh git-mfc
-PREFIX?= /usr/local
-BINDIR= ${PREFIX}/bin
+BINDIR?= /usr/local/bin
MAN= git-arc.1 git-mfc.1
-.if ${.MAKE.OS} == "FreeBSD"
-MANDIR?= ${PREFIX}/share/man/man
-.else
-# Work with vanilla bmake on alternate OSes, e.g., Linux, macOS, etc.
-MANDIR?= ${PREFIX}/share/man
-
-.include <scripts.mk>
-.endif
-
.include <bsd.prog.mk>
diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
index 537ac0f58d85..efc29b92865d 100755
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -101,7 +101,7 @@ get_bool_config()
#
setup()
{
- [ -x "${ARC_CMD}" ] || err "arc is required, install devel/phorgeit-arcanist-lib"
+ [ -x "${ARC_CMD}" ] || err "arc is required, install devel/arcanist-lib"
which jq >/dev/null 2>&1 || err "jq is required, install textproc/jq"
if [ "$VERBOSE" ]; then
@@ -152,7 +152,9 @@ setup()
# the devel/arcanist-port, which installs a symlink in ${LOCALBASE}/bin
# but conflicts with the archivers/arc port.
#
-: "${ARC_CMD:="$(command -v arc)"}"
+: "${LOCALBASE:=$(sysctl -n user.localbase)}"
+: "${LOCALBASE:=/usr/local}"
+: "${ARC_CMD:=${LOCALBASE}/lib/php/arcanist/bin/arc}"
arc()
{
${ARC_CMD} "$@"