Date: Tue, 30 Apr 2024 11:53:44 GMT From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 94c34dda53dc - main - devel/git: Update to 2.45.0 Message-ID: <202404301153.43UBri85046246@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=94c34dda53dc093d30a407b6323dd831683b7cf5 commit 94c34dda53dc093d30a407b6323dd831683b7cf5 Author: Renato Botelho <garga@FreeBSD.org> AuthorDate: 2024-04-30 11:53:03 +0000 Commit: Renato Botelho <garga@FreeBSD.org> CommitDate: 2024-04-30 11:53:34 +0000 devel/git: Update to 2.45.0 Sponsored by: Rubicon Communications, LLC ("Netgate") --- devel/git/Makefile | 3 +-- devel/git/distinfo | 14 +++++++------- devel/git/files/patch-Documentation__Makefile | 8 ++++---- devel/git/files/patch-Makefile | 16 ++++++++-------- devel/git/pkg-plist | 4 ++-- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 326b4ae0f033..ab12ddef1c50 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,5 @@ PORTNAME= git -DISTVERSION= 2.44.0 +DISTVERSION= 2.45.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -57,7 +57,6 @@ USE_RC_SUBR= git_daemon SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \ t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \ git-p4.py \ - contrib/hg-to-git/hg-to-git.py \ contrib/hooks/update-paranoid \ contrib/fast-import/import-zips.py \ contrib/remote-helpers/git-remote-bzr \ diff --git a/devel/git/distinfo b/devel/git/distinfo index ebb1516be025..885c82fe3692 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1708942187 -SHA256 (git-2.44.0.tar.xz) = e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 -SIZE (git-2.44.0.tar.xz) = 7429952 -SHA256 (git-manpages-2.44.0.tar.xz) = 777be83bd54e301988fc49708cae3b5ce4b0971c2ca3b7a720be58e2f4633fcb -SIZE (git-manpages-2.44.0.tar.xz) = 573444 -SHA256 (git-htmldocs-2.44.0.tar.xz) = 808f1221940de2a32d7b4a3f675f968a7d0a75058a12a791afcda58b01a6e820 -SIZE (git-htmldocs-2.44.0.tar.xz) = 1557284 +TIMESTAMP = 1714423677 +SHA256 (git-2.45.0.tar.xz) = 0aac200bd06476e7df1ff026eb123c6827bc10fe69d2823b4bf2ebebe5953429 +SIZE (git-2.45.0.tar.xz) = 7482988 +SHA256 (git-manpages-2.45.0.tar.xz) = 44b34e9a1f244c2d184afa6de5d93f226fc449f046d05869d980f6203397a7f4 +SIZE (git-manpages-2.45.0.tar.xz) = 575752 +SHA256 (git-htmldocs-2.45.0.tar.xz) = 53b6117470c1aa2b7c8ef387944dcb220ed1c303407bda2ff7727818b7569af1 +SIZE (git-htmldocs-2.45.0.tar.xz) = 1566792 diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile index 20da54799c25..32174c3e81f5 100644 --- a/devel/git/files/patch-Documentation__Makefile +++ b/devel/git/files/patch-Documentation__Makefile @@ -1,6 +1,6 @@ ---- Documentation/Makefile.orig 2021-08-16 21:18:43 UTC +--- Documentation/Makefile.orig 2024-04-29 16:19:22 UTC +++ Documentation/Makefile -@@ -120,11 +120,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER) +@@ -134,11 +134,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,8 +15,8 @@ mandir ?= $(prefix)/share/man man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 -@@ -241,7 +241,7 @@ ifndef V - endif +@@ -222,7 +222,7 @@ endif + ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' endif -all: html man diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile index 559f041a40a7..94fb2f735a0f 100644 --- a/devel/git/files/patch-Makefile +++ b/devel/git/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2024-02-23 00:37:50 UTC +--- Makefile.orig 2024-04-29 16:19:22 UTC +++ Makefile @@ -606,16 +606,16 @@ mandir = $(prefix)/share/man prefix = $(HOME) @@ -32,20 +32,20 @@ XGETTEXT = xgettext MSGCAT = msgcat MSGFMT = msgfmt -@@ -1665,9 +1665,9 @@ ifndef NO_OPENSSL +@@ -1671,9 +1671,9 @@ ifndef NO_OPENSSL ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl -- ifdef OPENSSLDIR +- ifdef OPENSSLDIR - BASIC_CFLAGS += -I$(OPENSSLDIR)/include - OPENSSL_LINK = $(call libpath_template,$(OPENSSLDIR)/$(lib)) + ifdef OPENSSLBASE + BASIC_CFLAGS += -I$(OPENSSLBASE)/include + OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib) - else + else OPENSSL_LINK = - endif -@@ -2574,7 +2574,7 @@ else # NO_PERL + endif +@@ -2580,7 +2580,7 @@ else # NO_PERL chmod +x $@+ && \ mv $@+ $@ else # NO_PERL @@ -54,7 +54,7 @@ $(QUIET_GEN) \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -@@ -2590,7 +2590,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py +@@ -2596,7 +2596,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS $(SCRIPT_PYTHON_GEN): % : %.py $(QUIET_GEN) \ @@ -63,7 +63,7 @@ $< >$@+ && \ chmod +x $@+ && \ mv $@+ $@ -@@ -3467,7 +3467,7 @@ install: all +@@ -3473,7 +3473,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 d9789ec60170..6240c6504546 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -832,6 +832,7 @@ share/man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.44.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.45.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1349,6 +1350,7 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/coccinelle/xcalloc.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/xopen.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/xstrdup_or_null.cocci +%%CONTRIB%%share/git-core/contrib/coccinelle/xstrncmpz.cocci %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh @@ -1394,8 +1396,6 @@ share/emacs/site-lisp/git/git.el %%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/hg-to-git/hg-to-git.py -%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404301153.43UBri85046246>