- Convert ports from databases/ and deskutils/ to new USES=python

Approved by:	portmgr (implicit)

110 files changed, 189 insertions, 301 deletions

diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index 6a1421426f7a..aca5b76bb22a 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Pure-Python database engine
 
-USES=		zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python zip
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index 141269809197..fd78bff5fee6 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Extendable MySQL managing assistant
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQLdb
 
+USES=		python
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=	distutils
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|python2.4|env python|' ${WRKSRC}/emma
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index a608034ad10b..86f9b79a0a33 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -12,9 +12,8 @@ COMMENT=	SQL database written in Python
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/kjbuckets.so:${PORTSDIR}/devel/py-kjbuckets
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index ecb4c8af69c2..374dd89469db 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -18,12 +18,11 @@ BUILD_DEPENDS=	checkmk:${PORTSDIR}/devel/libcheck \
 		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:${PORTSDIR}/textproc/py-cloud_sptheme
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
 
-USES=		execinfo scons shebangfix
+USES=		execinfo python:build scons shebangfix
 
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USE_PYTHON_BUILD=	yes
 
 MAKE_CMD=	${SCONS} -j${MAKE_JOBS_NUMBER} --config=force
 
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 1e415da62093..6415b1ed608a 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -29,10 +29,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		desktop-file-utils gettext gmake libtool pathfix \
-		pgsql pkgconfig shared-mime-info tar:bzip2
+		pgsql pkgconfig python shared-mime-info tar:bzip2
 USE_GNOME=	gnomedocutils gnomeprefix pygnomeextras
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index 903a8bd97be0..8ae894087604 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -15,8 +15,7 @@ LICENSE=		GPLv3
 
 CONFLICTS=		*samba3[0-4]-3.*
 
-USES=			compiler pkgconfig
-USE_PYTHON=		2
+USES=			compiler pkgconfig python:2
 USE_LDCONFIG=		yes
 WAF_TOOL=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile
index 68f3a483bc5d..455bd9e33a63 100644
--- a/databases/monetdb/Makefile
+++ b/databases/monetdb/Makefile
@@ -172,7 +172,7 @@ CATEGORIES+=	python
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON2}
-USE_PYTHON=	2
+USES+=		python:2
 PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 CONFIGURE_ARGS+=	--with-python2=${PYTHON_CMD} \
 			--without-python3
@@ -181,7 +181,7 @@ CONFIGURE_ARGS+=	--without-python2
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON3}
-USE_PYTHON=	3
+USES+=		python:3
 PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 CONFIGURE_ARGS+=	--with-python3=${PYTHON_CMD} \
 			--without-python2
diff --git a/databases/mydbf2mysql/Makefile b/databases/mydbf2mysql/Makefile
index 2eb60d3e7ac3..efd1651c8be0 100644
--- a/databases/mydbf2mysql/Makefile
+++ b/databases/mydbf2mysql/Makefile
@@ -14,10 +14,8 @@ COMMENT=	Flexible tool for DBF import into MySQL
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 RUN_DEPENDS+=	ydbf>=0.0.1:${PORTSDIR}/devel/py-ydbf
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
-USES=	tar:bzip2
+USES=		python tar:bzip2
+USE_PYTHON=	distutils autoplist
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}/dist/${DISTNAME}/
 
diff --git a/databases/nagios-check_mongodb/Makefile b/databases/nagios-check_mongodb/Makefile
index 7e9e54031961..944fffc50246 100644
--- a/databases/nagios-check_mongodb/Makefile
+++ b/databases/nagios-check_mongodb/Makefile
@@ -16,8 +16,7 @@ GH_ACCOUNT=	mzupan
 GH_PROJECT=	nagios-plugin-mongodb
 GH_COMMIT=	9d17373
 GH_TAGNAME=	${GH_COMMIT}
-USE_PYTHON=	yes
-USES=		shebangfix
+USES=		python shebangfix
 SHEBANG_FILES=	${WRKSRC}/check_mongodb.py
 python_OLD_CMD=	"/usr/bin/env\ python"
 python_CMD=	${PYTHON_CMD}
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index d6b833d40d7f..088652f5216a 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -16,7 +16,6 @@ LICENSE=		GPLv3
 CONFLICTS=
 
 USES=			compiler pkgconfig
-USE_PYTHON_BUILD=	2
 USE_LDCONFIG=		yes
 WAF_TOOL=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
@@ -38,8 +37,9 @@ MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
+USES+=			python:2,build
 .else
-USE_PYTHON_RUN=		yes
+USES+=			python:2
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/ntdb.so
 .endif
 
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index 7af270fa83cf..204878a75e12 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 
 PROJECTHOST=	openarkkit
-USE_PYDISTUTILS=	yes
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile
index d53be6405c0c..08435a6511b1 100644
--- a/databases/pg_activity/Makefile
+++ b/databases/pg_activity/Makefile
@@ -21,10 +21,8 @@ GH_ACCOUNT=	julmon
 GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	ba36bae
 
