Remove Zope 2.2 and related pieces:

databases/zope-mysql
lang/py-extclass
textproc/py-dtml
www/py-pcgi
www/py-zpublisher
www/zope

No objection from pkgsrc-users.
cVS: ----------------------------------------------------------------------

23 files changed, 1 insertions, 567 deletions

diff --git a/www/Makefile b/www/Makefile
index 02dd7842534..ae4be9fd955 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.511 2007/05/27 02:59:35 obache Exp $
+# $NetBSD: Makefile,v 1.512 2007/05/29 10:16:46 joerg Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -295,9 +295,7 @@ SUBDIR+=	py-flup
 SUBDIR+=	py-jonpy
 SUBDIR+=	py-moin
 SUBDIR+=	py-nevow
-SUBDIR+=	py-pcgi
 SUBDIR+=	py-webpy
-SUBDIR+=	py-zpublisher
 SUBDIR+=	qDecoder
 SUBDIR+=	raggle
 SUBDIR+=	rails
@@ -362,8 +360,6 @@ SUBDIR+=	wml
 SUBDIR+=	www6to4
 SUBDIR+=	wwwcount
 SUBDIR+=	wwwoffle
-SUBDIR+=	zope
-SUBDIR+=	zope-confera
 SUBDIR+=	zope25
 SUBDIR+=	zope25-AbracadabraObject
 SUBDIR+=	zope25-BTreeFolder
