editors/micro: Update 2.0.6 -> 2.0.7

PR:		249209
Submitted by:	vulcan@wired.sh (maintainer)

3 files changed, 35 insertions, 28 deletions

diff --git a/editors/micro/Makefile b/editors/micro/Makefile
index 7df8c180ebc5..bdbb867649a7 100644
--- a/editors/micro/Makefile
+++ b/editors/micro/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	micro
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -12,11 +12,9 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	zyedidia
-GH_TUPLE=	\
-		blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
+GH_TUPLE=	blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
@@ -34,34 +32,41 @@ GH_TUPLE=	\
 		robertkrimen:otto:c382bd3c16ff:robertkrimen_otto/vendor/github.com/robertkrimen/otto \
 		sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
 		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
+		xo:terminfo:454e5b68f9e8:xo_terminfo/vendor/github.com/xo/terminfo \
 		yuin:gopher-lua:ab39c6098bdb:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua \
-		zyedidia:clipboard:7c45b8673834:zyedidia_clipboard/vendor/github.com/zyedidia/clipboard \
+		zyedidia:clipboard:v1.0.3:zyedidia_clipboard/vendor/github.com/zyedidia/clipboard \
 		zyedidia:glob:dd4023a66dc3:zyedidia_glob/vendor/github.com/zyedidia/glob \
 		zyedidia:go-shellquote:eccd813c0655:zyedidia_go_shellquote/vendor/github.com/kballard/go-shellquote \
 		zyedidia:highlight:201131ce5cf5:zyedidia_highlight/vendor/github.com/zyedidia/highlight \
 		zyedidia:json5:2da050b1a98d:zyedidia_json5/vendor/github.com/zyedidia/json5 \
 		zyedidia:poller:v1.0.1:zyedidia_poller/vendor/github.com/zyedidia/poller \
 		zyedidia:pty:v2.0.0:zyedidia_pty/vendor/github.com/zyedidia/pty \
-		zyedidia:tcell:v1.4.8:zyedidia_tcell/vendor/github.com/zyedidia/tcell \
+		zyedidia:tcell:v2.0.2:zyedidia_tcell_v2/vendor/github.com/zyedidia/tcell/v2 \
 		zyedidia:terminal:533c623e2415:zyedidia_terminal/vendor/github.com/zyedidia/terminal
 
-GO_TARGET=	./cmd/micro
+_BUILD_VERSION=	${DISTVERSION}
+_BUILD_HASH=	5044ccf
+_BUILD_DATE=	$$(date '+%B %d, %Y')
+_BUILD_DEBUG=	OFF
+
+GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
-		-X github.com/zyedidia/micro/v2/internal/util.Version=${PORTVERSION} \
-		-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${BUILD_HASH} \
-		-X 'github.com/zyedidia/micro/v2/internal/util.CompileDate=${BUILD_DATE}'"
+		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/v2/internal/util.Version=${_BUILD_VERSION} \
+		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/v2/internal/util.CommitHash=${_BUILD_HASH} \
+		-X 'github.com/${GH_ACCOUNT}/${GH_PROJECT}/v2/internal/util.CompileDate=${_BUILD_DATE}' \
+		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/v2/internal/util.Debug=${_BUILD_DEBUG}"
 
-BUILD_HASH=	60846f5
-BUILD_DATE=	Jun 24, 2020
-
-PLIST_FILES=	bin/micro
+PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DEBUG DOCS
+
+DEBUG_DESC=	Enable debug logging
+DEBUG_VARS=	_BUILD_DEBUG=ON
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/micro/distinfo b/editors/micro/distinfo
index 0db0ef2697ca..190f5b300823 100644
--- a/editors/micro/distinfo
+++ b/editors/micro/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1593087170
-SHA256 (zyedidia-micro-v2.0.6_GH0.tar.gz) = 55bd3ab880905d45639a1f902ec1a84cb385e73de9a3e16d8175b3cd7f7fe908
-SIZE (zyedidia-micro-v2.0.6_GH0.tar.gz) = 782976
+TIMESTAMP = 1599650981
+SHA256 (zyedidia-micro-v2.0.7_GH0.tar.gz) = 50020f0fd450373f0f8ce5015b483da840a853c1d7b582a425b536aa8aa28bd5
+SIZE (zyedidia-micro-v2.0.7_GH0.tar.gz) = 797975
 SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57
 SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
@@ -37,10 +37,12 @@ SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c21
 SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552
 SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
 SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
