diff --git a/devel/got/Makefile b/devel/got/Makefile index 1d3b9bd1be06..f3c582ac7cb7 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,33 +1,33 @@ PORTNAME= got -PORTVERSION= 0.73 +PORTVERSION= 0.74 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 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 700fda3a7bca..74b8f05449b1 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656945056 -SHA256 (got-0.73.tar.gz) = 9b2046c6989d914ff93a042df7f5e97f81de7337d3bc8a8e9ef91784c2090c48 -SIZE (got-0.73.tar.gz) = 644344 +TIMESTAMP = 1657800184 +SHA256 (got-0.74.tar.gz) = ffeb828a0b79864e16cef2eca98f5ec4f2de8ac588d82053df4916a79b517dad +SIZE (got-0.74.tar.gz) = 648237 diff --git a/devel/got/files/patch-lib_sigs.c b/devel/got/files/patch-lib_sigs.c deleted file mode 100644 index 8681646adb9d..000000000000 --- a/devel/got/files/patch-lib_sigs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/sigs.c.orig 2022-07-04 14:54:12 UTC -+++ lib/sigs.c -@@ -206,7 +206,7 @@ got_tag_write_signed_data(BUF *buf, struct got_tag_obj - got_date_format_gmtoff(gmtoff, sizeof(gmtoff), - got_object_tag_get_tagger_gmtoff(tag)); - if (asprintf(&tagger, "%s %lld %s", got_object_tag_get_tagger(tag), -- got_object_tag_get_tagger_time(tag), gmtoff) == -1) { -+ (long long)got_object_tag_get_tagger_time(tag), gmtoff) == -1) { - err = got_error_from_errno("asprintf"); - goto done; - }