pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: update python-3.x state after py-twisted now supports 3.x



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Feb 14 11:04:01 2017 +0100
Changeset:	da6fd5705407d317e1ff69835dd94795cb8b33f2

Modified Files:
	ldtp/Makefile
	py-divmod-epsilon/Makefile
	py-divmod-epsilon/PLIST
	py-divmod-vertex/Makefile
	py-jabber-idavoll/Makefile
	py-jabber-palaver/Makefile
	py-jabber-proxy65/Makefile
	py-jabber-proxy65/PLIST
	py-jabber-punjab/Makefile
	py-kaa-imlib2/Makefile
	py-kaa-imlib2/PLIST
	py-kitchen/PLIST
	py-pynfo/Makefile
	py-pynfo/PLIST
	py-shtoom/Makefile
	py-shtoom/PLIST
	py-txZMQ/Makefile
	py-txZMQ/PLIST
	py-txZMQ/distinfo
Added Files:
	py-txZMQ/patches/patch-README.rst

Log Message:
*: update python-3.x state after py-twisted now supports 3.x

Convert to distutils.mk while here.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=da6fd5705407d317e1ff69835dd94795cb8b33f2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ldtp/Makefile                     |   5 +-
 py-divmod-epsilon/Makefile        |   9 +-
 py-divmod-epsilon/PLIST           |   1 +
 py-divmod-vertex/Makefile         |   5 +-
 py-jabber-idavoll/Makefile        |   5 -
 py-jabber-palaver/Makefile        |   7 +-
 py-jabber-proxy65/Makefile        |   8 +-
 py-jabber-proxy65/PLIST           |   6 +-
 py-jabber-punjab/Makefile         |   7 +-
 py-kaa-imlib2/Makefile            |  23 ++--
 py-kaa-imlib2/PLIST               |   3 +-
 py-kitchen/PLIST                  |  11 +-
 py-pynfo/Makefile                 |  24 ++--
 py-pynfo/PLIST                    |   3 +-
 py-shtoom/Makefile                |   6 +-
 py-shtoom/PLIST                   | 245 +++++++++++++++++++-------------------
 py-txZMQ/Makefile                 |   4 +-
 py-txZMQ/PLIST                    |   3 +-
 py-txZMQ/distinfo                 |   1 +
 py-txZMQ/patches/patch-README.rst |  40 +++++++
 20 files changed, 212 insertions(+), 204 deletions(-)

diffs:
diff --git a/ldtp/Makefile b/ldtp/Makefile
index 44f3a05536..a197861a79 100644
--- a/ldtp/Makefile
+++ b/ldtp/Makefile
@@ -15,11 +15,10 @@ DEPENDS+=	${PYPKGPREFIX}-at-spi-[0-9]*:../../devel/py-at-spi
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG=	yes
 REPLACE_PYTHON+=	bin/ldtp
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit and py-gnome2 via py-at-spi, py-gobject, py-twisted
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit and py-gnome2 via py-at-spi, py-gobject
 
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-divmod-epsilon/Makefile b/py-divmod-epsilon/Makefile
index dcb94c803c..57e6dd8444 100644
--- a/py-divmod-epsilon/Makefile
+++ b/py-divmod-epsilon/Makefile
@@ -3,8 +3,7 @@
 EPSILON_VERSION=	0.5.12
 DISTNAME=	Epsilon-${EPSILON_VERSION}
 PKGNAME=	${PYPKGPREFIX}-divmod-epsilon-${EPSILON_VERSION}
