sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

devel/git: Update to 2.48.0

Browse source 
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Renato Botelho 2025-01-13 14:19:18 -03:00
parent 542b6000be
commit 150cc0fdd0
5 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
devel/git/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= git PORTNAME= git
DISTVERSION= 2.47.1 DISTVERSION= 2.48.0
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@ -54,7 +54,8 @@ MAKE_ENV+= V=1
.if ${SUBPORT} == core .if ${SUBPORT} == core
USE_RC_SUBR= git_daemon USE_RC_SUBR= git_daemon
.endif .endif
SHEBANG_FILES= contrib/*/*.perl \ SHEBANG_FILES= Documentation/*.perl \
contrib/*/*.perl \
contrib/*/*.pl \ contrib/*/*.pl \
contrib/*/*/*.perl \ contrib/*/*/*.perl \
contrib/*/*/*.pl \ contrib/*/*/*.pl \
@ -62,7 +63,8 @@ SHEBANG_FILES= contrib/*/*.perl \
contrib/contacts/git-contacts \ contrib/contacts/git-contacts \
contrib/fast-import/import-zips.py \ contrib/fast-import/import-zips.py \
contrib/hooks/update-paranoid \ contrib/hooks/update-paranoid \
templates/hooks--fsmonitor-watchman.sample git-p4.py \
templates/hooks/fsmonitor-watchman.sample
TEST_TARGET= test TEST_TARGET= test
CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no 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} HTMLDOCS_DISTFILES= ${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor\ SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \
xmlto:textproc/xmlto xmlto:textproc/xmlto
.else .else
@ -272,6 +274,9 @@ post-install-HTMLDOCS-on:
${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html ${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
post-install-SUBTREE-on: 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} \ cd ${WRKSRC}/contrib/subtree && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \ ${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \
${MAKE_ARGS} install install-doc ${MAKE_ARGS} install install-doc

14
devel/git/distinfo
View file

@ -1,7 +1,7 @@
TIMESTAMP = 1732705557 TIMESTAMP = 1736533190
SHA256 (git-2.47.1.tar.xz) = f3d8f9bb23ae392374e91cd9d395970dabc5b9c5ee72f39884613cd84a6ed310 SHA256 (git-2.48.0.tar.xz) = 4803b809c42696b3b8cce6b0ba6de26febe1197f853daf930a484db93c1ad0d5
SIZE (git-2.47.1.tar.xz) = 7654244 SIZE (git-2.48.0.tar.xz) = 7723336
SHA256 (git-manpages-2.47.1.tar.xz) = ffc2005a89b056c0727b667f6beda0068371619762ea4844ad0229091befee13 SHA256 (git-manpages-2.48.0.tar.xz) = 1590a164e733b5cc83e59d51e6b323b46e2fdd3dec94ea5bf1fbbd0c129ed0d3
SIZE (git-manpages-2.47.1.tar.xz) = 586432 SIZE (git-manpages-2.48.0.tar.xz) = 590480
SHA256 (git-htmldocs-2.47.1.tar.xz) = 97ee550cd54cfd38db2b349fe4bc462b139edaad514503be034a76c80ef3053a SHA256 (git-htmldocs-2.48.0.tar.xz) = ae8427989f8d0ca4b74521a75630737e5e3e0512ec99cab93f8e682c99a42fef
SIZE (git-htmldocs-2.47.1.tar.xz) = 1564776 SIZE (git-htmldocs-2.48.0.tar.xz) = 1579956

6
devel/git/files/patch-Documentation__Makefile
View file

@ -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 +++ 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_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT))) DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
@ -15,7 +15,7 @@
mandir ?= $(prefix)/share/man mandir ?= $(prefix)/share/man
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
man5dir = $(mandir)/man5 man5dir = $(mandir)/man5
@@ -222,7 +222,7 @@ endif @@ -238,7 +238,7 @@ endif
ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
endif endif

23
devel/git/files/patch-Makefile
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2024-04-29 16:19:22 UTC --- Makefile.orig 2025-01-10 17:43:46 UTC
+++ Makefile +++ Makefile
@@ -606,16 +606,16 @@ mandir = $(prefix)/share/man @@ -613,16 +613,16 @@ mandir = $(prefix)/share/man
prefix = $(HOME) prefix = $(HOME)
bindir = $(prefix)/bin bindir = $(prefix)/bin
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
@ -21,7 +21,7 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib lib = lib
@@ -640,8 +640,8 @@ INSTALL = install @@ -647,8 +647,8 @@ INSTALL = install
TAR = tar TAR = tar
FIND = find FIND = find
INSTALL = install INSTALL = install
@ -32,7 +32,7 @@
XGETTEXT = xgettext XGETTEXT = xgettext
MSGCAT = msgcat MSGCAT = msgcat
MSGFMT = msgfmt MSGFMT = msgfmt
@@ -1671,9 +1671,9 @@ ifndef NO_OPENSSL @@ -1696,9 +1696,9 @@ ifndef NO_OPENSSL
ifndef NO_OPENSSL ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl OPENSSL_LIBSSL = -lssl
@ -45,7 +45,7 @@
else else
OPENSSL_LINK = OPENSSL_LINK =
endif endif
@@ -2580,7 +2580,7 @@ else # NO_PERL @@ -2627,7 +2627,7 @@ else # NO_PERL
chmod +x $@+ && \ chmod +x $@+ && \
mv $@+ $@ mv $@+ $@
else # NO_PERL else # NO_PERL
@ -53,17 +53,8 @@
+$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh +$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
$(QUIET_GEN) \ $(QUIET_GEN) \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
@@ -2596,7 +2596,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py @@ -3489,7 +3489,7 @@ install: all
$(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
$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(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)' $(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'

5
devel/git/pkg-plist
View file

@ -856,6 +856,7 @@ share/man/man7/gitworkflows.7.gz
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.46.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.46.2.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.47.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.47.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.47.1.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.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.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/Generators/Vcxproj.pm
%%CONTRIB%%share/git-core/contrib/buildsystems/engine.pl %%CONTRIB%%share/git-core/contrib/buildsystems/engine.pl
%%CONTRIB%%share/git-core/contrib/buildsystems/generate %%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/buildsystems/parse.pl
%%CONTRIB%%share/git-core/contrib/coccinelle/README %%CONTRIB%%share/git-core/contrib/coccinelle/README
%%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci %%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.tcsh
%%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
%%CONTRIB%%share/git-core/contrib/completion/git-prompt.sh %%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/Makefile
%%CONTRIB%%share/git-core/contrib/contacts/git-contacts %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
%%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt %%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/setgitperms.perl
%%CONTRIB%%share/git-core/contrib/hooks/update-paranoid %%CONTRIB%%share/git-core/contrib/hooks/update-paranoid
%%CONTRIB%%share/git-core/contrib/long-running-filter/example.pl %%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/.gitignore
%%CONTRIB%%share/git-core/contrib/mw-to-git/.perlcriticrc %%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/Git/Mediawiki.pm
@ -1515,4 +1519,3 @@ share/git-core/templates/info/exclude
%%NLS%%share/locale/vi/LC_MESSAGES/git.mo %%NLS%%share/locale/vi/LC_MESSAGES/git.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/git.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/git.mo
@dir share/git-core/templates/branches