diff --git a/textproc/py-jc/Makefile b/textproc/py-jc/Makefile index dd95971ac41c..2e9a2e4c363b 100644 --- a/textproc/py-jc/Makefile +++ b/textproc/py-jc/Makefile @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= jc -DISTVERSION= 1.11.1 +DISTVERSION= 1.11.2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= vulcan@wired.sh COMMENT= Converts output of popular command-line tools and file-types to JSON LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.0:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.12.0:devel/py-xmltodict@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/textproc/py-jc/distinfo b/textproc/py-jc/distinfo index 471528d5e8a3..8b343ba791b7 100644 --- a/textproc/py-jc/distinfo +++ b/textproc/py-jc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590403233 -SHA256 (jc-1.11.1.tar.gz) = 4de55cd708c1c470c07b663f62c3ec0090ee08ac9a97df14a9e6abff054f024f -SIZE (jc-1.11.1.tar.gz) = 86952 +TIMESTAMP = 1591460882 +SHA256 (jc-1.11.2.tar.gz) = dd4bababf261f79fffd1c37fc94e60fc5fc30018a6ba8f763cf5a12a15d64361 +SIZE (jc-1.11.2.tar.gz) = 89130 diff --git a/textproc/py-jc/files/patch-jc_utils.py b/textproc/py-jc/files/patch-jc_utils.py deleted file mode 100644 index ca4c8897edf0..000000000000 --- a/textproc/py-jc/files/patch-jc_utils.py +++ /dev/null @@ -1,26 +0,0 @@ -Platform check fails as sys.platform returns 'freebsd' plus -the release version e.g., 'freebsd12' and so forth where the string -'freebsd' is only listed as compatible. - ---- jc/utils.py.orig 2020-05-23 14:53:34 UTC -+++ jc/utils.py -@@ -1,8 +1,8 @@ - """jc - JSON CLI output utility utils""" - import textwrap - import sys -+import re - -- - def warning_message(message): - """ - Prints a warning message for non-fatal issues -@@ -56,7 +56,8 @@ def compatibility(mod_name, compatible): - - no return, just prints output to STDERR - """ -- if sys.platform not in compatible: -+ platform = re.sub(r'\d+', '', sys.platform) -+ if platform not in compatible: - mod = mod_name.split('.')[-1] - compat_list = ', '.join(compatible) - warning_message(f'{mod} parser not compatible with your OS ({sys.platform}).\n Compatible platforms: {compat_list}')