-#PKGREVISION=	2
-CATEGORIES=	python
+CATEGORIES=	time devel python
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/nslu2/sources/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -13,8 +12,8 @@ COMMENT=	Python utilities package, most famous for its Time class
 
 DEPENDS+=	${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
 
-PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.5.12
+EGG_NAME=	${DISTNAME}_r17222
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-divmod-epsilon/PLIST b/py-divmod-epsilon/PLIST
index 3d38aba5e9..fe1a3e18d9 100644
--- a/py-divmod-epsilon/PLIST
+++ b/py-divmod-epsilon/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD: PLIST,v 1.4 2012/02/01 00:34:37 noud4 Exp $
 bin/benchmark
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/build/lib/epsilon/__init__.py
 ${PYSITELIB}/build/lib/epsilon/__init__.pyc
 ${PYSITELIB}/build/lib/epsilon/__init__.pyo
diff --git a/py-divmod-vertex/Makefile b/py-divmod-vertex/Makefile
index 140cb2d1cf..6a8d9a12a7 100644
--- a/py-divmod-vertex/Makefile
+++ b/py-divmod-vertex/Makefile
@@ -17,8 +17,5 @@ DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-divmod-epsilon>=0.5.0:../../wip/py-divmod-epsilon
 
-PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-idavoll/Makefile b/py-jabber-idavoll/Makefile
index 828ec246e0..515a1ea50e 100644
--- a/py-jabber-idavoll/Makefile
+++ b/py-jabber-idavoll/Makefile
@@ -19,11 +19,6 @@ COMMENT=	XMPP publish-subscribe (XEP-0060) component (via twisted)
 DEPENDS+=	${PYPKGPREFIX}-twisted>=8.1.0:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-crypto>=2.0.1:../../security/py-crypto
 # wonkle
-# python < 2.5, uuid
-
-# it's a python package using the standard Python packager
-PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
 
 # always include bsd.prefs.mk before any .if or .ifdef statements
 .include "../../mk/bsd.prefs.mk"
diff --git a/py-jabber-palaver/Makefile b/py-jabber-palaver/Makefile
index 253e7f1ab7..7e071fda88 100644
--- a/py-jabber-palaver/Makefile
+++ b/py-jabber-palaver/Makefile
@@ -20,14 +20,9 @@ BROKEN=		Distfile has disappeared.
 DEPENDS+=	${PYPKGPREFIX}-twisted>=8.1.0:../../net/py-twisted
 # DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 
-# it's a python package using the standard Python packager
-PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
-
 # always include bsd.prefs.mk before any .if or .ifdef statements
 .include "../../mk/bsd.prefs.mk"
 
-
 JABBER_USER?=		jabberd
 JABBER_GROUP?=		jabberd
 FILES_SUBST+=		PYTHONBIN=${PYTHONBIN:Q}
@@ -68,5 +63,5 @@ SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-proxy65/Makefile b/py-jabber-proxy65/Makefile
index c6bf6d99b2..effd03638c 100644
--- a/py-jabber-proxy65/Makefile
+++ b/py-jabber-proxy65/Makefile
@@ -17,16 +17,14 @@ LICENSE=	mit
 #
 # DEPENDS+=	jabberd-[0-9]*:../../chat/jabberd2
 DEPENDS+=	${PYPKGPREFIX}-twisted>=8.1.0:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 
-# it's a python package using the standard Python packager
-PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 1.2.0
 
 # always include bsd.prefs.mk before any .if or .ifdef statements
 .include "../../mk/bsd.prefs.mk"
 
-
 JABBER_USER?=		jabberd
 JABBER_GROUP?=		jabberd
 FILES_SUBST+=		PYTHONBIN=${PYTHONBIN:Q}
@@ -48,5 +46,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
 .endfor
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-proxy65/PLIST b/py-jabber-proxy65/PLIST
index ac8e1aff88..0b10ae1770 100644
--- a/py-jabber-proxy65/PLIST
+++ b/py-jabber-proxy65/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2009/10/11 10:45:10 thomasklausner Exp $
+@comment $NetBSD$
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/proxy65/__init__.py
 ${PYSITELIB}/proxy65/__init__.pyc
 ${PYSITELIB}/proxy65/__init__.pyo
@@ -8,8 +9,7 @@ ${PYSITELIB}/proxy65/proxy65.pyo
 ${PYSITELIB}/proxy65/socks5.py
 ${PYSITELIB}/proxy65/socks5.pyc
 ${PYSITELIB}/proxy65/socks5.pyo
-${PYSITELIB}/twisted/plugins/proxy65_plugin.pyo
 ${PYSITELIB}/twisted/plugins/proxy65_plugin.py
 ${PYSITELIB}/twisted/plugins/proxy65_plugin.pyc
+${PYSITELIB}/twisted/plugins/proxy65_plugin.pyo
 share/doc/proxy65/README
-share/examples/rc.d/proxy65
diff --git a/py-jabber-punjab/Makefile b/py-jabber-punjab/Makefile
index e609114f66..8fed9ecc9b 100644
--- a/py-jabber-punjab/Makefile
+++ b/py-jabber-punjab/Makefile
@@ -23,14 +23,9 @@ BROKEN=		Source tarballs have disappeared.
 DEPENDS+=	${PYPKGPREFIX}-twisted>=8.1.0:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-crypto>=2.0.1:../../security/py-crypto
 
-# it's a python package using the standard Python packager
-PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
-
 # always include bsd.prefs.mk before any .if or .ifdef statements
 .include "../../mk/bsd.prefs.mk"
 
-
 JABBER_USER?=		jabberd
 JABBER_GROUP?=		jabberd
 FILES_SUBST+=		PYTHONBIN=${PYTHONBIN:Q}
@@ -66,5 +61,5 @@ SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-kaa-imlib2/Makefile b/py-kaa-imlib2/Makefile
index a70c1f4dbc..ca9a450d5a 100644
--- a/py-kaa-imlib2/Makefile
+++ b/py-kaa-imlib2/Makefile
@@ -1,20 +1,19 @@
 # $NetBSD: Makefile,v 1.9 2012/10/07 12:25:12 asau Exp $
-#
 
-DISTNAME=		kaa-imlib2-0.2.3
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		2
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=freevo/}
+DISTNAME=	kaa-imlib2-0.2.3
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	2
+CATEGORIES=	multimedia
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freevo/}
 
