From nobody Fri May 13 17:00:56 2022 X-Original-To: dev-commits-ports-main@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 A6EDA1ADEACD; Fri, 13 May 2022 17:00:56 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0FK44LRBz3vT1; Fri, 13 May 2022 17:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652461256; 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=Rs0w6ifwZKosaStU/DCeCZK5kZsb3AAYHUq55Rva+SA=; b=hu0Jy7L6A72s6Wdk2kq+pOraVGgIeGWk8AWFVr8ZevVvElcL/iWYmq6SjdM4ciBItZZ5vR vOBC1513HWOP0B3iJkSRq3CB36tNb+935Z4m6mpw43mdZ8Nz33u2P5t6iURTZQnA63njyF Df3/MaC+tKfMloLs8J2EGNSo1jzH4qM1QxsUPblR6BdijXoNspusAV1KfgBgrVxIlp1oGD Qln5kfSw9M+ZBuWeHy0YhDn3thYJ2Mf+BTm5yfZbYWBXDQ70rCEJjB22/8MtgAUZKT4aqM 9zZGTPBAviAvBGdQci8twyHjPmgsiqN56hV6vnITvys7FkB18BY/7rI+Pgr1jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7587026982; Fri, 13 May 2022 17:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DH0uqP097954; Fri, 13 May 2022 17:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DH0uBX097953; Fri, 13 May 2022 17:00:56 GMT (envelope-from git) Date: Fri, 13 May 2022 17:00:56 GMT Message-Id: <202205131700.24DH0uBX097953@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 20f1605507e9 - main - devel/freebsd-git-devtools: Simple Git tools from src/tools/tools/git List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20f1605507e9a2be1c6aefa3aa65f47dbf31e283 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652461256; 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=Rs0w6ifwZKosaStU/DCeCZK5kZsb3AAYHUq55Rva+SA=; b=nfpkU4K1ZLsd9ObZjjSy0s2w61KkAJHPMncwfYG8IuGBMUFPa9s/dJ0gTMiagOZpqR6A/b 0jiObWFH8UKVNOpX89oHru9QKCR44adgZh8cVi93TLPedJx/rbqs16Ob7EtvHbFECR2rak 2azsQJnRZhEF7TJ+f8X/16tdg1YTHVMQ/4OshstQ1eUO/2vqZiBpemMbbhAvqt5zgo5SWm +9RNLZeoQcYkw48p/OPhvBBcAZyv53TQ68aWEU68BYS4+L1eteA+DCACdd3DeyFfjxkbTT DVukEM2ntFMzRcOYKBeppMHTMSQ8/YHuUBebYNkqktfe2jFRxN2MSO6BJmrKgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652461256; a=rsa-sha256; cv=none; b=hiBLIyzzaqZQ+/u9V04DUL4wnBZ5IjP8soxzNcWjjX6Q8YLdkbvU5SC4TUr+osDP8ekTNn Itk4ERhvtVsvtxNFwaOYvDFukww306HixOuV+dmGz27QS8IDUEwrqBsSxOBHIFc7Cbc4vE ByOEwoGqznfPaVwngPNix3t8zLpWZh9+beyp0xx2DyC1Mkxo43etabM3fUEW2jW+kEu37F 25f5keoq9NTH1N8PHRh71IUjKDa+W7VcpWHi3gF+aJPJiiudZae4p4S6oV5PwWrYsK0XZl Wwsx5fNbJzPzzgWObNpBhAHV+baxBXP7fUB3WG8eLCjMDGNbSG7D2c6vgp52LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=20f1605507e9a2be1c6aefa3aa65f47dbf31e283 commit 20f1605507e9a2be1c6aefa3aa65f47dbf31e283 Author: Joseph Mingrone AuthorDate: 2022-04-29 20:38:00 +0000 Commit: Joseph Mingrone 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 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 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