git: 20f1605507e9 - main - devel/freebsd-git-devtools: Simple Git tools from src/tools/tools/git

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Fri, 13 May 2022 17:00:56 UTC
The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=20f1605507e9a2be1c6aefa3aa65f47dbf31e283

commit 20f1605507e9a2be1c6aefa3aa65f47dbf31e283
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2022-04-29 20:38:00 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2022-05-13 17:00:23 +0000

    devel/freebsd-git-devtools: Simple Git tools from src/tools/tools/git
    
    Rename from devel/git-arc to indicate that more tools from
    src/tools/tools/git/ may be included.  The only additional tool for now
    is mfc-candidates, which, as the name suggests, is a tool to find MFC
    candidates.  Under a ports tree, mfc-candidates finds commits to merge
    to quarterly.
    
    Approved by:    emaste, markj
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D35165
---
 MOVED                                             |  1 +
 devel/Makefile                                    |  2 +-
 devel/freebsd-git-devtools/Makefile               | 42 +++++++++++++++++++++++
 devel/freebsd-git-devtools/distinfo               |  7 ++++
 devel/{git-arc => freebsd-git-devtools}/pkg-descr |  0
 devel/git-arc/Makefile                            | 38 --------------------
 devel/git-arc/distinfo                            |  5 ---
 7 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/MOVED b/MOVED
index ffb5536e5e84..67c0d14502f3 100644
--- a/MOVED
+++ b/MOVED
@@ -17148,3 +17148,4 @@ graphics/drm-devel-kmod||2022-05-01|Switched to a Linux version based naming sch
 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
diff --git a/devel/Makefile b/devel/Makefile
index f09e545f243c..4d0a24210dde 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -747,6 +747,7 @@
     SUBDIR += frama-c
     SUBDIR += freebsd-gcc6
     SUBDIR += freebsd-gcc9
+    SUBDIR += freebsd-git-devtools
     SUBDIR += freebsd-sysroot
     SUBDIR += frink
     SUBDIR += fsmtrie
@@ -841,7 +842,6 @@
     SUBDIR += gio-sharp
     SUBDIR += git
     SUBDIR += git-absorb
-    SUBDIR += git-arc
     SUBDIR += git-bug
     SUBDIR += git-cinnabar
     SUBDIR += git-codereview
diff --git a/devel/freebsd-git-devtools/Makefile b/devel/freebsd-git-devtools/Makefile
new file mode 100644
index 000000000000..af5d882ee029
--- /dev/null
+++ b/devel/freebsd-git-devtools/Makefile
@@ -0,0 +1,42 @@
+PORTNAME=	freebsd-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=	${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>
diff --git a/devel/freebsd-git-devtools/distinfo b/devel/freebsd-git-devtools/distinfo
new file mode 100644
index 000000000000..5271f3f822de
--- /dev/null
+++ b/devel/freebsd-git-devtools/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1652369442
+SHA256 (freebsd-git-devtools/git-arc.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 2a5e9b873626ca60562ba7800cc49c7d7105fafd5eb1de2d3275654ea81167f5
+SIZE (freebsd-git-devtools/git-arc.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 16574
+SHA256 (freebsd-git-devtools/git-arc.1?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = ff882a81081cbe12b90a8008d9be9cf6d8175e583c319240a6c76b8e17361dc0
+SIZE (freebsd-git-devtools/git-arc.1?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 6609
+SHA256 (freebsd-git-devtools/mfc-candidates.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = f719ddbd34ce99dc82e4e172cc10c80b6106d8bc8f4c4e3aaf0b5ce7e649c5f3
+SIZE (freebsd-git-devtools/mfc-candidates.sh?id=4b3bf909005a8b89d55fb27b8dde6128dda61751) = 4479
diff --git a/devel/git-arc/pkg-descr b/devel/freebsd-git-devtools/pkg-descr
similarity index 100%
rename from devel/git-arc/pkg-descr
rename to devel/freebsd-git-devtools/pkg-descr
diff --git a/devel/git-arc/Makefile b/devel/git-arc/Makefile
deleted file mode 100644
index b5ee840ad50c..000000000000
--- a/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>
diff --git a/devel/git-arc/distinfo b/devel/git-arc/distinfo
deleted file mode 100644
index 118dcf4afd00..000000000000
--- a/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