Attachment #207604 for bug #240664





PORTNAME=	awscli
PORTVERSION=	1.16.227
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	CHEESESHOP


USE_PYTHON=	autoplist distutils concurrent noflavors

NO_ARCH=	yes
SUB_FILES=	pkg-message

OPTIONS_DEFINE=	DOCS
DOCS_USES=	groff:run

.include <bsd.port.mk>




--- 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()

Line 0 Link Here

(-)files/pkg-message.in (+4 lines)
	1	To auto-complete on your shell, please add a following line:
	2
	3	(bashrc) complete -C '%%PREFIX%%/bin/aws_completer' aws
	4	(zshrc) source %%PREFIX%%/bin/aws_zsh_completer.sh

Return to bug 240664

Lines 3-9 Link Here

(-)Makefile (-4 / +2 lines)
3		3
4	PORTNAME= awscli	4	PORTNAME= awscli
5	PORTVERSION= 1.16.227	5	PORTVERSION= 1.16.227
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
9		9
Lines 24-31 Link Here
24	USE_PYTHON= autoplist distutils concurrent noflavors	24	USE_PYTHON= autoplist distutils concurrent noflavors
25		25
26	NO_ARCH= yes	26	NO_ARCH= yes
		27	SUB_FILES= pkg-message
27		28
28	OPTIONS_DEFINE= DOCS
29	DOCS_USES= groff:run
30
31	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-awscli_help.py (+21 lines)
	1	--- awscli/help.py.orig 2019-08-27 18:05:04 UTC
	2	+++ awscli/help.py
	3	@@ -107,13 +107,13 @@ class PosixHelpRenderer(PagingHelpRenderer):
	4
	5	def _convert_doc_content(self, contents):
	6	man_contents = publish_string(contents, writer=manpage.Writer())
	7	- if not self._exists_on_path('groff'):
	8	- raise ExecutableNotFoundError('groff')
	9	- cmdline = ['groff', '-m', 'man', '-T', 'ascii']
	10	+ if not self._exists_on_path('mandoc'):
	11	+ raise ExecutableNotFoundError('mandoc')
	12	+ cmdline = ['mandoc', '-T', 'ascii']
	13	LOG.debug("Running command: %s", cmdline)
	14	p3 = self._popen(cmdline, stdin=PIPE, stdout=PIPE, stderr=PIPE)
	15	- groff_output = p3.communicate(input=man_contents)[0]
	16	- return groff_output
	17	+ mandoc_output = p3.communicate(input=man_contents)[0]
	18	+ return mandoc_output
	19
	20	def _send_output_to_pager(self, output):
	21	cmdline = self.get_pager_cmdline()