-USE_PYTHON=	yes
-PYDISTUTILS_NOEGGINFO=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist noegginfo
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\/usr\/share|${MAN1PREFIX}|g' \
diff --git a/databases/pgloader/Makefile b/databases/pgloader/Makefile
index dde92c99b646..1001ff08e6eb 100644
--- a/databases/pgloader/Makefile
+++ b/databases/pgloader/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	pea@raveland.org
 COMMENT=	Import CSV data and Large Object to PostgreSQL
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+USES=		python
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2
 
diff --git a/databases/pgtune/Makefile b/databases/pgtune/Makefile
index 10f7b3ff7059..8d978fa1780b 100644
--- a/databases/pgtune/Makefile
+++ b/databases/pgtune/Makefile
@@ -11,8 +11,7 @@ MASTER_SITES=	http://pgfoundry.org/frs/download.php/2449/ \
 MAINTAINER=	gjb@FreeBSD.org
 COMMENT=	Postgresql.conf tuning tips based on hardware and load type
 
-USES=		shebangfix
-USE_PYTHON=	2+
+USES=		python shebangfix
 NO_BUILD=	yes
 
 SHEBANG_FILES=	${PORTNAME}
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index 0dd9ca84bd1b..4f996c14bd6a 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -12,12 +12,9 @@ COMMENT=	Simple PostreSQL GUI front end
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:${PORTSDIR}/databases/py-pyPgSQL
 
-USES=		pgsql tar:bzip2
+USES=		pgsql python:2 tar:bzip2
 USE_GNOME=	pygtk2
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGVERSION=	1.9
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	${REINPLACE_CMD} -e \
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 67cde41a5137..0f4c5dd56099 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -17,8 +17,7 @@ LICENSE=	BSD3CLAUSE
 CONFLICTS=	postgresql-libpqxx-3.* postgresql-libpqxx3-3.*
 PORTSCOUT=	limit:^2\.
 
-USE_PYTHON_BUILD=	yes
-USES+=		gmake libtool pgsql shebangfix
+USES+=		gmake libtool pgsql python:build shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 84ef7ba7461c..ae82dae5aa78 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -16,11 +16,10 @@ COMMENT=	New C++ interface for PostgreSQL
 CONFLICTS=	postgresql-libpqxx-[2-4].*
 PORTSCOUT=	limit:^2\.
 
-USES+=		gmake libtool pgsql pkgconfig shebangfix
+USES+=		gmake libtool pgsql pkgconfig python:build shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-USE_PYTHON_BUILD=	yes
 INSTALL_TARGET=	install-strip
 
 SHEBANG_FILES=	tools/splitconfig
diff --git a/databases/postgresql84-plpython/Makefile b/databases/postgresql84-plpython/Makefile
index b213c2e234a8..fbcbb1bfa3eb 100644
--- a/databases/postgresql84-plpython/Makefile
+++ b/databases/postgresql84-plpython/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-USE_PYTHON=	2
-WANT_PGSQL_VER=	8.4
+WANT_PYTHON_USE=	python:2
+WANT_PGSQL_VER=		8.4
 
 .include "${.CURDIR}/../postgresql90-plpython/Makefile"
diff --git a/databases/postgresql90-plpython/Makefile b/databases/postgresql90-plpython/Makefile
index 3b61ed2b0134..7629187f9979 100644
--- a/databases/postgresql90-plpython/Makefile
+++ b/databases/postgresql90-plpython/Makefile
@@ -7,14 +7,14 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 
-USES+=		pgsql:${WANT_PGSQL_VER}
+USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
 
 WANT_PGSQL_VER?=	9.0
+WANT_PYTHON_USE?=	python
 
-USE_PYTHON?=	yes
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index fb6d3a6728d2..43effeaf1577 100644
--- a/databases/py-Elixir/Makefile
+++ b/databases/py-Elixir/Makefile
@@ -16,8 +16,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.4.0:${PORTSDIR}/databases/py-sqlalchemy06
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 348c5099d31b..1f4d069f6514 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -12,15 +12,14 @@ DISTNAME=	MySQL-python-${DISTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-USE_MYSQL=		yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
+USE_MYSQL=	yes
 
 CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]*
 
 PORTDOCS=	*
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index 605eb3cadea8..b0f97373e9eb 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -15,9 +15,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.2:${PORTSDIR}/databases/py-psyco
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.09:${PORTSDIR}/devel/py-yaml
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	perseas
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index eeea7a5ba817..b036fe1bd141 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -14,8 +14,7 @@ LICENSE=	MIT
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.3:${PORTSDIR}/databases/py-sqlalchemy \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:${PORTSDIR}/textproc/py-mako
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 5bfba09ed295..03ef9186cb5d 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -15,9 +15,8 @@ COMMENT=	APSW stands for Another Python SQLite Wrapper
 LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 PYDISTUTILS_PKGVERSION=	${PORTVERSION}_r1
