8 files changed, 11 insertions, 348 deletions

diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 8447c38874f3..7b34b405344b 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:${PORTSDIR}/www/py-django-classy-tags
 
 USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-django-sekizai/pkg-plist b/www/py-django-sekizai/pkg-plist
deleted file mode 100644
index d7948f462c30..000000000000
--- a/www/py-django-sekizai/pkg-plist
+++ /dev/null
@@ -1,70 +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%%/sekizai/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/context.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/context.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/context.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/context_processors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/context_processors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/context_processors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/data.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/data.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/data.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/helpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/models.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/models.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/models.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags/sekizai_tags.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags/sekizai_tags.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags/sekizai_tags.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/basic.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/css.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/css2.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/easy_base.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/easy_inherit.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/eat.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/errors/failadd.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/errors/failbase.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/errors/failbase2.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/errors/failinc.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/errors/failrender.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/base.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/baseinc.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/chain.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/extend.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/extinc.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/nullbase.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/nullext.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/spacechain.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/subvarchain.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/super_blocks.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit/varchain.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/named_end.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/namespaces.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/processors/namespace.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/processors/null.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/unique.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/variables.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/with_data.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/processors
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/inherit
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates/errors
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/test_templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai/templatetags
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sekizai
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-django-storages/Makefile b/www/py-django-storages/Makefile
index ab264acf5b2d..159b917eada3 100644
--- a/www/py-django-storages/Makefile
+++ b/www/py-django-storages/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-storages
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,8 +12,8 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Generic storages for Django
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-django-storages/pkg-plist b/www/py-django-storages/pkg-plist
deleted file mode 100644
index 00053d48a386..000000000000
--- a/www/py-django-storages/pkg-plist
+++ /dev/null
@@ -1,79 +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/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/apache_libcloud.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/apache_libcloud.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/apache_libcloud.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/azure_storage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/azure_storage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/azure_storage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/couchdb.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/couchdb.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/couchdb.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/database.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/database.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/database.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/ftp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/ftp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/ftp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/gs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/gs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/gs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/hashpath.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/hashpath.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/hashpath.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/image.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/image.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/image.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mogile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mogile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mogile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mongodb.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mongodb.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mongodb.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mosso.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mosso.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/mosso.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/overwrite.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/overwrite.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/overwrite.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/s3.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/s3.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/s3.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/s3boto.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/s3boto.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/s3boto.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/sftpstorage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/sftpstorage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/sftpstorage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/symlinkorcopy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/symlinkorcopy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends/symlinkorcopy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/models.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/models.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/models.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/hashpath.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/hashpath.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/hashpath.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/s3boto.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/s3boto.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests/s3boto.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages/backends
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/storages
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile
index e9f40105313f..949655996cdc 100644
--- a/www/py-django_compressor/Makefile
+++ b/www/py-django_compressor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django_compressor
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,14 +17,14 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:${PORTSDIR}/devel/py-v
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:${PORTSDIR}/www/py-django-appconf
 
 USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONS_DEFINE=	BEAUTIFULSOUP LXML HTML5LIB
 BEAUTIFULSOUP_DESC=	Enable BeautifulSoupParser
 LXML_DESC=		Enable LxmlParser
 HTML5LIB_DESC=		Enable Html5LibParser
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBEAUTIFULSOUP}
diff --git a/www/py-django_compressor/pkg-plist b/www/py-django_compressor/pkg-plist
deleted file mode 100644
index 5bcb4042f967..000000000000
--- a/www/py-django_compressor/pkg-plist
+++ /dev/null
@@ -1,149 +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%%/compressor/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/conf.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/conf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/conf.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib/jinja2ext.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib/jinja2ext.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib/jinja2ext.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/css.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/css.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/css.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/closure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/closure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/closure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/css_default.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/css_default.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/css_default.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin/cssmin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin/cssmin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin/cssmin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/csstidy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/csstidy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/csstidy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/datauri.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/datauri.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/datauri.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/rjsmin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/rjsmin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/rjsmin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/slimit.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/slimit.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin/slimit.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/yui.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/yui.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/yui.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/finders.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/finders.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/finders.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/js.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/js.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/js.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/compress.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/compress.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/compress.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/mtime_cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/mtime_cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands/mtime_cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/models.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/models.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/models.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/beautifulsoup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/beautifulsoup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/beautifulsoup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/default_htmlparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/default_htmlparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/default_htmlparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/html5lib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/html5lib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/html5lib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/lxml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/lxml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser/lxml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/signals.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/signals.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/signals.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/storage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/storage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/storage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor/css.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor/css_file.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor/css_inline.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor/js.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor/js_file.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor/js_inline.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags/compress.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags/compress.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags/compress.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/decorators.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/decorators.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/decorators.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/staticfiles.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/staticfiles.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/staticfiles.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/stringformat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/stringformat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils/stringformat.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/utils
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templatetags
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates/compressor
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/parser
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management/commands
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/management
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/jsmin
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters/cssmin
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/filters
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/compressor
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-dotcloud.cli/Makefile b/www/py-dotcloud.cli/Makefile
index 4adb2888d459..ab42ac2fd834 100644
--- a/www/py-dotcloud.cli/Makefile
+++ b/www/py-dotcloud.cli/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dotcloud.cli
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	dotCloud command-line interface client
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-dotcloud.cli/pkg-plist b/www/py-dotcloud.cli/pkg-plist
deleted file mode 100644
index baf99a28080a..000000000000
--- a/www/py-dotcloud.cli/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-bin/__dotcloud_git_ssh
-bin/dotcloud
-%%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/scripts/__dotcloud_git_ssh
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/dotcloud
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/cli.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/cli.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/cli.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/https.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/https.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/https.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/local.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/local.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/local.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/remote.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/remote.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/remote.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/root_ca.pem
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/setup.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud/cli
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dotcloud
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%