Index: branches/2016Q1/devel/cgit/Makefile
===================================================================
--- branches/2016Q1/devel/cgit/Makefile	(revision 406816)
+++ branches/2016Q1/devel/cgit/Makefile	(revision 406817)
@@ -1,50 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	cgit
-PORTVERSION=	0.11.2
-PORTREVISION=	1
+PORTVERSION=	0.12
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		https://www.kernel.org/pub/software/scm/git/:git
 DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
 		git-${GIT_VERSION}.tar.gz:git
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Hyperfast web frontend for Git repositories
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PROJECTHOST=	git-core
-GIT_VERSION=	2.3.3
+GIT_VERSION=	2.7.0
 USES=		cpe gmake iconv shebangfix tar:xz
 USE_OPENSSL=	yes
 CPE_VENDOR=	lars_hjemli
-SHEBANG_FILES=	filters/html-converters/resources/markdown.pl
+SHEBANG_FILES=	filters/html-converters/rst2html
 
 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
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME}
 PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 PORTDOCS=	${PORTNAME}rc.5.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/git
 	@${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/git/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi
 
 .include <bsd.port.mk>
Index: branches/2016Q1/devel/cgit/distinfo
===================================================================
--- branches/2016Q1/devel/cgit/distinfo	(revision 406816)
+++ branches/2016Q1/devel/cgit/distinfo	(revision 406817)
@@ -1,4 +1,4 @@
-SHA256 (cgit-0.11.2.tar.xz) = 2e126e770693d7296c7eb5eb83b809410aef29870bfe8f54da072a3f4d813e3b
-SIZE (cgit-0.11.2.tar.xz) = 93556
-SHA256 (git-2.3.3.tar.gz) = c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
-SIZE (git-2.3.3.tar.gz) = 5203135
+SHA256 (cgit-0.12.tar.xz) = 2ee233849335a64529a01cf2b6165ed492e20268e6e2526d7a7529ef1e24a5b7
+SIZE (cgit-0.12.tar.xz) = 85152
+SHA256 (git-2.7.0.tar.gz) = db9df4435c70a9b25d20a9ee20d65101692dc907a5a4b30e8343c9ae1b913ead
+SIZE (git-2.7.0.tar.gz) = 5622494
Index: branches/2016Q1/devel/cgit/pkg-plist
===================================================================
--- branches/2016Q1/devel/cgit/pkg-plist	(revision 406816)
+++ branches/2016Q1/devel/cgit/pkg-plist	(revision 406817)
@@ -1,21 +1,19 @@
 lib/%%PORTNAME%%/filters/about-formatting.sh
 lib/%%PORTNAME%%/filters/commit-links.sh
 lib/%%PORTNAME%%/filters/email-gravatar.lua
 lib/%%PORTNAME%%/filters/email-gravatar.py
 lib/%%PORTNAME%%/filters/email-libravatar.lua
 lib/%%PORTNAME%%/filters/gentoo-ldap-authentication.lua
 lib/%%PORTNAME%%/filters/html-converters/man2html
 lib/%%PORTNAME%%/filters/html-converters/md2html
-lib/%%PORTNAME%%/filters/html-converters/resources/markdown.pl
-lib/%%PORTNAME%%/filters/html-converters/resources/rst-template.txt
 lib/%%PORTNAME%%/filters/html-converters/rst2html
 lib/%%PORTNAME%%/filters/html-converters/txt2html
 lib/%%PORTNAME%%/filters/owner-example.lua
 lib/%%PORTNAME%%/filters/simple-authentication.lua
 lib/%%PORTNAME%%/filters/syntax-highlighting.py
 lib/%%PORTNAME%%/filters/syntax-highlighting.sh
 %%WWWDIR%%/%%PORTNAME%%.cgi
 %%WWWDIR%%/%%PORTNAME%%.css
 %%WWWDIR%%/%%PORTNAME%%.png
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/robots.txt
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 406816)
+++ branches/2016Q1	(revision 406817)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r406816