Update to 3.2.1

3 files changed, 32 insertions, 20 deletions

diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index e2ad489..6fee684d9 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	zodb
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	databases
-MASTER_SITES=	http://www.zope.org/Products/ZODB${PORTVERSION}/${PORTVERSION}/
+MASTER_SITES=	http://www.zope.org/Products/ZODB3.2/${PORTVERSION}/
 PKGNAMESUFFIX=	-py${PYTHON_SUFFIX}
 DISTNAME=	ZODB3-${PORTVERSION}
 
diff --git a/databases/zodb3/distinfo b/databases/zodb3/distinfo
index 56edec9..d7e0fe1 100644
--- a/databases/zodb3/distinfo
+++ b/databases/zodb3/distinfo
@@ -1 +1,2 @@
-MD5 (ZODB3-3.2.tar.gz) = bd8ccd82376c94eb673a1d13724c12ff
+MD5 (ZODB3-3.2.1.tar.gz) = 1298ce72605cdc0b41046fbb35ce64f9
+SIZE (ZODB3-3.2.1.tar.gz) = 842944
diff --git a/databases/zodb3/pkg-plist b/databases/zodb3/pkg-plist
index 830c9ed..e7fa5f4 100644
--- a/databases/zodb3/pkg-plist
+++ b/databases/zodb3/pkg-plist
@@ -2,13 +2,13 @@ bin/fsdump.py
 bin/fsrefs.py
 bin/fstail.py
 bin/fstest.py
+bin/mkzeoinst.py
 bin/repozo.py
-bin/zeopack.py
-bin/zconfig
 bin/runzeo.py
-bin/mkzeoinst.py
-bin/zdrun.py
+bin/zconfig
 bin/zdctl.py
+bin/zdrun.py
+bin/zeopack.py
 %%PYTHON_INCLUDEDIR%%/ZODB3/ExtensionClass.h
 %%PYTHON_INCLUDEDIR%%/ZODB3/cPersistence.h
 %%PYTHON_SITELIBDIR%%/Acquisition.so
@@ -130,12 +130,6 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/ThreadedAsync/__init__.py
 %%PYTHON_SITELIBDIR%%/ThreadedAsync/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ThreadedAsync/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ZConfig/Config.py
-%%PYTHON_SITELIBDIR%%/ZConfig/Config.pyc
-%%PYTHON_SITELIBDIR%%/ZConfig/Config.pyo
-%%PYTHON_SITELIBDIR%%/ZConfig/Context.py
-%%PYTHON_SITELIBDIR%%/ZConfig/Context.pyc
-%%PYTHON_SITELIBDIR%%/ZConfig/Context.pyo
 %%PYTHON_SITELIBDIR%%/ZConfig/__init__.py
 %%PYTHON_SITELIBDIR%%/ZConfig/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ZConfig/__init__.pyo
@@ -166,6 +160,11 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/input/base-datatype1.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/input/base-datatype2.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/input/base-keytype1.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/input/base-keytype2.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/input/base.xml
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/input/include.conf
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/input/inner.conf
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/input/library.xml
@@ -174,7 +173,18 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/input/simple.conf
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/input/simple.xml
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/input/simplesections.conf
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/input/simplesections.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/__init__.py
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/thing/__init__.py
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/thing/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/thing/__init__.pyo
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/library/thing/component.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/thing/extras/extras.xml
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/widget/__init__.py
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/widget/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/library/widget/__init__.pyo
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/library/widget/component.xml
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/library/widget/extra.xml
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/runtests.py
@@ -183,6 +193,9 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/support.py
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/support.pyc
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/support.pyo
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/test_cfgimports.py
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/test_cfgimports.pyc
+%%PYTHON_SITELIBDIR%%/ZConfig/tests/test_cfgimports.pyo
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/test_cmdline.py
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/test_cmdline.pyc
 %%PYTHON_SITELIBDIR%%/ZConfig/tests/test_cmdline.pyo
@@ -337,6 +350,10 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/ZEO/util.pyc
 %%PYTHON_SITELIBDIR%%/ZEO/util.pyo
 %%PYTHON_SITELIBDIR%%/ZEO/version.txt
+%%PYTHON_SITELIBDIR%%/ZEO/zeoctl.py
+%%PYTHON_SITELIBDIR%%/ZEO/zeoctl.pyc
+%%PYTHON_SITELIBDIR%%/ZEO/zeoctl.pyo
+%%PYTHON_SITELIBDIR%%/ZEO/zeoctl.xml
 %%PYTHON_SITELIBDIR%%/ZEO/zeopasswd.py
 %%PYTHON_SITELIBDIR%%/ZEO/zeopasswd.pyc
 %%PYTHON_SITELIBDIR%%/ZEO/zeopasswd.pyo
@@ -619,12 +636,10 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/zLOG/tests/testzLogConfig.py
 %%PYTHON_SITELIBDIR%%/zLOG/tests/testzLogConfig.pyc
 %%PYTHON_SITELIBDIR%%/zLOG/tests/testzLogConfig.pyo
-%%PYTHON_SITELIBDIR%%/zdaemon/Daemon.py
-%%PYTHON_SITELIBDIR%%/zdaemon/Daemon.pyc
-%%PYTHON_SITELIBDIR%%/zdaemon/Daemon.pyo
 %%PYTHON_SITELIBDIR%%/zdaemon/__init__.py
 %%PYTHON_SITELIBDIR%%/zdaemon/__init__.pyc
 %%PYTHON_SITELIBDIR%%/zdaemon/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zdaemon/component.xml
 %%PYTHON_SITELIBDIR%%/zdaemon/sample.conf
 %%PYTHON_SITELIBDIR%%/zdaemon/schema.xml
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/__init__.py
@@ -637,9 +652,6 @@ bin/zdctl.py
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/parent.py
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/parent.pyc
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/parent.pyo
-%%PYTHON_SITELIBDIR%%/zdaemon/tests/testDaemon.py
-%%PYTHON_SITELIBDIR%%/zdaemon/tests/testDaemon.pyc
-%%PYTHON_SITELIBDIR%%/zdaemon/tests/testDaemon.pyo
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/testzdoptions.py
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/testzdoptions.pyc
 %%PYTHON_SITELIBDIR%%/zdaemon/tests/testzdoptions.pyo