diff --git a/www/yarr/Makefile b/www/yarr/Makefile
index fc395007b375..ab2b990fadc2 100644
--- a/www/yarr/Makefile
+++ b/www/yarr/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	yarr
 DISTVERSIONPREFIX=v
-DISTVERSION=	2.4
-PORTREVISION=	11
+DISTVERSION=	2.5
 CATEGORIES=	www
 
 MAINTAINER=	decke@FreeBSD.org
@@ -11,18 +10,18 @@ WWW=		https://github.com/nkanaev/yarr
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/license
 
-USES=		go:modules
+USES=		go:1.23,modules
 
 USE_RC_SUBR=	${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nkanaev
-GH_TUPLE=       \
-                golang:net:v0.8.0:golang_net/vendor/golang.org/x/net \
-                golang:sys:v0.6.0:golang_sys/vendor/golang.org/x/sys \
-                golang:text:v0.8.0:golang_text/vendor/golang.org/x/text \
-                mattn:go-sqlite3:v1.14.7:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3
-GO_TARGET=	./src/main.go:yarr
+GH_TUPLE=	\
+		golang:net:v0.37.0:golang_net/vendor/golang.org/x/net \
+		golang:sys:v0.31.0:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.23.0:golang_text/vendor/golang.org/x/text \
+		mattn:go-sqlite3:v1.14.24:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3
+GO_TARGET=	./cmd/yarr/main.go:yarr
 GO_BUILDFLAGS=	-tags "sqlite_foreign_keys release" -ldflags "-X main.Version=${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/www/yarr/distinfo b/www/yarr/distinfo
index bc0c46eb3fbd..8a909ea5139f 100644
--- a/www/yarr/distinfo
+++ b/www/yarr/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1693117987
-SHA256 (nkanaev-yarr-v2.4_GH0.tar.gz) = 2d55a13348c8558aaa3126885bff9bf02f45ea1dc19b2aca86ba121dade7d16e
-SIZE (nkanaev-yarr-v2.4_GH0.tar.gz) = 4019050
-SHA256 (golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
-SIZE (golang-net-v0.8.0_GH0.tar.gz) = 1244302
-SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
-SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
-SHA256 (golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64
-SIZE (golang-text-v0.8.0_GH0.tar.gz) = 8359526
-SHA256 (mattn-go-sqlite3-v1.14.7_GH0.tar.gz) = ed9922998dc82553a7cc5889747b123fc216a15036e7c3e1bdeea1acb68bc584
-SIZE (mattn-go-sqlite3-v1.14.7_GH0.tar.gz) = 2391718
+TIMESTAMP = 1744574162
+SHA256 (nkanaev-yarr-v2.5_GH0.tar.gz) = 0ea4b037b4485abe599ad2fe743f29adf9656dc34a8ffd0deefe3e0c863a37af
+SIZE (nkanaev-yarr-v2.5_GH0.tar.gz) = 4388541
+SHA256 (golang-net-v0.37.0_GH0.tar.gz) = d822af41208d45f1a3055776187788bdb3c174226d88c2d134917e3edb2513ba
+SIZE (golang-net-v0.37.0_GH0.tar.gz) = 1494338
+SHA256 (golang-sys-v0.31.0_GH0.tar.gz) = de9873501d7e57afe8964b48d17392f82b5f1fd611915e6084523f9eb7506972
+SIZE (golang-sys-v0.31.0_GH0.tar.gz) = 1523040
+SHA256 (golang-text-v0.23.0_GH0.tar.gz) = 941692d8d3a0b5998cabf9d3a9e6e3617665e1f2b50c71e0fee08c654bbed3df
+SIZE (golang-text-v0.23.0_GH0.tar.gz) = 8969153
+SHA256 (mattn-go-sqlite3-v1.14.24_GH0.tar.gz) = 8fa3b0b66914ae2dd4ddef9a954f614c5b3eb6ac9d80ee61ae2d08e3178507ec
+SIZE (mattn-go-sqlite3-v1.14.24_GH0.tar.gz) = 2622934
diff --git a/www/yarr/files/patch-src_platform_open__etc.go b/www/yarr/files/patch-src_platform_open__etc.go
new file mode 100644
index 000000000000..3863257eed12
--- /dev/null
+++ b/www/yarr/files/patch-src_platform_open__etc.go
@@ -0,0 +1,8 @@
+--- src/platform/open_etc.go.orig	2025-03-26 14:42:39 UTC
++++ src/platform/open_etc.go
+@@ -1,4 +1,4 @@
+-//go:build linux
++//go:build linux || freebsd
+ 
+ package platform
+