git: d0ce5eeb95a2 - main - devel/bazel: update to 4.2.1

[Fernando Apesteguía]

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d0ce5eeb95a27af4868d0dc57bf0f7e1c9672e93

commit d0ce5eeb95a27af4868d0dc57bf0f7e1c9672e93
Author:     Klaus Aehlig <aehlig at linta.de>
AuthorDate: 2021-08-31 07:14:03 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-09-01 06:08:26 +0000

    devel/bazel: update to 4.2.1
    
    ChangeLog: https://github.com/bazelbuild/bazel/releases/tag/4.2.1
    
    While here, pet linters.
    
    PR:     258180
    Reported by:    aehlig at linta.de (maintainer)
---
 devel/bazel/Makefile | 22 +++++++++++-----------
 devel/bazel/distinfo |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index e5cad700338d..f9e596a91960 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Klaus Aehlig <aehlig at 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
@@ -22,26 +22,26 @@ 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"
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