Index: head/devel/got/Makefile
===================================================================
--- head/devel/got/Makefile	(revision 550016)
+++ head/devel/got/Makefile	(revision 550017)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	got
-PORTVERSION=	0.40
+PORTVERSION=	0.41
 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 <bsd.port.mk>
Index: head/devel/got/distinfo
===================================================================
--- head/devel/got/distinfo	(revision 550016)
+++ head/devel/got/distinfo	(revision 550017)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600702149
-SHA256 (got-0.40.tar.gz) = 7c587749bb990c9d933808e860fc18a4259861bb82cffac3ead7a4640c77d23b
-SIZE (got-0.40.tar.gz) = 440924
+TIMESTAMP = 1601035123
+SHA256 (got-0.41.tar.gz) = a0d2658d93c77de07bdf7fc3f65e0f25c4bd5332411f3344e27e7f13d1beeee1
+SIZE (got-0.41.tar.gz) = 444454
Index: head/devel/got/files/patch-got_got.c
===================================================================
--- head/devel/got/files/patch-got_got.c	(revision 550016)
+++ head/devel/got/files/patch-got_got.c	(revision 550017)
@@ -1,53 +1,53 @@
---- got/got.c.orig	2020-09-21 12:09:15 UTC
+--- got/got.c.orig	2020-09-25 11:58:47 UTC
 +++ got/got.c
