Index: head/devel/gitaly/Makefile
===================================================================
--- head/devel/gitaly/Makefile	(revision 455052)
+++ head/devel/gitaly/Makefile	(revision 455053)
@@ -1,35 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.2
+PORTREVISION=	1
 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: head/devel/gitaly/files/patch-config.toml.example
===================================================================
--- head/devel/gitaly/files/patch-config.toml.example	(revision 455052)
+++ head/devel/gitaly/files/patch-config.toml.example	(revision 455053)
@@ -1,10 +1,35 @@
---- config.toml.example.orig	2017-09-01 10:24:38 UTC
-+++ config.toml.example
+--- config.toml.example.orig	2017-10-28 10:50:48.245547000 +0200
++++ config.toml.example	2017-10-28 10:56:00.467310000 +0200
 @@ -1,6 +1,6 @@
  # Example Gitaly configuration file
  
 -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
 +socket_path = "/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket"
  
  # # Optional: listen on a TCP socket. This is insecure (no authentication)
  # listen_addr = "localhost:9999"
+@@ -10,14 +10,20 @@
+ # prometheus_listen_addr = "localhost:9236"
+ #
+ 
+-# # Git executable settings
+-# [git]
+-# bin_path = "/usr/bin/git"
++# Git executable settings
++[git]
++bin_path = "/usr/local/bin/git"
+ 
+ [[storage]]
+ name = "default"
+-path = "/home/git/repositories"
++path = "/usr/home/git/repositories"
+ 
++[gitaly-ruby]
++dir = "/usr/local/bin/ruby"
++
++[gitlab-shell]
++dir = "/usr/local/share/gitlab-shell/bin/gitlab-shell"
++
+ # # You can optionally configure more storages for this Gitaly instance to serve up
+ #
+ # [[storage]]