Convert my own Python ports to:

- STAGEDIR
- Replace USE_PYDISTUTILS= easy_install by USE_PYDISTUTILS= yes

While I'm here
- Use PYDISTUTILS_AUTOPLIST
- Adjust or add LICENSE

27 files changed, 125 insertions, 558 deletions

diff --git a/databases/py-flask-sqlalchemy/Makefile b/databases/py-flask-sqlalchemy/Makefile
index aae3c20..6912c38 100644
--- a/databases/py-flask-sqlalchemy/Makefile
+++ b/databases/py-flask-sqlalchemy/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
 	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/databases/py-flask-sqlalchemy/pkg-plist b/databases/py-flask-sqlalchemy/pkg-plist
deleted file mode 100644
index f448802..0000000
--- a/databases/py-flask-sqlalchemy/pkg-plist
+++ /dev/null
@@ -1,15 +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%%/flask_sqlalchemy/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_sqlalchemy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_sqlalchemy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_sqlalchemy/_compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_sqlalchemy/_compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_sqlalchemy/_compat.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_sqlalchemy
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index fc0ac93..69a889e 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -17,13 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
 	${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:${PORTSDIR}/devel/py-speaklater
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-flask-babel/pkg-plist b/devel/py-flask-babel/pkg-plist
deleted file mode 100644
index 760db29..0000000
--- a/devel/py-flask-babel/pkg-plist
+++ /dev/null
@@ -1,15 +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%%/flask_babel/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_babel/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_babel/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_babel/_compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_babel/_compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_babel/_compat.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask_babel
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index dfd13a8..edb83b6 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -27,7 +27,6 @@ OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MM2CRYPTO}
@@ -42,8 +41,9 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>0:${PORTSDIR}/math/py-gmpy
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	${CP} -R ${WRKSRC}/samples/ ${EXAMPLESDIR}/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	@cd ${WRKSRC}/samples && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-speaklater/Makefile b/devel/py-speaklater/Makefile
index ff86361..e304786 100644
--- a/devel/py-speaklater/Makefile
+++ b/devel/py-speaklater/Makefile
@@ -14,13 +14,7 @@ COMMENT=	Lazy string Python module for translations
 LICENSE=	BSD
 
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-speaklater/pkg-plist b/devel/py-speaklater/pkg-plist
deleted file mode 100644
index 7ae97405..0000000
--- a/devel/py-speaklater/pkg-plist
+++ /dev/null
@@ -1,10 +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%%/speaklater.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/speaklater.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/speaklater.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index 515694c..ebd0f18 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -9,14 +9,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	MagickWand Python binding
 
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LICENSE=	MIT
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+LIB_DEPENDS=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|cmdclass={'upload_doc': upload_doc}||" \
 		${WRKSRC}/setup.py
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index b074d62..f30516f 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openss
 	${PYTHON_PKGNAMEPREFIX}asn1>=0.1.4:${PORTSDIR}/devel/py-asn1
 
 USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net/py-ndg_httpsclient/pkg-plist b/net/py-ndg_httpsclient/pkg-plist
deleted file mode 100644
index bdf0210..0000000
--- a/net/py-ndg_httpsclient/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/ndg_httpclient
-%%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%%/ndg/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/https.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/https.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/https.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_context_util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_context_util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_context_util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_peer_verification.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_peer_verification.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_peer_verification.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_socket.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_socket.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/ssl_socket.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/subj_alt_name.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/subj_alt_name.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/subj_alt_name.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/README
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/pki/ca/d573507a.0
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/pki/localhost.crt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/pki/localhost.key
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/scripts/openssl_https_server.sh
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_https.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_https.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_https.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_urllib2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_urllib2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_urllib2.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/test_utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/urllib2_build_opener.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/urllib2_build_opener.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/urllib2_build_opener.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/pki/ca
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test/pki
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient/test
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg/httpsclient
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ndg
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 240d186..c1379cb 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	urllib3
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +14,9 @@ COMMENT=	Enhance HTTP Python's standard library
 LICENSE=	MIT
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 PYTHON_PY3K_PLIST_HACK=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # ndg_httpclient is only available for Python 2
@@ -27,7 +27,6 @@ PLIST_SUB+=	SSL=""
 PLIST_SUB+=	SSL="@comment "
 .endif
 
-# distutils module can't exclude file (during install step)
 post-extract:
 .if ${PYTHON_REL} >= 300
 	@${RM} ${WRKSRC}/urllib3/contrib/pyopenssl.py
diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist
index 99b56ba..8cab926 100644
--- a/net/py-urllib3/pkg-plist
+++ b/net/py-urllib3/pkg-plist
@@ -1,78 +1,71 @@
-%%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%%/dummyserver/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/handlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/handlers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/handlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/testcase.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/testcase.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver/testcase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/_collections.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/_collections.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/_collections.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/connectionpool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/connectionpool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/connectionpool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/ntlmpool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/ntlmpool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/ntlmpool.pyo
-%%SSL%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.py
-%%SSL%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.pyc
-%%SSL%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib/pyopenssl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/fields.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/fields.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/fields.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/filepost.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/filepost.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/filepost.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ordered_dict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ordered_dict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ordered_dict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/six.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/six.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/six.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/poolmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/poolmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/poolmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/request.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/request.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/request.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/response.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/response.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/response.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages/ssl_match_hostname
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/packages
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/urllib3
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dummyserver
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PYTHON_SITELIBDIR%%/dummyserver/__init__.py
+%%PYTHON_SITELIBDIR%%/dummyserver/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/handlers.py
+%%PYTHON_SITELIBDIR%%/dummyserver/handlers.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/handlers.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/proxy.py
+%%PYTHON_SITELIBDIR%%/dummyserver/proxy.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/proxy.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/server.py
+%%PYTHON_SITELIBDIR%%/dummyserver/server.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/server.pyo
+%%PYTHON_SITELIBDIR%%/dummyserver/testcase.py
+%%PYTHON_SITELIBDIR%%/dummyserver/testcase.pyc
+%%PYTHON_SITELIBDIR%%/dummyserver/testcase.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/_collections.py
+%%PYTHON_SITELIBDIR%%/urllib3/_collections.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/_collections.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.py
+%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/connectionpool.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.py
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/contrib/ntlmpool.pyo
+%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.py
+%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.pyc
+%%SSL%%%%PYTHON_SITELIBDIR%%/urllib3/contrib/pyopenssl.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/exceptions.py
+%%PYTHON_SITELIBDIR%%/urllib3/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/fields.py
+%%PYTHON_SITELIBDIR%%/urllib3/fields.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/fields.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/filepost.py
+%%PYTHON_SITELIBDIR%%/urllib3/filepost.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/filepost.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ordered_dict.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/six.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/six.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/six.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.py
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname/__init__.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.py
+%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/poolmanager.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/request.py
+%%PYTHON_SITELIBDIR%%/urllib3/request.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/request.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/response.py
+%%PYTHON_SITELIBDIR%%/urllib3/response.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/response.pyo
+%%PYTHON_SITELIBDIR%%/urllib3/util.py
+%%PYTHON_SITELIBDIR%%/urllib3/util.pyc
+%%PYTHON_SITELIBDIR%%/urllib3/util.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3/packages/ssl_match_hostname
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3/packages
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3/contrib
+@dirrm %%PYTHON_SITELIBDIR%%/urllib3
+@dirrm %%PYTHON_SITELIBDIR%%/dummyserver
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index 5e780b5..cb7c87b 100644
--- a/security/py-itsdangerous/Makefile
+++ b/security/py-itsdangerous/Makefile
@@ -11,22 +11,16 @@ MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Various helpers to pass data in untrusted environments
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	JSON
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MJSON}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:${PORTSDIR}/devel/py-simplejson
 .endif
 
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/py-itsdangerous/pkg-plist b/security/py-itsdangerous/pkg-plist
deleted file mode 100644
index 990fb11..0000000
--- a/security/py-itsdangerous/pkg-plist
+++ /dev/null
@@ -1,10 +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%%/itsdangerous.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/itsdangerous.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/itsdangerous.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/sysutils/py-iowait/Makefile b/sysutils/py-iowait/Makefile
index 2326543..2160257 100644
--- a/sysutils/py-iowait/Makefile
+++ b/sysutils/py-iowait/Makefile
@@ -10,14 +10,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Python module for I/O completion events
 
+LICENSE=	GPLv3
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/py-iowait/pkg-plist b/sysutils/py-iowait/pkg-plist
deleted file mode 100644
index 1e10fe3..0000000
--- a/sysutils/py-iowait/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/iowait.py
-%%PYTHON_SITELIBDIR%%/iowait.pyc
-%%PYTHON_SITELIBDIR%%/iowait.pyo
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 183de64..b465030 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Python Documentation Utilities
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYTHON_PY3K_PLIST_HACK=	yes
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	PYGMENTS
@@ -22,22 +23,15 @@ BIN_SCRIPTS=	rst2html.py rst2s5.py rst2latex.py rst2xetex.py \
 	rst2man.py rst2xml.py rst2pseudoxml.py rstpep2html.py \
 	rst2odt.py rst2odt_prepstyles.py
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MPYGMENTS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments
 .endif
 
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
 post-install:
 .for script in ${BIN_SCRIPTS}
