- Update to 2.10.3

PR:		ports/110987
Submitted by:	Yasushi Hayashi <yasi@yasi.to> (maintainer)

9 files changed, 45 insertions, 81 deletions

diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 12ff7a578c36..767dfdb28f62 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	zope210
-PORTVERSION=	2.10.2
-PORTREVISION=	1
+PORTVERSION=	2.10.3
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/:hotfix
-DISTNAME=	Zope-${PORTVERSION}
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+DISTNAME=	Zope-${PORTVERSION}-final
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_20070320.tgz:hotfix
 DIST_SUBDIR=	zope
 
 MAINTAINER=	yasi@yasi.to
@@ -23,8 +19,6 @@ COMMENT=	An object-based web application platform
 USE_PYTHON=	2.4
 USE_RC_SUBR=	${PORTNAME}.sh zeo210.sh
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-final
-
 # Note: the notes that follow reflect the decisions of prior maintainers
 # of this port. IOW, don't blame me if you don't like the way it's done.
 # Exceptions to this are marked as such.
@@ -79,7 +73,6 @@ post-configure:
 
 post-build:
 	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
-	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/Hotfix_20070320/
 
 post-install:
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
@@ -88,7 +81,6 @@ post-install:
 	${MKDIR} ${ZOPEBASEDIR}/Products
 	${CP} ${FILESDIR}/Products_00readme-freebsd.txt \
 		${ZOPEBASEDIR}/Products/00readme-freebsd.txt
-	${CP} -R ${WRKDIR}/Hotfix_20070320 ${ZOPEBASEDIR}/Products/
 
 	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w+r
 
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index ec94a4c1eea1..41c1278dacd8 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,6 +1,3 @@
-MD5 (zope/Zope-2.10.2.tgz) = 4f4e2afe23c19def16ba43db4b6252cb
-SHA256 (zope/Zope-2.10.2.tgz) = f08887f2f3a3225a47427814fd7ff99603a1fb0f905df68306792a1cc486d94b
-SIZE (zope/Zope-2.10.2.tgz) = 7089784
-MD5 (zope/Hotfix_20070320.tgz) = 0b4cd365d99731e18827ead11400087d
-SHA256 (zope/Hotfix_20070320.tgz) = 3b8760301826aba22386a561de48523663fc7840fc11280e2c34163ba4be383a
-SIZE (zope/Hotfix_20070320.tgz) = 3805
+MD5 (zope/Zope-2.10.3-final.tgz) = 60cedefc1589cdb2dd91e6e85f31b9b7
+SHA256 (zope/Zope-2.10.3-final.tgz) = 79233c797c77edf447f1903c93a2accbb227b3af2159a99d731607aa2e274350
+SIZE (zope/Zope-2.10.3-final.tgz) = 7094367
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 79a53d0c629e..46d6d5df1b41 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -1,12 +1,4 @@
 %%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/README.txt
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/__init__.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/version.txt
 %%ZOPEBASEDIR%%/bin/README.txt
 %%ZOPEBASEDIR%%/bin/analyze.py
 %%ZOPEBASEDIR%%/bin/analyze.pyc
@@ -141,6 +133,9 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/logger_wrapper.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/logger_wrapper.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.txt
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/README
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.pyc
@@ -200,6 +195,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeGuards.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_requestmethod.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_requestmethod.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_safeiter.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_safeiter.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/unauthorized.py
@@ -724,6 +721,7 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/subscribers.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/events.zcml
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif
@@ -733,6 +731,8 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testApplication.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportEvents.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportEvents.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testFTPInterface.py
@@ -1722,6 +1722,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/ns_bind.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/ns_bind_invalid.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/simple_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/subversive_except.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/try_except.ps
@@ -9862,7 +9863,5 @@
 @dirrm %%ZOPEBASEDIR%%/skel/etc/package-includes
 @dirrm %%ZOPEBASEDIR%%/skel/etc
 @dirrm %%ZOPEBASEDIR%%/skel
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320
 @dirrmtry %%ZOPEBASEDIR%%/Products
 @dirrmtry %%ZOPEBASEDIR%%
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 12ff7a578c36..767dfdb28f62 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	zope210
-PORTVERSION=	2.10.2
-PORTREVISION=	1
+PORTVERSION=	2.10.3
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/:hotfix
-DISTNAME=	Zope-${PORTVERSION}
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+DISTNAME=	Zope-${PORTVERSION}-final
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_20070320.tgz:hotfix
 DIST_SUBDIR=	zope
 
 MAINTAINER=	yasi@yasi.to
