Upgrade to Zope 2.5.1

PR:		ports/37763
Submitted by:	HAYASHI Yasushi <yasi@yasi.to>

24 files changed, 162 insertions, 150 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 3534415..6fe8937 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2002-03-01.tgz
-
-PATCHFILES=	Zope-2.5.0-unix-security.patch
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -28,10 +22,6 @@ PYTHON_VERSION=	python2.1
 
 DIST_SUBDIR=	zope
 
-post-patch:
-	@${CP} -Rp ${WRKDIR}/lib ${WRKSRC}
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -74,6 +64,9 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
+	#
+	# Copying some patches
+	#
 	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
diff --git a/www/zope/distinfo b/www/zope/distinfo
index 8fe20e1..b8bab84 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1,3 +1 @@
-MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
-MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
-MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
+MD5 (zope/Zope-2.5.1-src.tgz) = 65d502b2acf986693576decad6b837cf
diff --git a/www/zope/pkg-comment b/www/zope/pkg-comment
index 2ec9456..00e4c4a 100644
--- a/www/zope/pkg-comment
+++ b/www/zope/pkg-comment
@@ -1 +1 @@
-An object-based web application platform with database access
+An object-based web application platform with DB access, WebDAV, and more
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index a197c16..4cdc26f 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -281,7 +281,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
-%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -385,6 +384,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testClassSecurityInfo.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -526,6 +526,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/SetTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/Setup
 %%ZOPEBASEDIR%%/lib/python/BTrees/TreeSetTemplate.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IOBTree.c
@@ -831,11 +833,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/External-Method_Try-It.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions/Test.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2070,6 +2072,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/coptimizations.so
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/lock_file.py
@@ -2085,8 +2091,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MTStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ReadOnlyStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
@@ -2095,13 +2103,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testCache.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTimeStamp.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testfsIndex.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -2140,6 +2151,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
@@ -2166,7 +2178,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
-%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -2447,8 +2458,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
@@ -2487,7 +2499,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
-@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 3534415..6fe8937 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2002-03-01.tgz
-
-PATCHFILES=	Zope-2.5.0-unix-security.patch
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -28,10 +22,6 @@ PYTHON_VERSION=	python2.1
 
 DIST_SUBDIR=	zope
 
-post-patch:
-	@${CP} -Rp ${WRKDIR}/lib ${WRKSRC}
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -74,6 +64,9 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
+	#
+	# Copying some patches
+	#
 	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 8fe20e1..b8bab84 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,3 +1 @@
-MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
-MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
-MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
+MD5 (zope/Zope-2.5.1-src.tgz) = 65d502b2acf986693576decad6b837cf
diff --git a/www/zope210/pkg-comment b/www/zope210/pkg-comment
index 2ec9456..00e4c4a 100644
--- a/www/zope210/pkg-comment
+++ b/www/zope210/pkg-comment
@@ -1 +1 @@
-An object-based web application platform with database access
+An object-based web application platform with DB access, WebDAV, and more
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index a197c16..4cdc26f 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -281,7 +281,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
-%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -385,6 +384,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testClassSecurityInfo.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -526,6 +526,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/SetTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/Setup
 %%ZOPEBASEDIR%%/lib/python/BTrees/TreeSetTemplate.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IOBTree.c
@@ -831,11 +833,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/External-Method_Try-It.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions/Test.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2070,6 +2072,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/coptimizations.so
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/lock_file.py
@@ -2085,8 +2091,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MTStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ReadOnlyStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
@@ -2095,13 +2103,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testCache.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTimeStamp.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testfsIndex.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -2140,6 +2151,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
@@ -2166,7 +2178,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
-%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -2447,8 +2458,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
@@ -2487,7 +2499,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
-@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 3534415..6fe8937 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2002-03-01.tgz
-
-PATCHFILES=	Zope-2.5.0-unix-security.patch
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -28,10 +22,6 @@ PYTHON_VERSION=	python2.1
 
 DIST_SUBDIR=	zope
 
-post-patch:
-	@${CP} -Rp ${WRKDIR}/lib ${WRKSRC}
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -74,6 +64,9 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
+	#
+	# Copying some patches
+	#
 	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 8fe20e1..b8bab84 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,3 +1 @@
-MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
-MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
-MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
+MD5 (zope/Zope-2.5.1-src.tgz) = 65d502b2acf986693576decad6b837cf
diff --git a/www/zope211/pkg-comment b/www/zope211/pkg-comment
index 2ec9456..00e4c4a 100644
--- a/www/zope211/pkg-comment
+++ b/www/zope211/pkg-comment
@@ -1 +1 @@
-An object-based web application platform with database access
+An object-based web application platform with DB access, WebDAV, and more
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index a197c16..4cdc26f 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -281,7 +281,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
-%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -385,6 +384,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testClassSecurityInfo.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -526,6 +526,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/SetTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/Setup
 %%ZOPEBASEDIR%%/lib/python/BTrees/TreeSetTemplate.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IOBTree.c
@@ -831,11 +833,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/External-Method_Try-It.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions/Test.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2070,6 +2072,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/coptimizations.so
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/lock_file.py
@@ -2085,8 +2091,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MTStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ReadOnlyStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
@@ -2095,13 +2103,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testCache.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTimeStamp.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testfsIndex.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -2140,6 +2151,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
@@ -2166,7 +2178,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
-%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -2447,8 +2458,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
@@ -2487,7 +2499,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
-@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 3534415..6fe8937 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2002-03-01.tgz
-
-PATCHFILES=	Zope-2.5.0-unix-security.patch
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -28,10 +22,6 @@ PYTHON_VERSION=	python2.1
 
 DIST_SUBDIR=	zope
 
-post-patch:
-	@${CP} -Rp ${WRKDIR}/lib ${WRKSRC}
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -74,6 +64,9 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
+	#
+	# Copying some patches
+	#
 	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index 8fe20e1..b8bab84 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1,3 +1 @@
-MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
-MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
-MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
+MD5 (zope/Zope-2.5.1-src.tgz) = 65d502b2acf986693576decad6b837cf
diff --git a/www/zope213/pkg-comment b/www/zope213/pkg-comment
index 2ec9456..00e4c4a 100644
--- a/www/zope213/pkg-comment
+++ b/www/zope213/pkg-comment
@@ -1 +1 @@
-An object-based web application platform with database access
+An object-based web application platform with DB access, WebDAV, and more
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index a197c16..4cdc26f 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -281,7 +281,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
-%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -385,6 +384,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testClassSecurityInfo.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -526,6 +526,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/SetTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/Setup
 %%ZOPEBASEDIR%%/lib/python/BTrees/TreeSetTemplate.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IOBTree.c
@@ -831,11 +833,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/External-Method_Try-It.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions/Test.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2070,6 +2072,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/coptimizations.so
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/lock_file.py
@@ -2085,8 +2091,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MTStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ReadOnlyStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
@@ -2095,13 +2103,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testCache.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTimeStamp.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testfsIndex.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -2140,6 +2151,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
@@ -2166,7 +2178,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
-%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -2447,8 +2458,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
@@ -2487,7 +2499,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
-@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 3534415..6fe8937 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2002-03-01.tgz
-
-PATCHFILES=	Zope-2.5.0-unix-security.patch
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -28,10 +22,6 @@ PYTHON_VERSION=	python2.1
 
 DIST_SUBDIR=	zope
 
-post-patch:
-	@${CP} -Rp ${WRKDIR}/lib ${WRKSRC}
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -74,6 +64,9 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
+	#
+	# Copying some patches
+	#
 	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index 8fe20e1..b8bab84 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1,3 +1 @@
-MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
-MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
-MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
+MD5 (zope/Zope-2.5.1-src.tgz) = 65d502b2acf986693576decad6b837cf
diff --git a/www/zope28/pkg-comment b/www/zope28/pkg-comment
index 2ec9456..00e4c4a 100644
--- a/www/zope28/pkg-comment
+++ b/www/zope28/pkg-comment
@@ -1 +1 @@
-An object-based web application platform with database access
+An object-based web application platform with DB access, WebDAV, and more
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index a197c16..4cdc26f 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -281,7 +281,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
-%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -385,6 +384,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testClassSecurityInfo.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -526,6 +526,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/SetTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/Setup
 %%ZOPEBASEDIR%%/lib/python/BTrees/TreeSetTemplate.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IOBTree.c
@@ -831,11 +833,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/External-Method_Try-It.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions/Test.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2070,6 +2072,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/coptimizations.so
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/lock_file.py
@@ -2085,8 +2091,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MTStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ReadOnlyStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
@@ -2095,13 +2103,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testCache.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTimeStamp.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testfsIndex.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -2140,6 +2151,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
@@ -2166,7 +2178,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
-%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -2447,8 +2458,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
@@ -2487,7 +2499,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
-@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 3534415..6fe8937 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2002-03-01.tgz
-
-PATCHFILES=	Zope-2.5.0-unix-security.patch
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.zope.org/Members/zigg/UnixSecurityPatch/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -28,10 +22,6 @@ PYTHON_VERSION=	python2.1
 
 DIST_SUBDIR=	zope
 
-post-patch:
-	@${CP} -Rp ${WRKDIR}/lib ${WRKSRC}
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 # Build has to be done in the final location after installing the sources
 # there. It was a major action to fix all paths otherwise.
 do-build:	# empty, but needs to be there for the python dependency.
@@ -74,6 +64,9 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
+	#
+	# Copying some patches
+	#
 	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 8fe20e1..b8bab84 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,3 +1 @@
-MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
-MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
-MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
+MD5 (zope/Zope-2.5.1-src.tgz) = 65d502b2acf986693576decad6b837cf
diff --git a/www/zope29/pkg-comment b/www/zope29/pkg-comment
index 2ec9456..00e4c4a 100644
--- a/www/zope29/pkg-comment
+++ b/www/zope29/pkg-comment
@@ -1 +1 @@
-An object-based web application platform with database access
+An object-based web application platform with DB access, WebDAV, and more
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index a197c16..4cdc26f 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -281,7 +281,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/copy_reg.pyc
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
-%%ZOPEBASEDIR%%/lib/Components/initgroups/initgroups.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
@@ -385,6 +384,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/private_module/submodule/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/__init__.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/public_module/submodule/__init__.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testClassSecurityInfo.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testDeprecatedAPI.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testModuleSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPasswordDigest.py
@@ -526,6 +526,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/BTrees/SetTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/Setup
 %%ZOPEBASEDIR%%/lib/python/BTrees/TreeSetTemplate.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.c
+%%ZOPEBASEDIR%%/lib/python/BTrees/_fsBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IIBTree.so
 %%ZOPEBASEDIR%%/lib/python/BTrees/_IOBTree.c
@@ -831,11 +833,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/External-Method_Try-It.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions/Test.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/testExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2070,6 +2072,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/coptimizations.so
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/dbmStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/fsdump.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/fsrecover.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/lock_file.py
@@ -2085,8 +2091,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MTStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PersistentStorage.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ReadOnlyStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/RevisionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
@@ -2095,13 +2103,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testCache.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testDemoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testMappingStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testPersistentMapping.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTimeStamp.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testUtils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testfsIndex.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/winlock.c
@@ -2140,6 +2151,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/Batch.py
@@ -2166,7 +2178,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/config.c
 %%ZOPEBASEDIR%%/lib/python/dcdb.py
 %%ZOPEBASEDIR%%/lib/python/dcdb.pyc
-%%ZOPEBASEDIR%%/lib/python/initgroups.so
 %%ZOPEBASEDIR%%/lib/python/intSet.so
 %%ZOPEBASEDIR%%/lib/python/sedscript
 %%ZOPEBASEDIR%%/lib/python/tempfile.py
@@ -2447,8 +2458,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
@@ -2487,7 +2499,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
 @dirrm %%ZOPEBASEDIR%%/lib/python
 @dirrm %%ZOPEBASEDIR%%/lib/Components/zlib
-@dirrm %%ZOPEBASEDIR%%/lib/Components/initgroups
 @dirrm %%ZOPEBASEDIR%%/lib/Components/cPickle
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output
 @dirrm %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test