Update to 2.8.2

PR:		87428
Submitted by:	Denis Shaposhnikov <dsh@vlink.ru> (maintainer)

15 files changed, 70 insertions, 80 deletions

diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index c4eff5cc91e9..0925144ceb13 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,17 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.2
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2005-10-09/security_alert/:hotfix_20051009
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
-EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_2005-10-09.tar.gz:hotfix_20051009
 DIST_SUBDIR=	zope
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	An object-based web application platform
@@ -65,9 +59,6 @@ ISBATCH=	-u admin:test123
 ISBATCH=	""
 .endif
 
-pre-patch:
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/Hotfix_2005-10-09.tar.gz -C ${WRKSRC}/lib/python
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 837295f09680..e5d159640415 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,4 +1,2 @@
-MD5 (zope/Zope-2.8.1-final.tgz) = 0ec441a35175bb8d8c557b7d3c63f6f6
-SIZE (zope/Zope-2.8.1-final.tgz) = 5343921
-MD5 (zope/Hotfix_2005-10-09.tar.gz) = 607b2f4fa702d6e41f0bf960ec41979e
-SIZE (zope/Hotfix_2005-10-09.tar.gz) = 265673
+MD5 (zope/Zope-2.8.2-final.tar.gz) = 3ce41fce6deb1739fec5c4abcd8ab834
+SIZE (zope/Zope-2.8.2-final.tar.gz) = 8227937
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index ac62393e6922..e3c758e5ffa7 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -950,6 +950,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/testMailHost.py
@@ -1230,6 +1232,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py
@@ -2003,6 +2007,10 @@
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.py
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapter_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/__init__.py
@@ -3023,6 +3031,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testIterator.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.py
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope.py
 %%ZOPEBASEDIR%%/lib/python/Zope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope2/App/ClassFactory.py
@@ -3136,7 +3146,6 @@
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/.misc.py.swo
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/admonitions.py
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index c4eff5cc91e9..0925144ceb13 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,17 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.2
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2005-10-09/security_alert/:hotfix_20051009
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
-EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_2005-10-09.tar.gz:hotfix_20051009
 DIST_SUBDIR=	zope
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	An object-based web application platform
@@ -65,9 +59,6 @@ ISBATCH=	-u admin:test123
 ISBATCH=	""
 .endif
 
-pre-patch:
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/Hotfix_2005-10-09.tar.gz -C ${WRKSRC}/lib/python
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 837295f09680..e5d159640415 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,4 +1,2 @@
-MD5 (zope/Zope-2.8.1-final.tgz) = 0ec441a35175bb8d8c557b7d3c63f6f6
-SIZE (zope/Zope-2.8.1-final.tgz) = 5343921
-MD5 (zope/Hotfix_2005-10-09.tar.gz) = 607b2f4fa702d6e41f0bf960ec41979e
-SIZE (zope/Hotfix_2005-10-09.tar.gz) = 265673
+MD5 (zope/Zope-2.8.2-final.tar.gz) = 3ce41fce6deb1739fec5c4abcd8ab834
+SIZE (zope/Zope-2.8.2-final.tar.gz) = 8227937
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index ac62393e6922..e3c758e5ffa7 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -950,6 +950,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/testMailHost.py
@@ -1230,6 +1232,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py
@@ -2003,6 +2007,10 @@
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.py
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapter_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/__init__.py
@@ -3023,6 +3031,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testIterator.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.py
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope.py
 %%ZOPEBASEDIR%%/lib/python/Zope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope2/App/ClassFactory.py
@@ -3136,7 +3146,6 @@
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/.misc.py.swo
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/admonitions.py
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index c4eff5cc91e9..0925144ceb13 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,17 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.2
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2005-10-09/security_alert/:hotfix_20051009
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
-EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_2005-10-09.tar.gz:hotfix_20051009
 DIST_SUBDIR=	zope
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	An object-based web application platform
@@ -65,9 +59,6 @@ ISBATCH=	-u admin:test123
 ISBATCH=	""
 .endif
 