-@@ -213,7 +213,8 @@ main(int argc, char *argv[])
+@@ -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();
-@@ -3883,7 +3884,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+@@ -4022,7 +4023,7 @@ print_diff(void *arg, unsigned char status, unsigned c
  		if (dirfd != -1) {
  			fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
  			if (fd == -1) {
 -				if (errno != ELOOP) {
 +				if (errno != ELOOP && errno != EMLINK) {
  					err = got_error_from_errno2("openat",
  					    abspath);
  					goto done;
-@@ -3896,7 +3897,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+@@ -4035,7 +4036,7 @@ print_diff(void *arg, unsigned char status, unsigned c
  		} else {
  			fd = open(abspath, O_RDONLY | O_NOFOLLOW);
  			if (fd == -1) {
 -				if (errno != ELOOP) {
 +				if (errno != ELOOP && errno != EMLINK) {
  					err = got_error_from_errno2("open",
  					    abspath);
  					goto done;
-@@ -9282,11 +9283,11 @@ cat_commit(struct got_object_id *id, struct got_reposi
+@@ -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));
-@@ -9341,7 +9342,7 @@ cat_tag(struct got_object_id *id, struct got_repositor
+@@ -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));
Index: head/devel/got/files/patch-lib_object__create.c
===================================================================
--- head/devel/got/files/patch-lib_object__create.c	(revision 550016)
+++ head/devel/got/files/patch-lib_object__create.c	(revision 550017)
@@ -1,44 +1,44 @@
---- lib/object_create.c.orig	2020-07-25 09:10:27 UTC
+--- lib/object_create.c.orig	2020-09-25 11:58:47 UTC
 +++ lib/object_create.c
-@@ -129,7 +129,7 @@ got_object_blob_create(struct got_object_id **id, cons
+@@ -131,7 +131,7 @@ got_object_blob_file_create(struct got_object_id **id,
  
  	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
  	if (fd == -1) {
 -		if (errno != ELOOP)
 +		if (errno != ELOOP && errno != EMLINK)
  			return got_error_from_errno2("open", ondisk_path);
  
  		if (lstat(ondisk_path, &sb) == -1) {
-@@ -142,7 +142,7 @@ got_object_blob_create(struct got_object_id **id, cons
+@@ -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;
  	}
-@@ -417,12 +417,12 @@ got_object_commit_create(struct got_object_id **id,
+@@ -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;
-@@ -623,7 +623,7 @@ got_object_tag_create(struct got_object_id **id,
+@@ -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);
Index: head/devel/got/files/patch-lib_worktree.c
===================================================================
--- head/devel/got/files/patch-lib_worktree.c	(revision 550016)
+++ head/devel/got/files/patch-lib_worktree.c	(revision 550017)
@@ -1,50 +1,50 @@
---- lib/worktree.c.orig	2020-09-11 17:05:16 UTC
+--- lib/worktree.c.orig	2020-09-25 11:58:47 UTC
 +++ lib/worktree.c
-@@ -1225,7 +1225,7 @@ replace_existing_symlink(const char *ondisk_path, cons
+@@ -1227,7 +1227,7 @@ replace_existing_symlink(const char *ondisk_path, cons
  	 */
  	fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
  	if (fd == -1) {
 -		if (errno != ELOOP)
 +		if (errno != ELOOP && errno != EMLINK)
  			return got_error_from_errno2("open", ondisk_path);
  
  		/* We are updating an existing on-disk symlink. */
-@@ -1701,9 +1701,9 @@ get_file_status(unsigned char *status, struct stat *sb
+@@ -1703,9 +1703,9 @@ get_file_status(unsigned char *status, struct stat *sb
  		}
  	} else {
  		fd = open(abspath, O_RDONLY | O_NOFOLLOW);
 -		if (fd == -1 && errno != ENOENT && errno != ELOOP)
 +		if (fd == -1 && errno != ENOENT && errno != ELOOP && errno != EMLINK)
  			return got_error_from_errno2("open", abspath);
 -		else if (fd == -1 && errno == ELOOP) {
 +		else if (fd == -1 && (errno == ELOOP || errno == EMLINK)) {
  			if (lstat(abspath, sb) == -1)
  				return got_error_from_errno2("lstat", abspath);
  		} else if (fd == -1 || fstat(fd, sb) == -1) {
-@@ -3484,7 +3484,7 @@ worktree_status(struct got_worktree *worktree, const c
+@@ -3518,7 +3518,7 @@ worktree_status(struct got_worktree *worktree, const c
  	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
  	if (fd == -1) {
  		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
 -		    errno != ELOOP)
 +		    errno != ELOOP && errno != EMLINK)
  			err = got_error_from_errno2("open", ondisk_path);
  		else
  			err = report_single_file_status(path, ondisk_path,
-@@ -4156,7 +4156,7 @@ create_patched_content(char **path_outfile, int revers
+@@ -4190,7 +4190,7 @@ create_patched_content(char **path_outfile, int revers
  	if (dirfd2 != -1) {
  		fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
  		if (fd2 == -1) {
 -			if (errno != ELOOP) {
 +			if (errno != ELOOP && errno != EMLINK) {
  				err = got_error_from_errno2("openat", path2);
  				goto done;
  			}
-@@ -4170,7 +4170,7 @@ create_patched_content(char **path_outfile, int revers
+@@ -4204,7 +4204,7 @@ create_patched_content(char **path_outfile, int revers
  	} else {
  		fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
  		if (fd2 == -1) {
 -			if (errno != ELOOP) {
 +			if (errno != ELOOP && errno != EMLINK) {
  				err = got_error_from_errno2("open", path2);
  				goto done;
  			}
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 550016)
+++ head/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c	(revision 550017)
@@ -1,11 +1,11 @@
---- libexec/got-index-pack/got-index-pack.c.orig	2020-09-11 20:18:20 UTC
+--- libexec/got-index-pack/got-index-pack.c.orig	2020-09-25 11:58:47 UTC
 +++ libexec/got-index-pack/got-index-pack.c
-@@ -244,7 +244,7 @@ read_packed_object(struct got_pack *pack, struct got_i
+@@ -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;
Index: head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
===================================================================
--- head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y	(revision 550016)
+++ head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y	(revision 550017)
@@ -1,29 +1,29 @@
---- libexec/got-read-gotconfig/parse.y.orig	2020-09-21 12:09:15 UTC
+--- libexec/got-read-gotconfig/parse.y.orig	2020-09-25 11:58:47 UTC
 +++ libexec/got-read-gotconfig/parse.y
-@@ -61,7 +61,7 @@ int		 igetc(void);
+@@ -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 {
-@@ -123,7 +123,7 @@ boolean		: STRING {
+@@ -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;
  			}
-@@ -385,7 +385,7 @@ getservice(char *n)
+@@ -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;
Index: head/devel/got/files/patch-tog_tog.c
===================================================================
--- head/devel/got/files/patch-tog_tog.c	(revision 550016)
+++ head/devel/got/files/patch-tog_tog.c	(revision 550017)
@@ -1,11 +1,11 @@
---- tog/tog.c.orig	2020-09-14 19:31:57 UTC
+--- tog/tog.c.orig	2020-09-25 11:58:47 UTC
 +++ tog/tog.c
-@@ -5645,7 +5645,7 @@ main(int argc, char *argv[])
+@@ -5654,7 +5654,7 @@ main(int argc, char *argv[])
  
  	argc -= optind;
  	argv += optind;
 -	optind = 0;
 +	optind = 1;
  	optreset = 1;
  
  	if (Vflag) {