diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile
index 4bc3aaa20708..f533293d8ec6 100644
--- a/net/sngrep/Makefile
+++ b/net/sngrep/Makefile
@@ -1,46 +1,50 @@
 PORTNAME=	sngrep
-DISTVERSION=	1.7.0
-PORTREVISION=	1
+DISTVERSION=	1.8.4
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/irontec/${PORTNAME}/releases/download/v${DISTVERSION}/
 
+PATCH_SITES=	https://github.com/irontec/sngrep/commit/
+PATCHFILES=	3553fc8f6afed9d6e985efb34db250ec5b7fa903.patch:-p1
+
 MAINTAINER=	tad@vif.com
 COMMENT=	SIP Packet display and capture
 WWW=		https://github.com/irontec/sngrep
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		autoreconf localbase ncurses pkgconfig
+USES=		cmake ncurses pkgconfig
+
+TEST_TARGET=	tests
 
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--with-zlib
+CMAKE_ON=	USE_IPV6 \
+		USE_EEP \
+		WITH_UNICODE \
+		WITH_ZLIB
 
-OPTIONS_DEFINE=		EEP IPV6 PCRE UNICODE
-OPTIONS_DEFAULT=	EEP IPV6 UNICODE OPENSSL
+OPTIONS_DEFINE=		PCRE UNICODE
+OPTIONS_DEFAULT=	OPENSSL
 
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 
-EEP_DESC=		Enable EEP packet send/receive support
-
-EEP_CONFIGURE_ENABLE=	eep
-IPV6_CONFIGURE_ENABLE=	ipv6
-
+GNUTLS_USES=		localbase:ldflags
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
-			libgcrypt.so:security/libgcrypt \
-			libgpg-error.so:security/libgpg-error
-GNUTLS_CONFIGURE_WITH=	gnutls
+			libgcrypt.so:security/libgcrypt
+GNUTLS_CMAKE_BOOL=	WITH_GNUTLS
 
 OPENSSL_USES=		ssl
-OPENSSL_CONFIGURE_ENV+=	SSL_CFLAGS="-I${OPENSSLINC}" \
-			SSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
-OPENSSL_CONFIGURE_WITH=	openssl
+OPENSSL_CMAKE_BOOL=	WITH_OPENSSL
 
-PCRE_CONFIGURE_WITH=	pcre2
 PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+PCRE_CMAKE_BOOL=	WITH_PCRE2
+
+pre-test:
+	${CP} ${WRKSRC}/tests/*.pcap ${BUILD_WRKSRC}
 
-UNICODE_CONFIGURE_ENABLE=	unicode
+post-test:
+	@cd ${BUILD_WRKSRC} && for f in test_*; do \
+	    ./"$$f"; \
+	done
 
 .include <bsd.port.mk>
diff --git a/net/sngrep/distinfo b/net/sngrep/distinfo
index 625eef6a4d53..c992bfb7603f 100644
--- a/net/sngrep/distinfo
+++ b/net/sngrep/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1694165436
-SHA256 (sngrep-1.7.0.tar.gz) = 2e5ba3a4d6486ea00bd73d2cceff383ba162dcd6d0170ae74cfa3b1c206e2cb1
-SIZE (sngrep-1.7.0.tar.gz) = 248947
+TIMESTAMP = 1785680150
+SHA256 (sngrep-1.8.4.tar.gz) = 0f5cc5a356edc1327f1b916fedd9eb0fd1472eda360a04dfe59cabe15a346ee1
+SIZE (sngrep-1.8.4.tar.gz) = 275031
+SHA256 (3553fc8f6afed9d6e985efb34db250ec5b7fa903.patch) = 374d198a77b83bf2d8390dd0f8ee0af79f9d63bede2bc5dadf7d6dbdb423aa2d
+SIZE (3553fc8f6afed9d6e985efb34db250ec5b7fa903.patch) = 978