-pre-patch:
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/Hotfix_2005-10-09.tar.gz -C ${WRKSRC}/lib/python
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index 837295f09680..e5d159640415 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1,4 +1,2 @@
-MD5 (zope/Zope-2.8.1-final.tgz) = 0ec441a35175bb8d8c557b7d3c63f6f6
-SIZE (zope/Zope-2.8.1-final.tgz) = 5343921
-MD5 (zope/Hotfix_2005-10-09.tar.gz) = 607b2f4fa702d6e41f0bf960ec41979e
-SIZE (zope/Hotfix_2005-10-09.tar.gz) = 265673
+MD5 (zope/Zope-2.8.2-final.tar.gz) = 3ce41fce6deb1739fec5c4abcd8ab834
+SIZE (zope/Zope-2.8.2-final.tar.gz) = 8227937
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index ac62393e6922..e3c758e5ffa7 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -950,6 +950,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/testMailHost.py
@@ -1230,6 +1232,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py
@@ -2003,6 +2007,10 @@
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.py
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapter_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/__init__.py
@@ -3023,6 +3031,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testIterator.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.py
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope.py
 %%ZOPEBASEDIR%%/lib/python/Zope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope2/App/ClassFactory.py
@@ -3136,7 +3146,6 @@
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/.misc.py.swo
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/admonitions.py
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index c4eff5cc91e9..0925144ceb13 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,17 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.2
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2005-10-09/security_alert/:hotfix_20051009
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
-EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_2005-10-09.tar.gz:hotfix_20051009
 DIST_SUBDIR=	zope
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	An object-based web application platform
@@ -65,9 +59,6 @@ ISBATCH=	-u admin:test123
 ISBATCH=	""
 .endif
 
-pre-patch:
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/Hotfix_2005-10-09.tar.gz -C ${WRKSRC}/lib/python
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index 837295f09680..e5d159640415 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1,4 +1,2 @@
-MD5 (zope/Zope-2.8.1-final.tgz) = 0ec441a35175bb8d8c557b7d3c63f6f6
-SIZE (zope/Zope-2.8.1-final.tgz) = 5343921
-MD5 (zope/Hotfix_2005-10-09.tar.gz) = 607b2f4fa702d6e41f0bf960ec41979e
-SIZE (zope/Hotfix_2005-10-09.tar.gz) = 265673
+MD5 (zope/Zope-2.8.2-final.tar.gz) = 3ce41fce6deb1739fec5c4abcd8ab834
+SIZE (zope/Zope-2.8.2-final.tar.gz) = 8227937
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index ac62393e6922..e3c758e5ffa7 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -950,6 +950,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/testMailHost.py
@@ -1230,6 +1232,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py
@@ -2003,6 +2007,10 @@
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.py
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapter_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/__init__.py
@@ -3023,6 +3031,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testIterator.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.py
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope.py
 %%ZOPEBASEDIR%%/lib/python/Zope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope2/App/ClassFactory.py
@@ -3136,7 +3146,6 @@
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/.misc.py.swo
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/admonitions.py
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index c4eff5cc91e9..0925144ceb13 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,17 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.2
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2005-10-09/security_alert/:hotfix_20051009
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
-EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Hotfix_2005-10-09.tar.gz:hotfix_20051009
 DIST_SUBDIR=	zope
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	An object-based web application platform
@@ -65,9 +59,6 @@ ISBATCH=	-u admin:test123
 ISBATCH=	""
 .endif
 
-pre-patch:
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/Hotfix_2005-10-09.tar.gz -C ${WRKSRC}/lib/python
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 837295f09680..e5d159640415 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,4 +1,2 @@
-MD5 (zope/Zope-2.8.1-final.tgz) = 0ec441a35175bb8d8c557b7d3c63f6f6
-SIZE (zope/Zope-2.8.1-final.tgz) = 5343921
-MD5 (zope/Hotfix_2005-10-09.tar.gz) = 607b2f4fa702d6e41f0bf960ec41979e
-SIZE (zope/Hotfix_2005-10-09.tar.gz) = 265673
+MD5 (zope/Zope-2.8.2-final.tar.gz) = 3ce41fce6deb1739fec5c4abcd8ab834
+SIZE (zope/Zope-2.8.2-final.tar.gz) = 8227937
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index ac62393e6922..e3c758e5ffa7 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -950,6 +950,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/MailHost.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/tests/testMailHost.py
@@ -1230,6 +1232,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.py
+%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZRPythonExpr.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py
@@ -2003,6 +2007,10 @@
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.py
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/testResult.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlgroup.pyc
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.py
+%%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/tests/test_sqlvar.pyc
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/ZRDB/www/DBAdapter_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Shared/DC/__init__.py
@@ -3023,6 +3031,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testIterator.pyc
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.py
 %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testTree.pyc
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.py
+%%ZOPEBASEDIR%%/lib/python/ZTUtils/tests/testZope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope.py
 %%ZOPEBASEDIR%%/lib/python/Zope.pyc
 %%ZOPEBASEDIR%%/lib/python/Zope2/App/ClassFactory.py
@@ -3136,7 +3146,6 @@
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/.misc.py.swo
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.py
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/admonitions.py