2 files changed, 12 insertions, 174 deletions

diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile
index 438e5690a861..fbc765037c21 100644
--- a/sysutils/zrepl/Makefile
+++ b/sysutils/zrepl/Makefile
@@ -1,12 +1,12 @@
 # Created by: Nikolai Lifanov <lifanov@FreeBSD.org> and Ben Woods <woodsb02@FreeBSD.org>
 
 PORTNAME=	zrepl
-PORTVERSION=	0.3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	0.3.1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	ZFS dataset replication tool
 
 LICENSE=	MIT
@@ -14,70 +14,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake go:modules
 USE_RC_SUBR=	zrepl
+
+GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
+
 SUB_FILES=	pkg-message
-USE_GITHUB=	yes
-GH_TUPLE=	\
-		alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
-		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
-		alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		cespare:xxhash:v2.1.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
-		ftrvxmtrx:fd:c6d800382fff:ftrvxmtrx_fd/vendor/github.com/ftrvxmtrx/fd \
-		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:v1.2.0:gdamore_tcell/vendor/github.com/gdamore/tcell \
-		gitchander:permutation:9e56b92e9909:gitchander_permutation/vendor/github.com/gitchander/permutation \
-		go-logfmt:logfmt:v0.4.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
-		go-sql-driver:mysql:b2c03bcae3d4:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
-		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:appengine:v1.1.0:golang_appengine/vendor/google.golang.org/appengine \
-		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
-		golang:tools:40960b6deb8e:golang_tools/vendor/golang.org/x/tools \
-		google:go-genproto:c66870c02cf8:google_go_genproto/vendor/google.golang.org/genproto \
-		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
-		grpc:grpc-go:v1.17.0:grpc_grpc_go/vendor/google.golang.org/grpc \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		jinzhu:copier:db4671f3a9b8:jinzhu_copier/vendor/github.com/jinzhu/copier \
-		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
-		kr:logfmt:b84e30acd515:kr_logfmt/vendor/github.com/kr/logfmt \
-		kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
-		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
-		lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
-		lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		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 \
-		montanaflynn:stats:v0.5.0:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
-		pkg:profile:v1.2.1:pkg_profile/vendor/github.com/pkg/profile \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		problame:go-netssh:26439f9f0dc5:problame_go_netssh/vendor/github.com/problame/go-netssh \
-		prometheus:client_golang:v1.2.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.0.5:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		sergi:go-diff:da645544ed44:sergi_go_diff/vendor/github.com/sergi/go-diff \
-		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		spf13:cobra:v0.0.2:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		theckman:goconstraint:v1.11.0:theckman_goconstraint/vendor/github.com/theckman/goconstraint \
-		willf:bitset:v1.1.10:willf_bitset/vendor/github.com/willf/bitset \
-		yudai:gojsondiff:7b1b7adf999d:yudai_gojsondiff/vendor/github.com/yudai/gojsondiff \
-		yudai:golcs:ecda9a501e82:yudai_golcs/vendor/github.com/yudai/golcs \
-		zrepl:yaml-config:cbb6b0cf4bdd:zrepl_yaml_config/vendor/github.com/zrepl/yaml-config
 
 OPTIONS_DEFINE=		EXAMPLES MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
-MANPAGES_USES=		python:build,3.6+
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.5,1:textproc/py-sphinx@${PY_FLAVOR}
+MANPAGES_USES=		python:build,3.6+
 MANPAGES_PLIST_FILES=	man/man1/zrepl.1.gz
 
 .include <bsd.port.options.mk>
