diff --git a/devel/got/Makefile b/devel/got/Makefile index b2b49bfb6b62..93d6fb333aa6 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,31 +1,31 @@ PORTNAME= got -PORTVERSION= 0.59 +PORTVERSION= 0.60 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix # 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 run-test: @(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress) .include diff --git a/devel/got/distinfo b/devel/got/distinfo index e0394f44f97c..cac5835776bd 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631649267 -SHA256 (got-0.59.tar.gz) = 5b40e99137dde05a3f0ecd15fc591f15e22d55eb305d3ee27b1bc7aefedd0abe -SIZE (got-0.59.tar.gz) = 551916 +TIMESTAMP = 1631710560 +SHA256 (got-0.60.tar.gz) = 3269b04c280f131482be3c7bb822c4066334ed03e1e91033c24113a19b2088fe +SIZE (got-0.60.tar.gz) = 552219 diff --git a/devel/got/files/patch-regress_cmdline_checkout.sh b/devel/got/files/patch-regress_cmdline_checkout.sh deleted file mode 100644 index 4b80f29b1aa2..000000000000 --- a/devel/got/files/patch-regress_cmdline_checkout.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- regress/cmdline/checkout.sh.orig 2021-09-14 20:09:50 UTC -+++ regress/cmdline/checkout.sh -@@ -821,7 +821,7 @@ test_checkout_quiet() { - - echo -n "Checked out refs/heads/master: " >> $testroot/stdout.expected - git_show_head $testroot/repo >> $testroot/stdout.expected -- echo "\nNow shut up and hack" >> $testroot/stdout.expected -+ printf "\nNow shut up and hack\n" >> $testroot/stdout.expected - - got checkout -q $testroot/repo $testroot/wt > $testroot/stdout - ret="$?"