Index: devel/awscli2/Makefile
===================================================================
--- /dev/null
+++ devel/awscli2/Makefile
@@ -0,0 +1,67 @@
+PORTNAME=	awscli
+DISTVERSION=	2.11.6
+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.19.1,1:textproc/py-docutils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.2<3.4.9,1: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.9.0:sysutils/py-distro@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.17: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}pyinstaller>=5.8:devel/py-pyinstaller@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyinstaller-hooks-contrib>=2023.1:devel/py-pyinstaller-hooks-contrib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flit-core>=3.7.1<3.8.1:devel/py-flit-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pip>=22.0.0<23.0.0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.8.13:databases/py-sqlite3@${PY_FLAVOR}
+LIB_DEPENDS+=	libffi.so:devel/libffi
+
+#USES=		python:3.8+ groff:run
+USES=		python:3.8+ gettext-runtime ssl
+#USE_PYTHON=	autoplist distutils
+CONFLICTS=	awscli py*-awscli*
+ALL_TARGET=	build
+INSTALL_TARGET=	install
+GNU_CONFIGURE=	yes
+USE_MAKE=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	aws
+GH_PROJECT=	aws-cli
+
+SHEBANG_FIXES=	\
+		${STAGEDIR}${PREFIX}/lib/aws-cli/bin/aws \
+		${STAGEDIR}${PREFIX}/lib/aws-cli/bin/aws_completer
+UNWANTED_FILES=	\
+		${STAGEDIR}${PREFIX}/lib/aws-cli/bin/pip3 \
+		${STAGEDIR}${PREFIX}/lib/aws-cli/bin/pip3.9 \
+		${STAGEDIR}${PREFIX}/lib/aws-cli/bin/pip
+
+post-install:
+	@${ECHO_CMD} "shebang fixes for generated files"
+	${REINPLACE_CMD} -i '' -e "1s|^\#![[:space:]]*${STAGEDIR}|\#!|" ${SHEBANG_FIXES}
+	${LN} -fs ../lib/aws-cli/bin/aws ${STAGEDIR}${PREFIX}/bin/aws
+	${LN} -fs ../lib/aws-cli/bin/aws_completer ${STAGEDIR}${PREFIX}/bin/aws_completer
+	${RM} ${UNWANTED_FILES}
+
+	@${ECHO_CMD} "generating plist"
+	cd ${STAGEDIR}${PREFIX} ; ( \
+		${FIND} -s bin lib \! -type d ; \
+		${FIND} bin lib -type d -empty | ${SORT} -r | \
+			${SED} -e 's/^/@dir /' ; \
+	) >> ${TMPPLIST}
+
+.include <bsd.port.mk>
Index: devel/awscli2/distinfo
===================================================================
--- /dev/null
+++ devel/awscli2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1679729994
+SHA256 (aws-aws-cli-2.11.6_GH0.tar.gz) = cf6150407d9224ad17a38e5f75eead9981d29cc8bd5d094ffdaafcc0a5ce6739
+SIZE (aws-aws-cli-2.11.6_GH0.tar.gz) = 13062995
Index: devel/awscli2/files/patch-pyproject.toml
===================================================================
--- /dev/null
+++ devel/awscli2/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2023-03-24 18:27:31 UTC
++++ pyproject.toml
+@@ -37,7 +37,7 @@ dependencies = [
+     # a consistent dependency closure across all Python versions,
+     # we explicitly include ruamel.yaml.clib as a dependency.
+     "ruamel.yaml.clib>=0.2.0,<=0.2.7",
+-    "prompt-toolkit>=3.0.24,<3.0.29",
++    "prompt-toolkit>=3.0.24,<3.1.0",
+     "distro>=1.5.0,<1.9.0",
+     "awscrt>=0.12.4,<0.17.0",
+     "python-dateutil>=2.1,<3.0.0",
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/awscli2/pkg-message
===================================================================
--- /dev/null
+++ devel/awscli2/pkg-message
@@ -0,0 +1,22 @@
+[
+{
+type: install message: <<EOM
+To add completions for the aws command,
+add the line(s) below to the appropriate shell rc file
+
+For zsh:
+
+  autoload -Uz bashcompinit
+  bashcompinit -i
+  complete -C aws_completer aws
+
+For tcsh:
+
+  complete aws 'p/*/`aws_completer`/' 
+
+For bash:
+
+  complete -C aws_completer aws
+EOM
+}
+]
Index: devel/py-awscli/Makefile
===================================================================
--- devel/py-awscli/Makefile
+++ devel/py-awscli/Makefile
@@ -19,7 +19,8 @@
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils concurrent noflavors
+CONFLICTS=	py*-awscli*
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message