diff -ruN bazel.orig/Makefile bazel/Makefile
--- bazel.orig/Makefile	2020-03-03 14:03:17.886493000 +0100
+++ bazel/Makefile	2020-03-03 15:04:06.577212000 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: head/devel/bazel/Makefile 525657 2020-02-09 13:48:19Z riggs $
 
 PORTNAME=	bazel
-DISTVERSION=	2.1.0
+DISTVERSION=	2.2.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
 DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
@@ -29,7 +29,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=	1
 
 SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
 USE_JAVA=	yes
@@ -64,7 +64,8 @@
 	-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|/usr/bin/env python|${PYTHON_CMD}|' \
+	-e 's|pythonExecutableName =.*|pythonExecutableName = "${PYTHON_CMD}";|' \
+	-e 's|#!/usr/bin/env |#!|' \
 	${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
 
 do-build:
diff -ruN bazel.orig/distinfo bazel/distinfo
--- bazel.orig/distinfo	2020-03-03 14:03:17.900197000 +0100
+++ bazel/distinfo	2020-03-03 15:04:06.577241000 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580457560
-SHA256 (bazel-2.1.0rc4-dist.zip) = ac1d9a6189d717ba5aafcbc0745809155d24044df1a69e8de254c5b9182e894b
-SIZE (bazel-2.1.0rc4-dist.zip) = 259805171
+TIMESTAMP = 1581709432
+SHA256 (bazel-2.2.0rc1-dist.zip) = a67f282be7ee72181e797efb5ba7cb5fdb203fc883a2649e42e3464f556c73ec
+SIZE (bazel-2.2.0rc1-dist.zip) = 260142631
diff -ruN bazel.orig/files/patch-tools__jdk__default_java_toolchain.bzl bazel/files/patch-tools__jdk__default_java_toolchain.bzl
--- bazel.orig/files/patch-tools__jdk__default_java_toolchain.bzl	2020-03-03 14:03:17.879660000 +0100
+++ bazel/files/patch-tools__jdk__default_java_toolchain.bzl	2020-03-03 15:04:06.577157000 +0100
@@ -1,6 +1,6 @@
---- tools/jdk/default_java_toolchain.bzl.orig	2019-08-06 08:09:07.930962000 +0000
-+++ tools/jdk/default_java_toolchain.bzl	2019-08-06 08:16:15.674960000 +0000
-@@ -19,25 +19,6 @@
+--- tools/jdk/default_java_toolchain.bzl.orig	2020-02-14 20:56:31.911758000 +0100
++++ tools/jdk/default_java_toolchain.bzl	2020-02-14 20:57:09.531875000 +0100
+@@ -21,25 +21,6 @@
  ]
  
  JDK9_JVM_OPTS = [
@@ -26,12 +26,12 @@
  ]
  
  DEFAULT_JAVACOPTS = [
-@@ -70,7 +51,7 @@
-         "@bazel_tools//tools/jdk:jdk_compiler_jar",
-     ],
+@@ -63,7 +44,7 @@
      "javac_supports_workers": 1,
--    "jvm_opts": JDK9_JVM_OPTS,
-+    "jvm_opts": JDK8_JVM_OPTS,
+     "jvm_opts": select({
+         "@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,
+-        "//conditions:default": JDK9_JVM_OPTS,
++        "//conditions:default": JDK8_JVM_OPTS,
+     }),
      "misc": DEFAULT_JAVACOPTS,
-     "compatible_javacopts": COMPATIBLE_JAVACOPTS,
      "singlejar": ["@bazel_tools//tools/jdk:singlejar"],