Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Oct 2014 08:50:18 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371173 - in head: databases/buzhug databases/emma databases/gadfly databases/galera databases/glom databases/ldb databases/monetdb databases/mydbf2mysql databases/nagios-check_mongodb ...
Message-ID:  <201410190850.s9J8oIgo088790@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Sun Oct 19 08:50:17 2014
New Revision: 371173
URL: https://svnweb.freebsd.org/changeset/ports/371173
QAT: https://qat.redports.org/buildarchive/r371173/

Log:
  - Convert ports from databases/ and deskutils/ to new USES=python
  
  Approved by:	portmgr (implicit)

Modified:
  head/databases/buzhug/Makefile
  head/databases/emma/Makefile
  head/databases/gadfly/Makefile
  head/databases/galera/Makefile
  head/databases/glom/Makefile
  head/databases/ldb/Makefile
  head/databases/monetdb/Makefile
  head/databases/mydbf2mysql/Makefile
  head/databases/nagios-check_mongodb/Makefile
  head/databases/ntdb/Makefile
  head/databases/openark-kit/Makefile
  head/databases/pg_activity/Makefile
  head/databases/pgloader/Makefile
  head/databases/pgtune/Makefile
  head/databases/pgworksheet/Makefile
  head/databases/postgresql-libpqxx/Makefile
  head/databases/postgresql-libpqxx3/Makefile
  head/databases/postgresql84-plpython/Makefile
  head/databases/postgresql90-plpython/Makefile
  head/databases/py-Elixir/Makefile
  head/databases/py-MySQLdb/Makefile
  head/databases/py-Pyrseas/Makefile
  head/databases/py-alembic/Makefile
  head/databases/py-apsw/Makefile
  head/databases/py-bsddb/Makefile
  head/databases/py-carbon/Makefile
  head/databases/py-cdb/Makefile
  head/databases/py-couchdb/Makefile
  head/databases/py-cql/Makefile
  head/databases/py-dbf/Makefile
  head/databases/py-dbutils/Makefile
  head/databases/py-fdb/Makefile
  head/databases/py-firebirdsql/Makefile
  head/databases/py-forgetsql/Makefile
  head/databases/py-gdbm/Makefile
  head/databases/py-hiredis/Makefile
  head/databases/py-htsql-mysql/Makefile
  head/databases/py-htsql-pgsql/Makefile
  head/databases/py-htsql/Makefile
  head/databases/py-mysql2pgsql/Makefile
  head/databases/py-odbc/Makefile
  head/databases/py-oops/Makefile
  head/databases/py-pg_pqueue/Makefile
  head/databases/py-pgxnclient/Makefile
  head/databases/py-pickledb/Makefile
  head/databases/py-pyhs/Makefile
  head/databases/py-pylibmc/Makefile
  head/databases/py-pymysql/Makefile
  head/databases/py-pytc/Makefile
  head/databases/py-python-rrdtool/Makefile
  head/databases/py-redis/Makefile
  head/databases/py-rrdtool_lgpl/Makefile
  head/databases/py-south/Makefile
  head/databases/py-sqlalchemy-devel/Makefile
  head/databases/py-sqlalchemy-migrate/Makefile
  head/databases/py-sqlalchemy/Makefile
  head/databases/py-sqlalchemy06/Makefile
  head/databases/py-sqlite3dbm/Makefile
  head/databases/py-sqlkit/Makefile
  head/databases/py-sqlparse/Makefile
  head/databases/py-swift/Makefile
  head/databases/py-swiftclient/Makefile
  head/databases/py-umemcache/Makefile
  head/databases/py-whisper/Makefile
  head/databases/pydbdesigner/Makefile
  head/databases/pydbx/Makefile
  head/databases/pymongo/Makefile
  head/databases/pyspatialite/Makefile
  head/databases/rrdmerge/Makefile
  head/databases/tdb/Makefile
  head/databases/zodb3/Makefile
  head/deskutils/alacarte/Makefile
  head/deskutils/cairo-dock-plugins/Makefile
  head/deskutils/conduit/Makefile
  head/deskutils/cycle/Makefile
  head/deskutils/deskbar-applet/Makefile
  head/deskutils/everygui/Makefile
  head/deskutils/ganyremote/Makefile
  head/deskutils/gbirthday/Makefile
  head/deskutils/gcalcli/Makefile
  head/deskutils/gdesklets-recentlyused/Makefile
  head/deskutils/gdesklets-starterbar/Makefile
  head/deskutils/gimmie/Makefile
  head/deskutils/glipper/Makefile
  head/deskutils/gnochm/Makefile
  head/deskutils/gnome-blog/Makefile
  head/deskutils/gtg/Makefile
  head/deskutils/hamster-applet/Makefile
  head/deskutils/kupfer/Makefile
  head/deskutils/labyrinth/Makefile
  head/deskutils/libopensync-plugin-python/Makefile
  head/deskutils/ljcharm/Makefile
  head/deskutils/menumaker/Makefile
  head/deskutils/ontv/Makefile
  head/deskutils/py-pystash/Makefile
  head/deskutils/py-send2trash/Makefile
  head/deskutils/py-vobject/Makefile
  head/deskutils/pybookreader/Makefile
  head/deskutils/pypanel/Makefile
  head/deskutils/rednotebook/Makefile
  head/deskutils/rox-memo/Makefile
  head/deskutils/semantik/Makefile
  head/deskutils/splashsetter/Makefile
  head/deskutils/taskcoach/Makefile
  head/deskutils/timer-applet/Makefile
  head/deskutils/tnote/Makefile
  head/deskutils/vboxgtk/Makefile
  head/deskutils/virt-manager/Makefile
  head/deskutils/vnc2flv/Makefile
  head/deskutils/x-tile/Makefile

