34 files changed, 53 insertions, 77 deletions

diff --git a/dns/ipcheck/Makefile b/dns/ipcheck/Makefile
index 9629ba81e9cc..094adfed42ad 100644
--- a/dns/ipcheck/Makefile
+++ b/dns/ipcheck/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Fully compliant DynDNS.org client for UNIX (supports NIC v2.0)
 
 LICENSE=	GPLv2
 
-USE_PYTHON=	yes
+USES=		python
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 4c1936927359..5375b7cd4e8c 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -41,7 +41,7 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if defined(BUILD_PYLDNS)
-USE_PYTHON=	yes
+USES+=		python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 ALL_TARGET=	pyldns
 INSTALL_TARGET=	install-pyldns
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index 6ac1323462e5..b5d7ce162019 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Python Interface to adns, the asynchronous DNS library
 LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
 
 PROJECTHOST=	adns-python
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(include_dirs = \).*$$|\1\["${LOCALBASE}/include"\]|g' \
diff --git a/dns/py-bonjour/Makefile b/dns/py-bonjour/Makefile
index 61fc2832a821..b0f7e33938fd 100644
--- a/dns/py-bonjour/Makefile
+++ b/dns/py-bonjour/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Python interface to bonjour
 
 LICENSE=	MIT
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_SINGLE=			ZEROCONF
 OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
diff --git a/dns/py-dns/Makefile b/dns/py-dns/Makefile
index 42447d8c79ff..0b62a8745ee0 100644
--- a/dns/py-dns/Makefile
+++ b/dns/py-dns/Makefile
@@ -17,9 +17,8 @@ LICENSE_NAME=	CNRI LICENSE AGREEMENT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	README.txt README-guido.txt
 DOCSDIR=	${PREFIX}/share/doc/py-dns
diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index 3f21e98b5bd2..fbe8152a0957 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -12,9 +12,8 @@ DISTNAME=	${PORTNAME}${PORTVERSIONSUFFIX}-${PORTVERSION}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	DNS toolkit for Python
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS EXAMPLES PYCRYPTO
diff --git a/dns/py-easyzone/Makefile b/dns/py-easyzone/Makefile
index 6648247c0876..d5065db18d5b 100644
--- a/dns/py-easyzone/Makefile
+++ b/dns/py-easyzone/Makefile
@@ -16,8 +16,7 @@ LICENSE=	MIT
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/dns/py-idnkit2/Makefile b/dns/py-idnkit2/Makefile
index f3a3509cd239..7372eb7bcafe 100644
--- a/dns/py-idnkit2/Makefile
+++ b/dns/py-idnkit2/Makefile
@@ -12,10 +12,8 @@ COMMENT=	Python bindings for Internationalized Domain Name toolkit 2
 
 LIB_DEPENDS=	libidnkitlite.so:${PORTSDIR}/dns/idnkit2
 
-USES=		tar:bzip2
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2 tar:bzip2
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index 36ff86773d83..ff7dac65c623 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -32,10 +32,10 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	README.txt
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
+
 PYDISTUTILS_INSTALLARGS+=	--install-data=${PREFIX}/share
-PYDISTUTILS_AUTOPLIST=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
diff --git a/dns/py-publicsuffix/Makefile b/dns/py-publicsuffix/Makefile
index bb603b3e63e9..c36544efc7ca 100644
--- a/dns/py-publicsuffix/Makefile
+++ b/dns/py-publicsuffix/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Get public suffix of domain name from Public Suffix List
 
 LICENSE=	MIT
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/dns/py-twistedNames/Makefile b/dns/py-twistedNames/Makefile
index 68f776c639e3..8cc9a8b25166 100644
--- a/dns/py-twistedNames/Makefile
+++ b/dns/py-twistedNames/Makefile
@@ -14,9 +14,7 @@ COMMENT=	DNS protocol implementation with client and server
 
 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/dns/sshfp/Makefile b/dns/sshfp/Makefile
index cf080c68af31..ffb10f057e18 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
 		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:${PORTSDIR}/net-mgmt/py-ipcalc \
 		${PYTHON_SITELIBDIR}/ldns.py:${PORTSDIR}/dns/py-ldns
 
