From nobody Wed Mar 15 17:40:06 2023 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 4PcHj30nnRz3xYC5; Wed, 15 Mar 2023 17:40:07 +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 4PcHj30JrRz3PRd; Wed, 15 Mar 2023 17:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678902007; 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=u6/LvfvfVenNZpnr1Y/F/UnnwjqmBybwYBlK4wy2Sto=; b=WaD2zBdTbr2XDl+mI6MxnGdFvDIPDD7NI3k/SZcMVGx+YmL0KWY5relaS5NDVAqTtxVaZk P/fTtunXDGZsqFCg/PEdhNe/JZY4papnlZwaONjeKrjH/2sii7nIvHOVVnGfKiHxpPGYe2 7bxuYjB6V75gR9T+2uGMUS1rvYVF3yRXOv0tXS3acVnq6r6piWG+0OFooyAGzakQihh9gX ZuNqy6Tju21Yh6PA0GS1QaYZMYo5kZlzxoDMwrkNZYgH0M5rZ84sO2NKbBVF081vXxZ4rg sVdVtyh0URMKPLbqlRJqUUKPw9uRVTzP4UUlvtbfURBH0VqKsb9pzg00Ez6atA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678902007; 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=u6/LvfvfVenNZpnr1Y/F/UnnwjqmBybwYBlK4wy2Sto=; b=QgdnjpZaRLyG/VfjFs3stca9A2+Vcx9nmfS+xKi/PpGxOkOFC94mzpsngHPrlm8lNdKhWG dYmLE4LMURNCU1w2Mk6aknlr51fGaDcYz6dWPQ+Kugegx//Lp3lh9tm3kuNPL13BD8Nmgi OK+/TiiwzFA8minIqVj9b5ix0M5UEqKQBBPuCjp3HqF0jPhNCsR6LhUFKztY627YHuA+Jw qhBoPlgs1AZ91ZgxaIyn6VEjRgV09Jqj2r+GSruR7Rcr6oW+fvDEnngyzHENu5t8w+1nwf H0xXk+1XO+5qR2gp7aK+99FZjjgBh6dnqYo9PusSHSzcni9vd6czzWNk4eefDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678902007; a=rsa-sha256; cv=none; b=vvNlaidM5THuosjuiQFi7TC9P+6Njhx0otLcu6Z95XhpFR1CIIJ9hWQpAJQmbUcvt1CrFM nPcOtqKaXU19q9+KWVHm7hyI1Lc3ZchqxBRsR33QTKdKO5D5NOigJvzWrinwadR+Drp+Dm 5ydeWaufp3q33R5tjMNPqKsk8WfFoMERNkn2/IYDVX64W1XhEVCu3sbHsSIlLezVS8ggCs v0OE8PdG7Enq0tiIyGS04F7s6oFOO4s+L5zB44NRA54DuNEoBRhecJlrn45j2cYYXscw8U UfpTMxYJ3AZg66ATxPFU35R9BpVQpzYzNAmxF0USJ3G8rtYU3yUNLzb5Sj3IyQ== 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 4PcHj26TFqz1PlG; Wed, 15 Mar 2023 17:40:06 +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 32FHe6qm043150; Wed, 15 Mar 2023 17:40:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32FHe6Ak043146; Wed, 15 Mar 2023 17:40:06 GMT (envelope-from git) Date: Wed, 15 Mar 2023 17:40:06 GMT Message-Id: <202303151740.32FHe6Ak043146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: d3a5eb641d28 - main - devel/git: Update to 2.4.0 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3a5eb641d287192007f016bed2df0644ebe6184 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3a5eb641d287192007f016bed2df0644ebe6184 commit d3a5eb641d287192007f016bed2df0644ebe6184 Author: Cy Schubert AuthorDate: 2023-03-14 20:55:46 +0000 Commit: Cy Schubert CommitDate: 2023-03-15 17:39:09 +0000 devel/git: Update to 2.4.0 Changelog at https://github.com/git/git/blob/master/Documentation/RelNotes/2.4.0.txt. This update fixes a long-standing problem with git rebase of some (but not all) merges from the vendor branch, resulting in subsequently rebased files being placed into the root of the repo tree. PR: 270222 Submitted by: cy Reported by: cy Approved by: garga --- devel/git/Makefile | 2 +- devel/git/distinfo | 14 +++++++------- devel/git/pkg-plist | 6 ++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 6a3b647bc821..2863bf92ab94 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,5 @@ PORTNAME= git -DISTVERSION= 2.39.2 +DISTVERSION= 2.40.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/devel/git/distinfo b/devel/git/distinfo index 61ea129958f8..d0b2621740ef 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1676410579 -SHA256 (git-2.39.2.tar.xz) = 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 -SIZE (git-2.39.2.tar.xz) = 7163224 -SHA256 (git-manpages-2.39.2.tar.xz) = 0b3927a2f09db3d3ec91dd548409a7129d3af9dabf11847401872c8c0c529b25 -SIZE (git-manpages-2.39.2.tar.xz) = 557080 -SHA256 (git-htmldocs-2.39.2.tar.xz) = f729edf1821c688efc6767b1c0bb728aec673bc15b80a6b8be6a18c2cbb9d67e -SIZE (git-htmldocs-2.39.2.tar.xz) = 1505352 +TIMESTAMP = 1678830139 +SHA256 (git-2.40.0.tar.xz) = b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d +SIZE (git-2.40.0.tar.xz) = 7183692 +SHA256 (git-manpages-2.40.0.tar.xz) = 5766aecf137370015e3fd72e355b83c73dc2aa2ee14a42546049346442c3356e +SIZE (git-manpages-2.40.0.tar.xz) = 562824 +SHA256 (git-htmldocs-2.40.0.tar.xz) = 3da9fbe542e7d565b4168ea15872e8e1b13324e4bb5ab65604ca9a333dfe37bb +SIZE (git-htmldocs-2.40.0.tar.xz) = 1517292 diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 7ebe62bb2b81..ac71bee9217e 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -26,14 +26,12 @@ etc/bash_completion.d/git-completion.bash %%PERL%%%%SITE_PERL%%/Git/SVN/Utils.pm libexec/git-core/git libexec/git-core/git-add -libexec/git-core/git-add--interactive libexec/git-core/git-am libexec/git-core/git-annotate libexec/git-core/git-apply libexec/git-core/git-archimport libexec/git-core/git-archive libexec/git-core/git-bisect -libexec/git-core/git-bisect--helper libexec/git-core/git-blame libexec/git-core/git-branch libexec/git-core/git-bugreport @@ -69,7 +67,6 @@ libexec/git-core/git-diff-index libexec/git-core/git-diff-tree libexec/git-core/git-difftool libexec/git-core/git-difftool--helper -libexec/git-core/git-env--helper libexec/git-core/git-fast-export libexec/git-core/git-fast-import libexec/git-core/git-fetch @@ -813,6 +810,8 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1316,7 +1315,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/hashmap.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/index-compatibility.cocci -%%CONTRIB%%share/git-core/contrib/coccinelle/index-compatibility.pending.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/preincr.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci