Page MenuHomeFreeBSD
Files F147972315

D18962.diff
No OneTemporary
Actions

D18962.diff
View Options

Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -11565,3 +11565,4 @@
lang/clang-devel|devel/llvm-devel|2019-01-18|Unneeded metaport
sysutils/py-nomad|sysutils/py-python-nomad|2019-01-25|renamed to match project name
devel/py-easyconfig|devel/py-python-easyconfig|2019-01-28|Rename to reflect official Python modules naming scheme
+sysutils/py-consul|sysutils/py-python-consul|2019-01-30|renamed to match project name
Index: head/sysutils/Makefile
===================================================================
--- head/sysutils/Makefile
+++ head/sysutils/Makefile
@@ -1010,7 +1010,6 @@
SUBDIR += py-azure-cli-vm
SUBDIR += py-bcfg2
SUBDIR += py-cdmi
- SUBDIR += py-consul
SUBDIR += py-croniter
SUBDIR += py-crontab
SUBDIR += py-diffoscope
@@ -1046,6 +1045,7 @@
SUBDIR += py-psutil
SUBDIR += py-psutil121
SUBDIR += py-ptyprocess
+ SUBDIR += py-python-consul
SUBDIR += py-python-nomad
SUBDIR += py-pytsk
SUBDIR += py-pywatchman
Index: head/sysutils/py-consul/Makefile
===================================================================
--- head/sysutils/py-consul/Makefile
+++ head/sysutils/py-consul/Makefile
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= consul
-PORTVERSION= 1.1.0
-DISTVERSIONPREFIX= v
-PORTREVISION= 1
-CATEGORIES= sysutils
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER= jhixson@FreeBSD.org
-COMMENT= Python client for consul
-
-LICENSE= MIT
-
-BUILD_DEPENDS= ${LOCALBASE}/bin/consul:sysutils/consul \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
-RUN_DEPENDS= ${LOCALBASE}/bin/consul:sysutils/consul \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
-
-USES= python:2.7-3.6+
-
-USE_GITHUB= yes
-GH_ACCOUNT= cablehead
-GH_PROJECT= python-consul
-
-USE_PYTHON= distutils autoplist
-
-.include <bsd.port.mk>
Index: head/sysutils/py-consul/distinfo
===================================================================
--- head/sysutils/py-consul/distinfo
+++ head/sysutils/py-consul/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1546923514
-SHA256 (cablehead-python-consul-v1.1.0_GH0.tar.gz) = 5ad41822e2791fb5edc986e17bae6978573fbe44e7075fb12243e74008abfe13
-SIZE (cablehead-python-consul-v1.1.0_GH0.tar.gz) = 27548878
Index: head/sysutils/py-consul/files/patch-setup.py
===================================================================
--- head/sysutils/py-consul/files/patch-setup.py
+++ head/sysutils/py-consul/files/patch-setup.py
@@ -1,23 +0,0 @@
---- setup.py.orig 2018-07-09 03:59:48 UTC
-+++ setup.py
-@@ -22,14 +22,15 @@ description = "Python client for Consul (http://www.co
-
- py_modules = [os.path.splitext(x)[0] for x in glob.glob('consul/*.py')]
-
-+# 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 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)
-
-
Index: head/sysutils/py-consul/pkg-descr
===================================================================
--- head/sysutils/py-consul/pkg-descr
+++ head/sysutils/py-consul/pkg-descr
@@ -1,3 +0,0 @@
-Python client for consul (WWW: http://www.consul.io)
-
-WWW: https://github.com/cablehead/python-consul
Index: head/sysutils/py-python-consul/Makefile
===================================================================
--- head/sysutils/py-python-consul/Makefile
+++ head/sysutils/py-python-consul/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME= python-consul
+PORTVERSION= 1.1.0
+DISTVERSIONPREFIX= v
+PORTREVISION= 1
+CATEGORIES= sysutils python
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= jhixson@FreeBSD.org
+COMMENT= Python client for consul
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= ${LOCALBASE}/bin/consul:sysutils/consul \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${LOCALBASE}/bin/consul:sysutils/consul \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
+
+USES= python:2.7-3.6+
+
+USE_PYTHON= distutils autoplist
+
+USE_GITHUB= yes
+GH_ACCOUNT= cablehead
+
+.include <bsd.port.mk>
Index: head/sysutils/py-python-consul/distinfo
===================================================================
--- head/sysutils/py-python-consul/distinfo
+++ head/sysutils/py-python-consul/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546923514
+SHA256 (cablehead-python-consul-v1.1.0_GH0.tar.gz) = 5ad41822e2791fb5edc986e17bae6978573fbe44e7075fb12243e74008abfe13
+SIZE (cablehead-python-consul-v1.1.0_GH0.tar.gz) = 27548878
Index: head/sysutils/py-python-consul/files/patch-setup.py
===================================================================
--- head/sysutils/py-python-consul/files/patch-setup.py
+++ head/sysutils/py-python-consul/files/patch-setup.py
@@ -0,0 +1,23 @@
+--- setup.py.orig 2018-07-09 03:59:48 UTC
++++ setup.py
+@@ -22,14 +22,15 @@ description = "Python client for Consul (http://www.co
+
+ py_modules = [os.path.splitext(x)[0] for x in glob.glob('consul/*.py')]
+
++# 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 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)
+
+
Index: head/sysutils/py-python-consul/pkg-descr
===================================================================
--- head/sysutils/py-python-consul/pkg-descr
+++ head/sysutils/py-python-consul/pkg-descr
@@ -0,0 +1,3 @@
+Python client for consul (WWW: http://www.consul.io)
+
+WWW: https://github.com/cablehead/python-consul

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 15, 11:09 PM (17 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29730401
Default Alt Text
D18962.diff (6 KB)

Event Timeline