- Update py-twisted-* to 8.2.0

- turn devel/py-twisted into a meta port.
- Update USE_TWISTED{,_BUILD,_RUN} in bsd.python.mk:
  * Remove flow, pair, xish, which are deprecated
    (but still update them to latest release in the tree)
  * Remove USE_TWISTED=13 (no port uses this)
  * Fix typos in twisted components _DEPENDS

PR:		ports/130001
Submitted by:	lwhsu
Approved by:	maintainer timeout

3 files changed, 47 insertions, 56 deletions

diff --git a/devel/py-twistedFlow/Makefile b/devel/py-twistedFlow/Makefile
index 293b3934694f..d352c0f33152 100644
--- a/devel/py-twistedFlow/Makefile
+++ b/devel/py-twistedFlow/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	twistedFlow
-PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTVERSION=	8.0.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://twistedmatrix.com/downloads/Flow/0.1/ \
-		http://tmrc.mit.edu/mirror/twisted/Flow/0.1/
+MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Flow/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TwistedFlow-${PORTVERSION}
 
@@ -23,15 +21,8 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 WRKSRC=		${WRKDIR}/TwistedFlow-${PORTVERSION}
 
 USE_BZIP2=	yes
-USE_PYTHON=	2.2+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Twisted_Flow
 
-PLIST_SUB+=	S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
-
-post-extract:
-	# temporal hack to work with Twisted 2.4
-	${ECHO_CMD} "from twisted.python import versions" > ${WRKSRC}/twisted/flow/_version.py
-	${ECHO_CMD} "version = versions.Version(__name__[:__name__.rfind('.')], 0, 1, 0)" >> ${WRKSRC}/twisted/flow/_version.py
-
 .include <bsd.port.mk>
diff --git a/devel/py-twistedFlow/distinfo b/devel/py-twistedFlow/distinfo
index 9d7dba1d474b..a4cb2fd7152a 100644
--- a/devel/py-twistedFlow/distinfo
+++ b/devel/py-twistedFlow/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedFlow-0.1.0.tar.bz2) = 2bf918f72e5115793c25a7aac6b83502
-SHA256 (TwistedFlow-0.1.0.tar.bz2) = d44c99ae5ef01f548aac226844409042aead6db254baf2c762cbc8f8116a7d2b
-SIZE (TwistedFlow-0.1.0.tar.bz2) = 20215
+MD5 (TwistedFlow-8.0.0.tar.bz2) = 8a6abe304c3bd9b2ba054c397a2580a0
+SHA256 (TwistedFlow-8.0.0.tar.bz2) = a4dde9e218548f286a0c7626a0d15159a8cfeba1c28f3fe9fb1daa2a6587e262
+SIZE (TwistedFlow-8.0.0.tar.bz2) = 20545
diff --git a/devel/py-twistedFlow/pkg-plist b/devel/py-twistedFlow/pkg-plist
index 5a28af5c3ad2..d202cf483643 100644
--- a/devel/py-twistedFlow/pkg-plist
+++ b/devel/py-twistedFlow/pkg-plist
@@ -1,41 +1,41 @@
-%%S%%/twisted/flow/__init__.py
-%%S%%/twisted/flow/__init__.pyc
-%%S%%/twisted/flow/__init__.pyo
-%%S%%/twisted/flow/_version.py
-%%S%%/twisted/flow/_version.pyc
-%%S%%/twisted/flow/_version.pyo
-%%S%%/twisted/flow/base.py
-%%S%%/twisted/flow/base.pyc
-%%S%%/twisted/flow/base.pyo
-%%S%%/twisted/flow/controller.py
-%%S%%/twisted/flow/controller.pyc
-%%S%%/twisted/flow/controller.pyo
-%%S%%/twisted/flow/flow.py
-%%S%%/twisted/flow/flow.pyc
-%%S%%/twisted/flow/flow.pyo
-%%S%%/twisted/flow/pipe.py
-%%S%%/twisted/flow/pipe.pyc
-%%S%%/twisted/flow/pipe.pyo
-%%S%%/twisted/flow/protocol.py
-%%S%%/twisted/flow/protocol.pyc
-%%S%%/twisted/flow/protocol.pyo
-%%S%%/twisted/flow/stage.py
-%%S%%/twisted/flow/stage.pyc
-%%S%%/twisted/flow/stage.pyo
-%%S%%/twisted/flow/test/__init__.py
-%%S%%/twisted/flow/test/__init__.pyc
-%%S%%/twisted/flow/test/__init__.pyo
-%%S%%/twisted/flow/test/test_flow.py
-%%S%%/twisted/flow/test/test_flow.pyc
-%%S%%/twisted/flow/test/test_flow.pyo
-%%S%%/twisted/flow/threads.py
-%%S%%/twisted/flow/threads.pyc
-%%S%%/twisted/flow/threads.pyo
-%%S%%/twisted/flow/web.py
-%%S%%/twisted/flow/web.pyc
-%%S%%/twisted/flow/web.pyo
-%%S%%/twisted/flow/wrap.py
-%%S%%/twisted/flow/wrap.pyc
-%%S%%/twisted/flow/wrap.pyo
-@dirrm %%S%%/twisted/flow/test
-@dirrm %%S%%/twisted/flow
+%%PYTHON_SITELIBDIR%%/twisted/flow/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/_version.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/_version.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/_version.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/base.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/base.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/base.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/controller.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/controller.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/controller.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/flow.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/flow.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/flow.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/pipe.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/pipe.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/pipe.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/protocol.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/protocol.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/protocol.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/stage.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/stage.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/stage.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/test/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/test/test_flow.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/test/test_flow.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/test/test_flow.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/threads.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/threads.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/threads.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/web.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/web.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/web.pyo
+%%PYTHON_SITELIBDIR%%/twisted/flow/wrap.py
+%%PYTHON_SITELIBDIR%%/twisted/flow/wrap.pyc
+%%PYTHON_SITELIBDIR%%/twisted/flow/wrap.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/flow/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/flow