Switch to GO_MODULE after r566063

6 files changed, 36 insertions, 254 deletions

diff --git a/www/amfora/Makefile b/www/amfora/Makefile
index ac92a6b59ab5..204c70e28afa 100644
--- a/www/amfora/Makefile
+++ b/www/amfora/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	amfora
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -10,59 +11,11 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	makeworld-the-better-one
-GH_TUPLE=	PuerkitoBio:goquery:v1.5.1:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
-		andybalholm:cascadia:v1.1.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
-		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 \
-		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
-		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:19e17097d8fe:gdamore_tcell_v2/vendor/github.com/gdamore/tcell/v2 \
-		go-check:check:41f04d3bba15:go_check_check/vendor/gopkg.in/check.v1 \
-		go-ini:ini:v1.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
-		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 \
-		golang:crypto:0c6587e931a9:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:986b41b23924:golang_net/vendor/golang.org/x/net \
-		golang:sys:22da62e12c0c:golang_sys/vendor/golang.org/x/sys \
-		golang:term:2321bbc49cbf:golang_term/vendor/golang.org/x/term \
-		golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
-		google:go-cmp:v0.5.0:google_go_cmp/vendor/github.com/google/go-cmp \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
-		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
-		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
-		makeworld-the-better-one:go-gemini:v0.11.0:makeworld_the_better_one_go_gemini/vendor/github.com/makeworld-the-better-one/go-gemini \
-		makeworld-the-better-one:go-isemoji:v1.1.0:makeworld_the_better_one_go_isemoji/vendor/github.com/makeworld-the-better-one/go-isemoji \
-		makeworld-the-better-one:gofeed:c0c6354134fe:makeworld_the_better_one_gofeed/vendor/github.com/mmcdole/gofeed \
-		makeworld-the-better-one:progressbar:b036c4d38568:makeworld_the_better_one_progressbar_v3/vendor/github.com/schollz/progressbar/v3 \
-		mattn:go-runewidth:v0.0.10:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		mitchellh:colorstring:d06e56a500db:mitchellh_colorstring/vendor/github.com/mitchellh/colorstring \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
-		mitchellh:mapstructure:v1.3.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		mmcdole:goxpp:0068e33feabf:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \
-		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
-		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
-		pelletier:go-toml:v1.8.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
-		rkoesters:xdg:edd15b846f9b:rkoesters_xdg/vendor/github.com/rkoesters/xdg \
-		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
-		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
-		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		spf13:viper:v1.7.1:spf13_viper/vendor/github.com/spf13/viper \
-		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
-		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv
-
-USE_GITLAB=	nodefault
-GL_TUPLE=	tslocum:cbind:475986e4fda25b9fc3b95ee0b3d286dfa121c816:tslocum_cbind/vendor/gitlab.com/tslocum/cbind \
-		tslocum:cview:d776e728ef6d2a9990a5cd86a70b31f0678613e2:tslocum_cview/vendor/gitlab.com/tslocum/cview
 
 _BUILD_VERSION=	${DISTVERSIONFULL}
 _BUILD_COMMIT=	71385e9
 
+GO_MODULE=	github.com/makeworld-the-better-one/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
  	      	-s -w \
 		-X main.version=${_BUILD_VERSION}  \
