- 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

2 files changed, 4 insertions, 61 deletions

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%%