18 files changed, 27 insertions, 40 deletions

diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 284617328065..139610f062c8 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -17,9 +17,8 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlobject>=0.7:${PORTSDIR}/databases/py-sqlobject \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 
-USES=		gettext
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		gettext python
+USE_PYTHON=	distutils
 USE_WX=		2.6+
 WX_UNICODE=	yes
 WX_COMPS=	python
diff --git a/misc/fbless/Makefile b/misc/fbless/Makefile
index 2f636f73a832..632b9cf0cbd3 100644
--- a/misc/fbless/Makefile
+++ b/misc/fbless/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	misc textproc python
 MAINTAINER=	alexander.4mail@gmail.com
 COMMENT=	Text-mode fb2 books reader
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	matimatik
 GH_COMMIT=	b6259ab
diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index a17a2f3f0c08..ee8f60f9e340 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -22,10 +22,9 @@ LICENSE=	GFDL
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-USES=		gettext:build gmake perl5 pkgconfig shebangfix tar:bzip2
+USES=		gettext:build gmake perl5 pkgconfig python shebangfix tar:bzip2
 USE_GNOME=	libxslt:build
 USE_PERL5=	build
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gimp
 CONFIGURE_ENV=	ALL_LINGUAS=${DOCLANG}
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 12ccd6568e99..d2471b05d51b 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -11,9 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	On-Screen-Display infrastructure using Pango text rendering
 
-USES=		pathfix gmake pkgconfig
+USES=		pathfix gmake pkgconfig python
 USE_GNOME=	gnomeprefix intlhack pygnome2
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
 GCONF_SCHEMAS=	gnome-osd.schemas
diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index 61486fc49000..b5af406438dc 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Conversion utility that allows conversion between many units
 LICENSE=	GPLv2
 
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
+USES=		python
 NO_BUILD=	yes
 
 PORTDOCS=	CHANGELOG FAQ README THANKS
diff --git a/misc/grc/Makefile b/misc/grc/Makefile
index 1f1c48ed704d..8cb8bcdb2324 100644
--- a/misc/grc/Makefile
+++ b/misc/grc/Makefile
@@ -15,9 +15,8 @@ LICENSE=	GPLv2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
-USES=		shebangfix
+USES=		python:run shebangfix
 SHEBANG_FILES=	grc grcat
-USE_PYTHON_RUN=	yes
 
 post-patch:
 .for i in grc grcat
diff --git a/misc/metalink-checker/Makefile b/misc/metalink-checker/Makefile
index a8fe47b0e889..64eece62bc54 100644
--- a/misc/metalink-checker/Makefile
+++ b/misc/metalink-checker/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Python script to check metalink files and complete a basic download
 
 LICENSE=	GPLv2
 
-USES=		dos2unix
-USE_PYTHON=	yes
+USES=		dos2unix python
 NO_BUILD=	yes
 
 PORTDOCS=	README
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index a66ea0f099f7..f98b9420693c 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -17,11 +17,10 @@ LICENSE_FILE=	${WRKDIR}/license.txt
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		dos2unix zip
+USES=		dos2unix python zip
 DOS2UNIX_REGEX=	.*\.txt
 NO_WRKSUBDIR=	yes
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYTHON=	distutils
 PYDISTUTILS_EGGINFO=	metalink_editor-${PORTVERSION}-py${PYTHON_VER}.egg-info
 USE_WX=		3.0+
 WX_COMPS=	python
diff --git a/misc/mtail/Makefile b/misc/mtail/Makefile
index 46b544b76ae4..93c1fd50a929 100644
--- a/misc/mtail/Makefile
+++ b/misc/mtail/Makefile
@@ -10,8 +10,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small tail workalike that performs output coloring
 
+USES=		python:run
 NO_BUILD=	yes
-USE_PYTHON_RUN=	yes
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGES LICENSE README
 PORTEXAMPLES=	mtailrc
diff --git a/misc/py-YABT/Makefile b/misc/py-YABT/Makefile
index fe65e5a6bd5a..44194fdc251e 100644
--- a/misc/py-YABT/Makefile
+++ b/misc/py-YABT/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General Purpose Braille Translation System
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index a9e46fd9ebd6..439b8382b0b7 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Python wrapper for osd, for displaying text on your X display
 LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
 RUN_DEPENDS=	${LOCALBASE}/bin/twistd:${PORTSDIR}/devel/py-twisted
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile
index 7fab4f4396b1..ca979dc8986a 100644
--- a/misc/py-pexpect/Makefile
+++ b/misc/py-pexpect/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Pure Python Expect-like module
 
 LICENSE=	ISCL
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile
index bc95f4f91db5..bc4dbc6397fe 100644
--- a/misc/py-yolk/Makefile
+++ b/misc/py-yolk/Makefile
@@ -14,13 +14,11 @@ COMMENT=	Command-line tool for querying PyPI and Python packages installed
 
 LICENSE=	BSD3CLAUSE
 
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	EXAMPLES
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/misc/pypanda/Makefile b/misc/pypanda/Makefile
index bb77aa107c46..c56b837342ac 100644
--- a/misc/pypanda/Makefile
+++ b/misc/pypanda/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Viewer for San Diego Zoo Pandacam written in Python
 
 RUN_DEPENDS=	${PYGAME}
 
-USE_PYTHON=	yes
+USES=		python
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/misc/shuffle-db/Makefile b/misc/shuffle-db/Makefile
index e7794bd82941..4bc9e661243a 100644
--- a/misc/shuffle-db/Makefile
+++ b/misc/shuffle-db/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	rebuild_db-${DISTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	IPod shuffle database builder
 
-USE_PYTHON=	yes
+USES=		python
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/rebuild_db
diff --git a/misc/typetrainer/Makefile b/misc/typetrainer/Makefile
index a1f8722c94e3..eefea301e8c1 100644
--- a/misc/typetrainer/Makefile
+++ b/misc/typetrainer/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Typing tutor trainer
 
 LICENSE=	MIT
 
-USE_GNOME=		pygtk2
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_GNOME=	pygtk2
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/misc/xdg-menu/Makefile b/misc/xdg-menu/Makefile
index d68f755d23a7..5f34973336a3 100644
--- a/misc/xdg-menu/Makefile
+++ b/misc/xdg-menu/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 WRKSRC=		${WRKDIR}/XDG-Menu
 DATADIR=	${PREFIX}/apps/XDG-Menu
 
-USE_PYTHON=	yes
+USES=		python
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	*
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index f5e6485d7982..302972701e37 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -19,8 +19,7 @@ BUILD_DEPENDS:=	${RUN_DEPENDS} \
 LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
 		libsword.so:${PORTSDIR}/misc/sword
 
-USE_PYTHON_BUILD=	yes
-USES=		gettext pkgconfig
+USES=		gettext pkgconfig python:build
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgsf