diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
index 33e94368d83f..d8b707ba5e6c 100644
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@@ -1,52 +1,52 @@
 # Also update devel/libgit2-glib, devel/rubygem-rugged, devel/py-pygit2
 # Make sure you bump revision of depending ports, if SONAME changes
 # objdump -p libgit2.so |grep SONAME
 # Tools/scripts/search_lib_depends_and_bump.sh devel/libgit2
 
 PORTNAME=	libgit2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.4
+PORTREVISION=   1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Portable, pure C implementation of the Git core
 WWW=		https://libgit2.github.com/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libhttp_parser.so:www/http-parser
 
 USES=		cmake:testing cpe localbase pkgconfig python:build ssl
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
-CMAKE_TESTING_ON=	BUILD_TESTS
-
 CMAKE_ARGS=	-DREGEX_BACKEND=pcre2 -DUSE_HTTP_PARSER=system \
 		-DCMAKE_CTEST_ARGUMENTS="-E;'invasive|online'" \
 		-DOPENSSL_ROOT_DIR=${OPENSSLBASE} \
 		-DOPENSSL_ENGINES_DIR=${ENGINESDIR}
 
 CMAKE_OFF=	BUILD_TESTS
 
+CMAKE_TESTING_ON=	BUILD_TESTS
+
 PLIST_SUB=	DISTVERSION=${DISTVERSION} \
 		SHLIB_VER=${DISTVERSION:R}
 
-OPTIONS_DEFINE=	SSH THREADS
-OPTIONS_DEFAULT=SSH THREADS
+OPTIONS_DEFINE=	SSH
+OPTIONS_DEFAULT=SSH
 SSH_DESC=	Enable SSH support through libssh2
 
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
-SSH_CMAKE_BOOL=		USE_SSH
-THREADS_CMAKE_BOOL=	THREADSAFE
+SSH_CMAKE_ON=		-DUSE_SSH=libssh2
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 post-patch:
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
 		${WRKSRC}/cmake/SelectHTTPSBackend.cmake
 .endif
 
 .include <bsd.port.post.mk>