Updated to latest stable, 13.1.0. No ChangeLog/NEWS. Include

python/application.mk and REPLACE_PYTHON in a number of files.

3 files changed, 140 insertions, 48 deletions

diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile
index 4fa04e869c8..112ccaeb4f1 100644
--- a/net/py-zmq/Makefile
+++ b/net/py-zmq/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2013/07/30 01:27:37 obache Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/31 03:20:44 rodent Exp $
 #
 
-DISTNAME=	pyzmq-2.2.0.1
+DISTNAME=	pyzmq-13.1.0
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://cloud.github.com/downloads/zeromq/pyzmq/	\
 		http://pypi.python.org/packages/source/p/pyzmq/
@@ -13,9 +12,14 @@ HOMEPAGE=	https://github.com/zeromq/pyzmq/
 COMMENT=	Python bindings for zeromq
 LICENSE=	gnu-lgpl-v3 AND modified-bsd
 
-PYSETUPBUILDARGS+=	 --zmq=${BUILDLINK_PREFIX.zeromq:Q}
+PYSETUPBUILDARGS+=	--zmq=${BUILDLINK_PREFIX.zeromq:Q}
+REPLACE_PYTHON+=	zmq/eventloop/minitornado/ioloop.py
+REPLACE_PYTHON+=	zmq/eventloop/minitornado/platform/auto.py
+REPLACE_PYTHON+=	zmq/eventloop/minitornado/platform/interface.py
+REPLACE_PYTHON+=	zmq/eventloop/minitornado/platform/posix.py
+REPLACE_PYTHON+=	zmq/eventloop/minitornado/stack_context.py
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../net/zeromq/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-zmq/PLIST b/net/py-zmq/PLIST
index 81e8e7286ae..d1be2bd2656 100644
--- a/net/py-zmq/PLIST
+++ b/net/py-zmq/PLIST
@@ -1,34 +1,56 @@
-@comment $NetBSD: PLIST,v 1.3 2013/01/24 12:37:58 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/07/31 03:20:44 rodent Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/zmq/__init__.py
 ${PYSITELIB}/zmq/__init__.pyc
 ${PYSITELIB}/zmq/__init__.pyo
+${PYSITELIB}/zmq/cffi_core/__init__.py
+${PYSITELIB}/zmq/cffi_core/__init__.pyc
+${PYSITELIB}/zmq/cffi_core/__init__.pyo
+${PYSITELIB}/zmq/cffi_core/_cffi.py
+${PYSITELIB}/zmq/cffi_core/_cffi.pyc
+${PYSITELIB}/zmq/cffi_core/_cffi.pyo
+${PYSITELIB}/zmq/cffi_core/_poll.py
+${PYSITELIB}/zmq/cffi_core/_poll.pyc
+${PYSITELIB}/zmq/cffi_core/_poll.pyo
+${PYSITELIB}/zmq/cffi_core/constants.py
+${PYSITELIB}/zmq/cffi_core/constants.pyc
+${PYSITELIB}/zmq/cffi_core/constants.pyo
+${PYSITELIB}/zmq/cffi_core/context.py
+${PYSITELIB}/zmq/cffi_core/context.pyc
+${PYSITELIB}/zmq/cffi_core/context.pyo
+${PYSITELIB}/zmq/cffi_core/devices.py
+${PYSITELIB}/zmq/cffi_core/devices.pyc
+${PYSITELIB}/zmq/cffi_core/devices.pyo
+${PYSITELIB}/zmq/cffi_core/error.py
+${PYSITELIB}/zmq/cffi_core/error.pyc
+${PYSITELIB}/zmq/cffi_core/error.pyo
+${PYSITELIB}/zmq/cffi_core/message.py
+${PYSITELIB}/zmq/cffi_core/message.pyc
+${PYSITELIB}/zmq/cffi_core/message.pyo
+${PYSITELIB}/zmq/cffi_core/socket.py
+${PYSITELIB}/zmq/cffi_core/socket.pyc
+${PYSITELIB}/zmq/cffi_core/socket.pyo
+${PYSITELIB}/zmq/cffi_core/stopwatch.py
+${PYSITELIB}/zmq/cffi_core/stopwatch.pyc
+${PYSITELIB}/zmq/cffi_core/stopwatch.pyo
 ${PYSITELIB}/zmq/core/__init__.py
 ${PYSITELIB}/zmq/core/__init__.pyc
 ${PYSITELIB}/zmq/core/__init__.pyo
+${PYSITELIB}/zmq/core/_device.so
 ${PYSITELIB}/zmq/core/_poll.so
 ${PYSITELIB}/zmq/core/_version.so
