Index: head/devel/bazel/Makefile
===================================================================
--- head/devel/bazel/Makefile	(revision 494079)
+++ head/devel/bazel/Makefile	(revision 494080)
@@ -1,86 +1,86 @@
 # Created by: Klaus Aehlig <aehlig@linta.de>
 # $FreeBSD$
 
 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
 
 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_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
 
 # 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)
 USE_JAVA=		yes
 JAVA_VENDOR=		openjdk
 JAVA_VERSION=		1.8
 JAVA_BUILD=		yes
 JAVA_RUN=		yes
 
 NO_WRKSUBDIR=		YES
 
 STRIP=	# The bazel binary is also a zip archive (extracted by the elf part), it must not be stripped
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 EXTRA_PATCHES+=	${FILESDIR}/extra-i386_src_BUILD ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.freebsd
 .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/blaze_util_posix.cc \
 	${WRKSRC}/src/main/cpp/BUILD
 	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --python_path=${PYTHON_CMD} >> ${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|\$$command|$$command --python_path=${PYTHON_CMD}|' \
 	${WRKSRC}/scripts/bootstrap/bootstrap.sh
 	@${REINPLACE_CMD} \
 	-e 's|/usr/bin/env python|${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>
Index: head/devel/bazel/distinfo
===================================================================
--- head/devel/bazel/distinfo	(revision 494079)
+++ head/devel/bazel/distinfo	(revision 494080)
@@ -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
Index: head/devel/bazel/files/extra-i386_src_BUILD
===================================================================
--- head/devel/bazel/files/extra-i386_src_BUILD	(revision 494079)
+++ head/devel/bazel/files/extra-i386_src_BUILD	(revision 494080)
@@ -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",
+     ],
+ })
+