Page MenuHomeFreeBSD
Files F176916559

D60995.1793609752.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D60995.1793609752.diff
View Options

diff --git a/tools/tools/git/Makefile b/tools/tools/git/Makefile
--- a/tools/tools/git/Makefile
+++ b/tools/tools/git/Makefile
@@ -1,5 +1,16 @@
SCRIPTS= git-arc.sh git-mfc
-BINDIR?= /usr/local/bin
+PREFIX?= /usr/local
+BINDIR?= ${PREFIX}/bin
MAN= git-arc.1 git-mfc.1
+.if ${.MAKE.OS} == "FreeBSD"
+# This matches the value set in `bsd.own.mk`.
+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.1 b/tools/tools/git/git-arc.1
--- a/tools/tools/git/git-arc.1
+++ b/tools/tools/git/git-arc.1
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 23, 2026
+.Dd October 30, 2026
.Dt GIT-ARC 1
.Os
.Sh NAME
@@ -68,16 +68,17 @@
It is geared towards
.Fx
development.
-It requires the
-.Pa devel/git ,
-.Pa devel/arcanist-lib
+It requires
+.Pa arc ,
+.Pa git ,
and
-.Pa textproc/jq
-packages; these will be installed automatically if
+.Pa jq .
+The dependencies will be installed automatically if
.Nm
is installed via the
.Pa devel/freebsd-git-arc
-package.
+package on
+.Fx .
.Pp
.Nm
assumes a one-to-one relationship between git commits and
diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -101,8 +101,8 @@
#
setup()
{
- [ -x "${ARC_CMD}" ] || err "arc is required, install devel/arcanist-lib"
- which jq >/dev/null 2>&1 || err "jq is required, install textproc/jq"
+ [ -x "${ARC_CMD}" ] || err "arc is required"
+ which jq >/dev/null 2>&1 || err "jq is required"
if [ "$VERBOSE" ]; then
exec 3>&1
@@ -146,15 +146,24 @@
trap cleanup EXIT HUP INT QUIT TRAP USR1 TERM
}
-#
-# 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}"
+case "$(uname -s)" in
+FreeBSD)
+ #
+ # Invoke the actual arc command. This allows us to only rely on the
+ # devel/*arcanist-lib port, which installs the actual script, rather than
+ # devel/*arcanist, 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}"
+ ;;
+*)
+ # Linux, macOS, etc.
+ : "${ARC_CMD:="$(command -v arc)"}"
+ ;;
+esac
+
arc()
{
${ARC_CMD} "$@"

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 2, 8:55 AM (10 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41273788
Default Alt Text
D60995.1793609752.diff (2 KB)

Event Timeline