@@ -76,10 +29,12 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
+		${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} \
+		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/amfora/distinfo b/www/amfora/distinfo
index 37d3f61d57a0..7d8523c7304e 100644
--- a/www/amfora/distinfo
+++ b/www/amfora/distinfo
@@ -1,93 +1,5 @@
-TIMESTAMP = 1617892663
-SHA256 (makeworld-the-better-one-amfora-v1.8.0_GH0.tar.gz) = 2cf95009ee9b70e46f92ea6346d4f615df2c163b27182ec0e62bf67fb9f9544c
-SIZE (makeworld-the-better-one-amfora-v1.8.0_GH0.tar.gz) = 2323219
-SHA256 (PuerkitoBio-goquery-v1.5.1_GH0.tar.gz) = 50b671f7128ac6993b7388d4e8a76901afdcaa7c6889f45687a2acc0d0753ca4
-SIZE (PuerkitoBio-goquery-v1.5.1_GH0.tar.gz) = 101380
-SHA256 (andybalholm-cascadia-v1.1.0_GH0.tar.gz) = 5d03f4610b70cab7860b158efab1afd91baa58fd95286a0adbadcdc3b49c7936
-SIZE (andybalholm-cascadia-v1.1.0_GH0.tar.gz) = 15464
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
-SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
-SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
-SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
-SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
-SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-19e17097d8fe_GH0.tar.gz) = 3d28e9d40105647e21e645203cba4f2495beebb012cc7b22aa0f7414a80581ad
-SIZE (gdamore-tcell-19e17097d8fe_GH0.tar.gz) = 148755
-SHA256 (go-check-check-41f04d3bba15_GH0.tar.gz) = 2d5b1036909b241e44f0d6a7cfa936cf9f875efb4f0af077cd61585c6d0c0432
-SIZE (go-check-check-41f04d3bba15_GH0.tar.gz) = 31614
-SHA256 (go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c470167d42f0f0bcd6642ff64e
-SIZE (go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
-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 (golang-crypto-0c6587e931a9_GH0.tar.gz) = e9c562f4a379e1b92ed0e58f2a21240409b1b98cca291d1b9a0bc650777b6cd1
-SIZE (golang-crypto-0c6587e931a9_GH0.tar.gz) = 1732705
-SHA256 (golang-net-986b41b23924_GH0.tar.gz) = a39c45e02c28265764b87106e986e8ce4c2236babf75b2f7b4cafe48e9afaa4b
-SIZE (golang-net-986b41b23924_GH0.tar.gz) = 1251244
-SHA256 (golang-sys-22da62e12c0c_GH0.tar.gz) = 5a120a40c63be9383650b7757c00645b25d37a3b7daa523f2a85fac969e51b2a
-SIZE (golang-sys-22da62e12c0c_GH0.tar.gz) = 1106889
-SHA256 (golang-term-2321bbc49cbf_GH0.tar.gz) = 72896f6aa3deb053da5b597ab072ba5c3540b29d0fb56f350397b7f94c010e21
-SIZE (golang-term-2321bbc49cbf_GH0.tar.gz) = 15281
-SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
-SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127
-SHA256 (google-go-cmp-v0.5.0_GH0.tar.gz) = 6d4eb0e3a4b7d1ee3a9fa917bd776c557e21cee0040c7da4fe6180acb9e2d911
-SIZE (google-go-cmp-v0.5.0_GH0.tar.gz) = 98584
-SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
-SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
-SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328c12aaed92af462363191fa76e9809a6
-SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
-SHA256 (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = b3ee835cc398287452377266313edcc231043bae4168f8d2706e5d34ce1ce755
-SIZE (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = 970830
-SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd
-SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735
-SHA256 (makeworld-the-better-one-go-gemini-v0.11.0_GH0.tar.gz) = be467ab09c4bf3f1df078651be415e6c7a614c0ab80332996c39651f82e08104
-SIZE (makeworld-the-better-one-go-gemini-v0.11.0_GH0.tar.gz) = 11866
-SHA256 (makeworld-the-better-one-go-isemoji-v1.1.0_GH0.tar.gz) = 181820a9d93d3265c08731ef8ad91102d3fcb91c716beb1a4867c2034e4e0740
-SIZE (makeworld-the-better-one-go-isemoji-v1.1.0_GH0.tar.gz) = 41073
-SHA256 (makeworld-the-better-one-gofeed-c0c6354134fe_GH0.tar.gz) = e6a6136414982b2860d49d36c9118ff5eaa2df5a243171df03a1a5c76af99616
-SIZE (makeworld-the-better-one-gofeed-c0c6354134fe_GH0.tar.gz) = 120198
-SHA256 (makeworld-the-better-one-progressbar-b036c4d38568_GH0.tar.gz) = f15ae93ac6bee454236e4ed923aa86fffba1ef3fa7dc5ab829dae864e943b034
-SIZE (makeworld-the-better-one-progressbar-b036c4d38568_GH0.tar.gz) = 603011
-SHA256 (mattn-go-runewidth-v0.0.10_GH0.tar.gz) = 48cb8654014d9eab1d59088dd1879907de1dab51c2ed3cee8c8254c1708c2d8e
-SIZE (mattn-go-runewidth-v0.0.10_GH0.tar.gz) = 16778
-SHA256 (mitchellh-colorstring-d06e56a500db_GH0.tar.gz) = 2093d564392b9d6b752471ad0506ee20d4f8648cd96c179536fcb17a9b4d4137
-SIZE (mitchellh-colorstring-d06e56a500db_GH0.tar.gz) = 4677
-SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
-SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
-SHA256 (mitchellh-mapstructure-v1.3.1_GH0.tar.gz) = 889ff894c134c160ad94056fb4cb8f1ec58e616633174985e8666dba80234f7c
-SIZE (mitchellh-mapstructure-v1.3.1_GH0.tar.gz) = 24984
-SHA256 (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 432aadb22bc36d15d405c8b08a2c44dfd6f73508c49971e5a773cb6683f124ab
-SIZE (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 5167
-SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
-SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
-SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
-SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
-SHA256 (pelletier-go-toml-v1.8.0_GH0.tar.gz) = 535241212044f52bc40c8eb08d15342c75cef8e6c887ceb1e18d25aad4ab3633
-SIZE (pelletier-go-toml-v1.8.0_GH0.tar.gz) = 96286
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197
-SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) = 44036
-SHA256 (rkoesters-xdg-edd15b846f9b_GH0.tar.gz) = 2aaa4b7b3036b82e89afc870ee532308e8d9f79e564e15164b34e91424dceb2a
-SIZE (rkoesters-xdg-edd15b846f9b_GH0.tar.gz) = 16616
-SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570
-SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157
-SHA256 (spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
-SIZE (spf13-cast-v1.3.1_GH0.tar.gz) = 11102
-SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d
-SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (spf13-viper-v1.7.1_GH0.tar.gz) = de85215b50e9fbb2cdf63b0aa9df826a866dff8f718ba2dc3f5866e98d5bd39a
-SIZE (spf13-viper-v1.7.1_GH0.tar.gz) = 82641
-SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
-SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
-SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
-SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
-SHA256 (tslocum-cbind-475986e4fda25b9fc3b95ee0b3d286dfa121c816_GL0.tar.gz) = f6272d4bf0f8802948002c3790321bd4f4f29998eccaccfb6860e3b84d07b9ae
-SIZE (tslocum-cbind-475986e4fda25b9fc3b95ee0b3d286dfa121c816_GL0.tar.gz) = 7381
-SHA256 (tslocum-cview-d776e728ef6d2a9990a5cd86a70b31f0678613e2_GL0.tar.gz) = 9add15e2cd5892d3aa1bfd714f3f54148d82dfb750d97aa5df9b37dd94d88998
-SIZE (tslocum-cview-d776e728ef6d2a9990a5cd86a70b31f0678613e2_GL0.tar.gz) = 714433
+TIMESTAMP = 1620926548
+SHA256 (go/www_amfora/amfora-v1.8.0/v1.8.0.mod) = 49b34fe33204fa0dd44367edfb8b653372a5bb492a6457137e3d33cab60967d5
+SIZE (go/www_amfora/amfora-v1.8.0/v1.8.0.mod) = 1354
+SHA256 (go/www_amfora/amfora-v1.8.0/v1.8.0.zip) = 75afa56dc92b9745796f3d07cbab0d88ad482f43ae992a924a10ba8ba70d4d8f
+SIZE (go/www_amfora/amfora-v1.8.0/v1.8.0.zip) = 2357969
diff --git a/www/chisel/Makefile b/www/chisel/Makefile
index f302868d8c17..ff58639d1b68 100644
--- a/www/chisel/Makefile
+++ b/www/chisel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	chisel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.6
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -10,28 +11,13 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	jpillora
-GH_TUPLE=	andrew-d:go-termutil:009166a695a2:andrew_d_go_termutil/vendor/github.com/andrew-d/go-termutil \
-		armon:go-socks5:e75332964ef5:armon_go_socks5/vendor/github.com/armon/go-socks5 \
-		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
-		golang:crypto:948cd5f35899:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:ab3426394381:golang_net/vendor/golang.org/x/net \
-		golang:sync:6e8e738ad208:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:ddb9806d33ae:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
-		gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
-		jpillora:ansi:v1.0.2:jpillora_ansi/vendor/github.com/jpillora/ansi \
-		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
-		jpillora:requestlog:v1.0.0:jpillora_requestlog/vendor/github.com/jpillora/requestlog \
-		jpillora:sizestr:v1.0.0:jpillora_sizestr/vendor/github.com/jpillora/sizestr \
-		tomasen:realip:f0c99a92ddce:tomasen_realip/vendor/github.com/tomasen/realip
 
 _BUILD_VERSION=	${DISTVERSION}
 
+GO_MODULE=	github.com/jpillora/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
-		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/share.BuildVersion=${_BUILD_VERSION}"
+		-X ${GO_MODULE}/share.BuildVersion=${_BUILD_VERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md
@@ -40,6 +26,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/chisel/distinfo b/www/chisel/distinfo
index 72cc26f023a6..81e190fbec8e 100644
--- a/www/chisel/distinfo
+++ b/www/chisel/distinfo
@@ -1,31 +1,5 @@
-TIMESTAMP = 1613999194
-SHA256 (jpillora-chisel-v1.7.6_GH0.tar.gz) = b77d04cc5f5f4d2e6fcaa415998a6659f7dbf35fd0b06a3667016c954256484d
-SIZE (jpillora-chisel-v1.7.6_GH0.tar.gz) = 45769
-SHA256 (andrew-d-go-termutil-009166a695a2_GH0.tar.gz) = 51a01677f19e86c2307f2d48f389a071dd5bac928ca08f1dceaf83fa78acabab
-SIZE (andrew-d-go-termutil-009166a695a2_GH0.tar.gz) = 2937
-SHA256 (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 37f9cad3e321c452ea54824021ecd5b6ef4222c68b25f9c8a66a0c6d8411437e
-SIZE (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 8586
-SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
-SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
-SHA256 (golang-crypto-948cd5f35899_GH0.tar.gz) = 4e561431d990f6afd32bb64b7404aa3ab46da67fe239f383866e62b29f762670
-SIZE (golang-crypto-948cd5f35899_GH0.tar.gz) = 1732509
-SHA256 (golang-net-ab3426394381_GH0.tar.gz) = ddf23e17a147972ad0dd11824a912eaa0174cba60ab63da6ae6ced2c76345946
-SIZE (golang-net-ab3426394381_GH0.tar.gz) = 1177700
-SHA256 (golang-sync-6e8e738ad208_GH0.tar.gz) = 011eb5dc95a0ede8be5d68edde93be5af1b88d7fc098d0f74c6f7560beb378f0
-SIZE (golang-sync-6e8e738ad208_GH0.tar.gz) = 17288
-SHA256 (golang-sys-ddb9806d33ae_GH0.tar.gz) = c441ebb395a1facea244428b70a77fa792e3d83063275a611adda070e899eaca
-SIZE (golang-sys-ddb9806d33ae_GH0.tar.gz) = 1054636
-SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
-SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
-SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84
-SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101
-SHA256 (jpillora-ansi-v1.0.2_GH0.tar.gz) = 82bd6d4487f69de610a6d4f6c3ebace7828fe7c6df41b4b5728b57ed8c7dd2fb
-SIZE (jpillora-ansi-v1.0.2_GH0.tar.gz) = 3837
-SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f
-SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507
-SHA256 (jpillora-requestlog-v1.0.0_GH0.tar.gz) = bd557a09e49dd5c9f7f50634754c573ee26b2a64f310561a1790c9eaa41d4c42
-SIZE (jpillora-requestlog-v1.0.0_GH0.tar.gz) = 3411
-SHA256 (jpillora-sizestr-v1.0.0_GH0.tar.gz) = fe85fc79eb0c4d54269a16825b5fa63295e6b9270fd23bd6474905c90a2b9268
-SIZE (jpillora-sizestr-v1.0.0_GH0.tar.gz) = 3567
-SHA256 (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 030d3c3dd312e32344080344c8a8dd240446bedbdb6027887046ea25b5c741fc
-SIZE (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 3126
+TIMESTAMP = 1620924932
+SHA256 (go/www_chisel/chisel-v1.7.6/v1.7.6.mod) = f8db8ce1a46543232b7e71273e2e73dabaddbb7a3a736816906afa230c0c3e8f
+SIZE (go/www_chisel/chisel-v1.7.6/v1.7.6.mod) = 731
+SHA256 (go/www_chisel/chisel-v1.7.6/v1.7.6.zip) = d37b6f3fe467b69e2ba14dacf690b94a5b5c50a603b627b6919a771d27335cca
+SIZE (go/www_chisel/chisel-v1.7.6/v1.7.6.zip) = 68247
diff --git a/www/oneshot/Makefile b/www/oneshot/Makefile
index b2003fb7d41a..d2387b54f8c9 100644
--- a/www/oneshot/Makefile
+++ b/www/oneshot/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	oneshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -10,33 +11,15 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	raphaelreyna
-GH_TUPLE=	cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
-		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
-		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:87dc89f01550:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:627f9648deb9:golang_net/vendor/golang.org/x/net \
-		golang:sys:85ca7c5b95cd:golang_sys/vendor/golang.org/x/sys \
-		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
-		gorilla:mux:v1.7.4:gorilla_mux/vendor/github.com/gorilla/mux \
-		grandcat:zeroconf:v1.0.0:grandcat_zeroconf/vendor/github.com/grandcat/zeroconf \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		jf-tech:iohelper:v1.0.2:jf_tech_iohelper/vendor/github.com/jf-tech/iohelper \
-		miekg:dns:v1.1.27:miekg_dns/vendor/github.com/miekg/dns \
-		raphaelreyna:ez-cgi:v0.7.3:raphaelreyna_ez_cgi/vendor/github.com/raphaelreyna/ez-cgi \
-		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:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag
 
 _BUILD_VERSION=	${DISTVERSIONFULL}
 _BUILD_DATE=	$$(date +%d-%B-%Y)
 
+GO_MODULE=	github.com/raphaelreyna/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
-		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd.version=${_BUILD_VERSION} \
-		-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd.date=${_BUILD_DATE}"
+		-X ${GO_MODULE}/cmd.version=${_BUILD_VERSION} \
+		-X ${GO_MODULE}/cmd.date=${_BUILD_DATE}"
 
 PORTDOCS=	README.md
 
@@ -48,13 +31,16 @@ MANPAGES_DESC=	Build and install auto-generated manpages
 
 do-build-MANPAGES-on:
 	cd ${GO_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ${GO_BUILDFLAGS} ./doc/man/main.go > ${PORTNAME}.1
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ${GO_BUILDFLAGS} \
+		./doc/man/main.go > ${PORTNAME}.1
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${GO_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${GO_WRKSRC}/${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR}
 
 post-install-MANPAGES-on:
-	${INSTALL_MAN} ${GO_WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${GO_WRKSRC}/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/www/oneshot/distinfo b/www/oneshot/distinfo
index 88f4a67734e9..9a830c062acf 100644
--- a/www/oneshot/distinfo
+++ b/www/oneshot/distinfo
@@ -1,37 +1,5 @@
-TIMESTAMP = 1618562555
-SHA256 (raphaelreyna-oneshot-v1.5.0_GH0.tar.gz) = bb51866113288e341583725e7df40be27fab7f1b4eff9fae75b4773ebd328e96
-SIZE (raphaelreyna-oneshot-v1.5.0_GH0.tar.gz) = 641869
-SHA256 (cenkalti-backoff-v2.2.1_GH0.tar.gz) = a2c29d0184e7afc415975cf2689723028d2686ffbb67fe0999ab1d691e6d16db
-SIZE (cenkalti-backoff-v2.2.1_GH0.tar.gz) = 8623
-SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
-SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
-SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
-SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-crypto-87dc89f01550_GH0.tar.gz) = d81e26d345c6cd9f132fd69547b14200603d6f3b50622ebceace32dfe456339b
-SIZE (golang-crypto-87dc89f01550_GH0.tar.gz) = 1709204
-SHA256 (golang-net-627f9648deb9_GH0.tar.gz) = a171ecd3ca1ca546c82806d7ddba1985b18da28530cb7479ea62d90ea1f81041
-SIZE (golang-net-627f9648deb9_GH0.tar.gz) = 1177189
-SHA256 (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 06a5cbc446381df9653d4b410239720eea6b27461597de88f3e621664c811294
-SIZE (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 1047239
-SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
-SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
-SHA256 (gorilla-mux-v1.7.4_GH0.tar.gz) = 56ea3c39b8c19360357970a4dcd717485f36ac7da9c6b5a107bd4b80848c4aee
-SIZE (gorilla-mux-v1.7.4_GH0.tar.gz) = 45437
-SHA256 (grandcat-zeroconf-v1.0.0_GH0.tar.gz) = 6d1453ee70fb244aa1ddf758e7f061e6a83c69e4b8c82962cdff37ce1faa7767
-SIZE (grandcat-zeroconf-v1.0.0_GH0.tar.gz) = 16115
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (jf-tech-iohelper-v1.0.2_GH0.tar.gz) = 05fada24fd21aa66c6cc6744d1440658efdda793c07a79d1dcb79d991bbd76af
-SIZE (jf-tech-iohelper-v1.0.2_GH0.tar.gz) = 7494
-SHA256 (miekg-dns-v1.1.27_GH0.tar.gz) = f0dfa99cea9f97063114f6680b1718364323ff817d49211de1a98464a498f672
-SIZE (miekg-dns-v1.1.27_GH0.tar.gz) = 183862
-SHA256 (raphaelreyna-ez-cgi-v0.7.3_GH0.tar.gz) = ca9d933e51336e91ac0f0e3c09783fbee4d0ad5b8b003e0c1fa3c09c941ba76a
-SIZE (raphaelreyna-ez-cgi-v0.7.3_GH0.tar.gz) = 17525
-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-cobra-v1.0.0_GH0.tar.gz) = 58dbfe1b4dbc6751575e94d1e62d073098e0b41790bc1c7a7a95ec6b870ac697
-SIZE (spf13-cobra-v1.0.0_GH0.tar.gz) = 128897
-SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
-SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
+TIMESTAMP = 1620925755
+SHA256 (go/www_oneshot/oneshot-v1.5.0/v1.5.0.mod) = a6f3b5b7eb6ce37bc0886068ed434c221b2c7347d9f245946d3c96606e6494ea
+SIZE (go/www_oneshot/oneshot-v1.5.0/v1.5.0.mod) = 309
+SHA256 (go/www_oneshot/oneshot-v1.5.0/v1.5.0.zip) = a7c7a9248025ba5ee5b44b2b71a5bfb856863d929fb394b605a70fd2dde9bba4
+SIZE (go/www_oneshot/oneshot-v1.5.0/v1.5.0.zip) = 663281