Attachment 248757 Details for Bug 277327 – Patch file

[patch] Patch file

devel_git.patch (text/plain), 4.75 KB, created by Yasuhiro Kimura on 2024-02-26 10:21:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2024-02-26 10:21:36 UTC

Size: 4.75 KB

patch

obsolete

>From de87a6f61a45cba6059b2e19300d5a3aa0b57337 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Mon, 26 Feb 2024 19:19:10 +0900
>Subject: [PATCH] devel/git: Update to 2.44.0
>
>ReleaseNotes:	https://raw.githubusercontent.com/git/git/v2.44.0/Documentation/RelNotes/2.44.0.txt
>---
> devel/git/Makefile             |  2 +-
> devel/git/distinfo             | 14 +++++++-------
> devel/git/files/patch-Makefile | 12 ++++++------
> devel/git/pkg-plist            |  4 ++++
> 4 files changed, 18 insertions(+), 14 deletions(-)
>
>diff --git a/devel/git/Makefile b/devel/git/Makefile
>index 44a5a4d2e893..326b4ae0f033 100644
>--- a/devel/git/Makefile
>+++ b/devel/git/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	git
>-DISTVERSION=	2.43.2
>+DISTVERSION=	2.44.0
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG/software/scm/git
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>diff --git a/devel/git/distinfo b/devel/git/distinfo
>index e31a9edce1d5..ebb1516be025 100644
>--- a/devel/git/distinfo
>+++ b/devel/git/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1707931702
>-SHA256 (git-2.43.2.tar.xz) = f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9
>-SIZE (git-2.43.2.tar.xz) = 7388636
>-SHA256 (git-manpages-2.43.2.tar.xz) = 3739b021aa186a59de42153b70306684e7da85715d37a1b3bfe614c3dda0cab1
>-SIZE (git-manpages-2.43.2.tar.xz) = 570496
>-SHA256 (git-htmldocs-2.43.2.tar.xz) = 9b3265e3a825f6eaac3ef29b2ae82aeffd71f30e039f2e173f9df95e15d6ebf7
>-SIZE (git-htmldocs-2.43.2.tar.xz) = 1545440
>+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
>diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
>index 15107caa5c09..559f041a40a7 100644
>--- a/devel/git/files/patch-Makefile
>+++ b/devel/git/files/patch-Makefile
>@@ -1,4 +1,4 @@
>---- Makefile.orig	2023-11-20 02:07:41 UTC
>+--- Makefile.orig	2024-02-23 00:37:50 UTC
> +++ Makefile
> @@ -606,16 +606,16 @@ mandir = $(prefix)/share/man
>  prefix = $(HOME)
>@@ -32,20 +32,20 @@
>  XGETTEXT = xgettext
>  MSGCAT = msgcat
>  MSGFMT = msgfmt
>-@@ -1650,9 +1650,9 @@ ifndef NO_OPENSSL
>+@@ -1665,9 +1665,9 @@ ifndef NO_OPENSSL
>  
>  ifndef NO_OPENSSL
>  	OPENSSL_LIBSSL = -lssl
> -	ifdef OPENSSLDIR
> -		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
>--		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
>+-		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
>  		OPENSSL_LINK =
>  	endif
>-@@ -2559,7 +2559,7 @@ else # NO_PERL
>+@@ -2574,7 +2574,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' \
>-@@ -2575,7 +2575,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py
>+@@ -2590,7 +2590,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 $@+ $@
>-@@ -3451,7 +3451,7 @@ install: all
>+@@ -3467,7 +3467,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 99892a8b1157..d9789ec60170 100644
>--- a/devel/git/pkg-plist
>+++ b/devel/git/pkg-plist
>@@ -143,6 +143,7 @@ libexec/git-core/git-remote-fd
> %%CURL%%libexec/git-core/git-remote-https
> libexec/git-core/git-repack
> libexec/git-core/git-replace
>+libexec/git-core/git-replay
> libexec/git-core/git-request-pull
> libexec/git-core/git-rerere
> libexec/git-core/git-reset
>@@ -320,6 +321,7 @@ share/man/man1/git-remote-fd.1.gz
> share/man/man1/git-remote.1.gz
> share/man/man1/git-repack.1.gz
> share/man/man1/git-replace.1.gz
>+share/man/man1/git-replay.1.gz
> share/man/man1/git-request-pull.1.gz
> share/man/man1/git-rerere.1.gz
> share/man/man1/git-reset.1.gz
>@@ -828,6 +830,8 @@ share/man/man7/gitworkflows.7.gz
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.0.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.1.txt
> %%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.2.0.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 277327: 248757