2 files changed, 3 insertions, 144 deletions

diff --git a/www/py-pastescript/Makefile b/www/py-pastescript/Makefile
index 214188dad3fa..3d08621bca6a 100644
--- a/www/py-pastescript/Makefile
+++ b/www/py-pastescript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PasteScript
 PORTVERSION=	1.7.5
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,8 +19,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheeta
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-pastescript/pkg-plist b/www/py-pastescript/pkg-plist
deleted file mode 100644
index 78896f2e9fa9..000000000000
--- a/www/py-pastescript/pkg-plist
+++ /dev/null
@@ -1,141 +0,0 @@
-bin/paster
-%%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%%/paste/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/appinstall.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/appinstall.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/appinstall.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/bool_optparse.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/bool_optparse.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/bool_optparse.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/cgi_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/cgi_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/cgi_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/checkperms.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/checkperms.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/checkperms.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/cherrypy_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/cherrypy_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/cherrypy_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/command.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/command.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/command.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/copydir.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/copydir.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/copydir.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/create_distro.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/create_distro.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/create_distro.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/default_sysconfig.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/default_sysconfig.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/default_sysconfig.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/entrypoints.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/entrypoints.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/entrypoints.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/epdesc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/epdesc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/epdesc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/exe.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/exe.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/exe.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/filemaker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/filemaker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/filemaker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/flup_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/flup_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/flup_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/grep.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/grep.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/grep.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/help.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/help.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/help.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package/+package+/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package/+package+/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package/+package+/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package/setup.cfg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package/setup.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/pluginlib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/pluginlib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/pluginlib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/request.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/request.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/request.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/serve.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/serve.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/serve.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/templates.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/templates.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/templates.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/testapp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/testapp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/testapp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/twisted_web2_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/twisted_web2_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/twisted_web2_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/logging_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/logging_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/logging_config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/secret.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/secret.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/secret.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/string24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/string24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/string24.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/subprocess24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/subprocess24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/subprocess24.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/uuid.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/uuid.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util/uuid.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/wsgiutils_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/wsgiutils_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/wsgiutils_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup/test_make_project.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup/test_make_project.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup/test_make_project.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_egg_finder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_egg_finder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_egg_finder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_logging_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_logging_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_logging_config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_plugin_adder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_plugin_adder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_plugin_adder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_template_introspect.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_template_introspect.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_template_introspect.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/appsetup
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/util
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package/+package+
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates/basic_package
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script/paster-templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste/script
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/paste
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%