Update to 0.40. User-visible changes:

- document our default choice of text editor
- fix got.conf overriding GOT_AUTHOR even if no author is set in got.conf
- fix crash in got_free_gotconfig()
- print newline to clear the bottom line when tog exits

8 files changed, 13 insertions, 100 deletions

diff --git a/devel/got/Makefile b/devel/got/Makefile
index 67a5473fc9f7..6043757e37a0 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	got
-PORTVERSION=	0.39
-PORTREVISION=	2
+PORTVERSION=	0.40
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
diff --git a/devel/got/distinfo b/devel/got/distinfo
index 4ea70eb44925..9709155eca58 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600100495
-SHA256 (got-0.39.tar.gz) = 0169e18c71e9005935e8c6b77ea95f18c49762b98767b7d312a3d24121e39df4
-SIZE (got-0.39.tar.gz) = 440979
+TIMESTAMP = 1600702149
+SHA256 (got-0.40.tar.gz) = 7c587749bb990c9d933808e860fc18a4259861bb82cffac3ead7a4640c77d23b
+SIZE (got-0.40.tar.gz) = 440924
diff --git a/devel/got/files/patch-got_got.c b/devel/got/files/patch-got_got.c
index a35ffc028d8e..de08acf6e9d6 100644
--- a/devel/got/files/patch-got_got.c
+++ b/devel/got/files/patch-got_got.c
@@ -1,4 +1,4 @@
---- got/got.c.orig	2020-09-14 13:58:27 UTC
+--- got/got.c.orig	2020-09-21 12:09:15 UTC
 +++ got/got.c
 @@ -213,7 +213,8 @@ main(int argc, char *argv[])
  
