diff -ruN bazel.orig/Makefile bazel/Makefile
--- bazel.orig/Makefile	2019-02-27 08:48:25.218666000 +0100
+++ bazel/Makefile	2019-02-27 08:47:44.626146000 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: head/devel/bazel/Makefile 491744 2019-01-31 17:51:39Z tobik $
 
 PORTNAME=		bazel
-DISTVERSION=		0.22.0
+DISTVERSION=		0.23.0
 CATEGORIES=		devel java
 MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
 DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
@@ -24,7 +24,7 @@
 # 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
+FINALRC=		3
 
 USES=			shebangfix zip:infozip python
 SHEBANG_REGEX=		.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
diff -ruN bazel.orig/distinfo bazel/distinfo
--- bazel.orig/distinfo	2019-02-27 08:48:25.329803000 +0100
+++ bazel/distinfo	2019-02-27 08:47:44.627908000 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548326791
-SHA256 (bazel-0.22.0rc4-dist.zip) = 70db3b8397a6c3c5cabc4f1fffce5039ae874657d6123e7ecfc328460b1e6d2b
-SIZE (bazel-0.22.0rc4-dist.zip) = 88631345
+TIMESTAMP = 1551078041
+SHA256 (bazel-0.23.0rc3-dist.zip) = c361c7950ac0f5467f7d34f867758521b02aab794ae063976ba74151dd2120a8
+SIZE (bazel-0.23.0rc3-dist.zip) = 123718901
diff -ruN bazel.orig/files/extra-i386_src_BUILD bazel/files/extra-i386_src_BUILD
--- bazel.orig/files/extra-i386_src_BUILD	2019-02-27 08:48:25.022861000 +0100
+++ bazel/files/extra-i386_src_BUILD	2019-02-27 08:47:44.486083000 +0100
@@ -1,11 +1,11 @@
---- src/BUILD.orig	2019-01-08 10:17:38.552913000 +0000
-+++ src/BUILD	2019-01-08 10:18:35.379310000 +0000
-@@ -174,7 +174,7 @@
-                    "//src/java_tools/singlejar:SingleJar_deploy.jar",
-                ],
-                "//conditions:default": [
--                   "//src/tools/singlejar:singlejar_local",
-+                   "//src/java_tools/singlejar:SingleJar_deploy.jar",
-                ],
-            }) +
-            jdk,
+--- src/BUILD.orig	1980-01-01 00:00:00.000000000 +0000
++++ src/BUILD	2019-02-06 14:36:18.532824000 +0000
+@@ -131,7 +131,7 @@
+ ] + select({
+     "//src/conditions:arm": [],
+     "//conditions:default": [
+-        "//src/tools/singlejar:singlejar_local",
++        "//src/java_tools/singlejar:SingleJar_deploy.jar",
+     ],
+ })
+