NetBSD Problem Report #42918

From www@NetBSD.org  Thu Mar  4 13:26:05 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 0B76363B89F
	for <gnats-bugs@gnats.NetBSD.org>; Thu,  4 Mar 2010 13:26:05 +0000 (UTC)
Message-Id: <20100304132604.B40D563B873@www.NetBSD.org>
Date: Thu,  4 Mar 2010 13:26:04 +0000 (UTC)
From: wenheping@gmail.com
Reply-To: wenheping@gmail.com
To: gnats-bugs@NetBSD.org
Subject: [net/py-twisted] Update to 10.0.0
X-Send-Pr-Version: www-1.0

>Number:         42918
>Category:       pkg
>Synopsis:       [net/py-twisted] Update to 10.0.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    obache
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Mar 04 13:30:01 +0000 2010
>Closed-Date:    Sat Mar 06 13:21:46 +0000 2010
>Last-Modified:  Sat Mar 06 13:21:46 +0000 2010
>Originator:     Wen Heping
>Release:        NetBSD-5.0.1
>Organization:
Private
>Environment:
NetBSD NB501 5.0.1 NetBSD 5.0.1 (GENERIC) #0: Thu Jul 30 01:39:11 UTC 2009  builds@b8.netbsd.org:/home/builds/ab/netbsd-5-0-1-RELEASE/i386/200907292356Z-obj/home/builds/ab/netbsd-5-0-1-RELEASE/src/sys/arch/i386/compile/GENERIC i386
>Description:
The changelog is too long, please visit:

http://twistedmatrix.com/trac/browser/trunk/NEWS
>How-To-Repeat:

