Update to Zope 2.3.2 + Hotfix 2001-05-01

18 files changed, 150 insertions, 24 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index d044c3586c2..14a8e799f84 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${PORTVERSION}/ \
+		http://www.zope.org/Products/Zope/Hotfix_2001-05-01/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+		Hotfix_2001-05-01.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope/distinfo b/www/zope/distinfo
index 433962156e8..c9a04d630d5 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.3.1-src.tgz) = b8ae661f95eb978013fb30679de921d4
+MD5 (zope/Zope-2.3.2-src.tgz) = c74fed0f48462b31cea5ca4bb6830afc
+MD5 (zope/Hotfix_2001-05-01.tgz) = 5ccb1b57338eeb5b57b4593f884fb771
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index e746c1293d8..067c253231a 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -312,6 +312,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_form_title.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_header.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_style.css.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_style_test.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_tabs.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_top_frame.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_zmi_prefs.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/menu.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/profile.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/readme.dtml
@@ -351,6 +360,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/www/zope_button.jpg
 %%ZOPEBASEDIR%%/lib/python/App/www/zopelogo.jpg
 %%ZOPEBASEDIR%%/lib/python/BTree.so
+%%ZOPEBASEDIR%%/lib/python/BTrees/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeItemsTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeModuleTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeTemplate.c
@@ -689,6 +699,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/manageMailHost.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
@@ -876,9 +887,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/manyargs.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/simple_print.ps
@@ -1020,6 +1033,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/catalogView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/edit_stop_syn.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/manage_vocab.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.pyc
@@ -1040,6 +1055,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
@@ -1585,6 +1602,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/pcgi/configure
 %%ZOPEBASEDIR%%/pcgi/configure.in
 %%ZOPEBASEDIR%%/pcgi/install-sh
+%%ZOPEBASEDIR%%/pcgi/manifest
 %%ZOPEBASEDIR%%/pcgi/parseinfo.c
 %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c
 %%ZOPEBASEDIR%%/pcgi/pcgi.h
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index d044c3586c2..14a8e799f84 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${PORTVERSION}/ \
+		http://www.zope.org/Products/Zope/Hotfix_2001-05-01/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+		Hotfix_2001-05-01.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 433962156e8..c9a04d630d5 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.3.1-src.tgz) = b8ae661f95eb978013fb30679de921d4
+MD5 (zope/Zope-2.3.2-src.tgz) = c74fed0f48462b31cea5ca4bb6830afc
+MD5 (zope/Hotfix_2001-05-01.tgz) = 5ccb1b57338eeb5b57b4593f884fb771
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index e746c1293d8..067c253231a 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -312,6 +312,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_form_title.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_header.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_style.css.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_style_test.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_tabs.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_top_frame.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_zmi_prefs.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/menu.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/profile.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/readme.dtml
@@ -351,6 +360,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/www/zope_button.jpg
 %%ZOPEBASEDIR%%/lib/python/App/www/zopelogo.jpg
 %%ZOPEBASEDIR%%/lib/python/BTree.so
+%%ZOPEBASEDIR%%/lib/python/BTrees/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeItemsTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeModuleTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeTemplate.c
@@ -689,6 +699,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/manageMailHost.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
@@ -876,9 +887,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/manyargs.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/simple_print.ps
@@ -1020,6 +1033,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/catalogView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/edit_stop_syn.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/manage_vocab.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.pyc
@@ -1040,6 +1055,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
@@ -1585,6 +1602,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/pcgi/configure
 %%ZOPEBASEDIR%%/pcgi/configure.in
 %%ZOPEBASEDIR%%/pcgi/install-sh
