49 files changed, 75 insertions, 113 deletions

diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index f4146c56004e..b5bfb331886d 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -16,8 +16,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-USE_PYTHON_RUN=	yes
-USES=		iconv gmake perl5 pkgconfig shebangfix
+USES=		iconv gmake perl5 pkgconfig python:run shebangfix
 USE_PERL5=	run
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index 406360228d33..809a6ca797e1 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -18,9 +18,8 @@ GH_ACCOUNT=	Jajcus
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USES=		shebangfix
+USES=		python:2 shebangfix
 SHEBANG_FILES=	cjc.in cjc.py cjc/main.py
-USE_PYTHON=	2
 
 PORTDOCS=	*
 
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index 3905cedf71f5..7a3ef3c6c6b9 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PROJECTHOST=	bsdistfiles
-USE_PYTHON=	yes
-USES=		gettext desktop-file-utils
+USES=		gettext desktop-file-utils python
 USE_GNOME=	pygtk2
 USE_GSTREAMER=	python
 INSTALLS_ICONS=	yes
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 8f1fdf432ca6..f4738fc51818 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -30,14 +30,13 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 
 CONFLICTS=	empathy-3.[0-9]*
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig python tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	evolutiondataserver gnomeprefix pygtk2
 GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_PYTHON=	yes
 MAKE_JOBS_UNSAFE=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 0987436e32b6..2e85a63592ee 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
 
 USE_OPENSSL=	yes
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index a8f3199be181..7fce9ff26bf0 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -16,8 +16,7 @@ GH_ACCOUNT=	lyricat
 GH_PROJECT=	Hotot
 GH_COMMIT=	1f68d33
 
-USES=		cmake gettext
-USE_PYTHON=	yes
+USES=		cmake gettext python
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index e66e84760d23..0106c963f8e6 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Flexible Communications Framework
 LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USE_PYTHON_BUILD=	yes
