Index: devel/gitaly/Makefile
===================================================================
--- devel/gitaly/Makefile
+++ devel/gitaly/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitaly
 DISTVERSION=	13.8.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -21,7 +21,7 @@
 		rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.9<4.2.8:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc>=1.30.2<1.31:net/rubygem-grpc \
+		rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
 		rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
 		rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
 		rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
Index: devel/grpc134/Makefile
===================================================================
--- devel/grpc134/Makefile
+++ devel/grpc134/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	grpc
 PORTVERSION=	1.34.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
-PORTEPOCH=	2
 CATEGORIES=	devel
+PKGNAMESUFFIX=	134
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	HTTP/2-based RPC framework
@@ -38,5 +37,7 @@
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+CONFLICTS_INSTALL=	grpc
 
 .include <bsd.port.mk>
Index: devel/rubygem-gitlab-labkit/Makefile
===================================================================
--- devel/rubygem-gitlab-labkit/Makefile
+++ devel/rubygem-gitlab-labkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitlab-labkit
 PORTVERSION=	0.14.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -16,7 +16,7 @@
 RUN_DEPENDS=	rubygem-actionpack60>=5<7:www/rubygem-actionpack60 \
 		rubygem-activesupport60>=5<7:devel/rubygem-activesupport60 \
 		rubygem-gitlab-pg_query>=1.3<2:databases/rubygem-gitlab-pg_query \
-		rubygem-grpc>=1.19<2:net/rubygem-grpc \
+		rubygem-grpc130>=1.19<2:net/rubygem-grpc130 \
 		rubygem-jaeger-client>=1.1<2:devel/rubygem-jaeger-client \
 		rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing \
 		rubygem-redis>3.0.0<5.0.0:databases/rubygem-redis
Index: net/rubygem-gitaly/Makefile
===================================================================
--- net/rubygem-gitaly/Makefile
+++ net/rubygem-gitaly/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitaly
 PORTVERSION=	13.8.0.pre.rc2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-grpc>=1.0<2.0:net/rubygem-grpc \
+RUN_DEPENDS=	rubygem-grpc130>=1.0<2.0:net/rubygem-grpc130 \
 		gitaly>=13.8:devel/gitaly
 
 USES=		gem
Index: net/rubygem-grpc130/Makefile
===================================================================
--- net/rubygem-grpc130/Makefile
+++ net/rubygem-grpc130/Makefile
@@ -5,6 +5,7 @@
 PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
+PKGNAMESUFFIX=	130
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby implementation of gRPC
@@ -12,7 +13,7 @@
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcares.so:dns/c-ares \
-		libgrpc.so:devel/grpc
+		libgrpc.so:devel/grpc134
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		rubygem-google-protobuf>=3.12<4:devel/rubygem-google-protobuf \
 		rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types
@@ -21,6 +22,8 @@
 USE_RUBY=	yes
 
 MAKE_JOBS_UNSAFE=	yes
+
+PORTSCOUT=	limit:^1\.30\.
 
 post-extract:
 	@${RM} ${WRKSRC}/Makefile ${WRKSRC}/.yardopts
Index: www/gitlab-ce/Makefile
===================================================================
--- www/gitlab-ce/Makefile
+++ www/gitlab-ce/Makefile
@@ -1,13 +1,13 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME?=	gitlab-ce
-PORTVERSION?=	13.8.1
-PORTREVISION?=	1
+PORTNAME=	gitlab-ce
+PORTVERSION=	13.8.1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
-MAINTAINER?=	mfechner@FreeBSD.org
-COMMENT?=	Web GUI for managing git repositories
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Web GUI for managing git repositories
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -219,7 +219,7 @@
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
 	rubygem-gitaly>=13.8.0.pre.rc2<13.9.0:net/rubygem-gitaly \
-	rubygem-grpc>=1.30.2<1.31:net/rubygem-grpc \
+	rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
 	rubygem-google-protobuf>=3.12<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
 	rubygem-flipper017>=0.17.1<0.18.0:devel/rubygem-flipper017 \