14 files changed, 28 insertions, 43 deletions

diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 69a889e1f0d8..782c9bc4f388 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
 	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
 	${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:${PORTSDIR}/devel/py-speaklater
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 1c790da27a91..cf3f0c3f8471 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GData Python Client Library
 LICENSE=	APACHE20
 
 PROJECTHOST=	gdata-python-client
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
+USES=	python:2
+USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	GMPY M2CRYPTO PYCRYPTO EXAMPLES
 
diff --git a/devel/py-speaklater/Makefile b/devel/py-speaklater/Makefile
index e304786a0b6b..d35365b3f803 100644
--- a/devel/py-speaklater/Makefile
+++ b/devel/py-speaklater/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Lazy string Python module for translations
 
 LICENSE=	BSD
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index fd152f94f09f..24a0d30584aa 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -13,9 +13,8 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/pysvg/Makefile b/graphics/pysvg/Makefile
index b9a2d8416731..064016675ecb 100644
--- a/graphics/pysvg/Makefile
+++ b/graphics/pysvg/Makefile
@@ -11,10 +11,7 @@ COMMENT=	pySVG - creating svg with python
 
 LICENSE=	BSD2CLAUSE
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-
-USES=		zip
+USES=	zip python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index f30516ff6aa6..43504bb913ca 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Enhance HTTPS support for httplib and urllib2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl \
 	${PYTHON_PKGNAMEPREFIX}asn1>=0.1.4:${PORTSDIR}/devel/py-asn1
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 49c6849075b8..dd1a33a4021b 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Enhance HTTP Python's standard library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/py-certify/Makefile b/security/py-certify/Makefile
index 7d44b9b3b731..e8dba524ee6a 100644
--- a/security/py-certify/Makefile
+++ b/security/py-certify/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Mozilla's SSL certificates
 
 LICENSE=	ISCL
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-iowait/Makefile b/sysutils/py-iowait/Makefile
index 21602571fee7..5edf88138d5e 100644
--- a/sysutils/py-iowait/Makefile
+++ b/sysutils/py-iowait/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Python module for I/O completion events
 
 LICENSE=	GPLv3
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 2e9ab71f1042..c0167efddd7f 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Python Documentation Utilities
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	PYGMENTS
 PYGMENTS_DESC=	Syntax highlighting
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 833475819841..66c63f7c98fb 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -14,8 +14,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index c8deb77557a9..87b475f68235 100644
--- a/www/py-flask-uploads/Makefile
+++ b/www/py-flask-uploads/Makefile
@@ -14,8 +14,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 4fc288d30372..934b97baff75 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -16,8 +16,7 @@ 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=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile
index f6c1556210c5..fbb5bf79d269 100644
--- a/www/py-waitress/Makefile
+++ b/www/py-waitress/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Python WSGI server
 
 LICENSE=	ZPL21
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=	python
+USE_PYTHON=	distutils autoplist
 
 pre-patch:
 	@${CP} ${FILESDIR}/MANIFEST.in ${WRKSRC}