Page MenuHomeFreeBSD

D55129.id171280.diff
No OneTemporary

D55129.id171280.diff

diff --git a/MOVED b/MOVED
--- a/MOVED
+++ b/MOVED
@@ -1230,7 +1230,6 @@
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/freebsd-git-devtools|2022-05-13|Renamed because more tools are now included
math/pantheon-calculator|math/elementary-calculator|2022-05-18|Switch to reverse domain name notation
mail/p5-MIME-Fast||2022-05-19|Depends on long deprecated gmime-2.2
mail/gmime2-sharp|mail/gmime26-sharp|2022-05-19|Depends on long deprecated gmime-2.2
@@ -5108,3 +5107,4 @@
devel/hs-spago|devel/spago|2026-02-03|Dropped the "hs-" prefix, the software is now written in Purescript
lang/python-doc-pdf-a4||2026-02-05|A4-size PDF no longer provided since 3.13
devel/rubygem-sidekiq-cron-rails70|devel/rubygem-sidekiq-cron-rails-gitlab|2026-02-05|Obsolete, please use devel/rubygem-sidekiq-cron-rails-gitlab instead
+devel/freebsd-git-devtools|devel/git-arc|2026-02-05|Split into two separate ports: devel/git-arc and devel/mfc-candidates to improve discoverability
diff --git a/devel/Makefile b/devel/Makefile
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -734,7 +734,6 @@
SUBDIR += freebsd-gcc13
SUBDIR += freebsd-gcc14
SUBDIR += freebsd-gcc15
- SUBDIR += freebsd-git-devtools
SUBDIR += freebsd-nvme-shim
SUBDIR += freebsd-sysroot
SUBDIR += frink
@@ -838,6 +837,7 @@
SUBDIR += gio-sharp
SUBDIR += git
SUBDIR += git-absorb
+ SUBDIR += git-arc
SUBDIR += git-branchless
SUBDIR += git-bug
SUBDIR += git-cinnabar
diff --git a/devel/freebsd-git-devtools/distinfo b/devel/freebsd-git-devtools/distinfo
deleted file mode 100644
--- a/devel/freebsd-git-devtools/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1768434622
-SHA256 (freebsd-git-devtools_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.sh) = 1395c773a9e0f2110c0009fc15b15cac8047f02d3b4ae1807fefc81a419885cd
-SIZE (freebsd-git-devtools_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.sh) = 22705
-SHA256 (freebsd-git-devtools_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.1) = fa772ad92a403e94c622d6c88a797d5a8ebc1e9956b39659344452e436eff7d6
-SIZE (freebsd-git-devtools_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.1) = 9487
-SHA256 (freebsd-git-devtools_1c8dafe618878c563c3740061f83a85b0be10720/mfc-candidates.lua) = bcc35735f4d091e86afadd9b2bc4d9c066bc28270a5bdc40ce5d22b41e365565
-SIZE (freebsd-git-devtools_1c8dafe618878c563c3740061f83a85b0be10720/mfc-candidates.lua) = 6053
diff --git a/devel/freebsd-git-devtools/pkg-descr b/devel/freebsd-git-devtools/pkg-descr
deleted file mode 100644
--- a/devel/freebsd-git-devtools/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-freebsd-git-devtools includes tools under tools/tools/git/ in the FreeBSD src
-repository:
-
- - git-arc is a git plugin around arc that simplifies the creation and
- management of FreeBSD Phabricator reviews.
-
- - mfc-candidates compares git commit hashes between branches to identify
- potential MFC candidates.
diff --git a/devel/freebsd-git-devtools/Makefile b/devel/git-arc/Makefile
rename from devel/freebsd-git-devtools/Makefile
rename to devel/git-arc/Makefile
--- a/devel/freebsd-git-devtools/Makefile
+++ b/devel/git-arc/Makefile
@@ -1,14 +1,13 @@
-PORTNAME= freebsd-git-devtools
+PORTNAME= git-arc
PORTVERSION= 20260105
CATEGORIES= devel
MASTER_SITES= https://raw.githubusercontent.com/freebsd/freebsd-src/${_REV}/tools/tools/git/
DISTFILES= git-arc.sh \
- git-arc.1 \
- mfc-candidates.lua
+ git-arc.1
DIST_SUBDIR= ${PORTNAME}_${_REV}
MAINTAINER= jrm@FreeBSD.org
-COMMENT= Simple Git tools from the FreeBSD src repository
+COMMENT= Git plugin to manage FreeBSD Phabricator reviews
WWW= https://github.com/freebsd/freebsd-src/tree/main/tools/tools/git
LICENSE= BSD2CLAUSE
@@ -17,10 +16,6 @@
git:devel/git \
jq:textproc/jq
-USES= lua shebangfix
-SHEBANG_FILES= mfc-candidates.lua
-lua_OLD_CMD= /usr/libexec/flua
-
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= .
@@ -30,14 +25,12 @@
NO_WRKSUBDIR= yes
PLIST_FILES= bin/git-arc \
- bin/mfc-candidates \
share/man/man1/git-arc.1.gz
_REV= 1c8dafe618878c563c3740061f83a85b0be10720
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/git-arc.sh ${STAGEDIR}${PREFIX}/bin/git-arc
- ${INSTALL_SCRIPT} ${WRKSRC}/mfc-candidates.lua ${STAGEDIR}${PREFIX}/bin/mfc-candidates
${INSTALL_MAN} ${WRKSRC}/git-arc.1 ${STAGEDIR}${PREFIX}/share/man/man1/
.include <bsd.port.mk>
diff --git a/devel/git-arc/distinfo b/devel/git-arc/distinfo
new file mode 100644
--- /dev/null
+++ b/devel/git-arc/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1770309691
+SHA256 (git-arc_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.sh) = 1395c773a9e0f2110c0009fc15b15cac8047f02d3b4ae1807fefc81a419885cd
+SIZE (git-arc_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.sh) = 22705
+SHA256 (git-arc_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.1) = fa772ad92a403e94c622d6c88a797d5a8ebc1e9956b39659344452e436eff7d6
+SIZE (git-arc_1c8dafe618878c563c3740061f83a85b0be10720/git-arc.1) = 9487
diff --git a/devel/git-arc/pkg-descr b/devel/git-arc/pkg-descr
new file mode 100644
--- /dev/null
+++ b/devel/git-arc/pkg-descr
@@ -0,0 +1,4 @@
+The git-arc script is a git plugin for arc, the Phabricator command-line
+tool, that simplifies the creation and management of FreeBSD Phabricator
+reviews. It was created for src development, but also works for doc and
+ports.

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 31, 7:45 AM (10 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35776540
Default Alt Text
D55129.id171280.diff (5 KB)

Event Timeline