- Migrated port from the unofficial 3rd party standalone distribution of ZODB

  to the newly merged official StandaloneZODB from Zope Corp.

8 files changed, 309 insertions, 97 deletions

diff --git a/databases/zodb/Makefile b/databases/zodb/Makefile
index 4a8f7d98f01a..3fb39604c248 100644
--- a/databases/zodb/Makefile
+++ b/databases/zodb/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	zodb
-PORTVERSION=	2001.06.16
+PORTVERSION=	1.0.c1
+PORTEPOCH=	1
 CATEGORIES=	databases python
-MASTER_SITES=	http://amk.ca/files/zodb/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
+MASTER_SITES=	http://www.zope.org/Products/StandaloneZODB/
+DISTNAME=	StandaloneZODB-${PORTVERSION:C/\.([^.]*)$/\1/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	wjv@FreeBSD.org
 
@@ -17,26 +19,15 @@ BUILD_DEPENDS=	${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bsddb3/__init__.py:${PORTSDIR}/databases/py-bsddb3
 
 USE_PYTHON=	yes
-SRCDIRS=	zodb-basic ExtensionClass ZODB BTrees
+PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 
 do-build:
-.for dir in ${SRCDIRS}
-	@ cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-	  setup.py build
-.endfor
+	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
+
+pre-install:
+	@ ${SH} ${PKGREQ} INSTALL
 
 do-install:
-.for dir in ${SRCDIRS}
-	@ cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-	  setup.py install -c -O1 --prefix=${PREFIX}
-.endfor
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-.for docfile in ACKS CHANGES README TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
-.endfor
-.endif
+	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 --prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/databases/zodb/distinfo b/databases/zodb/distinfo
index c80edbcda720..b7fedc2a06f4 100644
--- a/databases/zodb/distinfo
+++ b/databases/zodb/distinfo
@@ -1 +1 @@
-MD5 (zodb-2001-06-16.tar.gz) = fbb54f5203cf023830fac2595dc606a1
+MD5 (StandaloneZODB-1.0c1.tgz) = 40d2715c80a8457873f839973ea05b80
diff --git a/databases/zodb/files/patch-ZODB-Timestamp.c b/databases/zodb/files/patch-ZODB-Timestamp.c
deleted file mode 100644
index 5bf20c435287..000000000000
--- a/databases/zodb/files/patch-ZODB-Timestamp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ZODB/TimeStamp.c.orig	Wed Sep 20 03:00:08 2000
-+++ ZODB/TimeStamp.c	Tue Sep 18 14:56:25 2001
-@@ -91,7 +91,7 @@
- #include <stdlib.h>
- #include <time.h>
- #ifdef USE_EXTENSION_CLASS
--#include "ExtensionClass/ExtensionClass.h"
-+#include "../ExtensionClass/src/ExtensionClass.h"
- #else
- #include "Python.h"
- #endif
diff --git a/databases/zodb/files/patch-ZODB-cPersistence.h b/databases/zodb/files/patch-ZODB-cPersistence.h
deleted file mode 100644
index e88fc66a1481..000000000000
--- a/databases/zodb/files/patch-ZODB-cPersistence.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ZODB/cPersistence.h.orig	Wed Sep 13 03:32:31 2000
-+++ ZODB/cPersistence.h	Tue Sep 18 14:56:53 2001
-@@ -86,7 +86,7 @@
- #ifndef CPERSISTENCE_H
- #define CPERSISTENCE_H
- 
--#include "ExtensionClass/ExtensionClass.h"
-+#include "../ExtensionClass/src/ExtensionClass.h"
- #include <time.h>
- 
- #define cPersistent_HEAD PyObject_HEAD PyObject *jar, *oid; char serial[8]; unsigned short atime;  signed char state;  unsigned char reserved; 
diff --git a/databases/zodb/pkg-comment b/databases/zodb/pkg-comment
index 11f5d087a948..93cad7b2947b 100644
--- a/databases/zodb/pkg-comment
+++ b/databases/zodb/pkg-comment
@@ -1 +1 @@
-The Zope Object Database, an object database written in Python
+The Zope Object Database, a persistent object database for Python
diff --git a/databases/zodb/pkg-descr b/databases/zodb/pkg-descr
index 8c67b10a6fb6..16fdf845828b 100644
--- a/databases/zodb/pkg-descr
+++ b/databases/zodb/pkg-descr
@@ -1,19 +1,21 @@
-ZODB, the Zope Object Database, is a fully-fledged object database system
-written in Python.  It forms part of the Zope application framework
-by Zope Corporation (previously Digital Creations).  (See port www/zope.)
+ZODB, the Zope Object Database, is a persistent object database system for
+Python.  It provides facilities to write objects to disk automatically, read
+them in again when they're required by a running program, and cache them.
 
-This port represents a third-party standalone packaging of ZODB by noted
-Python developer A.M. Kuchlin <akuchlin@mems-exchange.org> (AMK).  Official
-ZODB development is currently being managed by Pythonlabs, a division of Zope
-Corporation.  AMK's release of ZODB (and hence this port) will eventually be
-superseded by an official Pythonlabs release called StandaloneZODB.
+ZODB normally forms part of the Zope application framework by Zope
+Corporation (previously Digital Creations).  (See port www/zope.)  However,
+it has found significant application outside of Zope.
 
-AMK's ZODB package also includes a standalone version of Zope Enterprise
-Objects (ZEO), a tool to distribute ZODB stores across a network.  This port
-does NOT install ZEO.  A separate port, databases/zeo, is currently under
-development.
+This port represents StandaloneZODB, an official standalone distribution of
+ZODB by Pythonlabs, a division of Zope Corporation.  This official
+distribution is now merging with with Andrew Kuchling's third party
+standalone repackaging of ZODB that was formerly the focus of this port.
 
-WWW:      http://amk.ca/zodb/
-See also: http://www.zope.org/Wikis/ZODB/StandaloneZODB
+StandaloneZODB includes a standalone version of Zope Enterprise
+Objects (ZEO), a tool to distribute ZODB stores across a network.
+
+Author:   Barry A Warsaw <barry@zope.com> and a host of others
+WWW:      http://www.zope.org/Products/StandaloneZODB
+See also: http://amk.ca/zodb/guide/ (ZODB Programming Guide)
 
 -- Johann Visagie <wjv@FreeBSD.org>
diff --git a/databases/zodb/pkg-plist b/databases/zodb/pkg-plist
index ed634b3894f9..559fb2bb8930 100644
--- a/databases/zodb/pkg-plist
+++ b/databases/zodb/pkg-plist
@@ -1,9 +1,5 @@
-%%PORTDOCS%%share/doc/zodb/ACKS
-%%PORTDOCS%%share/doc/zodb/CHANGES
-%%PORTDOCS%%share/doc/zodb/README
-%%PORTDOCS%%share/doc/zodb/TODO
-include/%%PYTHON_VERSION%%/ExtensionClass/ExtensionClass.h
-include/%%PYTHON_VERSION%%/ZODB/cPersistence.h
+include/%%PYTHON_VERSION%%/StandaloneZODB/ExtensionClass.h
+include/%%PYTHON_VERSION%%/StandaloneZODB/cPersistence.h
 lib/%%PYTHON_VERSION%%/site-packages/Acquisition.so
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/IIBTree.py
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/IIBTree.pyc
@@ -23,25 +19,103 @@ lib/%%PYTHON_VERSION%%/site-packages/BTrees/OIBTree.pyo
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/OOBTree.py
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/OOBTree.pyc
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/OOBTree.pyo
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/_IIBTree.so
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/_IOBTree.so
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/_OIBTree.so
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/_OOBTree.so
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/BTrees/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/_fsBTree.so
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/convert.py
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/convert.pyc
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/convert.pyo
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTrees.py
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTrees.pyc
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTrees.pyo
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTreesUnicode.py
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTreesUnicode.pyc
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTreesUnicode.pyo
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testConflict.py
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testConflict.pyc
+lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testConflict.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ComputedAttribute.so
 lib/%%PYTHON_VERSION%%/site-packages/ExtensionClass.so
 lib/%%PYTHON_VERSION%%/site-packages/MethodObject.so
 lib/%%PYTHON_VERSION%%/site-packages/Missing.so
 lib/%%PYTHON_VERSION%%/site-packages/MultiMapping.so
-lib/%%PYTHON_VERSION%%/site-packages/Persistence.py
-lib/%%PYTHON_VERSION%%/site-packages/Persistence.pyc
-lib/%%PYTHON_VERSION%%/site-packages/Persistence.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Persistence/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Persistence/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Persistence/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Record.so
 lib/%%PYTHON_VERSION%%/site-packages/Sync.so
 lib/%%PYTHON_VERSION%%/site-packages/ThreadLock.so
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync.py
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync.pyo
-lib/%%PYTHON_VERSION%%/site-packages/Xaq.py
-lib/%%PYTHON_VERSION%%/site-packages/Xaq.pyc
-lib/%%PYTHON_VERSION%%/site-packages/Xaq.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/LoopCallback.py
+lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/LoopCallback.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/LoopCallback.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientCache.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientCache.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientCache.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/Invalidator.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/Invalidator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/Invalidator.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/StorageServer.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/StorageServer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/StorageServer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/asyncwrap.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/asyncwrap.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/asyncwrap.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/fap.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/fap.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/fap.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/smac.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/smac.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/smac.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/start.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/start.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/start.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/Cache.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/Cache.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/Cache.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/forker.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/forker.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/forker.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/multi.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/multi.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/multi.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/speed.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/speed.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/speed.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/stress.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/stress.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/stress.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/testZEO.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/testZEO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/testZEO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/winserver.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/winserver.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/winserver.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/trigger.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/trigger.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/trigger.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/zrpc.py
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/zrpc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZEO/zrpc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/BaseStorage.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/BaseStorage.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/BaseStorage.pyo
@@ -72,9 +146,6 @@ lib/%%PYTHON_VERSION%%/site-packages/ZODB/Mount.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/POSException.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/POSException.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/POSException.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentList.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentList.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentList.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentMapping.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentMapping.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentMapping.pyo
@@ -99,13 +170,13 @@ lib/%%PYTHON_VERSION%%/site-packages/ZODB/bpthread.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/bpthread.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/cPersistence.so
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/cPickleCache.so
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/conversionhack.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/conversionhack.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/conversionhack.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/coptimizations.so
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/dbmStorage.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/dbmStorage.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/dbmStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsIndex.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsIndex.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsIndex.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsrecover.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsrecover.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsrecover.pyo
@@ -115,27 +186,180 @@ lib/%%PYTHON_VERSION%%/site-packages/ZODB/lock_file.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/referencesf.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/referencesf.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/referencesf.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/test/speed.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/test/speed.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/test/speed.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/BasicStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/BasicStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/BasicStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/ConflictResolution.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/ConflictResolution.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/ConflictResolution.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Corruption.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Corruption.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Corruption.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/HistoryStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/HistoryStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/HistoryStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/IteratorStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/IteratorStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/IteratorStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/LocalStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/LocalStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/LocalStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/MinPO.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/MinPO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/MinPO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PackableStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PackableStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PackableStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PersistentStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PersistentStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PersistentStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/RevisionStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/RevisionStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/RevisionStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/StorageTestBase.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/StorageTestBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/StorageTestBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Synchronization.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Synchronization.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Synchronization.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoVersionStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoVersionStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoVersionStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/VersionStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/VersionStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/VersionStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/speed.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/speed.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/speed.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testDemoStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testDemoStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testDemoStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testFileStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testFileStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testFileStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testMappingStorage.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testMappingStorage.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testMappingStorage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentMapping.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentMapping.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentMapping.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTimeStamp.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTimeStamp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTimeStamp.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTransaction.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTransaction.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTransaction.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testUtils.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testUtils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testUtils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testZODB.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testZODB.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testZODB.pyo
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testfsIndex.py
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testfsIndex.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testfsIndex.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/utils.pyc
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/utils.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ZODB/winlock.so
-lib/%%PYTHON_VERSION%%/site-packages/_IIBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/_IOBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/_OIBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/_OOBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/intSet.so
-lib/%%PYTHON_VERSION%%/site-packages/zLOG.py
-lib/%%PYTHON_VERSION%%/site-packages/zLOG.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zLOG.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon.py
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZODB/test
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/BerkeleyBase.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/BerkeleyBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/BerkeleyBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/CommitLog.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/CommitLog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/CommitLog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Full.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Full.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Full.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Minimal.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Minimal.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Minimal.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/MinimalReplicated.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/MinimalReplicated.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/MinimalReplicated.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Packless.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Packless.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Packless.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/base.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/base.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/base.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/BerkeleyTestBase.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/BerkeleyTestBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/BerkeleyTestBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/ZODBTestBase.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/ZODBTestBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/ZODBTestBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_commitlog.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_commitlog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_commitlog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_create.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_create.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_create.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_storage_api.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_storage_api.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_storage_api.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_virgin.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_virgin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_virgin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_zodb_simple.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_zodb_simple.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_zodb_simple.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/testall.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/testall.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/testall.pyo
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/timeiter.py
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/timeiter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/timeiter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/FormatException.py
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/FormatException.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/FormatException.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/MinimalLogger.py
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/MinimalLogger.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/MinimalLogger.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/testzLog.py
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/testzLog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/testzLog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Daemon.py
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Daemon.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Daemon.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Heartbeat.py
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Heartbeat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Heartbeat.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/ZDaemonLogging.py
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/ZDaemonLogging.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/ZDaemonLogging.pyo
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/zdaemon/__init__.pyo
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/zdaemon
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/zLOG
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/ZODB
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZEO
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Persistence
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/BTrees
-@dirrm include/%%PYTHON_VERSION%%/ZODB
-@dirrm include/%%PYTHON_VERSION%%/ExtensionClass
-%%PORTDOCS%%@dirrm share/doc/zodb
+@dirrm include/%%PYTHON_VERSION%%/StandaloneZODB
diff --git a/databases/zodb/pkg-req b/databases/zodb/pkg-req
new file mode 100644
index 000000000000..ee4d9957297d
--- /dev/null
+++ b/databases/zodb/pkg-req
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PATH=$PATH:/usr/local/bin
+
+if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
+  PYTHON_GT=`python -c 'import string, sys; \
+                        print string.split(sys.version)[0] >= "2.1"'`
+  if [ "x${PYTHON_GT}" = "x1" ]; then
+    exit 0
+  else
+    echo "-----------------------------------------------------------"
+    echo "ZODB requires Python version 2.1 or greater -"
+    echo "  please update your Python installation before proceeding."
+    echo "-----------------------------------------------------------"
+    exit 1
+  fi
+fi