Modified: head/databases/buzhug/Makefile
==============================================================================
--- head/databases/buzhug/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/buzhug/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -9,8 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 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>

Modified: head/databases/emma/Makefile
==============================================================================
--- head/databases/emma/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/emma/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -12,9 +12,9 @@ COMMENT=	Extendable MySQL managing assis
 
 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

Modified: head/databases/gadfly/Makefile
==============================================================================
--- head/databases/gadfly/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/gadfly/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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
 

Modified: head/databases/galera/Makefile
==============================================================================
--- head/databases/galera/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/galera/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -18,12 +18,11 @@ BUILD_DEPENDS=	checkmk:${PORTSDIR}/devel
 		${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
 

Modified: head/databases/glom/Makefile
==============================================================================
--- head/databases/glom/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/glom/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -29,10 +29,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgcon
 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

Modified: head/databases/ldb/Makefile
==============================================================================
--- head/databases/ldb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/ldb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/monetdb/Makefile
==============================================================================
--- head/databases/monetdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/monetdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/mydbf2mysql/Makefile
==============================================================================
--- head/databases/mydbf2mysql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/mydbf2mysql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -14,10 +14,8 @@ COMMENT=	Flexible tool for DBF import in
 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}/
 

Modified: head/databases/nagios-check_mongodb/Makefile
==============================================================================
--- head/databases/nagios-check_mongodb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/nagios-check_mongodb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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}

Modified: head/databases/ntdb/Makefile
==============================================================================
--- head/databases/ntdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/ntdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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 manpag
 
 .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
 

Modified: head/databases/openark-kit/Makefile
==============================================================================
--- head/databases/openark-kit/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/openark-kit/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/pg_activity/Makefile
==============================================================================
--- head/databases/pg_activity/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pg_activity/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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' \

Modified: head/databases/pgloader/Makefile
==============================================================================
--- head/databases/pgloader/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pgloader/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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
 

Modified: head/databases/pgtune/Makefile
==============================================================================
--- head/databases/pgtune/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pgtune/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -11,8 +11,7 @@ MASTER_SITES=	http://pgfoundry.org/frs/d
 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}

Modified: head/databases/pgworksheet/Makefile
==============================================================================
--- head/databases/pgworksheet/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pgworksheet/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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 \

Modified: head/databases/postgresql-libpqxx/Makefile
==============================================================================
--- head/databases/postgresql-libpqxx/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/postgresql-libpqxx/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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}

Modified: head/databases/postgresql-libpqxx3/Makefile
==============================================================================
--- head/databases/postgresql-libpqxx3/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/postgresql-libpqxx3/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -16,11 +16,10 @@ COMMENT=	New C++ interface for PostgreSQ
 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

Modified: head/databases/postgresql84-plpython/Makefile
==============================================================================
--- head/databases/postgresql84-plpython/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/postgresql84-plpython/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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"

