- do not use easy_install, convert to auto-generated packing list

- move DIST_SUBDIR upper, where appropriate
- add trailing slash to WWW url, where appropriate
- bump PORTREVISION

20 files changed, 43 insertions, 872 deletions

diff --git a/textproc/py-elib.intl/Makefile b/textproc/py-elib.intl/Makefile
index 157141b92b71..66dd78e6ecd9 100644
--- a/textproc/py-elib.intl/Makefile
+++ b/textproc/py-elib.intl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	elib.intl
 PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -16,9 +16,8 @@ GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	d09997c
 USE_GITHUB=	yes
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-PYDISTUTILS_PKGVERSION=	${PORTVERSION}.dev
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/py-elib.intl/pkg-plist b/textproc/py-elib.intl/pkg-plist
deleted file mode 100644
index 3d4c282c0356..000000000000
--- a/textproc/py-elib.intl/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/intl/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/intl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/intl/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib/intl
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/elib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-gettext/Makefile b/textproc/py-gettext/Makefile
index 128c93c795ba..54fcb2fd1a40 100644
--- a/textproc/py-gettext/Makefile
+++ b/textproc/py-gettext/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,13 +13,11 @@ COMMENT=	Python Gettext po to mo file compiler
 
 LICENSE=	BSD
 
-# Python3 and Pypy 1.7 ready
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	python-${PORTNAME}
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_ZIP=		yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} <= 300
diff --git a/textproc/py-gettext/pkg-descr b/textproc/py-gettext/pkg-descr
index aed3607dac89..abbd3d523a22 100644
--- a/textproc/py-gettext/pkg-descr
+++ b/textproc/py-gettext/pkg-descr
@@ -2,4 +2,4 @@ This implementation of Gettext for Python includes a Msgfmt class
 which can be used to generate compiled mo files from Gettext po
 files and includes support for the newer msgctxt keyword.
 
-WWW: https://pypi.python.org/pypi/python-gettext
+WWW: https://pypi.python.org/pypi/python-gettext/
diff --git a/textproc/py-gettext/pkg-plist b/textproc/py-gettext/pkg-plist
deleted file mode 100644
index 3da8357efa03..000000000000
--- a/textproc/py-gettext/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/msgfmt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/msgfmt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/msgfmt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test.pot
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test2.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test2.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test3.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test3.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test4.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test5.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test6.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test6.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_compile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_compile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_compile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_empty.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_empty.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_escape.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_unicode_bom.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests/test_unicode_bom.po
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pythongettext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index a3c742a4f2d1..e810f5c9dbc7 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -2,9 +2,11 @@
 
 PORTNAME=	wicked
 PORTVERSION=	1.1.10
+PORTREVISION=	1
 CATEGORIES=	textproc python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Compact syntax for doing wiki-like content linking and creation
@@ -16,10 +18,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
 
-DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-USE_ZIP=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+USE_ZIP=		yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/py-wicked/pkg-descr b/textproc/py-wicked/pkg-descr
index 9c1eec237c0b..c1eefa0c6d66 100644
--- a/textproc/py-wicked/pkg-descr
+++ b/textproc/py-wicked/pkg-descr
@@ -1,4 +1,4 @@
 wicked is a compact syntax for doing wiki-like content linking and creation
 in zope and plone.
 
-WWW: https://pypi.python.org/pypi/wicked
+WWW: https://pypi.python.org/pypi/wicked/
diff --git a/textproc/py-wicked/pkg-plist b/textproc/py-wicked/pkg-plist
deleted file mode 100644
index 495f8530c089..000000000000
--- a/textproc/py-wicked/pkg-plist
+++ /dev/null
@@ -1,217 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/TODO.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/Install.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/Install.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/Install.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/upgrade.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/upgrade.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions/upgrade.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/add.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/backlink.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/backlink.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/backlink.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/field.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/field.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/field.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/link.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/link.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/link.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/objectevents.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/relation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/relation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/relation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/renderer.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/seeker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/seeker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/seeker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/subscriber.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/subscriber.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/subscriber.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_linking.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_linking.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_linking.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_rendering.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_rendering.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_rendering.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_scope.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_scope.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/test_scope.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/wickedtestcase.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/wickedtestcase.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests/wickedtestcase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/zope2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/zope2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/zope2.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/Install.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/Install.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/Install.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/migrate_atdoc_wickeddoc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/migrate_atdoc_wickeddoc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions/migrate_atdoc_wickeddoc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/ironicwiki.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/ironicwiki.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/ironicwiki.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration/migrator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration/migrator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration/migrator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/permissions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/permissions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/permissions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/wickeddoc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/wickeddoc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/wickeddoc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/zope2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/zope2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/zope2.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/basic-example.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/cache.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/decorator_intro.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/event.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/event.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/event.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/meta.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/meta.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/meta.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/meta.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/txtfilter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/txtfilter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent/txtfilter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/link.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/link.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/link.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/link.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/normalize.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/normalize.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/normalize.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/all-at.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/document-only.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/registration.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/registration.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/registration.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/selective-atct.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/registration.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/registration.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/registration.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/site.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/site.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/site.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/filtercore.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/filtercore.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/filtercore.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/general.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/general.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/general.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/traversal.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/xml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/xml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing/xml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/txtfilter-example.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/txtfilter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/txtfilter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/txtfilter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/vocabularies.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/wicked_link.pt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/testing
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/plone
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/fieldevent
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/migration
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent/Extensions
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/atcontent
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at/Extensions
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked/at
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/wicked
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 18ceaa7e6263..74d6003940f7 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -2,9 +2,11 @@
 
 PORTNAME=	zope.app.i18n
 PORTVERSION=	3.6.4
+PORTREVISION=	1
 CATEGORIES=	textproc python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Persistent translation domains and message catalogs
@@ -21,9 +23,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:${PORTSDIR}/devel/py-zop
 		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
-DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-NO_STAGE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.app.i18n/pkg-plist b/textproc/py-zope.app.i18n/pkg-plist
deleted file mode 100644
index 1de05fca1334..000000000000
--- a/textproc/py-zope.app.i18n/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/exportimport.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/exportimport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/exportimport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/exportimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/i18n_domain.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/synchronize.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/synchronize.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/synchronize.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/synchronize.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests/test_translate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests/test_translate.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests/test_translate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/translate.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/translate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/translate.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/translate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/translatemessage.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/filters.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/filters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/filters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/messagecatalog.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/messagecatalog.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/messagecatalog.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/placelesssetup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/placelesssetup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/placelesssetup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_filters.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_filters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_filters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_messagecatalog.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_messagecatalog.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_messagecatalog.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_translationdomain.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_translationdomain.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests/test_translationdomain.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/translationdomain.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/translationdomain.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/translationdomain.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/methods.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/methods.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc/methods.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/xmlrpc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n/browser
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/i18n
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index 7770286c701e..918069165a69 100644
--- a/textproc/py-zope.app.locales/Makefile
+++ b/textproc/py-zope.app.locales/Makefile
@@ -2,9 +2,11 @@
 
 PORTNAME=	zope.app.locales
 PORTVERSION=	3.7.3
+PORTREVISION=	1
 CATEGORIES=	textproc python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope locale extraction and management utilities
@@ -17,10 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
 		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.app.applicationcontrol \
 		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup
 
-DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.app.locales/pkg-plist b/textproc/py-zope.app.locales/pkg-plist
deleted file mode 100644
index 0a475e087fb2..000000000000
--- a/textproc/py-zope.app.locales/pkg-plist
+++ /dev/null
@@ -1,99 +0,0 @@
-bin/i18nextract
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/TRANSLATE.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/de/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/de/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/en/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/en/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/es/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/es/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/extract.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/extract.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/extract.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/fr/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/fr/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/he/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/he/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/hu/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/hu/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/it/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/it/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ja/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ja/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/nl/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/nl/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pl/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pl/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pt_BR/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pt_BR/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pygettext.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pygettext.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pygettext.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ru/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ru/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tr/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tr/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_CN/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_CN/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_TW/LC_MESSAGES/zope.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_TW/LC_MESSAGES/zope.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zope.pot
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_TW/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_TW
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_CN/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/zh_CN
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/tr
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ru/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ru
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pt_BR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pt_BR
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/pl
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/nl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/nl
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ja/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/ja
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/it/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/it
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/hu/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/hu
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/he/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/he
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/fr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/fr
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/es/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/es
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/en/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/en
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/de/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales/de
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/locales
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-zope.i18nmessageid/Makefile b/textproc/py-zope.i18nmessageid/Makefile
index f0b1f1548ade..adfda2445f1a 100644
--- a/textproc/py-zope.i18nmessageid/Makefile
+++ b/textproc/py-zope.i18nmessageid/Makefile
@@ -3,17 +3,17 @@
 
 PORTNAME=	zope.i18nmessageid
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Message Identifiers for internationalization
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYEASYINSTALL_ARCHDEP=yes
-
-NO_STAGE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.i18nmessageid/distinfo b/textproc/py-zope.i18nmessageid/distinfo
index 83854c4a774e..2c5b4a700a7f 100644
--- a/textproc/py-zope.i18nmessageid/distinfo
+++ b/textproc/py-zope.i18nmessageid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope.i18nmessageid-3.6.1.tar.gz) = a551e90baa20079aaf96a8b11f685168a03e0964843d0c344a8bdd465649e47d
-SIZE (zope.i18nmessageid-3.6.1.tar.gz) = 15350
+SHA256 (zope/zope.i18nmessageid-3.6.1.tar.gz) = a551e90baa20079aaf96a8b11f685168a03e0964843d0c344a8bdd465649e47d
+SIZE (zope/zope.i18nmessageid-3.6.1.tar.gz) = 15350
diff --git a/textproc/py-zope.i18nmessageid/pkg-descr b/textproc/py-zope.i18nmessageid/pkg-descr
index 4371ca4aeca1..9a7c19a16a2e 100644
--- a/textproc/py-zope.i18nmessageid/pkg-descr
+++ b/textproc/py-zope.i18nmessageid/pkg-descr
@@ -2,4 +2,4 @@ zope.i18nmessageid provides facilities for declaring such messages
 within program source text; translation of the messages is the
 responsiblitiy of the 'zope.i18n' package.
 
-WWW: https://www.python.org/pypi/zope.i18nmessageid/
+WWW: https://pypi.python.org/pypi/zope.i18nmessageid/
diff --git a/textproc/py-zope.i18nmessageid/pkg-plist b/textproc/py-zope.i18nmessageid/pkg-plist
deleted file mode 100644
index b4b20849bfcf..000000000000
--- a/textproc/py-zope.i18nmessageid/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/_zope_i18nmessageid_message.c
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/_zope_i18nmessageid_message.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/_zope_i18nmessageid_message.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/_zope_i18nmessageid_message.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/_zope_i18nmessageid_message.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/message.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/message.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/message.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/messages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/i18nmessageid
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-zope.structuredtext/Makefile b/textproc/py-zope.structuredtext/Makefile
index 40745bbae906..9609c296f127 100644
--- a/textproc/py-zope.structuredtext/Makefile
+++ b/textproc/py-zope.structuredtext/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	zope.structuredtext
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +13,8 @@ COMMENT=	StructuredText parser
 
 LICENSE=	ZPL21
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.structuredtext/pkg-plist b/textproc/py-zope.structuredtext/pkg-plist
deleted file mode 100644
index ca889ba52ae1..000000000000
--- a/textproc/py-zope.structuredtext/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/docbook.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/docbook.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/docbook.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/document.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/document.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/document.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/html.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/html.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/Acquisition.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/Acquisition.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/ExtensionClass.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/ExtensionClass.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/InnerLinks.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/InnerLinks.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/Links.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/Links.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/MultiMapping.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/MultiMapping.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/examples.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/examples.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/examples1.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/examples1.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/index.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/index.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/table.ref
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions/table.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stdom.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stdom.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stdom.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stletters.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stletters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stletters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stng.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stng.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/stng.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext/regressions
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/structuredtext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index cdf82affb39c..8b2b176b2e10 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -2,9 +2,11 @@
 
 PORTNAME=	zope.tal
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope Template Application Language (TAL)
@@ -14,11 +16,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
 
-DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP=	yes
-
-NO_STAGE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-zope.tal/pkg-plist b/textproc/py-zope.tal/pkg-plist
deleted file mode 100644
index 2e5f5c0c25a2..000000000000
--- a/textproc/py-zope.tal/pkg-plist
+++ /dev/null
@@ -1,286 +0,0 @@
-%%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
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/DEPENDENCIES.cfg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml01.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml02.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml03.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml04.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml05.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml06.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml07.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml08.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml09.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml10.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml11.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/dtml12.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal01.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal02.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal03.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal04.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal05.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal06.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal07.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal08.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal09.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal10.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal11.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark/tal12.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/driver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/driver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/driver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/dummyengine.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/dummyengine.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/dummyengine.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/htmltalparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/htmltalparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/htmltalparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/ndiff.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/ndiff.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/ndiff.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/runtest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/runtest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/runtest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/setpath.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/setpath.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/setpath.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/taldefs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/taldefs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/taldefs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talgenerator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talgenerator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talgenerator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talgettext.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talgettext.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talgettext.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talinterpreter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talinterpreter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talinterpreter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/talparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/acme_template.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/document_list.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/pnome_template.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test01.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test01.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test02.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test02.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test03.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test03.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test04.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test04.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test05.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test05.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test06.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test06.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test07.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test07.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test08.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test08.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test09.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test09.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test10.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test11.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test11.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test12.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test13.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test14.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test14.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test15.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test16.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test16.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test17.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test17.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test18.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test18.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test19.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test19.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test20.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test20.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test21.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test21.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test22.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test22.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test23.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test24.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test25.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test26.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test27.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test28.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test29.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test30.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test31.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test32.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test33.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test34.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test35.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test36.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test37.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_domain.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_failed_attr_translation.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal1.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal2.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal3.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal4.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal5.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal6.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal7.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal8.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_metal9.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa1.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa1.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa2.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa2.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa3.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa3.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input/test_sa4.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/markbench.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/markbench.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/markbench.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/acme_template.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/acme_template_source.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/document_list.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/document_list_source.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test01.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test01.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test02.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test02.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test03.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test03.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test04.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test04.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test05.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test05.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test06.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test06.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test07.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test07.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test08.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test08.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test09.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test09.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test10.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test11.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test11.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test12.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test13.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test14.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test14.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test15.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test16.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test16.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test17.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test17.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test18.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test18.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test19.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test19.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test20.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test20.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test21.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test21.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test22.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test22.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test23.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test24.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test25.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test26.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test27.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test28.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test29.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test30.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test31.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test32.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test33.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test34.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test35.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test36.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test37.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_domain.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_failed_attr_translation.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal1.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal2.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal3.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal4.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal5.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal6.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal7.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal8.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_metal9.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa1.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa1.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa2.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa2.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa3.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa3.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output/test_sa4.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/run.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/run.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/run.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_files.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_files.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_files.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_htmltalparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_htmltalparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_htmltalparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_sourcepos.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_sourcepos.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_sourcepos.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talgettext.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talgettext.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talgettext.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talinterpreter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talinterpreter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talinterpreter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_talparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_xmlparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_xmlparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/test_xmlparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/timer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/timer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/timer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/translationcontext.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/translationcontext.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/translationcontext.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/xmlparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/xmlparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/xmlparser.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/output
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests/input
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal/benchmark
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/tal
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%