sysutils/py-azure-cli: Update to 2.0.72

- Port changes

  Almost all sysutils/py-azure-cli-* ports were incorporated into
  py-azure-cli.

  This update replaces all those dependencies to their
  devel/py-azure-mgmt-* port directly, eliminating a level in the
  dependency chain.

  sysutils/py-azure-cli
   --> sysutils/py-azure-cli-XYZ  (GONE)
     --> devel/py-azure-mgmt-XYZ

  Now we will be able to remove ~50 sysutils/py-azure-cli-* ports
  from the ports tree.

- Add patches to fix an issue with the Policy API
  >>> ImportError: cannot import name 'PolicyMode'

5 files changed, 139 insertions, 61 deletions

diff --git a/sysutils/py-azure-cli/Makefile b/sysutils/py-azure-cli/Makefile
index 4226d1088ceb..967d1ce5c47c 100644
--- a/sysutils/py-azure-cli/Makefile
+++ b/sysutils/py-azure-cli/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-cli
-PORTVERSION=	2.0.67
+PORTVERSION=	2.0.72
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,60 +12,97 @@ COMMENT=	Microsoft Azure Command-Line Tools
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=2.0.67:sysutils/py-azure-cli-core@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-profile>=2.1.5:sysutils/py-azure-cli-profile@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-resource>=2.1.16:sysutils/py-azure-cli-resource@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-monitor>=0.2.15:sysutils/py-azure-cli-monitor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-vm>=2.2.23:sysutils/py-azure-cli-vm@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-batch>=7.0:devel/py-azure-batch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=2.0.72:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=1.0.2:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-storage>=2.4.3:sysutils/py-azure-cli-storage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-sql>=2.2.5:sysutils/py-azure-cli-sql@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-sqlvm>=0.2.0:sysutils/py-azure-cli-sqlvm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-signalr>=1.0.1:sysutils/py-azure-cli-signalr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-servicefabric>=0.1.20:sysutils/py-azure-cli-servicefabric@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-servicebus>=0.3.6:sysutils/py-azure-cli-servicebus@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-security>=0.1.2:sysutils/py-azure-cli-security@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-search>=0.1.2:sysutils/py-azure-cli-search@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-role>=2.6.4:sysutils/py-azure-cli-role@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-reservations>=0.4.3:sysutils/py-azure-cli-reservations@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-relay>=0.1.5:sysutils/py-azure-cli-relay@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-redis>=0.4.4:sysutils/py-azure-cli-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-rdbms>=0.3.12:sysutils/py-azure-cli-rdbms@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-policyinsights>=0.1.4:sysutils/py-azure-cli-policyinsights@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-network>=2.5.2:sysutils/py-azure-cli-network@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-maps>=0.3.5:sysutils/py-azure-cli-maps@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-lab>=0.1.8:sysutils/py-azure-cli-lab@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-kusto>=0.2.3:sysutils/py-azure-cli-kusto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-keyvault>=2.2.16:sysutils/py-azure-cli-keyvault@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-iotcentral>=0.1.7:sysutils/py-azure-cli-iotcentral@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-iot>=0.3.11:sysutils/py-azure-cli-iot@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-interactive>=0.4.5:sysutils/py-azure-cli-interactive@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-hdinsight>=0.3.5:sysutils/py-azure-cli-hdinsight@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-find>=0.3.4:sysutils/py-azure-cli-find@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-feedback>=2.2.1:sysutils/py-azure-cli-feedback@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-extension>=0.2.5:sysutils/py-azure-cli-extension@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-eventhubs>=0.3.7:sysutils/py-azure-cli-eventhubs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-eventgrid>=0.2.4:sysutils/py-azure-cli-eventgrid@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-dms>=0.1.4:sysutils/py-azure-cli-dms@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-dls>=0.1.10:sysutils/py-azure-cli-dls@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-dla>=0.2.6:sysutils/py-azure-cli-dla@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cosmosdb>=0.2.11:sysutils/py-azure-cli-cosmosdb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-container>=0.3.18:sysutils/py-azure-cli-container@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-consumption>=0.4.4:sysutils/py-azure-cli-consumption@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-configure>=2.0.24:sysutils/py-azure-cli-configure@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cognitiveservices>=0.2.6:sysutils/py-azure-cli-cognitiveservices@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cloud>=2.1.1:sysutils/py-azure-cli-cloud@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cdn>=0.2.4:sysutils/py-azure-cli-cdn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-botservice>=0.2.2:sysutils/py-azure-cli-botservice@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-billing>=0.2.2:sysutils/py-azure-cli-billing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-batchai>=0.4.10:sysutils/py-azure-cli-batchai@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-batch>=4.0.3:sysutils/py-azure-cli-batch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-backup>=1.2.5:sysutils/py-azure-cli-backup@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-ams>=0.4.7:sysutils/py-azure-cli-ams@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-advisor>=2.0.1:sysutils/py-azure-cli-advisor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-acs>=2.4.4:sysutils/py-azure-cli-acs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-acr>=2.2.9:sysutils/py-azure-cli-acr@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.45:devel/py-azure-datalake-store@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-functions-devops-build>=0.0.22:devel/py-azure-functions-devops-build@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1:devel/py-azure-keyvault@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=2.0.1:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-applicationinsights>=0.1.1:devel/py-azure-mgmt-applicationinsights@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-appconfiguration>=0.1.0:devel/py-azure-mgmt-appconfiguration@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.52.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=6.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=2.0:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=0.2:devel/py-azure-mgmt-billing@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=0.2.0:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=3.1:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=5.0.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=6.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-consumption>=2.0:devel/py-azure-mgmt-consumption@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=1.4:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=3.0.0.r5:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=5.2:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=0.7.0:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-analytics>=0.2.1:devel/py-azure-mgmt-datalake-analytics@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=0.1.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-deploymentmanager>=0.1.0:devel/py-azure-mgmt-deploymentmanager@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=2.2:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=2.1:devel/py-azure-mgmt-dns@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=2.2:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=2.6:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=1.1.0:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-imagebuilder>=0.2.1:devel/py-azure-mgmt-imagebuilder@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=1.0:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothub>=0.8.2:devel/py-azure-mgmt-iothub@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothubprovisioningservices>=0.2.0:devel/py-azure-mgmt-iothubprovisioningservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=1.1:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=0.2:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managedservices>=1.0:devel/py-azure-mgmt-managedservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=0.1:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=0.1.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-marketplaceordering>=0.1:devel/py-azure-mgmt-marketplaceordering@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=1.1:devel/py-azure-mgmt-media@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=0.2:devel/py-azure-mgmt-msi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=4.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-netapp>=0.5.0:devel/py-azure-mgmt-netapp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=0.3.1:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-privatedns>=0.1.0:devel/py-azure-mgmt-privatedns@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=1.8:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=0.4.0:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=0.4.0:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=6.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-relay>=0.1.0:devel/py-azure-mgmt-relay@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-reservations>=0.3.1:devel/py-azure-mgmt-reservations@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.1:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=2.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=0.1.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=0.6.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicefabric>=0.2.0:devel/py-azure-mgmt-servicefabric@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=0.3.0:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=0.12:devel/py-azure-mgmt-sql@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=0.4.0:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=4.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=0.51.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.42.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=0.2.4:devel/py-azure-multiapi-storage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.1:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=2.3.1:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fabric>=2.4:devel/py-fabric@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}knack>=0.6.3:devel/py-knack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.4:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>=5.6:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scp>=0.13.2:security/py-scp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sshtunnel>=0.1.4:net/py-sshtunnel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.18:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vsts-cd-manager>=1.0.0:devel/py-vsts-cd-manager@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websocket-client>=0.56.0:www/py-websocket-client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xmltodict>=0.12:devel/py-xmltodict@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}javaproperties>=0.5.1:devel/py-javaproperties@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsondiff>=1.2.0:devel/py-jsondiff@${PY_FLAVOR}
 
 USES=		azurepy python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/sysutils/py-azure-cli/distinfo b/sysutils/py-azure-cli/distinfo
