Attachment 229716 Details for Bug 259858 – Updated patch file

[patch] Updated patch file

devel_git.patch (text/plain), 4.83 KB, created by Yasuhiro Kimura on 2021-11-24 23:25:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-11-24 23:25:01 UTC

Size: 4.83 KB

patch

obsolete

>From 3999f6e3bd773508e52702dd5d3a96a0383e2912 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Sun, 31 Oct 2021 12:56:47 +0900
>Subject: [PATCH] devel/git: Update to 2.34.1
>
>ReleaseNotes:	https://github.com/git/git/blob/v2.34.0/Documentation/RelNotes/2.34.1.txt
>ReleaseNotes:	https://github.com/git/git/blob/v2.34.0/Documentation/RelNotes/2.34.0.txt
>PR:		259858
>---
> devel/git/Makefile             |  2 +-
> devel/git/distinfo             | 14 +++++++-------
> devel/git/files/patch-Makefile | 21 +++++++++++++++------
> devel/git/pkg-plist            |  3 ++-
> 4 files changed, 25 insertions(+), 15 deletions(-)
>
>diff --git a/devel/git/Makefile b/devel/git/Makefile
>index 07ed269ba712..31d0b90de024 100644
>--- a/devel/git/Makefile
>+++ b/devel/git/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Eric Anholt
> 
> PORTNAME=	git
>-DISTVERSION=	2.33.1
>+DISTVERSION=	2.34.1
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG/software/scm/git
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>diff --git a/devel/git/distinfo b/devel/git/distinfo
>index 3d39cb97220d..b7753b1335e4 100644
>--- a/devel/git/distinfo
>+++ b/devel/git/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1634082307
>-SHA256 (git-2.33.1.tar.xz) = e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
>-SIZE (git-2.33.1.tar.xz) = 6558636
>-SHA256 (git-manpages-2.33.1.tar.xz) = c75219f1c9f56caad4f8eb17915e4fe34ca5e1b453773df279a2cec98205ab87
>-SIZE (git-manpages-2.33.1.tar.xz) = 494288
>-SHA256 (git-htmldocs-2.33.1.tar.xz) = 6a6b8a0f064c78e0033aa4fce0520325496de019b09fff99fa82eeb472038f5c
>-SIZE (git-htmldocs-2.33.1.tar.xz) = 1396744
>+TIMESTAMP = 1637795219
>+SHA256 (git-2.34.1.tar.xz) = 3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c
>+SIZE (git-2.34.1.tar.xz) = 6623760
>+SHA256 (git-manpages-2.34.1.tar.xz) = 9c635dd772ff21bcc4b7bab9f0de0dd01afb34b0eda3c83907e026bd3b3c7eb8
>+SIZE (git-manpages-2.34.1.tar.xz) = 497280
>+SHA256 (git-htmldocs-2.34.1.tar.xz) = 7896a36c6497293c8d63d3bc120b063b6521eb1be7658540d1a6e67f0af5c4f3
>+SIZE (git-htmldocs-2.34.1.tar.xz) = 1406464
>diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
>index d0d61d0b2fe3..1e5a0d35ba5c 100644
>--- a/devel/git/files/patch-Makefile
>+++ b/devel/git/files/patch-Makefile
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2021-08-16 21:18:43 UTC
>+--- Makefile.orig	2021-10-29 22:46:52 UTC
> +++ Makefile
>-@@ -524,16 +524,16 @@ GIT-VERSION-FILE: FORCE
>+@@ -517,16 +517,16 @@ GIT-VERSION-FILE: FORCE
>  
>  prefix = $(HOME)
>  bindir = $(prefix)/bin
>@@ -22,7 +22,7 @@
>  ETC_GITCONFIG = $(sysconfdir)/gitconfig
>  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
>  lib = lib
>-@@ -558,8 +558,8 @@ DIFF = diff
>+@@ -551,8 +551,8 @@ DIFF = diff
>  TAR = tar
>  FIND = find
>  INSTALL = install
>@@ -33,7 +33,7 @@
>  XGETTEXT = xgettext
>  MSGFMT = msgfmt
>  CURL_CONFIG = curl-config
>-@@ -1477,9 +1477,9 @@ EXTLIBS += -lz
>+@@ -1465,9 +1465,9 @@ EXTLIBS += -lz
>  
>  ifndef NO_OPENSSL
>  	OPENSSL_LIBSSL = -lssl
>@@ -46,7 +46,7 @@
>  	else
>  		OPENSSL_LINK =
>  	endif
>-@@ -2376,7 +2376,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
>+@@ -2371,7 +2371,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
>  	chmod +x $@+ && \
>  	mv $@+ $@
>  else # NO_PERL
>@@ -55,7 +55,7 @@
>  	$(QUIET_GEN) \
>  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
>  	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
>-@@ -2392,7 +2392,7 @@ ifndef NO_PYTHON
>+@@ -2387,7 +2387,7 @@ ifndef NO_PYTHON
>  $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
>  $(SCRIPT_PYTHON_GEN): % : %.py
>  	$(QUIET_GEN) \
>@@ -64,3 +64,12 @@
>  	    $< >$@+ && \
>  	chmod +x $@+ && \
>  	mv $@+ $@
>+@@ -3015,7 +3015,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)'
>+-	$(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'
>++	if [ $(BINDIR_PROGRAMS_NO_X) ]; then  $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'; fi
>+ 
>+ ifdef MSVC
>+ 	# We DO NOT install the individual foo.o.pdb files because they
>diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
>index 288a829ef948..2a8ff6d7da73 100644
>--- a/devel/git/pkg-plist
>+++ b/devel/git/pkg-plist
>@@ -131,7 +131,6 @@ libexec/git-core/git-quiltimport
> libexec/git-core/git-range-diff
> libexec/git-core/git-read-tree
> libexec/git-core/git-rebase
>-libexec/git-core/git-rebase--preserve-merges
> libexec/git-core/git-receive-pack
> libexec/git-core/git-reflog
> libexec/git-core/git-remote
>@@ -701,6 +700,8 @@ man/man7/gitworkflows.7.gz
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.32.0.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.0.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.1.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.34.0.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.34.1.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
>-- 
>2.34.0
>

Actions: View | Diff

Attachments on bug 259858: 229518 | 229716