Index: head/devel/gitaly/Makefile
===================================================================
--- head/devel/gitaly/Makefile	(revision 470125)
+++ head/devel/gitaly/Makefile	(revision 470126)
@@ -1,60 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
 DISTVERSION=	0.96.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.16.2:devel/git \
 		rubygem-rugged>=0.27.0:devel/rubygem-rugged \
 		rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \
 		rubygem-bundler>0:sysutils/rubygem-bundler \
 		rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
 		rubygem-gitaly-proto095>=0.95.0:net/rubygem-gitaly-proto095 \
 		rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \
 		rubygem-rdoc>=4.2:devel/rubygem-rdoc \
 		rubygem-gollum-lib-gitlab>=4.2:www/rubygem-gollum-lib-gitlab \
 		rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \
 		rubygem-grpc>=1.10.0:net/rubygem-grpc \
 		rubygem-sentry-raven>=2.7.2:devel/rubygem-sentry-raven \
 		rubygem-licensee8>=8.7.0:devel/rubygem-licensee8 \
 		rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351
 
 BUILD_DEPENDS=	go>=1.8:lang/go \
 		gem:devel/ruby-gems \
 		${MY_DEPENDS}
 
 RUN_DEPENDS=	${MY_DEPENDS} \
 		gitlab-shell>=6.0.4:devel/gitlab-shell
 
 USES=		gmake
 USE_RUBY=	yes
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
 GL_COMMIT=	d779c028099f79360209b92473c201e07721b885
 
 post-patch:
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
 	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} .  ${STAGEDIR}${DATADIR}/bin && \
 	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR}) && \
 	cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-ssh
 
 .include <bsd.port.mk>
Index: head/devel/gitaly/files/patch-config.toml.example
===================================================================
--- head/devel/gitaly/files/patch-config.toml.example	(revision 470125)
+++ head/devel/gitaly/files/patch-config.toml.example	(revision 470126)
@@ -1,48 +1,48 @@
 --- config.toml.example.orig	2018-04-12 00:44:37 UTC
 +++ config.toml.example
 @@ -1,9 +1,9 @@
  # 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"
  
  # The directory where Gitaly's executables are stored
 -bin_dir = "/home/git/gitaly"
 +bin_dir = "/usr/local/share/gitaly/bin/"
  
  # # Optional: listen on a TCP socket. This is insecure (no authentication)
  # listen_addr = "localhost:9999"
 @@ -14,12 +14,12 @@ bin_dir = "/home/git/gitaly"
  #
  
  # # Git executable settings
 -# [git]
 -# bin_path = "/usr/bin/git"
 +[git]
 +bin_path = "/usr/local/bin/git"
  
  [[storage]]
  name = "default"
 -path = "/home/git/repositories"
 +path = "/usr/home/git/repositories"
  
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
 @@ -42,7 +42,7 @@ path = "/home/git/repositories"
  
  [gitaly-ruby]
  # The directory where gitaly-ruby is installed
 -dir = "/home/git/gitaly/ruby"
 +dir = "/usr/local/share/gitaly/ruby"
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 300000000
 @@ -55,7 +55,7 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed
 -dir = "/home/git/gitlab-shell"
-+dir = "/usr/local/share/gitlab-shell/bin"
++dir = "/usr/local/share/gitlab-shell"
  
  # # You can adjust the concurrency of each RPC endpoint
  # [[concurrency]]