diff -urN freebsd-ports/sysutils/py-consul/Makefile freebsd-ports-new/sysutils/py-consul/Makefile --- freebsd-ports/sysutils/py-consul/Makefile 2018-04-18 18:59:49.693019000 -0400 +++ freebsd-ports-new/sysutils/py-consul/Makefile 2018-05-24 12:40:51.364859000 -0400 @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= py-consul -PORTVERSION= 0.7.2 +PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,12 +16,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} -USES= python:3.3+ +USES= python:2.7-3.6+ USE_GITHUB= yes GH_ACCOUNT= cablehead GH_PROJECT= python-consul -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist flavors .include diff -urN freebsd-ports/sysutils/py-consul/distinfo freebsd-ports-new/sysutils/py-consul/distinfo --- freebsd-ports/sysutils/py-consul/distinfo 2018-04-18 18:59:49.693273000 -0400 +++ freebsd-ports-new/sysutils/py-consul/distinfo 2018-05-24 10:54:47.608819000 -0400 @@ -1,3 +1,3 @@ -TIMESTAMP = 1507911738 -SHA256 (cablehead-python-consul-v0.7.2_GH0.tar.gz) = 5eea5ccb1983036a9a360786b95530c2955a88d35228d83f6af8965309a59c8f -SIZE (cablehead-python-consul-v0.7.2_GH0.tar.gz) = 12960212 +TIMESTAMP = 1527173687 +SHA256 (cablehead-python-consul-v1.0.0_GH0.tar.gz) = b4f3f7e6d28f532e47d69e2cd28c90a66e743d4f1689f72f7dfea2c1557e4550 +SIZE (cablehead-python-consul-v1.0.0_GH0.tar.gz) = 20830753 diff -urN freebsd-ports/sysutils/py-consul/files/patch-setup.py freebsd-ports-new/sysutils/py-consul/files/patch-setup.py --- freebsd-ports/sysutils/py-consul/files/patch-setup.py 1969-12-31 19:00:00.000000000 -0500 +++ freebsd-ports-new/sysutils/py-consul/files/patch-setup.py 2018-05-24 13:40:59.303462000 -0400 @@ -0,0 +1,24 @@ +--- setup.py.orig 2018-05-17 20:20:19 UTC ++++ setup.py +@@ -20,16 +20,16 @@ requirements = [ + description = "Python client for Consul (http://www.consul.io/)" + + ++# Issue #123: skip installation of consul.aio if python version < 3.4.2 ++# as this version or later is required by aiohttp + py_modules = [os.path.splitext(x)[0] for x in glob.glob('consul/*.py')] ++if sys.version_info < (3, 4, 2): ++ if 'consul/aio' in py_modules: ++ py_modules.remove('consul/aio') + + + class Install(install): + def run(self): +- # Issue #123: skip installation of consul.aio if python version < 3.4.2 +- # as this version or later is required by aiohttp +- if sys.version_info < (3, 4, 2): +- if 'consul/aio' in self.distribution.py_modules: +- self.distribution.py_modules.remove('consul/aio') + install.run(self) + +