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

- move DIST_SUBDIR upper, where appropriate
- bump PORTREVISION

2 files changed, 5 insertions, 65 deletions

diff --git a/devel/py-zope.app.testing/Makefile b/devel/py-zope.app.testing/Makefile
index 6bf9bc277bef..9a21789a70a6 100644
--- a/devel/py-zope.app.testing/Makefile
+++ b/devel/py-zope.app.testing/Makefile
@@ -2,9 +2,11 @@
 
 PORTNAME=	zope.app.testing
 PORTVERSION=	3.10.0
+PORTREVISION=	1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope Application Testing Support
@@ -30,10 +32,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
 		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:${PORTSDIR}/devel/py-zope.testbrowser \
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
 
-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/devel/py-zope.app.testing/pkg-plist b/devel/py-zope.app.testing/pkg-plist
deleted file mode 100644
index 64f973fb18f4..000000000000
--- a/devel/py-zope.app.testing/pkg-plist
+++ /dev/null
@@ -1,60 +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/testing/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/cookieTestOne.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/cookieTestTwo.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/dochttp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/dochttp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/dochttp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/dochttp.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/doctest.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/empty.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/ftesting.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/functional.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/functional.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/functional.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/placelesssetup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/placelesssetup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/placelesssetup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/recorded/test0001.request
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/recorded/test0001.response
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/recorded/test0002.request
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/recorded/test0002.response
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/setup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testbrowser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testbrowser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testbrowser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testbrowser.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/testing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/xmlrpc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/xmlrpc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/xmlrpc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/ztapi.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/ztapi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/ztapi.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing/recorded
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/testing
-@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%%