4 files changed, 24 insertions, 14 deletions
diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile
index f843f9e9e91..ba7e19c1263 100644
--- a/net/py-zmq/Makefile
+++ b/net/py-zmq/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2017/12/01 10:22:56 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/02/22 10:03:25 adam Exp $
 
-DISTNAME=	pyzmq-16.0.3
-PKGNAME=        ${DISTNAME:S/py/${PYPKGPREFIX}-/1}
+DISTNAME=	pyzmq-17.0.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyzmq/}
 
diff --git a/net/py-zmq/PLIST b/net/py-zmq/PLIST
index 0de690375d5..09f180359e4 100644
--- a/net/py-zmq/PLIST
+++ b/net/py-zmq/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2017/02/02 19:05:01 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/02/22 10:03:25 adam Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/zmq/__init__.py
 ${PYSITELIB}/zmq/__init__.pyc
 ${PYSITELIB}/zmq/__init__.pyo
+${PYSITELIB}/zmq/_future.py
+${PYSITELIB}/zmq/_future.pyc
+${PYSITELIB}/zmq/_future.pyo
 ${PLIST.py3x}${PYSITELIB}/zmq/asyncio/__init__.py
 ${PLIST.py3x}${PYSITELIB}/zmq/asyncio/__init__.pyc
 ${PLIST.py3x}${PYSITELIB}/zmq/asyncio/__init__.pyo
@@ -107,6 +110,9 @@ ${PYSITELIB}/zmq/error.pyo
 ${PYSITELIB}/zmq/eventloop/__init__.py
 ${PYSITELIB}/zmq/eventloop/__init__.pyc
 ${PYSITELIB}/zmq/eventloop/__init__.pyo
+${PYSITELIB}/zmq/eventloop/_deprecated.py
+${PYSITELIB}/zmq/eventloop/_deprecated.pyc
+${PYSITELIB}/zmq/eventloop/_deprecated.pyo
 ${PYSITELIB}/zmq/eventloop/future.py
 ${PYSITELIB}/zmq/eventloop/future.pyc
 ${PYSITELIB}/zmq/eventloop/future.pyo
@@ -248,6 +254,9 @@ ${PYSITELIB}/zmq/tests/test_decorators.pyo
 ${PYSITELIB}/zmq/tests/test_device.py
 ${PYSITELIB}/zmq/tests/test_device.pyc
 ${PYSITELIB}/zmq/tests/test_device.pyo
+${PYSITELIB}/zmq/tests/test_draft.py
+${PYSITELIB}/zmq/tests/test_draft.pyc
+${PYSITELIB}/zmq/tests/test_draft.pyo
 ${PYSITELIB}/zmq/tests/test_error.py
 ${PYSITELIB}/zmq/tests/test_error.pyc
 ${PYSITELIB}/zmq/tests/test_error.pyo
@@ -340,6 +349,7 @@ ${PYSITELIB}/zmq/utils/jsonapi.pyo
 ${PYSITELIB}/zmq/utils/monitor.py
 ${PYSITELIB}/zmq/utils/monitor.pyc
 ${PYSITELIB}/zmq/utils/monitor.pyo
+${PYSITELIB}/zmq/utils/mutex.h
 ${PYSITELIB}/zmq/utils/pyversion_compat.h
 ${PYSITELIB}/zmq/utils/sixcerpt.py
 ${PYSITELIB}/zmq/utils/sixcerpt.pyc
diff --git a/net/py-zmq/distinfo b/net/py-zmq/distinfo
index f80b66e6e0e..6758a786f9e 100644
--- a/net/py-zmq/distinfo
+++ b/net/py-zmq/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2017/12/01 10:22:56 adam Exp $
+$NetBSD: distinfo,v 1.13 2018/02/22 10:03:25 adam Exp $
 
-SHA1 (pyzmq-16.0.3.tar.gz) = 11d0085231791f742019f426f49db0d9e1503621
-RMD160 (pyzmq-16.0.3.tar.gz) = 66447ca4c34abcb0674e10d36fe6ad393441824e
-SHA512 (pyzmq-16.0.3.tar.gz) = 299acfe9b4dc6d1d3a30efa6493a78d6da3a8e32244d86ed44ea8fb22f9d2d454c808784756126969628c60dde6de2c956bc231d66781aec86d972584d5cf8e5
-Size (pyzmq-16.0.3.tar.gz) = 1063036 bytes
-SHA1 (patch-buildutils_detect.py) = 829ad2337dfb2cf0aabd9fde0e0806802d8c7da4
+SHA1 (pyzmq-17.0.0.tar.gz) = 19d170a32419afb34b3c58366c51c091f7458fb5
+RMD160 (pyzmq-17.0.0.tar.gz) = 5bd9a15d7c87f8615d96d2a9931ac2c2e1dc1502
+SHA512 (pyzmq-17.0.0.tar.gz) = e7e9bd402b12ea4ef94740cc60db8481b0a873e0038fbeb80bc03f985c2bd6eab73ebaea41fb8cee277a8f4e6859baac4c8530650d1659c415b1c0eb6042d9a1
+Size (pyzmq-17.0.0.tar.gz) = 988170 bytes
+SHA1 (patch-buildutils_detect.py) = 74e061f716b308a3a8965d10fdbf18aca4b814f4
 SHA1 (patch-setup.py) = e03b101b23f2dd61bdd82743b7abeb57520898da
diff --git a/net/py-zmq/patches/patch-buildutils_detect.py b/net/py-zmq/patches/patch-buildutils_detect.py
index 5a91c2e9adb..7a8e35f7b97 100644
--- a/net/py-zmq/patches/patch-buildutils_detect.py
+++ b/net/py-zmq/patches/patch-buildutils_detect.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-buildutils_detect.py,v 1.1 2017/02/02 11:53:58 fhajny Exp $
+$NetBSD: patch-buildutils_detect.py,v 1.2 2018/02/22 10:03:25 adam Exp $
 
 Let compiler decide what's best.
 
---- buildutils/detect.py.orig	2016-11-22 12:41:00.000000000 +0000
+--- buildutils/detect.py.orig	2018-02-10 13:02:35.000000000 +0000
 +++ buildutils/detect.py
 @@ -47,11 +47,6 @@ def test_compilation(cfile, compiler=Non
          else:
@@ -14,5 +14,5 @@ Let compiler decide what's best.
 -        else: 
 -            lpreargs = ['-m64']
      extra = compiler_attrs.get('extra_compile_args', None)
- 
-     objs = cc.compile([cfile], extra_preargs=cpreargs, extra_postargs=extra)
+     extra_link = compiler_attrs.get('extra_link_args', [])
+     lpreargs.extend(extra_link)