-USES=		zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python zip
+USE_PYTHON=	distutils
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index a20fa907071d..ef4188fcdb94 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -18,16 +18,14 @@ LICENSE=	PSFL
 PORTSCOUT=	ignore:1
 
 USE_BDB=	43+
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-USES=		tar:xz
+USE_PYTHON=	distutils autoplist
+USES=		python tar:xz
 
 DIST_SUBDIR=	python
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
 WRKSRC=		${WRKDIR}/Python-${PORTVERSION}/Modules
 
 PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
-PYDISTUTILS_AUTOPLIST=	yes
 
 MAKE_ENV=	BSDDB_VERSION=${BDB_LIB_NAME}
 
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 979879dfcc88..00272895181d 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \
 		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:${PORTSDIR}/databases/py-whisper \
 		${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-USES=		twisted:run
+USE_PYTHON=	distutils
+USES=		python:2 twisted:run
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
 USE_RC_SUBR=	carbon
 
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index ace82e858f62..edfe27557f3c 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -11,10 +11,8 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to DJB's constant database library
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	python-cdb
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index 9449e569b43b..7c97c8119c50 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Simple Library to Allow Python Applications to Use CouchDB
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
+USES=		python
+USE_PYTHON=	distutils pythonprefix
 
 .include <bsd.port.mk>
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index 2c0e18235c0f..d7c531400975 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -15,8 +15,8 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/thrift/Thrift.py:${PORTSDIR}/devel/py-thrift
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	cql
 
 .include <bsd.port.mk>
diff --git a/databases/py-dbf/Makefile b/databases/py-dbf/Makefile
index 70125ce9cecb..10fd37a159de 100644
--- a/databases/py-dbf/Makefile
+++ b/databases/py-dbf/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Pure python package for reading/writing dbf files
 
 LICENSE=	BSD3CLAUSE
 
-USES=			zip
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python zip
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile
index 2d697b3086bd..431ac83a990c 100644
--- a/databases/py-dbutils/Makefile
+++ b/databases/py-dbutils/Makefile
@@ -13,8 +13,7 @@ DISTNAME=	DBUtils-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Providing solid, persistent, and pooled connections to a database
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-fdb/Makefile b/databases/py-fdb/Makefile
index 222a037b2e91..58a29a0aff89 100644
--- a/databases/py-fdb/Makefile
+++ b/databases/py-fdb/Makefile
@@ -15,9 +15,8 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	libfbclient.so:${PORTSDIR}/databases/firebird25-client
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/py-firebirdsql/Makefile b/databases/py-firebirdsql/Makefile
index 0895e81d300e..0aebfcbb7c4c 100644
--- a/databases/py-firebirdsql/Makefile
+++ b/databases/py-firebirdsql/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Python DBAPI module for FirebirdSQL
 LICENSE=	BSD
 
 # Python3 ready
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index c25f90bae80c..ae48e918e225 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -12,10 +12,8 @@ DISTNAME=	forgetSQL-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for object-oriented access to SQL databases
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	forgetSQL
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 DOCS=	BUGS README TODO
 
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 3775fe6fcce8..2187b1bca27e 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -19,11 +19,9 @@ LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 
 PORTSCOUT=	ignore:1
 
-USES=			tar:xz
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python tar:xz
+USE_PYTHON=	distutils autoplist
 
-PYDISTUTILS_AUTOPLIST=		yes
 PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload
 
 DIST_SUBDIR=	python
diff --git a/databases/py-hiredis/Makefile b/databases/py-hiredis/Makefile
index cbf5884f378d..6dce157a2e6a 100644
--- a/databases/py-hiredis/Makefile
+++ b/databases/py-hiredis/Makefile
@@ -14,9 +14,8 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/${PYSETUP}
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index 39f309d7b067..ace8fc6425df 100644
--- a/databases/py-htsql-mysql/Makefile
+++ b/databases/py-htsql-mysql/Makefile
@@ -17,8 +17,7 @@ LICENSE=	AGPLv3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:${PORTSDIR}/databases/py-htsql \
 		${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index d4daf76a27d3..ec1409f792c0 100644
--- a/databases/py-htsql-pgsql/Makefile
+++ b/databases/py-htsql-pgsql/Makefile
@@ -17,8 +17,7 @@ LICENSE=	AGPLv3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:${PORTSDIR}/databases/py-htsql \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index 3d782ad1cce9..a9bc20267e99 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Database Query Language (Core & SQLite Backend)
 
 LICENSE=	AGPLv3
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index 86e9519d6473..da2fab9d7186 100644
--- a/databases/py-mysql2pgsql/Makefile
+++ b/databases/py-mysql2pgsql/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:${PORTSDIR}/databases/py-MySQ
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:${PORTSDIR}/devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	philipsoutham
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index a6bda065983a..bb467ffb5d0d 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -13,10 +13,8 @@ COMMENT=	ODBC connections for python
 
 LICENSE=	MIT
 
-USES=		zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python zip
+USE_PYTHON=	distutils autoplist
 
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
diff --git a/databases/py-oops/Makefile b/databases/py-oops/Makefile
index dc6ec64a710d..844d64deac64 100644
--- a/databases/py-oops/Makefile
+++ b/databases/py-oops/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object Oriented Database Library For Persistent Storage in Python
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pg_pqueue/Makefile b/databases/py-pg_pqueue/Makefile
index cdf50c7340d6..cb920568699a 100644
--- a/databases/py-pg_pqueue/Makefile
+++ b/databases/py-pg_pqueue/Makefile
@@ -14,9 +14,8 @@ COMMENT=	PostgreSQL PQ Protocol Modules
 
 LICENSE=	BSD
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/py-pgxnclient/Makefile b/databases/py-pgxnclient/Makefile
index be231c71865c..74d0e332f2d4 100644
--- a/databases/py-pgxnclient/Makefile
+++ b/databases/py-pgxnclient/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Command line tool to interact with the PostgreSQL Extension Network
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index 6c842b7ed0f5..8b088b6d5f34 100644
--- a/databases/py-pickledb/Makefile
+++ b/databases/py-pickledb/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight, fast, and simple key-value store
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pickledb.py \
 		%%PYTHON_SITELIBDIR%%/pickledb.pyc \
diff --git a/databases/py-pyhs/Makefile b/databases/py-pyhs/Makefile
index 23522ab19d0a..783b5f457770 100644
--- a/databases/py-pyhs/Makefile
+++ b/databases/py-pyhs/Makefile
@@ -12,8 +12,7 @@ DISTNAME=	python-handler-socket-${PORTVERSION}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	HandlerSocket client for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pylibmc/Makefile b/databases/py-pylibmc/Makefile
index e2a9939011eb..ba2784abe0bd 100644
--- a/databases/py-pylibmc/Makefile
+++ b/databases/py-pylibmc/Makefile
@@ -15,9 +15,8 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 MAKE_ENV+=	LIBMEMCACHED="${LOCALBASE}"
 
diff --git a/databases/py-pymysql/Makefile b/databases/py-pymysql/Makefile
index cb215e46c4f6..34906eb6418b 100644
--- a/databases/py-pymysql/Makefile
+++ b/databases/py-pymysql/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Pure Python MySQL Driver
 
 LICENSE=	MIT
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pytc/Makefile b/databases/py-pytc/Makefile
index 48d77238a6ad..1cd3625703ab 100644
--- a/databases/py-pytc/Makefile
+++ b/databases/py-pytc/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Tokyo Cabinet Python bindings
 
 LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/py-python-rrdtool/Makefile b/databases/py-python-rrdtool/Makefile
index a749f1c8f8d4..057b90294ea6 100644
--- a/databases/py-python-rrdtool/Makefile
+++ b/databases/py-python-rrdtool/Makefile
@@ -13,11 +13,9 @@ LICENSE=	LGPL3
 
 LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
 
-USES=		pkgconfig
+USES=		pkgconfig python
 USE_GNOME=	cairo glib20 libxml2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index 0307ff92e514..3102be9f6908 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -18,10 +18,8 @@ DOCGEN=		${LOCALBASE}/bin/sphinx-apidoc
 
 HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>0:${PORTSDIR}/databases/py-hiredis
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYTHON_CONCURRENT_INSTALL=yes
+USES=		python
+USE_PYTHON=	distutils autoplist concurrent
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	andymccurdy
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index a72469839292..e3e6e99adb80 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -14,10 +14,8 @@ COMMENT=	Python interface to RRDTool, the graphing and logging utility
 
 LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	py-rrdtool
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 LIBDIR?=	${LOCALBASE}/lib # directory where librrd.so lives
 
diff --git a/databases/py-south/Makefile b/databases/py-south/Makefile
index 94545ad2fc41..e6b4613b9f62 100644
--- a/databases/py-south/Makefile
+++ b/databases/py-south/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Intelligent schema migrations for Django apps
 
 LICENSE=	APACHE20
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlalchemy-devel/Makefile b/databases/py-sqlalchemy-devel/Makefile
index 484d14aa1eb9..abb0b9b24b5e 100644
--- a/databases/py-sqlalchemy-devel/Makefile
+++ b/databases/py-sqlalchemy-devel/Makefile
@@ -18,9 +18,8 @@ LICENSE=	MIT
 TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PY2TO3_CMD=		${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=		--no-diffs --nobackups --verbose --write
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 1c4083d2da37..3343369793db 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sql
 		${PYTHON_PKGNAMEPREFIX}Tempita>0:${PORTSDIR}/textproc/py-Tempita \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index e5e3029c864a..9072cffd4168 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -18,11 +18,10 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
 
 # Python3 ready
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-PY2TO3_CMD=		${LOCALBASE}/bin/2to3-${PYTHON_VER}
-PY2TO3_ARGS=		--no-diffs --nobackups --verbose --write
+USES=		python
+USE_PYTHON=	distutils autoplist
+PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
+PY2TO3_ARGS=	--no-diffs --nobackups --verbose --write
 
 OPTIONS_DEFINE=		DOCS EXAMPLES TESTS
 OPTIONS_MULTI=		BACKEND
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index f2dce404b845..1577fecddb36 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Python SQL toolkit and Object Relational Mapper (series 0.6)
 LICENSE=	MIT
 
 # Python3 ready
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 # bypass infrastructure bug
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
diff --git a/databases/py-sqlite3dbm/Makefile b/databases/py-sqlite3dbm/Makefile
index 7c1db45d9bf4..19e0f52fbc8f 100644
--- a/databases/py-sqlite3dbm/Makefile
+++ b/databases/py-sqlite3dbm/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Sqlite-backed dictionary
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlkit/Makefile b/databases/py-sqlkit/Makefile
index 0b9822de003f..a47ef152ee35 100644
--- a/databases/py-sqlkit/Makefile
+++ b/databases/py-sqlkit/Makefile
@@ -17,10 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-s
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}Babel>=0:${PORTSDIR}/devel/py-babel
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
+USE_PYTHON=	distutils
 USE_GNOME=	pygtk2
-USES=		gettext
+USES=		gettext python:2
 
 OPTIONS_DEFINE=	MSSQL MYSQL PGSQL SQLITE SYBASE DOCS
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE
diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile
index 45d8a244958e..91a1baa2dcb6 100644
--- a/databases/py-sqlparse/Makefile
+++ b/databases/py-sqlparse/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Non-validating SQL parser for Python
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|distutils.core|setuptools|g' ${WRKSRC}/setup.py
diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index 2a2d391926e5..704a3d3e2137 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -27,9 +27,8 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:${PORTSDIR}/www/py-pastedeplo
 		memcached>=0:${PORTSDIR}/databases/memcached \
 		rsync>=3.0:${PORTSDIR}/net/rsync
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 USE_RC_SUBR=	swift
 USERS=		swift
 GROUPS=		swift
diff --git a/databases/py-swiftclient/Makefile b/databases/py-swiftclient/Makefile
index 5e8af5cef1b0..a947eabe0356 100644
--- a/databases/py-swiftclient/Makefile
+++ b/databases/py-swiftclient/Makefile
@@ -21,9 +21,8 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.1.3:${PORTSDIR}/devel/py-futures
 		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}requests>=1.1:${PORTSDIR}/www/py-requests
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/manpages/swift.1 \
diff --git a/databases/py-umemcache/Makefile b/databases/py-umemcache/Makefile
index 4c23443dced0..3e56470c3be8 100644
--- a/databases/py-umemcache/Makefile
+++ b/databases/py-umemcache/Makefile
@@ -13,9 +13,7 @@ COMMENT=	Memcache client written in highly optimized C++ with Python bindings
 
 LICENSE=	BSD4CLAUSE
 
-USES=			dos2unix zip
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		dos2unix python:2 zip
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-whisper/Makefile b/databases/py-whisper/Makefile
index 1734163543c2..f7a55c09199f 100644
--- a/databases/py-whisper/Makefile
+++ b/databases/py-whisper/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile
index 092694176859..43a71bfd9f17 100644
--- a/databases/pydbdesigner/Makefile
+++ b/databases/pydbdesigner/Makefile
@@ -17,7 +17,7 @@ BROKEN=		Needs an unsupported version of wxWidgets
 
 EXTRACT_AFTER_ARGS=	--exclude CVS
 
-USE_PYTHON=	yes
+USES=		python
 USE_WX=		2.4
 WX_COMPS=	python
 REINPLACE_ARGS=	-i ""
diff --git a/databases/pydbx/Makefile b/databases/pydbx/Makefile
index c98208ed893d..9628b927bf6a 100644
--- a/databases/pydbx/Makefile
+++ b/databases/pydbx/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	david@acz.org
 COMMENT=	Simple SQL database abstraction layer for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/databases/pymongo/Makefile b/databases/pymongo/Makefile
index ac1adf4be544..eb095d949d42 100644
--- a/databases/pymongo/Makefile
+++ b/databases/pymongo/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Python driver for MongoDB
 
 LICENSE=	APACHE20
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/pyspatialite/Makefile b/databases/pyspatialite/Makefile
index 12354c3b1ccd..47732f727071 100644
--- a/databases/pyspatialite/Makefile
+++ b/databases/pyspatialite/Makefile
@@ -16,9 +16,8 @@ COMMENT=	DB-API 2.0 interface for SQLite 3.x with Spatialite 3.x
 
 LIB_DEPENDS=	libspatialite.so:${PORTSDIR}/databases/spatialite
 
-USES=		iconv
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		iconv python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	pyspatialite
 
 AMALGAMATION_NAME=	libspatialite-amalgamation-${PORTVERSION}
diff --git a/databases/rrdmerge/Makefile b/databases/rrdmerge/Makefile
index 6380d039abf1..5dcd3ce3f11f 100644
--- a/databases/rrdmerge/Makefile
+++ b/databases/rrdmerge/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Utility to merge existing RRD data from backups into new RRD files
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
-USES=		tar:bzip2 shebangfix
+USES=		tar:bzip2 shebangfix python
 SHEBANG_FILES=	rrdmergetree
 GITREVISION=	b05d69bfac64
-USE_PYTHON=	yes
 bash_CMD=	/bin/sh
 NO_BUILD=	yes
 PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}tree
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 8532078ad72a..b20e36c7201e 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -16,7 +16,6 @@ LICENSE=		GPLv3
 CONFLICTS=		*samba3[0-4]-3.*
 
 USES=			compiler pkgconfig