+USES=		python
 NO_BUILD=	yes
-USE_PYTHON=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	xelerance
 GH_TAGNAME=	${PORTVERSION}
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index 05532d4f5ddf..f0714e32852d 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -46,7 +46,7 @@ STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
 		unbound-control .libs/unbound-host .libs/unbound-anchor
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes
 BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
 PYTHON=
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 6ee46a7bfd0a..a147212c835c 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	SUNSITE/apps/editors/X/cooledit
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of utilities, including a GUI editor
 
-USE_PYTHON=	yes
-USES=		gettext gmake libtool
+USES=		gettext gmake libtool python
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xt
 USE_LDCONFIG=	yes
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index cc6c38ced8fa..44f51ac45277 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=	PYTHON
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 USE_GNOME+=	pygtksourceview
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
 		${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus \
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 3582a0f8959b..592b719a977f 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \
 		${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
 
-USES=		desktop-file-utils
+USES=		desktop-file-utils python
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index afdc571d85ac..437ddf95ed69 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -26,9 +26,8 @@ PYENCHANT_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-
 
 WRKSRC=		${WRKDIR}/Leo-${PORTVERSION}-final
 
-USES=		shebangfix zip
+USES=		python shebangfix zip
 SHEBANG_FILES=	leo/doc/html/fixup.pl leo/scripts/LinixInstall.py
-USE_PYTHON=	yes
 
 DESKTOP_ENTRIES="Leo" "Literate Editor with Outlines" \
 		"${LEO_DIR}/Icons/leoapp32.png" "leo" "" ""
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 5b85c57d7857..b429f44814ea 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -73,10 +73,9 @@ USE_AUTOTOOLS=	autoconf aclocal
 USE_GL=		gl glu
 USE_OPENLDAP=	yes
 USE_PERL5=	build
-USE_PYTHON=	yes
 USE_QT4=	# empty but required
 USE_XORG=	xaw xrandr
-USES=		bison compiler:c++11-lang gmake perl5 pkgconfig shared-mime-info tar:xz
+USES=		bison compiler:c++11-lang gmake perl5 pkgconfig python shared-mime-info tar:xz
 WANT_GNOME=	yes
 
 DISTFILES+=	${PORTNAME}-${LOVERSION}${EXTRACT_SUFX}
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 1a3e59aebebe..96a42ead6112 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -26,8 +26,7 @@ USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 USE_GL=		gl glu
 USE_GSTREAMER=	yes
 USE_GCC=	yes
-USE_PYTHON=	yes
-USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
+USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils python
 USE_PERL5=	build
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index 168871d50705..22c71deb9b94 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -14,10 +14,9 @@ COMMENT=	PyRoom is a clone of WriteRoom and features "distraction-free writing"
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
-USES=		gettext
-USE_PYTHON=	yes
+USES=		gettext python
+USE_PYTHON=	distutils
 USE_GNOME=	pygtk2
-USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyRoom
 
 post-patch:
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index dbbec2661533..34cd1a8bacaa 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Text editor for the ROX desktop
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
 
-USES=		tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 
 post-extract:
 	@${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM}
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index f51ef32d35f8..4d2b6d649215 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml \
 		yelp:${PORTSDIR}/x11/yelp
 
-USES=		desktop-file-utils gettext gmake shebangfix tar:bzip2
+USES=		desktop-file-utils gettext gmake python shebangfix tar:bzip2
 SHEBANG_FILES=	scribes.in
 USE_GNOME=	gnomeprefix pygnomeextras pygtksourceview gnomedocutils
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index beb78f2ad444..02d26ea2c5a7 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Stani's Python Editor
 
 NO_BUILD=	yes
 
-USE_PYTHON=	yes
+USES=		python
 USE_WX=		3.0+
 WX_COMPS=	python
 
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 3d13b1c64a71..3f5b7b2274a9 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -56,7 +56,7 @@ PLIST_FILES+=	lib/texworks/libTWLuaPlugin.so
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	3
+USES+=		python:3
 PLIST_FILES+=	lib/texworks/libTWPythonPlugin.so
 .endif
 
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 1fe8cacf98cd..4a15fea31f97 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -18,13 +18,12 @@ RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig python:build
 USE_GCC=	yes
 USE_CXXSTD=	gnu++0x
 USE_GNOME=	gtk20 libxml2
 USE_WX=		2.8
 WX_UNICODE=	yes
-USE_PYTHON_BUILD=yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BASE="${PREFIX}" \
 		INSTALL_SHARE_DIR="${DATADIR}" \
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index f087cef122e5..a40c60f887a0 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -41,9 +41,8 @@ PORTDOCS=	*
 PORTEXAMPLES=	*
 PORTDATA=	*
 
-USES=		dos2unix
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		dos2unix python
+USE_PYTHON=	distutils
 ALL_TARGET=	# empty
 
 post-install:
diff --git a/emulators/dynagui/Makefile b/emulators/dynagui/Makefile
index 77c120d13015..68e262f10726 100644
--- a/emulators/dynagui/Makefile
+++ b/emulators/dynagui/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GUI frontend to the dynamips router simulator
 
 BUILD_DEPENDS=	dynagen:${PORTSDIR}/emulators/dynagen
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 IMGDIR=		${STAGEDIR}${PREFIX}/share/${PORTNAME}/img
 
 post-install:
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index d481e5ef3b1b..df2a720fa69e 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-legacy-GNS3-${PORTVERSION}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	GNS3
 
 DESKTOP_ENTRIES=	"GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator;" true
diff --git a/emulators/loemu/Makefile b/emulators/loemu/Makefile
index ce6bdcb5e03b..af2d7400be4e 100644
--- a/emulators/loemu/Makefile
+++ b/emulators/loemu/Makefile
@@ -14,9 +14,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolki
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
 		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
 
-USES=		gettext
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		gettext python
+USE_PYTHON=	distutils
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	MAME SNES9X ZSNES
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 2ef0d805de21..792861819732 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -23,11 +23,10 @@ MAKE_ARGS+=	INSTALL_BINARY_DIR=${PREFIX}/bin \
 		CXXFLAGS="${CXXFLAGS}"
 
 MAKEFILE=	GNUmakefile
-USES=		gmake tcl
+USES=		gmake python tcl
 USE_GCC=	yes
 USE_GL=		glew
 USE_SDL=	sdl ttf
-USE_PYTHON=	yes
 
 PLIST_FILES=	bin/openmsx
 PORTDATA=	*
diff --git a/emulators/swine/Makefile b/emulators/swine/Makefile
index 3e1979ed3a5d..f31860aec1ab 100644
--- a/emulators/swine/Makefile
+++ b/emulators/swine/Makefile
@@ -25,8 +25,7 @@ GH_PROJECT=	Swine
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	1770c40
 
-USES=		gmake
-USE_PYTHON=	yes
+USES=		gmake python
 NO_BUILD=	yes
 USE_QT4=	linguist_build
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 443ce3ae14be..9339d4a0e74e 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -27,9 +27,8 @@ UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxguest vboxservice
-USES=		compiler:features cpe iconv kmod tar:bzip2
+USES=		compiler:features cpe iconv kmod python:build tar:bzip2
 ONLY_FOR_ARCHS=	i386 amd64
-USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 0da912babba0..1b989a9b0f01 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -35,7 +35,6 @@ WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		compiler cpe iconv pkgconfig tar:bzip2
 USE_GNOME=	libidl
-USE_PYTHON_BUILD=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-java --passive-mesa
@@ -133,11 +132,12 @@ USE_TEX=	dvipsk:build formats:build texlive
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
+USES+=		python:2
+USE_PYTHON=	distutils noegginfo
 PYDISTUTILS_PKGNAME=	vboxapi
 PYDISTUTILS_PKGVERSION=	1.0
-PYDISTUTILS_NOEGGINFO=	yes
+.else
+USES+=		python:build
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 75476d7eaab8..a76a905bb007 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -22,10 +22,10 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64p
 		mupen64plus:${PORTSDIR}/emulators/mupen64plus-ui-console
 
 PROJECTHOST=	bsdistfiles
+USES=		python
 USE_SDL=	yes
 USE_WX=		3.0
 WX_UNICODE=	yes
-USE_PYTHON=	yes
 WAF_SCRIPT=	waf
 
 post-patch: