2 files changed, 10 insertions, 97 deletions

diff --git a/sysutils/hostctl/Makefile b/sysutils/hostctl/Makefile
index 1614a210b34a..1c0a049a41d4 100644
--- a/sysutils/hostctl/Makefile
+++ b/sysutils/hostctl/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	hostctl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.14
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -10,43 +11,12 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	guumaster
-GH_TUPLE=	Microsoft:go-winio:v0.4.14:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
-		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		docker:distribution:v2.7.1:docker_distribution/vendor/github.com/docker/distribution \
-		moby:moby:v1.13.1:docker_docker/vendor/github.com/docker/docker \
-		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
-		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
-		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
-		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:net:ab3426394381:golang_net/vendor/golang.org/x/net \
-		golang:sys:cb9d2d5c5666:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
-		gookit:color:v1.1.6:gookit_color/vendor/gopkg.in/gookit/color.v1 \
-		guumaster:cligger:v0.1.1:guumaster_cligger/vendor/github.com/guumaster/cligger \
-		guumaster:logsymbols:v0.3.1:guumaster_logsymbols/vendor/github.com/guumaster/logsymbols \
-		guumaster:tablewriter:v0.0.9:guumaster_tablewriter/vendor/github.com/guumaster/tablewriter \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.9:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		opencontainers:go-digest:v1.0.0:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
-		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
-		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
-		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
-		spf13:afero:v1.3.2:spf13_afero/vendor/github.com/spf13/afero \
-		spf13:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify
 
+GO_MODULE=	github.com/guumaster/${PORTNAME}
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
-		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/${GH_PROJECT}/actions.version=${DISTVERSION}"
+		-X ${GO_MODULE}/cmd/${GH_PROJECT}/actions.version=${DISTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CODE_OF_CONDUCT.md CONTRIBUTING.md README.md
@@ -55,6 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/hostctl/distinfo b/sysutils/hostctl/distinfo
index cb35ae898ca8..6decb06d55cc 100644
--- a/sysutils/hostctl/distinfo
+++ b/sysutils/hostctl/distinfo
@@ -1,63 +1,5 @@
-TIMESTAMP = 1595758482
-SHA256 (guumaster-hostctl-v1.0.14_GH0.tar.gz) = c69a539d50805f59acf3f171eef8f9db3e1c8813559071b7259b6d31cefa0553
-SIZE (guumaster-hostctl-v1.0.14_GH0.tar.gz) = 289357
-SHA256 (Microsoft-go-winio-v0.4.14_GH0.tar.gz) = 379082e49fb22dfdd9a0ff57f8a6d6d7e97ba30fdc0159ef2f38dc4caa79fd8e
-SIZE (Microsoft-go-winio-v0.4.14_GH0.tar.gz) = 118053
-SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
-SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (docker-distribution-v2.7.1_GH0.tar.gz) = 4c3609c102351f15c0386f619d48bb592f3100726b4bde86f3eba7739192ff55
-SIZE (docker-distribution-v2.7.1_GH0.tar.gz) = 1996699
-SHA256 (moby-moby-v1.13.1_GH0.tar.gz) = 0d24e814f7adf19dc281b29fef69d0dfec7994966de9aaed7d4207d3034b9ee0
-SIZE (moby-moby-v1.13.1_GH0.tar.gz) = 7788124
-SHA256 (docker-go-connections-v0.4.0_GH0.tar.gz) = e31dfcf72dd9b07bf6dc320671a78a142a1b7c6287a7282c034c8cd463bc8663
-SIZE (docker-go-connections-v0.4.0_GH0.tar.gz) = 30770
-SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b
-SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514
-SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
-SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
-SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
-SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
-SHA256 (golang-net-ab3426394381_GH0.tar.gz) = ddf23e17a147972ad0dd11824a912eaa0174cba60ab63da6ae6ced2c76345946
-SIZE (golang-net-ab3426394381_GH0.tar.gz) = 1177700
-SHA256 (golang-sys-cb9d2d5c5666_GH0.tar.gz) = 5dd66a7e80acb8db52bc480f19ea869c9cf7af4a4c71da0c011f871ea4615a24
-SIZE (golang-sys-cb9d2d5c5666_GH0.tar.gz) = 1054924
-SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
-SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
-SHA256 (gookit-color-v1.1.6_GH0.tar.gz) = 2a042f28eef50cc7d62c569f5f77e1cb49ce6efd2bd9fbadd60b3ed65ab8810b
-SIZE (gookit-color-v1.1.6_GH0.tar.gz) = 887536
-SHA256 (guumaster-cligger-v0.1.1_GH0.tar.gz) = c1d053e1da05b1e41a3d1efe1367359e8a5f62ed126ba0742f347d0c183fbc02
-SIZE (guumaster-cligger-v0.1.1_GH0.tar.gz) = 16929
-SHA256 (guumaster-logsymbols-v0.3.1_GH0.tar.gz) = c7b5deb0b8502fb55714a6cb4be80ca3cff027d615dc816a01718cb2cc06d450
-SIZE (guumaster-logsymbols-v0.3.1_GH0.tar.gz) = 30656
-SHA256 (guumaster-tablewriter-v0.0.9_GH0.tar.gz) = 29f4a8cc2a40563c700d0d13fdea09381630b9fe6c14e73b87e25871b1d6f3f4
-SIZE (guumaster-tablewriter-v0.0.9_GH0.tar.gz) = 19998
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 4f20a337ad06e071f29535afe9c5207d3e8840c8c86672bbc5f9837c6229c835
-SIZE (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 16714
-SHA256 (opencontainers-go-digest-v1.0.0_GH0.tar.gz) = 1e74706d265c92f62793af741e322163f3c08afa66f5a7926c9b9ccb44fed230
-SIZE (opencontainers-go-digest-v1.0.0_GH0.tar.gz) = 24456
-SHA256 (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = c7ca467de2cca65e7ea74414a3f51e91450156213af485830dcdfff0571e10d2
-SIZE (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = 138674
-SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
-SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
-SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
-SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f
-SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143
-SHA256 (spf13-afero-v1.3.2_GH0.tar.gz) = 3d91cc17dda655b202c91e826e0886176959e73bcc0905e3ba7fa4c184c15a02
-SIZE (spf13-afero-v1.3.2_GH0.tar.gz) = 52864
-SHA256 (spf13-cobra-v1.0.0_GH0.tar.gz) = 58dbfe1b4dbc6751575e94d1e62d073098e0b41790bc1c7a7a95ec6b870ac697
-SIZE (spf13-cobra-v1.0.0_GH0.tar.gz) = 128897
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
-SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
+TIMESTAMP = 1620926017
+SHA256 (go/sysutils_hostctl/hostctl-v1.0.14/v1.0.14.mod) = 62d808074b5f20ade6a0a3f0674c7ac038b46a18c19742479d27d7896a1ead58
+SIZE (go/sysutils_hostctl/hostctl-v1.0.14/v1.0.14.mod) = 1051
+SHA256 (go/sysutils_hostctl/hostctl-v1.0.14/v1.0.14.zip) = 7769d1c59c752327f9b7683b6ee7bc73fcc11237a0a975d179e03121308bbe16
+SIZE (go/sysutils_hostctl/hostctl-v1.0.14/v1.0.14.zip) = 329203