@@ -10,7 +10,7 @@
  
  	if (Vflag) {
  		got_version_print_str();
-@@ -3884,7 +3885,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+@@ -3883,7 +3884,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) {
@@ -19,7 +19,7 @@
  					err = got_error_from_errno2("openat",
  					    abspath);
  					goto done;
-@@ -3897,7 +3898,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+@@ -3896,7 +3897,7 @@ print_diff(void *arg, unsigned char status, unsigned c
  		} else {
  			fd = open(abspath, O_RDONLY | O_NOFOLLOW);
  			if (fd == -1) {
@@ -28,7 +28,7 @@
  					err = got_error_from_errno2("open",
  					    abspath);
  					goto done;
-@@ -9283,11 +9284,11 @@ cat_commit(struct got_object_id *id, struct got_reposi
+@@ -9282,11 +9283,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),
@@ -42,7 +42,7 @@
  
  	logmsg = got_object_commit_get_logmsg_raw(commit);
  	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
-@@ -9342,7 +9343,7 @@ cat_tag(struct got_object_id *id, struct got_repositor
+@@ -9341,7 +9342,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),
diff --git a/devel/got/files/patch-lib_utf8.c b/devel/got/files/patch-lib_utf8.c
deleted file mode 100644
index b51911bede0f..000000000000
--- a/devel/got/files/patch-lib_utf8.c
+++ /dev/null
@@ -1,12 +0,0 @@
-XXX remove after 0.39
---- lib/utf8.c.orig	2020-09-10 16:01:39 UTC
-+++ lib/utf8.c
-@@ -15,6 +15,8 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#include <sys/types.h>
-+
- #include <err.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c b/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c
deleted file mode 100644
index a6b391ded6f4..000000000000
--- a/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c
+++ /dev/null
@@ -1,11 +0,0 @@
-XXX remove after 0.39
---- libexec/got-read-gotconfig/got-read-gotconfig.c.orig	2020-09-14 16:29:32 UTC
-+++ libexec/got-read-gotconfig/got-read-gotconfig.c
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sha1.h>
-+#include <unistd.h>
- #include <zlib.h>
- 
- #include "got_error.h"
diff --git a/devel/got/files/patch-libexec_got-read-gotconfig_parse.y b/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
index 857a2869f2ee..38d12d1d05fd 100644
--- a/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
+++ b/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
@@ -1,36 +1,6 @@
-XXX remove first hunk after 0.39
---- libexec/got-read-gotconfig/parse.y.orig	2020-09-14 16:35:22 UTC
+--- libexec/got-read-gotconfig/parse.y.orig	2020-09-21 12:09:15 UTC
 +++ libexec/got-read-gotconfig/parse.y
-@@ -24,27 +24,17 @@
- %{
- #include <sys/types.h>
- #include <sys/queue.h>
--#include <sys/socket.h>
--#include <sys/stat.h>
- 
--#include <netinet/in.h>
--
--#include <arpa/inet.h>
--
- #include <netdb.h>
- 
- #include <ctype.h>
- #include <err.h>
- #include <errno.h>
--#include <event.h>
--#include <ifaddrs.h>
--#include <imsg.h>
- #include <limits.h>
- #include <stdarg.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
--#include <syslog.h>
--#include <unistd.h>
- 
- #include "got_error.h"
- #include "gotconfig.h"
-@@ -71,7 +61,7 @@ int		 igetc(void);
+@@ -61,7 +61,7 @@ int		 igetc(void);
  int		 lgetc(int);
  void		 lungetc(int);
  int		 findeol(void);
@@ -39,7 +9,7 @@ XXX remove first hunk after 0.39
  
  TAILQ_HEAD(symhead, sym)	 symhead = TAILQ_HEAD_INITIALIZER(symhead);
  struct sym {
-@@ -133,7 +123,7 @@ boolean		: STRING {
+@@ -123,7 +123,7 @@ boolean		: STRING {
  		;
  numberstring	: NUMBER				{
  			char	*s;
@@ -48,7 +18,7 @@ XXX remove first hunk after 0.39
  				yyerror("string: asprintf");
  				YYERROR;
  			}
-@@ -395,7 +385,7 @@ getservice(char *n)
+@@ -385,7 +385,7 @@ getservice(char *n)
  }
  
  static int
diff --git a/devel/got/files/patch-regress_cmdline_commit.sh b/devel/got/files/patch-regress_cmdline_commit.sh
deleted file mode 100644
index 3c4f2edf6682..000000000000
--- a/devel/got/files/patch-regress_cmdline_commit.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-XXX remove after 0.39
---- regress/cmdline/commit.sh.orig	2020-09-13 18:20:00 UTC
-+++ regress/cmdline/commit.sh
-@@ -248,7 +248,8 @@ test_commit_deleted_subdirs() {
- 		return 1
- 	fi
- 
--	(cd $testroot/wt && got rm -R $testroot/wt/{epsilon,gamma} >/dev/null)
-+	(cd $testroot/wt && \
-+		got rm -R $testroot/wt/epsilon $testroot/wt/gamma >/dev/null)
- 
- 	(cd $testroot/wt && got commit -m 'test commit_deleted_subdirs' \
- 		> $testroot/stdout 2> $testroot/stderr)
diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh
index 6d5156bca83a..23d0105f1852 100644
--- a/devel/got/files/patch-regress_cmdline_common.sh
+++ b/devel/got/files/patch-regress_cmdline_common.sh
@@ -1,4 +1,3 @@
-XXX remove second hunk after 0.39
 --- regress/cmdline/common.sh.orig	2020-09-13 18:20:00 UTC
 +++ regress/cmdline/common.sh
 @@ -24,6 +24,20 @@ export GOT_LOG_DEFAULT_LIMIT=0
@@ -22,25 +21,6 @@ XXX remove second hunk after 0.39
  git_init()
  {
  	git init -q "$1"
-@@ -96,13 +110,13 @@ git_show_tree()
- 
- trim_obj_id()
- {
--	let trimcount=$1
--	id=$2
-+	local trimcount=$1
-+	local id=$2
- 
--	pat=""
--	while [ trimcount -gt 0 ]; do
-+	local pat=""
-+	while [ "$trimcount" -gt 0 ]; do
- 		pat="[0-9a-f]$pat"
--		let trimcount--
-+		trimcount=$((trimcount - 1))
- 	done
- 
- 	echo ${id%$pat}
 @@ -168,7 +182,7 @@ test_init()
  		echo "No test name provided" >&2
  		return 1