- Update to 1.0

- Use REINPLACE_CMD instead of patch file
- Strip shared library
- Fix regression-test: in tinderbox

Changes:	https://github.com/surfly/gevent/blob/master/changelog.rst

4 files changed, 9 insertions, 36 deletions

diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile
index 9b2cfda716ec..c8374aff3a60 100644
--- a/devel/py-gevent/Makefile
+++ b/devel/py-gevent/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gevent
-PORTVERSION=	0.13.8
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,14 +14,17 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0:${PORTSDIR}/devel/py-greenlet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0:${PORTSDIR}/devel/py-greenlet \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
-PYDISTUTILS_BUILDARGS=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|setuptools|distutils.core|' ${WRKSRC}/${PYSETUP}
 
 post-build:
-	@${STRIP_CMD} ${WRKSRC}/gevent/core.so
+	@${STRIP_CMD} ${WRKSRC}/gevent/_semaphore.so ${WRKSRC}/gevent/_util.so ${WRKSRC}/gevent/ares.so ${WRKSRC}/gevent/core.so
 
 regression-test test: build
 	cd ${WRKSRC}/greentest/ && ${SETENV} PYTHONPATH=../ ${PYTHON_CMD} testrunner.py
diff --git a/devel/py-gevent/distinfo b/devel/py-gevent/distinfo
index c41df1574687..d9f5c1aaf586 100644
--- a/devel/py-gevent/distinfo
+++ b/devel/py-gevent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gevent-0.13.8.tar.gz) = 54b8d26300ce408c0916a3e63ef6cd3e6aca76230833558deb7de15196ed955e
-SIZE (gevent-0.13.8.tar.gz) = 300098
+SHA256 (gevent-1.0.tar.gz) = bfa9d846db91a7d8b6a36e87353eed641c7e3e7d0bfa0b9975796d227f2db4eb
+SIZE (gevent-1.0.tar.gz) = 1437122
diff --git a/devel/py-gevent/files/patch-setup.py b/devel/py-gevent/files/patch-setup.py
deleted file mode 100644
index 2b79a0d4a120..000000000000
--- a/devel/py-gevent/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py.orig	2010-10-10 00:49:45.379628041 +0800
-+++ setup.py	2010-10-10 00:49:58.743854117 +0800
-@@ -22,10 +22,7 @@
- import glob
- from os.path import join, isdir, abspath, basename, exists, dirname
- 
--try:
--    from setuptools import Extension, setup
--except ImportError:
--    from distutils.core import Extension, setup
-+from distutils.core import Extension, setup
- from distutils.command import build_ext
- 
- __version__ = re.search("__version__\s*=\s*'(.*)'", open('gevent/__init__.py').read(), re.M).group(1)
diff --git a/devel/py-gevent/pkg-plist b/devel/py-gevent/pkg-plist
index 2a21a3ea2f38..585a991ef682 100644
--- a/devel/py-gevent/pkg-plist
+++ b/devel/py-gevent/pkg-plist
@@ -11,21 +11,12 @@
 %%PYTHON_SITELIBDIR%%/gevent/coros.py
 %%PYTHON_SITELIBDIR%%/gevent/coros.pyc
 %%PYTHON_SITELIBDIR%%/gevent/coros.pyo
-%%PYTHON_SITELIBDIR%%/gevent/dns.py
-%%PYTHON_SITELIBDIR%%/gevent/dns.pyc
-%%PYTHON_SITELIBDIR%%/gevent/dns.pyo
 %%PYTHON_SITELIBDIR%%/gevent/event.py
 %%PYTHON_SITELIBDIR%%/gevent/event.pyc
 %%PYTHON_SITELIBDIR%%/gevent/event.pyo
 %%PYTHON_SITELIBDIR%%/gevent/greenlet.py
 %%PYTHON_SITELIBDIR%%/gevent/greenlet.pyc
 %%PYTHON_SITELIBDIR%%/gevent/greenlet.pyo
-%%PYTHON_SITELIBDIR%%/gevent/http.py
-%%PYTHON_SITELIBDIR%%/gevent/http.pyc
-%%PYTHON_SITELIBDIR%%/gevent/http.pyo
-%%PYTHON_SITELIBDIR%%/gevent/httplib.py
-%%PYTHON_SITELIBDIR%%/gevent/httplib.pyc
-%%PYTHON_SITELIBDIR%%/gevent/httplib.pyo
 %%PYTHON_SITELIBDIR%%/gevent/hub.py
 %%PYTHON_SITELIBDIR%%/gevent/hub.pyc
 %%PYTHON_SITELIBDIR%%/gevent/hub.pyo
@@ -44,9 +35,6 @@
 %%PYTHON_SITELIBDIR%%/gevent/queue.py
 %%PYTHON_SITELIBDIR%%/gevent/queue.pyc
 %%PYTHON_SITELIBDIR%%/gevent/queue.pyo
-%%PYTHON_SITELIBDIR%%/gevent/rawgreenlet.py
-%%PYTHON_SITELIBDIR%%/gevent/rawgreenlet.pyc
-%%PYTHON_SITELIBDIR%%/gevent/rawgreenlet.pyo
 %%PYTHON_SITELIBDIR%%/gevent/select.py
 %%PYTHON_SITELIBDIR%%/gevent/select.pyc
 %%PYTHON_SITELIBDIR%%/gevent/select.pyo
@@ -59,9 +47,6 @@
 %%PYTHON_SITELIBDIR%%/gevent/ssl.py
 %%PYTHON_SITELIBDIR%%/gevent/ssl.pyc
 %%PYTHON_SITELIBDIR%%/gevent/ssl.pyo
-%%PYTHON_SITELIBDIR%%/gevent/sslold.py
-%%PYTHON_SITELIBDIR%%/gevent/sslold.pyc
-%%PYTHON_SITELIBDIR%%/gevent/sslold.pyo
 %%PYTHON_SITELIBDIR%%/gevent/thread.py
 %%PYTHON_SITELIBDIR%%/gevent/thread.pyc
 %%PYTHON_SITELIBDIR%%/gevent/thread.pyo