+SHA256 (xo-terminfo-454e5b68f9e8_GH0.tar.gz) = 51c54af0bc27d2fe2293d3c144e3fdf44ff5c805ee8ecf39bc57f19620ad45af
+SIZE (xo-terminfo-454e5b68f9e8_GH0.tar.gz) = 35574
 SHA256 (yuin-gopher-lua-ab39c6098bdb_GH0.tar.gz) = 709a4aeb7a033157f678db2a5f785a1bfc541cbeb5cf53a1e92ba8d8fd93fd07
 SIZE (yuin-gopher-lua-ab39c6098bdb_GH0.tar.gz) = 161569
-SHA256 (zyedidia-clipboard-7c45b8673834_GH0.tar.gz) = 8f7086b4ba885e9799cd5d794c85f434f5875a7b9c12f0d1237f0029de673d7e
-SIZE (zyedidia-clipboard-7c45b8673834_GH0.tar.gz) = 4437
+SHA256 (zyedidia-clipboard-v1.0.3_GH0.tar.gz) = 163b9caa403c788919a92188b8d1b326094be6ce3879a99c4fdc55c4e7482ad8
+SIZE (zyedidia-clipboard-v1.0.3_GH0.tar.gz) = 4872
 SHA256 (zyedidia-glob-dd4023a66dc3_GH0.tar.gz) = 9371f2b148e6d0bc9ff79e5f6ca72729cea91af03ff1ab231b8e727c6dd579e2
 SIZE (zyedidia-glob-dd4023a66dc3_GH0.tar.gz) = 2701
 SHA256 (zyedidia-go-shellquote-eccd813c0655_GH0.tar.gz) = 3ed70251194b73039579044043d0e0fd4d664cc620aea1b9d32b32fba49b705d
@@ -53,7 +55,7 @@ SHA256 (zyedidia-poller-v1.0.1_GH0.tar.gz) = 699850cfe19c4a67b044c4059438119a4c9
 SIZE (zyedidia-poller-v1.0.1_GH0.tar.gz) = 15922
 SHA256 (zyedidia-pty-v2.0.0_GH0.tar.gz) = 3158c5f0e6a9af4ef589e37528253ecd6a53fdb4ddb47e2a2dbfc20048fe9615
 SIZE (zyedidia-pty-v2.0.0_GH0.tar.gz) = 5745
-SHA256 (zyedidia-tcell-v1.4.8_GH0.tar.gz) = ec4893f168c2d8f7bc7823cded987a7d0a7fa67e5438186d20df2f553cef4775
-SIZE (zyedidia-tcell-v1.4.8_GH0.tar.gz) = 132428
+SHA256 (zyedidia-tcell-v2.0.2_GH0.tar.gz) = cf03b48b1742bdbfe26fc0e9d137d6d8e415795278f7c6d8892b2ba5d7179f5d
+SIZE (zyedidia-tcell-v2.0.2_GH0.tar.gz) = 131461
 SHA256 (zyedidia-terminal-533c623e2415_GH0.tar.gz) = a6fbd14c4d612264d5ea1464039d5484b08cd0a2ad2708cd0ab264613d445ace
 SIZE (zyedidia-terminal-533c623e2415_GH0.tar.gz) = 12894
diff --git a/editors/micro/files/patch-vendor_github.com_zyedidia_pty_ztypes__freebsd__arm64.go b/editors/micro/files/patch-vendor_github.com_zyedidia_pty_ztypes__freebsd__arm64.go
index 356276d46482..e13b200f0052 100644
--- a/editors/micro/files/patch-vendor_github.com_zyedidia_pty_ztypes__freebsd__arm64.go
+++ b/editors/micro/files/patch-vendor_github.com_zyedidia_pty_ztypes__freebsd__arm64.go
@@ -1,5 +1,5 @@
---- vendor/github.com/zyedidia/pty/ztypes_freebsd_arm64.go.orig	2019-12-23 19:57:30.388608000 +0100
-+++ vendor/github.com/zyedidia/pty/ztypes_freebsd_arm64.go	2019-12-23 19:56:25.521268000 +0100
+--- vendor/github.com/zyedidia/pty/ztypes_freebsd_arm64.go.orig	2020-09-10 23:26:01 UTC
++++ vendor/github.com/zyedidia/pty/ztypes_freebsd_arm64.go
 @@ -0,0 +1,13 @@
 +// Created by cgo -godefs - DO NOT EDIT
 +// cgo -godefs types_freebsd.go
@@ -11,6 +11,6 @@
 +)
 +
 +type fiodgnameArg struct {
-+	Len       int32
-+	Buf       *byte
++	Len int32
++	Buf *byte
 +}