Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-zopeinterface/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	8 Oct 2007 08:22:40 -0000	1.3
+++ Makefile	13 Feb 2008 21:42:06 -0000
@@ -2,13 +2,14 @@
 
 COMMENT=	zope.interface package from Zope 3
 
-DISTNAME=	ZopeInterface-3.0.1
-PKGNAME=	py-${DISTNAME:L}p0
+VERSION=	3.3.0
+DISTNAME=	zope.interface-${VERSION}
+PKGNAME=	py-zopeinterface-${VERSION}
 CATEGORIES=	devel
 
 HOMEPAGE=	http://zope.org/Products/ZopeInterface/
 
-MAINTAINER=	Aleksander Piotrowski <alek@openbsd.org>
+MAINTAINER=	Eric Faurot <eric@openbsd.org>
 
 # Zope Public License
 PERMIT_PACKAGE_FTP=	Yes
@@ -16,15 +17,24 @@
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-MASTER_SITES=	http://www.zope.org/Products/ZopeInterface/3.0.1final/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.zope.org/Products/ZopeInterface/${VERSION}/
 
 MODULES=	lang/python
+SUBST_VARS=	VERSION
+
+MODPY_SETUPTOOLS=	Yes
+
+TESTS=	test_advice.py		\
+	test_document.py	\
+	test_element.py		\
+	test_odd_declarations.py\
+	test_sorting.py		\
+	test_verify.py
 
 do-regress: fake
