diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 71e380b96101..4ca6e9ca9d88 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,70 +1,73 @@
 # Created by: Matthias Fechner <mfechner@FreeBSD.org>
 
 PORTNAME=	gitlab-elasticsearch-indexer
-PORTVERSION=	2.9.0
-PORTREVISION=	1
+PORTVERSION=	2.11.0
+PORTREVISION=	0
 CATEGORIES=	textproc
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Elasticsearch indexer for GitLab
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	git>=2.16.2:devel/git
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu
 #RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
 USES=		gmake go:modules pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/tags
-GL_COMMIT=	b7feed9299684949050f9fa2627e43b25a01403a
+GL_COMMIT=	b2b3cc76f7e0f0b97a0c05c390916727959c48be
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 27dd
+# 30dd
 GH_TUPLE=	\
-		aws:aws-sdk-go:v1.19.6:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		aws:aws-sdk-go:v1.27.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		deoxxa:aws_signing_client:c20ee106809e:deoxxa_aws_signing_client/vendor/github.com/deoxxa/aws_signing_client \
 		fortytw2:leaktest:v1.3.0:fortytw2_leaktest/vendor/github.com/fortytw2/leaktest \
-		go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		gogo:protobuf:v1.2.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:tools:6fdc5776f4bb:golang_tools/vendor/golang.org/x/tools \
-		google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \
-		grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
-		grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
+		golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \
+		golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:22da62e12c0c:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
+		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
+		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
+		google:go-genproto:e7f2df4ecc2d:google_go_genproto/vendor/google.golang.org/genproto \
+		grpc-ecosystem:go-grpc-middleware:f849b5445de4:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
+		grpc:grpc-go:v1.35.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
-		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		magefile:mage:v1.10.0:magefile_mage/vendor/github.com/magefile/mage \
 		mailru:easyjson:1ea4449da983:mailru_easyjson/vendor/github.com/mailru/easyjson \
+		oklog:ulid:v2.0.2:oklog_ulid_v2/vendor/github.com/oklog/ulid/v2 \
 		olivere:elastic:v6.2.24:olivere_elastic/vendor/github.com/olivere/elastic \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		sirupsen:logrus:v1.4.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify
+		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		sirupsen:logrus:v1.7.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify
 
 GL_TUPLE=	gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \
-		gitlab-org:labkit:0149780c759d60f61fcfe1648fb882ba7ec41f3f:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
+		gitlab-org:labkit:d04f253f79d934e8e3d6872f56fd392df9a934da:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
 		lupine:icu:54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc:lupine_icu/vendor/gitlab.com/lupine/icu
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
 
 GO_BUILDFLAGS=	-ldflags "\
 		-X 'main.Version=v${PORTVERSION}' \
 		-X 'main.BuildTime=${_BUILD_DATE}'"
 GO_TARGET=	gitlab.com/gitlab-org/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo
index 5caf199621e4..fc391822f067 100644
--- a/textproc/gitlab-elasticsearch-indexer/distinfo
+++ b/textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,53 +1,59 @@
-TIMESTAMP = 1617892495
-SHA256 (aws-aws-sdk-go-v1.19.6_GH0.tar.gz) = 5e8e829be8b24850ea044672fedda36bd525b541ffc44ddbad85060190211f5e
-SIZE (aws-aws-sdk-go-v1.19.6_GH0.tar.gz) = 10820760
+TIMESTAMP = 1621488209
+SHA256 (aws-aws-sdk-go-v1.27.0_GH0.tar.gz) = 9f3dc12e43f795efad08a8ac37c5179546bbceb6485e569125f64e829f9a64dc
+SIZE (aws-aws-sdk-go-v1.27.0_GH0.tar.gz) = 13666537
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (deoxxa-aws_signing_client-c20ee106809e_GH0.tar.gz) = 209275015c4670eff326456edf6ac3b995a29968decae686ccdaf25013d6df72
 SIZE (deoxxa-aws_signing_client-c20ee106809e_GH0.tar.gz) = 4323
 SHA256 (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 897726ed584a7c442eb660406e3438d4585b00c5f3769360eb19b18cace35292
 SIZE (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 5281
-SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c
-SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209
-SHA256 (gogo-protobuf-v1.2.1_GH0.tar.gz) = 99e423905ba8921e86817607a5294ffeedb66fdd4a85efce5eb2848f715fdb3a
-SIZE (gogo-protobuf-v1.2.1_GH0.tar.gz) = 2017393
-SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d
-SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285
-SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
-SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
-SHA256 (golang-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49
-SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-tools-6fdc5776f4bb_GH0.tar.gz) = e944c45069f7f6938c19308277e80bd456f28dcef4fc24fdfefd4623f99009f6
-SIZE (golang-tools-6fdc5776f4bb_GH0.tar.gz) = 2341238
-SHA256 (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 06778b867759fad0b06fac4067911e616184aa40061cbd37cffaa950399ad7d4
-SIZE (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 5960232
-SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b
-SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266
-SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b
-SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
+SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
+SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
+SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59
+SIZE (golang-mod-v0.4.1_GH0.tar.gz) = 102751
+SHA256 (golang-net-5f4716e94777_GH0.tar.gz) = 987ec0774e8480615daf0664cd9c9ec9eb25cf6e553e32ae38697515629714b6
+SIZE (golang-net-5f4716e94777_GH0.tar.gz) = 1251426
+SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
+SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
+SHA256 (golang-sys-22da62e12c0c_GH0.tar.gz) = 5a120a40c63be9383650b7757c00645b25d37a3b7daa523f2a85fac969e51b2a
+SIZE (golang-sys-22da62e12c0c_GH0.tar.gz) = 1106889
+SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
+SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127
+SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2
+SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055
+SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
+SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
+SHA256 (google-go-genproto-e7f2df4ecc2d_GH0.tar.gz) = c606f3bdaad96934015fc51f8d1aa6562897b3c9f6dd1ab0191ff7ea4acb1388
+SIZE (google-go-genproto-e7f2df4ecc2d_GH0.tar.gz) = 7918613
+SHA256 (grpc-ecosystem-go-grpc-middleware-f849b5445de4_GH0.tar.gz) = c8e395f05976b05d96acf6ae434e52003a7ca2c73f5600d2dfc44956b381a6dd
+SIZE (grpc-ecosystem-go-grpc-middleware-f849b5445de4_GH0.tar.gz) = 81662
+SHA256 (grpc-grpc-go-v1.35.0_GH0.tar.gz) = d6ad74f8f48f957e81e86130931ddc9e9ec4f358ef14d5a5982ecc7260d503e8
+SIZE (grpc-grpc-go-v1.35.0_GH0.tar.gz) = 1164449
 SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
 SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
-SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
-SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
+SHA256 (magefile-mage-v1.10.0_GH0.tar.gz) = 7d7f46f62df9dfb1a3a03173a1c14d77fdc53b3c99821da02d32a4ba730838fe
+SIZE (magefile-mage-v1.10.0_GH0.tar.gz) = 8792150
 SHA256 (mailru-easyjson-1ea4449da983_GH0.tar.gz) = 8dee8a32ea94e56c90118b1ff02286bfe403ffe498274cf6aa3a08f6f5ebb8b3
 SIZE (mailru-easyjson-1ea4449da983_GH0.tar.gz) = 75475
+SHA256 (oklog-ulid-v2.0.2_GH0.tar.gz) = d2b0dadd45201cd3385736bd5bd9c8c572e42249e713fe65dfb1e1df6870e3e3
+SIZE (oklog-ulid-v2.0.2_GH0.tar.gz) = 56670
 SHA256 (olivere-elastic-v6.2.24_GH0.tar.gz) = 35365df3873ee77e84d0ce75f4397e07b3429143ab69d8214f4d5bc9883e7517
 SIZE (olivere-elastic-v6.2.24_GH0.tar.gz) = 389800
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (sirupsen-logrus-v1.4.1_GH0.tar.gz) = aecd75cfc00edfc8d8bdb013d2cee2a5da686fce31c5cf2ae314ce4642c8e139
-SIZE (sirupsen-logrus-v1.4.1_GH0.tar.gz) = 40811
-SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
-SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
-SHA256 (gitlab-org-gitlab-elasticsearch-indexer-b7feed9299684949050f9fa2627e43b25a01403a_GL0.tar.gz) = 5b6c3a5b18647f1383a348bc54401fbd987955d21ddc8b0934c6ed21ef34656e
-SIZE (gitlab-org-gitlab-elasticsearch-indexer-b7feed9299684949050f9fa2627e43b25a01403a_GL0.tar.gz) = 65719
+SHA256 (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = c1c04d6e36c0d0fb6f3374197f9025d7e6df13f38a974098be020617c00fbaf2
+SIZE (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = 1258804
+SHA256 (sirupsen-logrus-v1.7.1_GH0.tar.gz) = 01b02793ed1545b87f6f219e5467ef587cbc05f14be35b466e2ff573959d4698
+SIZE (sirupsen-logrus-v1.7.1_GH0.tar.gz) = 46795
+SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
+SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
+SHA256 (gitlab-org-gitlab-elasticsearch-indexer-b2b3cc76f7e0f0b97a0c05c390916727959c48be_GL0.tar.gz) = 56b55e10ea534b9f0e12a89ec3309b2cec74c3e40e48e191fdc2ea498a84f893
+SIZE (gitlab-org-gitlab-elasticsearch-indexer-b2b3cc76f7e0f0b97a0c05c390916727959c48be_GL0.tar.gz) = 80502
 SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = b6375220620fcf60e31b2067fc6cff1449cd3a2dff7c3896e3a5cb9f86ef876b
 SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2775132
-SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = 32de9f51a3dccc84399eadbc062c958cd0e3c829c89c0462354457a8eb2dd15c
-SIZE (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = 3672153
+SHA256 (gitlab-org-labkit-d04f253f79d934e8e3d6872f56fd392df9a934da_GL0.tar.gz) = 525750b1fa1de1236b7f7a041abec36c01737a070239e91f4810317e8945d9d1
+SIZE (gitlab-org-labkit-d04f253f79d934e8e3d6872f56fd392df9a934da_GL0.tar.gz) = 165007
 SHA256 (lupine-icu-54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc_GL0.tar.gz) = a7905e581f4efade5e173449b8703db75a82c39c9ce78ad9ba3e73c5d64d6d8d
 SIZE (lupine-icu-54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc_GL0.tar.gz) = 12038