git: 62359964c4e6 - main - devel/git: Update to 2.50.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Renato Botelho <garga_at_FreeBSD.org>
Date: Fri, 20 Jun 2025 13:33:29 UTC
The branch main has been updated by garga:

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

commit 62359964c4e64a30cd28fb4923c7e7b700b209f0
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2025-06-20 13:32:46 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2025-06-20 13:32:46 +0000

    devel/git: Update to 2.50.0
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 devel/git/Makefile                            |  3 +--
 devel/git/distinfo                            | 14 +++++++-------
 devel/git/files/patch-Documentation__Makefile |  6 +++---
 devel/git/files/patch-Makefile                | 13 +++++++------
 devel/git/pkg-plist                           | 15 ++++++++-------
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index d5490c5109c4..aaca14d836ad 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	git
-DISTVERSION=	2.49.0
+DISTVERSION=	2.50.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -59,7 +59,6 @@ SHEBANG_FILES=	Documentation/*.perl \
 		contrib/*/*.pl \
 		contrib/*/*/*.perl \
 		contrib/*/*/*.pl \
-		contrib/buildsystems/generate \
 		contrib/contacts/git-contacts \
 		contrib/fast-import/import-zips.py \
 		contrib/hooks/update-paranoid \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index c8a762a1997e..e56d8b21a27a 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1742244422
-SHA256 (git-2.49.0.tar.xz) = 618190cf590b7e9f6c11f91f23b1d267cd98c3ab33b850416d8758f8b5a85628
-SIZE (git-2.49.0.tar.xz) = 7771796
-SHA256 (git-manpages-2.49.0.tar.xz) = 2e4743168c4fba9729a50a1d7e52a5c94bc134a55df2e1bcee90762ebac2c4d7
-SIZE (git-manpages-2.49.0.tar.xz) = 594760
-SHA256 (git-htmldocs-2.49.0.tar.xz) = 949e0392c749fd6265e5b040df07cc3226d0ea300c2c166171295881e7070671
-SIZE (git-htmldocs-2.49.0.tar.xz) = 1602472
+TIMESTAMP = 1750423147
+SHA256 (git-2.50.0.tar.xz) = dff3c000e400ace3a63b8a6f8b3b76b88ecfdffd4504a04aba4248372cdec045
+SIZE (git-2.50.0.tar.xz) = 7878256
+SHA256 (git-manpages-2.50.0.tar.xz) = 58e73c5271dc7ac0553648cb58b981690aab6f604eef7da14c579a6bccbe9211
+SIZE (git-manpages-2.50.0.tar.xz) = 598416
+SHA256 (git-htmldocs-2.50.0.tar.xz) = 790ffce64c9f439624c5cdc41249e0e6b86010f35eb74456e814de74a29b4bf3
+SIZE (git-htmldocs-2.50.0.tar.xz) = 1615020
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 5e4767180bdf..73a1d7208558 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,6 +1,6 @@
---- Documentation/Makefile.orig	2025-03-14 16:40:00 UTC
+--- Documentation/Makefile.orig	2025-06-16 05:42:57 UTC
 +++ Documentation/Makefile