index a301985811b2..396ecf1a66bf 100644
--- a/sysutils/py-azure-cli/distinfo
+++ b/sysutils/py-azure-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561042718
-SHA256 (azure-cli-2.0.67.tar.gz) = 4c7e87f8bb6f6143f5a2c2bc9c2e7e7d56f6836dbb658cca00452cfd09194ec5
-SIZE (azure-cli-2.0.67.tar.gz) = 8603
+TIMESTAMP = 1567853924
+SHA256 (azure-cli-2.0.72.tar.gz) = d40fbadeff0957f4776df3dd50a6b7563927c74c3115111b086d1709d9cd9585
+SIZE (azure-cli-2.0.72.tar.gz) = 1018576
diff --git a/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___help.py b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___help.py
new file mode 100644
index 000000000000..f3fd7d00e436
--- /dev/null
+++ b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___help.py
@@ -0,0 +1,24 @@
+# Part of
+# https://github.com/Azure/azure-cli/commit/b33944353f474a35cae113b1496e90822d2eb8c6
+--- azure/cli/command_modules/resource/_help.py.orig	2019-09-07 20:28:46 UTC
++++ azure/cli/command_modules/resource/_help.py
+@@ -799,6 +799,19 @@ examples:
+                 "effect": "deny"
+             }
+         }'
++  - name: Create a policy definition with mode. The mode 'Indexed' indicates the policy should be evaluated only for resource types that support tags and location.
++    text: |
++        az policy definition create --name TagsPolicyDefinition --subscription 'MySubscription' --mode Indexed --rules '{
++            "if":
++            {
++                "field": "tags",
++                "exists": "false"
++            },
++            "then":
++            {
++                "effect": "deny"
++            }
++        }'
+ """
+ 
+ helps['policy definition delete'] = """
diff --git a/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___params.py b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___params.py
new file mode 100644
index 000000000000..4d83465381a4
--- /dev/null
+++ b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___params.py
@@ -0,0 +1,21 @@
+# Part of
+# https://github.com/Azure/azure-cli/commit/b33944353f474a35cae113b1496e90822d2eb8c6
+--- azure/cli/command_modules/resource/_params.py.orig	2019-09-07 20:29:39 UTC
++++ azure/cli/command_modules/resource/_params.py
+@@ -102,7 +102,6 @@ def load_arguments(self, _):
+         c.argument('resource_group_name', arg_type=resource_group_name_type, help='the resource group where the policy will be applied')
+ 
+     with self.argument_context('policy definition', resource_type=ResourceType.MGMT_RESOURCE_POLICY) as c:
+-        from azure.mgmt.resource.policy.models import PolicyMode
+         c.argument('policy_definition_name', arg_type=existing_policy_definition_name_type)
+         c.argument('rules', help='JSON formatted string or a path to a file with such content', type=file_type, completer=FilesCompleter())
+         c.argument('display_name', help='Display name of policy definition.')
+@@ -110,7 +109,7 @@ def load_arguments(self, _):
+         c.argument('params', help='JSON formatted string or a path to a file or uri with parameter definitions.', type=file_type, completer=FilesCompleter(), min_api='2016-12-01')
+         c.argument('metadata', min_api='2017-06-01-preview', nargs='+', validator=validate_metadata, help='Metadata in space-separated key=value pairs.')
+         c.argument('management_group', arg_type=management_group_name_type)
+-        c.argument('mode', arg_type=get_enum_type(PolicyMode), options_list=['--mode', '-m'], help='Mode of the policy definition.', min_api='2016-12-01')
++        c.argument('mode', options_list=['--mode', '-m'], help='Mode of the policy definition, e.g. All, Indexed. Please visit https://aka.ms/azure-policy-mode for more information.', min_api='2016-12-01')
+         c.argument('subscription', arg_type=subscription_type)
+         c.ignore('_subscription')  # disable global subscription
+ 
diff --git a/sysutils/py-azure-cli/pkg-message b/sysutils/py-azure-cli/pkg-message
index 9d3c309ac66b..8fbcf6d56586 100644
--- a/sysutils/py-azure-cli/pkg-message
+++ b/sysutils/py-azure-cli/pkg-message
@@ -1,8 +1,6 @@
 [
 {
 	message: <<EOM
-================================================================================
-
 Welcome to the Azure CLI! The CLI is a tool designed to get you working quickly
 and efficiently with Azure services, with an emphasis on automation.
 
@@ -15,8 +13,6 @@ https://docs.microsoft.com/en-us/cli/azure/azure-cli-vm-tutorial
 In this tutorial, you learn all of the steps involved in setting up a virtual
 machine with the Azure CLI. The tutorial also covers output queries, Azure
 resource reuse, and resource cleanup.
-
-================================================================================
 EOM
 	type: install
 }