Date: Mon, 6 May 2024 15:00:26 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 566876a16eb6 - main - devel/freebsd-git-devtools: Update to 2024-04-22 snapshot, 76a8625bc7 Message-ID: <202405061500.446F0QRT096638@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=566876a16eb688063a1b09c8411e2d9c714e0a46 commit 566876a16eb688063a1b09c8411e2d9c714e0a46 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2024-05-06 14:50:28 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2024-05-06 15:00:23 +0000 devel/freebsd-git-devtools: Update to 2024-04-22 snapshot, 76a8625bc7 Base commits since last update: 76a8625bc71d - mfc-candidates: use stable/14 as default MFC-to branch 793745fad866 - mfc-candidates: move pretty printing into lua d51c59002367 - mfc-candidates: fix output order with incorrect commit dates 3f115b864b1f - git/mfc-candidates.sh: allow comments in exclude file 280085ef0c9d - tools/git: ensure git-arc is more platform indepdendent e1735b35e3e4 - git-arc: Retain color status messages 787cb30d20ac - git-arc: Add -c flag to patch to commit the change 9f48ef1fcae5 - git-arc: Cope with extra output df834e06bbc7 - git-arc: Just strip escape sequences form arc log Sponsored by: The FreeBSD Foundation --- devel/freebsd-git-devtools/Makefile | 16 +++++++++++----- devel/freebsd-git-devtools/distinfo | 16 +++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/devel/freebsd-git-devtools/Makefile b/devel/freebsd-git-devtools/Makefile index 756aa00011e4..071b5ffd2108 100644 --- a/devel/freebsd-git-devtools/Makefile +++ b/devel/freebsd-git-devtools/Makefile @@ -1,9 +1,9 @@ PORTNAME= freebsd-git-devtools -PORTVERSION= 20230925 -PORTREVISION= 1 +PORTVERSION= 20240422 CATEGORIES= devel MASTER_SITES= https://cgit.freebsd.org/src/plain/tools/tools/git/ -DISTFILES= git-arc.sh?id=${_REV} \ +DISTFILES= candidatematch.lua?id=${_REV} \ + git-arc.sh?id=${_REV} \ git-arc.1?id=${_REV} \ mfc-candidates.sh?id=${_REV} DIST_SUBDIR= ${PORTNAME} @@ -17,6 +17,10 @@ RUN_DEPENDS= arc:devel/arcanist \ git:devel/git \ jq:textproc/jq +USES= lua shebangfix +SHEBANG_FILES= candidatematch.lua?id=${_REV} +lua_OLD_CMD= /usr/libexec/flua + EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . @@ -25,11 +29,12 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_FILES= bin/git-arc \ +PLIST_FILES= bin/candidatematch.lua \ + bin/git-arc \ bin/mfc-candidates \ share/man/man1/git-arc.1.gz -_REV= 61f8df6a13a357e1d45c22a2016b87491f10de87 +_REV= 76a8625bc71da3fa63eef5abb4782553d2588f5c post-patch: for f in ${WRKSRC}/*\?id=*; do \ @@ -37,6 +42,7 @@ post-patch: done do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/candidatematch.lua ${STAGEDIR}${PREFIX}/bin/ ${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}${PREFIX}/share/man/man1/ diff --git a/devel/freebsd-git-devtools/distinfo b/devel/freebsd-git-devtools/distinfo index 1d1a19748de0..05109017e881 100644 --- a/devel/freebsd-git-devtools/distinfo +++ b/devel/freebsd-git-devtools/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1695735108 -SHA256 (freebsd-git-devtools/git-arc.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 5dbcbde74b3a781b6d2ecff1929148c83ff0ff3608c0f1110327cffddf2cb25c -SIZE (freebsd-git-devtools/git-arc.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 17038 -SHA256 (freebsd-git-devtools/git-arc.1?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 011b470468af2994b0e0cca164dcf0ccfb870946fd3c5bb0ca7c4a0cb8b36b9d -SIZE (freebsd-git-devtools/git-arc.1?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 7111 -SHA256 (freebsd-git-devtools/mfc-candidates.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = ad11d61abc37134b4a5a37e587e80144bdcce05fbfb3145892df1ab6f92f1d4d -SIZE (freebsd-git-devtools/mfc-candidates.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 4450 +TIMESTAMP = 1715004431 +SHA256 (freebsd-git-devtools/candidatematch.lua?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 36098f6871d1ed79ed588bd8a7bb906a5f5ab291e2e3fe32aad2adf096142918 +SIZE (freebsd-git-devtools/candidatematch.lua?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 1748 +SHA256 (freebsd-git-devtools/git-arc.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 2125d0a57c522ab24a43091f851dbdd9b33633699eef84195c480630301335da +SIZE (freebsd-git-devtools/git-arc.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 23024 +SHA256 (freebsd-git-devtools/git-arc.1?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 3b7660960d39bbe310194f985d5cbc08836cad249e29da0692dfe7945275dc8e +SIZE (freebsd-git-devtools/git-arc.1?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 7469 +SHA256 (freebsd-git-devtools/mfc-candidates.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = adc38b6815d3ba672fc0fc108a79ef76e0e5ce97d027a30b21a189951f3cb1d4 +SIZE (freebsd-git-devtools/mfc-candidates.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 4190
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405061500.446F0QRT096638>