-	env PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} \
-		${WRKINST}${MODPY_SITEPKG}/zope/testing/tests.py
-	env PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} \
-		${WRKINST}${MODPY_SITEPKG}/zope/interface/tests/test_verify.py
+	for i in ${TESTS}; do \
+	echo $$i; env PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} \
+		${WRKINST}${MODPY_SITEPKG}/zope/interface/tests/$$i; \
+	done
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-zopeinterface/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	5 Apr 2007 15:38:06 -0000	1.2
+++ distinfo	13 Feb 2008 21:42:06 -0000
@@ -1,5 +1,5 @@
-MD5 (ZopeInterface-3.0.1.tgz) = EU8wLCsTLUOtTgHRCLTRkg==
-RMD160 (ZopeInterface-3.0.1.tgz) = d65TGyDgad6VmAeumAp2tGDj92w=
-SHA1 (ZopeInterface-3.0.1.tgz) = Nwf3EprPCF1aC2thaJOrZHy8fIQ=
-SHA256 (ZopeInterface-3.0.1.tgz) = BKlg1uodicKkTr9zC99JL2F6X9qdPLoZwrBB2v9JIjY=
-SIZE (ZopeInterface-3.0.1.tgz) = 108336
+MD5 (zope.interface-3.3.0.tar.gz) = k2aIVeN7RpHFyVZmXDM5LA==
+RMD160 (zope.interface-3.3.0.tar.gz) = 5ErTXJTlFxMMs92VH5pjfpQHyxw=
+SHA1 (zope.interface-3.3.0.tar.gz) = alzbLAPJ37rsUbJDpOuDKJCffjA=
+SHA256 (zope.interface-3.3.0.tar.gz) = wEnvbwdIotsmx9Ad4VZuUvBI5fpvu7jakMQ+VVl6UHU=
+SIZE (zope.interface-3.3.0.tar.gz) = 104204
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py	13 Feb 2008 21:42:06 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- setup.py.orig	Wed Feb 13 20:54:39 2008
++++ setup.py	Wed Feb 13 20:55:32 2008
+@@ -35,7 +35,6 @@ except ImportError, e:
+ 
+ else:
+     extra = dict(
+-        namespace_packages=["zope"],
+         include_package_data = True,
+         zip_safe = False,
+         tests_require = ['zope.testing'],
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-zopeinterface/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST	1 Jul 2006 12:46:51 -0000	1.1.1.1
+++ pkg/PLIST	13 Feb 2008 21:42:06 -0000
@@ -1,143 +1,96 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/01 12:46:51 alek Exp $
-%%SHARED%%
+@comment $OpenBSD$
 lib/python${MODPY_VERSION}/site-packages/zope/
-lib/python${MODPY_VERSION}/site-packages/zope/PUBLICATION.cfg
-lib/python${MODPY_VERSION}/site-packages/zope/README.txt
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/zope.interface-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/zope/__init__.py
 lib/python${MODPY_VERSION}/site-packages/zope/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/__init__.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/
 lib/python${MODPY_VERSION}/site-packages/zope/interface/DEPENDENCIES.cfg
 lib/python${MODPY_VERSION}/site-packages/zope/interface/PUBLICATION.cfg
+lib/python${MODPY_VERSION}/site-packages/zope/interface/README.ru.txt
 lib/python${MODPY_VERSION}/site-packages/zope/interface/README.txt
 lib/python${MODPY_VERSION}/site-packages/zope/interface/SETUP.cfg
 lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.pyo
+lib/python${MODPY_VERSION}/site-packages/zope/interface/_zope_interface_coptimizations.c
+lib/python${MODPY_VERSION}/site-packages/zope/interface/_zope_interface_coptimizations.so
 lib/python${MODPY_VERSION}/site-packages/zope/interface/adapter.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/adapter.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/adapter.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/adapter.txt
 lib/python${MODPY_VERSION}/site-packages/zope/interface/advice.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/advice.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/advice.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/__init__.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/__init__.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/idatetime.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/idatetime.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/idatetime.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/interfaces.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/interfaces.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/interfaces.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/mapping.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/mapping.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/mapping.pyo
+lib/python${MODPY_VERSION}/site-packages/zope/interface/common/sequence.py
+lib/python${MODPY_VERSION}/site-packages/zope/interface/common/sequence.pyc
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/__init__.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/basemapping.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/basemapping.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/basemapping.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/test_idatetime.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/test_idatetime.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/common/tests/test_idatetime.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/declarations.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/declarations.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/declarations.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/document.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/document.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/document.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/exceptions.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/exceptions.pyo
+lib/python${MODPY_VERSION}/site-packages/zope/interface/human.ru.txt
 lib/python${MODPY_VERSION}/site-packages/zope/interface/human.txt
 lib/python${MODPY_VERSION}/site-packages/zope/interface/interface.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/interface.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/interface.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/interfaces.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/interfaces.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/interfaces.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/ro.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/ro.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/ro.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/__init__.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/dummy.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/dummy.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/dummy.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/foodforthought.txt
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/ifoo.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/ifoo.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/ifoo.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/m1.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/m1.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/m1.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/m2.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/m2.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/m2.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/odd.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/odd.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/odd.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_adapter.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_adapter.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_adapter.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_advice.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_advice.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_advice.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_declarations.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_declarations.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_declarations.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_document.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_document.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_document.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_element.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_element.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_element.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_interface.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_interface.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_interface.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_odd_declarations.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_odd_declarations.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_odd_declarations.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_sorting.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_sorting.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_sorting.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_verify.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_verify.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/test_verify.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/unitfixtures.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/unitfixtures.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/tests/unitfixtures.pyo
 lib/python${MODPY_VERSION}/site-packages/zope/interface/verify.py
 lib/python${MODPY_VERSION}/site-packages/zope/interface/verify.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/interface/verify.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/
-lib/python${MODPY_VERSION}/site-packages/zope/testing/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/__init__.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/cleanup.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/cleanup.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/cleanup.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/doctest.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/doctest.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/doctest.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/doctestunit.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/doctestunit.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/doctestunit.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/loggingsupport.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/loggingsupport.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/loggingsupport.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/loghandler.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/loghandler.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/loghandler.pyo
-lib/python${MODPY_VERSION}/site-packages/zope/testing/tests.py
-lib/python${MODPY_VERSION}/site-packages/zope/testing/tests.pyc
-lib/python${MODPY_VERSION}/site-packages/zope/testing/tests.pyo