3 files changed, 18 insertions, 28 deletions

diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 34412d14fa6b..24fd9a2d4501 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	zope29
-PORTVERSION=	2.9.6
-PORTREVISION=	1
+PORTVERSION=	2.9.7
 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
+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
@@ -76,9 +72,6 @@ post-configure:
 		-e 's,^.*LN.*PYTHON.*$$,,g' \
 		${WRKSRC}/${MAKEFILE}
 
-post-build:
-	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/Hotfix_20070320/
-
 post-install:
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
 		${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
@@ -86,7 +79,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/zope29/distinfo b/www/zope29/distinfo
index 7a4b2853fe53..bae92694d138 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,6 +1,3 @@
-MD5 (zope/Zope-2.9.6-final.tgz) = a87008a9e78248072ea5908e1006b269
-SHA256 (zope/Zope-2.9.6-final.tgz) = 00ffe561df9ede6543bf5dceeea964048ee005705ba98dd8f8dbfcd8dd64fcc4
-SIZE (zope/Zope-2.9.6-final.tgz) = 6989768
-MD5 (zope/Hotfix_20070320.tgz) = 0b4cd365d99731e18827ead11400087d
-SHA256 (zope/Hotfix_20070320.tgz) = 3b8760301826aba22386a561de48523663fc7840fc11280e2c34163ba4be383a
-SIZE (zope/Hotfix_20070320.tgz) = 3805
+MD5 (zope/Zope-2.9.7-final.tgz) = 46c4319107c2a47e5d2cf42fabe6af1d
+SHA256 (zope/Zope-2.9.7-final.tgz) = f930366a9a98df34d1cb26e3a06f7cd232890328835905592527b71c8164a98e
+SIZE (zope/Zope-2.9.7-final.tgz) = 6945526
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index e71491512b0d..b0bb06951621 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/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/test_hotfix.py
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/__init__.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests/test_hotfix.pyc
-%%ZOPEBASEDIR%%/Products/Hotfix_20070320/version.txt
 %%ZOPEBASEDIR%%/bin/README.txt
 %%ZOPEBASEDIR%%/bin/analyze.py
 %%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -110,6 +102,9 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/userFolderProps.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.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
@@ -169,6 +164,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
@@ -718,6 +715,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
@@ -727,6 +725,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
@@ -1393,7 +1393,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/batch.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/batch.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/Attributes.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/BooleanAttributesAndDefault.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckBatchIteration.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslate.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslateHooked.html
@@ -1412,7 +1412,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/TeeShop1.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/TeeShop2.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/input/TeeShopLAF.html
-%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/Attributes.html
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/BooleanAttributesAndDefault.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckBatchIteration.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckI18nTranslate.html
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/output/CheckI18nTranslateHooked.html
@@ -1629,6 +1629,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
@@ -3087,6 +3088,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_Converters.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_Converters.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -9548,7 +9551,5 @@
 @dirrm %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320/tests
-@dirrm %%ZOPEBASEDIR%%/Products/Hotfix_20070320/
 @dirrmtry %%ZOPEBASEDIR%%/Products
 @dirrmtry %%ZOPEBASEDIR%%