--- Makefile	(revision 512258)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	awscli
 PORTVERSION=	1.16.227
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 
@@ -24,8 +24,6 @@ 
 USE_PYTHON=	autoplist distutils concurrent noflavors
 
 NO_ARCH=	yes
+SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS
-DOCS_USES=	groff:run
-
 .include <bsd.port.mk>
--- files/patch-awscli_help.py	(nonexistent)
+++ files/patch-awscli_help.py	(working copy)
@@ -0,0 +1,21 @@ 
+--- awscli/help.py.orig	2019-08-27 18:05:04 UTC
++++ awscli/help.py
+@@ -107,13 +107,13 @@ class PosixHelpRenderer(PagingHelpRenderer):
+ 
+     def _convert_doc_content(self, contents):
+         man_contents = publish_string(contents, writer=manpage.Writer())
+-        if not self._exists_on_path('groff'):
+-            raise ExecutableNotFoundError('groff')
+-        cmdline = ['groff', '-m', 'man', '-T', 'ascii']
++        if not self._exists_on_path('mandoc'):
++            raise ExecutableNotFoundError('mandoc')
++        cmdline = ['mandoc', '-T', 'ascii']
+         LOG.debug("Running command: %s", cmdline)
+         p3 = self._popen(cmdline, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+-        groff_output = p3.communicate(input=man_contents)[0]
+-        return groff_output
++        mandoc_output = p3.communicate(input=man_contents)[0]
++        return mandoc_output
+ 
+     def _send_output_to_pager(self, output):
+         cmdline = self.get_pager_cmdline()
--- files/pkg-message.in	(nonexistent)
+++ files/pkg-message.in	(working copy)
@@ -0,0 +1,4 @@ 
+To auto-complete on your shell, please add a following line:
+
+(bashrc) complete -C '%%PREFIX%%/bin/aws_completer' aws
+(zshrc)  source %%PREFIX%%/bin/aws_zsh_completer.sh