-USES=		gmake libtool:keepla pkgconfig
+USES=		gmake libtool:keepla pkgconfig python:build
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 libxslt:build
 GNU_CONFIGURE=	yes
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 8d333c65b3e1..a4971eede54e 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	py*-openssl>0:${PORTSDIR}/security/py-openssl \
 		${PYTHON_SITELIBDIR}/farsight.so:${PORTSDIR}/net-im/farsight2
 
 USE_GNOME=	pygobject
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/net-im/pebrot/Makefile b/net-im/pebrot/Makefile
index 60236c9a7cb0..03f46f268dbd 100644
--- a/net-im/pebrot/Makefile
+++ b/net-im/pebrot/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Text-based MSN messenger client
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index 9d0d3fe4f6a1..9ed2db7a87f8 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -11,9 +11,8 @@ DISTNAME=	jabberpy-${PORTVERSION}-0
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Python Jabber library
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/jabber.pth
 
 post-install:
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index fb901c6c334d..33bdcfd628d8 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -15,9 +15,8 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:${PORTSDIR}/net-im/py-xmpppy
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
diff --git a/net-im/py-libturpial/Makefile b/net-im/py-libturpial/Makefile
index 1c9905d211ff..64e3819381f9 100644
--- a/net-im/py-libturpial/Makefile
+++ b/net-im/py-libturpial/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:${PORTSDIR}/devel/py-simpl
 		${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:${PORTSDIR}/net/py-oauth \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:${PORTSDIR}/www/py-requests
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 post-extract:
 		${RM} -r ${WRKSRC}/tests
diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index a7944ca4e7de..e0f404e5aca3 100644
--- a/net-im/py-punjab/Makefile
+++ b/net-im/py-punjab/Makefile
@@ -11,10 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP XMPP client interface
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
-USES=		twisted:words,web,conch,names
+USE_PYTHON=	distutils autoplist
+USES=		python twisted:words,web,conch,names
 
 PORTDOCS=	README.txt INSTALL.txt PKG-INFO
 
diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 05cb4196f231..bb70c4d9fae9 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -23,11 +23,9 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jajcus
 
-USES=		shebangfix
+USES=		python shebangfix
 SHEBANG_FILES=	auxtools/*.py examples/*.py tests/*.py utils/*.py
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/net-im/py-skype4py/Makefile b/net-im/py-skype4py/Makefile
index de1de91c479b..2d8eb2f90494 100644
--- a/net-im/py-skype4py/Makefile
+++ b/net-im/py-skype4py/Makefile
@@ -13,9 +13,7 @@ COMMENT=	Skype (TM) API wrapper for Python
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-USES=		zip
+USES=		python:2 zip
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/py-twistedWords/Makefile b/net-im/py-twistedWords/Makefile
index 8ff835c3a122..bb140d6910e8 100644
--- a/net-im/py-twistedWords/Makefile
+++ b/net-im/py-twistedWords/Makefile
@@ -14,9 +14,7 @@ COMMENT=	Twisted Words has more chat than you can handle
 
 LICENSE=	MIT
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
-USES=		tar:bzip2 twisted
+USE_PYTHON=	distutils autoplist
+USES=		python:2 tar:bzip2 twisted
 
 .include <bsd.port.mk>
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 7e7fb1888220..a742ab60a5da 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Xmpp to irc transport
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
 		${PYTHON_PKGNAMEPREFIX}irc>0:${PORTSDIR}/irc/py-irc
 
-USE_PYTHON=	yes
+USES=		python
 NO_BUILD=	yes
 FILES=		irc.py jep0106.py jep0133.py test_jep0106.py
 PFILES=		${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/irc/.}
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
index 904688a6ed0f..2c25ca213e35 100644
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ b/net-im/py-xmpppy-yahoo/Makefile
@@ -19,7 +19,7 @@ EJABBERD_DESC=	transport with ejabberd
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
 		${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
 
-USE_PYTHON=	yes
+USES=		python
 NO_BUILD=	yes
 FILES=		adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \
 		yahoo_helpers.py avatar.py htmlutils.py migratespool.py toolbox.py \
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index 227e4ff8e218..ce5978f9f249 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python library that provides easy scripting with Jabber
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:${PORTSDIR}/dns/py-dnspython
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 post-patch:
 	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index 13b681dc287f..148e226c711e 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyo
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyon \
     		${PYTHON_SITELIBDIR}/telepathy/__init__.py:${PORTSDIR}/net-im/telepathy-python
 
-USE_PYTHON=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}
-USES=		gmake
+USES=		gmake python
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 544bdab0c69c..012580d5cfec 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pkgconfig
+USES=		gmake libtool pkgconfig python
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 USE_GNOME=	gnomehack glib20 libxslt:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 998cf039ac2f..fad002bd02db 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -23,11 +23,10 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
-USES=		alias gmake libtool pathfix pkgconfig
+USES=		alias gmake libtool pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	yes
 USE_OPENSSL=	yes
-USE_PYTHON_BUILD=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 
 PLIST_SUB=	PVERSION=${PORTVERSION}
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 0cf929794a33..bc5421166044 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -14,10 +14,9 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:build
 USE_OPENSSL=	yes
 USE_GNOME=	glib20 libxslt:build
-USE_PYTHON_BUILD=yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index c78776da9547..818c30a5f908 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Python bindings for the Telepathy framework
 BUILD_DEPENDS=	py2?-dbus>=0:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS=	py2?-dbus>=0:${PORTSDIR}/devel/py-dbus
 
-USE_PYTHON=	2
-USES=		gmake
+USES=		gmake python:2
 USE_GNOME=	libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 318b0fa3f8f3..41f67fb00b16 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS=	libtelepathy-farsight.so:${PORTSDIR}/net-im/telepathy-farsight \
 
 USE_GNOME=	libxslt:build
 USE_GSTREAMER=	yes
-USE_PYTHON_BUILD=	yes
 USE_QT4=	corelib dbus gui network qtestlib_build xml \
 		moc_build qmake_build rcc_build uic_build
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig python:build
 CMAKE_ARGS=	-DENABLE_FARSIGHT:BOOL=True \
 		-DENABLE_TESTS:BOOL=False
 USE_LDCONFIG=	yes
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index b4dc16257e15..66e90bc5fd3e 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -15,10 +15,9 @@ LIB_DEPENDS=	libavahi-glib.so:${PORTSDIR}/net/avahi-app \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
 USE_OPENSSL=	yes
-USE_PYTHON_BUILD=	yes
 USE_SQLITE=	3
 CONFIGURE_ARGS=	--disable-Werror --enable-avahi-tests=no
 CPPFLAGS+=	${PTHREAD_CFLAGS}
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index 867133cc567a..a5d916d42dc2 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
 	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:${PORTSDIR}/devel/py-Jinja2 \
 	${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:${PORTSDIR}/net-im/py-libturpial
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 INSTALLS_ICONS=	yes
 
 PYQT4_PORTS=	core gui network phonon webkit
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 563358e8c1a0..8e94d53396de 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -352,7 +352,7 @@ PLIST_SUB+=	PING="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=		yes
+USES+=		python
 CONFIGURE_ARGS+=--enable-python --with-python=${PYTHON_CMD}
 PLIST_SUB+=	PYTHON=""
 .else
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index b50209ee8a87..c398bc1ae7a7 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -317,7 +317,7 @@ PLIST_SUB+=	PING="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} --enable-python
 PLIST_SUB+=	PYTHON=""
 .else
diff --git a/net-mgmt/flow-tools-ng/Makefile b/net-mgmt/flow-tools-ng/Makefile
index fa10e8a8065b..183c46205ac6 100644
--- a/net-mgmt/flow-tools-ng/Makefile
+++ b/net-mgmt/flow-tools-ng/Makefile
@@ -26,9 +26,8 @@ OPENSSL_USE=		OPENSSL=yes
 
 CONFLICTS=	flow-tools-[0-9]*
 
-USES=		gmake libtool tar:bzip2
+USES=		gmake libtool python:run tar:bzip2
 USE_LDCONFIG=	yes
-USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index c96ac5674539..53039cb4b6c8 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
 
 CONFLICTS=	flow-tools-ng-[0-9]*
 
+USES=		python:run
 USE_GCC=	any
-USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--localstatedir="${PREFIX}"
 
diff --git a/net-mgmt/nagios-check_smartmon/Makefile b/net-mgmt/nagios-check_smartmon/Makefile
index f242a31694a2..85a0509ae93a 100644
--- a/net-mgmt/nagios-check_smartmon/Makefile
+++ b/net-mgmt/nagios-check_smartmon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nagios plug-in to get status from smartmontools
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/smartctl:${PORTSDIR}/sysutils/smartmontools
 
-USE_PYTHON=	yes
+USES=		python
 NO_BUILD=	yes
 
 do-install:
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index 82b986217bce..fdd48907556e 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
+USES=		python:2
+USE_PYTHON=	distutils
 USE_GNOME=	pygtk2 librsvg2
 
 WRKSRC=		${WRKDIR}/Nagstamon
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index 9f8982de37ab..f311bb752741 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -23,7 +23,7 @@ MACRESOLV_DESC=		Enable MAC Manufacturer Resolution (use p5-libwww)
 
 .if ${PORT_OPTIONS:MPY4SUITE}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Ft/Xml/Domlette.py:${PORTSDIR}/textproc/py-4suite-xml
-USE_PYTHON=	yes
+USES+=		python
 PLIST_SUB+=	PY=""
 .else
 PLIST_SUB+=	PY="@comment "
diff --git a/net-mgmt/py-flowtools/Makefile b/net-mgmt/py-flowtools/Makefile
index 33b663e85402..044146b13ae9 100644
--- a/net-mgmt/py-flowtools/Makefile
+++ b/net-mgmt/py-flowtools/Makefile
@@ -18,9 +18,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PROJECTHOST=	py${PORTNAME}
 
diff --git a/net-mgmt/py-ipcalc/Makefile b/net-mgmt/py-ipcalc/Makefile
index bb1a3ddef1f6..2bd5d1721f08 100644
--- a/net-mgmt/py-ipcalc/Makefile
+++ b/net-mgmt/py-ipcalc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module to perform IP subnet calculations
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-ipy/Makefile b/net-mgmt/py-ipy/Makefile
index 46446c06d20e..a549ceb8ccfe 100644
--- a/net-mgmt/py-ipy/Makefile
+++ b/net-mgmt/py-ipy/Makefile
@@ -12,9 +12,8 @@ DISTNAME=	IPy-${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python module for handling IPv4 and IPv6 Addresses and Networks
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 test: install
 	${PYTHON_CMD} ${WRKSRC}/test/test_IPy.py
diff --git a/net-mgmt/py-pyang/Makefile b/net-mgmt/py-pyang/Makefile
index 69a77d2f9ccd..47ba48e3d2a7 100644
--- a/net-mgmt/py-pyang/Makefile
+++ b/net-mgmt/py-pyang/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Validator and code generator for YANG (RFC 4741)
 
 LICENSE=	BSD
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python
+USE_PYTHON=	distutils
 
 DATADIR=	${PREFIX}/share/yang
 
diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 76fb01a00ed7..7e251db618b6 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -16,9 +16,8 @@ LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index 873d02585c0b..e03eb7764f4e 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -17,9 +17,8 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index f1741d3dd8ed..71fce5d7fe0d 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -17,9 +17,8 @@ LICENSE=	BSD2CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>=0.1.2:${PORTSDIR}/devel/py-asn1 \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:${PORTSDIR}/security/py-pycrypto
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 1032c918bc95..2f74da463fbb 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake libtool
-USE_PYTHON=	yes
+USES=		gmake libtool python
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-mgmt/virtinst/Makefile b/net-mgmt/virtinst/Makefile
index e65ec3573387..28ddba5d0561 100644
--- a/net-mgmt/virtinst/Makefile
+++ b/net-mgmt/virtinst/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Module to help in starting installations inside of virtual machines
 LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.9.1:${PORTSDIR}/www/py-urlgrabber
 
-USES=		gettext
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		gettext python
+USE_PYTHON=	distutils
 
 post-patch:
 	${REINPLACE_CMD} 's|share/man|man|g' \
diff --git a/net-p2p/bitmessage/Makefile b/net-p2p/bitmessage/Makefile
index d24293b52a0b..927042cafd61 100644
--- a/net-p2p/bitmessage/Makefile
+++ b/net-p2p/bitmessage/Makefile
@@ -22,8 +22,8 @@ GH_PROJECT=	PyBitmessage
 GH_COMMIT=	ab49373
 GH_TAGNAME=	v${PORTVERSION}
 
+USES=		python
 USE_OPENSSL=	yes
-USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 
 post-patch:
diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile
index 5d681f71b65c..35f7abb115a0 100644
--- a/net-p2p/btqueue/Makefile
+++ b/net-p2p/btqueue/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Alternative BitTorrent client with queuing functionality
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
 
 CONFLICTS=	py??-*[Bb]it[Tt]ornado* py??-*[Bb]it[Tt]orrent*
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	BTQueue
 
 DATADIR=	${PREFIX}/share/BTQueue
diff --git a/net-p2p/libtorrent-rasterbar-python/Makefile b/net-p2p/libtorrent-rasterbar-python/Makefile
index bd8edc7a22c9..517502a93e6d 100644
--- a/net-p2p/libtorrent-rasterbar-python/Makefile
+++ b/net-p2p/libtorrent-rasterbar-python/Makefile
@@ -15,8 +15,8 @@ BUILD_WRKSRC=	${WRKSRC}/bindings/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 SLAVE_PORT=	yes
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	python_libtorrent
 
 PLIST=		${NONEXISTENT}
diff --git a/net-p2p/py-kenosis/Makefile b/net-p2p/py-kenosis/Makefile
index 79934b8f22cb..75724bad94ad 100644
--- a/net-p2p/py-kenosis/Makefile
+++ b/net-p2p/py-kenosis/Makefile
@@ -15,9 +15,8 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/xmlrpclib.py:${PORTSDIR}/net/py-xmlrpclib
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 PYSETUP=	${PORTNAME}_setup.py
 
 PORTSCOUT=	skipv:0.941 # Older version than the current one
diff --git a/net-p2p/py-py2play/Makefile b/net-p2p/py-py2play/Makefile
index e63f57418d41..63ea79c53422 100644
--- a/net-p2p/py-py2play/Makefile
+++ b/net-p2p/py-py2play/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Peer-to-peer network game engine
 LICENSE=	GPLv2
 
 DIST_SUBDIR=	python
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	Py2Play
 EXAMPLESDIR=	${PREFIX}/share/examples/py-py2play
 
diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile
index 6499fbb6bf91..5ed40403a123 100644
--- a/net-p2p/py-vertex/Makefile
+++ b/net-p2p/py-vertex/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/epsilon/__init__.py:${PORTSDIR}/devel/py-epsil
 
 LICENSE=	BSD
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-USES=		twisted
+USES=		python twisted
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>