Attachment 219214 Details for Bug 250472 – Updated patch file

[patch] Updated patch file

devel_git.patch (text/plain), 4.91 KB, created by Yasuhiro Kimura on 2020-10-30 04:17:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-10-30 04:17:08 UTC

Size: 4.91 KB

patch

obsolete

>Index: devel/git/Makefile
>===================================================================
>--- devel/git/Makefile	(revision 553569)
>+++ devel/git/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	git
>-DISTVERSION=	2.28.0
>+DISTVERSION=	2.29.2
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG/software/scm/git
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>@@ -57,7 +57,6 @@
> 		contrib/remote-helpers/git-remote-hg \
> 		contrib/credential/netrc/git-credential-netrc.perl \
> 		contrib/buildsystems/generate contrib/contacts/git-contacts \
>-		contrib/svn-fe/svnrdump_sim.py \
> 		templates/hooks--fsmonitor-watchman.sample
> TEST_TARGET=	test
> 
>Index: devel/git/distinfo
>===================================================================
>--- devel/git/distinfo	(revision 553569)
>+++ devel/git/distinfo	(working copy)
>@@ -1,7 +1,5 @@
>-TIMESTAMP = 1596624620
>-SHA256 (git-2.28.0.tar.xz) = dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d
>-SIZE (git-2.28.0.tar.xz) = 6117608
>-SHA256 (git-manpages-2.28.0.tar.xz) = 665a7fa41f9a39248e48422dcf533e1a0133a4a6eddfc25ee55e28e42fc07cb7
>-SIZE (git-manpages-2.28.0.tar.xz) = 472524
>-SHA256 (git-htmldocs-2.28.0.tar.xz) = 24feed3b584e2121418de9bde9f2e23fdcf78e4f914279787f669d3dc375bfe6
>-SIZE (git-htmldocs-2.28.0.tar.xz) = 1347596
>+TIMESTAMP = 1604030667
>+SHA256 (git-2.29.2.tar.xz) = f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1
>+SIZE (git-2.29.2.tar.xz) = 6187988
>+SHA256 (git-manpages-2.29.2.tar.xz) = e2d44a2a30b9d43a770262f1328b77df2f532f16c2dcd235655e5c9bd39bd792
>+SIZE (git-manpages-2.29.2.tar.xz) = 478516
>Index: devel/git/pkg-plist
>===================================================================
>--- devel/git/pkg-plist	(revision 553569)
>+++ devel/git/pkg-plist	(working copy)
>@@ -149,7 +149,6 @@
> %%CURL%%libexec/git-core/git-remote-ftps
> %%CURL%%libexec/git-core/git-remote-http
> %%CURL%%libexec/git-core/git-remote-https
>-libexec/git-core/git-remote-testsvn
> libexec/git-core/git-repack
> libexec/git-core/git-replace
> libexec/git-core/git-request-pull
>@@ -200,7 +199,6 @@
> libexec/git-core/git-write-tree
> libexec/git-core/mergetools/araxis
> libexec/git-core/mergetools/bc
>-libexec/git-core/mergetools/bc3
> libexec/git-core/mergetools/codecompare
> libexec/git-core/mergetools/deltawalker
> libexec/git-core/mergetools/diffmerge
>@@ -210,11 +208,10 @@
> libexec/git-core/mergetools/examdiff
> libexec/git-core/mergetools/guiffy
> libexec/git-core/mergetools/gvimdiff
>-libexec/git-core/mergetools/gvimdiff2
>-libexec/git-core/mergetools/gvimdiff3
> libexec/git-core/mergetools/kdiff3
> libexec/git-core/mergetools/kompare
> libexec/git-core/mergetools/meld
>+libexec/git-core/mergetools/nvimdiff
> libexec/git-core/mergetools/opendiff
> libexec/git-core/mergetools/p4merge
> libexec/git-core/mergetools/smerge
>@@ -221,8 +218,6 @@
> libexec/git-core/mergetools/tkdiff
> libexec/git-core/mergetools/tortoisemerge
> libexec/git-core/mergetools/vimdiff
>-libexec/git-core/mergetools/vimdiff2
>-libexec/git-core/mergetools/vimdiff3
> libexec/git-core/mergetools/winmerge
> libexec/git-core/mergetools/xxdiff
> man/man1/git-add.1.gz
>@@ -299,6 +294,7 @@
> man/man1/git-ls-tree.1.gz
> man/man1/git-mailinfo.1.gz
> man/man1/git-mailsplit.1.gz
>+man/man1/git-maintenance.1.gz
> man/man1/git-merge-base.1.gz
> man/man1/git-merge-file.1.gz
> man/man1/git-merge-index.1.gz
>@@ -1200,6 +1196,7 @@
> %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
> %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
> %%CONTRIB%%share/git-core/contrib/README
>+%%CONTRIB%%share/git-core/contrib/buildsystems/CMakeLists.txt
> %%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm
> %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm
> %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm
>@@ -1300,9 +1297,6 @@
> %%CONTRIB%%share/git-core/contrib/mw-to-git/t/Makefile
> %%CONTRIB%%share/git-core/contrib/mw-to-git/t/README
> %%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki.sh
>-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/.gitignore
>-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/LocalSettings.php
>-%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/db_install.php
> %%CONTRIB%%share/git-core/contrib/mw-to-git/t/push-pull-tests.sh
> %%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
> %%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh
>@@ -1338,11 +1332,6 @@
> %%CONTRIB%%share/git-core/contrib/subtree/t/Makefile
> %%CONTRIB%%share/git-core/contrib/subtree/t/t7900-subtree.sh
> %%CONTRIB%%share/git-core/contrib/subtree/todo
>-%%CONTRIB%%share/git-core/contrib/svn-fe/.gitignore
>-%%CONTRIB%%share/git-core/contrib/svn-fe/Makefile
>-%%CONTRIB%%share/git-core/contrib/svn-fe/svn-fe.c
>-%%CONTRIB%%share/git-core/contrib/svn-fe/svn-fe.txt
>-%%CONTRIB%%share/git-core/contrib/svn-fe/svnrdump_sim.py
> %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README
> %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh
> %%CONTRIB%%share/git-core/contrib/update-unicode/README

Actions: View | Diff

Attachments on bug 250472: 218902 | 219024 | 219214