+${PYSITELIB}/zmq/core/checkrc.pxd
 ${PYSITELIB}/zmq/core/constants.so
 ${PYSITELIB}/zmq/core/context.pxd
 ${PYSITELIB}/zmq/core/context.so
-${PYSITELIB}/zmq/core/device.so
 ${PYSITELIB}/zmq/core/error.so
 ${PYSITELIB}/zmq/core/libzmq.pxd
 ${PYSITELIB}/zmq/core/message.pxd
 ${PYSITELIB}/zmq/core/message.so
-${PYSITELIB}/zmq/core/poll.py
-${PYSITELIB}/zmq/core/poll.pyc
-${PYSITELIB}/zmq/core/poll.pyo
-${PYSITELIB}/zmq/core/pysocket.py
-${PYSITELIB}/zmq/core/pysocket.pyc
-${PYSITELIB}/zmq/core/pysocket.pyo
 ${PYSITELIB}/zmq/core/socket.pxd
 ${PYSITELIB}/zmq/core/socket.so
 ${PYSITELIB}/zmq/core/stopwatch.pxd
 ${PYSITELIB}/zmq/core/stopwatch.so
-${PYSITELIB}/zmq/core/version.py
-${PYSITELIB}/zmq/core/version.pyc
-${PYSITELIB}/zmq/core/version.pyo
 ${PYSITELIB}/zmq/devices/__init__.py
 ${PYSITELIB}/zmq/devices/__init__.pyc
 ${PYSITELIB}/zmq/devices/__init__.pyo
@@ -36,31 +58,61 @@ ${PYSITELIB}/zmq/devices/basedevice.py
 ${PYSITELIB}/zmq/devices/basedevice.pyc
 ${PYSITELIB}/zmq/devices/basedevice.pyo
 ${PYSITELIB}/zmq/devices/monitoredqueue.pxd
+${PYSITELIB}/zmq/devices/monitoredqueue.py
+${PYSITELIB}/zmq/devices/monitoredqueue.pyc
+${PYSITELIB}/zmq/devices/monitoredqueue.pyo
 ${PYSITELIB}/zmq/devices/monitoredqueue.so
 ${PYSITELIB}/zmq/devices/monitoredqueuedevice.py
 ${PYSITELIB}/zmq/devices/monitoredqueuedevice.pyc
 ${PYSITELIB}/zmq/devices/monitoredqueuedevice.pyo
+${PYSITELIB}/zmq/devices/proxydevice.py
+${PYSITELIB}/zmq/devices/proxydevice.pyc
+${PYSITELIB}/zmq/devices/proxydevice.pyo
+${PYSITELIB}/zmq/error.py
+${PYSITELIB}/zmq/error.pyc
+${PYSITELIB}/zmq/error.pyo
 ${PYSITELIB}/zmq/eventloop/__init__.py
 ${PYSITELIB}/zmq/eventloop/__init__.pyc
 ${PYSITELIB}/zmq/eventloop/__init__.pyo
 ${PYSITELIB}/zmq/eventloop/ioloop.py
 ${PYSITELIB}/zmq/eventloop/ioloop.pyc
 ${PYSITELIB}/zmq/eventloop/ioloop.pyo
