diff --git a/games/neo-cowsay/Makefile b/games/neo-cowsay/Makefile
index eb18b9a95073..c18c891078ec 100644
--- a/games/neo-cowsay/Makefile
+++ b/games/neo-cowsay/Makefile
@@ -1,24 +1,30 @@
 PORTNAME=	neo-cowsay
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Neo Cowsay written in Go
 WWW=		https://github.com/Code-Hex/Neo-cowsay
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_MODULE=	github.com/Code-Hex/Neo-cowsay/cmd/v2
 
 GO_TARGET=	./cowsay:neo-cowsay ./cowthink:neo-cowthink
 
 PLIST_FILES=	bin/neo-cowsay \
 		bin/neo-cowthink
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 .include <bsd.port.mk>
diff --git a/games/neo-cowsay/distinfo b/games/neo-cowsay/distinfo
index 48d0b9dfed07..0bf5e013b17e 100644
--- a/games/neo-cowsay/distinfo
+++ b/games/neo-cowsay/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1655345926
+TIMESTAMP = 1679515500
 SHA256 (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.mod) = ba6dcf06f216832cbc41c1d07154d3cb498a89159c43e2b52fead061a695eaed
 SIZE (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.mod) = 393
 SHA256 (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.zip) = dc64392f992730452d0d2006ada0baec106a3173afaa6a5abc93c5f98759d23a
 SIZE (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.zip) = 24115
+SHA256 (go/games_neo-cowsay/neo-cowsay-v2.0.4/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/games_neo-cowsay/neo-cowsay-v2.0.4/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/games/neo-cowsay/files/patch-go.mod b/games/neo-cowsay/files/patch-go.mod
new file mode 100644
index 000000000000..4e0bd4e314d8
--- /dev/null
+++ b/games/neo-cowsay/files/patch-go.mod
@@ -0,0 +1,27 @@
+--- go.mod.orig	2023-03-22 20:07:09 UTC
++++ go.mod
+@@ -1,6 +1,6 @@
+ module github.com/Code-Hex/Neo-cowsay/cmd/v2
+ 
+-go 1.16
++go 1.17
+ 
+ require (
+ 	github.com/Code-Hex/Neo-cowsay/v2 v2.0.3
+@@ -11,4 +11,16 @@ require (
+ 	github.com/mattn/go-runewidth v0.0.13
+ 	github.com/rivo/uniseg v0.2.0
+ 	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
++)
++
++require (
++	github.com/gdamore/encoding v1.0.0 // indirect
++	github.com/gdamore/tcell/v2 v2.4.0 // indirect
++	github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
++	github.com/mattn/go-isatty v0.0.14 // indirect
++	github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 // indirect
++	github.com/pkg/errors v0.9.1 // indirect
++	golang.org/x/sys v0.6.0 // indirect
++	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
++	golang.org/x/text v0.3.6 // indirect
+ )
diff --git a/games/neo-cowsay/files/patch-go.sum b/games/neo-cowsay/files/patch-go.sum
new file mode 100644
index 000000000000..635209c97cb0
--- /dev/null
+++ b/games/neo-cowsay/files/patch-go.sum
@@ -0,0 +1,11 @@
+--- go.sum.orig	2023-03-22 20:07:14 UTC
++++ go.sum
+@@ -41,6 +41,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go
+ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
+ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
diff --git a/games/neo-cowsay/files/patch-vendor_modules.txt b/games/neo-cowsay/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..8745403d6153
--- /dev/null
+++ b/games/neo-cowsay/files/patch-vendor_modules.txt
@@ -0,0 +1,76 @@
+--- vendor/modules.txt.orig	2023-03-22 20:08:05 UTC
++++ vendor/modules.txt
+@@ -1,13 +1,15 @@
+ # github.com/Code-Hex/Neo-cowsay/v2 v2.0.3
+-## explicit
++## explicit; go 1.16
+ github.com/Code-Hex/Neo-cowsay/v2
+ github.com/Code-Hex/Neo-cowsay/v2/decoration
+ # github.com/Code-Hex/go-wordwrap v1.0.0
+-## explicit
++## explicit; go 1.13
+ github.com/Code-Hex/go-wordwrap
+ # github.com/gdamore/encoding v1.0.0
++## explicit; go 1.9
+ github.com/gdamore/encoding
+ # github.com/gdamore/tcell/v2 v2.4.0
++## explicit; go 1.12
+ github.com/gdamore/tcell/v2
+ github.com/gdamore/tcell/v2/terminfo
+ github.com/gdamore/tcell/v2/terminfo/a/aixterm
+@@ -48,41 +50,48 @@ github.com/gdamore/tcell/v2/terminfo/x/xterm
+ github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty
+ github.com/gdamore/tcell/v2/terminfo/x/xterm_termite
+ # github.com/jessevdk/go-flags v1.5.0
+-## explicit
++## explicit; go 1.15
+ github.com/jessevdk/go-flags
+ # github.com/ktr0731/go-fuzzyfinder v0.5.1
+-## explicit
++## explicit; go 1.13
+ github.com/ktr0731/go-fuzzyfinder
+ github.com/ktr0731/go-fuzzyfinder/matching
+ github.com/ktr0731/go-fuzzyfinder/scoring
+ # github.com/lucasb-eyer/go-colorful v1.0.3
++## explicit; go 1.12
+ github.com/lucasb-eyer/go-colorful
+ # github.com/mattn/go-colorable v0.1.11
+-## explicit
++## explicit; go 1.13
+ github.com/mattn/go-colorable
+ # github.com/mattn/go-isatty v0.0.14
++## explicit; go 1.12
+ github.com/mattn/go-isatty
+ # github.com/mattn/go-runewidth v0.0.13
+-## explicit
++## explicit; go 1.9
+ github.com/mattn/go-runewidth
+ # github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00
++## explicit; go 1.15
+ github.com/nsf/termbox-go
+ # github.com/pkg/errors v0.9.1
++## explicit
+ github.com/pkg/errors
+ # github.com/rivo/uniseg v0.2.0
+-## explicit
++## explicit; go 1.12
+ github.com/rivo/uniseg
+ # golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
+-## explicit
++## explicit; go 1.17
+ golang.org/x/crypto/ssh/terminal
+-# golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
++# golang.org/x/sys v0.6.0
++## explicit; go 1.17
+ golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/plan9
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+ # golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
++## explicit; go 1.11
+ golang.org/x/term
+ # golang.org/x/text v0.3.6
++## explicit; go 1.11
+ golang.org/x/text/encoding
+ golang.org/x/text/encoding/internal/identifier
+ golang.org/x/text/transform