Index: branches/2017Q4/devel/gitaly/Makefile
===================================================================
--- branches/2017Q4/devel/gitaly/Makefile	(revision 452850)
+++ branches/2017Q4/devel/gitaly/Makefile	(revision 452851)
@@ -1,36 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.11.2
-PORTREVISION=	1
+DISTVERSION=	0.21.2
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go>=1.8:lang/go
 
 USES=	gmake
 USE_RUBY=	yes
 
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME}-* ${WRKDIR}/${DISTNAME}
 
 post-patch:
 	${MV} ${WRKDIR}/${DISTNAME}/config.toml.example ${WRKDIR}/${DISTNAME}/config.toml.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} .  ${STAGEDIR}${DATADIR}/bin && \
 	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR})
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly
 
 .include <bsd.port.mk>
Index: branches/2017Q4/devel/gitaly/distinfo
===================================================================
--- branches/2017Q4/devel/gitaly/distinfo	(revision 452850)
+++ branches/2017Q4/devel/gitaly/distinfo	(revision 452851)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502360981
-SHA256 (gitaly-v0.11.2.tar.gz) = 4baf9dda7831b142a84c7d1cbf90601c3f00541be36ceeaaccd427118cdb2017
-SIZE (gitaly-v0.11.2.tar.gz) = 1971913
+TIMESTAMP = 1505982310
+SHA256 (gitaly-v0.21.2.tar.gz) = badbf17917341993f4ce670ef111a2f0e5e40fb737c9bf5fab72c9538e0b07d6
+SIZE (gitaly-v0.21.2.tar.gz) = 2027704
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 452850)
+++ branches/2017Q4	(revision 452851)

Property changes on: branches/2017Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r452771