+%%ZOPEBASEDIR%%/pcgi/manifest
 %%ZOPEBASEDIR%%/pcgi/parseinfo.c
 %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c
 %%ZOPEBASEDIR%%/pcgi/pcgi.h
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index d044c3586c2..14a8e799f84 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${PORTVERSION}/ \
+		http://www.zope.org/Products/Zope/Hotfix_2001-05-01/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+		Hotfix_2001-05-01.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 433962156e8..c9a04d630d5 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.3.1-src.tgz) = b8ae661f95eb978013fb30679de921d4
+MD5 (zope/Zope-2.3.2-src.tgz) = c74fed0f48462b31cea5ca4bb6830afc
+MD5 (zope/Hotfix_2001-05-01.tgz) = 5ccb1b57338eeb5b57b4593f884fb771
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index e746c1293d8..067c253231a 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -312,6 +312,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_form_title.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_header.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_style.css.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_style_test.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_tabs.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_top_frame.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_zmi_prefs.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/menu.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/profile.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/readme.dtml
@@ -351,6 +360,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/www/zope_button.jpg
 %%ZOPEBASEDIR%%/lib/python/App/www/zopelogo.jpg
 %%ZOPEBASEDIR%%/lib/python/BTree.so
+%%ZOPEBASEDIR%%/lib/python/BTrees/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeItemsTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeModuleTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeTemplate.c
@@ -689,6 +699,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/manageMailHost.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
@@ -876,9 +887,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/manyargs.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/simple_print.ps
@@ -1020,6 +1033,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/catalogView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/edit_stop_syn.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/manage_vocab.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.pyc
@@ -1040,6 +1055,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
@@ -1585,6 +1602,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/pcgi/configure
 %%ZOPEBASEDIR%%/pcgi/configure.in
 %%ZOPEBASEDIR%%/pcgi/install-sh
+%%ZOPEBASEDIR%%/pcgi/manifest
 %%ZOPEBASEDIR%%/pcgi/parseinfo.c
 %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c
 %%ZOPEBASEDIR%%/pcgi/pcgi.h
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index d044c3586c2..14a8e799f84 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${PORTVERSION}/ \
+		http://www.zope.org/Products/Zope/Hotfix_2001-05-01/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+		Hotfix_2001-05-01.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index 433962156e8..c9a04d630d5 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.3.1-src.tgz) = b8ae661f95eb978013fb30679de921d4
+MD5 (zope/Zope-2.3.2-src.tgz) = c74fed0f48462b31cea5ca4bb6830afc
+MD5 (zope/Hotfix_2001-05-01.tgz) = 5ccb1b57338eeb5b57b4593f884fb771
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index e746c1293d8..067c253231a 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -312,6 +312,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_form_title.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_header.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_style.css.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_style_test.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_tabs.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_top_frame.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_zmi_prefs.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/menu.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/profile.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/readme.dtml
@@ -351,6 +360,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/www/zope_button.jpg
 %%ZOPEBASEDIR%%/lib/python/App/www/zopelogo.jpg
 %%ZOPEBASEDIR%%/lib/python/BTree.so
+%%ZOPEBASEDIR%%/lib/python/BTrees/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeItemsTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeModuleTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeTemplate.c
@@ -689,6 +699,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/manageMailHost.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
@@ -876,9 +887,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/manyargs.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/simple_print.ps
@@ -1020,6 +1033,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/catalogView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/edit_stop_syn.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/manage_vocab.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.pyc
@@ -1040,6 +1055,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
@@ -1585,6 +1602,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/pcgi/configure
 %%ZOPEBASEDIR%%/pcgi/configure.in
 %%ZOPEBASEDIR%%/pcgi/install-sh
+%%ZOPEBASEDIR%%/pcgi/manifest
 %%ZOPEBASEDIR%%/pcgi/parseinfo.c
 %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c
 %%ZOPEBASEDIR%%/pcgi/pcgi.h
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index d044c3586c2..14a8e799f84 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${PORTVERSION}/ \
+		http://www.zope.org/Products/Zope/Hotfix_2001-05-01/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+		Hotfix_2001-05-01.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index 433962156e8..c9a04d630d5 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.3.1-src.tgz) = b8ae661f95eb978013fb30679de921d4
+MD5 (zope/Zope-2.3.2-src.tgz) = c74fed0f48462b31cea5ca4bb6830afc
+MD5 (zope/Hotfix_2001-05-01.tgz) = 5ccb1b57338eeb5b57b4593f884fb771
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index e746c1293d8..067c253231a 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -312,6 +312,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_form_title.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_header.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_style.css.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_style_test.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_tabs.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_top_frame.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_zmi_prefs.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/menu.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/profile.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/readme.dtml
@@ -351,6 +360,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/www/zope_button.jpg
 %%ZOPEBASEDIR%%/lib/python/App/www/zopelogo.jpg
 %%ZOPEBASEDIR%%/lib/python/BTree.so
+%%ZOPEBASEDIR%%/lib/python/BTrees/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeItemsTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeModuleTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeTemplate.c
@@ -689,6 +699,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/manageMailHost.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
@@ -876,9 +887,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/manyargs.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/simple_print.ps
@@ -1020,6 +1033,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/catalogView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/edit_stop_syn.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/manage_vocab.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.pyc
@@ -1040,6 +1055,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
@@ -1585,6 +1602,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/pcgi/configure
 %%ZOPEBASEDIR%%/pcgi/configure.in
 %%ZOPEBASEDIR%%/pcgi/install-sh
+%%ZOPEBASEDIR%%/pcgi/manifest
 %%ZOPEBASEDIR%%/pcgi/parseinfo.c
 %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c
 %%ZOPEBASEDIR%%/pcgi/pcgi.h
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index d044c3586c2..14a8e799f84 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=  http://www.zope.org/Products/Zope/${PORTVERSION}/ \
+		http://www.zope.org/Products/Zope/Hotfix_2001-05-01/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+		Hotfix_2001-05-01.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 433962156e8..c9a04d630d5 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1 +1,2 @@
-MD5 (zope/Zope-2.3.1-src.tgz) = b8ae661f95eb978013fb30679de921d4
+MD5 (zope/Zope-2.3.2-src.tgz) = c74fed0f48462b31cea5ca4bb6830afc
+MD5 (zope/Hotfix_2001-05-01.tgz) = 5ccb1b57338eeb5b57b4593f884fb771
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index e746c1293d8..067c253231a 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -312,6 +312,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_form_title.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_footer.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_header.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_page_style.css.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_style_test.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_tabs.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_top_frame.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/manage_zmi_prefs.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/menu.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/profile.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/readme.dtml
@@ -351,6 +360,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/www/zope_button.jpg
 %%ZOPEBASEDIR%%/lib/python/App/www/zopelogo.jpg
 %%ZOPEBASEDIR%%/lib/python/BTree.so
+%%ZOPEBASEDIR%%/lib/python/BTrees/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeItemsTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeModuleTemplate.c
 %%ZOPEBASEDIR%%/lib/python/BTrees/BTreeTemplate.c
@@ -689,6 +699,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/addMailHost_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml/manageMailHost.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Add.stx
 %%ZOPEBASEDIR%%/lib/python/Products/MailHost/help/Mail-Host_Edit.stx
@@ -876,9 +887,11 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/boolean_map.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/manyargs.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/simple_print.ps
@@ -1020,6 +1033,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/catalogView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/edit_stop_syn.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/manage_vocab.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/Vocabulary.pyc
@@ -1040,6 +1055,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
@@ -1585,6 +1602,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/pcgi/configure
 %%ZOPEBASEDIR%%/pcgi/configure.in
 %%ZOPEBASEDIR%%/pcgi/install-sh
+%%ZOPEBASEDIR%%/pcgi/manifest
 %%ZOPEBASEDIR%%/pcgi/parseinfo.c
 %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c
 %%ZOPEBASEDIR%%/pcgi/pcgi.h