Updated diff with PATCHORIG=.pat.orig because upstream ships an .orig
file in their regress suite which makes update-patches pick it up.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.199
diff -u -p -r1.199 Makefile
--- Makefile 20 May 2019 22:15:03 -0000 1.199
+++ Makefile 24 Jun 2019 22:04:13 -0000
@@ -4,12 +4,11 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.21.0
+V = 2.22.0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
-REVISION-main = 0
CATEGORIES = devel
HOMEPAGE = https://git-scm.com/
@@ -91,6 +90,9 @@ TEST_DEPENDS = archivers/gtar \
archivers/zip \
devel/cvsps \
devel/subversion,-perl
+
+# ${WRKSRC}/t/t4256/1/mailinfo.c.orig
+PATCHORIG = .pat.orig
post-extract:
@mkdir -p ${WRKSRC}/doc
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.150
diff -u -p -r1.150 distinfo
--- distinfo 26 Feb 2019 09:10:34 -0000 1.150
+++ distinfo 24 Jun 2019 19:17:36 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.21.0.tar.gz) = heylHHQE2nXjU+ulh/h/6pSBukHhYiBqb3CtgRgUe+4=
-SHA256 (git-manpages-2.21.0.tar.gz) =
FMduu04x+eVc9TOKBP06E7ztAyPNUXlMz0X8dL0MEIA=
-SIZE (git-2.21.0.tar.gz) = 8289375
-SIZE (git-manpages-2.21.0.tar.gz) = 716556
+SHA256 (git-2.22.0.tar.gz) = pLfkNlvuQ8qhKjjWRtLJN0PXVdHOpeq0SP+0CQbJ2gs=
+SHA256 (git-manpages-2.22.0.tar.gz) =
9qV1DfxKCqXsDAzEldSZXR827UdZHDlBvpdWwcOhqgo=
+SIZE (git-2.22.0.tar.gz) = 8472680
+SIZE (git-manpages-2.22.0.tar.gz) = 727065
Index: patches/patch-config_mak_uname
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-config_mak_uname,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mak_uname
--- patches/patch-config_mak_uname 26 Feb 2019 09:10:34 -0000 1.8
+++ patches/patch-config_mak_uname 24 Jun 2019 22:03:07 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-config_mak_uname,v 1.8 2
OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
Index: config.mak.uname
---- config.mak.uname.orig
+--- config.mak.uname.pat.orig
+++ config.mak.uname
-@@ -226,6 +226,7 @@ endif
+@@ -228,6 +228,7 @@ endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
Index: patches/patch-contrib_svn-fe_Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-contrib_svn-fe_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-contrib_svn-fe_Makefile
--- patches/patch-contrib_svn-fe_Makefile 7 Feb 2015 18:19:41 -0000
1.1
+++ patches/patch-contrib_svn-fe_Makefile 24 Jun 2019 22:03:07 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-contrib_svn-fe_Makefile,
No need for librt on OpenBSD
---- contrib/svn-fe/Makefile.orig Fri Feb 6 02:50:23 2015
+--- contrib/svn-fe/Makefile.pat.orig Fri Feb 6 02:50:23 2015
+++ contrib/svn-fe/Makefile Fri Feb 6 02:50:45 2015
@@ -41,7 +41,6 @@ endif
Index: patches/patch-gitweb_gitweb_perl
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.32
diff -u -p -r1.32 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 14 Jun 2018 17:43:48 -0000 1.32
+++ patches/patch-gitweb_gitweb_perl 24 Jun 2019 22:03:07 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.3
This prevents the following error: '-T and -B not implemented on filehandles'
Index: gitweb/gitweb.perl
---- gitweb/gitweb.perl.orig
+--- gitweb/gitweb.perl.pat.orig
+++ gitweb/gitweb.perl
-@@ -7001,7 +7001,7 @@ sub git_blob_plain {
+@@ -7038,7 +7038,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@@ -14,7 +14,7 @@ Index: gitweb/gitweb.perl
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
-@@ -7063,7 +7063,7 @@ sub git_blob {
+@@ -7100,7 +7100,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-t_t9117-git-svn-init-clone_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t9117-git-svn-init-clone_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-t_t9117-git-svn-init-clone_sh
--- patches/patch-t_t9117-git-svn-init-clone_sh 24 Jan 2009 14:31:29 -0000
1.2
+++ patches/patch-t_t9117-git-svn-init-clone_sh 24 Jun 2019 22:03:07 -0000
@@ -1,5 +1,5 @@
$OpenBSD: patch-t_t9117-git-svn-init-clone_sh,v 1.2 2009/01/24 14:31:29 bernd
Exp $
---- t/t9117-git-svn-init-clone.sh.orig Thu Dec 25 06:33:25 2008
+--- t/t9117-git-svn-init-clone.sh.pat.orig Thu Dec 25 06:33:25 2008
+++ t/t9117-git-svn-init-clone.sh Thu Dec 25 19:25:32 2008
@@ -8,7 +8,6 @@ test_description='git svn init/clone tests'
. ./lib-git-svn.sh
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.30
diff -u -p -r1.30 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 26 Feb 2019 09:10:34 -0000 1.30
+++ patches/patch-t_test-lib_sh 24 Jun 2019 22:03:07 -0000
@@ -4,9 +4,9 @@ Force usage of GNU tar in the test suite
wants it badly.
Index: t/test-lib.sh
---- t/test-lib.sh.orig
+--- t/test-lib.sh.pat.orig
+++ t/test-lib.sh
-@@ -294,6 +294,11 @@ then
+@@ -308,6 +308,11 @@ then
exit $stress_exit
fi
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.88
diff -u -p -r1.88 PLIST-main
--- pkg/PLIST-main 26 Feb 2019 09:10:34 -0000 1.88
+++ pkg/PLIST-main 24 Jun 2019 19:36:34 -0000
@@ -80,7 +80,7 @@ libexec/git/git-filter-branch
@bin libexec/git/git-init-db
libexec/git/git-instaweb
@bin libexec/git/git-interpret-trailers
-libexec/git/git-legacy-rebase
+libexec/git/git-legacy-stash
@bin libexec/git/git-log
@bin libexec/git/git-ls-files
@bin libexec/git/git-ls-remote
@@ -122,7 +122,6 @@ libexec/git/git-quiltimport
@bin libexec/git/git-rebase
libexec/git/git-rebase--am
libexec/git/git-rebase--common
-@bin libexec/git/git-rebase--interactive
libexec/git/git-rebase--preserve-merges
@bin libexec/git/git-receive-pack
@bin libexec/git/git-reflog
@@ -145,7 +144,6 @@ libexec/git/git-request-pull
@bin libexec/git/git-rm
libexec/git/git-send-email
@bin libexec/git/git-send-pack
-@bin libexec/git/git-serve
libexec/git/git-sh-i18n
@bin libexec/git/git-sh-i18n--envsubst
libexec/git/git-sh-setup
@@ -156,7 +154,7 @@ libexec/git/git-sh-setup
@bin libexec/git/git-show-index
@bin libexec/git/git-show-ref
@bin libexec/git/git-stage
-libexec/git/git-stash
+@bin libexec/git/git-stash
@bin libexec/git/git-status
@bin libexec/git/git-stripspace
libexec/git/git-submodule
@@ -199,6 +197,7 @@ libexec/git/mergetools/kompare
libexec/git/mergetools/meld
libexec/git/mergetools/opendiff
libexec/git/mergetools/p4merge
+libexec/git/mergetools/smerge
libexec/git/mergetools/tkdiff
libexec/git/mergetools/tortoisemerge
libexec/git/mergetools/vimdiff
@@ -309,7 +308,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-reflog.1
@man man/man1/git-remote-ext.1
@man man/man1/git-remote-fd.1
-@man man/man1/git-remote-testgit.1
@man man/man1/git-remote.1
@man man/man1/git-repack.1
@man man/man1/git-replace.1
@@ -355,7 +353,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-worktree.1
@man man/man1/git-write-tree.1
@man man/man1/git.1
-@man man/man1/gitremote-helpers.1
@man man/man1/gitweb.1
@man man/man5/gitattributes.5
@man man/man5/githooks.5
@@ -371,6 +368,7 @@ libexec/git/mergetools/xxdiff
@man man/man7/giteveryday.7
@man man/man7/gitglossary.7
@man man/man7/gitnamespaces.7
+@man man/man7/gitremote-helpers.7
@man man/man7/gitrevisions.7
@man man/man7/gitsubmodules.7
@man man/man7/gittutorial-2.7
