Index: devel/awscli/Makefile
===================================================================
--- devel/awscli/Makefile
+++ devel/awscli/Makefile
@@ -18,6 +18,7 @@
 
 USES=		python
 USE_PYTHON=	autoplist distutils concurrent noflavors
+CONFLICTS=	py*-awscli*
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
Index: devel/awscli2/Makefile
===================================================================
--- /dev/null
+++ devel/awscli2/Makefile
@@ -0,0 +1,90 @@
+PORTNAME=	awscli
+DISTVERSION=	2.7.20
+CATEGORIES=	devel python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
+
+MAINTAINER=	hsw@bitmark.com
+COMMENT=	Universal Command Line Interface for Amazon Web Services V2
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+# used by post-build target below
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5<=0.4.5:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.10<0.17.2,1:textproc/py-docutils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.2<37.0.0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.0<=0.17.21:devel/py-ruamel.yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.8<0.2.0:devel/py-wcwidth@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.24<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}distro>=1.5.0<1.8.0:sysutils/py-distro@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.13.15:devel/py-awscrt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1<1.1.0:devel/py-jmespath@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.4<1.27,1:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.8.13:databases/py-sqlite3@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5<=0.4.5:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.10<0.17.2,1:textproc/py-docutils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.2<37.0.0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.0<=0.17.21:devel/py-ruamel.yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.8<0.2.0:devel/py-wcwidth@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.24<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}distro>=1.5.0<1.8.0:sysutils/py-distro@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.13.15:devel/py-awscrt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1<1.1.0:devel/py-jmespath@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.4<1.27,1:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.8.13:databases/py-sqlite3@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}coverage>=5.5:devel/py-coverage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov<=2.12.1:devel/py-pytest-cov@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.4.0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<=0.13.15:devel/py-awscrt@${PY_FLAVOR} \
+		cmake:devel/cmake \
+		rustc:lang/rust \
+		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo
+
+USES=		python:3.8+ groff:run
+USE_PYTHON=	autoplist distutils
+CONFLICTS=	awscli py*-awscli*
+INSTALL_TARGET=	install-strip
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	aws
+GH_PROJECT=	aws-cli
+
+OPTIONS_DEFINE=		BASH ZSH
+OPTIONS_DEFAULT=	BASH ZSH
+
+BASH_PLIST_FILES=	share/bash-completion/completions/aws
+ZSH_PLIST_FILES=	share/zsh/site-functions/_aws
+
+NO_ARCH=	yes
+
+PLIST_FILES+=	${PYTHON_SITELIBDIR}/awscli/data/ac.index
+post-build:
+	@${ECHO} "building completion index..."
+	cd "${WRKSRC}" && \
+		${SETENV} PYTHONPATH=build/lib \
+		${PYTHON_VERSION} ./scripts/gen-ac-index --include-builtin-index --index-location=./build/lib/awscli/data/ac.index
+
+do-install-BASH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/bin/aws_bash_completer \
+		${STAGEDIR}${PREFIX}/share/bash-completion/completions/aws
+
+do-install-ZSH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/bin/aws_zsh_completer.sh \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_aws
+
+# enable after devel/py-awscrt no longer needs: (once its s2n submodule is updated)
+#   CFLAGS+=-D__BSD_VISIBLE
+#   LDFLAGS+=-lexecinfo
+#do-test:
+#	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox
+
+.include <bsd.port.mk>
Index: devel/awscli2/distinfo
===================================================================
--- /dev/null
+++ devel/awscli2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1659406462
+SHA256 (aws-aws-cli-2.7.20_GH0.tar.gz) = 51c2ff0511565ca40c4d1c2262f275719bec2aefc5a62e5ccbd335ad8918cf1e
+SIZE (aws-aws-cli-2.7.20_GH0.tar.gz) = 11111528
Index: devel/awscli2/files/patch-setup.cfg
===================================================================
--- /dev/null
+++ devel/awscli2/files/patch-setup.cfg
@@ -0,0 +1,22 @@
+--- setup.cfg.orig	2022-07-27 16:23:13 UTC
++++ setup.cfg
+@@ -29,14 +29,14 @@ packages = find:
+ python_requires = >=3.8
+ include_package_data = True
+ install_requires =
+-    colorama>=0.2.5,<0.4.4
+-    docutils>=0.10,<0.16
++    colorama>=0.2.5,<0.4.5
++    docutils>=0.10,<0.17.2
+     cryptography>=3.3.2,<37.0.0
+     ruamel.yaml>=0.15.0,<=0.17.21
+     wcwidth<0.2.0
+-    prompt-toolkit>=3.0.24,<3.0.29
+-    distro>=1.5.0,<1.6.0
+-    awscrt>=0.12.4,<=0.13.11
++    prompt-toolkit>=3.0.24,<3.1.0
++    distro>=1.5.0,<1.7.1
++    awscrt>=0.12.4,<=0.13.15
+     python-dateutil>=2.1,<3.0.0
+     jmespath>=0.7.1,<1.1.0
+     urllib3>=1.25.4,<1.27
Index: devel/awscli2/pkg-descr
===================================================================
--- /dev/null
+++ devel/awscli2/pkg-descr
@@ -0,0 +1,17 @@
+This package provides a unified command line interface to many Amazon Web
+Services.
+
+The currently supported services include:
+
+* Amazon Elastic Compute Cloud (Amazon EC2)
+* Elastic Load Balancing
+* Auto Scaling
+* AWS CloudFormation
+* AWS Elastic Beanstalk
+* Amazon Simple Notification Service (Amazon SNS)
+* Amazon Simple Queue Service (Amazon SQS)
+* Amazon Relational Database Service (Amazon RDS)
+
+... and more.
+
+WWW: https://aws.amazon.com/cli/
Index: devel/py-awscrt/Makefile
===================================================================
--- devel/py-awscrt/Makefile
+++ devel/py-awscrt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	awscrt
 PORTVERSION=	0.13.14
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,6 +17,7 @@
 USE_PYTHON=	autoplist concurrent distutils
 
 CFLAGS+=	-D__BSD_VISIBLE
+LDFLAGS+=	-lexecinfo
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +