Index: head/devel/cgit/Makefile
===================================================================
--- head/devel/cgit/Makefile	(revision 523698)
+++ head/devel/cgit/Makefile	(revision 523699)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	cgit
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
-		https://www.kernel.org/pub/software/scm/git/:git
+		${MASTER_SITES_KERNEL_ORG}:git
+MASTER_SITE_SUBDIR=	software/scm/git:git
 DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
 		git-${GIT_VERSION}${EXTRACT_SUFX}:git
 
 MAINTAINER=	mt@markoturk.info
 COMMENT=	Fast, lightweight web frontend for Git repositories
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	msgfmt:devel/gettext-tools
 
-GIT_VERSION=	2.18.0
+GIT_VERSION=	2.25.0
 USES=		cpe gmake iconv perl5 python:3.2+,env shebangfix ssl tar:xz
 CPE_VENDOR=	lars_hjemli
 USE_PERL5=	test
 SHEBANG_FILES=	filters/email-gravatar.py \
 		filters/html-converters/md2html \
 		filters/html-converters/rst2html \
 		filters/syntax-highlighting.py
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MAKE_ARGS+=	CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \
 		prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 V=1
 
 SUB_FILES=	pkg-message
 
 PORTDOCS=	${PORTNAME}rc.5.txt
 
 OPTIONS_DEFINE=	DOCS ASCIIDOC
 OPTIONS_DEFAULT=	ASCIIDOC
 OPTIONS_SUB=	yes
 
 ASCIIDOC_DESC=	Use asciidoc to preprocess man page
 ASCIIDOC_BUILD_DEPENDS=	a2x:textproc/asciidoc
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/git
 	@${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/^\(GIT_VER =\).*$$/\1 ${GIT_VERSION}/' \
 		${WRKSRC}/Makefile
 
 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \
 		-e "s|\(ALL_CFLAGS =\)|\1 -I${OPENSSLINC}|g" \
 		-e "s|\(ALL_LDFLAGS =\)|\1 -L${OPENSSLLIB}|g" \
 		${WRKSRC}/git/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-ASCIIDOC-on:
 	a2x --doctype manpage --format manpage ${WRKSRC}/cgitrc.5.txt
 	${INSTALL_MAN} ${WRKSRC}/cgitrc.5 ${STAGEDIR}${PREFIX}/man/man5
 
 .include <bsd.port.mk>
Index: head/devel/cgit/distinfo
===================================================================
--- head/devel/cgit/distinfo	(revision 523698)
+++ head/devel/cgit/distinfo	(revision 523699)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1533411742
-SHA256 (cgit-1.2.1.tar.xz) = 3c547c146340fb16d4134326e7524bfb28ffa681284f1e3914bde1c27a9182bf
-SIZE (cgit-1.2.1.tar.xz) = 89648
-SHA256 (git-2.18.0.tar.xz) = 8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
-SIZE (git-2.18.0.tar.xz) = 5102264
+TIMESTAMP = 1578963027
+SHA256 (cgit-1.2.2.tar.xz) = 3f97ce944d0f3fe0782bea3c46eafa5ff151212ea5bec31f99e5cb1775d4b236
+SIZE (cgit-1.2.2.tar.xz) = 90204
+SHA256 (git-2.25.0.tar.xz) = c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
+SIZE (git-2.25.0.tar.xz) = 5873532