[pkgsrc/trunk]: pkgsrc/net Update from to 8.1.0; changes too numerous to list.

[epg <epg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/075fad9c3dbc
branches:  trunk
changeset: 546152:075fad9c3dbc
user:      epg <epg%pkgsrc.org@localhost>
date:      Fri Aug 22 21:49:08 2008 +0000

description:
Update from to 8.1.0; changes too numerous to list.

pkgsrc changes:
- Move more definitions to Makefile.common, drop some that had default values.

- Depend on py-OpenSSL and py-ZopeInterface.

- Add do-test target.

- Remove patch-aa and install all bin/ script with plain names, not with
  ${PYVERSSUFFIX} appended.  setup.py is now much, much simpler, and rewriting
  the patch would be difficult.  It doesn't matter anyway, as I tried really
  hard to install py-OpenSSL for both python24 and python25 and it just
  doesn't work.

diffstat:

 net/py-twisted-docs/Makefile    |    17 +-
 net/py-twisted-docs/PLIST.pre   |     1 -
 net/py-twisted/Makefile         |    22 +-
 net/py-twisted/Makefile.common  |    19 +-
 net/py-twisted/PLIST            |  3569 +++++++++++++++++++++++---------------
 net/py-twisted/distinfo         |     9 +-
 net/py-twisted/patches/patch-aa |    24 -
 7 files changed, 2160 insertions(+), 1501 deletions(-)

diffs (truncated from 3944 to 300 lines):

diff -r b67b3c111e12 -r 075fad9c3dbc net/py-twisted-docs/Makefile
--- a/net/py-twisted-docs/Makefile      Fri Aug 22 21:31:37 2008 +0000
+++ b/net/py-twisted-docs/Makefile      Fri Aug 22 21:49:08 2008 +0000
@@ -1,34 +1,23 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:42 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.9 2008/08/22 21:49:08 epg Exp $
 
-DISTNAME=              ${TWISTED_DISTNAME}
 PKGNAME=               py-twisted-docs-${TWISTED_VERSION}
-CATEGORIES=            net python
-MASTER_SITES=          ${TWISTED_MASTER_SITES}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.twistedmatrix.com/
 COMMENT=               Framework for writing networked applications
-
-PKG_DESTDIR_SUPPORT=   user-destdir
+.include "../../net/py-twisted/Makefile.common"
 
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
-USE_LANGUAGES= # empty
 USE_TOOLS+=    pax
 
-HTMLDIR=       share/doc/py-twisted-docs-${TWISTED_VERSION}
+HTMLDIR=       share/doc/py-twisted-docs
 DOC_SRCDIR=    ${WRKSRC}/doc
 PLIST_SRC=     ${WRKDIR}/.PLIST_SRC
 
 INSTALLATION_DIRS=     ${HTMLDIR}
 
 do-install:
-       ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
        cd ${DOC_SRCDIR} && pax -rw -pe * ${DESTDIR}${PREFIX}/${HTMLDIR}
        cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
        cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
        ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
-.include "../../net/py-twisted/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r b67b3c111e12 -r 075fad9c3dbc net/py-twisted-docs/PLIST.pre
--- a/net/py-twisted-docs/PLIST.pre     Fri Aug 22 21:31:37 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1.1.1 2004/03/30 13:33:44 recht Exp $
diff -r b67b3c111e12 -r 075fad9c3dbc net/py-twisted/Makefile
--- a/net/py-twisted/Makefile   Fri Aug 22 21:31:37 2008 +0000
+++ b/net/py-twisted/Makefile   Fri Aug 22 21:49:08 2008 +0000
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/08/22 21:49:08 epg Exp $
 #
 
-DISTNAME=              ${TWISTED_DISTNAME}
-PKGNAME=               ${PYPKGPREFIX}-${TWISTED_PKGNAME}
-PKGREVISION=           1
-CATEGORIES=            net python
-MASTER_SITES=          ${TWISTED_MASTER_SITES}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.twistedmatrix.com/
+PKGNAME=               ${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
 COMMENT=               Framework for writing networked applications
+.include "../../net/py-twisted/Makefile.common"
 
-PKG_DESTDIR_SUPPORT=   user-destdir
+DEPENDS+=              ${PYPKGPREFIX}-OpenSSL>=0.7:../../security/py-OpenSSL
+DEPENDS+=              ${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
 
-PY_PATCHPLIST=         yes
 PYDISTUTILSPKG=                yes
-PLIST_SUBST+=          PYVERSSUFFIX="-${PYVERSSUFFIX}"
-MAKE_ENV+=             PKGSRC="1" PYVERSSUFFIX="-${PYVERSSUFFIX}"
 
-PYTHON_VERSIONS_ACCEPTED=      25 24 23
+do-test:
+       cd ${WRKSRC} && ./build/scripts-${PYVERSSUFFIX}/trial twisted
 
-.include "../../net/py-twisted/Makefile.common"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b67b3c111e12 -r 075fad9c3dbc net/py-twisted/Makefile.common
--- a/net/py-twisted/Makefile.common    Fri Aug 22 21:31:37 2008 +0000
+++ b/net/py-twisted/Makefile.common    Fri Aug 22 21:49:08 2008 +0000
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile.common,v 1.4 2008/01/29 22:39:52 heinz Exp $
-#
+# $NetBSD: Makefile.common,v 1.5 2008/08/22 21:49:08 epg Exp $
+# used by net/py-twisted/Makefile
+# used by net/py-twisted-docs/Makefile
 
-TWISTED_VERSION=       1.3.0
-TWISTED_DISTNAME=      Twisted-${TWISTED_VERSION}
-TWISTED_PKGNAME=       ${TWISTED_DISTNAME:S/T/t/}
-TWISTED_MASTER_SITES=  http://tmrc.mit.edu/mirror/twisted/
+TWISTED_VERSION=       8.1.0
+DISTNAME=              Twisted-${TWISTED_VERSION}
+CATEGORIES=            net python
+MASTER_SITES=          http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/
 EXTRACT_SUFX=          .tar.bz2
 
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              http://www.twistedmatrix.com/
+
 DISTINFO_FILE?=                ${.CURDIR}/../py-twisted/distinfo
-COMMON_FILESDIR?=      ${.CURDIR}/../py-twisted/files
 PATCHDIR?=             ${.CURDIR}/../py-twisted/patches
+
+PKG_DESTDIR_SUPPORT=   user-destdir
diff -r b67b3c111e12 -r 075fad9c3dbc net/py-twisted/PLIST
--- a/net/py-twisted/PLIST      Fri Aug 22 21:31:37 2008 +0000
+++ b/net/py-twisted/PLIST      Fri Aug 22 21:49:08 2008 +0000
@@ -1,1653 +1,2352 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/26 11:59:25 recht Exp $
-bin/ckeygen${PYVERSSUFFIX}
-bin/conch${PYVERSSUFFIX}
-bin/im${PYVERSSUFFIX}
-bin/lore${PYVERSSUFFIX}
-bin/mailmail${PYVERSSUFFIX}
-bin/manhole${PYVERSSUFFIX}
-bin/mktap${PYVERSSUFFIX}
-bin/t-im${PYVERSSUFFIX}
-bin/tap2deb${PYVERSSUFFIX}
-bin/tap2rpm${PYVERSSUFFIX}
-bin/tapconvert${PYVERSSUFFIX}
-bin/tkconch${PYVERSSUFFIX}
-bin/tkmktap${PYVERSSUFFIX}
-bin/trial${PYVERSSUFFIX}
-bin/twistd${PYVERSSUFFIX}
-bin/websetroot${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.3 2008/08/22 21:49:08 epg Exp $
+bin/bookify
+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
+bin/tkconch
+bin/trial
+bin/twistd
 ${PYSITELIB}/twisted/__init__.py
-${PYSITELIB}/twisted/copyright.py
-${PYSITELIB}/twisted/application/internet.py
+${PYSITELIB}/twisted/__init__.pyc
+${PYSITELIB}/twisted/__init__.pyo
+${PYSITELIB}/twisted/_version.py
+${PYSITELIB}/twisted/_version.pyc
+${PYSITELIB}/twisted/_version.pyo
 ${PYSITELIB}/twisted/application/__init__.py
+${PYSITELIB}/twisted/application/__init__.pyc
+${PYSITELIB}/twisted/application/__init__.pyo
+${PYSITELIB}/twisted/application/app.py
+${PYSITELIB}/twisted/application/app.pyc
+${PYSITELIB}/twisted/application/app.pyo
+${PYSITELIB}/twisted/application/internet.py
+${PYSITELIB}/twisted/application/internet.pyc
+${PYSITELIB}/twisted/application/internet.pyo
+${PYSITELIB}/twisted/application/reactors.py
+${PYSITELIB}/twisted/application/reactors.pyc
+${PYSITELIB}/twisted/application/reactors.pyo
 ${PYSITELIB}/twisted/application/service.py
-${PYSITELIB}/twisted/application/app.py
+${PYSITELIB}/twisted/application/service.pyc
+${PYSITELIB}/twisted/application/service.pyo
 ${PYSITELIB}/twisted/application/strports.py
-${PYSITELIB}/twisted/application/compat.py
-${PYSITELIB}/twisted/application/internet.pyc
-${PYSITELIB}/twisted/application/__init__.pyc
-${PYSITELIB}/twisted/application/service.pyc
-${PYSITELIB}/twisted/application/app.pyc
 ${PYSITELIB}/twisted/application/strports.pyc
-${PYSITELIB}/twisted/application/compat.pyc
-${PYSITELIB}/twisted/application/internet.pyo
-${PYSITELIB}/twisted/application/__init__.pyo
-${PYSITELIB}/twisted/application/service.pyo
-${PYSITELIB}/twisted/application/app.pyo
 ${PYSITELIB}/twisted/application/strports.pyo
-${PYSITELIB}/twisted/application/compat.pyo
-${PYSITELIB}/twisted/conch/identity.py
-${PYSITELIB}/twisted/conch/error.py
-${PYSITELIB}/twisted/conch/authorizer.py
-${PYSITELIB}/twisted/conch/credentials.py
 ${PYSITELIB}/twisted/conch/__init__.py
-${PYSITELIB}/twisted/conch/pamauth.py
-${PYSITELIB}/twisted/conch/interfaces.py
-${PYSITELIB}/twisted/conch/ttymodes.py
+${PYSITELIB}/twisted/conch/__init__.pyc
+${PYSITELIB}/twisted/conch/__init__.pyo
+${PYSITELIB}/twisted/conch/_version.py
+${PYSITELIB}/twisted/conch/_version.pyc
+${PYSITELIB}/twisted/conch/_version.pyo
 ${PYSITELIB}/twisted/conch/avatar.py
-${PYSITELIB}/twisted/conch/unix.py
+${PYSITELIB}/twisted/conch/avatar.pyc
+${PYSITELIB}/twisted/conch/avatar.pyo
 ${PYSITELIB}/twisted/conch/checkers.py
-${PYSITELIB}/twisted/conch/client/connect.py
-${PYSITELIB}/twisted/conch/client/direct.py
-${PYSITELIB}/twisted/conch/client/options.py
-${PYSITELIB}/twisted/conch/client/agent.py
+${PYSITELIB}/twisted/conch/checkers.pyc
+${PYSITELIB}/twisted/conch/checkers.pyo
 ${PYSITELIB}/twisted/conch/client/__init__.py
-${PYSITELIB}/twisted/conch/client/unix.py
-${PYSITELIB}/twisted/conch/client/default.py
+${PYSITELIB}/twisted/conch/client/__init__.pyc
+${PYSITELIB}/twisted/conch/client/__init__.pyo
+${PYSITELIB}/twisted/conch/client/agent.py
+${PYSITELIB}/twisted/conch/client/agent.pyc
+${PYSITELIB}/twisted/conch/client/agent.pyo
+${PYSITELIB}/twisted/conch/client/connect.py
 ${PYSITELIB}/twisted/conch/client/connect.pyc
-${PYSITELIB}/twisted/conch/client/direct.pyc
-${PYSITELIB}/twisted/conch/client/options.pyc
-${PYSITELIB}/twisted/conch/client/agent.pyc
-${PYSITELIB}/twisted/conch/client/__init__.pyc
-${PYSITELIB}/twisted/conch/client/unix.pyc
+${PYSITELIB}/twisted/conch/client/connect.pyo
+${PYSITELIB}/twisted/conch/client/default.py
 ${PYSITELIB}/twisted/conch/client/default.pyc
-${PYSITELIB}/twisted/conch/client/connect.pyo
+${PYSITELIB}/twisted/conch/client/default.pyo
+${PYSITELIB}/twisted/conch/client/direct.py
+${PYSITELIB}/twisted/conch/client/direct.pyc
 ${PYSITELIB}/twisted/conch/client/direct.pyo
+${PYSITELIB}/twisted/conch/client/options.py
+${PYSITELIB}/twisted/conch/client/options.pyc
 ${PYSITELIB}/twisted/conch/client/options.pyo
-${PYSITELIB}/twisted/conch/client/agent.pyo
-${PYSITELIB}/twisted/conch/client/__init__.pyo
+${PYSITELIB}/twisted/conch/client/unix.py
+${PYSITELIB}/twisted/conch/client/unix.pyc
 ${PYSITELIB}/twisted/conch/client/unix.pyo
-${PYSITELIB}/twisted/conch/client/default.pyo
+${PYSITELIB}/twisted/conch/error.py
+${PYSITELIB}/twisted/conch/error.pyc
+${PYSITELIB}/twisted/conch/error.pyo
+${PYSITELIB}/twisted/conch/insults/__init__.py
+${PYSITELIB}/twisted/conch/insults/__init__.pyc
+${PYSITELIB}/twisted/conch/insults/__init__.pyo
+${PYSITELIB}/twisted/conch/insults/client.py
+${PYSITELIB}/twisted/conch/insults/client.pyc
+${PYSITELIB}/twisted/conch/insults/client.pyo
+${PYSITELIB}/twisted/conch/insults/colors.py
+${PYSITELIB}/twisted/conch/insults/colors.pyc
+${PYSITELIB}/twisted/conch/insults/colors.pyo
+${PYSITELIB}/twisted/conch/insults/helper.py
+${PYSITELIB}/twisted/conch/insults/helper.pyc
+${PYSITELIB}/twisted/conch/insults/helper.pyo
+${PYSITELIB}/twisted/conch/insults/insults.py
+${PYSITELIB}/twisted/conch/insults/insults.pyc
+${PYSITELIB}/twisted/conch/insults/insults.pyo
+${PYSITELIB}/twisted/conch/insults/text.py
+${PYSITELIB}/twisted/conch/insults/text.pyc
+${PYSITELIB}/twisted/conch/insults/text.pyo
+${PYSITELIB}/twisted/conch/insults/window.py
+${PYSITELIB}/twisted/conch/insults/window.pyc
+${PYSITELIB}/twisted/conch/insults/window.pyo
+${PYSITELIB}/twisted/conch/interfaces.py
+${PYSITELIB}/twisted/conch/interfaces.pyc
+${PYSITELIB}/twisted/conch/interfaces.pyo
+${PYSITELIB}/twisted/conch/ls.py
+${PYSITELIB}/twisted/conch/ls.pyc
+${PYSITELIB}/twisted/conch/ls.pyo
+${PYSITELIB}/twisted/conch/manhole.py
+${PYSITELIB}/twisted/conch/manhole.pyc
+${PYSITELIB}/twisted/conch/manhole.pyo
+${PYSITELIB}/twisted/conch/manhole_ssh.py
+${PYSITELIB}/twisted/conch/manhole_ssh.pyc
+${PYSITELIB}/twisted/conch/manhole_ssh.pyo
+${PYSITELIB}/twisted/conch/manhole_tap.py
+${PYSITELIB}/twisted/conch/manhole_tap.pyc
+${PYSITELIB}/twisted/conch/manhole_tap.pyo
+${PYSITELIB}/twisted/conch/mixin.py
+${PYSITELIB}/twisted/conch/mixin.pyc
+${PYSITELIB}/twisted/conch/mixin.pyo
 ${PYSITELIB}/twisted/conch/openssh_compat/__init__.py
-${PYSITELIB}/twisted/conch/openssh_compat/primes.py
+${PYSITELIB}/twisted/conch/openssh_compat/__init__.pyc
+${PYSITELIB}/twisted/conch/openssh_compat/__init__.pyo
 ${PYSITELIB}/twisted/conch/openssh_compat/factory.py
-${PYSITELIB}/twisted/conch/openssh_compat/__init__.pyc
+${PYSITELIB}/twisted/conch/openssh_compat/factory.pyc
+${PYSITELIB}/twisted/conch/openssh_compat/factory.pyo
+${PYSITELIB}/twisted/conch/openssh_compat/primes.py
 ${PYSITELIB}/twisted/conch/openssh_compat/primes.pyc
-${PYSITELIB}/twisted/conch/openssh_compat/factory.pyc
-${PYSITELIB}/twisted/conch/openssh_compat/__init__.pyo
 ${PYSITELIB}/twisted/conch/openssh_compat/primes.pyo
-${PYSITELIB}/twisted/conch/openssh_compat/factory.pyo
-${PYSITELIB}/twisted/conch/ssh/connection.py