51 files changed, 153 insertions, 0 deletions

diff --git a/sysutils/py-azure-cli-acs/Makefile b/sysutils/py-azure-cli-acs/Makefile
index 98acc002cd06..586d3e631ae7 100644
--- a/sysutils/py-azure-cli-acs/Makefile
+++ b/sysutils/py-azure-cli-acs/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools ACS Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=5.0.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=5.2.0:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-advisor/Makefile b/sysutils/py-azure-cli-advisor/Makefile
index 915f51289156..ab5f28d6cab3 100644
--- a/sysutils/py-azure-cli-advisor/Makefile
+++ b/sysutils/py-azure-cli-advisor/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Advisor Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=2.0.1:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-ams/Makefile b/sysutils/py-azure-cli-ams/Makefile
index cfbd36c0eed0..3c001b21a931 100644
--- a/sysutils/py-azure-cli-ams/Makefile
+++ b/sysutils/py-azure-cli-ams/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools AMS Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=1.1.1:devel/py-azure-mgmt-media@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-appservice/Makefile b/sysutils/py-azure-cli-appservice/Makefile
index 514759ebc029..73243a359552 100644
--- a/sysutils/py-azure-cli-appservice/Makefile
+++ b/sysutils/py-azure-cli-appservice/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools AppService Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.1.1:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.40.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=2.7.0:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-backup/Makefile b/sysutils/py-azure-cli-backup/Makefile
index f0140ff0d8de..18f79dcfbd87 100644
--- a/sysutils/py-azure-cli-backup/Makefile
+++ b/sysutils/py-azure-cli-backup/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Recovery Services Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=0.1.1:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=0.1.2:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-batch/Makefile b/sysutils/py-azure-cli-batch/Makefile
index 44aa8625fec5..65fd895f8f97 100644
--- a/sysutils/py-azure-cli-batch/Makefile
+++ b/sysutils/py-azure-cli-batch/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Batch Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=6.0.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-batch>=6.0.0:devel/py-azure-batch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-batchai/Makefile b/sysutils/py-azure-cli-batchai/Makefile
index 6cbbae41a84b..5fae23f5ce7a 100644
--- a/sysutils/py-azure-cli-batchai/Makefile
+++ b/sysutils/py-azure-cli-batchai/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Batch AI Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=2.0.0:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-billing/Makefile b/sysutils/py-azure-cli-billing/Makefile
index 7383216918ae..4a35ae3b8c7b 100644
--- a/sysutils/py-azure-cli-billing/Makefile
+++ b/sysutils/py-azure-cli-billing/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Billing Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=0.2.0:devel/py-azure-mgmt-billing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-botservice/Makefile b/sysutils/py-azure-cli-botservice/Makefile
index 50211e20685f..d62fb0e6e716 100644
--- a/sysutils/py-azure-cli-botservice/Makefile
+++ b/sysutils/py-azure-cli-botservice/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Bot Services Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=0:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.42.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-cdn/Makefile b/sysutils/py-azure-cli-cdn/Makefile
index 7ddc1bfc829d..5993c62c9a13 100644
--- a/sysutils/py-azure-cli-cdn/Makefile
+++ b/sysutils/py-azure-cli-cdn/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools CDN Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=3.1.0:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-cloud/Makefile b/sysutils/py-azure-cli-cloud/Makefile
index b40a7c7c6008..80586dc8136a 100644
--- a/sysutils/py-azure-cli-cloud/Makefile
+++ b/sysutils/py-azure-cli-cloud/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Cloud Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-cognitiveservices/Makefile b/sysutils/py-azure-cli-cognitiveservices/Makefile
index 7b8f07ae9499..08c492405acc 100644
--- a/sysutils/py-azure-cli-cognitiveservices/Makefile
+++ b/sysutils/py-azure-cli-cognitiveservices/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Cognitive Services Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=3.0.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-configure/Makefile b/sysutils/py-azure-cli-configure/Makefile
index cd6e9fe7dabe..16f7f1c5a468 100644
--- a/sysutils/py-azure-cli-configure/Makefile
+++ b/sysutils/py-azure-cli-configure/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Configure Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-consumption/Makefile b/sysutils/py-azure-cli-consumption/Makefile
index 768af22839f5..28dc85c91837 100644
--- a/sysutils/py-azure-cli-consumption/Makefile
+++ b/sysutils/py-azure-cli-consumption/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Consumption Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-consumption>=2.0.0:devel/py-azure-mgmt-consumption@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-container/Makefile b/sysutils/py-azure-cli-container/Makefile
index 4a1560748301..03c0c88f911a 100644
--- a/sysutils/py-azure-cli-container/Makefile
+++ b/sysutils/py-azure-cli-container/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools container Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=1.4.0:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=0.2.0:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.0.0:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-cosmosdb/Makefile b/sysutils/py-azure-cli-cosmosdb/Makefile
index da2e9a3b2b8d..d448ddf028c5 100644
--- a/sysutils/py-azure-cli-cosmosdb/Makefile
+++ b/sysutils/py-azure-cli-cosmosdb/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Cosmos DB Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=0.6.1:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-dla/Makefile b/sysutils/py-azure-cli-dla/Makefile
index dbd68a1aaf9b..be866906d710 100644
--- a/sysutils/py-azure-cli-dla/Makefile
+++ b/sysutils/py-azure-cli-dla/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Data Lake Analytics Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-analytics>=0.2.1:devel/py-azure-mgmt-datalake-analytics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-dls/Makefile b/sysutils/py-azure-cli-dls/Makefile
index 78ed1f5bb77e..c165c3232c4c 100644
--- a/sysutils/py-azure-cli-dls/Makefile
+++ b/sysutils/py-azure-cli-dls/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Data Lake Store Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.39:devel/py-azure-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-dms/Makefile b/sysutils/py-azure-cli-dms/Makefile
index 13cf0231cbc0..c318baf446f4 100644
--- a/sysutils/py-azure-cli-dms/Makefile
+++ b/sysutils/py-azure-cli-dms/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools for the Data Migration Service (DMS)
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=0.1.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-eventgrid/Makefile b/sysutils/py-azure-cli-eventgrid/Makefile
index d2f17b098b41..af6161a684d0 100644
--- a/sysutils/py-azure-cli-eventgrid/Makefile
+++ b/sysutils/py-azure-cli-eventgrid/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools EventGrid Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=2.2.0:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-eventhubs/Makefile b/sysutils/py-azure-cli-eventhubs/Makefile
index c1f89f023156..194d51af66fb 100644
--- a/sysutils/py-azure-cli-eventhubs/Makefile
+++ b/sysutils/py-azure-cli-eventhubs/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Event Hubs Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=2.6.0:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-extension/Makefile b/sysutils/py-azure-cli-extension/Makefile
index 44e08d26d490..59783b69629c 100644
--- a/sysutils/py-azure-cli-extension/Makefile
+++ b/sysutils/py-azure-cli-extension/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Extension Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-feedback/Makefile b/sysutils/py-azure-cli-feedback/Makefile
index 2aad2ca7e11a..2b389704b7d8 100644
--- a/sysutils/py-azure-cli-feedback/Makefile
+++ b/sysutils/py-azure-cli-feedback/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Feedback Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-find/Makefile b/sysutils/py-azure-cli-find/Makefile
index 4b3bc36590e2..695fc2835483 100644
--- a/sysutils/py-azure-cli-find/Makefile
+++ b/sysutils/py-azure-cli-find/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Find Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-hdinsight/Makefile b/sysutils/py-azure-cli-hdinsight/Makefile
index 8dc78237cf62..2e3dcfbb7984 100644
--- a/sysutils/py-azure-cli-hdinsight/Makefile
+++ b/sysutils/py-azure-cli-hdinsight/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools HDInsight Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=0.2.1:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-interactive/Makefile b/sysutils/py-azure-cli-interactive/Makefile
index 5af2266a3382..9148b0895b7e 100644
--- a/sysutils/py-azure-cli-interactive/Makefile
+++ b/sysutils/py-azure-cli-interactive/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Interactive Shell
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt_toolkit1>=1.0.15:devel/py-prompt_toolkit1@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-iot/Makefile b/sysutils/py-azure-cli-iot/Makefile
index 335f6efdecae..c82ef3774949 100644
--- a/sysutils/py-azure-cli-iot/Makefile
+++ b/sysutils/py-azure-cli-iot/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools IoT Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${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-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-iotcentral/Makefile b/sysutils/py-azure-cli-iotcentral/Makefile
index 86d16001ac1a..573c75a917ac 100644
--- a/sysutils/py-azure-cli-iotcentral/Makefile
+++ b/sysutils/py-azure-cli-iotcentral/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools IoT Central Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=1.0.0:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-keyvault/Makefile b/sysutils/py-azure-cli-keyvault/Makefile
index 56e57173176c..1d9c38bb669c 100644
--- a/sysutils/py-azure-cli-keyvault/Makefile
+++ b/sysutils/py-azure-cli-keyvault/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Keyvault Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=1.1.0:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1.0:devel/py-azure-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-kusto/Makefile b/sysutils/py-azure-cli-kusto/Makefile
index 14c179242606..8664122c8717 100644
--- a/sysutils/py-azure-cli-kusto/Makefile
+++ b/sysutils/py-azure-cli-kusto/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools KUSTO Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-lab/Makefile b/sysutils/py-azure-cli-lab/Makefile
index b769e9488e6c..f0c165956751 100644
--- a/sysutils/py-azure-cli-lab/Makefile
+++ b/sysutils/py-azure-cli-lab/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools DevTestLabs Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=2.2.0:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-maps/Makefile b/sysutils/py-azure-cli-maps/Makefile
index 243e75075bd2..4fa61937281e 100644
--- a/sysutils/py-azure-cli-maps/Makefile
+++ b/sysutils/py-azure-cli-maps/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Maps Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=0.1.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-monitor/Makefile b/sysutils/py-azure-cli-monitor/Makefile
index 1b31a1822cf0..5581de4f532d 100644
--- a/sysutils/py-azure-cli-monitor/Makefile
+++ b/sysutils/py-azure-cli-monitor/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Monitor Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-network/Makefile b/sysutils/py-azure-cli-network/Makefile
index 0463fa2e3810..8992811edc47 100644
--- a/sysutils/py-azure-cli-network/Makefile
+++ b/sysutils/py-azure-cli-network/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Network Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=0.51.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=2.1.0:devel/py-azure-mgmt-dns@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-policyinsights/Makefile b/sysutils/py-azure-cli-policyinsights/Makefile
index e614cc504fc7..0d78dd2c027b 100644
--- a/sysutils/py-azure-cli-policyinsights/Makefile
+++ b/sysutils/py-azure-cli-policyinsights/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Policy Insights Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=0.3.1:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-profile/Makefile b/sysutils/py-azure-cli-profile/Makefile
index 61bfc733a66f..eddfd3d3615b 100644
--- a/sysutils/py-azure-cli-profile/Makefile
+++ b/sysutils/py-azure-cli-profile/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Profile Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-rdbms/Makefile b/sysutils/py-azure-cli-rdbms/Makefile
index 4e8f4881759f..6172eb4dc248 100644
--- a/sysutils/py-azure-cli-rdbms/Makefile
+++ b/sysutils/py-azure-cli-rdbms/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools MySQL and PostgreSQL Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=1.8.0:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-redis/Makefile b/sysutils/py-azure-cli-redis/Makefile
index 3e150571f1f1..32d5fc8a9fa6 100644
--- a/sysutils/py-azure-cli-redis/Makefile
+++ b/sysutils/py-azure-cli-redis/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Redis Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=6.0.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-relay/Makefile b/sysutils/py-azure-cli-relay/Makefile
index 693407fc180a..f7931be9a1fe 100644
--- a/sysutils/py-azure-cli-relay/Makefile
+++ b/sysutils/py-azure-cli-relay/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Relay Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-relay>=0.1.0:devel/py-azure-mgmt-relay@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-reservations/Makefile b/sysutils/py-azure-cli-reservations/Makefile
index b50337953514..1bf960d93b99 100644
--- a/sysutils/py-azure-cli-reservations/Makefile
+++ b/sysutils/py-azure-cli-reservations/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Reservations Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-reservations>=0.3.1:devel/py-azure-mgmt-reservations@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-resource/Makefile b/sysutils/py-azure-cli-resource/Makefile
index a6acbeb967c6..31ee400a693f 100644
--- a/sysutils/py-azure-cli-resource/Makefile
+++ b/sysutils/py-azure-cli-resource/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Resource Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=0.1.0:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-role/Makefile b/sysutils/py-azure-cli-role/Makefile
index 7f2d3ba9277a..0239df2de24c 100644
--- a/sysutils/py-azure-cli-role/Makefile
+++ b/sysutils/py-azure-cli-role/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Role Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-search/Makefile b/sysutils/py-azure-cli-search/Makefile
index b74c3dc43e08..289faa05f13e 100644
--- a/sysutils/py-azure-cli-search/Makefile
+++ b/sysutils/py-azure-cli-search/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Search Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=2.0.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-security/Makefile b/sysutils/py-azure-cli-security/Makefile
index 08adb959cd95..ca172143d517 100644
--- a/sysutils/py-azure-cli-security/Makefile
+++ b/sysutils/py-azure-cli-security/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Azure Security Center
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=0.1.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-servicebus/Makefile b/sysutils/py-azure-cli-servicebus/Makefile
index 3e3d4f27c781..bcf9706dbbc1 100644
--- a/sysutils/py-azure-cli-servicebus/Makefile
+++ b/sysutils/py-azure-cli-servicebus/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Service Bus Command-Line Tools
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=0.6.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-servicefabric/Makefile b/sysutils/py-azure-cli-servicefabric/Makefile
index 2df37a1cd8f6..9b7aa127289a 100644
--- a/sysutils/py-azure-cli-servicefabric/Makefile
+++ b/sysutils/py-azure-cli-servicefabric/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Service Fabric Command-Line Tools
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1.0:devel/py-azure-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-signalr/Makefile b/sysutils/py-azure-cli-signalr/Makefile
index 38fe4541de64..1c078fe8a0f6 100644
--- a/sysutils/py-azure-cli-signalr/Makefile
+++ b/sysutils/py-azure-cli-signalr/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools SignalR Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=0.1.1:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-sql/Makefile b/sysutils/py-azure-cli-sql/Makefile
index 45f2cd496cc2..cb0c9b39390c 100644
--- a/sysutils/py-azure-cli-sql/Makefile
+++ b/sysutils/py-azure-cli-sql/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools SQL Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=0.12.0:devel/py-azure-mgmt-sql@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-sqlvm/Makefile b/sysutils/py-azure-cli-sqlvm/Makefile
index ad83a5d944ca..81d327d11839 100644
--- a/sysutils/py-azure-cli-sqlvm/Makefile
+++ b/sysutils/py-azure-cli-sqlvm/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools SQL virtual machine Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=0.3.0:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-storage/Makefile b/sysutils/py-azure-cli-storage/Makefile
index 8e173db9db5c..2720440805c3 100644
--- a/sysutils/py-azure-cli-storage/Makefile
+++ b/sysutils/py-azure-cli-storage/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Storage Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=0.2.3:devel/py-azure-multiapi-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-vm/Makefile b/sysutils/py-azure-cli-vm/Makefile
index 505c3105cc68..5c987fd97cba 100644
--- a/sysutils/py-azure-cli-vm/Makefile
+++ b/sysutils/py-azure-cli-vm/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools VM Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=0.2.0:devel/py-azure-mgmt-msi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=5.0.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \