diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index 609e74343437..95ecf6cfbdf6 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -1,107 +1,108 @@
 # Created by: Klaus Aehlig <aehlig@linta.de>
 
 PORTNAME=	bazel
 DISTVERSION=	5.2.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
 DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
 
 MAINTAINER=	aehlig@linta.de
 COMMENT=	Fast and correct build system
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=	fails to package: cp: bazel: No such file or directory
 BROKEN_armv7=	fails to package: cp: bazel: No such file or directory
 BROKEN_i386=	fails to build: ./src/tools/singlejar/mapped_file_posix.inc:31:2: error: This code for 64 bit Unix
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang
 
 BUILD_DEPENDS=	bash:shells/bash \
 		zip:archivers/zip
 
 USES=		cpe python:3.3+ shebangfix zip:infozip
 
 CPE_VENDOR=	google
 
 USE_JAVA=	yes
 JAVA_VERSION=	11
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
 
 CONFLICTS_INSTALL=	bazel029
 
 # The bazel binary is also a zip archive (extracted by the elf part), it must not be stripped
 STRIP=
 
 NO_WRKSUBDIR=	YES
 
 # In bazel, a release is always code-wise identical to the final release candidate.
 # Hence we can also download that one and so have a simple way to also test earlier release
 # candidates.
 FINALRC=	3
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 EXTRA_PATCHES+=	${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd
 .endif
 
 .if ${ARCH} == "aarch64"
 BAZEL_JAVAC_OPTS+=	"-J-Xmx1g -J-Xms128m"
 .endif
 
 pre-patch:
 	@${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc \
-		${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \
+		${WRKSRC}/third_party/py/abseil/
+	@${CP} ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \
 		${FILESDIR}/extra-patch-bazel_build_defs.bzl \
 		${WRKSRC}/third_party/grpc/
 
 # Have the location of the system-wide rc file reside ${ETCDIR}.
 # Also adapt the sample file to disable persistent java workers as they
 # do not work reliably on FreeBSD.
 post-patch:
 	@${REINPLACE_CMD} \
 	-e "s|/etc/bazel.bazelrc|${ETCDIR}/bazel.bazelrc|" \
 	${WRKSRC}/src/main/cpp/BUILD
 	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --java_runtime_version=${JAVA_VERSION} >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --tool_java_runtime_version=${JAVA_VERSION} >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --action_env=PATH=/bin:/usr/bin/:${LOCALBASE}/bin >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${REINPLACE_CMD} \
 	-e 's|^\(PYTHON_BIN=.*\)|if [ "%VERSION%" = "3" ] ; then PYTHON_BIN=${PYTHON_CMD}; else \1 ; fi|' \
 	${WRKSRC}/tools/python/pywrapper_template.txt
 	@${REINPLACE_CMD} \
 	-e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 	${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
 	@${REINPLACE_CMD} \
 	-e 's|%%JAVA_HOME%%|${JAVA_HOME}|' \
 	${WRKSRC}/src/main/cpp/blaze_util_bsd.cc
 
 do-build:
 	@${MKDIR} ${WRKDIR}/bazel_tmp
 	(if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \
 	  then SOURCE_DATE_EPOCH=`grep TIMESTAMP ${DISTINFO_FILE} \
 	    | ${SED} -e 's/[^0-9]//g'`; \
 	fi ; \
 	cd ${WRKSRC} && \
 	${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \
 	JAVA_HOME=${JAVA_HOME} \
 	JAVA_VERSION=${JAVA_VERSION} \
 	TMPDIR=${WRKDIR}/bazel_tmp \
 	EMBED_LABEL='${PORTVERSION}' \
 	PATH=${LOCALBASE}/bin:$$PATH \
 	SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \
 	BAZEL_JAVAC_OPTS=${BAZEL_JAVAC_OPTS} \
 	EXTRA_BAZEL_ARGS='--host_javabase=@local_jdk//:jdk --tool_java_runtime_version=local_jdk   --java_language_version=${JAVA_VERSION}  --tool_java_language_version=${JAVA_VERSION}' \
 	${LOCALBASE}/bin/bash ./compile.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/scripts/packages/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample
 
 .include <bsd.port.post.mk>
diff --git a/devel/bazel/files/patch-distdir_deps.bzl b/devel/bazel/files/patch-distdir_deps.bzl
index 1a91f6c030a7..7585e5a1fe7b 100644
--- a/devel/bazel/files/patch-distdir_deps.bzl
+++ b/devel/bazel/files/patch-distdir_deps.bzl
@@ -1,10 +1,20 @@
---- distdir_deps.bzl.orig	1980-01-01 00:00:00 UTC
+--- distdir_deps.bzl.orig	1979-12-31 23:00:00 UTC
 +++ distdir_deps.bzl
 @@ -130,6 +130,7 @@ DIST_DEPS = {
          "patch_args": ["-p1"],
          "patches": [
              "//third_party/grpc:grpc_1.41.0.patch",
-+             "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl",
++            "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl",
              "//third_party/grpc:grpc_1.41.0.win_arm64.patch",
          ],
          "used_in": [
+@@ -168,6 +169,9 @@ DIST_DEPS = {
+             "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
+             "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
+         ],
++	"patches": [
++            "//third_party/py/abseil:extra-patch-absl_base_internal_unscaledcycleclock.cc",
++	],
+         "used_in": [
+             "additional_distfiles",
+             "test_WORKSPACE_files",