- Update to version 0.10.2

4 files changed, 32 insertions, 25 deletions

diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index f0925176e88c..08842fa353a4 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	0.10.1
+PORTVERSION=	0.10.2
 CATEGORIES=	devel net python
 MASTER_SITES=	http://twistedmatrix.com/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,10 +20,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/unittest.py:${PORTSDIR}/devel/py-unit \
 		${PYTHON_SITELIBDIR}/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome
 
 USE_PYTHON=	yes
-
+PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 EXAMPLESDIR=	${PREFIX}/share/examples/twisted
-SCRIPTS=	accepttests cpyrght faucet gnusto im malyon manhole \
-		mapeditor mktap runtests twistd twistd-debug
 MAN1=		faucet.1 gnusto.1 im.1 manhole.1 mktap.1 twistd.1
 
 post-patch:
@@ -31,14 +29,11 @@ post-patch:
 	  ${WRKSRC}/bin/runtests ${WRKSRC}/twisted/test/*.py
 
 do-build:
-	@ cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
+	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
 
 do-install:
-	@ cd ${WRKSRC} && ${PYTHON_CMD} setup.py install -c -O1 \
+	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 \
 	  --prefix=${PREFIX}
-.for script in ${SCRIPTS}
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${PREFIX}/bin
-.endfor
 .for manpage in ${MAN1}
 	@ ${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage} ${MANPREFIX}/man/man1
 .endfor
diff --git a/devel/py-twisted/distinfo b/devel/py-twisted/distinfo
index 3415be00a826..fbcb33997c7a 100644
--- a/devel/py-twisted/distinfo
+++ b/devel/py-twisted/distinfo
@@ -1 +1 @@
-MD5 (Twisted-0.10.1.tar.gz) = 686e78e2a448c56b7c94901a0e0a15ee
+MD5 (Twisted-0.10.2.tar.gz) = ab908b5b6ce02c336c1acee390213ccb
diff --git a/devel/py-twisted/files/patch-setup.py b/devel/py-twisted/files/patch-setup.py
new file mode 100644
index 000000000000..3026c2404444
--- /dev/null
+++ b/devel/py-twisted/files/patch-setup.py
@@ -0,0 +1,15 @@
+--- setup.py.orig	Fri Sep 14 03:22:48 2001
++++ setup.py	Tue Sep 25 16:07:37 2001
+@@ -80,8 +80,10 @@
+     setup_args['platforms'] = "win32 posix"
+ 
+ if os.name == 'posix':
+-    import glob
+-    setup_args['scripts'] = filter(os.path.isfile, glob.glob('bin/*'))
++    setup_args['scripts'] = ['bin/accepttests', 'bin/cpyrght', 'bin/faucet',
++                             'bin/gnusto', 'bin/im', 'bin/malyon',
++                             'bin/manhole', 'bin/mapeditor', 'bin/mktap',
++                             'bin/runtests', 'bin/twistd', 'bin/twistd-debug']
+ 
+ #'"
+ # for building C banana...
diff --git a/devel/py-twisted/pkg-plist b/devel/py-twisted/pkg-plist
index bf9be221a027..e57412531ede 100644
--- a/devel/py-twisted/pkg-plist
+++ b/devel/py-twisted/pkg-plist
@@ -3,9 +3,10 @@
 %%PORTDOCS%%share/doc/twisted/ERRATA
 %%PORTDOCS%%share/doc/twisted/README
 %%PORTDOCS%%share/doc/twisted/TODO
+%%PORTDOCS%%share/doc/twisted/TwistedEnterprise.html
+%%PORTDOCS%%share/doc/twisted/TwistedPlugins.html
+%%PORTDOCS%%share/doc/twisted/WritingServers.html
 %%PORTDOCS%%share/doc/twisted/img/TwistedLogo.bmp
-%%PORTDOCS%%share/doc/twisted/twistedEnterprise.html
-%%PORTDOCS%%share/doc/twisted/writing-serves.html
 %%PORTDOCS%%share/examples/twisted/echoserv-ssl.py
 %%PORTDOCS%%share/examples/twisted/echoserv.py
 %%PORTDOCS%%share/examples/twisted/echoserv_threaded.py
@@ -134,12 +135,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/persisted/dirdbm.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/persisted/styles.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/persisted/styles.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/persisted/styles.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/pim/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/pim/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/pim/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/pim/todo.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/pim/todo.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/pim/todo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/__init__.pyo
@@ -188,9 +183,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/wire.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/authenticator.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/authenticator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/authenticator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/defer.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/defer.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/defer.pyo
@@ -212,6 +204,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/python/mutablestring.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/observable.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/observable.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/observable.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/otp.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/otp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/otp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/ouroboros.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/ouroboros.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/ouroboros.pyo
@@ -405,9 +400,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_rebuild.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_reflect.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_reflect.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_reflect.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_sexpy.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_sexpy.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_sexpy.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_smtp.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_smtp.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_smtp.pyo
@@ -417,6 +409,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_toc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_todo.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_todo.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_todo.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_web.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_web.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_web.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_words.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_words.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_words.pyo
@@ -432,6 +427,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/web/distrib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/error.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/error.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/error.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/guard.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/guard.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/guard.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/html.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/html.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/html.pyo
@@ -528,7 +526,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/words/webwords.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/reality
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/python
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/pim
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/persisted
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/manhole/ui
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/twisted/manhole