git: c045e02c43a1 - main - devel/git: Update to 2.51.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Renato Botelho <garga_at_FreeBSD.org>
Date: Tue, 19 Aug 2025 14:34:21 UTC
The branch main has been updated by garga:

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

commit c045e02c43a1eeea8bcdae869630bb305b49e716
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2025-08-19 14:33:36 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2025-08-19 14:34:16 +0000

    devel/git: Update to 2.51.0
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 devel/git/Makefile                 | 14 ++-----
 devel/git/distinfo                 | 14 +++----
 devel/git/files/patch-configure.ac | 75 --------------------------------------
 devel/git/pkg-plist                | 52 +-------------------------
 4 files changed, 13 insertions(+), 142 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index ec480863ce00..be4423fe4fd3 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	git
-DISTVERSION=	2.50.1
+DISTVERSION=	2.51.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -61,7 +61,6 @@ SHEBANG_FILES=	Documentation/*.perl \
 		contrib/*/*/*.pl \
 		contrib/contacts/git-contacts \
 		contrib/fast-import/import-zips.py \
-		contrib/hooks/update-paranoid \
 		git-p4.py \
 		templates/hooks/fsmonitor-watchman.sample
 TEST_TARGET=	test
@@ -220,7 +219,7 @@ post-patch:
 .if ${SUBPORT} == gui
 	@${REINPLACE_CMD} -e "/exec wish/s,wish,${WISH}," \
 		${WRKSRC}/gitk-git/gitk \
-		${WRKSRC}/git-gui/git-gui--askpass
+		${WRKSRC}/git-gui/git-gui--askpass.sh
 .endif
 
 post-patch-CONTRIB-on:
@@ -249,11 +248,6 @@ post-install:
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man5)
 	(cd ${WRKDIR}/man7/ && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man7)
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
-	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
-		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
-	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \
-		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
@@ -301,8 +295,8 @@ do-install:
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${LN} ${STAGEDIR}${PREFIX}/libexec/git-core/git-gui \
 		${STAGEDIR}${PREFIX}/libexec/git-core/git-citool
-	${INSTALL_SCRIPT} ${WRKSRC}/git-gui/git-gui--askpass \
-		${STAGEDIR}${PREFIX}/libexec/git-core/
+	${INSTALL_SCRIPT} ${WRKSRC}/git-gui/git-gui--askpass.sh \
+		${STAGEDIR}${PREFIX}/libexec/git-core/git-gui--askpass
 	${INSTALL_DATA} ${WRKSRC}/git-gui/lib/tclIndex \
 		${STAGEDIR}${PREFIX}/share/git-gui/lib/
 	${INSTALL_DATA} ${WRKSRC}/git-gui/lib/*.ico \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 2f31b7cd2f90..97d9bc2835ce 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1751994170
-SHA256 (git-2.50.1.tar.xz) = 7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4
-SIZE (git-2.50.1.tar.xz) = 7880972
-SHA256 (git-manpages-2.50.1.tar.xz) = 7dd86882bbc22bef8852924de96b9cb378aad8532089e301c82093da3e7c5478
-SIZE (git-manpages-2.50.1.tar.xz) = 598416
-SHA256 (git-htmldocs-2.50.1.tar.xz) = d15ccd1518b822e317d14b63de4444bb288909294f117cbbfa385c60ab739bca
-SIZE (git-htmldocs-2.50.1.tar.xz) = 1615796
+TIMESTAMP = 1755609765
+SHA256 (git-2.51.0.tar.xz) = 60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62
+SIZE (git-2.51.0.tar.xz) = 7857228
+SHA256 (git-manpages-2.51.0.tar.xz) = c10aea63316865ace762078a6e67fc3cf117b11a5c9d4a2a52cb3762ae22ed35
+SIZE (git-manpages-2.51.0.tar.xz) = 602200
+SHA256 (git-htmldocs-2.51.0.tar.xz) = dd33897c676ea140d57a652758e458756fa93582801cfd1d7e1f62acd5fa7580
+SIZE (git-htmldocs-2.51.0.tar.xz) = 1627664
diff --git a/devel/git/files/patch-configure.ac b/devel/git/files/patch-configure.ac
index 35ed793fa5c4..37c1d7ac2a2a 100644
--- a/devel/git/files/patch-configure.ac
+++ b/devel/git/files/patch-configure.ac
@@ -12,78 +12,3 @@
  #
  # Define PYTHON_PATH to provide path to Python.
  GIT_ARG_SET_PATH(python, allow-without)
-@@ -1068,32 +1068,6 @@ GIT_CONF_SUBST([CHARSET_LIB])
- GIT_CONF_SUBST([CHARSET_LIB])
- 
- #
--# Define HAVE_SYSINFO=YesPlease if sysinfo is available.
--#
--AC_DEFUN([HAVE_SYSINFO_SRC], [
--AC_LANG_PROGRAM([[
--#include <stdint.h>
--#include <sys/sysinfo.h>
--]], [[
--struct sysinfo si;
--uint64_t t = 0;
--if (!sysinfo(&si)) {
--	t = si.totalram;
--	if (si.mem_unit > 1)
--		t *= (uint64_t)si.mem_unit;
--}
--return t;
--]])])
--
--AC_MSG_CHECKING([for sysinfo])
--AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
--	[AC_MSG_RESULT([yes])
--	HAVE_SYSINFO=YesPlease],
--	[AC_MSG_RESULT([no])
--	HAVE_SYSINFO=])
--GIT_CONF_SUBST([HAVE_SYSINFO])
--
--#
- # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
- GIT_CHECK_FUNC(clock_gettime,
- 	[HAVE_CLOCK_GETTIME=YesPlease],
-@@ -1220,6 +1194,41 @@ GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
- 	[AC_MSG_RESULT([no])
- 	HAVE_BSD_SYSCTL=])
- GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
-+
-+#
-+# Define HAVE_SYSINFO=YesPlease if sysinfo is available.
-+#
-+
-+HAVE_SYSINFO=
-+# on a *BSD system, sysctl() takes precedence over the
-+# sysinfo() compatibility library (if installed).
-+
-+if test -z "$HAVE_BSD_SYSCTL"; then
-+
-+  AC_DEFUN([HAVE_SYSINFO_SRC], [
-+  AC_LANG_PROGRAM([[
-+  #include <stdint.h>
-+  #include <sys/sysinfo.h>
-+  ]], [[
-+  struct sysinfo si;
-+  uint64_t t = 0;
-+  if (!sysinfo(&si)) {
-+	t = si.totalram;
-+	if (si.mem_unit > 1)
-+		t *= (uint64_t)si.mem_unit;
-+  }
-+  return t;
-+  ]])])
-+
-+  AC_MSG_CHECKING([for sysinfo])
-+  AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
-+	[AC_MSG_RESULT([yes])
-+	HAVE_SYSINFO=YesPlease],
-+	[AC_MSG_RESULT([no])
-+	HAVE_SYSINFO=])
-+  GIT_CONF_SUBST([HAVE_SYSINFO])
-+
-+fi
- 
- ## Other checks.
- # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 295990bf78d1..de0df5fd2882 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -917,6 +917,7 @@ share/man/man7/gitworkflows.7.gz
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.49.1.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.50.0.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.50.1.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.51.0.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.0.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.1.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.2.adoc
@@ -973,6 +974,7 @@ share/man/man7/gitworkflows.7.gz
 %%DOCS%%%%DOCSDIR%%/cmds-userinterfaces.adoc
 %%DOCS%%%%DOCSDIR%%/config.adoc
 %%DOCS%%%%DOCSDIR%%/date-formats.adoc
+%%DOCS%%%%DOCSDIR%%/diff-context-options.adoc
 %%DOCS%%%%DOCSDIR%%/diff-format.adoc
 %%DOCS%%%%DOCSDIR%%/diff-generate-patch.adoc
 %%DOCS%%%%DOCSDIR%%/diff-options.adoc
@@ -1506,8 +1508,6 @@ share/man/man7/gitworkflows.7.gz
 %%DOCS%%%%DOCSDIR%%/urls.adoc
 %%DOCS%%%%DOCSDIR%%/user-manual.adoc
 %%DOCS%%%%DOCSDIR%%/user-manual.html
-share/emacs/site-lisp/git/git-blame.el
-share/emacs/site-lisp/git/git.el
 %%GITWEB%%@sample %%ETCDIR%%/gitweb.conf.sample
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
@@ -1578,10 +1578,6 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh
-%%CONTRIB%%share/git-core/contrib/emacs/README
-%%CONTRIB%%share/git-core/contrib/emacs/git-blame.el
-%%CONTRIB%%share/git-core/contrib/emacs/git.el
-%%CONTRIB%%share/git-core/contrib/examples/README
 %%CONTRIB%%share/git-core/contrib/fast-import/git-import.perl
 %%CONTRIB%%share/git-core/contrib/fast-import/git-import.sh
 %%CONTRIB%%share/git-core/contrib/fast-import/git-p4.README
@@ -1590,15 +1586,9 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/fast-import/import-zips.py
 %%CONTRIB%%share/git-core/contrib/git-jump/README
 %%CONTRIB%%share/git-core/contrib/git-jump/git-jump
-%%CONTRIB%%share/git-core/contrib/git-resurrect.sh
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/README
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/help
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/list
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
-%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
-%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
-%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
-%%CONTRIB%%share/git-core/contrib/hooks/update-paranoid
 %%CONTRIB%%share/git-core/contrib/libgit-rs/Cargo.lock
 %%CONTRIB%%share/git-core/contrib/libgit-rs/Cargo.toml
 %%CONTRIB%%share/git-core/contrib/libgit-rs/README.md
@@ -1617,42 +1607,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/libgit-sys/src/lib.rs
 %%CONTRIB%%share/git-core/contrib/long-running-filter/example.pl
 %%CONTRIB%%share/git-core/contrib/meson.build
-%%CONTRIB%%share/git-core/contrib/mw-to-git/.gitignore
-%%CONTRIB%%share/git-core/contrib/mw-to-git/.perlcriticrc
-%%CONTRIB%%share/git-core/contrib/mw-to-git/Git/Mediawiki.pm
-%%CONTRIB%%share/git-core/contrib/mw-to-git/Makefile
-%%CONTRIB%%share/git-core/contrib/mw-to-git/bin-wrapper/git
-%%CONTRIB%%share/git-core/contrib/mw-to-git/git-mw.perl
-%%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.perl
-%%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.txt
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/.gitignore
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/Makefile
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/README
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/push-pull-tests.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9364-pull-by-rev.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9365-continuing-queries.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw-lib.sh
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw.pl
-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test.config
-%%CONTRIB%%share/git-core/contrib/persistent-https/LICENSE
-%%CONTRIB%%share/git-core/contrib/persistent-https/Makefile
-%%CONTRIB%%share/git-core/contrib/persistent-https/README
-%%CONTRIB%%share/git-core/contrib/persistent-https/client.go
-%%CONTRIB%%share/git-core/contrib/persistent-https/main.go
-%%CONTRIB%%share/git-core/contrib/persistent-https/proxy.go
-%%CONTRIB%%share/git-core/contrib/persistent-https/socket.go
-%%CONTRIB%%share/git-core/contrib/remote-helpers/README
-%%CONTRIB%%share/git-core/contrib/remote-helpers/git-remote-bzr
-%%CONTRIB%%share/git-core/contrib/remote-helpers/git-remote-hg
-%%CONTRIB%%share/git-core/contrib/remotes2config.sh
 %%CONTRIB%%share/git-core/contrib/rerere-train.sh
-%%CONTRIB%%share/git-core/contrib/stats/git-common-hash
-%%CONTRIB%%share/git-core/contrib/stats/mailmap.pl
 %%CONTRIB%%share/git-core/contrib/stats/packinfo.pl
 %%CONTRIB%%share/git-core/contrib/subtree/.gitignore
 %%CONTRIB%%share/git-core/contrib/subtree/COPYING
@@ -1665,13 +1620,10 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/subtree/t/Makefile
 %%CONTRIB%%share/git-core/contrib/subtree/t/t7900-subtree.sh
 %%CONTRIB%%share/git-core/contrib/subtree/todo
-%%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README
-%%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh
 %%CONTRIB%%share/git-core/contrib/update-unicode/README
 %%CONTRIB%%share/git-core/contrib/update-unicode/update_unicode.sh
 %%CONTRIB%%share/git-core/contrib/vscode/README.md
 %%CONTRIB%%share/git-core/contrib/vscode/init.sh
-%%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg.sample
 share/git-core/templates/hooks/commit-msg.sample