@@ -23,8 +19,6 @@ COMMENT=	An object-based web application platform
 USE_PYTHON=	2.4
 USE_RC_SUBR=	${PORTNAME}.sh zeo210.sh
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-final
-
 # Note: the notes that follow reflect the decisions of prior maintainers
 # of this port. IOW, don't blame me if you don't like the way it's done.
 # Exceptions to this are marked as such.
@@ -79,7 +73,6 @@ post-configure:
 
 post-build:
 	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
-	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/Hotfix_20070320/
 
 post-install:
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
@@ -88,7 +81,6 @@ post-install:
 	${MKDIR} ${ZOPEBASEDIR}/Products
 	${CP} ${FILESDIR}/Products_00readme-freebsd.txt \
 		${ZOPEBASEDIR}/Products/00readme-freebsd.txt
-	${CP} -R ${WRKDIR}/Hotfix_20070320 ${ZOPEBASEDIR}/Products/
 
 	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w+r
 
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index ec94a4c1eea1..41c1278dacd8 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,6 +1,3 @@
-MD5 (zope/Zope-2.10.2.tgz) = 4f4e2afe23c19def16ba43db4b6252cb
-SHA256 (zope/Zope-2.10.2.tgz) = f08887f2f3a3225a47427814fd7ff99603a1fb0f905df68306792a1cc486d94b
-SIZE (zope/Zope-2.10.2.tgz) = 7089784
-MD5 (zope/Hotfix_20070320.tgz) = 0b4cd365d99731e18827ead11400087d
-SHA256 (zope/Hotfix_20070320.tgz) = 3b8760301826aba22386a561de48523663fc7840fc11280e2c34163ba4be383a
-SIZE (zope/Hotfix_20070320.tgz) = 3805
+MD5 (zope/Zope-2.10.3-final.tgz) = 60cedefc1589cdb2dd91e6e85f31b9b7
+SHA256 (zope/Zope-2.10.3-final.tgz) = 79233c797c77edf447f1903c93a2accbb227b3af2159a99d731607aa2e274350
+SIZE (zope/Zope-2.10.3-final.tgz) = 7094367
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index 79a53d0c629e..46d6d5df1b41 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -1,12 +1,4 @@
 %%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/README.txt
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/__init__.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/version.txt
 %%ZOPEBASEDIR%%/bin/README.txt
 %%ZOPEBASEDIR%%/bin/analyze.py
 %%ZOPEBASEDIR%%/bin/analyze.pyc
@@ -141,6 +133,9 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/logger_wrapper.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/logger_wrapper.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.txt
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/README
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.pyc
@@ -200,6 +195,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeGuards.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_requestmethod.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_requestmethod.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_safeiter.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_safeiter.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/unauthorized.py
@@ -724,6 +721,7 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/subscribers.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/events.zcml
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif
@@ -733,6 +731,8 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testApplication.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportEvents.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportEvents.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testFTPInterface.py
@@ -1722,6 +1722,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/ns_bind.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/ns_bind_invalid.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/simple_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/subversive_except.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/try_except.ps
@@ -9862,7 +9863,5 @@
 @dirrm %%ZOPEBASEDIR%%/skel/etc/package-includes
 @dirrm %%ZOPEBASEDIR%%/skel/etc
 @dirrm %%ZOPEBASEDIR%%/skel
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320
 @dirrmtry %%ZOPEBASEDIR%%/Products
 @dirrmtry %%ZOPEBASEDIR%%
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 12ff7a578c36..767dfdb28f62 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	zope210
-PORTVERSION=	2.10.2
-PORTREVISION=	1
+PORTVERSION=	2.10.3
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/:hotfix
-DISTNAME=	Zope-${PORTVERSION}
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+DISTNAME=	Zope-${PORTVERSION}-final
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_20070320.tgz:hotfix
 DIST_SUBDIR=	zope
 
 MAINTAINER=	yasi@yasi.to
