diff --git a/devel/got/Makefile b/devel/got/Makefile index f86398e206e9..1c65a16038ae 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,34 +1,34 @@ PORTNAME= got -PORTVERSION= 0.80 +PORTVERSION= 0.81 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system WWW= https://gameoftrees.org LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix CONFLICTS_INSTALL= p5-App-GitGot # Insert #include "openbsd-compat.h" into each source file, # after the <...> includes and before the "..." ones. n= ${.newline} post-extract: @${FIND} ${WRKSRC} -name '*.[cy]' -exec \ ${REINPLACE_CMD} '1,/^#include "/{ \ /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \ {} + ${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC} # The regression test suite requires: # installed got # installed git # ssh to 127.0.0.1 regress: @(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress) .include diff --git a/devel/got/distinfo b/devel/got/distinfo index 44ba8d36a38f..1c9610bd915e 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673988392 -SHA256 (got-0.80.tar.gz) = e927d0ebb6d10cdf170cf2dde7a1be20551cd44ac35cf012248260a809222bad -SIZE (got-0.80.tar.gz) = 784764 +TIMESTAMP = 1674083408 +SHA256 (got-0.81.tar.gz) = 5f4318e8fe1c158d5d7ce1e7b3814767790335d6f32c75d1e4333285ed202620 +SIZE (got-0.81.tar.gz) = 785771 diff --git a/devel/got/files/patch-regress_cmdline_diff.sh b/devel/got/files/patch-regress_cmdline_diff.sh deleted file mode 100644 index e17f2bb3e014..000000000000 --- a/devel/got/files/patch-regress_cmdline_diff.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- regress/cmdline/diff.sh.orig 2023-01-16 08:47:29 UTC -+++ regress/cmdline/diff.sh -@@ -1762,10 +1762,8 @@ EOF - return 1 - fi - -- typeset -L10 short_alpha_id -- typeset -L10 short_alpha_new_id -- short_alpha_id=$alpha_blobid -- short_alpha_new_id=$alpha_new_blobid -+ short_alpha_id=$(printf '%-10.10s' $alpha_blobid) -+ short_alpha_new_id=$(printf '%-10.10s' $alpha_new_blobid) - cat <$testroot/stdout.expected - diffstat $alpha_blobid $alpha_new_blobid - M $short_alpha_id -> $short_alpha_new_id | 1+ 1-