git: 9656cc688c57 - 2025Q1 - devel/git: Update to 2.48.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Renato Botelho <garga_at_FreeBSD.org>
Date: Tue, 14 Jan 2025 20:51:16 UTC
The branch 2025Q1 has been updated by garga:

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

commit 9656cc688c57082d92989be2046a792ee4ef4b15
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2025-01-13 17:19:18 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2025-01-14 20:51:03 +0000

    devel/git: Update to 2.48.0
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 150cc0fdd0575c8c1978e87c60c30fc743fafcf7)
---
 devel/git/Makefile                            | 13 +++++++++----
 devel/git/distinfo                            | 14 +++++++-------
 devel/git/files/patch-Documentation__Makefile |  6 +++---
 devel/git/files/patch-Makefile                | 23 +++++++----------------
 devel/git/pkg-plist                           |  5 ++++-
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index ef8b9eb5feba..51e648e92e32 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	git
-DISTVERSION=	2.47.1
+DISTVERSION=	2.48.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -54,7 +54,8 @@ MAKE_ENV+=	V=1
 .if ${SUBPORT} == core
 USE_RC_SUBR=	git_daemon
 .endif
-SHEBANG_FILES=	contrib/*/*.perl \
+SHEBANG_FILES=	Documentation/*.perl \
+		contrib/*/*.perl \
 		contrib/*/*.pl \
 		contrib/*/*/*.perl \
 		contrib/*/*/*.pl \
@@ -62,7 +63,8 @@ SHEBANG_FILES=	contrib/*/*.perl \
 		contrib/contacts/git-contacts \
 		contrib/fast-import/import-zips.py \
 		contrib/hooks/update-paranoid \
-		templates/hooks--fsmonitor-watchman.sample
+		git-p4.py \
+		templates/hooks/fsmonitor-watchman.sample
 TEST_TARGET=	test
 
 CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
@@ -124,7 +126,7 @@ CURL_MAKE_ARGS_OFF=	NO_CURL=1 NO_EXPAT=1
 
 HTMLDOCS_DISTFILES=	${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
 
-SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor\
+SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
 			xmlto:textproc/xmlto
 
 .else
@@ -272,6 +274,9 @@ post-install-HTMLDOCS-on:
 	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
 
 post-install-SUBTREE-on:
+	cd ${WRKSRC}/Documentation && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \
+		${MAKE_ARGS} asciidoctor-extensions.rb
 	cd ${WRKSRC}/contrib/subtree && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \
 		${MAKE_ARGS} install install-doc
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 3ff8d9537c4b..667d87c3b44b 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1732705557
-SHA256 (git-2.47.1.tar.xz) = f3d8f9bb23ae392374e91cd9d395970dabc5b9c5ee72f39884613cd84a6ed310
-SIZE (git-2.47.1.tar.xz) = 7654244
-SHA256 (git-manpages-2.47.1.tar.xz) = ffc2005a89b056c0727b667f6beda0068371619762ea4844ad0229091befee13
-SIZE (git-manpages-2.47.1.tar.xz) = 586432
-SHA256 (git-htmldocs-2.47.1.tar.xz) = 97ee550cd54cfd38db2b349fe4bc462b139edaad514503be034a76c80ef3053a
-SIZE (git-htmldocs-2.47.1.tar.xz) = 1564776
+TIMESTAMP = 1736533190
+SHA256 (git-2.48.0.tar.xz) = 4803b809c42696b3b8cce6b0ba6de26febe1197f853daf930a484db93c1ad0d5
+SIZE (git-2.48.0.tar.xz) = 7723336
+SHA256 (git-manpages-2.48.0.tar.xz) = 1590a164e733b5cc83e59d51e6b323b46e2fdd3dec94ea5bf1fbbd0c129ed0d3
+SIZE (git-manpages-2.48.0.tar.xz) = 590480
+SHA256 (git-htmldocs-2.48.0.tar.xz) = ae8427989f8d0ca4b74521a75630737e5e3e0512ec99cab93f8e682c99a42fef
+SIZE (git-htmldocs-2.48.0.tar.xz) = 1579956
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 32174c3e81f5..4c02df0418e4 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,6 +1,6 @@
---- Documentation/Makefile.orig	2024-04-29 16:19:22 UTC
+--- Documentation/Makefile.orig	2025-01-10 17:43:46 UTC
 +++ Documentation/Makefile
-@@ -134,11 +134,11 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER)
+@@ -140,11 +140,11 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER)
  DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
  DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
  
@@ -15,7 +15,7 @@
  mandir ?= $(prefix)/share/man
  man1dir = $(mandir)/man1
  man5dir = $(mandir)/man5
-@@ -222,7 +222,7 @@ endif
+@@ -238,7 +238,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 94fb2f735a0f..9173829d2894 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2024-04-29 16:19:22 UTC
+--- Makefile.orig	2025-01-10 17:43:46 UTC
 +++ Makefile
-@@ -606,16 +606,16 @@ mandir = $(prefix)/share/man
+@@ -613,16 +613,16 @@ mandir = $(prefix)/share/man
  prefix = $(HOME)
  bindir = $(prefix)/bin
  mandir = $(prefix)/share/man
@@ -21,7 +21,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -640,8 +640,8 @@ INSTALL = install
+@@ -647,8 +647,8 @@ INSTALL = install
  TAR = tar
  FIND = find
  INSTALL = install
@@ -32,7 +32,7 @@
  XGETTEXT = xgettext
  MSGCAT = msgcat
  MSGFMT = msgfmt
-@@ -1671,9 +1671,9 @@ ifndef NO_OPENSSL
+@@ -1696,9 +1696,9 @@ ifndef NO_OPENSSL
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@ -45,7 +45,7 @@
          else
  		OPENSSL_LINK =
          endif
-@@ -2580,7 +2580,7 @@ else # NO_PERL
+@@ -2627,7 +2627,7 @@ else # NO_PERL
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
@@ -53,17 +53,8 @@
 +$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
  	$(QUIET_GEN) \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
-@@ -2596,7 +2596,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
- $(SCRIPT_PYTHON_GEN): % : %.py
- 	$(QUIET_GEN) \
--	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
-+	sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \
- 	    $< >$@+ && \
- 	chmod +x $@+ && \
- 	mv $@+ $@
-@@ -3473,7 +3473,7 @@ install: all
+ 	    -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
+@@ -3489,7 +3489,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 98e7a8ff30e6..1138abb20510 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -856,6 +856,7 @@ share/man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.46.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.47.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.47.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.48.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -1350,6 +1351,7 @@ share/emacs/site-lisp/git/git.el
 %%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
@@ -1379,6 +1381,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
 %%CONTRIB%%share/git-core/contrib/completion/git-prompt.sh
+%%CONTRIB%%share/git-core/contrib/completion/meson.build
 %%CONTRIB%%share/git-core/contrib/contacts/Makefile
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
@@ -1426,6 +1429,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
 %%CONTRIB%%share/git-core/contrib/hooks/update-paranoid
 %%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
@@ -1515,4 +1519,3 @@ share/git-core/templates/info/exclude
 %%NLS%%share/locale/vi/LC_MESSAGES/git.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/git.mo
-@dir share/git-core/templates/branches