sysutils/gotop: Update 3.0.0 -> 3.5.2; Move from the discontinued cjbassi account to a maintained fork under the xxxserxxx account

3 files changed, 82 insertions, 17 deletions

diff --git a/sysutils/gotop/Makefile b/sysutils/gotop/Makefile
index 00625c6e29c7..2b7ae8bfb186 100644
--- a/sysutils/gotop/Makefile
+++ b/sysutils/gotop/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	gotop
-DISTVERSION=	3.0.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.5.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,12 +13,35 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
-GH_ACCOUNT=	cjbassi
-GH_TUPLE=	docopt:docopt.go:ee0de3b:docopt/src/github.com/docopt/docopt-go \
-		shirou:gopsutil:v2.19.01:gopsutil/src/github.com/shirou/gopsutil \
-		golang:sys:37707fd:sys/src/golang.org/x/sys
+GH_ACCOUNT=	xxxserxxx # forked from cjbassi/gotop that was discontinued
+GH_TUPLE=	\
+		StackExchange:wmi:5d049714c4a6:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
+		cjbassi:drawille-go:27dc511fe6fd:cjbassi_drawille_go/vendor/github.com/cjbassi/drawille-go \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		distatus:battery:v0.9.0:distatus_battery/vendor/github.com/distatus/battery \
+		docopt:docopt.go:ee0de3bc6815:docopt_docopt_go/vendor/github.com/docopt/docopt.go \
+		gizak:termui:v3.0.0:gizak_termui_v3/vendor/github.com/gizak/termui/v3 \
+		go-ole:go-ole:v1.2.1:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
+		go-yaml:yaml:v2.2.5:go_yaml_yaml/vendor/gopkg.in/yaml \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:e047566fdf82:golang_sys/vendor/golang.org/x/sys \
+		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		mitchellh:go-wordwrap:v1.0.0:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
+		nsf:termbox-go:02980233997d:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		prometheus:client_golang:v1.4.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.9.1:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.8:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		shirou:gopsutil:v2.18.11:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
+		shirou:w32:bb4de0191aa4:shirou_w32/vendor/github.com/shirou/w32 \
+		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify
+GL_TUPLE=	https://gitlab.howett.net:go:plist:591f970eefbbeb04d7b37f334a0c4c3256e32876:go_plist/vendor/howett.net/plist
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	./cmd/gotop/
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/sysutils/gotop/distinfo b/sysutils/gotop/distinfo
index 8ea0078d06aa..28b3e157542b 100644
--- a/sysutils/gotop/distinfo
+++ b/sysutils/gotop/distinfo
@@ -1,9 +1,51 @@
-TIMESTAMP = 1550907308
-SHA256 (cjbassi-gotop-3.0.0_GH0.tar.gz) = d5147080bb6057f0bf0900b38438e89aa066959c845bdd4c84a9c9fe478b176f
-SIZE (cjbassi-gotop-3.0.0_GH0.tar.gz) = 1887890
-SHA256 (docopt-docopt.go-ee0de3b_GH0.tar.gz) = 6eb951df9aa0503060e3912fd10f5f592b4453a5f1d5130995db02aa4697374d
-SIZE (docopt-docopt.go-ee0de3b_GH0.tar.gz) = 30659
-SHA256 (shirou-gopsutil-v2.19.01_GH0.tar.gz) = 5ea929c3e3550a9601f41c0813f0c9da3ba338ebd1060452aded2d4ba1cb8444
-SIZE (shirou-gopsutil-v2.19.01_GH0.tar.gz) = 118948
-SHA256 (golang-sys-37707fd_GH0.tar.gz) = 9a86c90f564594b3f201540d19fb4fb828e1df8af61bb2fa9190a760cba039a7
-SIZE (golang-sys-37707fd_GH0.tar.gz) = 795284
+TIMESTAMP = 1588098596
+SHA256 (xxxserxxx-gotop-v3.5.2_GH0.tar.gz) = d175d370491c1d1b98c8cd1015674f5cfc04d3dbe6ea4a528b641698f0fafb34
+SIZE (xxxserxxx-gotop-v3.5.2_GH0.tar.gz) = 992891
+SHA256 (StackExchange-wmi-5d049714c4a6_GH0.tar.gz) = d8025ef6297d6d96ea12ef9dda1f71628958e2021e60ede92bc5816f225cbad9
+SIZE (StackExchange-wmi-5d049714c4a6_GH0.tar.gz) = 11234
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (cjbassi-drawille-go-27dc511fe6fd_GH0.tar.gz) = a9e06c0d5335e10010e71d81415f65c69d8f4c2e9f7b26c8d3a84dee49a2b6ae
+SIZE (cjbassi-drawille-go-27dc511fe6fd_GH0.tar.gz) = 1708
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (distatus-battery-v0.9.0_GH0.tar.gz) = 506b50c552020638733f1ecdeca2e845ee6bbc015d1b7ebd6c7438d5a664fb81
+SIZE (distatus-battery-v0.9.0_GH0.tar.gz) = 13738
+SHA256 (docopt-docopt.go-ee0de3bc6815_GH0.tar.gz) = ba02d30f7be6ff0f486c9ea8cacd84255d643cf58397a6926b805c76ed6da43a
+SIZE (docopt-docopt.go-ee0de3bc6815_GH0.tar.gz) = 30673
+SHA256 (gizak-termui-v3.0.0_GH0.tar.gz) = a1df0d378b813be620f4b593c1b98056ce0091ec6a830e765dec7cf645a248b4
+SIZE (gizak-termui-v3.0.0_GH0.tar.gz) = 184064
+SHA256 (go-ole-go-ole-v1.2.1_GH0.tar.gz) = e39183c0ca968dbd700d5019e2c9ae962b0839fd71e7d66c610ff4ea0ddf50c4
+SIZE (go-ole-go-ole-v1.2.1_GH0.tar.gz) = 51315
+SHA256 (go-yaml-yaml-v2.2.5_GH0.tar.gz) = 7b3929eeaa6c9ba8be52a10d195955060ff0b8b8c13671d533d26ff27fb13de2
+SIZE (go-yaml-yaml-v2.2.5_GH0.tar.gz) = 72259
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sys-e047566fdf82_GH0.tar.gz) = efdcc83f41376bfb46c4337ecd1bdcbe88c7b7c1d93a191e67b0b7b44ad08c2a
+SIZE (golang-sys-e047566fdf82_GH0.tar.gz) = 1535022
+SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
+SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
+SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
+SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
+SHA256 (mitchellh-go-wordwrap-v1.0.0_GH0.tar.gz) = 9bcf5c1f8b66594c73f606502bb3d9713d862a71ea66d8641e2a0b7bb66cb252
+SIZE (mitchellh-go-wordwrap-v1.0.0_GH0.tar.gz) = 2777
+SHA256 (nsf-termbox-go-02980233997d_GH0.tar.gz) = 454576132767864baa6bf84a81836ed6dc0e18d6dd20561cf8bf9127b13f427b
+SIZE (nsf-termbox-go-02980233997d_GH0.tar.gz) = 31954
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (prometheus-client_golang-v1.4.1_GH0.tar.gz) = 98a59a22033b87f160e882e6bf30b20715bf78d27964e5d1b8a99889412fefdf
+SIZE (prometheus-client_golang-v1.4.1_GH0.tar.gz) = 148394
+SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
+SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
+SHA256 (prometheus-common-v0.9.1_GH0.tar.gz) = a36c6c9ad9da26e20fe7b0a3b0ffe6d3b6d30695289a2caf4d4bdad11620c91c
+SIZE (prometheus-common-v0.9.1_GH0.tar.gz) = 107014
+SHA256 (prometheus-procfs-v0.0.8_GH0.tar.gz) = 1c26c8b86a9b1902684f860f94d0bf4b94abcc570e456bf9a74d1c9d83643872
+SIZE (prometheus-procfs-v0.0.8_GH0.tar.gz) = 126299
+SHA256 (shirou-gopsutil-v2.18.11_GH0.tar.gz) = 328d044bd4a8898073760c484a0254f5dc1c4b08b5fca4abc63ffbfb383d13c9
+SIZE (shirou-gopsutil-v2.18.11_GH0.tar.gz) = 116115
+SHA256 (shirou-w32-bb4de0191aa4_GH0.tar.gz) = 9392c79053e1137f6e5716d5c3f28a9639c7aed9292a1ca4b8f41fa9202dbba8
+SIZE (shirou-w32-bb4de0191aa4_GH0.tar.gz) = 44336
+SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
+SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
diff --git a/sysutils/gotop/pkg-descr b/sysutils/gotop/pkg-descr
index a61e2195a6f1..961dd845cdaf 100644
--- a/sysutils/gotop/pkg-descr
+++ b/sysutils/gotop/pkg-descr
@@ -2,4 +2,4 @@ gotop is a terminal-based graphical activity monitor inspired by gtop and vtop.
 
 It shows CPU/Disk/Memory/Network usage and process lists.
 
-WWW: https://github.com/cjbassi/gotop
+WWW: https://github.com/xxxserxxx/gotop