Modified: head/databases/postgresql90-plpython/Makefile
==============================================================================
--- head/databases/postgresql90-plpython/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/postgresql90-plpython/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -7,14 +7,14 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${
 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
 

Modified: head/databases/py-Elixir/Makefile
==============================================================================
--- head/databases/py-Elixir/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-Elixir/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-MySQLdb/Makefile
==============================================================================
--- head/databases/py-MySQLdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-MySQLdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/py-Pyrseas/Makefile
==============================================================================
--- head/databases/py-Pyrseas/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-Pyrseas/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -15,9 +15,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psyc
 		${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

Modified: head/databases/py-alembic/Makefile
==============================================================================
--- head/databases/py-alembic/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-alembic/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-apsw/Makefile
==============================================================================
--- head/databases/py-apsw/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-apsw/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -15,9 +15,8 @@ COMMENT=	APSW stands for Another Python 
 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

Modified: head/databases/py-bsddb/Makefile
==============================================================================
--- head/databases/py-bsddb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-bsddb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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}
 

Modified: head/databases/py-carbon/Makefile
==============================================================================
--- head/databases/py-carbon/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-carbon/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -17,9 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}txam
 		${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
 

Modified: head/databases/py-cdb/Makefile
==============================================================================
--- head/databases/py-cdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-cdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -11,10 +11,8 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSI
 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}

Modified: head/databases/py-couchdb/Makefile
==============================================================================
--- head/databases/py-couchdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-couchdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -13,8 +13,7 @@ COMMENT=	Simple Library to Allow Python 
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
+USES=		python
+USE_PYTHON=	distutils pythonprefix
 
 .include <bsd.port.mk>

Modified: head/databases/py-cql/Makefile
==============================================================================
--- head/databases/py-cql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-cql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-dbf/Makefile
==============================================================================
--- head/databases/py-dbf/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-dbf/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -12,8 +12,7 @@ COMMENT=	Pure python package for reading
 
 LICENSE=	BSD3CLAUSE
 
-USES=			zip
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python zip
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>

Modified: head/databases/py-dbutils/Makefile
==============================================================================
--- head/databases/py-dbutils/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-dbutils/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-fdb/Makefile
==============================================================================
--- head/databases/py-fdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-fdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>
 

Modified: head/databases/py-firebirdsql/Makefile
==============================================================================
--- head/databases/py-firebirdsql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-firebirdsql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -13,8 +13,7 @@ COMMENT=	Python DBAPI module for Firebir
 LICENSE=	BSD
 
 # Python3 ready
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>

Modified: head/databases/py-forgetsql/Makefile
==============================================================================
--- head/databases/py-forgetsql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-forgetsql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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
 

Modified: head/databases/py-gdbm/Makefile
==============================================================================
--- head/databases/py-gdbm/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-gdbm/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -19,11 +19,9 @@ LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/data
 
 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

Modified: head/databases/py-hiredis/Makefile
==============================================================================
--- head/databases/py-hiredis/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-hiredis/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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}

Modified: head/databases/py-htsql-mysql/Makefile
==============================================================================
--- head/databases/py-htsql-mysql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-htsql-mysql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-htsql-pgsql/Makefile
==============================================================================
--- head/databases/py-htsql-pgsql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-htsql-pgsql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-htsql/Makefile
==============================================================================
--- head/databases/py-htsql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-htsql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -14,9 +14,8 @@ COMMENT=	Database Query Language (Core &
 
 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

Modified: head/databases/py-mysql2pgsql/Makefile
==============================================================================
--- head/databases/py-mysql2pgsql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-mysql2pgsql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}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

Modified: head/databases/py-odbc/Makefile
==============================================================================
--- head/databases/py-odbc/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-odbc/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/py-oops/Makefile
==============================================================================
--- head/databases/py-oops/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-oops/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-pg_pqueue/Makefile
==============================================================================
--- head/databases/py-pg_pqueue/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pg_pqueue/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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
 

Modified: head/databases/py-pgxnclient/Makefile
==============================================================================
--- head/databases/py-pgxnclient/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pgxnclient/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-pickledb/Makefile
==============================================================================
--- head/databases/py-pickledb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pickledb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -12,8 +12,8 @@ COMMENT=	Lightweight, fast, and simple k
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pickledb.py \
 		%%PYTHON_SITELIBDIR%%/pickledb.pyc \

Modified: head/databases/py-pyhs/Makefile
==============================================================================
--- head/databases/py-pyhs/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pyhs/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -12,8 +12,7 @@ DISTNAME=	python-handler-socket-${PORTVE
 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>

Modified: head/databases/py-pylibmc/Makefile
==============================================================================
--- head/databases/py-pylibmc/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pylibmc/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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}"
 