-${PYSITELIB}/zmq/eventloop/platform/__init__.py
-${PYSITELIB}/zmq/eventloop/platform/__init__.pyc
-${PYSITELIB}/zmq/eventloop/platform/__init__.pyo
-${PYSITELIB}/zmq/eventloop/platform/auto.py
-${PYSITELIB}/zmq/eventloop/platform/auto.pyc
-${PYSITELIB}/zmq/eventloop/platform/auto.pyo
-${PYSITELIB}/zmq/eventloop/platform/posix.py
-${PYSITELIB}/zmq/eventloop/platform/posix.pyc
-${PYSITELIB}/zmq/eventloop/platform/posix.pyo
-${PYSITELIB}/zmq/eventloop/platform/windows.py
-${PYSITELIB}/zmq/eventloop/platform/windows.pyc
-${PYSITELIB}/zmq/eventloop/platform/windows.pyo
-${PYSITELIB}/zmq/eventloop/stack_context.py
-${PYSITELIB}/zmq/eventloop/stack_context.pyc
-${PYSITELIB}/zmq/eventloop/stack_context.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/__init__.py
+${PYSITELIB}/zmq/eventloop/minitornado/__init__.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/__init__.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/concurrent.py
+${PYSITELIB}/zmq/eventloop/minitornado/concurrent.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/concurrent.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/ioloop.py
+${PYSITELIB}/zmq/eventloop/minitornado/ioloop.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/ioloop.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/log.py
+${PYSITELIB}/zmq/eventloop/minitornado/log.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/log.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/platform/__init__.py
+${PYSITELIB}/zmq/eventloop/minitornado/platform/__init__.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/platform/__init__.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/platform/auto.py
+${PYSITELIB}/zmq/eventloop/minitornado/platform/auto.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/platform/auto.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/platform/common.py
+${PYSITELIB}/zmq/eventloop/minitornado/platform/common.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/platform/common.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/platform/interface.py
+${PYSITELIB}/zmq/eventloop/minitornado/platform/interface.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/platform/interface.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/platform/posix.py
+${PYSITELIB}/zmq/eventloop/minitornado/platform/posix.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/platform/posix.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/platform/windows.py
+${PYSITELIB}/zmq/eventloop/minitornado/platform/windows.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/platform/windows.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/stack_context.py
+${PYSITELIB}/zmq/eventloop/minitornado/stack_context.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/stack_context.pyo
+${PYSITELIB}/zmq/eventloop/minitornado/util.py
+${PYSITELIB}/zmq/eventloop/minitornado/util.pyc
+${PYSITELIB}/zmq/eventloop/minitornado/util.pyo
 ${PYSITELIB}/zmq/eventloop/zmqstream.py
 ${PYSITELIB}/zmq/eventloop/zmqstream.pyc
 ${PYSITELIB}/zmq/eventloop/zmqstream.pyo
@@ -70,6 +122,18 @@ ${PYSITELIB}/zmq/green/__init__.pyo
 ${PYSITELIB}/zmq/green/core.py
 ${PYSITELIB}/zmq/green/core.pyc
 ${PYSITELIB}/zmq/green/core.pyo
+${PYSITELIB}/zmq/green/device.py
+${PYSITELIB}/zmq/green/device.pyc
+${PYSITELIB}/zmq/green/device.pyo
+${PYSITELIB}/zmq/green/eventloop/__init__.py
+${PYSITELIB}/zmq/green/eventloop/__init__.pyc
+${PYSITELIB}/zmq/green/eventloop/__init__.pyo
+${PYSITELIB}/zmq/green/eventloop/ioloop.py
+${PYSITELIB}/zmq/green/eventloop/ioloop.pyc
+${PYSITELIB}/zmq/green/eventloop/ioloop.pyo
+${PYSITELIB}/zmq/green/eventloop/zmqstream.py
+${PYSITELIB}/zmq/green/eventloop/zmqstream.pyc
+${PYSITELIB}/zmq/green/eventloop/zmqstream.pyo
 ${PYSITELIB}/zmq/green/poll.py
 ${PYSITELIB}/zmq/green/poll.pyc
 ${PYSITELIB}/zmq/green/poll.pyo
@@ -88,9 +152,42 @@ ${PYSITELIB}/zmq/ssh/forward.pyo
 ${PYSITELIB}/zmq/ssh/tunnel.py
 ${PYSITELIB}/zmq/ssh/tunnel.pyc
 ${PYSITELIB}/zmq/ssh/tunnel.pyo
+${PYSITELIB}/zmq/sugar/__init__.py
+${PYSITELIB}/zmq/sugar/__init__.pyc
+${PYSITELIB}/zmq/sugar/__init__.pyo
+${PYSITELIB}/zmq/sugar/attrsettr.py
+${PYSITELIB}/zmq/sugar/attrsettr.pyc
+${PYSITELIB}/zmq/sugar/attrsettr.pyo
+${PYSITELIB}/zmq/sugar/backend.py
+${PYSITELIB}/zmq/sugar/backend.pyc
+${PYSITELIB}/zmq/sugar/backend.pyo
+${PYSITELIB}/zmq/sugar/constants.py
+${PYSITELIB}/zmq/sugar/constants.pyc
+${PYSITELIB}/zmq/sugar/constants.pyo
+${PYSITELIB}/zmq/sugar/context.py
+${PYSITELIB}/zmq/sugar/context.pyc
+${PYSITELIB}/zmq/sugar/context.pyo
+${PYSITELIB}/zmq/sugar/frame.py
+${PYSITELIB}/zmq/sugar/frame.pyc
+${PYSITELIB}/zmq/sugar/frame.pyo
+${PYSITELIB}/zmq/sugar/poll.py
+${PYSITELIB}/zmq/sugar/poll.pyc
+${PYSITELIB}/zmq/sugar/poll.pyo
+${PYSITELIB}/zmq/sugar/socket.py
+${PYSITELIB}/zmq/sugar/socket.pyc
+${PYSITELIB}/zmq/sugar/socket.pyo
+${PYSITELIB}/zmq/sugar/tracker.py
+${PYSITELIB}/zmq/sugar/tracker.pyc
+${PYSITELIB}/zmq/sugar/tracker.pyo
+${PYSITELIB}/zmq/sugar/version.py
+${PYSITELIB}/zmq/sugar/version.pyc
+${PYSITELIB}/zmq/sugar/version.pyo
 ${PYSITELIB}/zmq/tests/__init__.py
 ${PYSITELIB}/zmq/tests/__init__.pyc
 ${PYSITELIB}/zmq/tests/__init__.pyo
+${PYSITELIB}/zmq/tests/test_cffi_backend.py
+${PYSITELIB}/zmq/tests/test_cffi_backend.pyc
+${PYSITELIB}/zmq/tests/test_cffi_backend.pyo
 ${PYSITELIB}/zmq/tests/test_context.py
 ${PYSITELIB}/zmq/tests/test_context.pyc
 ${PYSITELIB}/zmq/tests/test_context.pyo
@@ -139,17 +236,14 @@ ${PYSITELIB}/zmq/tests/test_stopwatch.pyo
 ${PYSITELIB}/zmq/tests/test_version.py
 ${PYSITELIB}/zmq/tests/test_version.pyc
 ${PYSITELIB}/zmq/tests/test_version.pyo
-${PYSITELIB}/zmq/tests/test_web.py
-${PYSITELIB}/zmq/tests/test_web.pyc
-${PYSITELIB}/zmq/tests/test_web.pyo
 ${PYSITELIB}/zmq/tests/test_zmqstream.py
 ${PYSITELIB}/zmq/tests/test_zmqstream.pyc
 ${PYSITELIB}/zmq/tests/test_zmqstream.pyo
 ${PYSITELIB}/zmq/utils/__init__.py
 ${PYSITELIB}/zmq/utils/__init__.pyc
 ${PYSITELIB}/zmq/utils/__init__.pyo
-${PYSITELIB}/zmq/utils/allocate.h
 ${PYSITELIB}/zmq/utils/buffers.pxd
+${PYSITELIB}/zmq/utils/getpid_compat.h
 ${PYSITELIB}/zmq/utils/initthreads.so
 ${PYSITELIB}/zmq/utils/ipcmaxlen.h
 ${PYSITELIB}/zmq/utils/jsonapi.py
@@ -161,12 +255,6 @@ ${PYSITELIB}/zmq/utils/strtypes.py
 ${PYSITELIB}/zmq/utils/strtypes.pyc
 ${PYSITELIB}/zmq/utils/strtypes.pyo
 ${PYSITELIB}/zmq/utils/zmq_compat.h
-${PYSITELIB}/zmq/web/__init__.py
-${PYSITELIB}/zmq/web/__init__.pyc
-${PYSITELIB}/zmq/web/__init__.pyo
-${PYSITELIB}/zmq/web/proxy.py
-${PYSITELIB}/zmq/web/proxy.pyc
-${PYSITELIB}/zmq/web/proxy.pyo
-${PYSITELIB}/zmq/web/zmqweb.py
-${PYSITELIB}/zmq/web/zmqweb.pyc
-${PYSITELIB}/zmq/web/zmqweb.pyo
+${PYSITELIB}/zmq/web.py
+${PYSITELIB}/zmq/web.pyc
+${PYSITELIB}/zmq/web.pyo
diff --git a/net/py-zmq/distinfo b/net/py-zmq/distinfo
index 639c650c412..b86906dd952 100644
--- a/net/py-zmq/distinfo
+++ b/net/py-zmq/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2013/01/24 12:37:58 obache Exp $
+$NetBSD: distinfo,v 1.5 2013/07/31 03:20:44 rodent Exp $
 
-SHA1 (pyzmq-2.2.0.1.tar.gz) = 54e261cc42e85920f9453a90a2c336c38c73fe40
-RMD160 (pyzmq-2.2.0.1.tar.gz) = bc22c053d532124b569b59fb9a35914865b9ecc8
-Size (pyzmq-2.2.0.1.tar.gz) = 789996 bytes
+SHA1 (pyzmq-13.1.0.tar.gz) = 775fcff7777d220f06f5ff9e531822d63a5671c0
+RMD160 (pyzmq-13.1.0.tar.gz) = 2d7d79240c2544241830c68e5b9ba12bd8e0f7bd
+Size (pyzmq-13.1.0.tar.gz) = 838742 bytes