diff --git a/www/py-pcgi/DESCR b/www/py-pcgi/DESCR
deleted file mode 100644
index 9437c79bbaa..00000000000
--- a/www/py-pcgi/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Persistent CGI provides a transparent architecture for accessing
-published web objects as long-running processes.  Published objects may
-be accessed on any server supporting CGI.  PCGI is one way to interface
-Zope or other ZPublisher applications to Apache.
diff --git a/www/py-pcgi/Makefile b/www/py-pcgi/Makefile
deleted file mode 100644
index de86726fe8d..00000000000
--- a/www/py-pcgi/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/05/18 21:26:54 joerg Exp $
-#
-
-DISTNAME=	Zope-2.2.2-src
-PKGNAME=	${PYPKGPREFIX}-pcgi-2.2.2
-CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/2.2.2/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://starship.python.net/crew/jbauer/persistcgi/
-COMMENT=	Persistent CGI system for Zope and other ZPublisher applications
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/pcgi
-HAS_CONFIGURE=	yes
-EXTRACT_ELEMENTS=	${DISTNAME}/pcgi
-
-BUILD_TARGET=	all
-PYTHON_PATCH_SCRIPTS=	Util/*.py
-
-INSTALLATION_DIRS=	bin libexec
-
-post-build:
-	(cd ${WRKSRC}; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
-	(cd ${WRKSRC}; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
-	(cd ${WRKSRC}/Util; \
-		${SED} -e s,/usr/local,${PREFIX}, <pcgifile.py >pcgifile; \
-		${SED} -e s,/usr/local,${PREFIX}, <killpcgi.py >killpcgi )
-
-do-install:
-	${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}
-	${INSTALL_SCRIPT} ${WRKSRC}/pcgi_publisher.py* ${PY_SITEPKG}
-	${INSTALL_PROGRAM} ${WRKSRC}/pcgi-wrapper ${PREFIX}/libexec
-	${INSTALL_SCRIPT} ${WRKSRC}/Util/pcgifile ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/Util/killpcgi ${PREFIX}/bin
-
-.include "../../lang/python20/Makefile.inc"
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-pcgi/PLIST b/www/py-pcgi/PLIST
deleted file mode 100644
index 7d12e55c303..00000000000
--- a/www/py-pcgi/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:42 zuntum Exp $
-libexec/pcgi-wrapper
-lib/python2.0/site-packages/pcgi_publisher.py
-lib/python2.0/site-packages/pcgi_publisher.pyc
-lib/python2.0/site-packages/pcgi_publisher.pyo
-bin/pcgifile
-bin/killpcgi
diff --git a/www/py-pcgi/distinfo b/www/py-pcgi/distinfo
deleted file mode 100644
index dcd687f6258..00000000000
--- a/www/py-pcgi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:38 wiz Exp $
-
-SHA1 (python/Zope-2.2.2-src.tgz) = 16a1a4525e078c7b62120311443075dcadae6df5
-RMD160 (python/Zope-2.2.2-src.tgz) = 3990a9fe292c66280cb32522fcbdd7cb516aa1bc
-Size (python/Zope-2.2.2-src.tgz) = 1575270 bytes
diff --git a/www/py-zpublisher/DESCR b/www/py-zpublisher/DESCR
deleted file mode 100644
index ee33f5bc2f4..00000000000
--- a/www/py-zpublisher/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-ZPublisher is the Zope ORB.  It provides a simple mechanism for
-publishing a collection of Python objects as World-Wide-Web (Web)
-resources without any plumbing (e.g.  CGI) specific code.  The Zope ORB
-is the central component of the Zope web application platform.  It can
-also be used without the rest of Zope.  ZPublisher applications can be
-published as regular CGIs, using Persistent CGI ("PCGI") (see the
-py-pcgi package), or on the command line with the "bobo" program.
diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
deleted file mode 100644
index 0a3cecd34cb..00000000000
--- a/www/py-zpublisher/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:24 wiz Exp $
-#
-
-DISTNAME=	Zope-2.2.2-src
-PKGNAME=	py-zpublisher-2.2.2
-PKGREVISION=	1
-CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/2.2.2/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://classic.zope.org:8080/Documentation/Reference/ORB
-COMMENT=	Publishes a collection of Python objects as Web resources
-
-DEPENDS+=	py-extclass>=2.2.2:../../lang/py-extclass
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/lib/python
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-EXTRACT_ELEMENTS=	${DISTNAME}/lib/python/ZPublisher
-INSTALLATION_DIRS=	bin
-
-do-build:
-	cd ${WRKSRC}/.. && ${PY_PROG} ${PY_LIBDIR}/compileall.py .
-	cd ${WRKSRC}/.. && ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .
-
-do-install:
-	${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	cd ${WRKSRC} && ${PAX} -rw -pe ZPublisher ${PY_SITEPKG}
-	${CHMOD} 755 ${PY_SITEPKG}/ZPublisher/Test.py
-	cd ${PREFIX} && ${FIND} ${PY_SITEPATH}/ZPublisher \
-		-type f -print >>${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} -d ${PY_SITEPATH}/ZPublisher \
-		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
-	${LN} -sf ../${PY_SITEPATH}/ZPublisher/Test.py ${PREFIX}/bin/bobo
-
-.include "../../lang/python20/Makefile.inc"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-zpublisher/PLIST.pre b/www/py-zpublisher/PLIST.pre
deleted file mode 100644
index 12313bcf453..00000000000
--- a/www/py-zpublisher/PLIST.pre
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 02:26:20 zuntum Exp $
-bin/bobo
diff --git a/www/py-zpublisher/distinfo b/www/py-zpublisher/distinfo
deleted file mode 100644
index dcd687f6258..00000000000
--- a/www/py-zpublisher/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:38 wiz Exp $
-
-SHA1 (python/Zope-2.2.2-src.tgz) = 16a1a4525e078c7b62120311443075dcadae6df5
-RMD160 (python/Zope-2.2.2-src.tgz) = 3990a9fe292c66280cb32522fcbdd7cb516aa1bc
-Size (python/Zope-2.2.2-src.tgz) = 1575270 bytes
diff --git a/www/zope-confera/DESCR b/www/zope-confera/DESCR
deleted file mode 100644
index 8dac98cb916..00000000000
--- a/www/zope-confera/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Confera web-based discussion product for the
-Z Object Publishing Environment (Zope).
diff --git a/www/zope-confera/Makefile b/www/zope-confera/Makefile
deleted file mode 100644
index 93ff93e9a03..00000000000
--- a/www/zope-confera/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:25 wiz Exp $
-#
-
-DISTNAME=	Confera-1.2.0-nonbin
-PKGNAME=	zope-confera-1.2.0
-PKGREVISION=	1
-CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Download/Prereleases/Confera/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://www.zope.org/
-COMMENT=	Confera: Threaded discussion groups for Zope
-
-DEPENDS+=	zope>=2.1.4:../../www/zope
-
-WRKSRC=		${WRKDIR}/lib
-NO_BUILD=	yes
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-ZOPEDIR=	${PREFIX}/lib/zope
-PRODPATH=	lib/python/Products/Confera
-
-do-install:
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	${INSTALL_DATA_DIR} ${ZOPEDIR}
-	cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR}
-	${CHMOD} -R a+rX ${ZOPEDIR}/${PRODPATH}
-	cd ${PREFIX} && ${FIND} lib/zope/${PRODPATH} -type f -print >>${PLIST_SRC}
-	${ECHO} "@dirrm lib/zope/${PRODPATH}" >> ${PLIST_SRC}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope-confera/PLIST.pre b/www/zope-confera/PLIST.pre
deleted file mode 100644
index a872d49e80d..00000000000
--- a/www/zope-confera/PLIST.pre
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 02:27:15 zuntum Exp $
diff --git a/www/zope-confera/distinfo b/www/zope-confera/distinfo
deleted file mode 100644
index 2343723bf75..00000000000
--- a/www/zope-confera/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:40 wiz Exp $
-
-SHA1 (Confera-1.2.0-nonbin.tgz) = 2669b246434caa2f5caf18b9e5bc39d3d331cde1
-RMD160 (Confera-1.2.0-nonbin.tgz) = 2900e90ec497e9eb5e5dc6e2107c96b127d28254
-Size (Confera-1.2.0-nonbin.tgz) = 22827 bytes
diff --git a/www/zope/DESCR b/www/zope/DESCR
deleted file mode 100644
index 75f637f56fd..00000000000
--- a/www/zope/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Zope is a free, open source web application platform used for building
-high-performance, dynamic web sites.
-
-The Zope architecture competes in the web application server market
-against products such as Cold Fusion, Silverstream, Netscape Application
-Server, and the like.  These products are aimed at systems programmers
-and relational databases.  Zope, however, contains a powerful and simple
-scripting object model and high-performance, integrated object database.
-Thus the term "platform".
diff --git a/www/zope/MESSAGE b/www/zope/MESSAGE
deleted file mode 100644
index 4d919ed8547..00000000000
--- a/www/zope/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:52 wiz Exp $
-
-Zope is now installed.
-
-The command "zope-install" will create instances of Zope for use with
-Apache. Run it without any arguments for help and usage information.
-
-===========================================================================
diff --git a/www/zope/Makefile b/www/zope/Makefile
deleted file mode 100644
index 9fe536e69c4..00000000000
--- a/www/zope/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:27:25 wiz Exp $
-#
-
-DISTNAME=	Zope-2.2.2-src
-PKGNAME=	zope-2.2.2
-PKGREVISION=	1
-CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Products/Zope/2.2.2/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://www.zope.org/
-COMMENT=	Zope, the Z Object Publishing Environment
-
-DEPENDS+=	py-dtml>=2.2.2:../../textproc/py-dtml
-
-DIST_SUBDIR=	python
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-ZOPEDIR=	${PREFIX}/lib/zope
-
-PYTHON_VERSIONS_ACCEPTED= 20 # XXX for now
-
-INSTALLATION_DIRS=	sbin
-
-do-configure:
-	${SED} -e "s,@PREFIX@,${PREFIX}," \
-		<${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile
-	cd ${WRKSRC}/lib && ${RM} -rf Components/zlib \
-		Components/ExtensionClass python/DocumentTemplate \
-		python/StructuredText
-	cd ${WRKSRC} && make configure
-
-do-install:
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	${INSTALL_DATA_DIR} ${ZOPEDIR}
-	cd ${WRKSRC} && ${PAX} -rw -s'/.*\.[cho]$$//' . ${ZOPEDIR}
-	${PYTHONBIN} \
-		${PREFIX}/lib/python2.0/compileall.py ${ZOPEDIR}
-	${CHMOD} -R a+rX ${ZOPEDIR}
-	cd ${PREFIX} && ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC}
-	cd ${PREFIX} && ${FIND} lib/zope -type d -print | ${SORT} -r | \
-	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
-	${SED} -e "s,/usr/pkg,${PREFIX}," \
-		<${FILESDIR}/zope-install.py >${PREFIX}/sbin/zope-install
-	${SED} -e "s,/usr/pkg,${PREFIX}," \
-		<${FILESDIR}/zope-shutdown.py >${PREFIX}/sbin/zope-shutdown
-	${CHMOD} 755 ${PREFIX}/sbin/zope-install ${PREFIX}/sbin/zope-shutdown
-
-.include "../../lang/py-extclass/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope/PLIST.pre b/www/zope/PLIST.pre
deleted file mode 100644
index 6fbfb48e163..00000000000
--- a/www/zope/PLIST.pre
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 02:27:23 zuntum Exp $
-sbin/zope-install
-sbin/zope-shutdown
diff --git a/www/zope/distinfo b/www/zope/distinfo
deleted file mode 100644
index a19c3fd8c50..00000000000
--- a/www/zope/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:40 wiz Exp $
-
-SHA1 (python/Zope-2.2.2-src.tgz) = 16a1a4525e078c7b62120311443075dcadae6df5
-RMD160 (python/Zope-2.2.2-src.tgz) = 3990a9fe292c66280cb32522fcbdd7cb516aa1bc
-Size (python/Zope-2.2.2-src.tgz) = 1575270 bytes
-SHA1 (patch-aa) = b60ae122e42dec711fb2d27f34f0cff6c2fe7d41
-SHA1 (patch-ab) = ac3c8bd288f1521c07ca2d7845132b89d46dbbd8
diff --git a/www/zope/files/Makefile.in b/www/zope/files/Makefile.in
deleted file mode 100644
index 0fa884646e1..00000000000
--- a/www/zope/files/Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile.in,v 1.7 2002/01/22 18:47:15 drochner Exp $
-
-all: 	all-pcgi all-lib all-zodb all-search all-expat # link-cpickle
-configure: config-pcgi config-lib config-zodb config-search \
-	config-expat
-	
-config-pcgi:
-	(cd pcgi; ./configure)
-
-all-pcgi:
-	(cd pcgi; make)
-
-config-lib:
-	(cd lib/python; \
-	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
-	make -f Makefile.pre.in boot)
-
-all-lib:
-	(cd lib/python; make)
-
-config-zodb:
-	(cd lib/python/ZODB; \
-	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
-	make -f Makefile.pre.in boot)
-
-all-zodb:
-	(cd lib/python/ZODB; make)
-
-
-config-search:
-	(cd lib/python/SearchIndex; \
-	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
-	make -f Makefile.pre.in boot)
-
-all-search:
-	(cd lib/python/SearchIndex; make)
-
-config-expat:
-	(cd lib/python/Shared/DC/xml/pyexpat; \
-	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
-	make -f Makefile.pre.in boot)
-
-all-expat:
-	(cd lib/python/Shared/DC/xml/pyexpat; make)
-
-link-cpickle:
-	(cd lib/python/ZODB; \
-	ln -s ../cPickle.so cPickle.so; \
-	ln -s ../cStringIO.so cStringIO.so )
-
diff --git a/www/zope/files/zope-install.py b/www/zope/files/zope-install.py
deleted file mode 100755
index 31828578f0a..00000000000
--- a/www/zope/files/zope-install.py
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/pkg/bin/python2.0
-#
-#	$NetBSD: zope-install.py,v 1.6 2002/01/22 18:47:15 drochner Exp $
-#
-# Copyright (c) 1998,1999 Endicor Technologies, Inc.
-# All rights reserved. Written by Ty Sarna <tsarna@endicor.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-# This will have to do for now...
-
-import sys, os, re, getopt, string
-
-prefix = "/usr/pkg"
-cgidir = prefix + "/libexec/cgi-bin"
-apconf = prefix + "/etc/httpd/httpd.conf"
-zopedir = prefix + "/lib/zope"
-zopevar = zopedir + "/var"
-zopedata = "/var/zope"
-ext = "fs"
-module = "Zope"
-
-def usage():
-    print 'usage: zope-install [-n] [-b] [-p perms] [-u user] [-g group] [-d dir] [-c cgidir] instancename'
-    print
-    print '\t-n\tshow what would be done, but don\'t actually do it'
-    print '\t-b\tuse old .bbb format BoboPOS format instead of .fs ZODB format'
-    print '\t-p\tmanager permissions, in the form'
-    print '\t\tusername:plaintextpassword[:domain-restrinction]'
-    print '\t\teg: "root:mypass" or "root:mypass:*.mydomain.com'
-    print '\t-u\tusername to run as, default to Apache\'s user'
-    print '\t-g\tgroupname to run as, default to Apache\'s group'
-    print '\t-d\tdirectory for instance, defaults to %s/instancename' % zopedata
-    print '\t-c\tdirectory for CGIs, defaults to %s' % cgidir
-    
-    sys.exit(1)
-
-def exists(f):
-    e = 1
-    try:
-        os.stat(f)
-    except:
-        e = 0
-    return e
-
-def resourcefile(v):
-    resource = '''#!%(zopedir)s/pcgi/pcgi-wrapper
-PCGI_NAME=%(module)s
-PCGI_MODULE_PATH=%(zopedir)s/lib/python/%(module)s.py
-PCGI_PUBLISHER=%(zopedir)s/pcgi/pcgi_publisher.py
-PCGI_EXE=%(python)s
-PCGI_SOCKET_FILE=%(instvar)s/pcgi.soc
-PCGI_PID_FILE=%(instvar)s/pcgi.pid
-PCGI_ERROR_LOG=%(instvar)s/pcgi.log
-PCGI_DISPLAY_ERRORS=1
-BOBO_REALM=%(instance)s
-BOBO_DEBUG_MODE=1
-INSTANCE_HOME=%(dirname)s
-''' % v
-    
-    return resource
-    
-def GetApachePerms():
-    user = group = "?ERROR?"
-    
-    rx = re.compile("^(User|Group)\\s([^\\s]+)")
-    f = open(apconf, "r")
-    for l in f.readlines():
-        m = rx.match(l)
-        if m:
-            if m.group(1) == "User":
-                user = m.group(2)
-            if m.group(1) == "Group":
-                group = m.group(2)
-    return user, group
-
-def runsys(pretend, cmd):
-    if pretend:
-        print cmd
-    else:
-        r = os.system(cmd)
-        if r:
-            sys.exit(r)
-            
-def createfile(pretend, fname, contents):
-    if pretend:
-        print "cat >%(fname)s <__EOF__\n%(contents)s__EOF__" % vars()
-    else:
-        f = open(fname, "w")
-        f.write(contents)
-        f.close()
-            
-if __name__ == "__main__":
-    optlist, args = getopt.getopt(sys.argv[1:], 'bnp:u:g:d:c:')
-    if len(args) != 1:
-        usage()
-
-    instance = args[0]
-    user, group = GetApachePerms()
-    pretend = 0
-    seenperms = 0
-    perms = "root:password"
-    dirname = None
-    python = sys.executable
-
-    for (oname, oarg) in optlist:
-        if oname == '-n':
-            pretend = 1
-        elif oname == '-b':
-            ext = "bbb"
-            module = "Main"
-        elif oname == '-p':
-            perms = oarg
-            seenperms = 1
-        elif oname == '-u':
-            user = oarg
-        elif oname == '-g':
-            group = oarg
-        elif oname == '-d':
-            dirname = oarg
-        elif oname == '-c':
-            cgidir = oarg
-            
-    if not dirname:
-        dirname = zopedata + '/' + instance
-
-    instvar = dirname + '/var'
-    
-    runsys(pretend, "mkdir -p " + instvar)
-
-    if not exists(instvar + "/Data." + ext):
-        runsys(pretend, "cp %(zopevar)s/Data.%(ext)s.in %(instvar)s" % vars())
-
-    runsys(pretend, "chown -R %(user)s:%(group)s %(dirname)s" % vars())
-    runsys(pretend, "chmod -R u+rwX,g+rX,g-w,o-rwx %(dirname)s" % vars())
-
-    fname = dirname + "/access"
-    if not exists(fname):
-        if not seenperms:
-            sys.stderr.write("%s: warning: perms not set, dedaulting to %s\n"
-                % (sys.argv[0], perms))
-
-        createfile(pretend, fname, perms + '\n')
-
-    runsys(pretend, 
-        "chmod 600 %(fname)s; chown %(user)s:%(group)s %(fname)s" % vars())
-
-    fname = cgidir + '/' + instance + ".cgi"
-    createfile(pretend, fname, resourcefile(vars()))
-    runsys(pretend, 
-        "chmod 755 %(fname)s; chown %(user)s:%(group)s %(fname)s" % vars())
-
-    sys.stderr.write("""
-now you will need to add lines similar to these to your
-Apache httpd.conf file to enable access to your instance
-via http://yourwebserver/instance/
-
-RewriteEngine on
-RewriteCond %%{HTTP:Authorization}  ^(.*)
-RewriteRule ^/%(instance)s($|/)(.*) %(cgidir)s/%(instance)s.cgi/$2  [e=HTTP_CGI_AUTHORIZATION:%%1,t=application/x-httpd-cgi,l]
-
-You may need to add Options ExecCGI on "<Directory />" and your cgi-bin
-directory for this to work.
-""" % vars())
diff --git a/www/zope/files/zope-shutdown.py b/www/zope/files/zope-shutdown.py
deleted file mode 100755
index a6f9b5113dd..00000000000
--- a/www/zope/files/zope-shutdown.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/pkg/bin/python2.0
-#
-#	$NetBSD: zope-shutdown.py,v 1.2 2002/01/22 18:47:15 drochner Exp $
-#
-# Copyright (c) 1999 Endicor Technologies, Inc.
-# All rights reserved. Written by Ty Sarna <tsarna@endicor.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-
-import sys, os, string, urllib #, re, getopt
-
-zopedata = "/var/zope"
-
-def getstr(fn, dflt):
-    try:
-        f = open(fn, 'r')
-        s = string.strip(f.read())
-        f.close()
-    except:
-        s = dflt
-    return s
-    
-for instance in os.listdir(zopedata):
-    os.chdir(os.path.join(zopedata, instance))
-    access = ""
-    try:
-        f = open(os.path.join('var', 'pcgi.pid'), 'r')
-        pid = int(f.read())
-        f.close()
-        os.kill(pid, 0)
-        url = getstr('access', '')
-        if url:
-            url = url + '@'
-        url = 'http://' + url + getstr('host', 'localhost')
-        url = url +'/' + instance + '/Control_Panel/manage_shutdown'
-        u = urllib.urlopen(url)
-        u.read()
-        u.close()
-        sys.stdout.write(' ' + instance)
-    except:
-        sys.stdout.write(' (' + instance + ')')
diff --git a/www/zope/patches/patch-aa b/www/zope/patches/patch-aa
deleted file mode 100644
index 605199b73db..00000000000
--- a/www/zope/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2000/10/22 23:11:48 tsarna Exp $
-
---- lib/python/Setup.orig	Mon Jul 19 18:55:11 1999
-+++ lib/python/Setup	Sun Oct 22 16:40:04 2000
-@@ -1,23 +1,7 @@
- *shared*
- 
--ExtensionClass 	  ../Components/ExtensionClass/ExtensionClass.c    -I../Components/ExtensionClass
--Acquisition    	  ../Components/ExtensionClass/Acquisition.c       -I../Components/ExtensionClass
--MethodObject   	  ../Components/ExtensionClass/MethodObject.c      -I../Components/ExtensionClass
--MultiMapping   	  ../Components/ExtensionClass/MultiMapping.c      -I../Components/ExtensionClass
--ThreadLock     	  ../Components/ExtensionClass/ThreadLock.c        -I../Components/ExtensionClass
--Missing           ../Components/ExtensionClass/Missing.c           -I../Components/ExtensionClass
--Sync              ../Components/ExtensionClass/Sync.c              -I../Components/ExtensionClass
--Record            ../Components/ExtensionClass/Record.c            -I../Components/ExtensionClass
--ComputedAttribute ../Components/ExtensionClass/ComputedAttribute.c -I../Components/ExtensionClass
--
--cStringIO      ../Components/cPickle/cStringIO.c
--cPickle        ../Components/cPickle/cPickle.c
--
- BTree         ../Components/BTree/BTree.c     -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
- IIBTree        ../Components/BTree/IIBTree.c  -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
- IOBTree        ../Components/BTree/IOBTree.c  -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
- OIBTree        ../Components/BTree/OIBTree.c  -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
- intSet         ../Components/BTree/intSet.c   -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
--
--
--zlib ../Components/zlib/zlib.c -I../Components/zlib ../Components/zlib/adler32.c ../Components/zlib/compress.c ../Components/zlib/crc32.c ../Components/zlib/gzio.c ../Components/zlib/uncompr.c ../Components/zlib/deflate.c ../Components/zlib/trees.c ../Components/zlib/zutil.c ../Components/zlib/inflate.c ../Components/zlib/infblock.c ../Components/zlib/inftrees.c ../Components/zlib/infcodes.c ../Components/zlib/infutil.c ../Components/zlib/inffast.c
diff --git a/www/zope/patches/patch-ab b/www/zope/patches/patch-ab
deleted file mode 100644
index fb482e9de31..00000000000
--- a/www/zope/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/11/17 14:36:46 wiz Exp $
-
---- lib/python/AccessControl/SecurityManagement.py.orig	Fri Nov 17 15:33:58 2000
-+++ lib/python/AccessControl/SecurityManagement.py
-@@ -90,5 +90,7 @@
- 
- import SpecialUsers
--from thread import get_ident
-+try: import thread
-+except: get_ident=lambda: 0
-+else: get_ident=thread.get_ident
- from SecurityManager import SecurityManager
-