>Fix:
diff -urN py-twisted.orig/Makefile py-twisted/Makefile
--- py-twisted.orig/Makefile    2010-03-05 03:22:24.000000000 +0800
+++ py-twisted/Makefile 2010-03-05 05:07:57.000000000 +0800
@@ -2,17 +2,18 @@
 #

 PKGNAME=               ${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
-COMMENT=               Framework for writing networked applications
+COMMENT=               Asynchronous networking framework written in Python
+LICENSE=               mit
 .include "../../net/py-twisted/Makefile.common"

-DEPENDS+=              ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
-DEPENDS+=              ${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
+DEPENDS+=              ${PYPKGPREFIX}-ZopeInterface>=3.5.3:../../devel/py-ZopeInterface

 # bin/cftp
 CONFLICTS+=            cftp-[0-9]*

 REPLACE_PYTHON+=       ${WRKSRC}/twisted/mail/test/pop3testserver.py
 REPLACE_PYTHON+=       ${WRKSRC}/twisted/trial/test/scripttest.py
+REPLACE_PYTHON+=       ${WRKSRC}/twisted/topfiles/setup.py

 do-test:
        cd ${WRKSRC} && ./build/scripts-${PYVERSSUFFIX}/trial twisted
diff -urN py-twisted.orig/Makefile.common py-twisted/Makefile.common
--- py-twisted.orig/Makefile.common     2010-03-05 03:22:24.000000000 +0800
+++ py-twisted/Makefile.common  2010-03-05 03:41:03.000000000 +0800
@@ -2,10 +2,10 @@
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile

-TWISTED_VERSION=       8.1.0
+TWISTED_VERSION=       10.0.0
 DISTNAME=              Twisted-${TWISTED_VERSION}
 CATEGORIES=            net python
-MASTER_SITES=          http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/
+MASTER_SITES=          http://tmrc.mit.edu/mirror/twisted/Twisted/10.0/
 EXTRACT_SUFX=          .tar.bz2

 MAINTAINER=            pkgsrc-users@NetBSD.org
diff -urN py-twisted.orig/PLIST py-twisted/PLIST
--- py-twisted.orig/PLIST       2010-03-05 03:22:24.000000000 +0800
+++ py-twisted/PLIST    2010-03-05 03:55:38.000000000 +0800
@@ -1,15 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2008/09/16 01:59:07 epg Exp $
-bin/bookify
+@comment $NetBSD$
 bin/cftp
 bin/ckeygen
 bin/conch
-bin/im
 bin/lore
 bin/mailmail
 bin/manhole
 bin/mktap
 bin/pyhtmlizer
-bin/t-im
 bin/tap2deb
 bin/tap2rpm
 bin/tapconvert
@@ -73,12 +70,12 @@
 ${PYSITELIB}/twisted/conch/client/direct.py
 ${PYSITELIB}/twisted/conch/client/direct.pyc
 ${PYSITELIB}/twisted/conch/client/direct.pyo
+${PYSITELIB}/twisted/conch/client/knownhosts.py
+${PYSITELIB}/twisted/conch/client/knownhosts.pyc
+${PYSITELIB}/twisted/conch/client/knownhosts.pyo
 ${PYSITELIB}/twisted/conch/client/options.py
 ${PYSITELIB}/twisted/conch/client/options.pyc
 ${PYSITELIB}/twisted/conch/client/options.pyo
-${PYSITELIB}/twisted/conch/client/unix.py
-${PYSITELIB}/twisted/conch/client/unix.pyc
-${PYSITELIB}/twisted/conch/client/unix.pyo
 ${PYSITELIB}/twisted/conch/error.py
 ${PYSITELIB}/twisted/conch/error.pyc
 ${PYSITELIB}/twisted/conch/error.pyo
@@ -208,18 +205,30 @@
 ${PYSITELIB}/twisted/conch/test/keydata.py
 ${PYSITELIB}/twisted/conch/test/keydata.pyc
 ${PYSITELIB}/twisted/conch/test/keydata.pyo
+${PYSITELIB}/twisted/conch/test/test_agent.py
+${PYSITELIB}/twisted/conch/test/test_agent.pyc
+${PYSITELIB}/twisted/conch/test/test_agent.pyo
 ${PYSITELIB}/twisted/conch/test/test_cftp.py
 ${PYSITELIB}/twisted/conch/test/test_cftp.pyc
 ${PYSITELIB}/twisted/conch/test/test_cftp.pyo
 ${PYSITELIB}/twisted/conch/test/test_channel.py
 ${PYSITELIB}/twisted/conch/test/test_channel.pyc
 ${PYSITELIB}/twisted/conch/test/test_channel.pyo
+${PYSITELIB}/twisted/conch/test/test_checkers.py
+${PYSITELIB}/twisted/conch/test/test_checkers.pyc
+${PYSITELIB}/twisted/conch/test/test_checkers.pyo
+${PYSITELIB}/twisted/conch/test/test_ckeygen.py
+${PYSITELIB}/twisted/conch/test/test_ckeygen.pyc
+${PYSITELIB}/twisted/conch/test/test_ckeygen.pyo
 ${PYSITELIB}/twisted/conch/test/test_conch.py
 ${PYSITELIB}/twisted/conch/test/test_conch.pyc
 ${PYSITELIB}/twisted/conch/test/test_conch.pyo
 ${PYSITELIB}/twisted/conch/test/test_connection.py
 ${PYSITELIB}/twisted/conch/test/test_connection.pyc
 ${PYSITELIB}/twisted/conch/test/test_connection.pyo
+${PYSITELIB}/twisted/conch/test/test_default.py
+${PYSITELIB}/twisted/conch/test/test_default.pyc
+${PYSITELIB}/twisted/conch/test/test_default.pyo
 ${PYSITELIB}/twisted/conch/test/test_filetransfer.py
 ${PYSITELIB}/twisted/conch/test/test_filetransfer.pyc
 ${PYSITELIB}/twisted/conch/test/test_filetransfer.pyo
@@ -232,18 +241,30 @@
 ${PYSITELIB}/twisted/conch/test/test_keys.py
 ${PYSITELIB}/twisted/conch/test/test_keys.pyc
 ${PYSITELIB}/twisted/conch/test/test_keys.pyo
+${PYSITELIB}/twisted/conch/test/test_knownhosts.py
+${PYSITELIB}/twisted/conch/test/test_knownhosts.pyc
+${PYSITELIB}/twisted/conch/test/test_knownhosts.pyo
 ${PYSITELIB}/twisted/conch/test/test_manhole.py
 ${PYSITELIB}/twisted/conch/test/test_manhole.pyc
 ${PYSITELIB}/twisted/conch/test/test_manhole.pyo
 ${PYSITELIB}/twisted/conch/test/test_mixin.py
 ${PYSITELIB}/twisted/conch/test/test_mixin.pyc
 ${PYSITELIB}/twisted/conch/test/test_mixin.pyo
+${PYSITELIB}/twisted/conch/test/test_openssh_compat.py
+${PYSITELIB}/twisted/conch/test/test_openssh_compat.pyc
+${PYSITELIB}/twisted/conch/test/test_openssh_compat.pyo
 ${PYSITELIB}/twisted/conch/test/test_recvline.py
 ${PYSITELIB}/twisted/conch/test/test_recvline.pyc
 ${PYSITELIB}/twisted/conch/test/test_recvline.pyo
+${PYSITELIB}/twisted/conch/test/test_session.py
+${PYSITELIB}/twisted/conch/test/test_session.pyc
+${PYSITELIB}/twisted/conch/test/test_session.pyo
 ${PYSITELIB}/twisted/conch/test/test_ssh.py
 ${PYSITELIB}/twisted/conch/test/test_ssh.pyc
 ${PYSITELIB}/twisted/conch/test/test_ssh.pyo
+${PYSITELIB}/twisted/conch/test/test_tap.py
+${PYSITELIB}/twisted/conch/test/test_tap.pyc
+${PYSITELIB}/twisted/conch/test/test_tap.pyo
 ${PYSITELIB}/twisted/conch/test/test_telnet.py
 ${PYSITELIB}/twisted/conch/test/test_telnet.pyc
 ${PYSITELIB}/twisted/conch/test/test_telnet.pyo
@@ -282,6 +303,9 @@
 ${PYSITELIB}/twisted/cred/__init__.py
 ${PYSITELIB}/twisted/cred/__init__.pyc
 ${PYSITELIB}/twisted/cred/__init__.pyo
+${PYSITELIB}/twisted/cred/_digest.py
+${PYSITELIB}/twisted/cred/_digest.pyc
+${PYSITELIB}/twisted/cred/_digest.pyo
 ${PYSITELIB}/twisted/cred/checkers.py
 ${PYSITELIB}/twisted/cred/checkers.pyc
 ${PYSITELIB}/twisted/cred/checkers.pyo
@@ -321,52 +345,12 @@
 ${PYSITELIB}/twisted/enterprise/util.py
 ${PYSITELIB}/twisted/enterprise/util.pyc
 ${PYSITELIB}/twisted/enterprise/util.pyo
-${PYSITELIB}/twisted/flow/__init__.py
-${PYSITELIB}/twisted/flow/__init__.pyc
-${PYSITELIB}/twisted/flow/__init__.pyo
-${PYSITELIB}/twisted/flow/_version.py
-${PYSITELIB}/twisted/flow/_version.pyc
-${PYSITELIB}/twisted/flow/_version.pyo
-${PYSITELIB}/twisted/flow/base.py
-${PYSITELIB}/twisted/flow/base.pyc
-${PYSITELIB}/twisted/flow/base.pyo
-${PYSITELIB}/twisted/flow/controller.py
-${PYSITELIB}/twisted/flow/controller.pyc
-${PYSITELIB}/twisted/flow/controller.pyo
-${PYSITELIB}/twisted/flow/flow.py
-${PYSITELIB}/twisted/flow/flow.pyc
-${PYSITELIB}/twisted/flow/flow.pyo
-${PYSITELIB}/twisted/flow/pipe.py
-${PYSITELIB}/twisted/flow/pipe.pyc
-${PYSITELIB}/twisted/flow/pipe.pyo
-${PYSITELIB}/twisted/flow/protocol.py
-${PYSITELIB}/twisted/flow/protocol.pyc
-${PYSITELIB}/twisted/flow/protocol.pyo
-${PYSITELIB}/twisted/flow/stage.py
-${PYSITELIB}/twisted/flow/stage.pyc
-${PYSITELIB}/twisted/flow/stage.pyo
-${PYSITELIB}/twisted/flow/test/__init__.py
-${PYSITELIB}/twisted/flow/test/__init__.pyc
-${PYSITELIB}/twisted/flow/test/__init__.pyo
-${PYSITELIB}/twisted/flow/test/test_flow.py
-${PYSITELIB}/twisted/flow/test/test_flow.pyc
-${PYSITELIB}/twisted/flow/test/test_flow.pyo
-${PYSITELIB}/twisted/flow/threads.py
-${PYSITELIB}/twisted/flow/threads.pyc
-${PYSITELIB}/twisted/flow/threads.pyo
-${PYSITELIB}/twisted/flow/topfiles/README
-${PYSITELIB}/twisted/flow/web.py
-${PYSITELIB}/twisted/flow/web.pyc
-${PYSITELIB}/twisted/flow/web.pyo
-${PYSITELIB}/twisted/flow/wrap.py
-${PYSITELIB}/twisted/flow/wrap.pyc
-${PYSITELIB}/twisted/flow/wrap.pyo
-${PYSITELIB}/twisted/im.py
-${PYSITELIB}/twisted/im.pyc
-${PYSITELIB}/twisted/im.pyo
 ${PYSITELIB}/twisted/internet/__init__.py
 ${PYSITELIB}/twisted/internet/__init__.pyc
 ${PYSITELIB}/twisted/internet/__init__.pyo
+${PYSITELIB}/twisted/internet/_baseprocess.py
+${PYSITELIB}/twisted/internet/_baseprocess.pyc
+${PYSITELIB}/twisted/internet/_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.py
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyc
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyo
@@ -522,12 +506,60 @@
 ${PYSITELIB}/twisted/internet/test/__init__.py
 ${PYSITELIB}/twisted/internet/test/__init__.pyc
 ${PYSITELIB}/twisted/internet/test/__init__.pyo
-${PYSITELIB}/twisted/internet/test/test_gtk2reactor.py
-${PYSITELIB}/twisted/internet/test/test_gtk2reactor.pyc
-${PYSITELIB}/twisted/internet/test/test_gtk2reactor.pyo
+${PYSITELIB}/twisted/internet/test/inlinecb_tests.py
+${PYSITELIB}/twisted/internet/test/inlinecb_tests.pyc
+${PYSITELIB}/twisted/internet/test/inlinecb_tests.pyo
+${PYSITELIB}/twisted/internet/test/process_helper.py
+${PYSITELIB}/twisted/internet/test/process_helper.pyc
+${PYSITELIB}/twisted/internet/test/process_helper.pyo
+${PYSITELIB}/twisted/internet/test/reactormixins.py
+${PYSITELIB}/twisted/internet/test/reactormixins.pyc
+${PYSITELIB}/twisted/internet/test/reactormixins.pyo
+${PYSITELIB}/twisted/internet/test/test_base.py
+${PYSITELIB}/twisted/internet/test/test_base.pyc
+${PYSITELIB}/twisted/internet/test/test_base.pyo
+${PYSITELIB}/twisted/internet/test/test_baseprocess.py
+${PYSITELIB}/twisted/internet/test/test_baseprocess.pyc
+${PYSITELIB}/twisted/internet/test/test_baseprocess.pyo
+${PYSITELIB}/twisted/internet/test/test_core.py
+${PYSITELIB}/twisted/internet/test/test_core.pyc
+${PYSITELIB}/twisted/internet/test/test_core.pyo
+${PYSITELIB}/twisted/internet/test/test_fdset.py
+${PYSITELIB}/twisted/internet/test/test_fdset.pyc
+${PYSITELIB}/twisted/internet/test/test_fdset.pyo
+${PYSITELIB}/twisted/internet/test/test_inlinecb.py
+${PYSITELIB}/twisted/internet/test/test_inlinecb.pyc
+${PYSITELIB}/twisted/internet/test/test_inlinecb.pyo
 ${PYSITELIB}/twisted/internet/test/test_iocp.py
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyc
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyo
+${PYSITELIB}/twisted/internet/test/test_pollingfile.py
+${PYSITELIB}/twisted/internet/test/test_pollingfile.pyc
+${PYSITELIB}/twisted/internet/test/test_pollingfile.pyo
+${PYSITELIB}/twisted/internet/test/test_posixbase.py
+${PYSITELIB}/twisted/internet/test/test_posixbase.pyc
+${PYSITELIB}/twisted/internet/test/test_posixbase.pyo
+${PYSITELIB}/twisted/internet/test/test_process.py
+${PYSITELIB}/twisted/internet/test/test_process.pyc
+${PYSITELIB}/twisted/internet/test/test_process.pyo
+${PYSITELIB}/twisted/internet/test/test_qtreactor.py
+${PYSITELIB}/twisted/internet/test/test_qtreactor.pyc
+${PYSITELIB}/twisted/internet/test/test_qtreactor.pyo
+${PYSITELIB}/twisted/internet/test/test_tcp.py
+${PYSITELIB}/twisted/internet/test/test_tcp.pyc
+${PYSITELIB}/twisted/internet/test/test_tcp.pyo
+${PYSITELIB}/twisted/internet/test/test_threads.py
+${PYSITELIB}/twisted/internet/test/test_threads.pyc
+${PYSITELIB}/twisted/internet/test/test_threads.pyo
+${PYSITELIB}/twisted/internet/test/test_time.py
+${PYSITELIB}/twisted/internet/test/test_time.pyc
+${PYSITELIB}/twisted/internet/test/test_time.pyo
+${PYSITELIB}/twisted/internet/test/test_tls.py
+${PYSITELIB}/twisted/internet/test/test_tls.pyc
+${PYSITELIB}/twisted/internet/test/test_tls.pyo
+${PYSITELIB}/twisted/internet/test/test_unix.py
+${PYSITELIB}/twisted/internet/test/test_unix.pyc
+${PYSITELIB}/twisted/internet/test/test_unix.pyo
 ${PYSITELIB}/twisted/internet/threads.py
 ${PYSITELIB}/twisted/internet/threads.pyc
 ${PYSITELIB}/twisted/internet/threads.pyo
@@ -582,9 +614,6 @@
 ${PYSITELIB}/twisted/lore/man2lore.py
 ${PYSITELIB}/twisted/lore/man2lore.pyc
 ${PYSITELIB}/twisted/lore/man2lore.pyo
-${PYSITELIB}/twisted/lore/nevowlore.py
-${PYSITELIB}/twisted/lore/nevowlore.pyc
-${PYSITELIB}/twisted/lore/nevowlore.pyo
 ${PYSITELIB}/twisted/lore/numberer.py
 ${PYSITELIB}/twisted/lore/numberer.pyc
 ${PYSITELIB}/twisted/lore/numberer.pyo
@@ -604,36 +633,38 @@
 ${PYSITELIB}/twisted/lore/test/__init__.py
 ${PYSITELIB}/twisted/lore/test/__init__.pyc
 ${PYSITELIB}/twisted/lore/test/__init__.pyo
-${PYSITELIB}/twisted/lore/test/good_internal.xhtml
-${PYSITELIB}/twisted/lore/test/good_simple.xhtml
 ${PYSITELIB}/twisted/lore/test/lore_index_file_out.html
 ${PYSITELIB}/twisted/lore/test/lore_index_file_out_multiple.html
-${PYSITELIB}/twisted/lore/test/lore_index_file_unnumbered_multiple_out.html
 ${PYSITELIB}/twisted/lore/test/lore_index_file_unnumbered_out.html
 ${PYSITELIB}/twisted/lore/test/lore_index_test.xhtml
 ${PYSITELIB}/twisted/lore/test/lore_index_test2.xhtml
-${PYSITELIB}/twisted/lore/test/lore_index_test3.xhtml
-${PYSITELIB}/twisted/lore/test/lore_index_test_out.html
-${PYSITELIB}/twisted/lore/test/lore_index_test_out2.html
-${PYSITELIB}/twisted/lore/test/lore_numbering_test.xhtml
 ${PYSITELIB}/twisted/lore/test/lore_numbering_test_out.html
 ${PYSITELIB}/twisted/lore/test/lore_numbering_test_out2.html
 ${PYSITELIB}/twisted/lore/test/simple.html
-${PYSITELIB}/twisted/lore/test/simple.xhtml
-${PYSITELIB}/twisted/lore/test/simple1.xhtml
-${PYSITELIB}/twisted/lore/test/simple2.xhtml
 ${PYSITELIB}/twisted/lore/test/simple3.html
-${PYSITELIB}/twisted/lore/test/simple3.xhtml
 ${PYSITELIB}/twisted/lore/test/simple4.html
-${PYSITELIB}/twisted/lore/test/simple4.xhtml
-${PYSITELIB}/twisted/lore/test/simple4foo.xhtml
 ${PYSITELIB}/twisted/lore/test/template.tpl
+${PYSITELIB}/twisted/lore/test/test_docbook.py
+${PYSITELIB}/twisted/lore/test/test_docbook.pyc
+${PYSITELIB}/twisted/lore/test/test_docbook.pyo
+${PYSITELIB}/twisted/lore/test/test_latex.py
+${PYSITELIB}/twisted/lore/test/test_latex.pyc
+${PYSITELIB}/twisted/lore/test/test_latex.pyo
+${PYSITELIB}/twisted/lore/test/test_lint.py
+${PYSITELIB}/twisted/lore/test/test_lint.pyc
+${PYSITELIB}/twisted/lore/test/test_lint.pyo
+${PYSITELIB}/twisted/lore/test/test_lmath.py
+${PYSITELIB}/twisted/lore/test/test_lmath.pyc
+${PYSITELIB}/twisted/lore/test/test_lmath.pyo
 ${PYSITELIB}/twisted/lore/test/test_lore.py
 ${PYSITELIB}/twisted/lore/test/test_lore.pyc
 ${PYSITELIB}/twisted/lore/test/test_lore.pyo
 ${PYSITELIB}/twisted/lore/test/test_man2lore.py
 ${PYSITELIB}/twisted/lore/test/test_man2lore.pyc
 ${PYSITELIB}/twisted/lore/test/test_man2lore.pyo
+${PYSITELIB}/twisted/lore/test/test_slides.py
+${PYSITELIB}/twisted/lore/test/test_slides.pyc
+${PYSITELIB}/twisted/lore/test/test_slides.pyo
 ${PYSITELIB}/twisted/lore/texi.py
 ${PYSITELIB}/twisted/lore/texi.pyc
 ${PYSITELIB}/twisted/lore/texi.pyo
@@ -642,6 +673,11 @@
 ${PYSITELIB}/twisted/lore/tree.py
 ${PYSITELIB}/twisted/lore/tree.pyc
 ${PYSITELIB}/twisted/lore/tree.pyo
+${PYSITELIB}/twisted/lore/xhtml-lat1.ent
+${PYSITELIB}/twisted/lore/xhtml-special.ent
+${PYSITELIB}/twisted/lore/xhtml-symbol.ent
+${PYSITELIB}/twisted/lore/xhtml1-strict.dtd
+${PYSITELIB}/twisted/lore/xhtml1-transitional.dtd
 ${PYSITELIB}/twisted/mail/__init__.py
 ${PYSITELIB}/twisted/mail/__init__.pyc
 ${PYSITELIB}/twisted/mail/__init__.pyo
@@ -709,6 +745,9 @@
 ${PYSITELIB}/twisted/mail/test/test_mail.py
 ${PYSITELIB}/twisted/mail/test/test_mail.pyc
 ${PYSITELIB}/twisted/mail/test/test_mail.pyo
+${PYSITELIB}/twisted/mail/test/test_mailmail.py
+${PYSITELIB}/twisted/mail/test/test_mailmail.pyc
+${PYSITELIB}/twisted/mail/test/test_mailmail.pyo
 ${PYSITELIB}/twisted/mail/test/test_options.py
 ${PYSITELIB}/twisted/mail/test/test_options.pyc
 ${PYSITELIB}/twisted/mail/test/test_options.pyo
@@ -751,16 +790,12 @@
 ${PYSITELIB}/twisted/manhole/ui/gtk2manhole.py
 ${PYSITELIB}/twisted/manhole/ui/gtk2manhole.pyc
 ${PYSITELIB}/twisted/manhole/ui/gtk2manhole.pyo
-${PYSITELIB}/twisted/manhole/ui/gtkmanhole.py
-${PYSITELIB}/twisted/manhole/ui/gtkmanhole.pyc
-${PYSITELIB}/twisted/manhole/ui/gtkmanhole.pyo
-${PYSITELIB}/twisted/manhole/ui/gtkrc
-${PYSITELIB}/twisted/manhole/ui/pywidgets.py
-${PYSITELIB}/twisted/manhole/ui/pywidgets.pyc
-${PYSITELIB}/twisted/manhole/ui/pywidgets.pyo
-${PYSITELIB}/twisted/manhole/ui/spelunk_gnome.py
-${PYSITELIB}/twisted/manhole/ui/spelunk_gnome.pyc
-${PYSITELIB}/twisted/manhole/ui/spelunk_gnome.pyo
+${PYSITELIB}/twisted/manhole/ui/test/__init__.py
+${PYSITELIB}/twisted/manhole/ui/test/__init__.pyc
+${PYSITELIB}/twisted/manhole/ui/test/__init__.pyo
+${PYSITELIB}/twisted/manhole/ui/test/test_gtk2manhole.py
+${PYSITELIB}/twisted/manhole/ui/test/test_gtk2manhole.pyc
+${PYSITELIB}/twisted/manhole/ui/test/test_gtk2manhole.pyo
 ${PYSITELIB}/twisted/names/__init__.py
 ${PYSITELIB}/twisted/names/__init__.pyc
 ${PYSITELIB}/twisted/names/__init__.pyo
@@ -815,6 +850,9 @@
 ${PYSITELIB}/twisted/names/test/test_client.py
 ${PYSITELIB}/twisted/names/test/test_client.pyc
 ${PYSITELIB}/twisted/names/test/test_client.pyo
+${PYSITELIB}/twisted/names/test/test_common.py
+${PYSITELIB}/twisted/names/test/test_common.pyc
+${PYSITELIB}/twisted/names/test/test_common.pyo
 ${PYSITELIB}/twisted/names/test/test_dns.py
 ${PYSITELIB}/twisted/names/test/test_dns.pyc
 ${PYSITELIB}/twisted/names/test/test_dns.pyo
@@ -888,6 +926,7 @@
 ${PYSITELIB}/twisted/pair/test/test_rawudp.py
 ${PYSITELIB}/twisted/pair/test/test_rawudp.pyc
 ${PYSITELIB}/twisted/pair/test/test_rawudp.pyo
+${PYSITELIB}/twisted/pair/topfiles/NEWS
 ${PYSITELIB}/twisted/pair/topfiles/README
 ${PYSITELIB}/twisted/pair/tuntap.py
 ${PYSITELIB}/twisted/pair/tuntap.pyc
@@ -916,9 +955,6 @@
 ${PYSITELIB}/twisted/persisted/journal/rowjournal.py
 ${PYSITELIB}/twisted/persisted/journal/rowjournal.pyc
 ${PYSITELIB}/twisted/persisted/journal/rowjournal.pyo
-${PYSITELIB}/twisted/persisted/marmalade.py
-${PYSITELIB}/twisted/persisted/marmalade.pyc
-${PYSITELIB}/twisted/persisted/marmalade.pyo
 ${PYSITELIB}/twisted/persisted/sob.py
 ${PYSITELIB}/twisted/persisted/sob.pyc
 ${PYSITELIB}/twisted/persisted/sob.pyo
@@ -1005,12 +1041,6 @@
 ${PYSITELIB}/twisted/protocols/dict.py
 ${PYSITELIB}/twisted/protocols/dict.pyc
 ${PYSITELIB}/twisted/protocols/dict.pyo
-${PYSITELIB}/twisted/protocols/dns.py
-${PYSITELIB}/twisted/protocols/dns.pyc
-${PYSITELIB}/twisted/protocols/dns.pyo
-${PYSITELIB}/twisted/protocols/ethernet.py
-${PYSITELIB}/twisted/protocols/ethernet.pyc
-${PYSITELIB}/twisted/protocols/ethernet.pyo
 ${PYSITELIB}/twisted/protocols/finger.py
 ${PYSITELIB}/twisted/protocols/finger.pyc
 ${PYSITELIB}/twisted/protocols/finger.pyo
@@ -1029,24 +1059,9 @@
 ${PYSITELIB}/twisted/protocols/htb.py
 ${PYSITELIB}/twisted/protocols/htb.pyc
 ${PYSITELIB}/twisted/protocols/htb.pyo
-${PYSITELIB}/twisted/protocols/http.py
-${PYSITELIB}/twisted/protocols/http.pyc
-${PYSITELIB}/twisted/protocols/http.pyo
 ${PYSITELIB}/twisted/protocols/ident.py
 ${PYSITELIB}/twisted/protocols/ident.pyc
 ${PYSITELIB}/twisted/protocols/ident.pyo
-${PYSITELIB}/twisted/protocols/imap4.py
-${PYSITELIB}/twisted/protocols/imap4.pyc
-${PYSITELIB}/twisted/protocols/imap4.pyo
-${PYSITELIB}/twisted/protocols/ip.py
-${PYSITELIB}/twisted/protocols/ip.pyc
-${PYSITELIB}/twisted/protocols/ip.pyo
-${PYSITELIB}/twisted/protocols/irc.py
-${PYSITELIB}/twisted/protocols/irc.pyc
-${PYSITELIB}/twisted/protocols/irc.pyo
-${PYSITELIB}/twisted/protocols/jabber.py
-${PYSITELIB}/twisted/protocols/jabber.pyc
-${PYSITELIB}/twisted/protocols/jabber.pyo
 ${PYSITELIB}/twisted/protocols/loopback.py
 ${PYSITELIB}/twisted/protocols/loopback.pyc
 ${PYSITELIB}/twisted/protocols/loopback.pyo
@@ -1059,71 +1074,52 @@
 ${PYSITELIB}/twisted/protocols/mice/mouseman.py
 ${PYSITELIB}/twisted/protocols/mice/mouseman.pyc
 ${PYSITELIB}/twisted/protocols/mice/mouseman.pyo
-${PYSITELIB}/twisted/protocols/msn.py
-${PYSITELIB}/twisted/protocols/msn.pyc
-${PYSITELIB}/twisted/protocols/msn.pyo
-${PYSITELIB}/twisted/protocols/nntp.py
-${PYSITELIB}/twisted/protocols/nntp.pyc
-${PYSITELIB}/twisted/protocols/nntp.pyo
-${PYSITELIB}/twisted/protocols/oscar.py
-${PYSITELIB}/twisted/protocols/oscar.pyc
-${PYSITELIB}/twisted/protocols/oscar.pyo
 ${PYSITELIB}/twisted/protocols/pcp.py
 ${PYSITELIB}/twisted/protocols/pcp.pyc
 ${PYSITELIB}/twisted/protocols/pcp.pyo
 ${PYSITELIB}/twisted/protocols/policies.py
 ${PYSITELIB}/twisted/protocols/policies.pyc
 ${PYSITELIB}/twisted/protocols/policies.pyo
-${PYSITELIB}/twisted/protocols/pop3.py
-${PYSITELIB}/twisted/protocols/pop3.pyc
-${PYSITELIB}/twisted/protocols/pop3.pyo
 ${PYSITELIB}/twisted/protocols/portforward.py
 ${PYSITELIB}/twisted/protocols/portforward.pyc
 ${PYSITELIB}/twisted/protocols/portforward.pyo
 ${PYSITELIB}/twisted/protocols/postfix.py
 ${PYSITELIB}/twisted/protocols/postfix.pyc
 ${PYSITELIB}/twisted/protocols/postfix.pyo
-${PYSITELIB}/twisted/protocols/raw.py
-${PYSITELIB}/twisted/protocols/raw.pyc
-${PYSITELIB}/twisted/protocols/raw.pyo
-${PYSITELIB}/twisted/protocols/rawudp.py
-${PYSITELIB}/twisted/protocols/rawudp.pyc
-${PYSITELIB}/twisted/protocols/rawudp.pyo
 ${PYSITELIB}/twisted/protocols/shoutcast.py
 ${PYSITELIB}/twisted/protocols/shoutcast.pyc
 ${PYSITELIB}/twisted/protocols/shoutcast.pyo
 ${PYSITELIB}/twisted/protocols/sip.py
 ${PYSITELIB}/twisted/protocols/sip.pyc
 ${PYSITELIB}/twisted/protocols/sip.pyo
-${PYSITELIB}/twisted/protocols/smtp.py
-${PYSITELIB}/twisted/protocols/smtp.pyc
-${PYSITELIB}/twisted/protocols/smtp.pyo
 ${PYSITELIB}/twisted/protocols/socks.py
 ${PYSITELIB}/twisted/protocols/socks.pyc
 ${PYSITELIB}/twisted/protocols/socks.pyo
 ${PYSITELIB}/twisted/protocols/stateful.py
 ${PYSITELIB}/twisted/protocols/stateful.pyc
 ${PYSITELIB}/twisted/protocols/stateful.pyo
-${PYSITELIB}/twisted/protocols/sux.py
-${PYSITELIB}/twisted/protocols/sux.pyc
-${PYSITELIB}/twisted/protocols/sux.pyo
 ${PYSITELIB}/twisted/protocols/telnet.py
 ${PYSITELIB}/twisted/protocols/telnet.pyc
 ${PYSITELIB}/twisted/protocols/telnet.pyo
-${PYSITELIB}/twisted/protocols/toc.py
-${PYSITELIB}/twisted/protocols/toc.pyc
-${PYSITELIB}/twisted/protocols/toc.pyo
+${PYSITELIB}/twisted/protocols/test/__init__.py
+${PYSITELIB}/twisted/protocols/test/__init__.pyc
+${PYSITELIB}/twisted/protocols/test/__init__.pyo
+${PYSITELIB}/twisted/protocols/test/test_tls.py
+${PYSITELIB}/twisted/protocols/test/test_tls.pyc
+${PYSITELIB}/twisted/protocols/test/test_tls.pyo
+${PYSITELIB}/twisted/protocols/tls.py
+${PYSITELIB}/twisted/protocols/tls.pyc
+${PYSITELIB}/twisted/protocols/tls.pyo
 ${PYSITELIB}/twisted/protocols/wire.py
 ${PYSITELIB}/twisted/protocols/wire.pyc
 ${PYSITELIB}/twisted/protocols/wire.pyo
-${PYSITELIB}/twisted/protocols/xmlstream.py
-${PYSITELIB}/twisted/protocols/xmlstream.pyc
-${PYSITELIB}/twisted/protocols/xmlstream.pyo
 ${PYSITELIB}/twisted/python/__init__.py
 ${PYSITELIB}/twisted/python/__init__.pyc
 ${PYSITELIB}/twisted/python/__init__.pyo
 ${PYSITELIB}/twisted/python/_epoll.c
 ${PYSITELIB}/twisted/python/_epoll.pyx
+${PYSITELIB}/twisted/python/_initgroups.c
+${PYSITELIB}/twisted/python/_initgroups.so
 ${PYSITELIB}/twisted/python/_release.py
 ${PYSITELIB}/twisted/python/_release.pyc
 ${PYSITELIB}/twisted/python/_release.pyo
@@ -1152,6 +1148,9 @@
 ${PYSITELIB}/twisted/python/failure.py
 ${PYSITELIB}/twisted/python/failure.pyc
 ${PYSITELIB}/twisted/python/failure.pyo
+${PYSITELIB}/twisted/python/fakepwd.py
+${PYSITELIB}/twisted/python/fakepwd.pyc
+${PYSITELIB}/twisted/python/fakepwd.pyo
 ${PYSITELIB}/twisted/python/filepath.py
 ${PYSITELIB}/twisted/python/filepath.pyc
 ${PYSITELIB}/twisted/python/filepath.pyo
@@ -1161,6 +1160,9 @@
 ${PYSITELIB}/twisted/python/formmethod.py
 ${PYSITELIB}/twisted/python/formmethod.pyc
 ${PYSITELIB}/twisted/python/formmethod.pyo
+${PYSITELIB}/twisted/python/hashlib.py
+${PYSITELIB}/twisted/python/hashlib.pyc
+${PYSITELIB}/twisted/python/hashlib.pyo
 ${PYSITELIB}/twisted/python/hook.py
 ${PYSITELIB}/twisted/python/hook.pyc
 ${PYSITELIB}/twisted/python/hook.pyo
@@ -1185,9 +1187,6 @@
 ${PYSITELIB}/twisted/python/otp.py
 ${PYSITELIB}/twisted/python/otp.pyc
 ${PYSITELIB}/twisted/python/otp.pyo
-${PYSITELIB}/twisted/python/plugin.py
-${PYSITELIB}/twisted/python/plugin.pyc
-${PYSITELIB}/twisted/python/plugin.pyo
 ${PYSITELIB}/twisted/python/procutils.py
 ${PYSITELIB}/twisted/python/procutils.pyc
 ${PYSITELIB}/twisted/python/procutils.pyo
@@ -1218,6 +1217,9 @@
 ${PYSITELIB}/twisted/python/test/__init__.py
 ${PYSITELIB}/twisted/python/test/__init__.pyc
 ${PYSITELIB}/twisted/python/test/__init__.pyo
+${PYSITELIB}/twisted/python/test/deprecatedattributes.py
+${PYSITELIB}/twisted/python/test/deprecatedattributes.pyc
+${PYSITELIB}/twisted/python/test/deprecatedattributes.pyo
 ${PYSITELIB}/twisted/python/test/test_components.py
 ${PYSITELIB}/twisted/python/test/test_components.pyc
 ${PYSITELIB}/twisted/python/test/test_components.pyo
@@ -1227,15 +1229,33 @@
 ${PYSITELIB}/twisted/python/test/test_dist.py
 ${PYSITELIB}/twisted/python/test/test_dist.pyc
 ${PYSITELIB}/twisted/python/test/test_dist.pyo
+${PYSITELIB}/twisted/python/test/test_fakepwd.py
+${PYSITELIB}/twisted/python/test/test_fakepwd.pyc
+${PYSITELIB}/twisted/python/test/test_fakepwd.pyo
+${PYSITELIB}/twisted/python/test/test_hashlib.py
+${PYSITELIB}/twisted/python/test/test_hashlib.pyc
+${PYSITELIB}/twisted/python/test/test_hashlib.pyo
+${PYSITELIB}/twisted/python/test/test_htmlizer.py
+${PYSITELIB}/twisted/python/test/test_htmlizer.pyc
+${PYSITELIB}/twisted/python/test/test_htmlizer.pyo
 ${PYSITELIB}/twisted/python/test/test_release.py
 ${PYSITELIB}/twisted/python/test/test_release.pyc
 ${PYSITELIB}/twisted/python/test/test_release.pyo
+${PYSITELIB}/twisted/python/test/test_runtime.py
+${PYSITELIB}/twisted/python/test/test_runtime.pyc
+${PYSITELIB}/twisted/python/test/test_runtime.pyo
+${PYSITELIB}/twisted/python/test/test_syslog.py
+${PYSITELIB}/twisted/python/test/test_syslog.pyc
+${PYSITELIB}/twisted/python/test/test_syslog.pyo
 ${PYSITELIB}/twisted/python/test/test_util.py
 ${PYSITELIB}/twisted/python/test/test_util.pyc
 ${PYSITELIB}/twisted/python/test/test_util.pyo
 ${PYSITELIB}/twisted/python/test/test_versions.py
 ${PYSITELIB}/twisted/python/test/test_versions.pyc
 ${PYSITELIB}/twisted/python/test/test_versions.pyo
+${PYSITELIB}/twisted/python/test/test_win32.py
+${PYSITELIB}/twisted/python/test/test_win32.pyc
+${PYSITELIB}/twisted/python/test/test_win32.pyo
 ${PYSITELIB}/twisted/python/test/test_zipstream.py
 ${PYSITELIB}/twisted/python/test/test_zipstream.pyc
 ${PYSITELIB}/twisted/python/test/test_zipstream.pyo
@@ -1315,6 +1335,12 @@
 ${PYSITELIB}/twisted/runner/procutils.py
 ${PYSITELIB}/twisted/runner/procutils.pyc
 ${PYSITELIB}/twisted/runner/procutils.pyo
+${PYSITELIB}/twisted/runner/test/__init__.py
+${PYSITELIB}/twisted/runner/test/__init__.pyc
+${PYSITELIB}/twisted/runner/test/__init__.pyo
+${PYSITELIB}/twisted/runner/test/test_procmon.py
+${PYSITELIB}/twisted/runner/test/test_procmon.pyc
+${PYSITELIB}/twisted/runner/test/test_procmon.pyo
 ${PYSITELIB}/twisted/runner/topfiles/NEWS
 ${PYSITELIB}/twisted/runner/topfiles/README
 ${PYSITELIB}/twisted/scripts/__init__.py
@@ -1389,9 +1415,6 @@
 ${PYSITELIB}/twisted/spread/ui/gtk2util.py
 ${PYSITELIB}/twisted/spread/ui/gtk2util.pyc
 ${PYSITELIB}/twisted/spread/ui/gtk2util.pyo
-${PYSITELIB}/twisted/spread/ui/gtkutil.py
-${PYSITELIB}/twisted/spread/ui/gtkutil.pyc
-${PYSITELIB}/twisted/spread/ui/gtkutil.pyo
 ${PYSITELIB}/twisted/spread/ui/login2.glade
 ${PYSITELIB}/twisted/spread/ui/tktree.py
 ${PYSITELIB}/twisted/spread/ui/tktree.pyc
@@ -1423,9 +1446,6 @@
 ${PYSITELIB}/twisted/test/__init__.py
 ${PYSITELIB}/twisted/test/__init__.pyc
 ${PYSITELIB}/twisted/test/__init__.pyo
-${PYSITELIB}/twisted/test/app_qtstub.py
-${PYSITELIB}/twisted/test/app_qtstub.pyc
-${PYSITELIB}/twisted/test/app_qtstub.pyo
 ${PYSITELIB}/twisted/test/crash_test_dummy.py
 ${PYSITELIB}/twisted/test/crash_test_dummy.pyc
 ${PYSITELIB}/twisted/test/crash_test_dummy.pyo
@@ -1536,9 +1556,6 @@
 ${PYSITELIB}/twisted/test/test_application.py
 ${PYSITELIB}/twisted/test/test_application.pyc
 ${PYSITELIB}/twisted/test/test_application.pyo
-${PYSITELIB}/twisted/test/test_assertions.py
-${PYSITELIB}/twisted/test/test_assertions.pyc
-${PYSITELIB}/twisted/test/test_assertions.pyo
 ${PYSITELIB}/twisted/test/test_banana.py
 ${PYSITELIB}/twisted/test/test_banana.pyc
 ${PYSITELIB}/twisted/test/test_banana.pyo
@@ -1560,6 +1577,9 @@
 ${PYSITELIB}/twisted/test/test_dict.py
 ${PYSITELIB}/twisted/test/test_dict.pyc
 ${PYSITELIB}/twisted/test/test_dict.pyo
+${PYSITELIB}/twisted/test/test_digestauth.py
+${PYSITELIB}/twisted/test/test_digestauth.pyc
+${PYSITELIB}/twisted/test/test_digestauth.pyo
 ${PYSITELIB}/twisted/test/test_dirdbm.py
 ${PYSITELIB}/twisted/test/test_dirdbm.pyc
 ${PYSITELIB}/twisted/test/test_dirdbm.pyo
@@ -1710,9 +1730,6 @@
 ${PYSITELIB}/twisted/test/test_socks.py
 ${PYSITELIB}/twisted/test/test_socks.pyc
 ${PYSITELIB}/twisted/test/test_socks.pyo
-${PYSITELIB}/twisted/test/test_split_compat.py
-${PYSITELIB}/twisted/test/test_split_compat.pyc
-${PYSITELIB}/twisted/test/test_split_compat.pyo
 ${PYSITELIB}/twisted/test/test_ssl.py
 ${PYSITELIB}/twisted/test/test_ssl.pyc
 ${PYSITELIB}/twisted/test/test_ssl.pyo
@@ -1731,6 +1748,9 @@
 ${PYSITELIB}/twisted/test/test_strerror.py
 ${PYSITELIB}/twisted/test/test_strerror.pyc
 ${PYSITELIB}/twisted/test/test_strerror.pyo
+${PYSITELIB}/twisted/test/test_stringtransport.py
+${PYSITELIB}/twisted/test/test_stringtransport.pyc
+${PYSITELIB}/twisted/test/test_stringtransport.pyo
 ${PYSITELIB}/twisted/test/test_strports.py
 ${PYSITELIB}/twisted/test/test_strports.pyc
 ${PYSITELIB}/twisted/test/test_strports.pyo
@@ -1755,6 +1775,9 @@
 ${PYSITELIB}/twisted/test/test_threads.py
 ${PYSITELIB}/twisted/test/test_threads.pyc
 ${PYSITELIB}/twisted/test/test_threads.pyo
+${PYSITELIB}/twisted/test/test_timehelpers.py
+${PYSITELIB}/twisted/test/test_timehelpers.pyc
+${PYSITELIB}/twisted/test/test_timehelpers.pyo
 ${PYSITELIB}/twisted/test/test_timeoutqueue.py
 ${PYSITELIB}/twisted/test/test_timeoutqueue.pyc
 ${PYSITELIB}/twisted/test/test_timeoutqueue.pyo
@@ -1779,12 +1802,10 @@
 ${PYSITELIB}/twisted/test/testutils.py
 ${PYSITELIB}/twisted/test/testutils.pyc
 ${PYSITELIB}/twisted/test/testutils.pyo
-${PYSITELIB}/twisted/test/threading_latency.py
-${PYSITELIB}/twisted/test/threading_latency.pyc
-${PYSITELIB}/twisted/test/threading_latency.pyo
 ${PYSITELIB}/twisted/test/time_helpers.py
 ${PYSITELIB}/twisted/test/time_helpers.pyc
 ${PYSITELIB}/twisted/test/time_helpers.pyo
+${PYSITELIB}/twisted/topfiles/4335.misc
 ${PYSITELIB}/twisted/topfiles/CREDITS
 ${PYSITELIB}/twisted/topfiles/ChangeLog.Old
 ${PYSITELIB}/twisted/topfiles/NEWS
@@ -1847,9 +1868,6 @@
 ${PYSITELIB}/twisted/trial/test/test_assertions.py
 ${PYSITELIB}/twisted/trial/test/test_assertions.pyc
 ${PYSITELIB}/twisted/trial/test/test_assertions.pyo
-${PYSITELIB}/twisted/trial/test/test_class.py
-${PYSITELIB}/twisted/trial/test/test_class.pyc
-${PYSITELIB}/twisted/trial/test/test_class.pyo
 ${PYSITELIB}/twisted/trial/test/test_deferred.py
 ${PYSITELIB}/twisted/trial/test/test_deferred.pyc
 ${PYSITELIB}/twisted/trial/test/test_deferred.pyo
@@ -1868,6 +1886,9 @@
 ${PYSITELIB}/twisted/trial/test/test_output.py
 ${PYSITELIB}/twisted/trial/test/test_output.pyc
 ${PYSITELIB}/twisted/trial/test/test_output.pyo
+${PYSITELIB}/twisted/trial/test/test_plugins.py
+${PYSITELIB}/twisted/trial/test/test_plugins.pyc
+${PYSITELIB}/twisted/trial/test/test_plugins.pyo
 ${PYSITELIB}/twisted/trial/test/test_pyunitcompat.py
 ${PYSITELIB}/twisted/trial/test/test_pyunitcompat.pyc
 ${PYSITELIB}/twisted/trial/test/test_pyunitcompat.pyo
@@ -1883,12 +1904,18 @@
 ${PYSITELIB}/twisted/trial/test/test_test_visitor.py
 ${PYSITELIB}/twisted/trial/test/test_test_visitor.pyc
 ${PYSITELIB}/twisted/trial/test/test_test_visitor.pyo
+${PYSITELIB}/twisted/trial/test/test_testcase.py
+${PYSITELIB}/twisted/trial/test/test_testcase.pyc
+${PYSITELIB}/twisted/trial/test/test_testcase.pyo
 ${PYSITELIB}/twisted/trial/test/test_tests.py
 ${PYSITELIB}/twisted/trial/test/test_tests.pyc
 ${PYSITELIB}/twisted/trial/test/test_tests.pyo
 ${PYSITELIB}/twisted/trial/test/test_util.py
 ${PYSITELIB}/twisted/trial/test/test_util.pyc
 ${PYSITELIB}/twisted/trial/test/test_util.pyo
+${PYSITELIB}/twisted/trial/test/test_warning.py
+${PYSITELIB}/twisted/trial/test/test_warning.pyc
+${PYSITELIB}/twisted/trial/test/test_warning.pyo
 ${PYSITELIB}/twisted/trial/test/weird.py
 ${PYSITELIB}/twisted/trial/test/weird.pyc
 ${PYSITELIB}/twisted/trial/test/weird.pyo
@@ -1901,6 +1928,21 @@
 ${PYSITELIB}/twisted/web/__init__.py
 ${PYSITELIB}/twisted/web/__init__.pyc
 ${PYSITELIB}/twisted/web/__init__.pyo
+${PYSITELIB}/twisted/web/_auth/__init__.py
+${PYSITELIB}/twisted/web/_auth/__init__.pyc
+${PYSITELIB}/twisted/web/_auth/__init__.pyo
+${PYSITELIB}/twisted/web/_auth/basic.py
+${PYSITELIB}/twisted/web/_auth/basic.pyc
+${PYSITELIB}/twisted/web/_auth/basic.pyo
+${PYSITELIB}/twisted/web/_auth/digest.py
+${PYSITELIB}/twisted/web/_auth/digest.pyc
+${PYSITELIB}/twisted/web/_auth/digest.pyo
+${PYSITELIB}/twisted/web/_auth/wrapper.py
+${PYSITELIB}/twisted/web/_auth/wrapper.pyc
+${PYSITELIB}/twisted/web/_auth/wrapper.pyo
+${PYSITELIB}/twisted/web/_newclient.py
+${PYSITELIB}/twisted/web/_newclient.pyc
+${PYSITELIB}/twisted/web/_newclient.pyo
 ${PYSITELIB}/twisted/web/_version.py
 ${PYSITELIB}/twisted/web/_version.pyc
 ${PYSITELIB}/twisted/web/_version.pyo
@@ -1931,12 +1973,15 @@
 ${PYSITELIB}/twisted/web/http.py
 ${PYSITELIB}/twisted/web/http.pyc
 ${PYSITELIB}/twisted/web/http.pyo
+${PYSITELIB}/twisted/web/http_headers.py
+${PYSITELIB}/twisted/web/http_headers.pyc
+${PYSITELIB}/twisted/web/http_headers.pyo
+${PYSITELIB}/twisted/web/iweb.py
+${PYSITELIB}/twisted/web/iweb.pyc
+${PYSITELIB}/twisted/web/iweb.pyo
 ${PYSITELIB}/twisted/web/microdom.py
 ${PYSITELIB}/twisted/web/microdom.pyc
 ${PYSITELIB}/twisted/web/microdom.pyo
-${PYSITELIB}/twisted/web/monitor.py
-${PYSITELIB}/twisted/web/monitor.pyc
-${PYSITELIB}/twisted/web/monitor.pyo
 ${PYSITELIB}/twisted/web/proxy.py
 ${PYSITELIB}/twisted/web/proxy.pyc
 ${PYSITELIB}/twisted/web/proxy.pyo
@@ -1967,6 +2012,9 @@
 ${PYSITELIB}/twisted/web/test/__init__.py
 ${PYSITELIB}/twisted/web/test/__init__.pyc
 ${PYSITELIB}/twisted/web/test/__init__.pyo
+${PYSITELIB}/twisted/web/test/_util.py
+${PYSITELIB}/twisted/web/test/_util.pyc
+${PYSITELIB}/twisted/web/test/_util.pyo
 ${PYSITELIB}/twisted/web/test/test_cgi.py
 ${PYSITELIB}/twisted/web/test/test_cgi.pyc
 ${PYSITELIB}/twisted/web/test/test_cgi.pyo
@@ -1976,15 +2024,30 @@
 ${PYSITELIB}/twisted/web/test/test_domhelpers.py
 ${PYSITELIB}/twisted/web/test/test_domhelpers.pyc
 ${PYSITELIB}/twisted/web/test/test_domhelpers.pyo
+${PYSITELIB}/twisted/web/test/test_error.py
+${PYSITELIB}/twisted/web/test/test_error.pyc
+${PYSITELIB}/twisted/web/test/test_error.pyo
 ${PYSITELIB}/twisted/web/test/test_http.py
 ${PYSITELIB}/twisted/web/test/test_http.pyc
 ${PYSITELIB}/twisted/web/test/test_http.pyo
-${PYSITELIB}/twisted/web/test/test_mvc.py
-${PYSITELIB}/twisted/web/test/test_mvc.pyc
-${PYSITELIB}/twisted/web/test/test_mvc.pyo
+${PYSITELIB}/twisted/web/test/test_http_headers.py
+${PYSITELIB}/twisted/web/test/test_http_headers.pyc
+${PYSITELIB}/twisted/web/test/test_http_headers.pyo
+${PYSITELIB}/twisted/web/test/test_httpauth.py
+${PYSITELIB}/twisted/web/test/test_httpauth.pyc
+${PYSITELIB}/twisted/web/test/test_httpauth.pyo
+${PYSITELIB}/twisted/web/test/test_newclient.py
+${PYSITELIB}/twisted/web/test/test_newclient.pyc
+${PYSITELIB}/twisted/web/test/test_newclient.pyo
 ${PYSITELIB}/twisted/web/test/test_proxy.py
 ${PYSITELIB}/twisted/web/test/test_proxy.pyc
 ${PYSITELIB}/twisted/web/test/test_proxy.pyo
+${PYSITELIB}/twisted/web/test/test_resource.py
+${PYSITELIB}/twisted/web/test/test_resource.pyc
+${PYSITELIB}/twisted/web/test/test_resource.pyo
+${PYSITELIB}/twisted/web/test/test_script.py
+${PYSITELIB}/twisted/web/test/test_script.pyc
+${PYSITELIB}/twisted/web/test/test_script.pyo
 ${PYSITELIB}/twisted/web/test/test_soap.py
 ${PYSITELIB}/twisted/web/test/test_soap.pyc
 ${PYSITELIB}/twisted/web/test/test_soap.pyo
@@ -1994,15 +2057,18 @@
 ${PYSITELIB}/twisted/web/test/test_tap.py
 ${PYSITELIB}/twisted/web/test/test_tap.pyc
 ${PYSITELIB}/twisted/web/test/test_tap.pyo
+${PYSITELIB}/twisted/web/test/test_vhost.py
+${PYSITELIB}/twisted/web/test/test_vhost.pyc
+${PYSITELIB}/twisted/web/test/test_vhost.pyo
 ${PYSITELIB}/twisted/web/test/test_web.py
 ${PYSITELIB}/twisted/web/test/test_web.pyc
 ${PYSITELIB}/twisted/web/test/test_web.pyo
 ${PYSITELIB}/twisted/web/test/test_webclient.py
 ${PYSITELIB}/twisted/web/test/test_webclient.pyc
 ${PYSITELIB}/twisted/web/test/test_webclient.pyo
-${PYSITELIB}/twisted/web/test/test_woven.py
-${PYSITELIB}/twisted/web/test/test_woven.pyc
-${PYSITELIB}/twisted/web/test/test_woven.pyo
+${PYSITELIB}/twisted/web/test/test_wsgi.py
+${PYSITELIB}/twisted/web/test/test_wsgi.pyc
+${PYSITELIB}/twisted/web/test/test_wsgi.pyo
 ${PYSITELIB}/twisted/web/test/test_xml.py
 ${PYSITELIB}/twisted/web/test/test_xml.pyc
 ${PYSITELIB}/twisted/web/test/test_xml.pyo
@@ -2023,63 +2089,9 @@
 ${PYSITELIB}/twisted/web/vhost.py
 ${PYSITELIB}/twisted/web/vhost.pyc
 ${PYSITELIB}/twisted/web/vhost.pyo
-${PYSITELIB}/twisted/web/widgets.py
-${PYSITELIB}/twisted/web/widgets.pyc
-${PYSITELIB}/twisted/web/widgets.pyo
-${PYSITELIB}/twisted/web/woven/FlashConduit.fla
-${PYSITELIB}/twisted/web/woven/FlashConduit.swf
-${PYSITELIB}/twisted/web/woven/FlashConduitGlue.html
-${PYSITELIB}/twisted/web/woven/WebConduit2_mozilla.js
-${PYSITELIB}/twisted/web/woven/WebConduit2_msie.js
-${PYSITELIB}/twisted/web/woven/WebConduitGlue.html
-${PYSITELIB}/twisted/web/woven/__init__.py
-${PYSITELIB}/twisted/web/woven/__init__.pyc
-${PYSITELIB}/twisted/web/woven/__init__.pyo
-${PYSITELIB}/twisted/web/woven/controller.py
-${PYSITELIB}/twisted/web/woven/controller.pyc
-${PYSITELIB}/twisted/web/woven/controller.pyo
-${PYSITELIB}/twisted/web/woven/dirlist.py
-${PYSITELIB}/twisted/web/woven/dirlist.pyc
-${PYSITELIB}/twisted/web/woven/dirlist.pyo
-${PYSITELIB}/twisted/web/woven/flashconduit.py
-${PYSITELIB}/twisted/web/woven/flashconduit.pyc
-${PYSITELIB}/twisted/web/woven/flashconduit.pyo
-${PYSITELIB}/twisted/web/woven/form.py
-${PYSITELIB}/twisted/web/woven/form.pyc
-${PYSITELIB}/twisted/web/woven/form.pyo
-${PYSITELIB}/twisted/web/woven/guard.py
-${PYSITELIB}/twisted/web/woven/guard.pyc
-${PYSITELIB}/twisted/web/woven/guard.pyo
-${PYSITELIB}/twisted/web/woven/input.py
-${PYSITELIB}/twisted/web/woven/input.pyc
-${PYSITELIB}/twisted/web/woven/input.pyo
-${PYSITELIB}/twisted/web/woven/interfaces.py
-${PYSITELIB}/twisted/web/woven/interfaces.pyc
-${PYSITELIB}/twisted/web/woven/interfaces.pyo
-${PYSITELIB}/twisted/web/woven/model.py
-${PYSITELIB}/twisted/web/woven/model.pyc
-${PYSITELIB}/twisted/web/woven/model.pyo
-${PYSITELIB}/twisted/web/woven/page.py
-${PYSITELIB}/twisted/web/woven/page.pyc
-${PYSITELIB}/twisted/web/woven/page.pyo
-${PYSITELIB}/twisted/web/woven/simpleguard.py
-${PYSITELIB}/twisted/web/woven/simpleguard.pyc
-${PYSITELIB}/twisted/web/woven/simpleguard.pyo
-${PYSITELIB}/twisted/web/woven/tapestry.py
-${PYSITELIB}/twisted/web/woven/tapestry.pyc
-${PYSITELIB}/twisted/web/woven/tapestry.pyo
-${PYSITELIB}/twisted/web/woven/template.py
-${PYSITELIB}/twisted/web/woven/template.pyc
-${PYSITELIB}/twisted/web/woven/template.pyo
-${PYSITELIB}/twisted/web/woven/utils.py
-${PYSITELIB}/twisted/web/woven/utils.pyc
-${PYSITELIB}/twisted/web/woven/utils.pyo
-${PYSITELIB}/twisted/web/woven/view.py
-${PYSITELIB}/twisted/web/woven/view.pyc
-${PYSITELIB}/twisted/web/woven/view.pyo
-${PYSITELIB}/twisted/web/woven/widgets.py
-${PYSITELIB}/twisted/web/woven/widgets.pyc
-${PYSITELIB}/twisted/web/woven/widgets.pyo
+${PYSITELIB}/twisted/web/wsgi.py
+${PYSITELIB}/twisted/web/wsgi.pyc
+${PYSITELIB}/twisted/web/wsgi.pyo
 ${PYSITELIB}/twisted/web/xmlrpc.py
 ${PYSITELIB}/twisted/web/xmlrpc.pyc
 ${PYSITELIB}/twisted/web/xmlrpc.pyo
@@ -2104,15 +2116,6 @@
 ${PYSITELIB}/twisted/words/im/basesupport.py
 ${PYSITELIB}/twisted/words/im/basesupport.pyc
 ${PYSITELIB}/twisted/words/im/basesupport.pyo
-${PYSITELIB}/twisted/words/im/gtkaccount.py
-${PYSITELIB}/twisted/words/im/gtkaccount.pyc
-${PYSITELIB}/twisted/words/im/gtkaccount.pyo
-${PYSITELIB}/twisted/words/im/gtkchat.py
-${PYSITELIB}/twisted/words/im/gtkchat.pyc
-${PYSITELIB}/twisted/words/im/gtkchat.pyo
-${PYSITELIB}/twisted/words/im/gtkcommon.py
-${PYSITELIB}/twisted/words/im/gtkcommon.pyc
-${PYSITELIB}/twisted/words/im/gtkcommon.pyo
 ${PYSITELIB}/twisted/words/im/instancemessenger.glade
 ${PYSITELIB}/twisted/words/im/interfaces.py
 ${PYSITELIB}/twisted/words/im/interfaces.pyc
@@ -2120,12 +2123,6 @@
 ${PYSITELIB}/twisted/words/im/ircsupport.py
 ${PYSITELIB}/twisted/words/im/ircsupport.pyc
 ${PYSITELIB}/twisted/words/im/ircsupport.pyo
-${PYSITELIB}/twisted/words/im/jyaccount.py
-${PYSITELIB}/twisted/words/im/jyaccount.pyc
-${PYSITELIB}/twisted/words/im/jyaccount.pyo
-${PYSITELIB}/twisted/words/im/jychat.py
-${PYSITELIB}/twisted/words/im/jychat.pyc
-${PYSITELIB}/twisted/words/im/jychat.pyo
 ${PYSITELIB}/twisted/words/im/locals.py
 ${PYSITELIB}/twisted/words/im/locals.pyc
 ${PYSITELIB}/twisted/words/im/locals.pyo
@@ -2192,12 +2189,6 @@
 ${PYSITELIB}/twisted/words/protocols/toc.py
 ${PYSITELIB}/twisted/words/protocols/toc.pyc
 ${PYSITELIB}/twisted/words/protocols/toc.pyo
-${PYSITELIB}/twisted/words/scripts/__init__.py
-${PYSITELIB}/twisted/words/scripts/__init__.pyc
-${PYSITELIB}/twisted/words/scripts/__init__.pyo
-${PYSITELIB}/twisted/words/scripts/im.py
-${PYSITELIB}/twisted/words/scripts/im.pyc
-${PYSITELIB}/twisted/words/scripts/im.pyo
 ${PYSITELIB}/twisted/words/service.py
 ${PYSITELIB}/twisted/words/service.pyc
 ${PYSITELIB}/twisted/words/service.pyo
@@ -2216,6 +2207,9 @@
 ${PYSITELIB}/twisted/words/test/test_irc.py
 ${PYSITELIB}/twisted/words/test/test_irc.pyc
 ${PYSITELIB}/twisted/words/test/test_irc.pyo
+${PYSITELIB}/twisted/words/test/test_irc_service.py
+${PYSITELIB}/twisted/words/test/test_irc_service.pyc
+${PYSITELIB}/twisted/words/test/test_irc_service.pyo
 ${PYSITELIB}/twisted/words/test/test_jabberclient.py
 ${PYSITELIB}/twisted/words/test/test_jabberclient.pyc
 ${PYSITELIB}/twisted/words/test/test_jabberclient.pyo
@@ -2243,6 +2237,9 @@
 ${PYSITELIB}/twisted/words/test/test_msn.py
 ${PYSITELIB}/twisted/words/test/test_msn.pyc
 ${PYSITELIB}/twisted/words/test/test_msn.pyo
+${PYSITELIB}/twisted/words/test/test_oscar.py
+${PYSITELIB}/twisted/words/test/test_oscar.pyc
+${PYSITELIB}/twisted/words/test/test_oscar.pyo
 ${PYSITELIB}/twisted/words/test/test_service.py
 ${PYSITELIB}/twisted/words/test/test_service.pyc
 ${PYSITELIB}/twisted/words/test/test_service.pyo
@@ -2258,6 +2255,9 @@
 ${PYSITELIB}/twisted/words/test/test_xmlstream.py
 ${PYSITELIB}/twisted/words/test/test_xmlstream.pyc
 ${PYSITELIB}/twisted/words/test/test_xmlstream.pyo
+${PYSITELIB}/twisted/words/test/test_xmpproutertap.py
+${PYSITELIB}/twisted/words/test/test_xmpproutertap.pyc
+${PYSITELIB}/twisted/words/test/test_xmpproutertap.pyo
 ${PYSITELIB}/twisted/words/test/test_xpath.py
 ${PYSITELIB}/twisted/words/test/test_xpath.pyc
 ${PYSITELIB}/twisted/words/test/test_xpath.pyo
@@ -2285,3 +2285,6 @@
 ${PYSITELIB}/twisted/words/xish/xpathparser.py
 ${PYSITELIB}/twisted/words/xish/xpathparser.pyc
 ${PYSITELIB}/twisted/words/xish/xpathparser.pyo
+${PYSITELIB}/twisted/words/xmpproutertap.py
+${PYSITELIB}/twisted/words/xmpproutertap.pyc
+${PYSITELIB}/twisted/words/xmpproutertap.pyo
diff -urN py-twisted.orig/distinfo py-twisted/distinfo
--- py-twisted.orig/distinfo    2010-03-05 03:22:24.000000000 +0800
+++ py-twisted/distinfo 2010-03-05 03:41:45.000000000 +0800
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.5 2008/08/22 21:49:08 epg Exp $

-SHA1 (Twisted-8.1.0.tar.bz2) = b10e523ab96032f5055ee02687b22bcd7cb02951
-RMD160 (Twisted-8.1.0.tar.bz2) = 1348f5e384a7d9d8591bd67e6b1f0d54aa18700e
-Size (Twisted-8.1.0.tar.bz2) = 2371422 bytes
+SHA1 (Twisted-10.0.0.tar.bz2) = 8d48d78323ce7a1ccc8b02c55b693389d50b3bc3
+RMD160 (Twisted-10.0.0.tar.bz2) = 4c006305e5cbd1e46ac7f9e2581e69714e94af18
+Size (Twisted-10.0.0.tar.bz2) = 2583372 bytes
 SHA1 (patch-ab) = 26495e5abd57025e915b923cc7089704bbd85629
 SHA1 (patch-ac) = 3881dec501db0913a600bde78e6d96a106c33156

>Release-Note:

>Audit-Trail:
From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 05 Mar 2010 14:12:46 +0900

 Why drop dependency on py-SSL?

From: wen heping <wenheping@gmail.com>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 5 Mar 2010 13:16:20 +0800

 On Fri, Mar 5, 2010 at 1:15 PM, OBATA Akio <obache@netbsd.org> wrote:
 > The following reply was made to PR pkg/42918; it has been noted by GNATS.
 >
 > From: "OBATA Akio" <obache@netbsd.org>
 > To: gnats-bugs@netbsd.org
 > Cc:
 > Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
 > Date: Fri, 05 Mar 2010 14:12:46 +0900
 >
 > =A0Why drop dependency on py-SSL?

 In source code's setup.py , there is no depend on py-SSL.

 wen


 >
 >

From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 05 Mar 2010 14:46:39 +0900

 On Fri, 05 Mar 2010 14:25:01 +0900, wen heping <wenheping@gmail.com> wrote:

 >  > Why drop dependency on py-SSL?
 > In source code's setup.py , there is no depend on py-SSL.

 (s/py-SSL/py-OpenSSL/)

 Also no pyOpenSSL in setup.py of 8.1, but using in source code.
 maybe optional dependency but usually required.

 How about py-ZopeInterface? why bump dependency pattern to >=3.5.3?

From: wen heping <wenheping@gmail.com>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 5 Mar 2010 14:20:22 +0800

 On Fri, Mar 5, 2010 at 1:50 PM, OBATA Akio <obache@netbsd.org> wrote:
 > The following reply was made to PR pkg/42918; it has been noted by GNATS.
 >
 > From: "OBATA Akio" <obache@netbsd.org>
 > To: gnats-bugs@netbsd.org
 > Cc:
 > Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
 > Date: Fri, 05 Mar 2010 14:46:39 +0900
 >
 > =A0On Fri, 05 Mar 2010 14:25:01 +0900, wen heping <wenheping@gmail.com> w=
 rote:
 >
 > =A0> =A0> Why drop dependency on py-SSL?
 > =A0> In source code's setup.py , there is no depend on py-SSL.
 >
 > =A0(s/py-SSL/py-OpenSSL/)
 >
 > =A0Also no pyOpenSSL in setup.py of 8.1, but using in source code.
 > =A0maybe optional dependency but usually required.

 I found in FreeBSD and Debian, both has no py-openssl dependence,
 and not mentioned in setup.py, so I remove it.

 >
 > =A0How about py-ZopeInterface? why bump dependency pattern to >=3D3.5.3?
 >

 Because in NetBSD pkgsrc , now the version is 3.5.3, in FreeBSD we
 also change it
 to the current version. Maybe NetBSD dislike it.


 wen


 >

From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 05 Mar 2010 20:22:32 +0900

 On Fri, 05 Mar 2010 15:25:02 +0900, wen heping <wenheping@gmail.com> wrote:

 >  I found in FreeBSD and Debian, both has no py-openssl dependence,
 >  and not mentioned in setup.py, so I remove it.

 But in pkgsrc, currently depending on.
 It may have a meaning.
 (I don't know why hard dependency currently though).

 >  > How about py-ZopeInterface? why bump dependency pattern to >=3.5.3?
 >  >
 > Because in NetBSD pkgsrc , now the version is 3.5.3, in FreeBSD we
 >  also change it
 >  to the current version. Maybe NetBSD dislike it.

 It is not like/dislike matter, its meaning.
 Changing to >=3.5.3 means that py-twisted-10.0.0 does not work with 3.0.1 anymore.
 I can only find >=3.0.1 in INSTALL document, but not where >=3.5.3 came from.
 Why do you think py-twisted-10.0.0 require newest py-ZopeInterface package?

From: wen heping <wenheping@gmail.com>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 5 Mar 2010 20:10:47 +0800

 On Fri, Mar 5, 2010 at 7:25 PM, OBATA Akio <obache@netbsd.org> wrote:
 > The following reply was made to PR pkg/42918; it has been noted by GNATS.
 >
 > From: "OBATA Akio" <obache@netbsd.org>
 > To: gnats-bugs@netbsd.org
 > Cc:
 > Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
 > Date: Fri, 05 Mar 2010 20:22:32 +0900
 >
 > =A0On Fri, 05 Mar 2010 15:25:02 +0900, wen heping <wenheping@gmail.com> w=
 rote:
 >
 > =A0> =A0I found in FreeBSD and Debian, both has no py-openssl dependence,
 > =A0> =A0and not mentioned in setup.py, so I remove it.
 >
 > =A0But in pkgsrc, currently depending on.
 > =A0It may have a meaning.
 > =A0(I don't know why hard dependency currently though).

 For safety, please feel free re-add the py-OpenSSL depndence.


 >
 > =A0> =A0> How about py-ZopeInterface? why bump dependency pattern to >=3D=
 3.5.3?
 > =A0> =A0>
 > =A0> Because in NetBSD pkgsrc , now the version is 3.5.3, in FreeBSD we
 > =A0> =A0also change it
 > =A0> =A0to the current version. Maybe NetBSD dislike it.
 >
 > =A0It is not like/dislike matter, its meaning.
 > =A0Changing to >=3D3.5.3 means that py-twisted-10.0.0 does not work with =
 3.0.1 anymore.
 > =A0I can only find >=3D3.0.1 in INSTALL document, but not where >=3D3.5.3=
  came from.
 > =A0Why do you think py-twisted-10.0.0 require newest py-ZopeInterface pac=
 kage?

 As a user, I would use the default version of all packages in the pkgsrc.

 Suppose a user had installed py-ZopeInterface-3.0.1, now he could install
 py-twisted-10.0.0 without reinstall py-ZopeInterface. But If I change 3.0.1=
  -->
 3.5.3, then the install of py-twisted shall force the reinstallation
 of py-Zopeinterface.

 If this is not the way NetBSD prefer, please feel free revert it.


 Regards,
 wen

From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 05 Mar 2010 21:35:07 +0900

 On Fri, 05 Mar 2010 21:15:03 +0900, wen heping <wenheping@gmail.com> wrote:

 >  For safety, please feel free re-add the py-OpenSSL depndence.

 Yes, no need to confuse current users.

 >  As a user, I would use the default version of all packages in the pkgsrc.
 > Suppose a user had installed py-ZopeInterface-3.0.1, now he could install
 >  py-twisted-10.0.0 without reinstall py-ZopeInterface. But If I change 3.0.1=
 >   -->
 >  3.5.3, then the install of py-twisted shall force the reinstallation
 >  of py-Zopeinterface.
 > If this is not the way NetBSD prefer, please feel free revert it.

 I feel that it is not the way FreeBSD too...I can't find such change in
 FreeBSD ports tree (force to install ZopeInterface-3.5.3).

 -- 
 "Of course I love NetBSD":-)
 OBATA Akio / obache@NetBSD.org

From: wen heping <wenheping@gmail.com>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 5 Mar 2010 20:56:06 +0800

 On Fri, Mar 5, 2010 at 8:40 PM, OBATA Akio <obache@netbsd.org> wrote:
 > The following reply was made to PR pkg/42918; it has been noted by GNATS.
 >
 > From: "OBATA Akio" <obache@netbsd.org>
 > To: gnats-bugs@netbsd.org
 > Cc:
 > Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
 > Date: Fri, 05 Mar 2010 21:35:07 +0900
 >
 > =A0On Fri, 05 Mar 2010 21:15:03 +0900, wen heping <wenheping@gmail.com> w=
 rote:
 >
 > =A0> =A0For safety, please feel free re-add the py-OpenSSL depndence.
 >
 > =A0Yes, no need to confuse current users.
 >
 > =A0> =A0As a user, I would use the default version of all packages in the=
  pkgsrc.
 > =A0> Suppose a user had installed py-ZopeInterface-3.0.1, now he could in=
 stall
 > =A0> =A0py-twisted-10.0.0 without reinstall py-ZopeInterface. But If I ch=
 ange 3.0.1=3D
 > =A0> =A0 -->
 > =A0> =A03.5.3, then the install of py-twisted shall force the reinstallat=
 ion
 > =A0> =A0of py-Zopeinterface.
 > =A0> If this is not the way NetBSD prefer, please feel free revert it.
 >
 > =A0I feel that it is not the way FreeBSD too...I can't find such change i=
 n
 > =A0FreeBSD ports tree (force to install ZopeInterface-3.5.3).

 No, I am not mean this is the FreeBSD way.
 It is only my way :)

 wen


 >
 > =A0--
 > =A0"Of course I love NetBSD":-)
 > =A0OBATA Akio / obache@NetBSD.org
 >
 >

From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918: [net/py-twisted] Update to 10.0.0
Date: Fri, 05 Mar 2010 22:38:43 +0900

 On Fri, 05 Mar 2010 22:00:06 +0900, wen heping <wenheping@gmail.com> wrote:

 >  > I feel that it is not the way FreeBSD too...I can't find such change in
 >  > FreeBSD ports tree (force to install ZopeInterface-3.5.3).
 > No, I am not mean this is the FreeBSD way.
 >  It is only my way :)

 IMO, stay AS-IS, let users the rest is the PKGSRC way :)