-	@cd ${PREFIX}/bin && ${LN} -sf ${script} ${script:C/\.py//}
+	@cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ${script} ${script:C/\.py//}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index 5ce593c..77160ef 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -10,12 +10,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Produces HTML5 documents from reStructuredText sources
 
+LICENSE=	MIT
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:${PORTSDIR}/textproc/py-genshi \
 	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments \
-	${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils
+	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/py-rst2html5/pkg-plist b/textproc/py-rst2html5/pkg-plist
deleted file mode 100644
index 406b459..0000000
--- a/textproc/py-rst2html5/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/rst2html5
-%%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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rst2html5.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rst2html5.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rst2html5.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 0ac3311..8334758 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -7,13 +7,15 @@ CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	duchateau.olivier@gmail.com
+MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Embed YouTube videos in reStructuredText documents
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils
+LICENSE=	MIT
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils
+
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/py-rstyoutube/pkg-descr b/textproc/py-rstyoutube/pkg-descr
index ebfb324..bd46e58 100644
--- a/textproc/py-rstyoutube/pkg-descr
+++ b/textproc/py-rstyoutube/pkg-descr
@@ -1,4 +1,4 @@
 rstyoutube is a package for embedding YouTube videos in reStructuredText
 documents.
 
-WWW:	http://bitbucket.org/cliff/rstyoutube
+WWW: http://bitbucket.org/cliff/rstyoutube
diff --git a/textproc/py-rstyoutube/pkg-plist b/textproc/py-rstyoutube/pkg-plist
deleted file mode 100644
index d205a40..0000000
--- a/textproc/py-rstyoutube/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/rst2html_youtube
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-bjoern/Makefile b/www/py-bjoern/Makefile
index 93893b9..9c5f314 100644
--- a/www/py-bjoern/Makefile
+++ b/www/py-bjoern/Makefile
@@ -10,17 +10,15 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Fast Python WSGI server
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	ev:${PORTSDIR}/devel/libev
 
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lc
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PORTNAME}.so
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index a4550b411..c8deb77 100644
--- a/www/py-flask-uploads/Makefile
+++ b/www/py-flask-uploads/Makefile
@@ -7,15 +7,15 @@ CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	duchateau.olivier@gmail.com
+MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Flexible and efficient upload handling for Flask
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.6:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/py-flask-uploads/pkg-plist b/www/py-flask-uploads/pkg-plist
deleted file mode 100644
index a71fc8e..0000000
--- a/www/py-flask-uploads/pkg-plist
+++ /dev/null
@@ -1,16 +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%%/flaskext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flaskext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flaskext/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flaskext/uploads.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flaskext/uploads.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flaskext/uploads.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flaskext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index ee789f5..4fc288d 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -12,18 +12,12 @@ COMMENT=	Micro web framework
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>=0.8:${PORTSDIR}/www/py-werkzeug \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>=0.9:${PORTSDIR}/www/py-werkzeug \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.6:${PORTSDIR}/devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.21:${PORTSDIR}/security/py-itsdangerous
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-flask/pkg-plist b/www/py-flask/pkg-plist
deleted file mode 100644
index f904d3a..0000000
--- a/www/py-flask/pkg-plist
+++ /dev/null
@@ -1,248 +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%%/flask/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/_compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/_compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/_compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/app.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/blueprints.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/blueprints.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/blueprints.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ctx.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ctx.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ctx.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/debughelpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/debughelpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/debughelpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ext/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/exthook.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/exthook.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/exthook.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/globals.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/globals.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/globals.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/helpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/json.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/json.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/json.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/logging.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/logging.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/logging.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/module.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/module.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/module.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/sessions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/sessions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/sessions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/signals.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/signals.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/signals.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/templating.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/templating.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/templating.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/appctx.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/appctx.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/appctx.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/basic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/basic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/basic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/blueprints.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/blueprints.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/blueprints.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/deprecations.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/deprecations.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/deprecations.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/examples.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/examples.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/examples.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/ext.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/ext.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/ext.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/helpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/regression.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/regression.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/regression.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/reqctx.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/reqctx.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/reqctx.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/signals.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/signals.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/signals.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/static/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/subclassing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/subclassing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/subclassing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/_macro.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/context_template.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/escaping_template.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/mail.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/nested/nested.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/simple_template.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/template_filter.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/template_test.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templating.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templating.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templating.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/static/css/test.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/static/test.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/templates/admin/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend/templates/frontend/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_module_app.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_module_app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_module_app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_package_app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_package_app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_package_app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken/b.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken/b.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken/b.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package/submodule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package/submodule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package/submodule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_simple.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_simple.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_simple.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package/submodule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package/submodule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package/submodule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_simple.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_simple.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_simple.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/importerror.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/importerror.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/importerror.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/SiteEgg.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/main_app.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/main_app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/main_app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/static/css/test.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/static/test.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/templates/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/frontend/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/frontend/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/frontend/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/frontend/templates/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/path/installed_package/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/path/installed_package/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/path/installed_package/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/subdomaintestmodule/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/subdomaintestmodule/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/subdomaintestmodule/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/subdomaintestmodule/static/hello.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/testing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/views.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/views.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/views.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/views.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/views.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/views.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/wrappers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/wrappers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/wrappers.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/subdomaintestmodule/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/subdomaintestmodule
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/path/installed_package
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/path
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/frontend/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/frontend
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/static/css
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps/admin
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/moduleapp
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5/site-packages
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib/python2.5
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/lib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext/oldext_package
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flaskext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_newext_package
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/flask_broken
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/config_package_app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend/templates/frontend
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/frontend
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/templates/admin
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/static/css
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps/admin
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps/blueprintapp
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/test_apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates/nested
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/testsuite
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask/ext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/flask
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%