diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index 7478a6ad1a26..a0767a6404b0 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -1,35 +1,32 @@
 PORTNAME=	oniguruma
-DISTVERSION=	6.9.8
-PORTREVISION=	1
+DISTVERSION=	6.9.9
 CATEGORIES=	devel textproc
 MASTER_SITES=	https://github.com/kkos/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	onig-${DISTVERSION}
 
-PATCH_SITES=	https://github.com/kkos/oniguruma/commit/
-PATCHFILES=	1f322c45aa365d377e1d7db567bb7087c7c1b38c.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Regular expressions library compatible with POSIX/GNU/Perl
 WWW=		https://github.com/kkos/oniguruma
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake cpe pathfix
 CPE_VENDOR=	oniguruma_project
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/onig
 EXAMPLESDIR=	${PREFIX}/share/examples/onig
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+CMAKE_OFF=	BUILD_TEST
 CMAKE_ON=	BUILD_SHARED_LIBS ENABLE_POSIX_API
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_CMAKE_BOOL=	INSTALL_DOCUMENTATION
-EXAMPLES_CMAKE_BOOL==	INSTALL_EXAMPLES
+EXAMPLES_CMAKE_BOOL=	INSTALL_EXAMPLES
 
 .include <bsd.port.mk>
diff --git a/devel/oniguruma/distinfo b/devel/oniguruma/distinfo
index 4ccbb6dec2c9..6ba65bac3934 100644
--- a/devel/oniguruma/distinfo
+++ b/devel/oniguruma/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1651339873
-SHA256 (onig-6.9.8.tar.gz) = 28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e
-SIZE (onig-6.9.8.tar.gz) = 944148
-SHA256 (1f322c45aa365d377e1d7db567bb7087c7c1b38c.patch) = 3f2230d7f42606011a69610ea9f5f530de58da0b0ce69ad9a77ae5aca954c73a
-SIZE (1f322c45aa365d377e1d7db567bb7087c7c1b38c.patch) = 981
+TIMESTAMP = 1697307469
+SHA256 (onig-6.9.9.tar.gz) = 60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf
+SIZE (onig-6.9.9.tar.gz) = 957444
diff --git a/devel/oniguruma/pkg-plist b/devel/oniguruma/pkg-plist
index 9a15badcaefe..d7021b91ab6f 100644
--- a/devel/oniguruma/pkg-plist
+++ b/devel/oniguruma/pkg-plist
@@ -1,12 +1,12 @@
 bin/onig-config
 include/oniggnu.h
 include/onigposix.h
 include/oniguruma.h
 lib/cmake/oniguruma/onigurumaConfig.cmake
 lib/cmake/oniguruma/onigurumaConfigVersion.cmake
 lib/cmake/oniguruma/onigurumaTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/oniguruma/onigurumaTargets.cmake
 lib/libonig.so
 lib/libonig.so.5
-lib/libonig.so.5.3.0
+lib/libonig.so.5.4.0
 libdata/pkgconfig/oniguruma.pc