diff --git a/sysutils/zrepl/distinfo b/sysutils/zrepl/distinfo
index eb37381bfc4e..754c67b6b316 100644
--- a/sysutils/zrepl/distinfo
+++ b/sysutils/zrepl/distinfo
@@ -1,113 +1,5 @@
-TIMESTAMP = 1611269188
-SHA256 (zrepl-zrepl-v0.3.1_GH0.tar.gz) = 46c4540c330ec68f30eafa9c44f27bfc04fcac85a2fe54b72b051c73cd11f66d
-SIZE (zrepl-zrepl-v0.3.1_GH0.tar.gz) = 383904
-SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
-SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
-SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
-SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
-SHA256 (alecthomas-units-c3de453c63f4_GH0.tar.gz) = b2eb77de46e677edb150bb4bf81d213416a477525980e315264cbd70b22d0ece
-SIZE (alecthomas-units-c3de453c63f4_GH0.tar.gz) = 3485
-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.0_GH0.tar.gz) = e290af0281cb450d295eafbecdbc3138f94c3ff728f14714af055a1d9a4ce15d
-SIZE (cespare-xxhash-v2.1.0_GH0.tar.gz) = 9198
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
-SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
-SHA256 (ftrvxmtrx-fd-c6d800382fff_GH0.tar.gz) = 69b71ef7c26bca3b06e9f75d3949a0536b8e0146a9154e8ec999dce6da6d4b0a
-SIZE (ftrvxmtrx-fd-c6d800382fff_GH0.tar.gz) = 3276
-SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
-SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-v1.2.0_GH0.tar.gz) = 39f3d1fb6c30b911141f6d19d3e3ee1352af7907336910811a8e60b2f10c8d8b
-SIZE (gdamore-tcell-v1.2.0_GH0.tar.gz) = 146485
-SHA256 (gitchander-permutation-9e56b92e9909_GH0.tar.gz) = 9f3575a75189ea932be960ef18a38d3ded4ef190d497a017ecebf0f4d25c9a8d
-SIZE (gitchander-permutation-9e56b92e9909_GH0.tar.gz) = 4966
-SHA256 (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = eddccc7c8d39a6381f7152e73ebf3c725de317c5b984d8a77282e63915aa834d
-SIZE (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = 12724
-SHA256 (go-sql-driver-mysql-b2c03bcae3d4_GH0.tar.gz) = 3c2356551b8115a7a2457d0c9a4b7e296d549badfffe06722d34a3d3459ad4e5
-SIZE (go-sql-driver-mysql-b2c03bcae3d4_GH0.tar.gz) = 89452
-SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
-SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-appengine-v1.1.0_GH0.tar.gz) = 83e0a8b26421bb2701bbd09a19b9242928573d41e912dd56eb331bac6a5c4aa6
-SIZE (golang-appengine-v1.1.0_GH0.tar.gz) = 302553
-SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
-SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
-SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
-SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
-SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
-SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
-SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
-SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
-SHA256 (golang-tools-40960b6deb8e_GH0.tar.gz) = 52208c4763a7d7911b83c9d7c8cfde852410a60230b75a25bad61ca32689244a
-SIZE (golang-tools-40960b6deb8e_GH0.tar.gz) = 2848894
-SHA256 (google-go-genproto-c66870c02cf8_GH0.tar.gz) = 156e7cd1f95947c3f3293e18baa7af04e0da58eeeb3475f15bcc308ff491f31a
-SIZE (google-go-genproto-c66870c02cf8_GH0.tar.gz) = 2191164
-SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 891add70cc16c9e2dc07986fd6e8fae44a36921727411f0b652afbc76e0fb169
-SIZE (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 563534
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (jinzhu-copier-db4671f3a9b8_GH0.tar.gz) = 82684446197805059b37f348a1489342cb487ee5a8601bec4cd4edcebb9a4dcb
-SIZE (jinzhu-copier-db4671f3a9b8_GH0.tar.gz) = 5036
-SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
-SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909
-SHA256 (kr-logfmt-b84e30acd515_GH0.tar.gz) = bf056ba7960b6846f2aa2c6ec0a217ead3e7259bc6c537f9f3ba3af6eb82cb80
-SIZE (kr-logfmt-b84e30acd515_GH0.tar.gz) = 6411
-SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
-SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
-SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
-SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686
-SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
-SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
-SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140
-SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545
-SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11
-SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981
-SHA256 (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 4f40edb394582f49ac6330bc807be93018216ef485eb65f00adcf61b670d4f3e
-SIZE (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 3564
-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 (montanaflynn-stats-v0.5.0_GH0.tar.gz) = 7013ef675c1836a574e20ae81b71ac4854796cc2a8abf55e176d4643849e3778
-SIZE (montanaflynn-stats-v0.5.0_GH0.tar.gz) = 28893
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
-SHA256 (pkg-profile-v1.2.1_GH0.tar.gz) = 21b6541e7cad44e984e9bad1dc700def6e52fa1affa38a867f32ff6a6bec3ac0
-SIZE (pkg-profile-v1.2.1_GH0.tar.gz) = 5789
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (problame-go-netssh-26439f9f0dc5_GH0.tar.gz) = 39e0ffba466d2dc89057a25c59edd12592312e0435070b700b78023aaa3bf09d
-SIZE (problame-go-netssh-26439f9f0dc5_GH0.tar.gz) = 15297
-SHA256 (prometheus-client_golang-v1.2.1_GH0.tar.gz) = fe6a626322d22d8ce9780320fd04a64a90c9a7aa62ec88809651072b30a10e6a
-SIZE (prometheus-client_golang-v1.2.1_GH0.tar.gz) = 142465
-SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03
-SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495
-SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae
-SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520
-SHA256 (prometheus-procfs-v0.0.5_GH0.tar.gz) = 0a28cd42f6c727ccd48878f7506f0a9c87b72e7dba122f8c6884aba3aab7c800
-SIZE (prometheus-procfs-v0.0.5_GH0.tar.gz) = 112152
-SHA256 (sergi-go-diff-da645544ed44_GH0.tar.gz) = b90c77c55769fffabfc555092910960be9481d105b20da510c921da56166f025
-SIZE (sergi-go-diff-da645544ed44_GH0.tar.gz) = 42371
-SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
-SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
-SHA256 (spf13-cobra-v0.0.2_GH0.tar.gz) = 5703ee865c6e7b11a471889fa05b8a4178b1ff8d98982bcadb46753b305e3d6b
-SIZE (spf13-cobra-v0.0.2_GH0.tar.gz) = 100775
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
-SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
-SHA256 (theckman-goconstraint-v1.11.0_GH0.tar.gz) = 98d95306dc3679374fb954f9a25a01606fc96a166fdcbda5226ff6f50d58dfcf
-SIZE (theckman-goconstraint-v1.11.0_GH0.tar.gz) = 5945
-SHA256 (willf-bitset-v1.1.10_GH0.tar.gz) = cae0a87412803d087eeb59a8ca26c399c57bff66f79966e3a4cce9a09de17b98
-SIZE (willf-bitset-v1.1.10_GH0.tar.gz) = 18708
-SHA256 (yudai-gojsondiff-7b1b7adf999d_GH0.tar.gz) = ac06dcedd4af0024cfaa8b9e2195611eecf5ee3ee1361d5186b07f0dea7eba02
-SIZE (yudai-gojsondiff-7b1b7adf999d_GH0.tar.gz) = 578880
-SHA256 (yudai-golcs-ecda9a501e82_GH0.tar.gz) = 080b0331f2d3e1f96446247afdc1c095d2ba2aca63a9b353fc4621e881d1dfa7
-SIZE (yudai-golcs-ecda9a501e82_GH0.tar.gz) = 3700
-SHA256 (zrepl-yaml-config-cbb6b0cf4bdd_GH0.tar.gz) = e91a8f240ec331d9cd2fecfaa47772e41c0ff182a335f5793d2f26ec8b1ac902
-SIZE (zrepl-yaml-config-cbb6b0cf4bdd_GH0.tar.gz) = 71249
+TIMESTAMP = 1621651083
+SHA256 (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.mod) = e809ef564d8187410ba9423bcc2c6abe992907674d5d4a4a471ebe8ea5513a04
+SIZE (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.mod) = 2164
+SHA256 (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.zip) = 79b707d7cf50329c9566367ae5459cbba483117269cac19c39756dc0abc4e30a
+SIZE (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.zip) = 520921