3 files changed, 117 insertions, 189 deletions

diff --git a/devel/py-zope.interface/Makefile b/devel/py-zope.interface/Makefile
index a63977bfa54e..d61ba70e7097 100644
--- a/devel/py-zope.interface/Makefile
+++ b/devel/py-zope.interface/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zopeInterface
-PORTVERSION=	3.1.0c1
+PORTVERSION=	3.3.0
 CATEGORIES=	devel zope python
-MASTER_SITES=	http://www.zope.org/Products/ZopeInterface/
+MASTER_SITES=	http://www.zope.org/Products/ZopeInterface/${PORTVERSION}/ \
+		http://cheeseshop.python.org/packages/source/z/zope.interface/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTVERSION}/ZopeInterface-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	zope.interface-${PORTVERSION}
 
 MAINTAINER=	neal@nelson.name
 COMMENT=	Zope.interface package from Zope 3
 
-WRKSRC=		${WRKDIR}/ZopeInterface-${PORTVERSION}
 USE_PYTHON=	2.2+
 USE_PYDISTUTILS=	yes
 
-PLIST_SUB+=	S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
-
 .include <bsd.port.mk>
diff --git a/devel/py-zope.interface/distinfo b/devel/py-zope.interface/distinfo
index 943cc753aa80..27394425f6d3 100644
--- a/devel/py-zope.interface/distinfo
+++ b/devel/py-zope.interface/distinfo
@@ -1,3 +1,3 @@
-MD5 (3.1.0c1/ZopeInterface-3.1.0c1.tgz) = f34cb95f2fbdbe3f1850c95cefddbd2c
-SHA256 (3.1.0c1/ZopeInterface-3.1.0c1.tgz) = 76bcc288efc8a13e573d72ba2ec1255f26a83dd27cac46b9f0b0584e9070c410
-SIZE (3.1.0c1/ZopeInterface-3.1.0c1.tgz) = 180647
+MD5 (zope.interface-3.3.0.tar.gz) = 93668855e37b4691c5c956665c33392c
+SHA256 (zope.interface-3.3.0.tar.gz) = c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075
+SIZE (zope.interface-3.3.0.tar.gz) = 104204
diff --git a/devel/py-zope.interface/pkg-plist b/devel/py-zope.interface/pkg-plist
index 04ee2d66dbfd..4396d8967a00 100644
--- a/devel/py-zope.interface/pkg-plist
+++ b/devel/py-zope.interface/pkg-plist
@@ -1,179 +1,110 @@
-%%S%%/zope/PUBLICATION.cfg
-%%S%%/zope/README.txt
-%%S%%/zope/__init__.py
-%%S%%/zope/__init__.pyc
-%%S%%/zope/__init__.pyo
-%%S%%/zope/exceptions/DEPENDENCIES.cfg
-%%S%%/zope/exceptions/__init__.py
-%%S%%/zope/exceptions/__init__.pyc
-%%S%%/zope/exceptions/__init__.pyo
-%%S%%/zope/exceptions/_duplicate.py
-%%S%%/zope/exceptions/_duplicate.pyc
-%%S%%/zope/exceptions/_duplicate.pyo
-%%S%%/zope/exceptions/_notfounderror.py
-%%S%%/zope/exceptions/_notfounderror.pyc
-%%S%%/zope/exceptions/_notfounderror.pyo
-%%S%%/zope/exceptions/exceptionformatter.py
-%%S%%/zope/exceptions/exceptionformatter.pyc
-%%S%%/zope/exceptions/exceptionformatter.pyo
-%%S%%/zope/exceptions/interfaces.py
-%%S%%/zope/exceptions/interfaces.pyc
-%%S%%/zope/exceptions/interfaces.pyo
-%%S%%/zope/exceptions/tests/__init__.py
-%%S%%/zope/exceptions/tests/__init__.pyc
-%%S%%/zope/exceptions/tests/__init__.pyo
-%%S%%/zope/exceptions/tests/test_exceptionformatter.py
-%%S%%/zope/exceptions/tests/test_exceptionformatter.pyc
-%%S%%/zope/exceptions/tests/test_exceptionformatter.pyo
-%%S%%/zope/interface/DEPENDENCIES.cfg
-%%S%%/zope/interface/PUBLICATION.cfg
-%%S%%/zope/interface/README.ru.txt
-%%S%%/zope/interface/README.txt
-%%S%%/zope/interface/SETUP.cfg
-%%S%%/zope/interface/__init__.py
-%%S%%/zope/interface/__init__.pyc
-%%S%%/zope/interface/__init__.pyo
-%%S%%/zope/interface/_flatten.py
-%%S%%/zope/interface/_flatten.pyc
-%%S%%/zope/interface/_flatten.pyo
-%%S%%/zope/interface/_zope_interface_coptimizations.so
-%%S%%/zope/interface/adapter.py
-%%S%%/zope/interface/adapter.pyc
-%%S%%/zope/interface/adapter.pyo
-%%S%%/zope/interface/adapter.txt
-%%S%%/zope/interface/advice.py
-%%S%%/zope/interface/advice.pyc
-%%S%%/zope/interface/advice.pyo
-%%S%%/zope/interface/common/__init__.py
-%%S%%/zope/interface/common/__init__.pyc
-%%S%%/zope/interface/common/__init__.pyo
-%%S%%/zope/interface/common/idatetime.py
-%%S%%/zope/interface/common/idatetime.pyc
-%%S%%/zope/interface/common/idatetime.pyo
-%%S%%/zope/interface/common/interfaces.py
-%%S%%/zope/interface/common/interfaces.pyc
-%%S%%/zope/interface/common/interfaces.pyo
-%%S%%/zope/interface/common/mapping.py
-%%S%%/zope/interface/common/mapping.pyc
-%%S%%/zope/interface/common/mapping.pyo
-%%S%%/zope/interface/common/sequence.py
-%%S%%/zope/interface/common/sequence.pyc
-%%S%%/zope/interface/common/sequence.pyo
-%%S%%/zope/interface/common/tests/__init__.py
-%%S%%/zope/interface/common/tests/__init__.pyc
-%%S%%/zope/interface/common/tests/__init__.pyo
-%%S%%/zope/interface/common/tests/basemapping.py
-%%S%%/zope/interface/common/tests/basemapping.pyc
-%%S%%/zope/interface/common/tests/basemapping.pyo
-%%S%%/zope/interface/common/tests/test_idatetime.py
-%%S%%/zope/interface/common/tests/test_idatetime.pyc
-%%S%%/zope/interface/common/tests/test_idatetime.pyo
-%%S%%/zope/interface/declarations.py
-%%S%%/zope/interface/declarations.pyc
-%%S%%/zope/interface/declarations.pyo
-%%S%%/zope/interface/document.py
-%%S%%/zope/interface/document.pyc
-%%S%%/zope/interface/document.pyo
-%%S%%/zope/interface/exceptions.py
-%%S%%/zope/interface/exceptions.pyc
-%%S%%/zope/interface/exceptions.pyo
-%%S%%/zope/interface/human.txt
-%%S%%/zope/interface/interface.py
-%%S%%/zope/interface/interface.pyc
-%%S%%/zope/interface/interface.pyo
-%%S%%/zope/interface/interfaces.py
-%%S%%/zope/interface/interfaces.pyc
-%%S%%/zope/interface/interfaces.pyo
-%%S%%/zope/interface/ro.py
-%%S%%/zope/interface/ro.pyc
-%%S%%/zope/interface/ro.pyo
-%%S%%/zope/interface/tests/__init__.py
-%%S%%/zope/interface/tests/__init__.pyc
-%%S%%/zope/interface/tests/__init__.pyo
-%%S%%/zope/interface/tests/dummy.py
-%%S%%/zope/interface/tests/dummy.pyc
-%%S%%/zope/interface/tests/dummy.pyo
-%%S%%/zope/interface/tests/foodforthought.txt
-%%S%%/zope/interface/tests/ifoo.py
-%%S%%/zope/interface/tests/ifoo.pyc
-%%S%%/zope/interface/tests/ifoo.pyo
-%%S%%/zope/interface/tests/m1.py
-%%S%%/zope/interface/tests/m1.pyc
-%%S%%/zope/interface/tests/m1.pyo
-%%S%%/zope/interface/tests/m2.py
-%%S%%/zope/interface/tests/m2.pyc
-%%S%%/zope/interface/tests/m2.pyo
-%%S%%/zope/interface/tests/odd.py
-%%S%%/zope/interface/tests/odd.pyc
-%%S%%/zope/interface/tests/odd.pyo
-%%S%%/zope/interface/tests/test_adapter.py
-%%S%%/zope/interface/tests/test_adapter.pyc
-%%S%%/zope/interface/tests/test_adapter.pyo
-%%S%%/zope/interface/tests/test_advice.py
-%%S%%/zope/interface/tests/test_advice.pyc
-%%S%%/zope/interface/tests/test_advice.pyo
-%%S%%/zope/interface/tests/test_declarations.py
-%%S%%/zope/interface/tests/test_declarations.pyc
-%%S%%/zope/interface/tests/test_declarations.pyo
-%%S%%/zope/interface/tests/test_document.py
-%%S%%/zope/interface/tests/test_document.pyc
-%%S%%/zope/interface/tests/test_document.pyo
-%%S%%/zope/interface/tests/test_element.py
-%%S%%/zope/interface/tests/test_element.pyc
-%%S%%/zope/interface/tests/test_element.pyo
-%%S%%/zope/interface/tests/test_interface.py
-%%S%%/zope/interface/tests/test_interface.pyc
-%%S%%/zope/interface/tests/test_interface.pyo
-%%S%%/zope/interface/tests/test_odd_declarations.py
-%%S%%/zope/interface/tests/test_odd_declarations.pyc
-%%S%%/zope/interface/tests/test_odd_declarations.pyo
-%%S%%/zope/interface/tests/test_sorting.py
-%%S%%/zope/interface/tests/test_sorting.pyc
-%%S%%/zope/interface/tests/test_sorting.pyo
-%%S%%/zope/interface/tests/test_verify.py
-%%S%%/zope/interface/tests/test_verify.pyc
-%%S%%/zope/interface/tests/test_verify.pyo
-%%S%%/zope/interface/tests/unitfixtures.py
-%%S%%/zope/interface/tests/unitfixtures.pyc
-%%S%%/zope/interface/tests/unitfixtures.pyo
-%%S%%/zope/interface/verify.py
-%%S%%/zope/interface/verify.pyc
-%%S%%/zope/interface/verify.pyo
-%%S%%/zope/testing/DEPENDENCIES.cfg
-%%S%%/zope/testing/__init__.py
-%%S%%/zope/testing/__init__.pyc
-%%S%%/zope/testing/__init__.pyo
-%%S%%/zope/testing/cleanup.py
-%%S%%/zope/testing/cleanup.pyc
-%%S%%/zope/testing/cleanup.pyo
-%%S%%/zope/testing/doctest.py
-%%S%%/zope/testing/doctest.pyc
-%%S%%/zope/testing/doctest.pyo
-%%S%%/zope/testing/doctestunit.py
-%%S%%/zope/testing/doctestunit.pyc
-%%S%%/zope/testing/doctestunit.pyo
-%%S%%/zope/testing/formparser.py
-%%S%%/zope/testing/formparser.pyc
-%%S%%/zope/testing/formparser.pyo
-%%S%%/zope/testing/formparser.txt
-%%S%%/zope/testing/loggingsupport.py
-%%S%%/zope/testing/loggingsupport.pyc
-%%S%%/zope/testing/loggingsupport.pyo
-%%S%%/zope/testing/loghandler.py
-%%S%%/zope/testing/loghandler.pyc
-%%S%%/zope/testing/loghandler.pyo
-%%S%%/zope/testing/module.py
-%%S%%/zope/testing/module.pyc
-%%S%%/zope/testing/module.pyo
-%%S%%/zope/testing/tests.py
-%%S%%/zope/testing/tests.pyc
-%%S%%/zope/testing/tests.pyo
-@dirrm %%S%%/zope/testing
-@dirrm %%S%%/zope/interface/tests
-@dirrm %%S%%/zope/interface/common/tests
-@dirrm %%S%%/zope/interface/common
-@dirrm %%S%%/zope/interface
-@dirrm %%S%%/zope/exceptions/tests
-@dirrm %%S%%/zope/exceptions
-@dirrm %%S%%/zope
-
+%%PYTHON_SITELIBDIR%%/zope/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/README.ru.txt
+%%PYTHON_SITELIBDIR%%/zope/interface/README.txt
+%%PYTHON_SITELIBDIR%%/zope/interface/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/interface/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/_flatten.py
+%%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/_zope_interface_coptimizations.so
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.py
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.txt
+%%PYTHON_SITELIBDIR%%/zope/interface/advice.py
+%%PYTHON_SITELIBDIR%%/zope/interface/advice.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/advice.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/idatetime.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/idatetime.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/idatetime.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/mapping.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/mapping.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/mapping.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/sequence.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/sequence.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/sequence.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/declarations.py
+%%PYTHON_SITELIBDIR%%/zope/interface/declarations.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/declarations.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/document.py
+%%PYTHON_SITELIBDIR%%/zope/interface/document.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/document.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/exceptions.py
+%%PYTHON_SITELIBDIR%%/zope/interface/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/human.ru.txt
+%%PYTHON_SITELIBDIR%%/zope/interface/human.txt
+%%PYTHON_SITELIBDIR%%/zope/interface/interface.py
+%%PYTHON_SITELIBDIR%%/zope/interface/interface.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/interface.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/interface/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/ro.py
+%%PYTHON_SITELIBDIR%%/zope/interface/ro.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/ro.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/dummy.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/dummy.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/dummy.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/foodforthought.txt
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/ifoo.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/ifoo.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/ifoo.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/m1.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/m1.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/m1.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/m2.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/m2.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/m2.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/odd.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/odd.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/odd.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_adapter.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_adapter.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_adapter.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_advice.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_advice.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_advice.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_declarations.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_declarations.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_declarations.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_document.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_document.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_document.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_element.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_element.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_element.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_interface.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_interface.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_interface.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_odd_declarations.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_odd_declarations.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_odd_declarations.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_sorting.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_sorting.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_sorting.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_verify.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_verify.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/test_verify.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/unitfixtures.py
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/unitfixtures.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/tests/unitfixtures.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/verify.py
+%%PYTHON_SITELIBDIR%%/zope/interface/verify.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/verify.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/zope/interface/tests
+@dirrm %%PYTHON_SITELIBDIR%%/zope/interface/common
+@dirrm %%PYTHON_SITELIBDIR%%/zope/interface
+@dirrm %%PYTHON_SITELIBDIR%%/zope