- Remove easy_install dependency

- Convert to PYDISTUTILS_AUTOPLIST
- Bump PORTREVISION to enforce a cleanup for the easy_install references

With hat:	python@
Approved by:	portmgr (implicit)

2 files changed, 4 insertions, 92 deletions

diff --git a/converters/py-pisa/Makefile b/converters/py-pisa/Makefile
index 284f3dbc394..13b827c62c9 100644
--- a/converters/py-pisa/Makefile
+++ b/converters/py-pisa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pisa
 PORTVERSION=	3.0.33
+PORTREVISION=	1
 CATEGORIES=	converters python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0.11.1:${PORTSDIR}/www/py-html5lib
 		${PYTHON_PKGNAMEPREFIX}imaging>=0.1:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:${PORTSDIR}/print/py-pdf
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/converters/py-pisa/pkg-plist b/converters/py-pisa/pkg-plist
deleted file mode 100644
index ccdd2fb2238..00000000000
--- a/converters/py-pisa/pkg-plist
+++ /dev/null
@@ -1,90 +0,0 @@
-bin/pisa
-bin/xhtml2pdf
-%%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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/pisa/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/pisa/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/pisa/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_context.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_context.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_context.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_default.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_default.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_default.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_document.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_document.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_document.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_paragraph.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_paragraph.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_paragraph.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_paragraph2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_paragraph2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_paragraph2.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_pdf.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_pdf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_pdf.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_reportlab.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_reportlab.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_reportlab.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_tables.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_tables.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_tables.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_tags.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_tags.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_tags.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_turbogears.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_turbogears.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_turbogears.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_version.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_wsgi.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_wsgi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/pisa_wsgi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/reportlab_paragraph.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/reportlab_paragraph.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3/reportlab_paragraph.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/css.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/css.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/css.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssDOMElementInterface.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssDOMElementInterface.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssDOMElementInterface.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssParser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssParser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssParser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssSpecial.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssSpecial.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c/cssSpecial.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho/pisa
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ho
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/pisa3
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx/w3c
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sx
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%