-MAINTAINER=		dhowland%users.sourceforge.net@localhost
-HOMEPAGE=		http://freevo.sourceforge.net/cgi-bin/freevo-2.0/Kaa
-COMMENT=		Imlib2 wrapper for the Kaa multimedia framework
+MAINTAINER=	dhowland%users.sourceforge.net@localhost
+HOMEPAGE=	http://freevo.sourceforge.net/cgi-bin/freevo-2.0/Kaa
+COMMENT=	Imlib2 wrapper for the Kaa multimedia framework
 
-
-PYDISTUTILSPKG=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.2.3
 
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../wip/py-kaa-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-kaa-imlib2/PLIST b/py-kaa-imlib2/PLIST
index fd849554da..bf6b888d3f 100644
--- a/py-kaa-imlib2/PLIST
+++ b/py-kaa-imlib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:10 thomasklausner Exp $
+@comment $NetBSD$
 ${PYSITELIB}/kaa/imlib2/_Imlib2module.so
 ${PYSITELIB}/kaa/imlib2/__init__.py
 ${PYSITELIB}/kaa/imlib2/__init__.pyc
@@ -12,3 +12,4 @@ ${PYSITELIB}/kaa/imlib2/image.pyo
 ${PYSITELIB}/kaa/imlib2/version.py
 ${PYSITELIB}/kaa/imlib2/version.pyc
 ${PYSITELIB}/kaa/imlib2/version.pyo
+${PYSITELIB}/${EGG_FILE}
diff --git a/py-kitchen/PLIST b/py-kitchen/PLIST
index 862eedd665..0cea789da0 100644
--- a/py-kitchen/PLIST
+++ b/py-kitchen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/19 23:05:37 jihbed Exp $
+@comment $NetBSD$
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -27,9 +27,6 @@ ${PYSITELIB}/kitchen/pycompat24/__init__.pyo
 ${PYSITELIB}/kitchen/pycompat24/base64/__init__.py
 ${PYSITELIB}/kitchen/pycompat24/base64/__init__.pyc
 ${PYSITELIB}/kitchen/pycompat24/base64/__init__.pyo
-${PYSITELIB}/kitchen/pycompat24/base64/_base64.py
-${PYSITELIB}/kitchen/pycompat24/base64/_base64.pyc
-${PYSITELIB}/kitchen/pycompat24/base64/_base64.pyo
 ${PYSITELIB}/kitchen/pycompat24/sets/__init__.py
 ${PYSITELIB}/kitchen/pycompat24/sets/__init__.pyc
 ${PYSITELIB}/kitchen/pycompat24/sets/__init__.pyo
@@ -42,18 +39,12 @@ ${PYSITELIB}/kitchen/pycompat25/__init__.pyo
 ${PYSITELIB}/kitchen/pycompat25/collections/__init__.py
 ${PYSITELIB}/kitchen/pycompat25/collections/__init__.pyc
 ${PYSITELIB}/kitchen/pycompat25/collections/__init__.pyo
-${PYSITELIB}/kitchen/pycompat25/collections/_defaultdict.py
-${PYSITELIB}/kitchen/pycompat25/collections/_defaultdict.pyc
-${PYSITELIB}/kitchen/pycompat25/collections/_defaultdict.pyo
 ${PYSITELIB}/kitchen/pycompat27/__init__.py
 ${PYSITELIB}/kitchen/pycompat27/__init__.pyc
 ${PYSITELIB}/kitchen/pycompat27/__init__.pyo
 ${PYSITELIB}/kitchen/pycompat27/subprocess/__init__.py
 ${PYSITELIB}/kitchen/pycompat27/subprocess/__init__.pyc
 ${PYSITELIB}/kitchen/pycompat27/subprocess/__init__.pyo
-${PYSITELIB}/kitchen/pycompat27/subprocess/_subprocess.py
-${PYSITELIB}/kitchen/pycompat27/subprocess/_subprocess.pyc
-${PYSITELIB}/kitchen/pycompat27/subprocess/_subprocess.pyo
 ${PYSITELIB}/kitchen/release.py
 ${PYSITELIB}/kitchen/release.pyc
 ${PYSITELIB}/kitchen/release.pyo
diff --git a/py-pynfo/Makefile b/py-pynfo/Makefile
index 7102482f87..6e0d75adbc 100644
--- a/py-pynfo/Makefile
+++ b/py-pynfo/Makefile
@@ -1,20 +1,18 @@
 # $NetBSD: Makefile,v 1.10 2014/05/09 07:38:51 thomasklausner Exp $
 
-DISTNAME=		pynfo-0.6.3
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		chat
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pynfo/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	pynfo-0.6.3
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	chat
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pynfo/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://pynfo.sourceforge.net/
-COMMENT=		Nice, configureable info bot in Python
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://pynfo.sourceforge.net/
+COMMENT=	Nice, configureable info bot in Python
 
-DEPENDS+=		${PYPKGPREFIX}-twisted>=1.1.1rc1:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted>=1.1.1rc1:../../net/py-twisted
 
-PY_PATCHPLIST=		yes
-PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.6.3
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pynfo/PLIST b/py-pynfo/PLIST
index 31c07fa041..767dbfcf99 100644
--- a/py-pynfo/PLIST
+++ b/py-pynfo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:12 thomasklausner Exp $
+@comment $NetBSD$
 bin/respond
 ${PYSITELIB}/Pynfo/__init__.py
 ${PYSITELIB}/Pynfo/__init__.pyc
@@ -94,3 +94,4 @@ ${PYSITELIB}/Pynfo/tap.pyo
 ${PYSITELIB}/Pynfo/util.py
 ${PYSITELIB}/Pynfo/util.pyc
 ${PYSITELIB}/Pynfo/util.pyo
+${PYSITELIB}/${EGG_FILE}
diff --git a/py-shtoom/Makefile b/py-shtoom/Makefile
index 6e8053c849..02c72838c0 100644
--- a/py-shtoom/Makefile
+++ b/py-shtoom/Makefile
@@ -13,13 +13,11 @@ LICENSE=		gnu-lgpl-v2.1
 
 DEPENDS+=		${PYPKGPREFIX}-twisted>=1.3.0:../../net/py-twisted
 
-PY_PATCHPLIST=		yes
-PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.2
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/shtoom/ui/gnomeui/shtoom.glade \
 		${DESTDIR}${PREFIX}/${PYSITELIB}/shtoom/ui/gnomeui/shtoom.glade
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-shtoom/PLIST b/py-shtoom/PLIST
index 1c4b526262..8ee0cb36ed 100644
--- a/py-shtoom/PLIST
+++ b/py-shtoom/PLIST
@@ -1,158 +1,159 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:11 thomasklausner Exp $
-bin/shtoom.py
-bin/shtam.py
+@comment $NetBSD$
 bin/shmessage.py
+bin/shtam.py
+bin/shtoom.py
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/shtoom/Options.py
+${PYSITELIB}/shtoom/Options.pyc
+${PYSITELIB}/shtoom/Options.pyo
 ${PYSITELIB}/shtoom/__init__.py
+${PYSITELIB}/shtoom/__init__.pyc
+${PYSITELIB}/shtoom/__init__.pyo
+${PYSITELIB}/shtoom/app/__init__.py
+${PYSITELIB}/shtoom/app/__init__.pyc
+${PYSITELIB}/shtoom/app/__init__.pyo
+${PYSITELIB}/shtoom/app/answer.py
+${PYSITELIB}/shtoom/app/answer.pyc
+${PYSITELIB}/shtoom/app/answer.pyo
+${PYSITELIB}/shtoom/app/base.py
+${PYSITELIB}/shtoom/app/base.pyc
+${PYSITELIB}/shtoom/app/base.pyo
+${PYSITELIB}/shtoom/app/echo.py
+${PYSITELIB}/shtoom/app/echo.pyc
+${PYSITELIB}/shtoom/app/echo.pyo
+${PYSITELIB}/shtoom/app/interfaces.py
+${PYSITELIB}/shtoom/app/interfaces.pyc
+${PYSITELIB}/shtoom/app/interfaces.pyo
+${PYSITELIB}/shtoom/app/message.py
+${PYSITELIB}/shtoom/app/message.pyc
+${PYSITELIB}/shtoom/app/message.pyo
+${PYSITELIB}/shtoom/app/phone.py
+${PYSITELIB}/shtoom/app/phone.pyc
+${PYSITELIB}/shtoom/app/phone.pyo
+${PYSITELIB}/shtoom/audio/__init__.py
+${PYSITELIB}/shtoom/audio/__init__.pyc
+${PYSITELIB}/shtoom/audio/__init__.pyo
+${PYSITELIB}/shtoom/audio/baseaudio.py
+${PYSITELIB}/shtoom/audio/baseaudio.pyc
+${PYSITELIB}/shtoom/audio/baseaudio.pyo
+${PYSITELIB}/shtoom/audio/converters.py
+${PYSITELIB}/shtoom/audio/converters.pyc
+${PYSITELIB}/shtoom/audio/converters.pyo
+${PYSITELIB}/shtoom/audio/echoaudio.py
+${PYSITELIB}/shtoom/audio/echoaudio.pyc
+${PYSITELIB}/shtoom/audio/echoaudio.pyo
+${PYSITELIB}/shtoom/audio/fast.py
+${PYSITELIB}/shtoom/audio/fast.pyc
+${PYSITELIB}/shtoom/audio/fast.pyo
+${PYSITELIB}/shtoom/audio/fileaudio.py
+${PYSITELIB}/shtoom/audio/fileaudio.pyc
+${PYSITELIB}/shtoom/audio/fileaudio.pyo
+${PYSITELIB}/shtoom/audio/interfaces.py
+${PYSITELIB}/shtoom/audio/interfaces.pyc
+${PYSITELIB}/shtoom/audio/interfaces.pyo
+${PYSITELIB}/shtoom/audio/ossaudio.py
+${PYSITELIB}/shtoom/audio/ossaudio.pyc
+${PYSITELIB}/shtoom/audio/ossaudio.pyo
 ${PYSITELIB}/shtoom/digestauth.py
+${PYSITELIB}/shtoom/digestauth.pyc
+${PYSITELIB}/shtoom/digestauth.pyo
 ${PYSITELIB}/shtoom/exceptions.py
+${PYSITELIB}/shtoom/exceptions.pyc
+${PYSITELIB}/shtoom/exceptions.pyo
 ${PYSITELIB}/shtoom/interfaces.py
-${PYSITELIB}/shtoom/opts.py
-${PYSITELIB}/shtoom/rtcp.py
-${PYSITELIB}/shtoom/rtp.py
-${PYSITELIB}/shtoom/sip.py
-${PYSITELIB}/shtoom/stun.py
-${PYSITELIB}/shtoom/upnp.py
+${PYSITELIB}/shtoom/interfaces.pyc
+${PYSITELIB}/shtoom/interfaces.pyo
 ${PYSITELIB}/shtoom/multicast/SAP.py
-${PYSITELIB}/shtoom/multicast/SDP.py
-${PYSITELIB}/shtoom/multicast/__init__.py
-${PYSITELIB}/shtoom/multicast/netnum.py
-${PYSITELIB}/shtoom/multicast/unixspec.py
 ${PYSITELIB}/shtoom/multicast/SAP.pyc
-${PYSITELIB}/shtoom/multicast/SDP.pyc
-${PYSITELIB}/shtoom/multicast/__init__.pyc
-${PYSITELIB}/shtoom/multicast/netnum.pyc
-${PYSITELIB}/shtoom/multicast/unixspec.pyc
 ${PYSITELIB}/shtoom/multicast/SAP.pyo
+${PYSITELIB}/shtoom/multicast/SDP.py
+${PYSITELIB}/shtoom/multicast/SDP.pyc
 ${PYSITELIB}/shtoom/multicast/SDP.pyo
+${PYSITELIB}/shtoom/multicast/__init__.py
+${PYSITELIB}/shtoom/multicast/__init__.pyc
 ${PYSITELIB}/shtoom/multicast/__init__.pyo
+${PYSITELIB}/shtoom/multicast/netnum.py
+${PYSITELIB}/shtoom/multicast/netnum.pyc
 ${PYSITELIB}/shtoom/multicast/netnum.pyo
+${PYSITELIB}/shtoom/multicast/unixspec.py
+${PYSITELIB}/shtoom/multicast/unixspec.pyc
 ${PYSITELIB}/shtoom/multicast/unixspec.pyo
+${PYSITELIB}/shtoom/opts.py
+${PYSITELIB}/shtoom/opts.pyc
+${PYSITELIB}/shtoom/opts.pyo
+${PYSITELIB}/shtoom/rtcp.py
+${PYSITELIB}/shtoom/rtcp.pyc
+${PYSITELIB}/shtoom/rtcp.pyo
+${PYSITELIB}/shtoom/rtp.py
+${PYSITELIB}/shtoom/rtp.pyc
+${PYSITELIB}/shtoom/rtp.pyo
+${PYSITELIB}/shtoom/sip.py
+${PYSITELIB}/shtoom/sip.pyc
+${PYSITELIB}/shtoom/sip.pyo
+${PYSITELIB}/shtoom/stun.py
+${PYSITELIB}/shtoom/stun.pyc
+${PYSITELIB}/shtoom/stun.pyo
 ${PYSITELIB}/shtoom/ui/__init__.py
+${PYSITELIB}/shtoom/ui/__init__.pyc
+${PYSITELIB}/shtoom/ui/__init__.pyo
 ${PYSITELIB}/shtoom/ui/base.py
+${PYSITELIB}/shtoom/ui/base.pyc
+${PYSITELIB}/shtoom/ui/base.pyo
 ${PYSITELIB}/shtoom/ui/gnomeshtoom.py
+${PYSITELIB}/shtoom/ui/gnomeshtoom.pyc
+${PYSITELIB}/shtoom/ui/gnomeshtoom.pyo
+${PYSITELIB}/shtoom/ui/gnomeui/__init__.py
+${PYSITELIB}/shtoom/ui/gnomeui/__init__.pyc
+${PYSITELIB}/shtoom/ui/gnomeui/__init__.pyo
+${PYSITELIB}/shtoom/ui/gnomeui/main.py
+${PYSITELIB}/shtoom/ui/gnomeui/main.pyc
+${PYSITELIB}/shtoom/ui/gnomeui/main.pyo
+${PYSITELIB}/shtoom/ui/gnomeui/shtoom.glade
 ${PYSITELIB}/shtoom/ui/logo.py
+${PYSITELIB}/shtoom/ui/logo.pyc
+${PYSITELIB}/shtoom/ui/logo.pyo
 ${PYSITELIB}/shtoom/ui/qtshtoom.py
-${PYSITELIB}/shtoom/ui/select.py
-${PYSITELIB}/shtoom/ui/textshtoom.py
-${PYSITELIB}/shtoom/ui/tkshtoom.py
+${PYSITELIB}/shtoom/ui/qtshtoom.pyc
+${PYSITELIB}/shtoom/ui/qtshtoom.pyo
 ${PYSITELIB}/shtoom/ui/qtui/__init__.py
-${PYSITELIB}/shtoom/ui/qtui/main.py
-${PYSITELIB}/shtoom/ui/qtui/prefs.py
-${PYSITELIB}/shtoom/ui/qtui/shtoommainwindow.py
 ${PYSITELIB}/shtoom/ui/qtui/__init__.pyc
-${PYSITELIB}/shtoom/ui/qtui/main.pyc
-${PYSITELIB}/shtoom/ui/qtui/prefs.pyc
-${PYSITELIB}/shtoom/ui/qtui/shtoommainwindow.pyc
 ${PYSITELIB}/shtoom/ui/qtui/__init__.pyo
+${PYSITELIB}/shtoom/ui/qtui/main.py
+${PYSITELIB}/shtoom/ui/qtui/main.pyc
 ${PYSITELIB}/shtoom/ui/qtui/main.pyo
+${PYSITELIB}/shtoom/ui/qtui/prefs.py
+${PYSITELIB}/shtoom/ui/qtui/prefs.pyc
 ${PYSITELIB}/shtoom/ui/qtui/prefs.pyo
+${PYSITELIB}/shtoom/ui/qtui/shtoommainwindow.py
+${PYSITELIB}/shtoom/ui/qtui/shtoommainwindow.pyc
 ${PYSITELIB}/shtoom/ui/qtui/shtoommainwindow.pyo
-${PYSITELIB}/shtoom/ui/gnomeui/__init__.py
-${PYSITELIB}/shtoom/ui/gnomeui/main.py
-${PYSITELIB}/shtoom/ui/gnomeui/__init__.pyc
-${PYSITELIB}/shtoom/ui/gnomeui/main.pyc
-${PYSITELIB}/shtoom/ui/gnomeui/__init__.pyo
-${PYSITELIB}/shtoom/ui/gnomeui/main.pyo
-${PYSITELIB}/shtoom/ui/gnomeui/shtoom.glade
+${PYSITELIB}/shtoom/ui/select.py
+${PYSITELIB}/shtoom/ui/select.pyc
+${PYSITELIB}/shtoom/ui/select.pyo
+${PYSITELIB}/shtoom/ui/textshtoom.py
+${PYSITELIB}/shtoom/ui/textshtoom.pyc
+${PYSITELIB}/shtoom/ui/textshtoom.pyo
 ${PYSITELIB}/shtoom/ui/textui/__init__.py
-${PYSITELIB}/shtoom/ui/textui/main.py
 ${PYSITELIB}/shtoom/ui/textui/__init__.pyc
-${PYSITELIB}/shtoom/ui/textui/main.pyc
 ${PYSITELIB}/shtoom/ui/textui/__init__.pyo
+${PYSITELIB}/shtoom/ui/textui/main.py
+${PYSITELIB}/shtoom/ui/textui/main.pyc
 ${PYSITELIB}/shtoom/ui/textui/main.pyo
+${PYSITELIB}/shtoom/ui/tkshtoom.py
+${PYSITELIB}/shtoom/ui/tkshtoom.pyc
+${PYSITELIB}/shtoom/ui/tkshtoom.pyo
 ${PYSITELIB}/shtoom/ui/tkui/__init__.py
-${PYSITELIB}/shtoom/ui/tkui/main.py
-${PYSITELIB}/shtoom/ui/tkui/notebook.py
-${PYSITELIB}/shtoom/ui/tkui/prefs.py
 ${PYSITELIB}/shtoom/ui/tkui/__init__.pyc
-${PYSITELIB}/shtoom/ui/tkui/main.pyc
-${PYSITELIB}/shtoom/ui/tkui/notebook.pyc
-${PYSITELIB}/shtoom/ui/tkui/prefs.pyc
 ${PYSITELIB}/shtoom/ui/tkui/__init__.pyo
+${PYSITELIB}/shtoom/ui/tkui/main.py
+${PYSITELIB}/shtoom/ui/tkui/main.pyc
 ${PYSITELIB}/shtoom/ui/tkui/main.pyo
+${PYSITELIB}/shtoom/ui/tkui/notebook.py
+${PYSITELIB}/shtoom/ui/tkui/notebook.pyc
 ${PYSITELIB}/shtoom/ui/tkui/notebook.pyo
+${PYSITELIB}/shtoom/ui/tkui/prefs.py
+${PYSITELIB}/shtoom/ui/tkui/prefs.pyc
 ${PYSITELIB}/shtoom/ui/tkui/prefs.pyo
-${PYSITELIB}/shtoom/ui/__init__.pyc
-${PYSITELIB}/shtoom/ui/base.pyc
-${PYSITELIB}/shtoom/ui/gnomeshtoom.pyc
-${PYSITELIB}/shtoom/ui/logo.pyc
-${PYSITELIB}/shtoom/ui/qtshtoom.pyc
-${PYSITELIB}/shtoom/ui/select.pyc
-${PYSITELIB}/shtoom/ui/textshtoom.pyc
-${PYSITELIB}/shtoom/ui/tkshtoom.pyc
-${PYSITELIB}/shtoom/ui/__init__.pyo
-${PYSITELIB}/shtoom/ui/base.pyo
-${PYSITELIB}/shtoom/ui/gnomeshtoom.pyo
-${PYSITELIB}/shtoom/ui/logo.pyo
-${PYSITELIB}/shtoom/ui/qtshtoom.pyo
-${PYSITELIB}/shtoom/ui/select.pyo
-${PYSITELIB}/shtoom/ui/textshtoom.pyo
-${PYSITELIB}/shtoom/ui/tkshtoom.pyo
-${PYSITELIB}/shtoom/audio/__init__.py
-${PYSITELIB}/shtoom/audio/baseaudio.py
-${PYSITELIB}/shtoom/audio/converters.py
-${PYSITELIB}/shtoom/audio/echoaudio.py
-${PYSITELIB}/shtoom/audio/fast.py
-${PYSITELIB}/shtoom/audio/fileaudio.py
-${PYSITELIB}/shtoom/audio/interfaces.py
-${PYSITELIB}/shtoom/audio/ossaudio.py
-${PYSITELIB}/shtoom/audio/__init__.pyc
-${PYSITELIB}/shtoom/audio/baseaudio.pyc
-${PYSITELIB}/shtoom/audio/converters.pyc
-${PYSITELIB}/shtoom/audio/echoaudio.pyc
-${PYSITELIB}/shtoom/audio/fast.pyc
-${PYSITELIB}/shtoom/audio/fileaudio.pyc
-${PYSITELIB}/shtoom/audio/interfaces.pyc
-${PYSITELIB}/shtoom/audio/ossaudio.pyc
-${PYSITELIB}/shtoom/audio/__init__.pyo
-${PYSITELIB}/shtoom/audio/baseaudio.pyo
-${PYSITELIB}/shtoom/audio/converters.pyo
-${PYSITELIB}/shtoom/audio/echoaudio.pyo
-${PYSITELIB}/shtoom/audio/fast.pyo
-${PYSITELIB}/shtoom/audio/fileaudio.pyo
-${PYSITELIB}/shtoom/audio/interfaces.pyo
-${PYSITELIB}/shtoom/audio/ossaudio.pyo
-${PYSITELIB}/shtoom/app/__init__.py
-${PYSITELIB}/shtoom/app/answer.py
-${PYSITELIB}/shtoom/app/base.py
-${PYSITELIB}/shtoom/app/echo.py
-${PYSITELIB}/shtoom/app/interfaces.py
-${PYSITELIB}/shtoom/app/message.py
-${PYSITELIB}/shtoom/app/phone.py
-${PYSITELIB}/shtoom/app/__init__.pyc
-${PYSITELIB}/shtoom/app/answer.pyc
-${PYSITELIB}/shtoom/app/base.pyc
-${PYSITELIB}/shtoom/app/echo.pyc
-${PYSITELIB}/shtoom/app/interfaces.pyc
-${PYSITELIB}/shtoom/app/message.pyc
-${PYSITELIB}/shtoom/app/phone.pyc
-${PYSITELIB}/shtoom/app/__init__.pyo
-${PYSITELIB}/shtoom/app/answer.pyo
-${PYSITELIB}/shtoom/app/base.pyo
-${PYSITELIB}/shtoom/app/echo.pyo
-${PYSITELIB}/shtoom/app/interfaces.pyo
-${PYSITELIB}/shtoom/app/message.pyo
-${PYSITELIB}/shtoom/app/phone.pyo
-${PYSITELIB}/shtoom/Options.pyc
-${PYSITELIB}/shtoom/__init__.pyc
-${PYSITELIB}/shtoom/digestauth.pyc
-${PYSITELIB}/shtoom/exceptions.pyc
-${PYSITELIB}/shtoom/interfaces.pyc
-${PYSITELIB}/shtoom/opts.pyc
-${PYSITELIB}/shtoom/rtcp.pyc
-${PYSITELIB}/shtoom/rtp.pyc
-${PYSITELIB}/shtoom/sip.pyc
-${PYSITELIB}/shtoom/stun.pyc
+${PYSITELIB}/shtoom/upnp.py
 ${PYSITELIB}/shtoom/upnp.pyc
