Index: head/devel/got/Makefile =================================================================== --- head/devel/got/Makefile (revision 550733) +++ head/devel/got/Makefile (revision 550734) @@ -1,32 +1,31 @@ # $FreeBSD$ PORTNAME= got -PORTVERSION= 0.41 -PORTREVISION= 1 +PORTVERSION= 0.42 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 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 Index: head/devel/got/distinfo =================================================================== --- head/devel/got/distinfo (revision 550733) +++ head/devel/got/distinfo (revision 550734) @@ -1,3 +1,3 @@ -TIMESTAMP = 1601035123 -SHA256 (got-0.41.tar.gz) = a0d2658d93c77de07bdf7fc3f65e0f25c4bd5332411f3344e27e7f13d1beeee1 -SIZE (got-0.41.tar.gz) = 444454 +TIMESTAMP = 1601492035 +SHA256 (got-0.42.tar.gz) = d5b976942cc630026fda401b903860bcd145a187d64231e062b57a6bc8a63d67 +SIZE (got-0.42.tar.gz) = 444954 Index: head/devel/got/files/patch-tog_tog.c =================================================================== --- head/devel/got/files/patch-tog_tog.c (revision 550733) +++ head/devel/got/files/patch-tog_tog.c (nonexistent) @@ -1,11 +0,0 @@ ---- tog/tog.c.orig 2020-09-25 11:58:47 UTC -+++ tog/tog.c -@@ -5654,7 +5654,7 @@ main(int argc, char *argv[]) - - argc -= optind; - argv += optind; -- optind = 0; -+ optind = 1; - optreset = 1; - - if (Vflag) { Property changes on: head/devel/got/files/patch-tog_tog.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-got_got.c =================================================================== --- head/devel/got/files/patch-got_got.c (revision 550733) +++ head/devel/got/files/patch-got_got.c (nonexistent) @@ -1,35 +0,0 @@ ---- got/got.c.orig 2020-09-25 11:58:47 UTC -+++ got/got.c -@@ -215,7 +215,8 @@ main(int argc, char *argv[]) - - argc -= optind; - argv += optind; -- optind = 0; -+ optind = 1; -+ optreset = 1; - - if (Vflag) { - got_version_print_str(); -@@ -9421,11 +9422,11 @@ cat_commit(struct got_object_id *id, struct got_reposi - } - fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR, - got_object_commit_get_author(commit), -- got_object_commit_get_author_time(commit)); -+ (long long)got_object_commit_get_author_time(commit)); - - fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER, - got_object_commit_get_author(commit), -- got_object_commit_get_committer_time(commit)); -+ (long long)got_object_commit_get_committer_time(commit)); - - logmsg = got_object_commit_get_logmsg_raw(commit); - fprintf(outfile, "messagelen %zd\n", strlen(logmsg)); -@@ -9480,7 +9481,7 @@ cat_tag(struct got_object_id *id, struct got_repositor - - fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER, - got_object_tag_get_tagger(tag), -- got_object_tag_get_tagger_time(tag)); -+ (long long)got_object_tag_get_tagger_time(tag)); - - tagmsg = got_object_tag_get_message(tag); - fprintf(outfile, "messagelen %zd\n", strlen(tagmsg)); Property changes on: head/devel/got/files/patch-got_got.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c =================================================================== --- head/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c (revision 550733) +++ head/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c (nonexistent) @@ -1,11 +0,0 @@ ---- libexec/got-index-pack/got-index-pack.c.orig 2020-09-25 11:58:47 UTC -+++ libexec/got-index-pack/got-index-pack.c -@@ -246,7 +246,7 @@ read_packed_object(struct got_pack *pack, struct got_i - free(data); - break; - } -- if (asprintf(&header, "%s %lld", obj_label, obj->size) == -1) { -+ if (asprintf(&header, "%s %lld", obj_label, (long long)obj->size) == -1) { - err = got_error_from_errno("asprintf"); - free(data); - break; Property changes on: head/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y =================================================================== --- head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y (revision 550733) +++ head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y (nonexistent) @@ -1,29 +0,0 @@ ---- libexec/got-read-gotconfig/parse.y.orig 2020-09-25 11:58:47 UTC -+++ libexec/got-read-gotconfig/parse.y -@@ -63,7 +63,7 @@ int igetc(void); - int lgetc(int); - void lungetc(int); - int findeol(void); --static int parseport(char *, long long *); -+static int parseport(char *, int64_t *); - - TAILQ_HEAD(symhead, sym) symhead = TAILQ_HEAD_INITIALIZER(symhead); - struct sym { -@@ -125,7 +125,7 @@ boolean : STRING { - ; - numberstring : NUMBER { - char *s; -- if (asprintf(&s, "%lld", $1) == -1) { -+ if (asprintf(&s, "%lld", (long long)$1) == -1) { - yyerror("string: asprintf"); - YYERROR; - } -@@ -387,7 +387,7 @@ getservice(char *n) - } - - static int --parseport(char *port, long long *pn) -+parseport(char *port, int64_t *pn) - { - if ((*pn = getservice(port)) == -1) { - *pn = 0LL; Property changes on: head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-lib_object__create.c =================================================================== --- head/devel/got/files/patch-lib_object__create.c (revision 550733) +++ head/devel/got/files/patch-lib_object__create.c (nonexistent) @@ -1,35 +0,0 @@ ---- lib/object_create.c.orig 2020-09-25 11:58:47 UTC -+++ lib/object_create.c -@@ -144,7 +144,7 @@ got_object_blob_file_create(struct got_object_id **id, - } - - if (asprintf(&header, "%s %lld", GOT_OBJ_LABEL_BLOB, -- sb.st_size) == -1) { -+ (long long)sb.st_size) == -1) { - err = got_error_from_errno("asprintf"); - goto done; - } -@@ -440,12 +440,12 @@ got_object_commit_create(struct got_object_id **id, - } - - if (asprintf(&author_str, "%s%s %lld +0000\n", -- GOT_COMMIT_LABEL_AUTHOR, author, author_time) == -1) -+ GOT_COMMIT_LABEL_AUTHOR, author, (long long)author_time) == -1) - return got_error_from_errno("asprintf"); - - if (asprintf(&committer_str, "%s%s %lld +0000\n", - GOT_COMMIT_LABEL_COMMITTER, committer ? committer : author, -- committer ? committer_time : author_time) -+ (long long)(committer ? committer_time : author_time)) - == -1) { - err = got_error_from_errno("asprintf"); - goto done; -@@ -646,7 +646,7 @@ got_object_tag_create(struct got_object_id **id, - } - - if (asprintf(&tagger_str, "%s%s %lld +0000\n", -- GOT_TAG_LABEL_TAGGER, tagger, tagger_time) == -1) -+ GOT_TAG_LABEL_TAGGER, tagger, (long long)tagger_time) == -1) - return got_error_from_errno("asprintf"); - - msg0 = strdup(tagmsg); Property changes on: head/devel/got/files/patch-lib_object__create.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property