Modified: head/databases/py-pymysql/Makefile
==============================================================================
--- head/databases/py-pymysql/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pymysql/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-pytc/Makefile
==============================================================================
--- head/databases/py-pytc/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-pytc/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>
 

Modified: head/databases/py-python-rrdtool/Makefile
==============================================================================
--- head/databases/py-python-rrdtool/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-python-rrdtool/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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
 

Modified: head/databases/py-redis/Makefile
==============================================================================
--- head/databases/py-redis/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-redis/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/py-rrdtool_lgpl/Makefile
==============================================================================
--- head/databases/py-rrdtool_lgpl/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-rrdtool_lgpl/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -14,10 +14,8 @@ COMMENT=	Python interface to RRDTool, th
 
 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
 

Modified: head/databases/py-south/Makefile
==============================================================================
--- head/databases/py-south/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-south/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -13,8 +13,7 @@ COMMENT=	Intelligent schema migrations f
 
 LICENSE=	APACHE20
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>

Modified: head/databases/py-sqlalchemy-devel/Makefile
==============================================================================
--- head/databases/py-sqlalchemy-devel/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlalchemy-devel/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/py-sqlalchemy-migrate/Makefile
==============================================================================
--- head/databases/py-sqlalchemy-migrate/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlalchemy-migrate/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -17,8 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqla
 		${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>

Modified: head/databases/py-sqlalchemy/Makefile
==============================================================================
--- head/databases/py-sqlalchemy/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlalchemy/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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

Modified: head/databases/py-sqlalchemy06/Makefile
==============================================================================
--- head/databases/py-sqlalchemy06/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlalchemy06/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -15,9 +15,8 @@ COMMENT=	Python SQL toolkit and Object R
 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

Modified: head/databases/py-sqlite3dbm/Makefile
==============================================================================
--- head/databases/py-sqlite3dbm/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlite3dbm/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/py-sqlkit/Makefile
==============================================================================
--- head/databases/py-sqlkit/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlkit/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -17,10 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqla
 		${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

Modified: head/databases/py-sqlparse/Makefile
==============================================================================
--- head/databases/py-sqlparse/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-sqlparse/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -13,9 +13,8 @@ COMMENT=	Non-validating SQL parser for P
 
 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

Modified: head/databases/py-swift/Makefile
==============================================================================
--- head/databases/py-swift/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-swift/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -27,9 +27,8 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Pas
 		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

Modified: head/databases/py-swiftclient/Makefile
==============================================================================
--- head/databases/py-swiftclient/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-swiftclient/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -21,9 +21,8 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fut
 		${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 \

Modified: head/databases/py-umemcache/Makefile
==============================================================================
--- head/databases/py-umemcache/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-umemcache/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -13,9 +13,7 @@ COMMENT=	Memcache client written in high
 
 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>

Modified: head/databases/py-whisper/Makefile
==============================================================================
--- head/databases/py-whisper/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/py-whisper/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/pydbdesigner/Makefile
==============================================================================
--- head/databases/pydbdesigner/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pydbdesigner/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -17,7 +17,7 @@ BROKEN=		Needs an unsupported version of
 
 EXTRACT_AFTER_ARGS=	--exclude CVS
 
-USE_PYTHON=	yes
+USES=		python
 USE_WX=		2.4
 WX_COMPS=	python
 REINPLACE_ARGS=	-i ""

Modified: head/databases/pydbx/Makefile
==============================================================================
--- head/databases/pydbx/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pydbx/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>

Modified: head/databases/pymongo/Makefile
==============================================================================
--- head/databases/pymongo/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pymongo/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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>
 

Modified: head/databases/pyspatialite/Makefile
==============================================================================
--- head/databases/pyspatialite/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/pyspatialite/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -16,9 +16,8 @@ COMMENT=	DB-API 2.0 interface for SQLite
 
 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}

Modified: head/databases/rrdmerge/Makefile
==============================================================================
--- head/databases/rrdmerge/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/rrdmerge/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -14,10 +14,9 @@ COMMENT=	Utility to merge existing RRD d
 
 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

Modified: head/databases/tdb/Makefile
==============================================================================
--- head/databases/tdb/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
+++ head/databases/tdb/Makefile	Sun Oct 19 08:50:17 2014	(r371173)
@@ -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 manpag
 
 .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 OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410190850.s9J8oIgo088790>