-${PYSITELIB}/shtoom/Options.pyo
-${PYSITELIB}/shtoom/__init__.pyo
-${PYSITELIB}/shtoom/digestauth.pyo
-${PYSITELIB}/shtoom/exceptions.pyo
-${PYSITELIB}/shtoom/interfaces.pyo
-${PYSITELIB}/shtoom/opts.pyo
-${PYSITELIB}/shtoom/rtcp.pyo
-${PYSITELIB}/shtoom/rtp.pyo
-${PYSITELIB}/shtoom/sip.pyo
-${PYSITELIB}/shtoom/stun.pyo
 ${PYSITELIB}/shtoom/upnp.pyo
diff --git a/py-txZMQ/Makefile b/py-txZMQ/Makefile
index 0099d5f4e3..fa9805cfd2 100644
--- a/py-txZMQ/Makefile
+++ b/py-txZMQ/Makefile
@@ -15,7 +15,5 @@ DEPENDS+=	${PYPKGPREFIX}-zmq>=14.4.1:../../net/py-zmq
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG=	yes
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-txZMQ/PLIST b/py-txZMQ/PLIST
index dc22e4302e..85f263e96b 100644
--- a/py-txZMQ/PLIST
+++ b/py-txZMQ/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/20 16:30:08 jihbed Exp $
+@comment $NetBSD$
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/txzmq/__init__.py
 ${PYSITELIB}/txzmq/__init__.pyc
 ${PYSITELIB}/txzmq/__init__.pyo
diff --git a/py-txZMQ/distinfo b/py-txZMQ/distinfo
index e46625479d..f1e9a4835e 100644
--- a/py-txZMQ/distinfo
+++ b/py-txZMQ/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.1 2015/02/20 10:38:34 jihbed Exp $
 SHA1 (txZMQ-0.7.3.tar.gz) = 97134d0900fc680ac4accf4b0a738fc4c5a4c8e7
 RMD160 (txZMQ-0.7.3.tar.gz) = 63094968eb842b0a059100745693338db987158e
 Size (txZMQ-0.7.3.tar.gz) = 18663 bytes
+SHA1 (patch-README.rst) = 8cb3afeee67edf352ec86511405815823ad5dafd
diff --git a/py-txZMQ/patches/patch-README.rst b/py-txZMQ/patches/patch-README.rst
new file mode 100644
index 0000000000..0f2871ea42
--- /dev/null
+++ b/py-txZMQ/patches/patch-README.rst
@@ -0,0 +1,40 @@
+$NetBSD$
+
+Encoding of file not defined, gives read error during installation
+with python-3.x.
+
+--- README.rst.orig	2014-04-17 21:00:47.000000000 +0000
++++ README.rst
+@@ -16,10 +16,10 @@ Twisted bindings for 0MQ
+ Introduction
+ ------------
+ 
+-txZMQ allows to integrate easily `ØMQ <http://zeromq.org>`_ sockets into
++txZMQ allows to integrate easily `zeroMQ <http://zeromq.org>`_ sockets into
+ Twisted event loop (reactor).
+ 
+-txZMQ supports both CPython and PyPy and ØMQ library version 2.2.x or 3.2.x.
++txZMQ supports both CPython and PyPy and zeroMQ library version 2.2.x or 3.2.x.
+ Preliminary support for Python 3.x is available.
+ 
+ Documentation is available at `ReadTheDocs <http://txzmq.readthedocs.org>`_ and
+@@ -31,7 +31,7 @@ Requirements
+ 
+ C library required:
+ 
+-* ØMQ library 2.2.x or 3.2.x
++* zeroMQ library 2.2.x or 3.2.x
+ 
+ Python packages required:
+ 
+@@ -46,8 +46,8 @@ txZMQ introduces support for general 0MQ
+ that can do basic event loop integration, sending-receiving messages in
+ non-blocking manner, scatter-gather for multipart messages.
+ 
+-txZMQ uses ØMQ APIs to get file descriptor that is used to signal pending
+-actions from ØMQ library IO thread running in separate thread. This is used in
++txZMQ uses zeroMQ APIs to get file descriptor that is used to signal pending
++actions from zeroMQ library IO thread running in separate thread. This is used in
+ a custom file descriptor reader, which is then added to the Twisted reactor.
+ 
+ 


Home | Main Index | Thread Index | Old Index