@@ -23,8 +19,6 @@ COMMENT=	An object-based web application platform
 USE_PYTHON=	2.4
 USE_RC_SUBR=	${PORTNAME}.sh zeo210.sh
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-final
-
 # Note: the notes that follow reflect the decisions of prior maintainers
 # of this port. IOW, don't blame me if you don't like the way it's done.
 # Exceptions to this are marked as such.
@@ -79,7 +73,6 @@ post-configure:
 
 post-build:
 	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
-	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/Hotfix_20070320/
 
 post-install:
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
@@ -88,7 +81,6 @@ post-install:
 	${MKDIR} ${ZOPEBASEDIR}/Products
 	${CP} ${FILESDIR}/Products_00readme-freebsd.txt \
 		${ZOPEBASEDIR}/Products/00readme-freebsd.txt
-	${CP} -R ${WRKDIR}/Hotfix_20070320 ${ZOPEBASEDIR}/Products/
 
 	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w+r
 
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index ec94a4c1eea1..41c1278dacd8 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1,6 +1,3 @@
-MD5 (zope/Zope-2.10.2.tgz) = 4f4e2afe23c19def16ba43db4b6252cb
-SHA256 (zope/Zope-2.10.2.tgz) = f08887f2f3a3225a47427814fd7ff99603a1fb0f905df68306792a1cc486d94b
-SIZE (zope/Zope-2.10.2.tgz) = 7089784
-MD5 (zope/Hotfix_20070320.tgz) = 0b4cd365d99731e18827ead11400087d
-SHA256 (zope/Hotfix_20070320.tgz) = 3b8760301826aba22386a561de48523663fc7840fc11280e2c34163ba4be383a
-SIZE (zope/Hotfix_20070320.tgz) = 3805
+MD5 (zope/Zope-2.10.3-final.tgz) = 60cedefc1589cdb2dd91e6e85f31b9b7
+SHA256 (zope/Zope-2.10.3-final.tgz) = 79233c797c77edf447f1903c93a2accbb227b3af2159a99d731607aa2e274350
+SIZE (zope/Zope-2.10.3-final.tgz) = 7094367
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index 79a53d0c629e..46d6d5df1b41 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -1,12 +1,4 @@
 %%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/README.txt
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/__init__.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/version.txt
 %%ZOPEBASEDIR%%/bin/README.txt
 %%ZOPEBASEDIR%%/bin/analyze.py
 %%ZOPEBASEDIR%%/bin/analyze.pyc
@@ -141,6 +133,9 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/logger_wrapper.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/logger_wrapper.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/requestmethod.txt
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/README
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.pyc
@@ -200,6 +195,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeGuards.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeSecurityPolicy.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_requestmethod.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_requestmethod.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_safeiter.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/test_safeiter.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/unauthorized.py
@@ -724,6 +721,7 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/subscribers.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/events.zcml
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif
@@ -733,6 +731,8 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testApplication.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportEvents.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportEvents.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testFTPInterface.py
@@ -1722,6 +1722,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/ns_bind.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/ns_bind_invalid.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/simple_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/subversive_except.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/try_except.ps
@@ -9862,7 +9863,5 @@
 @dirrm %%ZOPEBASEDIR%%/skel/etc/package-includes
 @dirrm %%ZOPEBASEDIR%%/skel/etc
 @dirrm %%ZOPEBASEDIR%%/skel
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320
 @dirrmtry %%ZOPEBASEDIR%%/Products
 @dirrmtry %%ZOPEBASEDIR%%