cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to awscli-1.11.97 and drop the requirement on groff.

Browse Source
This commit is contained in:
ajacoutot 2017-06-04 09:34:45 +00:00
parent a62c837133
commit 67436c83d8
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/awscli/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.147 2017/06/02 06:50:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.148 2017/06/04 09:34:45 ajacoutot Exp $
COMMENT= universal command line environment for AWS
MODPY_EGG_VERSION= 1.11.96
MODPY_EGG_VERSION= 1.11.97
DISTNAME= awscli-${MODPY_EGG_VERSION}
CATEGORIES= sysutils
@ -20,13 +20,12 @@ MODPY_PI= Yes
MODPY_SETUPTOOLS= Yes
RUN_DEPENDS= security/py-rsa \
textproc/groff \
textproc/py-docutils \
textproc/py-yaml
# !!! check setup.py for exact dependencies version
RUN_DEPENDS += devel/py-colorama=0.3.7
RUN_DEPENDS += net/py-botocore=1.5.59
RUN_DEPENDS += net/py-botocore=1.5.60
RUN_DEPENDS += net/py-s3transfer=0.1.10
NO_TEST= Yes

4
sysutils/awscli/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (awscli-1.11.96.tar.gz) = psFwmnGmFKw3mPeJ0X5yDwz4ezBptRGw3i8DXlfhHWI=
SIZE (awscli-1.11.96.tar.gz) = 547064
SHA256 (awscli-1.11.97.tar.gz) = GMKGs0xc3F3sME72iAuI/7vxFdDFQDf42ZsdRKJTQW4=
SIZE (awscli-1.11.97.tar.gz) = 547087

23
sysutils/awscli/patches/patch-awscli_help_py Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-awscli_help_py,v 1.1 2017/06/04 09:34:46 ajacoutot Exp $
https://github.com/aws/aws-cli/pull/2635
Index: awscli/help.py
--- awscli/help.py.orig
+++ awscli/help.py
@@ -107,9 +107,12 @@ 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 self._exists_on_path('groff'):
+ cmdline = ['groff', '-m', 'man', '-T', 'ascii']
+ elif self._exists_on_path('mandoc'):
+ cmdline = ['mandoc', '-T', 'ascii']
+ else:
+ raise ExecutableNotFoundError('groff or mandoc')
LOG.debug("Running command: %s", cmdline)
p3 = self._popen(cmdline, stdin=PIPE, stdout=PIPE, stderr=PIPE)
groff_output = p3.communicate(input=man_contents)[0]