-@@ -143,11 +143,11 @@ DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER
+@@ -144,11 +144,11 @@ DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER
  DOC_MAN5 = $(patsubst %.adoc,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
  DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
  
@@ -15,7 +15,7 @@
  mandir ?= $(prefix)/share/man
  man1dir = $(mandir)/man1
  man5dir = $(mandir)/man5
-@@ -245,7 +245,7 @@ endif
+@@ -246,7 +246,7 @@ endif
  ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
  endif
  
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 9173829d2894..b26e17562f15 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,11 +1,12 @@
---- Makefile.orig	2025-01-10 17:43:46 UTC
+--- Makefile.orig	2025-06-16 05:42:57 UTC
 +++ Makefile
-@@ -613,16 +613,16 @@ mandir = $(prefix)/share/man
+@@ -614,17 +614,17 @@ mandir = $(prefix)/share/man
  prefix = $(HOME)
  bindir = $(prefix)/bin
  mandir = $(prefix)/share/man
 -infodir = $(prefix)/share/info
 +infodir = $(prefix)/info
+ bash_completion_dir = $(prefix)/share/bash-completion/completions
  gitexecdir = libexec/git-core
  mergetoolsdir = $(gitexecdir)/mergetools
  sharedir = $(prefix)/share
@@ -21,7 +22,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -647,8 +647,8 @@ INSTALL = install
+@@ -649,8 +649,8 @@ INSTALL = install
  TAR = tar
  FIND = find
  INSTALL = install
@@ -32,7 +33,7 @@
  XGETTEXT = xgettext
  MSGCAT = msgcat
  MSGFMT = msgfmt
-@@ -1696,9 +1696,9 @@ ifndef NO_OPENSSL
+@@ -1723,9 +1723,9 @@ ifndef NO_OPENSSL
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@ -45,7 +46,7 @@
          else
  		OPENSSL_LINK =
          endif
-@@ -2627,7 +2627,7 @@ else # NO_PERL
+@@ -2672,7 +2672,7 @@ else # NO_PERL
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
@@ -54,7 +55,7 @@
  	$(QUIET_GEN) \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
-@@ -3489,7 +3489,7 @@ install: all
+@@ -3540,7 +3540,7 @@ install: all
  	$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index f1b74af10a14..143acb19e58e 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -65,6 +65,7 @@ libexec/git-core/git-diagnose
 libexec/git-core/git-diff
 libexec/git-core/git-diff-files
 libexec/git-core/git-diff-index
+libexec/git-core/git-diff-pairs
 libexec/git-core/git-diff-tree
 libexec/git-core/git-difftool
 libexec/git-core/git-difftool--helper
@@ -217,6 +218,7 @@ libexec/git-core/mergetools/vscode
 libexec/git-core/mergetools/winmerge
 libexec/git-core/mergetools/xxdiff
 libexec/git-core/scalar
+share/bash-completion/completions/git
 share/man/man1/git-add.1.gz
 share/man/man1/git-am.1.gz
 share/man/man1/git-annotate.1.gz
@@ -255,6 +257,7 @@ share/man/man1/git-describe.1.gz
 share/man/man1/git-diagnose.1.gz
 share/man/man1/git-diff-files.1.gz
 share/man/man1/git-diff-index.1.gz
+share/man/man1/git-diff-pairs.1.gz
 share/man/man1/git-diff-tree.1.gz
 share/man/man1/git-diff.1.gz
 share/man/man1/git-difftool.1.gz
@@ -409,6 +412,7 @@ share/man/man7/gittutorial-2.7.gz
 share/man/man7/gittutorial.7.gz
 share/man/man7/gitworkflows.7.gz
 %%DOCS%%%%DOCSDIR%%/BreakingChanges.adoc
+%%DOCS%%%%DOCSDIR%%/BreakingChanges.html
 %%DOCS%%%%DOCSDIR%%/DecisionMaking.adoc
 %%DOCS%%%%DOCSDIR%%/DecisionMaking.html
 %%DOCS%%%%DOCSDIR%%/MyFirstContribution.adoc
@@ -904,6 +908,7 @@ share/man/man7/gitworkflows.7.gz
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.48.0.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.48.1.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.49.0.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.50.0.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.0.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.1.adoc
 %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.2.adoc
@@ -1054,6 +1059,8 @@ share/man/man7/gitworkflows.7.gz
 %%DOCS%%%%DOCSDIR%%/git-diff-files.html
 %%DOCS%%%%DOCSDIR%%/git-diff-index.adoc
 %%DOCS%%%%DOCSDIR%%/git-diff-index.html
+%%DOCS%%%%DOCSDIR%%/git-diff-pairs.adoc
+%%DOCS%%%%DOCSDIR%%/git-diff-pairs.html
 %%DOCS%%%%DOCSDIR%%/git-diff-tree.adoc
 %%DOCS%%%%DOCSDIR%%/git-diff-tree.html
 %%DOCS%%%%DOCSDIR%%/git-diff.adoc
@@ -1501,14 +1508,7 @@ share/emacs/site-lisp/git/git.el
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%CONTRIB%%share/git-core/contrib/README
 %%CONTRIB%%share/git-core/contrib/buildsystems/CMakeLists.txt
-%%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm
-%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm
-%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm
-%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcxproj.pm
-%%CONTRIB%%share/git-core/contrib/buildsystems/engine.pl
-%%CONTRIB%%share/git-core/contrib/buildsystems/generate
 %%CONTRIB%%share/git-core/contrib/buildsystems/git-version.in
-%%CONTRIB%%share/git-core/contrib/buildsystems/parse.pl
 %%CONTRIB%%share/git-core/contrib/coccinelle/README
 %%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/commit.cocci
@@ -1686,6 +1686,7 @@ share/git-core/templates/info/exclude
 %%NLS%%share/locale/el/LC_MESSAGES/git.mo
 %%NLS%%share/locale/es/LC_MESSAGES/git.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/git.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/git.mo
 %%NLS%%share/locale/id/LC_MESSAGES/git.mo
 %%NLS%%share/locale/is/LC_MESSAGES/git.mo
 %%NLS%%share/locale/it/LC_MESSAGES/git.mo