-USE_PYTHON_BUILD=	2
 USE_LDCONFIG=		yes
 WAF_TOOL=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
@@ -37,8 +36,9 @@ MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
+USES+=			python:2,build
 .else
-USE_PYTHON_RUN=		yes
+USES+=			python:2
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/tdb.so
 .endif
 
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index eaf48e08018d..be5d337f8550 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
 		${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:${PORTSDIR}/devel/py-zclockfile \
 		${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:${PORTSDIR}/devel/py-zope.event
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index ed61ff257ce8..3008361a6cd6 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -13,8 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Editor for the freedesktop.org menu specification
 
 USE_GNOME=	gnomehack gnomeprefix pygnomedesktop intlhack
-USES=		gettext gmake pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		gettext gmake pkgconfig python tar:bzip2
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 5f341eba0a79..e5c6d9212b5f 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -21,9 +21,8 @@ ICONS_PACKAGE=	cairo-dock-plugins-png-icons
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 librsvg2 libxml2
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 USE_XORG=	xrender
-USES=		cmake gettext pkgconfig
+USES=		cmake gettext pkgconfig python
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/thon//}"
 CMAKE_ARGS+=	-DROOT_PREFIX:PATH=${STAGEDIR}
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 3dc1268e1342..6119e85a25cd 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -24,9 +24,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goo
 		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig python
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile
index 5400b2a510df..d45ac41fe05c 100644
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Calendar program for women
 
 LICENSE=	GPLv2
 
-USES=		tar:bzip2
-USE_PYTHON_RUN=	yes
+USES=		python:run tar:bzip2
 USE_WX=		3.0+
 WX_COMPS=	python
 NO_BUILD=	yes
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 4a47471c772d..230de910a6c9 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Omnipresent versatile search interface
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	gnomeprefix pygnomedesktop intlhack
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index b565fb3ad0c3..0f91f00e2e04 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic GUI for an OS command
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_GNOME=	libglade2 pygnome2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index a3046011417a..277a3b890a8a 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -13,9 +13,8 @@ LICENSE=	GPLv2 # (or later)
 
 RUN_DEPENDS=	anyremote:${PORTSDIR}/comms/anyremote
 
-USES=		gettext
+USES=		gettext python
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index 7c520d12d1c4..0eaa7dddcee4 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -24,8 +24,7 @@ NLS_USE=			GNOME=intltool
 NOTIFY_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify
 THUNDERBIRD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
-USES=		tar:xz
-USE_PYTHON_RUN=	2
+USES=		python:2,run tar:xz
 USE_GNOME=	pygtk2
 LANGUAGES=	de en es fr gl it pl pt ru sk
 
diff --git a/deskutils/gcalcli/Makefile b/deskutils/gcalcli/Makefile
index d67685d2d656..c665cf29db78 100644
--- a/deskutils/gcalcli/Makefile
+++ b/deskutils/gcalcli/Makefile
@@ -19,7 +19,7 @@ GH_PROJECT=	gcalcli
 GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	a0fc61a
 
-USE_PYTHON=	yes
+USES=		python
 
 NO_BUILD=	yes
 
diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile
index e2cce18f1fcb..f774a44ace21 100644
--- a/deskutils/gdesklets-recentlyused/Makefile
+++ b/deskutils/gdesklets-recentlyused/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 WRKSRC=		${WRKDIR}/${NAME}
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+USES=		python
 
 SUB_FILES=	pkg-message
 
diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index b93a8c07f8d1..9c7e0bbf4934 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Icon bar for GNOME 2.x where you can put starters into
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
-USE_PYTHON=	yes
+USES=		python
 
 SUB_FILES=	pkg-message
 SUB_LIST=	NAME="${NAME}"
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index 99ca898ece5f..94d1c011ad5a 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libgnomecups-1.0.a:${PORTSDIR}/print/libgnomecup
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 
 USE_GNOME=	gnomehack gnomeprefix pygnome2 pygnomedesktop pygnomeextras
-USES=		gmake libtool pkgconfig
-USE_PYTHON=	yes
+USES=		gmake libtool pkgconfig python
 GCONF_SCHEMAS=	gimmie.schemas
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile
index 1a8cb287620a..d351d5a5a0a9 100644
--- a/deskutils/glipper/Makefile
+++ b/deskutils/glipper/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clipboard manager for the GNOME panel
 
-USES=		gettext gmake iconv libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake iconv libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	gnomeprefix intltool pygnomedesktop pygnomeextras
-USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec --disable-schemas-install
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index f413c35303ec..6ef338da73a8 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -13,11 +13,10 @@ COMMENT=	GNOME viewer for CHM files
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/chm/_chmlib.so:${PORTSDIR}/textproc/pychm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		desktop-file-utils gettext gmake pathfix shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix python shared-mime-info
 USE_GNOME=	gnomeprefix intlhack pygnome2 pygtk2 pygnomeextras
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mime-update
-USE_PYTHON=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 88dd42674094..6e7080bddaf4 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -12,8 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME app to post to blogs
 
-USE_PYTHON=	yes
-USES=		gettext gmake pkgconfig tar:bzip2
+USES=		gettext gmake pkgconfig python tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnome2 intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index f499cb540523..12ea25928c31 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -16,13 +16,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus \
 		xset:${PORTSDIR}/x11/xset
 
 USE_GNOME=	pygobject pygtk2
-USES=		gettext desktop-file-utils shebangfix
+USES=		gettext desktop-file-utils python:2 shebangfix
 INSTALLS_ICONS=	yes
 SHEBANG_FILES=	${WRKSRC}/gtcli_bash_completion
-
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=		CHEETAH
 CHEETAH_DESC=		Needed for export plugin to work
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index cc8c6952f375..785bf177f961 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
-USES=		gettext gmake pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		gettext gmake pkgconfig python tar:bzip2
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomeprefix intlhack gnomehack pygnomedesktop \
 		gnomecontrolcenter2 gnomedocutils
diff --git a/deskutils/kupfer/Makefile b/deskutils/kupfer/Makefile
index 32e170e65645..b0d1e25c8ecb 100644
--- a/deskutils/kupfer/Makefile
+++ b/deskutils/kupfer/Makefile
@@ -26,9 +26,8 @@ GH_PROJECT=	kupfer
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	0268e36
 
-USES=		desktop-file-utils shared-mime-info
+USES=		desktop-file-utils python shared-mime-info
 USE_GNOME=	gvfs intltool pygtk2 pygnomedesktop
-USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	*
diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index 06fcad9d34ef..961c90416d1e 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS+=	f2py:${PORTSDIR}/math/py-numpy
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GMSGFMT=msgfmt
 USE_GNOME=	pygnome2 gnomedesktop gnomehack
-USE_PYTHON=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig python
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/libopensync-plugin-python/Makefile b/deskutils/libopensync-plugin-python/Makefile
index 07e377119a80..cb76f4ee1e18 100644
--- a/deskutils/libopensync-plugin-python/Makefile
+++ b/deskutils/libopensync-plugin-python/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync022
 
 CONFLICTS=	libopensync-plugin-python-devel-[0-9]*
 
-USES=		libtool pkgconfig tar:bzip2
+USES=		libtool pkgconfig python tar:bzip2
 GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/ljcharm/Makefile b/deskutils/ljcharm/Makefile
index aa853e657331..1814aadf5efc 100644
--- a/deskutils/ljcharm/Makefile
+++ b/deskutils/ljcharm/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Menu-driven python-based livejournal client
 
 LICENSE=	GPLv2
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/deskutils/menumaker/Makefile b/deskutils/menumaker/Makefile
index efd81992ff0b..c1305d740ce3 100644
--- a/deskutils/menumaker/Makefile
+++ b/deskutils/menumaker/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/MenuMaker/${PORTVERSION}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Menu generator for X Window Managers and desktop environments
 
-USE_PYTHON=	yes
-USES=	gmake
+USES=		gmake python
 GNU_CONFIGURE=	yes
 
 INFO=		mmaker
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index 402ed2e147bf..3f22024acee0 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/dev
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		tv_check:${PORTSDIR}/textproc/p5-xmltv
 
-USES=		gettext gmake tar:bzip2
+USES=		gettext gmake python:2 tar:bzip2
 USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras pygtk2
-USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/py-pystash/Makefile b/deskutils/py-pystash/Makefile
index 2b20785470fe..a650ce631514 100644
--- a/deskutils/py-pystash/Makefile
+++ b/deskutils/py-pystash/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:${PORTSDIR}/devel/py-args \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:${PORTSDIR}/devel/py-xerox
 
-PYDISTUTILS_AUTOPLIST=	yes
-
-USE_PYDISTUTILS=	yes
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-send2trash/Makefile b/deskutils/py-send2trash/Makefile
index 1108a9156186..a89184deae30 100644
--- a/deskutils/py-send2trash/Makefile
+++ b/deskutils/py-send2trash/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Small package that sends files to the Trash
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	CHANGES.rst README.rst
 OPTIONS_DEFINE=	DOCS
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index a1d5ad082bb3..285b91a5d467 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -13,8 +13,7 @@ COMMENT=	ICalendar library
 
 RUN_DEPENDS=	py*-dateutil>=1.1:${PORTSDIR}/devel/py-dateutil
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 9392c84f6aab..e69f70a717f5 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Program for reading e-books
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	PyBookReader
 USE_GNOME=	pygtk2
 
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 9db596fa9f33..de022f138b97 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -15,12 +15,10 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_EFL=	imlib2
 USE_XORG=	xft
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	PyPanel
 
 PORTDOCS=	*
 
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index dc876a96d4cf..9c5fa15360bd 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -19,12 +19,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
 
-USES=		desktop-file-utils gettext
+USES=		desktop-file-utils gettext python:2
 
 INSTALLS_ICONS=	yes
 USE_GNOME=	pygtk2
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index 69add84c70eb..38b007daf7c5 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Appointment/TODO management for the ROX desktop
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
 
-USES=	tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index eb53eaaa4a58..0756087bae39 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -14,10 +14,9 @@ LICENSE=	GPLv3
 USE_KDE4=	kdehier kdelibs kdeprefix
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
-USE_PYTHON=	yes
 USE_QT4=	corelib gui linguist_build svg webkit xml \
 		moc_build qmake_build uic_build
-USES=		pkgconfig shebangfix tar:bzip2
+USES=		pkgconfig python shebangfix tar:bzip2
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}" \
 		PATH="${KDE4_PREFIX}/bin:$$PATH" \
 		WAF_HOME="${WRKSRC}"
diff --git a/deskutils/splashsetter/Makefile b/deskutils/splashsetter/Makefile
index 124acb4421bd..3f22edb81711 100644
--- a/deskutils/splashsetter/Makefile
+++ b/deskutils/splashsetter/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Splash screen changer for GNOME
 
-USES=	tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 USE_GNOME=	pygnome2 gnomeprefix
 
 do-build:
diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index b35d09cd584f..aa310a60d99e 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -13,9 +13,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 LICENSE=	GPLv3
 LICENSE_FILE=   ${WRKSRC}/LICENSE.txt
-USES=		twisted
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python twisted
+USE_PYTHON=	distutils
 PYDISTUTILS_EGGINFO=${DISTNAME}-py${PYTHON_VER}.egg-info
 USE_WX=		2.8
 WX_COMPS=	python:lib
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 16e11eec1001..6cfaa007dd04 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	gnome-audio>0:${PORTSDIR}/audio/gnome-audio \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix python
 USE_GNOME=	gnomeprefix intlhack pygnomedesktop
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec --disable-schemas-install
 
diff --git a/deskutils/tnote/Makefile b/deskutils/tnote/Makefile
index 4dd759d934aa..d64847729a3b 100644
--- a/deskutils/tnote/Makefile
+++ b/deskutils/tnote/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Small note taking program for the terminal
 
 LICENSE=	GPLv3
 
-USES=		shebangfix
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
+USES=		python:2 shebangfix
+USE_PYTHON=	distutils
 
 SHEBANG_FILES=	tnote
 python_OLD_CMD=	${SETENV} python
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index 887fb73c4b06..2f5844540119 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -12,10 +12,9 @@ COMMENT=	GTK frontend for VirtualBox
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xpcom/vboxxpcom.py:${PORTSDIR}/emulators/virtualbox-ose
 
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_GNOME=	gtk30 pygtk2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	NLS
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index 4e96bc5e4036..5b5937376582 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -33,8 +33,7 @@ INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	virt-manager.schemas
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-tui
-USES=		gmake
-USE_PYTHON=	yes
+USES=		gmake python
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|itlocaledir = $$(prefix)/$$(DATADIRNAME)/locale|itlocaledir = $$(prefix)/share/locale|' \
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 733e00c48a65..5174a55f2715 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -16,10 +16,7 @@ RUN_DEPENDS+=	x11vnc:${PORTSDIR}/net/x11vnc
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	${PORTNAME}
-PYDISTUTILS_PKGVERSION=	${PORTVERSION}
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/deskutils/x-tile/Makefile b/deskutils/x-tile/Makefile
index 2c6c3bd972f3..26ddea942846 100644
--- a/deskutils/x-tile/Makefile
+++ b/deskutils/x-tile/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GNOME applet to tile the opened windows
 LICENSE=	GPLv2
 
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	X_Tile
 
 OPTIONS_DEFINE=	NLS