diff --git a/editors/micro/Makefile b/editors/micro/Makefile
index 1ddf8c39a934..e7d21d80db5a 100644
--- a/editors/micro/Makefile
+++ b/editors/micro/Makefile
@@ -1,86 +1,58 @@
 PORTNAME=	micro
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.11
 PORTREVISION=	9
 CATEGORIES=	editors
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Modern and intuitive terminal-based text editor
 WWW=		https://micro-editor.github.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		desktop-file-utils go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	zyedidia
-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 \
-		go-errors:errors:v1.0.1:go_errors_errors/vendor/github.com/go-errors/errors \
-		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		layeh:gopher-luar:v1.0.7:layeh_gopher_luar/vendor/layeh.com/gopher-luar \
-		lucasb-eyer:go-colorful:v1.0.3:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		mattn:go-isatty:v0.0.11:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		rivo:uniseg:v0.1.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
-		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:clipper:v0.1.0:zyedidia_clipper/vendor/github.com/zyedidia/clipper \
-		zyedidia:glob:dd4023a66dc3:zyedidia_glob/vendor/github.com/zyedidia/glob \
-		zyedidia:go-runewidth:v0.0.12:zyedidia_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		zyedidia:go-shellquote:eccd813c0655:zyedidia_go_shellquote/vendor/github.com/kballard/go-shellquote \
-		zyedidia:json5:2da050b1a98d:zyedidia_json5/vendor/github.com/zyedidia/json5 \
-		zyedidia:poller:v1.0.1:zyedidia_poller/vendor/github.com/zyedidia/poller \
-		zyedidia:pty:v1.1.20:zyedidia_pty/vendor/github.com/zyedidia/pty \
-		zyedidia:tcell:v2.0.9:zyedidia_tcell_v2/vendor/github.com/zyedidia/tcell/v2 \
-		zyedidia:terminal:533c623e2415:zyedidia_terminal/vendor/github.com/zyedidia/terminal
 
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_HASH=	225927b
 _BUILD_DATE=	$$(date '+%B %d, %Y')
 _BUILD_DEBUG=	OFF
 
+GO_MODULE=	github.com/zyedidia/${PORTNAME}/v2
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
-		-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}"
+		-X ${GO_MODULE}/internal/util.Version=${_BUILD_VERSION} \
+		-X ${GO_MODULE}/internal/util.CommitHash=${_BUILD_HASH} \
+		-X '${GO_MODULE}/internal/util.CompileDate=${_BUILD_DATE}' \
+		-X ${GO_MODULE}/internal/util.Debug=${_BUILD_DEBUG}"
 
 PLIST_FILES=	bin/micro \
 		share/applications/micro.desktop \
 		share/man/man1/micro.1.gz \
 		share/pixmaps/micro-logo-drop.svg \
 		share/pixmaps/micro-logo-mark.svg \
 		share/pixmaps/micro-logo.svg
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_DESC=	Enable debug logging
 DEBUG_VARS=	_BUILD_DEBUG=ON
 
 pre-build:
 	cd ${GO_WRKSRC} && ${SETENV} ${GO_ENV} ${GO_CMD} generate ./runtime
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/assets/packaging/micro.1 \
 		${STAGEDIR}${MANPREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/assets/packaging/micro.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/assets/*.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/micro/distinfo b/editors/micro/distinfo
index 9b4c7ec5564d..6f2a58894752 100644
--- a/editors/micro/distinfo
+++ b/editors/micro/distinfo
@@ -1,57 +1,5 @@
-TIMESTAMP = 1661645991
-SHA256 (zyedidia-micro-v2.0.11_GH0.tar.gz) = 1bb499edeaaadf1fe1791a49f96ab672c4e1add31ee125882ccd85a0fc8a4abe
-SIZE (zyedidia-micro-v2.0.11_GH0.tar.gz) = 549261
-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
-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 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
-SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (go-errors-errors-v1.0.1_GH0.tar.gz) = f3c4e21affe3f563ab6ab5de4086be9eff38c4b5cfb748602f89e814f65c7705
-SIZE (go-errors-errors-v1.0.1_GH0.tar.gz) = 8647
-SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045
-SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
-SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
-SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (layeh-gopher-luar-v1.0.7_GH0.tar.gz) = 800d74af130112190e733a89ac15bfa65471772f4fc0454e217fcc4a9f081b25
-SIZE (layeh-gopher-luar-v1.0.7_GH0.tar.gz) = 24012
-SHA256 (lucasb-eyer-go-colorful-v1.0.3_GH0.tar.gz) = 40c8c7e03a4eeaaabd44273e9b6a992933f554f17225aadd0b225ffc67e1e7db
-SIZE (lucasb-eyer-go-colorful-v1.0.3_GH0.tar.gz) = 430208
-SHA256 (mattn-go-isatty-v0.0.11_GH0.tar.gz) = 631fab18253998a4e27e9d260c445e9852bd86cf5a42693623d305c3e59c415a
-SIZE (mattn-go-isatty-v0.0.11_GH0.tar.gz) = 4396
-SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
-SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
-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.1.0_GH0.tar.gz) = b80dffa6c757687cc997b77efbd32435361829cb085b913424b9b2bfebc19655
-SIZE (rivo-uniseg-v0.1.0_GH0.tar.gz) = 43971
-SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c217c0499ef5573ab7176352229451
-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-clipper-v0.1.0_GH0.tar.gz) = c55be53467bb557eaf067e168ac4a0e5b032f3ab5a09d96979ca42a1203f6359
-SIZE (zyedidia-clipper-v0.1.0_GH0.tar.gz) = 6366
-SHA256 (zyedidia-glob-dd4023a66dc3_GH0.tar.gz) = 9371f2b148e6d0bc9ff79e5f6ca72729cea91af03ff1ab231b8e727c6dd579e2
-SIZE (zyedidia-glob-dd4023a66dc3_GH0.tar.gz) = 2701
-SHA256 (zyedidia-go-runewidth-v0.0.12_GH0.tar.gz) = 1a82c0a0a83b1fbf296923e55c2b1c168c27c5f925b9961c575a061ab8eb2a32
-SIZE (zyedidia-go-runewidth-v0.0.12_GH0.tar.gz) = 16886
-SHA256 (zyedidia-go-shellquote-eccd813c0655_GH0.tar.gz) = 3ed70251194b73039579044043d0e0fd4d664cc620aea1b9d32b32fba49b705d
-SIZE (zyedidia-go-shellquote-eccd813c0655_GH0.tar.gz) = 4403
-SHA256 (zyedidia-json5-2da050b1a98d_GH0.tar.gz) = 10825c3ed56827273e92976fe0635cfe4489ddc9c0168cb9cdccee3a79d73420
-SIZE (zyedidia-json5-2da050b1a98d_GH0.tar.gz) = 39998
-SHA256 (zyedidia-poller-v1.0.1_GH0.tar.gz) = 699850cfe19c4a67b044c4059438119a4c9b821d635a754500ec46a2e3e701b6
-SIZE (zyedidia-poller-v1.0.1_GH0.tar.gz) = 15922
-SHA256 (zyedidia-pty-v1.1.20_GH0.tar.gz) = 9c64d95a621517c633df042d9a8d12c3965039f86b132e75fbd74e96b5c33cb7
-SIZE (zyedidia-pty-v1.1.20_GH0.tar.gz) = 12050
-SHA256 (zyedidia-tcell-v2.0.9_GH0.tar.gz) = d430c19ec463a077cc19eedf439955631e82946d6e59d08c3e307a1ba34f3e42
-SIZE (zyedidia-tcell-v2.0.9_GH0.tar.gz) = 132068
-SHA256 (zyedidia-terminal-533c623e2415_GH0.tar.gz) = a6fbd14c4d612264d5ea1464039d5484b08cd0a2ad2708cd0ab264613d445ace
-SIZE (zyedidia-terminal-533c623e2415_GH0.tar.gz) = 12894
+TIMESTAMP = 1685775676
+SHA256 (go/editors_micro/micro-v2.0.11/v2.0.11.mod) = 0147a15cf1779538d0609c072b59ff367f44e4599a566a153818ebd1e0455118
+SIZE (go/editors_micro/micro-v2.0.11/v2.0.11.mod) = 1148
+SHA256 (go/editors_micro/micro-v2.0.11/v2.0.11.zip) = fda5ce58ebf12f4450086947d149befa6a1ff703f08e8f3d744424fafdacda6f
+SIZE (go/editors_micro/micro-v2.0.11/v2.0.11.zip) = 679101