diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index e5cad700338d..f9e596a91960 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -1,88 +1,88 @@
 # Created by: Klaus Aehlig <aehlig@linta.de>
 
 PORTNAME=	bazel
-DISTVERSION=	4.2.0
+DISTVERSION=	4.2.1
 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_aarch64=		fails to build: java.lang.OutOfMemoryError: Java heap space
 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_FreeBSD_11_powerpc64=	fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang
 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=		python:3.3+ shebangfix zip:infozip
-
-CONFLICTS_INSTALL=	bazel029
-
-# 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=	4
-
 SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
+
 USE_JAVA=	yes
-JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.8
+JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
-NO_WRKSUBDIR=	YES
+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=	2
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 EXTRA_PATCHES+=	${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd
 .endif
 
 # 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 --host_javabase=@local_jdk//:jdk >> ${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
 
 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 \
 	TMPDIR=${WRKDIR}/bazel_tmp \
 	EMBED_LABEL='${PORTVERSION}' \
 	PATH=${LOCALBASE}/bin:$$PATH \
 	SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \
 	EXTRA_BAZEL_ARGS=--host_javabase=@local_jdk//:jdk \
 	${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/distinfo b/devel/bazel/distinfo
index 98df6b25bc08..a9c4c74f8cff 100644
--- a/devel/bazel/distinfo
+++ b/devel/bazel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629042860
-SHA256 (bazel-4.2.0rc4-dist.zip) = 2294013b281879f4be744113ba3d75c311369ff321e9c697a4449b24455e10cc
-SIZE (bazel-4.2.0rc4-dist.zip) = 279246919
+TIMESTAMP = 1630150517
+SHA256 (bazel-4.2.1rc2-dist.zip) = d92998f7503a74e9e4f8aef5c81d85849abfed51d9d8fb622103c4eb5d1330a7
+SIZE (bazel-4.2.1rc2-dist.zip) = 279265298