Responsible-Changed-From-To: pkg-manager->obache
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Sat, 06 Mar 2010 11:36:57 +0000
Responsible-Changed-Why:
I'll take this.


From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918 ([net/py-twisted] Update to 10.0.0)
Date: Sat, 06 Mar 2010 20:55:35 +0900

 If do "make test" before installation,  ${PYSITELIB}/twisted/plugins/dropin.cache also installed.
 What is this?

From: wen heping <wenheping@gmail.com>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/42918 ([net/py-twisted] Update to 10.0.0)
Date: Sat, 6 Mar 2010 20:11:22 +0800

 On Sat, Mar 6, 2010 at 8:00 PM, OBATA Akio <obache@netbsd.org> wrote:
 > The following reply was made to PR pkg/42918; it has been noted by GNATS.
 >
 > From: "OBATA Akio" <obache@netbsd.org>
 > To: gnats-bugs@netbsd.org
 > Cc:
 > Subject: Re: pkg/42918 ([net/py-twisted] Update to 10.0.0)
 > Date: Sat, 06 Mar 2010 20:55:35 +0900
 >
 > =A0If do "make test" before installation, =A0${PYSITELIB}/twisted/plugins=
 /dropin.cache also installed.
 > =A0What is this?

 Sorry, I am not sure it.

 wen



 >
 >

From: OBATA Akio <obache@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/42918 CVS commit: pkgsrc/net/py-twisted
Date: Sat, 6 Mar 2010 13:18:07 +0000

 Module Name:	pkgsrc
 Committed By:	obache
 Date:		Sat Mar  6 13:18:07 UTC 2010

 Modified Files:
 	pkgsrc/net/py-twisted: Makefile Makefile.common PLIST distinfo

 Log Message:
 Update py-twisted to 10.0.0.
 Based on PR#42918 by Wen Heping

 Pkgsrc changes:
  * set LICENSE to mit
  * add handling of plugin cache file

 Upstream changes:
  from 8.1.0 to 10.0.0 is too long to put here.
  please refer: http://twistedmatrix.com/trac/browser/trunk/NEWS


 To generate a diff of this commit:
 cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/py-twisted/Makefile
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/py-twisted/Makefile.common \
     pkgsrc/net/py-twisted/PLIST
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-twisted/distinfo

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

State-Changed-From-To: open->closed
State-Changed-By: obache@NetBSD.org
State-Changed-When: Sat, 06 Mar 2010 13:21:46 +0000
State-Changed-Why:
Updated with addition of plugin cache handling.
Thanks!


>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.