Index: head/devel/gitaly/Makefile
===================================================================
--- head/devel/gitaly/Makefile
+++ head/devel/gitaly/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	0.91.0
-PORTREVISION=	2
+DISTVERSION=	0.96.1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -13,17 +12,18 @@
 
 # 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-proto088>=0.88.0:net/rubygem-gitaly-proto088 \
+		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.0:www/rubygem-gollum-lib-gitlab \
+		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:devel/rubygem-licensee8 \
+		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 \
@@ -39,7 +39,7 @@
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	89298fe8b80b73a34352023555fe061866aff3ad
+GL_COMMIT=	d779c028099f79360209b92473c201e07721b885
 
 post-patch:
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
@@ -47,7 +47,8 @@
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
-	$(RM) -f ${WRKSRC}/ruby/Gemfile.orig
+	${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
Index: head/devel/gitaly/distinfo
===================================================================
--- head/devel/gitaly/distinfo
+++ head/devel/gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523378733
-SHA256 (gitlab-org-gitaly-89298fe8b80b73a34352023555fe061866aff3ad_GL0.tar.gz) = c1a8e836b572f249e05c3a821002781af6a3a1bf3434dff5fe515078700994b3
-SIZE (gitlab-org-gitaly-89298fe8b80b73a34352023555fe061866aff3ad_GL0.tar.gz) = 3586830
+TIMESTAMP = 1524579302
+SHA256 (gitlab-org-gitaly-d779c028099f79360209b92473c201e07721b885_GL0.tar.gz) = 8344bfff658433002444d756c3552b57ce7861b614efc2f3db42be68dd4aa4b5
+SIZE (gitlab-org-gitaly-d779c028099f79360209b92473c201e07721b885_GL0.tar.gz) = 3620431
Index: head/devel/gitaly/files/patch-config.toml.example
===================================================================
--- head/devel/gitaly/files/patch-config.toml.example
+++ head/devel/gitaly/files/patch-config.toml.example
@@ -1,4 +1,4 @@
---- config.toml.example.orig	2018-02-08 14:44:53 UTC
+--- config.toml.example.orig	2018-04-12 00:44:37 UTC
 +++ config.toml.example
 @@ -1,9 +1,9 @@
  # Example Gitaly configuration file
@@ -28,7 +28,7 @@
  
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
-@@ -40,7 +40,7 @@ path = "/home/git/repositories"
+@@ -42,7 +42,7 @@ path = "/home/git/repositories"
  
  [gitaly-ruby]
  # The directory where gitaly-ruby is installed
@@ -37,7 +37,7 @@
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 300000000
-@@ -53,7 +53,7 @@ dir = "/home/git/gitaly/ruby"
+@@ -55,7 +55,7 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed
Index: head/devel/gitaly/files/patch-ruby_Gemfile
===================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile
+++ head/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,12 @@
---- ruby/Gemfile.orig	2018-02-25 18:31:26 UTC
+--- ruby/Gemfile.orig	2018-04-12 00:44:37 UTC
 +++ ruby/Gemfile
-@@ -12,7 +12,3 @@ gem 'grpc', '~> 1.8.0'
+@@ -13,12 +13,8 @@ gem 'sentry-raven', '~> 2.7.2', require:
+ 
+ # Detects the open source license the repository includes
+ # This version needs to be in sync with GitLab CE/EE
+-gem 'licensee', '~> 8.7.0'
++gem 'licensee', '~> 8.9'
+ 
  # Locked until https://github.com/google/protobuf/issues/4210 is closed
  gem 'google-protobuf', '= 3.5.1'
  
Index: head/devel/gitaly/pkg-plist
===================================================================
--- head/devel/gitaly/pkg-plist
+++ head/devel/gitaly/pkg-plist
@@ -1,5 +1,4 @@
 %%DATADIR%%/ruby/Gemfile
-%%DATADIR%%/ruby/Gemfile.lock
 %%DATADIR%%/ruby/README.md
 @(,,555) %%DATADIR%%/ruby/bin/gitaly-ruby
 @(,,555) %%DATADIR%%/ruby/bin/ruby-cd