3 files changed, 18 insertions, 40 deletions

diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index f5f56560dc8a..cc5c59dbc959 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.8
-PORTREVISION=	2
+PORTVERSION=	2.8.9.1
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/:src \
-		http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/:hotfix1 \
-		http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/:hotfix2
-DISTFILES=	Zope-${PORTVERSION}-final.tgz:src \
-		${HOTFIX1}.tar.gz:hotfix1 \
-		${HOTFIX2}.tgz:hotfix2
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+DISTNAME=	Zope-${PORTVERSION}-final
+EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	zope
 
 MAINTAINER=	dsh@vlink.ru
@@ -23,8 +19,6 @@ COMMENT=	An object-based web application platform
 WRKSRC=		${WRKDIR}/Zope-${PORTVERSION}-final
 USE_PYTHON=	2.3-2.4
 USE_RC_SUBR=	${PORTNAME}28.sh zeo28.sh
-HOTFIX1=	Hotfix_20060821
-HOTFIX2=	Hotfix_20070320
 LATEST_LINK=	zope28
 
 # Note: the notes that follow reflect the decisions of prior maintainers
@@ -73,13 +67,7 @@ post-patch:
 		-e 's,^\(EXENAMES="\).*"$$,\1${PYTHON_VERSION}",g' \
 		${WRKSRC}/configure
 
-post-build:
-	-${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/${HOTFIX1}
-	-${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/${HOTFIX2}
-
 post-install:
-	@${CP} -R ${WRKDIR}/${HOTFIX1} ${ZOPEBASEDIR}/lib/python/Products/
-	@${CP} -R ${WRKDIR}/${HOTFIX2} ${ZOPEBASEDIR}/lib/python/Products/
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
 		${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
 
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index 3b2621a43ca6..e241462d7ba1 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1,9 +1,3 @@
-MD5 (zope/Zope-2.8.8-final.tgz) = 6deaf23f8a77a1d6f0be43864cff9b54
-SHA256 (zope/Zope-2.8.8-final.tgz) = 94a6ad1fe0fdc28c0ea5c3a501976b96b16a4110a3290a80e4897bd3f145c856
-SIZE (zope/Zope-2.8.8-final.tgz) = 5394023
-MD5 (zope/Hotfix_20060821.tar.gz) = 5cb921d15ff6d290bfc73bdc20ff67c1
-SHA256 (zope/Hotfix_20060821.tar.gz) = 6ba5f717cc7443c6182c5b829f2a4228e7c56667d07e2b6fad8323ab1ec850af
-SIZE (zope/Hotfix_20060821.tar.gz) = 1050
-MD5 (zope/Hotfix_20070320.tgz) = 0b4cd365d99731e18827ead11400087d
-SHA256 (zope/Hotfix_20070320.tgz) = 3b8760301826aba22386a561de48523663fc7840fc11280e2c34163ba4be383a
-SIZE (zope/Hotfix_20070320.tgz) = 3805
+MD5 (zope/Zope-2.8.9.1-final.tgz) = 091e96f14c9a8aadcad3f6da74cc38c1
+SHA256 (zope/Zope-2.8.9.1-final.tgz) = 81220396961097478261341099d3aff4e93fb4e41b2e2da27f450b79d5a2ed81
+SIZE (zope/Zope-2.8.9.1-final.tgz) = 5367889
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index 5b789c4f8d2f..8306574a57a9 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -109,6 +109,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
@@ -164,6 +167,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
@@ -688,6 +693,8 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupportHooks.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testFolder.py
@@ -706,6 +713,8 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testTraverse.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testTraverse.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/test_Uninstalled.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/test_Uninstalled.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test_XMLExportImport.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test_XMLExportImport.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
@@ -939,18 +948,6 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Five/viewable.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Five/zcml.py
 %%ZOPEBASEDIR%%/lib/python/Products/Five/zcml.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20060821/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20060821/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20060821/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20060821/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/tests/test_hotfix.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/tests/test_hotfix.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -2909,6 +2906,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
@@ -6846,9 +6845,6 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZReST/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZReST/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZReST
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320/tests
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20070320
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_20060821
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/StandardCacheManagers/help