From nobody Mon May 6 15:00:26 2024 X-Original-To: dev-commits-ports-all@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 4VY4Mv1gtFz5KNr2; Mon, 06 May 2024 15:00:27 +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 4VY4Mv0s0Wz4T69; Mon, 6 May 2024 15:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715007627; 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=/xdeit+9zKK+/8Obl4+dtlA9ZyA+EPqp5aLNabbAdpw=; b=Qzjpl8Nhp5ZUQh+q4xKoqbayts8F30E6ECYgWaueqMFV14TnJ4Ufd15PIIETS6JWsxwEAG O6Vx711ZSk64MRd+xmzfeMHFsO6Pc7afITO467KuFhEEognfoCHrSwrmYeBfku4qKY01ei zwzBb6k9Y8BKjyYZKpFkKpaOenNx/o7r5WyzmcdE4kHmSV3JKpCwinlVtLxqrDPBdwg4td GkrCTyuY79CrtpJvxqhS71uJ7Ze5injWI+HxtvrFArW+7cauRGg7s63GUZrUfQHojboF/T AEztpirZ5dGGLl+8HBEghncNSil4fVAJpVz0mxLns30dNQxk6m79pbmGx0r3GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715007627; a=rsa-sha256; cv=none; b=Vh7+v+EZ9gOxDoagp1VzwuJH+/OBkWObYTdY0Si3ToBjppSXmYizpFWefrxVMGRYyqUSee x9GliDpUaE6nAQiC5M/xtiOEZ76SZijrg9lVseK/m+9a1Y586QNY708NkHZ12Pt+TBfFDI QHLUe/odUD6VqxD4OMTkpOUbznVIrXH1iD3/tyAXJ5Vn/0tgUprp6zZ3gXcsjft0HWg89g BagCsyrX9vCWm9ZaOiUk/u4VUywTjoQMUh+R4gCUOsR1fhxc7x3NHs20JRwjPqkC0F4FrJ s0jx/VLfqzANopKzf8C7Lgtg+GLTbGRjONuvoxBA4J7WAtxaV1X1GETyippUdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715007627; 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=/xdeit+9zKK+/8Obl4+dtlA9ZyA+EPqp5aLNabbAdpw=; b=VmvKv8oruX+ZSEveFgP/EB8mcd5kUAW9REsKFhsZsP7O/nN2+wFLaSahGwydZ6kY9WVbUO 2nkgEh7RvIRz73Cbl67HwW+EbgHz6yPce2XScN3ecm5QWt2Y3B59pxGP9fEOtbCxupc++u StEc/rXtzuy8h62A2qT8LOfgLH+Y+p5/QfGzeN2oHmVyu7rIp/QrwxVtXHB+OMJnsHxB1u siSY4NALq7a4qhU1AAmjZtfw3rvTrt1lydj0fbqoh0eTb6wBt2dNHBfWQOkR2Ch1/2/hg5 UCzVJ1+da+4E8m2FfHY5CF0qL1j4t8VOh/E7sFJSM0Of5BHhsxidQ3e3Efo5Kg== 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 4VY4Mv0SCSz11gV; Mon, 6 May 2024 15:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 446F0QLa096641; Mon, 6 May 2024 15:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 446F0QRT096638; Mon, 6 May 2024 15:00:26 GMT (envelope-from git) Date: Mon, 6 May 2024 15:00:26 GMT Message-Id: <202405061500.446F0QRT096638@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: 566876a16eb6 - main - devel/freebsd-git-devtools: Update to 2024-04-22 snapshot, 76a8625bc7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 566876a16eb688063a1b09c8411e2d9c714e0a46 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=566876a16eb688063a1b09c8411e2d9c714e0a46 commit 566876a16eb688063a1b09c8411e2d9c714e0a46 Author: Joseph Mingrone AuthorDate: 2024-05-06 14:50:28 +0000 Commit: Joseph Mingrone 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