diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile
index 71c0bf559d07..b32be78e810b 100644
--- a/databases/rubygem-pg_query/Makefile
+++ b/databases/rubygem-pg_query/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	pg_query
 PORTVERSION=	6.2.2
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Parses SQL queries using a copy of the PostgreSQL server query parser
 WWW=		https://github.com/lfittl/pg_query
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rubygem-pathname>0:devel/rubygem-pathname
-RUN_DEPENDS=	rubygem-google-protobuf>=3.25.3:devel/rubygem-google-protobuf
+RUN_DEPENDS=	rubygem-google-protobuf-gitlab>=3.25.3:devel/rubygem-google-protobuf-gitlab
 
 USES=		gem
 
 post-patch:
 #	${RM} ${WRKSRC}/ext/pg_query/pg_query_ruby_freebsd.sym
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-gapic-common-gitlab/Makefile b/devel/rubygem-gapic-common-gitlab/Makefile
index 1b004afceb06..587e86afa3bc 100644
--- a/devel/rubygem-gapic-common-gitlab/Makefile
+++ b/devel/rubygem-gapic-common-gitlab/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	gapic-common
 PORTVERSION=	0.23.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Common code for GAPIC-generated API clients
 WWW=		https://github.com/googleapis/gapic-generator-ruby/tree/master/gapic-common \
 		https://github.com/googleapis/gapic-generator-ruby
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	rubygem-faraday-gitlab>=1.9<3:www/rubygem-faraday-gitlab \
 		rubygem-faraday-retry-gitlab>=1.0<3:www/rubygem-faraday-retry-gitlab \
-		rubygem-google-protobuf>=3.25<5.0:devel/rubygem-google-protobuf \
+		rubygem-google-protobuf-gitlab>=3.25<5.0:devel/rubygem-google-protobuf-gitlab \
 		rubygem-googleapis-common-protos-gitlab>=1.6<2:devel/rubygem-googleapis-common-protos-gitlab \
-		rubygem-googleapis-common-protos-types>=1.15<2:devel/rubygem-googleapis-common-protos-types \
+		rubygem-googleapis-common-protos-types-gitlab>=1.15<2:devel/rubygem-googleapis-common-protos-types-gitlab \
 		rubygem-googleauth-gitlab>=1.11<2:security/rubygem-googleauth-gitlab \
 		rubygem-grpc-gitlab>=1.65<2:net/rubygem-grpc-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-google-cloud-common/Makefile b/devel/rubygem-google-cloud-common/Makefile
index 3cf77a749d63..9ad58133e0f5 100644
--- a/devel/rubygem-google-cloud-common/Makefile
+++ b/devel/rubygem-google-cloud-common/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	google-cloud-common
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Common protocol buffer types used by Google Cloud APIs
 WWW=		https://github.com/googleapis/common-protos-ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-googleapis-common-protos-types>=1.7<2:devel/rubygem-googleapis-common-protos-types \
-		rubygem-google-protobuf>=3.18<5:devel/rubygem-google-protobuf
+RUN_DEPENDS=	rubygem-googleapis-common-protos-types-gitlab>=1.7<2:devel/rubygem-googleapis-common-protos-types-gitlab \
+		rubygem-google-protobuf-gitlab>=3.18<5:devel/rubygem-google-protobuf-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-googleapis-common-protos-gitlab/Makefile b/devel/rubygem-googleapis-common-protos-gitlab/Makefile
index 2e7ad647d78a..63f6510eafb7 100644
--- a/devel/rubygem-googleapis-common-protos-gitlab/Makefile
+++ b/devel/rubygem-googleapis-common-protos-gitlab/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	googleapis-common-protos
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Common gRPC and protocol buffer classes used in Google APIs
 WWW=		https://github.com/googleapis/common-protos-ruby/tree/main/googleapis-common-protos \
 		https://github.com/googleapis/common-protos-ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-google-protobuf>=3.18<5.0:devel/rubygem-google-protobuf \
-		rubygem-googleapis-common-protos-types>=1.20<2:devel/rubygem-googleapis-common-protos-types \
+RUN_DEPENDS=	rubygem-google-protobuf-gitlab>=3.18<5.0:devel/rubygem-google-protobuf-gitlab \
+		rubygem-googleapis-common-protos-types-gitlab>=1.20<2:devel/rubygem-googleapis-common-protos-types-gitlab \
 		rubygem-grpc-gitlab>=1.41<2:net/rubygem-grpc-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-googleapis-common-protos-types-gitlab/Makefile b/devel/rubygem-googleapis-common-protos-types-gitlab/Makefile
index cd31b597f1e8..67008eb78385 100644
--- a/devel/rubygem-googleapis-common-protos-types-gitlab/Makefile
+++ b/devel/rubygem-googleapis-common-protos-types-gitlab/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	googleapis-common-protos-types
 PORTVERSION=	1.20.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Common protocol buffer types used by Google APIs
 WWW=		https://github.com/googleapis/common-protos-ruby/tree/main/googleapis-common-protos-types \
 		https://github.com/googleapis/common-protos-ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-google-protobuf>=3.18<5.0:devel/rubygem-google-protobuf
