Index: head/editors/nvi2/Makefile
===================================================================
--- head/editors/nvi2/Makefile	(revision 544112)
+++ head/editors/nvi2/Makefile	(revision 544113)
@@ -1,48 +1,48 @@
 # Created by: Craig Leres <leres@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nvi2
-PORTVERSION=	2.1.3.g2020801
+PORTVERSION=	2.2.0
 CATEGORIES=	editors
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Updated implementation of the ex/vi text editor
 
 LICENSE=	BSD3CLAUSE
 
 USES=		bdb cmake ncurses
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	lichray
-GH_TAGNAME=	6a8af80
+GH_TAGNAME=	v${PORTVERSION}
 
 CONFLICTS_INSTALL=	nvi-m17n-[0-9]* nvi-[0-9]*
 
 OPTIONS_DEFINE=		DEBUG WIDECHAR ICONV
 OPTIONS_DEFAULT=	WIDECHAR ICONV
 
 WIDECHAR_DESC=		Enable wide-character support (UTF-8)
 ICONV_DESC=		Enable iconv support
 
 DEBUG_CMAKE_BOOL=	ENABLE_DEBUG
 ICONV_CMAKE_BOOL=	ENABLE_ICONV
 ICONV_USES=		iconv
 WIDECHAR_CMAKE_BOOL=	ENABLE_WIDECHAR
 
 PLIST_FILES=	bin/nex \
 		bin/nvi \
 		bin/nview \
 		man/man1/nex.1.gz \
 		man/man1/nvi.1.gz \
 		man/man1/nview.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/nvi ${STAGEDIR}${PREFIX}/bin
 	${LN} ${STAGEDIR}${PREFIX}/bin/nvi ${STAGEDIR}${PREFIX}/bin/nex
 	${LN} ${STAGEDIR}${PREFIX}/bin/nvi ${STAGEDIR}${PREFIX}/bin/nview
 	${INSTALL_MAN} ${WRKSRC}/man/vi.1 \
 	    ${STAGEDIR}${MAN1PREFIX}/man/man1/nvi.1
 	${LN} -sf nvi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/nex.1
 	${LN} -sf nvi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/nview.1
 
 .include <bsd.port.mk>
Index: head/editors/nvi2/distinfo
===================================================================
--- head/editors/nvi2/distinfo	(revision 544112)
+++ head/editors/nvi2/distinfo	(revision 544113)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596316771
-SHA256 (lichray-nvi2-2.1.3.g2020801-6a8af80_GH0.tar.gz) = e16c63352426a490c35543825fbccbb3436f4876439d6f21a5c6f1ba341bc2a3
-SIZE (lichray-nvi2-2.1.3.g2020801-6a8af80_GH0.tar.gz) = 439562
+TIMESTAMP = 1596489960
+SHA256 (lichray-nvi2-2.2.0-v2.2.0_GH0.tar.gz) = cd668287f55af1e2ccd64e6c0edb504aec41d25a9efe2e505abaa90c3c551455
+SIZE (lichray-nvi2-2.2.0-v2.2.0_GH0.tar.gz) = 439545