Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -17148,3 +17148,4 @@
 math/rkward-kde|math/rkward|2022-05-06|Switched to the name used by upstream
 graphics/photoflow||2022-05-06|Unmaintainer upstream, has been broken for months, particularly this issue isn't answered: https://github.com/aferrero2707/PhotoFlow/issues/220
 textproc/redisearch16||2022-05-09|Has expired. Use textproc/redisearch or textproc/redisearch20
+devel/git-arc|devel/git-devtools|2022-05-10|Renamed to generic port name to account for more tools
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -841,13 +841,13 @@
     SUBDIR += gio-sharp
     SUBDIR += git
     SUBDIR += git-absorb
-    SUBDIR += git-arc
     SUBDIR += git-bug
     SUBDIR += git-cinnabar
     SUBDIR += git-codereview
     SUBDIR += git-cola
     SUBDIR += git-cvs
     SUBDIR += git-delta
+    SUBDIR += git-devtools
     SUBDIR += git-extras
     SUBDIR += git-filter-repo
     SUBDIR += git-gui
Index: devel/git-arc/Makefile
===================================================================
--- devel/git-arc/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PORTNAME=	git-arc
-PORTVERSION=	20220214
-CATEGORIES=	devel
-MASTER_SITES=	https://cgit.freebsd.org/src/plain/tools/tools/git/
-DISTFILES=	${PORTNAME}.sh?id=${_REV} \
-		${PORTNAME}.1?id=${_REV}
-DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
-
-MAINTAINER=	jrm@FreeBSD.org
-COMMENT=	FreeBSD Phabricator reviews based on git commits
-
-LICENSE=	BSD2CLAUSE
-
-RUN_DEPENDS=	arc:devel/arcanist \
-		git:devel/git \
-		jq:textproc/jq
-
-EXTRACT_CMD=	${CP}
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	.
-NO_ARCH=	yes
-NO_BUILD=	yes
-
-NO_WRKSUBDIR=	yes
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
-
-_REV=		99589993ceb5e6ec2511f29899e75bab1ef2f325
-
-post-patch:
-	@${MV} ${WRKSRC}/${PORTNAME}.sh?id=* ${WRKSRC}/${PORTNAME}.sh
-	@${MV} ${WRKSRC}/${PORTNAME}.1?id=* ${WRKSRC}/${PORTNAME}.1
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-
-.include <bsd.port.mk>
Index: devel/git-arc/distinfo
===================================================================
--- devel/git-arc/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1649796091
-SHA256 (git-arc/git-arc.sh?id=99589993ceb5e6ec2511f29899e75bab1ef2f325) = 2a5e9b873626ca60562ba7800cc49c7d7105fafd5eb1de2d3275654ea81167f5
-SIZE (git-arc/git-arc.sh?id=99589993ceb5e6ec2511f29899e75bab1ef2f325) = 16574
-SHA256 (git-arc/git-arc.1?id=99589993ceb5e6ec2511f29899e75bab1ef2f325) = ff882a81081cbe12b90a8008d9be9cf6d8175e583c319240a6c76b8e17361dc0
-SIZE (git-arc/git-arc.1?id=99589993ceb5e6ec2511f29899e75bab1ef2f325) = 6609
Index: devel/git-arc/pkg-descr
===================================================================
--- /dev/null
+++ devel/git-arc/pkg-descr
@@ -1,16 +0,0 @@
-The git-arc utility creates and manages FreeBSD Phabricator reviews
-based on git commits.  It is a git plugin that provides a wrapper around
-arc.
-
-The arc command has a few limitations that make it awkward for FreeBSD
-development:
-
-- Arcanist uses its own commit log template with a format does not match
-  FreeBSD's template.
-
-- Arcanist presumes a model where all the commits in a development
-  branch are uploaded for review as a single Differential revision.
-  When working on a feature branch with multiple commits, it is usually
-  more efficient to review each commit individually.
-
-git-arc mitigates these limitations.
Index: devel/git-devtools/Makefile
===================================================================
--- /dev/null
+++ devel/git-devtools/Makefile
@@ -0,0 +1,42 @@
+PORTNAME=	git-devtools
+PORTVERSION=	20220504
+CATEGORIES=	devel
+MASTER_SITES=	https://cgit.freebsd.org/src/plain/tools/tools/git/
+DISTFILES=	git-arc.sh?id=${_REV} \
+		git-arc.1?id=${_REV} \
+		mfc-candidates.sh?id=${_REV}
+DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+
+MAINTAINER=	jrm@FreeBSD.org
+COMMENT=	Simple Git tools from the FreeBSD src tree
+
+LICENSE=	BSD2CLAUSE
+
+RUN_DEPENDS=	arc:devel/arcanist \
+		git:devel/git \
+		jq:textproc/jq
+
+EXTRACT_CMD=	${CP}
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	.
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+NO_WRKSUBDIR=	yes
+PLIST_FILES=	bin/git-arc \
+		bin/mfc-candidates \
+		man/man1/git-arc.1.gz
+
+_REV=		4b3bf909005a8b89d55fb27b8dde6128dda61751
+
+post-patch:
+	for f in ${WRKSRC}/*\?id=*; do \
+		nn=$$(${ECHO_CMD} $$f | ${SED} -e s/\?id=.*//); ${MV} $$f $$nn; \
+	done
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/git-arc.sh ${STAGEDIR}${PREFIX}/bin/git-arc
+	${INSTALL_SCRIPT} ${WRKSRC}/mfc-candidates.sh ${STAGEDIR}${PREFIX}/bin/mfc-candidates
+	${INSTALL_MAN} ${WRKSRC}/git-arc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+
+.include <bsd.port.mk>
Index: devel/git-devtools/distinfo
===================================================================
--- /dev/null
+++ devel/git-devtools/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1652188296
+SHA256 (git-devtools/git-arc.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 2a5e9b873626ca60562ba7800cc49c7d7105fafd5eb1de2d3275654ea81167f5
+SIZE (git-devtools/git-arc.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 16574
+SHA256 (git-devtools/git-arc.1?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = ff882a81081cbe12b90a8008d9be9cf6d8175e583c319240a6c76b8e17361dc0
+SIZE (git-devtools/git-arc.1?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 6609
+SHA256 (git-devtools/mfc-candidates.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = f719ddbd34ce99dc82e4e172cc10c80b6106d8bc8f4c4e3aaf0b5ce7e649c5f3
+SIZE (git-devtools/mfc-candidates.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 4479