Date: Thu, 20 Apr 2023 13:57:09 GMT From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b0158c9bdf6d - main - devel/got: update to 0.87 Message-ID: <202304201357.33KDv9ZU014859@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0158c9bdf6d46545750d216cff5360273dda30e commit b0158c9bdf6d46545750d216cff5360273dda30e Author: Christian Weisgerber <naddy@FreeBSD.org> AuthorDate: 2023-04-20 13:56:28 +0000 Commit: Christian Weisgerber <naddy@FreeBSD.org> CommitDate: 2023-04-20 13:56:28 +0000 devel/got: update to 0.87 User-visible changes: - tog: resume blame and diff search from the first line - fix rebase/histedit -a leaving some files on the temporary branch - make 'got revert' and 'got rm' work on non-existent directories - when aborting rebase/histedit/merge, unlink files added by merged changes - allow no-op merge commits to be created - fix sending merge commits - show how to fetch a pull request in got.1 pull request example section --- devel/got/Makefile | 2 +- devel/got/distinfo | 6 +++--- devel/got/files/patch-regress_Makefile | 14 ++++++++------ devel/got/files/patch-regress_tog_Makefile | 10 ++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/devel/got/Makefile b/devel/got/Makefile index ac0e43500432..994e490e71ec 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,5 +1,5 @@ PORTNAME= got -DISTVERSION= 0.86 +DISTVERSION= 0.87 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ diff --git a/devel/got/distinfo b/devel/got/distinfo index 4179faf6d8b9..3f320bd1a955 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678656896 -SHA256 (got-0.86.tar.gz) = 2473a3afc5356d1999ef8fea7ff3f73ea64919462adf87105424b0fa3bab87ec -SIZE (got-0.86.tar.gz) = 806708 +TIMESTAMP = 1681998178 +SHA256 (got-0.87.tar.gz) = 74f8b5e0ce1158c877628e0d95a42b8e1ce1fe0afc2fc01911ba4ea471978605 +SIZE (got-0.87.tar.gz) = 822791 diff --git a/devel/got/files/patch-regress_Makefile b/devel/got/files/patch-regress_Makefile index 4e9eb445defa..89edb028f0d4 100644 --- a/devel/got/files/patch-regress_Makefile +++ b/devel/got/files/patch-regress_Makefile @@ -1,8 +1,10 @@ ---- regress/Makefile.orig 2021-03-16 21:43:57 UTC +--- regress/Makefile.orig 2023-04-15 23:28:20 UTC +++ regress/Makefile -@@ -1,3 +1,5 @@ - SUBDIR = cmdline delta deltify idset path fetch - -+SUBDIR_TARGETS+= regress +@@ -1,4 +1,6 @@ +-SUBDIR = cmdline delta deltify idset path fetch ++SUBDIR = cmdline delta deltify idset path fetch tog + - .include <bsd.subdir.mk> ++SUBDIR_TARGETS+= regress + + .if make(clean) + SUBDIR += gotd diff --git a/devel/got/files/patch-regress_tog_Makefile b/devel/got/files/patch-regress_tog_Makefile new file mode 100644 index 000000000000..effb7a8466fc --- /dev/null +++ b/devel/got/files/patch-regress_tog_Makefile @@ -0,0 +1,10 @@ +--- regress/tog/Makefile.orig 2023-04-17 19:05:41 UTC ++++ regress/tog/Makefile +@@ -12,4 +12,6 @@ diff: + blame: + ./blame.sh -q -r "$(GOT_TEST_ROOT)" + +-.include <bsd.regress.mk> ++regress: ${REGRESS_TARGETS} .PHONY .SILENT ++ ++.include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304201357.33KDv9ZU014859>