* Update devel/awscli to 1.2.5

* Update devel/py-botocore 0.25.0
* Update devel/py-bcdoc to 0.11.0
* Update devel/py-jmespath to 0.1.0
* Add STAGE support in updated ports.

Approved by:	wg (mentor)

3 files changed, 51 insertions, 30 deletions

diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 5d6ea0faf401..d5755a260b83 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	awscli
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.5
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 MASTER_SITE_SUBDIR=source/a/awscli
@@ -12,8 +12,8 @@ COMMENT=	Universal Command Line Interface for Amazon Web Services
 
 LICENSE=	AL2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcdoc>=0.10.0:${PORTSDIR}/devel/py-bcdoc \
-		${PYTHON_PKGNAMEPREFIX}botocore>=0.17:${PORTSDIR}/devel/py-botocore \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcdoc>=0.11.0:${PORTSDIR}/devel/py-bcdoc \
+		${PYTHON_PKGNAMEPREFIX}botocore>=0.25:${PORTSDIR}/devel/py-botocore \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:${PORTSDIR}/devel/py-colorama \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
 		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:${PORTSDIR}/security/py-rsa \
@@ -22,11 +22,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcdoc>=0.10.0:${PORTSDIR}/devel/py-bcdoc \
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 270
-RUN_DEPENDS+=   ${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/awscli/distinfo b/devel/awscli/distinfo
index d7a759d84aec..39de0b6b803b 100644
--- a/devel/awscli/distinfo
+++ b/devel/awscli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (awscli-1.1.0.tar.gz) = c3802d3274618d152fc3cd0946b8f5a131ab89318b3e8ba1d89d4d27c2ecb647
-SIZE (awscli-1.1.0.tar.gz) = 121538
+SHA256 (awscli-1.2.5.tar.gz) = cfcb2c8c2ca6b991e99436f6f8ca1f411866f02f3cfe1d4bc0e8ac70294ab3ea
+SIZE (awscli-1.2.5.tar.gz) = 135537
diff --git a/devel/awscli/pkg-plist b/devel/awscli/pkg-plist
index ce340fdd9670..8658a5407467 100644
--- a/devel/awscli/pkg-plist
+++ b/devel/awscli/pkg-plist
@@ -39,6 +39,15 @@ bin/aws_zsh_completer.sh
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/argrename.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/argrename.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/argrename.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/cloudtrail.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/cloudtrail.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/cloudtrail.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/commands.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/commands.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/commands.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/configure.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/configure.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/configure.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/dryrundocs.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/dryrundocs.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/dryrundocs.pyo
@@ -75,6 +84,9 @@ bin/aws_zsh_completer.sh
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/removals.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/removals.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/removals.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/route53resourceid.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/route53resourceid.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/route53resourceid.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/__init__.pyo
@@ -87,6 +99,9 @@ bin/aws_zsh_completer.sh
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/description.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/description.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/description.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/dochandler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/dochandler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/dochandler.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/executer.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/executer.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/executer.pyo
@@ -114,6 +129,9 @@ bin/aws_zsh_completer.sh
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/utils.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/utils.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/service.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/service.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/service.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/sessendemail.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/sessendemail.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/sessendemail.pyo
@@ -132,6 +150,7 @@ bin/aws_zsh_completer.sh
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/autoscaling/describe-auto-scaling-groups.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/autoscaling/describe-auto-scaling-instances.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/autoscaling/describe-scaling-activities.rst
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/autoscaling/update-auto-scaling-group.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudformation/create-stack.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudformation/describe-stacks.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudformation/get-template.rst
@@ -337,29 +356,32 @@ bin/aws_zsh_completer.sh
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/table.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/table.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/table.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/text.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/text.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/text.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/utils.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/utils.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/swf
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/storagegateway
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/sqs
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/sns
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/ses
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/s3api
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/s3
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/redshift
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/rds
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/opsworks
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/iam
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/ec2
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudwatch
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudformation
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/autoscaling
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/data
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/swf
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/storagegateway
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/sqs
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/sns
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/ses
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/s3api
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/s3
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/redshift
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/rds
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/opsworks
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/iam
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/ec2
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudwatch
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/cloudformation
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples/autoscaling
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/examples
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/data
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations/s3
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli/customizations
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/awscli
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%