diff --git a/lang/gomacro/Makefile b/lang/gomacro/Makefile
index dfc4cf9e2240..fb8b864cafe3 100644
--- a/lang/gomacro/Makefile
+++ b/lang/gomacro/Makefile
@@ -1,25 +1,19 @@
 PORTNAME=	gomacro
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7-304
-DISTVERSIONSUFFIX=	-g2f4dc7c
-PORTREVISION=	8
+DISTVERSION=	2.7-601
+DISTVERSIONSUFFIX=	-g9aafa23
 CATEGORIES=	lang
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Interactive Go interpreter and debugger with REPL, generics and macros
 WWW=		https://github.com/cosmos72/gomacro
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
-GO_PKGNAME=	github.com/cosmos72/gomacro
-USE_GITHUB=	yes
-GH_ACCOUNT=	cosmos72
-GH_TUPLE=	golang:sys:b294cbc:golang_sys/vendor/golang.org/x/sys \
-		mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		peterh:liner:6f820f8:peterh_liner/vendor/github.com/peterh/liner
+USES=		go:modules
+GO_MODULE=	github.com/cosmos72/gomacro@v0.0.0-20221020183653-9aafa23692e7
 
 PLIST_FILES=	bin/gomacro
 
 .include <bsd.port.mk>
diff --git a/lang/gomacro/distinfo b/lang/gomacro/distinfo
index 10f94f849598..d4c480f5925a 100644
--- a/lang/gomacro/distinfo
+++ b/lang/gomacro/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1551966942
-SHA256 (cosmos72-gomacro-v2.7-304-g2f4dc7c_GH0.tar.gz) = d4d94a43c292be8ea57f2b8f8bfd1d2b06d1fb6e785e277aae6499ae9aa95688
-SIZE (cosmos72-gomacro-v2.7-304-g2f4dc7c_GH0.tar.gz) = 1117257
-SHA256 (peterh-liner-6f820f8_GH0.tar.gz) = 5a059343ae5ba6ced33fcd9f6eccd5b78a221dde8c59b3b4500c58531605aa58
-SIZE (peterh-liner-6f820f8_GH0.tar.gz) = 21100
-SHA256 (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 398ec709b006664e527040770056156cb225233d8b44b5a59ba2f5f5f3fa885e
-SIZE (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 22961
-SHA256 (golang-sys-b294cbc_GH0.tar.gz) = 0e2ef3e4313f73449a107fe9dc61cd49acf0f3c61587f2681096237a05197728
-SIZE (golang-sys-b294cbc_GH0.tar.gz) = 1254744
+TIMESTAMP = 1671560202
+SHA256 (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.mod) = b5b9d2e36fcd33955d64c6e71d16919cf97f8f7aed3a2dba87b4db3a3dcd74d1
+SIZE (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.mod) = 156
+SHA256 (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.zip) = 5573f593e43e3905d26cd23d987353f06aad80ba79cd0acf5ab6febf52d62b95
+SIZE (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.zip) = 6700329
diff --git a/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__386.go b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__386.go
new file mode 100644
index 000000000000..854d45a6fb93
--- /dev/null
+++ b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__386.go
@@ -0,0 +1,26 @@
+--- imports/syscall/syscall_freebsd_386.go.orig	2022-12-20 19:25:38 UTC
++++ imports/syscall/syscall_freebsd_386.go
+@@ -1724,7 +1724,6 @@ func init() {
+ 		"SYS_LISTEN":	ValueOf(syscall.SYS_LISTEN),
+ 		"SYS_LPATHCONF":	ValueOf(syscall.SYS_LPATHCONF),
+ 		"SYS_LSEEK":	ValueOf(syscall.SYS_LSEEK),
+-		"SYS_LSTAT":	ValueOf(syscall.SYS_LSTAT),
+ 		"SYS_LUTIMES":	ValueOf(syscall.SYS_LUTIMES),
+ 		"SYS_MAC_SYSCALL":	ValueOf(syscall.SYS_MAC_SYSCALL),
+ 		"SYS_MADVISE":	ValueOf(syscall.SYS_MADVISE),
+@@ -1855,7 +1854,6 @@ func init() {
+ 		"SYS_SOCKET":	ValueOf(syscall.SYS_SOCKET),
+ 		"SYS_SOCKETPAIR":	ValueOf(syscall.SYS_SOCKETPAIR),
+ 		"SYS_SSTK":	ValueOf(syscall.SYS_SSTK),
+-		"SYS_STAT":	ValueOf(syscall.SYS_STAT),
+ 		"SYS_STATFS":	ValueOf(syscall.SYS_STATFS),
+ 		"SYS_SWAPCONTEXT":	ValueOf(syscall.SYS_SWAPCONTEXT),
+ 		"SYS_SWAPOFF":	ValueOf(syscall.SYS_SWAPOFF),
+@@ -3672,7 +3670,6 @@ func init() {
+ 		"SYS_LISTEN":	"int:106",
+ 		"SYS_LPATHCONF":	"int:513",
+ 		"SYS_LSEEK":	"int:478",
+-		"SYS_LSTAT":	"int:190",
+ 		"SYS_LUTIMES":	"int:276",
+ 		"SYS_MAC_SYSCALL":	"int:394",
+ 		"SYS_MADVISE":	"int:75",
diff --git a/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__amd64.go b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__amd64.go
new file mode 100644
index 000000000000..f1ffab0403cf
--- /dev/null
+++ b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__amd64.go
@@ -0,0 +1,18 @@
+--- imports/syscall/syscall_freebsd_amd64.go.orig	2022-12-20 19:25:43 UTC
++++ imports/syscall/syscall_freebsd_amd64.go
+@@ -1725,7 +1725,6 @@ func init() {
+ 		"SYS_LISTEN":	ValueOf(syscall.SYS_LISTEN),
+ 		"SYS_LPATHCONF":	ValueOf(syscall.SYS_LPATHCONF),
+ 		"SYS_LSEEK":	ValueOf(syscall.SYS_LSEEK),
+-		"SYS_LSTAT":	ValueOf(syscall.SYS_LSTAT),
+ 		"SYS_LUTIMES":	ValueOf(syscall.SYS_LUTIMES),
+ 		"SYS_MAC_SYSCALL":	ValueOf(syscall.SYS_MAC_SYSCALL),
+ 		"SYS_MADVISE":	ValueOf(syscall.SYS_MADVISE),
+@@ -1856,7 +1855,6 @@ func init() {
+ 		"SYS_SOCKET":	ValueOf(syscall.SYS_SOCKET),
+ 		"SYS_SOCKETPAIR":	ValueOf(syscall.SYS_SOCKETPAIR),
+ 		"SYS_SSTK":	ValueOf(syscall.SYS_SSTK),
+-		"SYS_STAT":	ValueOf(syscall.SYS_STAT),
+ 		"SYS_STATFS":	ValueOf(syscall.SYS_STATFS),
+ 		"SYS_SWAPCONTEXT":	ValueOf(syscall.SYS_SWAPCONTEXT),
+ 		"SYS_SWAPOFF":	ValueOf(syscall.SYS_SWAPOFF),