From nobody Thu Oct 29 23:34:58 2026 X-Original-To: dev-commits-src-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 4jG0vQ4kzcz6xqnP for ; Thu, 29 Oct 2026 23:34:58 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jG0vQ3wBpz4rvL for ; Thu, 29 Oct 2026 23:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793316898; 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=tteKjOjXhuUa6YVzVXhwzYphG008/P5z/CQQAkZUEQM=; b=DKRXrzSaMLj5Ju/24D9zWnGBFmFouLwXCW5cco41eAiLfjs+2Y2uz3O7hCAEi/9KN2YgFS Xb9b5sQCIzU8RQyn7W+weCaZWh9wY3dVoV4m0Xt5GYbsKIv4YHLY7nM4ofBWBa2KdlC3qG E0NEoACbm8LGTxF3VXxv2TiaWC0YG5rcdofB2Ni+ZN3k2JiDePmOeOE8sM3EYSpc/L5kSY 9LTrOm0C9hq7KNZYYkkI4YDyeoqAGlnqJjoSToNXcyPkHERSLB1q10uzRZqf9GOYCGaOfy 7t15ANjZBMEF8rz9rhGb3hPfjJa67+0IGFiWVfcO5XTX29Agoyb80WI4MEXcEw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793316898; b=LEgm2RqPcU2QJ5NvWkx5qLCb6pMs0ktkTMX7nhZfYtxr6sXQSmPzdoYZCLRd2J7UJh90mc jXVssPW18mVy/nyIdJtvy4eIip878JQsfP/gQ2OuRqwIRLN3vlpzkWn/FR3t/CuZOlfHwj qovN8z9wdslt0hjNaTAMxbBWQWACRGop/iiJPiTMawx4BEUx5batlU+ilyAEmNhsyyRnEr XfMcoknU4ykdoNw0cAUcS/wW1F7kEkVxr//QxoHb49fcWLkEmpeR3kNNuhpabOamHNCyhE phYj5pmOpY2MvQSX2ftQj/ECGLj2ZWPZW/pwfmvGd73rJCkz4Y94cBrpOPGo9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793316898; 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=tteKjOjXhuUa6YVzVXhwzYphG008/P5z/CQQAkZUEQM=; b=A3NLCauah/BfUKf/Tl/edrgu7Qwwx8OW1GL2yf1tSsvb6u2cGNRDQe4QXhJsnc4rrbc6Gl CrhQX+7yRAg+Y++L9oxTTf8V05j9YEWUQecEnrIRzJkIy0aQYkC9oQnQ8fVHWDxHV2PMDB zkLoB+egTBwQ9YFB4Q6XdzPQ4lzIsSE/eA7or1rcVT0Ytiw5+Nn0EOiuFAiMVANURR7BTR CBI2n87LdvEbUyyGPR4AygaFDG/OgloC2LG5cxyLdkRxf3JSCvNoERFvh2Kt5KBoV2PktZ qX19oddCcvitiLqcVMocxClBvtKAhfLqlxibZsFsQATN2jxRCQPSVqLmTIFZoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jG0vQ3b5Sz12CT for ; Thu, 29 Oct 2026 23:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b336 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 23:34:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 091492b83f8f - main - Revert "git-arc: add initial non-FreeBSD and `$HOME` install support" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 091492b83f8f96f9b9f700c1e9d40753243fb992 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 23:34:58 +0000 Message-Id: <6ae3d822.3b336.4b61d063@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=091492b83f8f96f9b9f700c1e9d40753243fb992 commit 091492b83f8f96f9b9f700c1e9d40753243fb992 Author: Enji Cooper AuthorDate: 2026-10-29 23:34:42 +0000 Commit: Enji Cooper 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 -.endif - .include 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} "$@"