+RUN_DEPENDS=	rubygem-google-protobuf-gitlab>=3.18<5.0:devel/rubygem-google-protobuf-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 PORTSCOUT=	limit:^1\.20\.
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-grpc-google-iam-v1-gitlab/Makefile b/devel/rubygem-grpc-google-iam-v1-gitlab/Makefile
index 724e2a1b33e7..c32873a1d288 100644
--- a/devel/rubygem-grpc-google-iam-v1-gitlab/Makefile
+++ b/devel/rubygem-grpc-google-iam-v1-gitlab/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	grpc-google-iam-v1
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Common protos and gRPC services for Google IAM
 WWW=		https://github.com/googleapis/common-protos-ruby/tree/main/grpc-google-iam-v1 \
 		https://github.com/googleapis/common-protos-ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-google-protobuf>=3.18<5.0:devel/rubygem-google-protobuf \
+RUN_DEPENDS=	rubygem-google-protobuf-gitlab>=3.18<5.0:devel/rubygem-google-protobuf-gitlab \
 		rubygem-googleapis-common-protos-gitlab>=1.7.0<2:devel/rubygem-googleapis-common-protos-gitlab \
 		rubygem-grpc-gitlab>=1.41<2:net/rubygem-grpc-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-opentelemetry-exporter-otlp-gitlab/Makefile b/devel/rubygem-opentelemetry-exporter-otlp-gitlab/Makefile
index f0c447172a42..dd71b03c4e87 100644
--- a/devel/rubygem-opentelemetry-exporter-otlp-gitlab/Makefile
+++ b/devel/rubygem-opentelemetry-exporter-otlp-gitlab/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	opentelemetry-exporter-otlp
 PORTVERSION=	0.31.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	OTLP exporter for the OpenTelemetry framework
 WWW=		https://opentelemetry.io/ \
 		https://github.com/open-telemetry/opentelemetry-ruby \
 		https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/otlp
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-googleapis-common-protos-types-gitlab>=1.3<2:devel/rubygem-googleapis-common-protos-types-gitlab \
-		rubygem-google-protobuf>=3.18:devel/rubygem-google-protobuf \
+		rubygem-google-protobuf-gitlab>=3.18:devel/rubygem-google-protobuf-gitlab \
 		rubygem-opentelemetry-api-gitlab>=1.1<2:devel/rubygem-opentelemetry-api-gitlab \
 		rubygem-opentelemetry-common-gitlab>=0.20<1:devel/rubygem-opentelemetry-common-gitlab \
 		rubygem-opentelemetry-sdk-gitlab>=1.10<2:devel/rubygem-opentelemetry-sdk-gitlab \
 		rubygem-opentelemetry-semantic_conventions-gitlab>=0:devel/rubygem-opentelemetry-semantic_conventions-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-grpc-gitlab/Makefile b/net/rubygem-grpc-gitlab/Makefile
index 621a0dd19e06..283fc40f10e4 100644
--- a/net/rubygem-grpc-gitlab/Makefile
+++ b/net/rubygem-grpc-gitlab/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	grpc
 PORTVERSION=	1.81.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Ruby implementation of gRPC
 WWW=		https://github.com/grpc/grpc/tree/master/src/ruby
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libgrpc.so:devel/grpc
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
-		rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types \
-		rubygem-google-protobuf>=3.25<5.0:devel/rubygem-google-protobuf
+		rubygem-googleapis-common-protos-types-gitlab>=1.0<2:devel/rubygem-googleapis-common-protos-types-gitlab \
+		rubygem-google-protobuf-gitlab>=3.25<5.0:devel/rubygem-google-protobuf-gitlab
 
 USES=		cpe gem gmake pkgconfig
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	@${RM} ${WRKSRC}/Makefile ${WRKSRC}/.yardopts
 	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl ${WRKSRC}/src/core
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/ruby/lib/grpc.rb
 	@${REINPLACE_CMD} -Ee '/s\.files = /s;, "(Makefile|etc|include|third_party|src/boringssl|src/core)[^"]*"\.freeze;;g' ${WRKSRC}/${GEMSPEC}
 	@${REINPLACE_CMD} -e '/s\.files = /s|"\.yardopts"\.freeze, ||' ${WRKSRC}/${GEMSPEC}
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-grpc_reflection/Makefile b/net/rubygem-grpc_reflection/Makefile
index a50d6dd3511a..bf1121dc2412 100644
--- a/net/rubygem-grpc_reflection/Makefile
+++ b/net/rubygem-grpc_reflection/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	grpc_reflection
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	GRPC Server Reflection Protocol for Ruby
 WWW=		https://github.com/y-yagi/grpc_reflection
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-google-protobuf>=4.31.0:devel/rubygem-google-protobuf \
+RUN_DEPENDS=	rubygem-google-protobuf-gitlab>=4.31.0:devel/rubygem-google-protobuf-gitlab \
 		rubygem-grpc-gitlab>=0:net/rubygem-grpc-gitlab
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>