3 files changed, 25 insertions, 26 deletions

diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index 7272a0020e39..a314600f05ad 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zodb
-PORTVERSION=	3.10.3
-PORTREVISION=	4
+PORTVERSION=	3.10.5
 CATEGORIES=	databases
 MASTER_SITES=	CHEESESHOP
 PKGNAMESUFFIX=	-py${PYTHON_SUFFIX}
@@ -16,15 +15,14 @@ DISTNAME=	ZODB3-${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	The Z - Object Database for python
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:${PORTSDIR}/devel/py-zconfig \
-		${LOCALBASE}/bin/zdaemon:${PORTSDIR}/sysutils/py-zdaemon \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=3.7.1:${PORTSDIR}/devel/py-zope.testing \
+LICENSE=	ZPL21
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
+		${PYTHON_PKGNAMEPREFIX}zdaemon>=0:${PORTSDIR}/sysutils/py-zdaemon \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
 		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:${PORTSDIR}/devel/py-transaction \
 		${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:${PORTSDIR}/devel/py-zclockfile \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4.2:${PORTSDIR}/net/py-zope.proxy
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:${PORTSDIR}/devel/py-zope.event
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
diff --git a/databases/zodb3/distinfo b/databases/zodb3/distinfo
index 3182fdd5bdd5..04710c53287c 100644
--- a/databases/zodb3/distinfo
+++ b/databases/zodb3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ZODB3-3.10.3.tar.gz) = 2bc0305f62202947728515d806c8ce04ff975a9ef66e5731e6997fadf3e3b39d
-SIZE (ZODB3-3.10.3.tar.gz) = 714924
+SHA256 (ZODB3-3.10.5.tar.gz) = c857d8a97d331351a3b964f841c263ebf39c862fe1103563fa020a7df1137338
+SIZE (ZODB3-3.10.5.tar.gz) = 706036
diff --git a/databases/zodb3/pkg-plist b/databases/zodb3/pkg-plist
index db811d1f8fc0..bd67a6b0b511 100644
--- a/databases/zodb3/pkg-plist
+++ b/databases/zodb3/pkg-plist
@@ -136,15 +136,15 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_btreesubclass.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_btreesubclass.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_btreesubclass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_check.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_check.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_check.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_compare.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_compare.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_compare.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
@@ -776,20 +776,21 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent/wref.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent/wref.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent/wref.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/auth
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/zrpc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/FileStorage
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/FileStorage
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/persistent
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/zrpc
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/auth
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%