11 files changed, 15 insertions, 459 deletions
diff --git a/www/py-clientform/Makefile b/www/py-clientform/Makefile
index 04cddb02d8d8..560838c09064 100644
--- a/www/py-clientform/Makefile
+++ b/www/py-clientform/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clientform
 PORTVERSION=	0.2.10
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://wwwsearch.sourceforge.net/ClientForm/src/ \
 		CHEESESHOP
@@ -13,10 +14,9 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Client-side HTTP Form for Python
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	ClientForm
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-django-mezzanine-filebrowser/Makefile b/www/py-django-mezzanine-filebrowser/Makefile
index 03caeb12fd47..c702ccc65487 100644
--- a/www/py-django-mezzanine-filebrowser/Makefile
+++ b/www/py-django-mezzanine-filebrowser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-mezzanine-filebrowser
 PORTVERSION=	0.2.27
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +14,8 @@ COMMENT=	Fork of django-filebrowser for Mezzanine CMS
 
 USE_PYTHON=	yes
 USES=		gettext
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	filebrowser_safe
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-django-mezzanine-filebrowser/pkg-plist b/www/py-django-mezzanine-filebrowser/pkg-plist
deleted file mode 100644
index 17a24c6fb232..000000000000
--- a/www/py-django-mezzanine-filebrowser/pkg-plist
+++ /dev/null
@@ -1,161 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/decorators.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/fields.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/forms.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/functions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/models.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/settings.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/storage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/urls.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/views.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/decorators.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/fields.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/forms.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/functions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/models.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/settings.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/storage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/urls.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/views.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_csrf.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_pagination.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_tags.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_csrf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_pagination.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_tags.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_csrf.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_pagination.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags/fb_tags.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ar/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ar/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ca/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ca/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/de/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/de/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/es/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/es/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/fr/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/fr/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/it/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/it/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/nl/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/nl/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ru/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ru/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr_Latn/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr_Latn/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_CN/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_CN/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_TW/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_TW/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/css/filebrowser.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/css/rtl.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_delete.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_delete_hover.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_rename.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_rename_hover.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_select.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_select_disabled.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_select_hover.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_show.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_show_hover.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_showversions.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_icon_showversions_hover.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_audio.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_code.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_document.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_folder.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_image.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img/filebrowser_type_video.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js/AddFileBrowser.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js/FB_CKEditor.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js/FB_FileBrowseField.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js/FB_TinyMCE.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js/TinyMCEAdmin.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js/filebrowser-popup.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/cancel.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/expressInstall.swf
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/jquery-1.4.2.min.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/jquery.uploadify.v2.1.4.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/jquery.uploadify.v2.1.4.min.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/swfobject.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/uploadify.allglyphs.swf
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/uploadify.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify/uploadify.swf
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/append.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/custom_field.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/makedir.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/rename.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/upload.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/_response.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/breadcrumbs.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/filelisting.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/filter.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/paginator.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/search.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/tableheader.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include/toolbar.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/decorators.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/fields.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/forms.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/functions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/models.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/settings.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/storage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/urls.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/views.pyo
-%%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
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templatetags
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser/include
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates/filebrowser
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/templates
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/uploadify
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/js
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/img
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser/css
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static/filebrowser
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/static
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_TW/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_TW
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_CN/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/zh_CN
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr_Latn/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr_Latn
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/sr
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ru/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ru
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/nl/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/nl
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/it/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/it
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/fr/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/fr
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/es/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/es
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/de/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/de
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ca/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ca
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ar/LC_MESSAGES
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale/ar
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe/locale
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/filebrowser_safe
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index f94b331415a8..4f51c6b5334a 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-registration
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USES=		gettext
 
 CONFLICTS_INSTALL=	pootle-*
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-django-registration/pkg-plist b/www/py-django-registration/pkg-plist
deleted file mode 100644
index 5b6e3388cbba..000000000000
--- a/www/py-django-registration/pkg-plist
+++ /dev/null
@@ -1,200 +0,0 @@
-%%PYTHON_SITELIBDIR%%/registration/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/admin.py
-%%PYTHON_SITELIBDIR%%/registration/admin.pyc
-%%PYTHON_SITELIBDIR%%/registration/admin.pyo
-%%PYTHON_SITELIBDIR%%/registration/auth_urls.py
-%%PYTHON_SITELIBDIR%%/registration/auth_urls.pyc
-%%PYTHON_SITELIBDIR%%/registration/auth_urls.pyo
-%%PYTHON_SITELIBDIR%%/registration/forms.py
-%%PYTHON_SITELIBDIR%%/registration/forms.pyc
-%%PYTHON_SITELIBDIR%%/registration/forms.pyo
-%%PYTHON_SITELIBDIR%%/registration/models.py
-%%PYTHON_SITELIBDIR%%/registration/models.pyc
-%%PYTHON_SITELIBDIR%%/registration/models.pyo
-%%PYTHON_SITELIBDIR%%/registration/signals.py
-%%PYTHON_SITELIBDIR%%/registration/signals.pyc
-%%PYTHON_SITELIBDIR%%/registration/signals.pyo
-%%PYTHON_SITELIBDIR%%/registration/urls.py
-%%PYTHON_SITELIBDIR%%/registration/urls.pyc
-%%PYTHON_SITELIBDIR%%/registration/urls.pyo
-%%PYTHON_SITELIBDIR%%/registration/views.py
-%%PYTHON_SITELIBDIR%%/registration/views.pyc
-%%PYTHON_SITELIBDIR%%/registration/views.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/backends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/default/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/backends/default/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/default/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/default/urls.py
-%%PYTHON_SITELIBDIR%%/registration/backends/default/urls.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/default/urls.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/default/views.py
-%%PYTHON_SITELIBDIR%%/registration/backends/default/views.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/default/views.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/urls.py
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/urls.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/urls.pyo
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/views.py
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/views.pyc
-%%PYTHON_SITELIBDIR%%/registration/backends/simple/views.pyo
-%%PYTHON_SITELIBDIR%%/registration/locale/ar/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/ar/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/bg/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/bg/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/ca/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/ca/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/cs/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/cs/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/da/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/da/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/de/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/de/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/el/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/el/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/en/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/en/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/es/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/es/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/es_AR/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/es_AR/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/fa/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/fa/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/fr/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/fr/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/he/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/he/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/hr/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/hr/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/is/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/is/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/it/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/it/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/ja/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/ja/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/ko/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/ko/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/nb/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/nb/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/nl/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/nl/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/pl/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/pl/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/pt/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/pt/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/pt_BR/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/pt_BR/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/ru/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/ru/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/sl/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/sl/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/sr/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/sr/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/sv/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/sv/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/tr_TR/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/tr_TR/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/zh_CN/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/zh_CN/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/locale/zh_TW/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/registration/locale/zh_TW/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/registration/management/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/management/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/management/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/management/commands/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/management/commands/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/management/commands/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/management/commands/cleanupregistration.py
-%%PYTHON_SITELIBDIR%%/registration/management/commands/cleanupregistration.pyc
-%%PYTHON_SITELIBDIR%%/registration/management/commands/cleanupregistration.pyo
-%%PYTHON_SITELIBDIR%%/registration/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/registration/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/registration/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/registration/tests/default_backend.py
-%%PYTHON_SITELIBDIR%%/registration/tests/default_backend.pyc
-%%PYTHON_SITELIBDIR%%/registration/tests/default_backend.pyo
-%%PYTHON_SITELIBDIR%%/registration/tests/simple_backend.py
-%%PYTHON_SITELIBDIR%%/registration/tests/simple_backend.pyc
-%%PYTHON_SITELIBDIR%%/registration/tests/simple_backend.pyo
-%%PYTHON_SITELIBDIR%%/registration/tests/forms.py
-%%PYTHON_SITELIBDIR%%/registration/tests/forms.pyc
-%%PYTHON_SITELIBDIR%%/registration/tests/forms.pyo
-%%PYTHON_SITELIBDIR%%/registration/tests/models.py
-%%PYTHON_SITELIBDIR%%/registration/tests/models.pyc
-%%PYTHON_SITELIBDIR%%/registration/tests/models.pyo
-%%PYTHON_SITELIBDIR%%/registration/tests/urls.py
-%%PYTHON_SITELIBDIR%%/registration/tests/urls.pyc
-%%PYTHON_SITELIBDIR%%/registration/tests/urls.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/registration/tests
-@dirrm %%PYTHON_SITELIBDIR%%/registration/management/commands
-@dirrm %%PYTHON_SITELIBDIR%%/registration/management
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/zh_TW/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/zh_TW
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/zh_CN/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/zh_CN
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/tr_TR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/tr_TR
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/sv/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/sv
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/sr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/sr
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/sl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/sl
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ru/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ru
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/pt_BR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/pt_BR
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/pt/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/pt
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/pl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/pl
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/nl/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/nl
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/nb/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/nb
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ko/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ko
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ja/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ja
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/it/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/it
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/is/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/is
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/hr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/hr
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/he/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/he
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/fr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/fr
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/fa/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/fa
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/es_AR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/es_AR
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/es/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/es
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/en/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/en
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/el/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/el
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/de/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/de
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/da/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/da
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/cs/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/cs
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ca/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ca
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/bg/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/bg
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ar/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale/ar
-@dirrm %%PYTHON_SITELIBDIR%%/registration/locale
-@dirrm %%PYTHON_SITELIBDIR%%/registration/backends/simple
-@dirrm %%PYTHON_SITELIBDIR%%/registration/backends/default
-@dirrm %%PYTHON_SITELIBDIR%%/registration/backends
-@dirrm %%PYTHON_SITELIBDIR%%/registration
diff --git a/www/py-fedex/Makefile b/www/py-fedex/Makefile
index dcd7c92a83d3..dec58c412ed8 100644
--- a/www/py-fedex/Makefile
+++ b/www/py-fedex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fedex
 PORTVERSION=	1.0.14
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,6 +17,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}suds>=0:${PORTSDIR}/net/py-suds
 
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-fedex/pkg-plist b/www/py-fedex/pkg-plist
deleted file mode 100644
index 661133c0c84b..000000000000
--- a/www/py-fedex/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-%%PYTHON_SITELIBDIR%%/fedex/__init__.py
-%%PYTHON_SITELIBDIR%%/fedex/__init__.pyc
-%%PYTHON_SITELIBDIR%%/fedex/__init__.pyo
-%%PYTHON_SITELIBDIR%%/fedex/base_service.py
-%%PYTHON_SITELIBDIR%%/fedex/base_service.pyc
-%%PYTHON_SITELIBDIR%%/fedex/base_service.pyo
-%%PYTHON_SITELIBDIR%%/fedex/config.py
-%%PYTHON_SITELIBDIR%%/fedex/config.pyc
-%%PYTHON_SITELIBDIR%%/fedex/config.pyo
-%%PYTHON_SITELIBDIR%%/fedex/printers/__init__.py
-%%PYTHON_SITELIBDIR%%/fedex/printers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/fedex/printers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/fedex/printers/unix.py
-%%PYTHON_SITELIBDIR%%/fedex/printers/unix.pyc
-%%PYTHON_SITELIBDIR%%/fedex/printers/unix.pyo
-%%PYTHON_SITELIBDIR%%/fedex/services/__init__.py
-%%PYTHON_SITELIBDIR%%/fedex/services/__init__.pyc
-%%PYTHON_SITELIBDIR%%/fedex/services/__init__.pyo
-%%PYTHON_SITELIBDIR%%/fedex/services/address_validation_service.py
-%%PYTHON_SITELIBDIR%%/fedex/services/address_validation_service.pyc
-%%PYTHON_SITELIBDIR%%/fedex/services/address_validation_service.pyo
-%%PYTHON_SITELIBDIR%%/fedex/services/package_movement.py
-%%PYTHON_SITELIBDIR%%/fedex/services/package_movement.pyc
-%%PYTHON_SITELIBDIR%%/fedex/services/package_movement.pyo
-%%PYTHON_SITELIBDIR%%/fedex/services/rate_service.py
-%%PYTHON_SITELIBDIR%%/fedex/services/rate_service.pyc
-%%PYTHON_SITELIBDIR%%/fedex/services/rate_service.pyo
-%%PYTHON_SITELIBDIR%%/fedex/services/ship_service.py
-%%PYTHON_SITELIBDIR%%/fedex/services/ship_service.pyc
-%%PYTHON_SITELIBDIR%%/fedex/services/ship_service.pyo
-%%PYTHON_SITELIBDIR%%/fedex/services/track_service.py
-%%PYTHON_SITELIBDIR%%/fedex/services/track_service.pyc
-%%PYTHON_SITELIBDIR%%/fedex/services/track_service.pyo
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/AddressValidationService_v2.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/CloseService_v2.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/CourierDispatchService_v3.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/PackageMovementInformationService_v4.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/RateService_v8.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/ReturnTagService_v1.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/ShipService_v7.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/TrackService_v5.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/AddressValidationService_v2.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/CloseService_v2.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/CourierDispatchService_v3.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/PackageMovementInformationService_v4.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/RateService_v8.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/ReturnTagService_v1.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/ShipService_v7.wsdl
-%%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl/TrackService_v5.wsdl
-@dirrm %%PYTHON_SITELIBDIR%%/fedex/wsdl/test_server_wsdl
-@dirrm %%PYTHON_SITELIBDIR%%/fedex/wsdl
-@dirrm %%PYTHON_SITELIBDIR%%/fedex/services
-@dirrm %%PYTHON_SITELIBDIR%%/fedex/printers
-@dirrm %%PYTHON_SITELIBDIR%%/fedex
diff --git a/www/py-rackspace-monitoring/Makefile b/www/py-rackspace-monitoring/Makefile
index e7e4720b986f..c68607874f31 100644
--- a/www/py-rackspace-monitoring/Makefile
+++ b/www/py-rackspace-monitoring/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rackspace-monitoring
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,6 +18,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libcloud>=0.12.4:${PORTSDIR}/net/py-libcloud
 # Python3 ready
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-rackspace-monitoring/pkg-plist b/www/py-rackspace-monitoring/pkg-plist
deleted file mode 100644
index f7e528f31127..000000000000
--- a/www/py-rackspace-monitoring/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/__init__.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/__init__.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/__init__.pyo
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/base.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/base.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/base.pyo
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers/__init__.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers/rackspace.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers/rackspace.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers/rackspace.pyo
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/providers.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/providers.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/providers.pyo
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/types.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/types.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/types.pyo
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/utils.py
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/utils.pyc
-%%PYTHON_SITELIBDIR%%/rackspace_monitoring/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/rackspace_monitoring/drivers
-@dirrm %%PYTHON_SITELIBDIR%%/rackspace_monitoring
diff --git a/www/py-selector/Makefile b/www/py-selector/Makefile
index cda6235b39b1..6c85e434c2e2 100644
--- a/www/py-selector/Makefile
+++ b/www/py-selector/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	selector
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,9 +16,9 @@ LICENSE=	MIT
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:${PORTSDIR}/devel/py-resolver
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} 's/license="MIT",/license="MIT", zip_safe=False,/' \
 		${WRKSRC}/setup.py
diff --git a/www/py-selector/pkg-plist b/www/py-selector/pkg-plist
deleted file mode 100644
index bf085dace4b3..000000000000
--- a/www/py-selector/pkg-plist
+++ /dev/null
@@ -1,11 +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%%/selector.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/selector.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/selector.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%