Re: git: update to 2.23.0

On 24/08/2019 17:28, Klemens Nanni wrote:
> Lots of fixes and improvements, new git-switch(1) and git-restore(1):
> https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.23.0.txt
>
> `WANTLIB += charset' comes through
>
> The "git fast-export/import" pair has been taught to handle commits
> with log messages in encoding other than UTF-8 better.
>
> Adding myself as second maintainer while here.
> OK?

ok benoit@

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.202
> diff -u -p -r1.202 Makefile
> --- Makefile 15 Aug 2019 16:24:46 -0000 1.202
> +++ Makefile 23 Aug 2019 16:43:39 -0000
> @@ -4,9 +4,7 @@ COMMENT-main = GIT - Tree History Storag
> COMMENT-svn = GIT - subversion interoperability tools
> COMMENT-x11 = GIT - graphical tools
>
> -V = 2.22.0
> -REVISION = 0
> -REVISION-main = 1
> +V = 2.23.0
> DISTNAME = git-${V}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-svn = git-svn-${V}
> @@ -15,7 +13,8 @@ CATEGORIES = devel
>
> HOMEPAGE = https://git-scm.com/
>
> -MAINTAINER = Benoit Lecocq <benoit@openbsd.org>
> +MAINTAINER = Benoit Lecocq <benoit@openbsd.org>, \
> + Klemens Nanni <kn@openbsd.org>
>
> # GPLv2 only
> PERMIT_PACKAGE = Yes
> @@ -43,7 +42,8 @@ BUILD_DEPENDS = devel/gettext,-tools \
>
> MULTI_PACKAGES = -main -svn -x11
>
> -WANTLIB-main = c crypto curl expat iconv intl nghttp2 pthread ssl z
> +WANTLIB-main = c charset crypto curl expat iconv intl nghttp2 pthread \
> + ssl z
>
> RUN_DEPENDS-main = devel/cvsps \
> devel/p5-Error
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.151
> diff -u -p -r1.151 distinfo
> --- distinfo 26 Jun 2019 15:07:57 -0000 1.151
> +++ distinfo 23 Aug 2019 15:39:07 -0000
> @@ -1,4 +1,4 @@
> -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
> +SHA256 (git-2.23.0.tar.gz) = 4zlskIiBEaAb9gc0bbCbD79JqVvIP6+VBrYRlZNvDP4=
> +SHA256 (git-manpages-2.23.0.tar.gz) = pbCZj5XCKQOG0ZHTR4DRRepn5Sf6yYVB4DUHSb92vnU=
> +SIZE (git-2.23.0.tar.gz) = 8641922
> +SIZE (git-manpages-2.23.0.tar.gz) = 737985
> Index: patches/patch-config_mak_uname
> ===================================================================
> RCS file: /cvs/ports/devel/git/patches/patch-config_mak_uname,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-config_mak_uname
> --- patches/patch-config_mak_uname 26 Jun 2019 15:07:57 -0000 1.9
> +++ patches/patch-config_mak_uname 23 Aug 2019 16:39:24 -0000
> @@ -3,9 +3,9 @@ $OpenBSD: patch-config_mak_uname,v 1.9 2
> OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
>
> Index: config.mak.uname
> ---- config.mak.uname.pat.orig
> +--- config.mak.uname.orig
> +++ config.mak.uname
> -@@ -228,6 +228,7 @@ endif
> +@@ -247,6 +247,7 @@ endif
> ifeq ($(uname_S),OpenBSD)
> NO_STRCASESTR = YesPlease
> NO_MEMMEM = YesPlease
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
> retrieving revision 1.89
> diff -u -p -r1.89 PLIST-main
> --- pkg/PLIST-main 26 Jun 2019 15:07:57 -0000 1.89
> +++ pkg/PLIST-main 23 Aug 2019 16:39:15 -0000
> @@ -56,6 +56,7 @@ libexec/git/git-cvsserver
> @bin libexec/git/git-diff-tree
> @bin libexec/git/git-difftool
> libexec/git/git-difftool--helper
> +@bin libexec/git/git-env--helper
> @bin libexec/git/git-fast-export
> @bin libexec/git/git-fast-import
> @bin libexec/git/git-fetch
> @@ -120,8 +121,6 @@ libexec/git/git-quiltimport
> @bin libexec/git/git-range-diff
> @bin libexec/git/git-read-tree
> @bin libexec/git/git-rebase
> -libexec/git/git-rebase--am
> -libexec/git/git-rebase--common
> libexec/git/git-rebase--preserve-merges
> @bin libexec/git/git-receive-pack
> @bin libexec/git/git-reflog
> @@ -138,6 +137,7 @@ libexec/git/git-rebase--preserve-merges
> libexec/git/git-request-pull
> @bin libexec/git/git-rerere
> @bin libexec/git/git-reset
> +@bin libexec/git/git-restore
> @bin libexec/git/git-rev-list
> @bin libexec/git/git-rev-parse
> @bin libexec/git/git-revert
> @@ -160,6 +160,7 @@ libexec/git/git-sh-setup
> libexec/git/git-submodule
> @bin libexec/git/git-submodule--helper
> libexec/git/git-subtree
> +@bin libexec/git/git-switch
> @bin libexec/git/git-symbolic-ref
> @bin libexec/git/git-tag
> @bin libexec/git/git-unpack-file
> @@ -314,6 +315,7 @@ libexec/git/mergetools/xxdiff
> @man man/man1/git-request-pull.1
> @man man/man1/git-rerere.1
> @man man/man1/git-reset.1
> +@man man/man1/git-restore.1
> @man man/man1/git-rev-list.1
> @man man/man1/git-rev-parse.1
> @man man/man1/git-revert.1
> @@ -335,6 +337,7 @@ libexec/git/mergetools/xxdiff
> @man man/man1/git-stripspace.1
> @man man/man1/git-submodule.1
> @man man/man1/git-subtree.1
> +@man man/man1/git-switch.1
> @man man/man1/git-symbolic-ref.1
> @man man/man1/git-tag.1
> @man man/man1/git-unpack-file.1
>