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

Approved by: portmgr (implicit)
svn path=/head/; revision=371173
2024-12-21 04:06:46 +00:00 · 2014-10-19 08:50:17 +00:00 · 2014-10-19 08:50:17 +00:00 · e1555011ab · 2021-03-31 03:12:20 +00:00
commit e1555011ab
parent dae43d7a6d
110 changed files with 189 additions and 301 deletions
--- 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>
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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}/

--- 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}
--- 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

--- 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>
--- 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' \
--- 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

--- 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}
--- 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 \
--- 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}
--- 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
--- 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"
--- 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

--- 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>
--- 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
--- 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
--- 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>
--- 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
--- 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}

--- 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

--- 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}
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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

--- 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
--- 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}
--- 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>
--- 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>
--- 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
--- 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
--- 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
--- 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>
--- 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

--- 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>
--- 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 \
--- 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>
--- 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}"

--- 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>
--- 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>

--- 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

--- 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
--- 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

--- 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>
--- 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
--- 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>
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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 \
--- 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>
--- 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>
--- 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 ""
--- 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>
--- 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>

--- 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}
--- 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
--- 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

--- 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>
--- 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
--- 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}
--- 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
--- 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
--- 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
--- 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}
--- 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
--- 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

--- 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

--- 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

--- 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}"
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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=	*
--- 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>
--- 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>
--- 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=	*
--- 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
--- 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
--- 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>
--- 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
--- 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>
--- 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

--- 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=	*

--- 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>
--- a/Show More
+++ b/Show More