- Convert ports from korean/, shells/, x11/, x11-clocks/, x11-fm/,

  x11-fonts/, x11-toolkits and x11-wm to new USES=python

Approved by:	portmgr (implicit)

63 files changed, 86 insertions, 135 deletions

diff --git a/korean/hunspell/Makefile b/korean/hunspell/Makefile
index f781f1af4618..8d1f766c3253 100644
--- a/korean/hunspell/Makefile
+++ b/korean/hunspell/Makefile
@@ -14,8 +14,7 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-USES=		gmake tar:xz
-USE_PYTHON_BUILD=	yes
+USES=		gmake python:build tar:xz
 
 PLIST_FILES=	%%DATADIR%%/ko_KR.aff \
 		%%DATADIR%%/ko_KR.dic
diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index c6298d0c1b1b..c70bab1545ca 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -20,9 +20,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
-USES=		gmake libtool pkgconfig
+USES=		gmake libtool pkgconfig python
 USE_GNOME=	intlhack pygobject3
-USE_PYTHON=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	NLS
diff --git a/shells/jailkit/Makefile b/shells/jailkit/Makefile
index 7f33b99a4343..b6e862b2ba87 100644
--- a/shells/jailkit/Makefile
+++ b/shells/jailkit/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Utilities to limit user account
 
 LICENSE=	BSD3CLAUSE
 
+USES=		python:2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHONINTERPRETER=${PYTHON_CMD}
-USE_PYTHON=	2
 
 PORTDOCS=	COPYRIGHT README.txt
 
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index 7a3dd5d60a34..adf208fc5943 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Shell environment to limited sets of commands to users
 
 LICENSE=	GPLv3 # (or later)
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index b212696f9a51..5fbe7718bbda 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Various clock displays for Gnome 2.x
 
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 
-USE_PYTHON=	2
+USES=		python:2
 
 SUB_FILES=	pkg-message
 SUB_LIST=	NAME="${NAME}"
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index e25990701582..27628a834857 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+USES=		python
 
 SUB_FILES=	pkg-message
 SUB_LIST=	NAME="${NAME}"
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index e70b88904b78..0733af035a81 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 RUN_DEPENDS=	meld:${PORTSDIR}/textproc/meld \
 		yelp:${PORTSDIR}/x11/yelp
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig python tar:xz
 USE_GNOME=	gnomedocutils gnomeprefix gnomevfs2 libgnomeui
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 INSTALLS_OMF=	yes
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index 31ac5587e2a3..4814932e9040 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -13,8 +13,7 @@ COMMENT=	MIME type 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
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index a42478b07cad..0ac6512a4082 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 WRKSRC=		${WRKDIR}/ROX-Session
 DATADIR=	${PREFIX}/apps/ROX-Session
 
-USES=		pkgconfig
+USES=		pkgconfig python
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xtst xxf86vm
-USE_PYTHON=	yes
 
 PORTDOCS=	Changes DBUS-API README
 
diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index d0b73c1cb32d..3c3ff2116801 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Better Filesystem Browser
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 
-USE_PYTHON=	yes
+USES=		python
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 0e452c7d3938..067f851a64f0 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
-USE_PYTHON=	2
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake pkgconfig python:2 tar:bzip2
 
 PORTDATA=	*
 
diff --git a/x11-fonts/py-bdflib/Makefile b/x11-fonts/py-bdflib/Makefile
index 873dcc9d8289..b7e9d978c972 100644
--- a/x11-fonts/py-bdflib/Makefile
+++ b/x11-fonts/py-bdflib/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library for working with BDF font files
 
 LICENSE=	GPLv3
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
+USES=		python:2
+USE_PYTHON=	distutils
 
 post-patch:
 	@${REINPLACE_CMD} -e '/def/!s,guess_version(),"${PORTVERSION}",' \
diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile
index e8b5ad75dc69..e32245d95fba 100644
--- a/x11-toolkits/flowcanvas/Makefile
+++ b/x11-toolkits/flowcanvas/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 \
 		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
-USES=		tar:bzip2 pkgconfig
-USE_PYTHON_BUILD=yes
+USES=		tar:bzip2 pkgconfig python:build
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index 908f6e2b8d03..49421cc74286 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -14,9 +14,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py
 LIB_DEPENDS=	libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	cairo gtk20 glib20 librsvg2 pygtk2 pango
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc --enable-python
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 5a4117545543..7b6fb381fa2c 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PMWVERSION=	${DISTNAME:R:S/./_/g}
diff --git a/x11-toolkits/py-SquareMap/Makefile b/x11-toolkits/py-SquareMap/Makefile
index ba53a5e53a88..1fe3e1edf92e 100644
--- a/x11-toolkits/py-SquareMap/Makefile
+++ b/x11-toolkits/py-SquareMap/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Hierarchic visualization control for wxPython
 
 LICENSE=	BSD2CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_WX=		2.8
 WX_COMPS=	python
 
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index c0b4c7a4ea0c..31b801264b9f 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Python interface to FLTK window toolkit
 
 LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_XORG=	x11
 
 MAKE_ENV+=	FLTK_HOME=${LOCALBASE}/bin
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 2eb29af3c9e2..a6b6f54400ef 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -28,8 +28,7 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 		libevdocument.so:${PORTSDIR}/graphics/evince
 RUN_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
-USE_PYTHON=	2
+USES=		gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	libgnomeprintui gnomepanel gnomedesktop \
 		gtksourceview libwnck nautilus2 pygnome2 metacity \
 		evolutiondataserver
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 5d55a998f1dc..2881d6934f17 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
 		libgksu2.so:${PORTSDIR}/sysutils/libgksu \
 #		gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	libgtkhtml pygnome2 libgda4
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 195fc2049b59..f9512951c734 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -22,8 +22,7 @@ OPTIONS_SUB=	yes
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
-USE_PYTHON=	2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libgnomeui pygtk2
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 98ee4615aad6..0190e1cf0122 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -19,9 +19,8 @@ COMMENT=	Set of Python bindings for GTK+
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	libglade2 pygobject
-USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_VERSION}"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 866daffd67a7..9738cc3db9f9 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-o
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
 
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index a217594a58fa..68fbba88a8c6 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	pygtksourceview-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GtkSourceView 2
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig python tar:bzip2
 USE_GNOME=	gnomeprefix gtksourceview2 pygtk2
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs
 INSTALL_TARGET=	install-strip
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index b2d8ae022d11..6c7e9b8785e0 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -18,9 +18,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES OPENGL
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile
index d394ea8df678..deecdfd4e293 100644
--- a/x11-toolkits/py-kiwi/Makefile
+++ b/x11-toolkits/py-kiwi/Makefile
@@ -15,11 +15,9 @@ LICENSE=	LGPL21
 
 NO_ARCH=	yes
 
-USES=		gettext uniquefiles:dirs
+USES=		gettext python uniquefiles:dirs
 USE_GNOME=	libglade2 pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index b349ad7b70e1..cad2b8b62134 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -17,9 +17,8 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
 
-USES=		pkgconfig libtool
+USES=		libtool pkgconfig python
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 2f24e45cbbb6..a317f43b4984 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	libtreectrl.so.1:${PORTSDIR}/x11-toolkits/tktreectrl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
 
-USES=		tk:run zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python tk:run zip
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	TkinterTreectrl
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
 
diff --git a/x11-toolkits/py-traitsbackendwx/Makefile b/x11-toolkits/py-traitsbackendwx/Makefile
index 17840853671f..3dda80b9e006 100644
--- a/x11-toolkits/py-traitsbackendwx/Makefile
+++ b/x11-toolkits/py-traitsbackendwx/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Wx backend for TraitsGUI
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=3.2.0:${PORTSDIR}/devel/py-traits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python
 
diff --git a/x11-toolkits/py-traitsgui/Makefile b/x11-toolkits/py-traitsgui/Makefile
index f291a8b2f38d..e736d204d692 100644
--- a/x11-toolkits/py-traitsgui/Makefile
+++ b/x11-toolkits/py-traitsgui/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Gui toolkit derived from the Enthought python traits library
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traitsbackendwx>=3.1.0:${PORTSDIR}/x11-toolkits/py-traitsbackendwx
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index eba2ec72302c..edd606250855 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -15,8 +15,8 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
+USES=		python
 USE_GNOME=	vte pygtk2
-USE_PYTHON=	yes
 CONFIGURE_ARGS=	--enable-python \
 		--disable-Bsymbolic \
 		--disable-freetypetest
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index 374d1faabc9e..ecf116831d92 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	User-friendly layer on top of wxPython
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+USES=		python
 USE_WX=		2.8
 WX_UNICODE=	yes
 WX_COMPS=	python:run
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index eec970c24f9d..13ce7fd010c0 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -18,10 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl
 WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
 
 DIST_SUBDIR=	python
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
-USES=		gettext gmake pkgconfig tar:bzip2
+USE_PYTHON=	distutils
+USES=		gettext gmake pkgconfig python tar:bzip2
 
 PYDISTUTILS_BUILDARGS=	\
 			WX_CONFIG="${WX_CONFIG}" \
diff --git a/x11-toolkits/py-wxPython30/Makefile b/x11-toolkits/py-wxPython30/Makefile
index 5f5d02c31970..42b62f9e9fac 100644
--- a/x11-toolkits/py-wxPython30/Makefile
+++ b/x11-toolkits/py-wxPython30/Makefile
@@ -16,14 +16,13 @@ DIST_SUBDIR=	python
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
 
-USES=		tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 
 .if defined(WITH_WXVERSION_ONLY)
 
 PKGNAMESUFFIX=	-common
 
-PYTHON_PY3K_PLIST_HACK=	yes
+USE_PYTHON=	py3kplist
 
 do-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHON_SITELIBDIR} -f ${WRKSRC}/wxversion
@@ -44,8 +43,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wxPython-common>0:${PORTSDIR}/x11-toolkits/p
 USES+=		gettext pkgconfig
 USE_WX=	3.0
 WANT_UNICODE=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}" \
 			NO_HEADERS=1 \
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 80a22f8f3e61..c840ea807f1b 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -12,8 +12,7 @@ DISTNAME=	python-xlib-${PORTVERSION}
 MAINTAINER=	mwm@mired.org
 COMMENT=	X11 library for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index d4e664d4bf04..e9526b6ccc0a 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -19,12 +19,11 @@ LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		iconv pkgconfig
+USES=		iconv pkgconfig python:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 USE_EFL=	imlib2
 USE_GNOME=	pango
-USE_PYTHON_BUILD=	yes
 USE_XORG=	x11 xft xext xinerama xt xrandr xproto
 LDFLAGS+=	-lX11 -lXext ${ICONV_LIB}
 
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 91a92b89d0ff..1cf296bca128 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	\
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
-USE_PYTHON=	2
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	glib20
 
 post-install:
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 454d680b6b33..a243a87e3aa1 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
-USES=		fam gettext iconv:translit pathfix pkgconfig \
+USES=		fam gettext iconv:translit pathfix pkgconfig python:2 \
 		shared-mime-info shebangfix
 SHEBANG_FILES=	doc/asciidoc/asciidoc.py
 python_OLD_CMD=	${SETENV} python
 python_CMD=	${PYTHON_CMD}
 USE_XORG=	xcomposite xft xinerama xpm xrandr
-USE_PYTHON=	2
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PEKWM_CXXFLAGS="${CXXFLAGS}" \
diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index 984a7f152e75..b1c7f47b7444 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Easy, eye-candy, light, and powerful window manager for X11
 RUN_DEPENDS=	fvwm>=2.5:${PORTSDIR}/x11-wm/fvwm2 \
 		bash:${PORTSDIR}/shells/bash
 
-USES=		gettext gmake shebangfix
+USES=		gettext gmake python shebangfix
 SHEBANG_FILES=	addons/* bin/* fvwm/scripts/speed_value
-USE_PYTHON=	yes
 MAKE_ENV=	prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
 PORTDOCS=	*
 
diff --git a/x11-wm/obapps/Makefile b/x11-wm/obapps/Makefile
index 9bdf62a937cc..6cfc39ef36e5 100644
--- a/x11-wm/obapps/Makefile
+++ b/x11-wm/obapps/Makefile
@@ -18,10 +18,10 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>=0:${PORTSDIR}/x11-toolkits/py-xlib
 
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils
 USE_WX=		3.0+
 WX_COMPS=	python:run
-USE_PYDISTUTILS=yes
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
diff --git a/x11-wm/obkey/Makefile b/x11-wm/obkey/Makefile
index e4cde86f760b..15d3382442f6 100644
--- a/x11-wm/obkey/Makefile
+++ b/x11-wm/obkey/Makefile
@@ -13,9 +13,8 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	py27-gtk2>=2.14:${PORTSDIR}/x11-toolkits/py-gtk2
 
-USES=		gettext
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		gettext python
+USE_PYTHON=	distutils
 
 PORTDOCS=	NEWS
 
diff --git a/x11-wm/obmenu/Makefile b/x11-wm/obmenu/Makefile
index f548fb2a010f..87ea1e453e8b 100644
--- a/x11-wm/obmenu/Makefile
+++ b/x11-wm/obmenu/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Menu manager for Openbox supporting both static and pipe menus
 
 LICENSE=	GPLv2
 
+USES=			python
 USE_GNOME=		pygtk2
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
+USE_PYTHON=		distutils
 PYDISTUTILS_PKGNAME=	obMenu
 
 PORTDOCS=	README
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index a8022dab62cf..0a9573a220a7 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:${PORTSDIR}/x11-toolkits/py-xlib
 
 NO_ARCH=	yes
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/x11-wm/qtile/Makefile b/x11-wm/qtile/Makefile
index fd1617f10a3f..8f1ff9c75f75 100644
--- a/x11-wm/qtile/Makefile
+++ b/x11-wm/qtile/Makefile
@@ -21,9 +21,8 @@ GH_TAGNAME=	v0.6
 
 USE_GNOME=	pygobject pygtk2
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	CHANGELOG INSTALL.rst README.rst
 
diff --git a/x11/arandr/Makefile b/x11/arandr/Makefile
index 2ab91dca3150..7ac2de86b170 100644
--- a/x11/arandr/Makefile
+++ b/x11/arandr/Makefile
@@ -19,10 +19,8 @@ RUN_DEPENDS=	xrandr>0:${PORTSDIR}/x11/xrandr \
 
 OPTIONS_DEFINE=	DOCS
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-USES+=		gettext desktop-file-utils
+USE_PYTHON=	distutils
+USES+=		gettext desktop-file-utils python
 
 PORTDOCS=	ChangeLog NEWS README TODO
 
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 11f7872613e3..ef1bea92daef 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig python
 USE_GNOME=	glib20 gtk20 pygtk2
-USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	x11 xproto xcomposite xrender
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 56373bbff855..9bb769b53b53 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -63,7 +63,7 @@ WITH_GNOME=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 USE_GNOME+=	pygnomedesktop
 PLIST_SUB+=	PYTHON=""
 .else
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 2e67e767e33c..ee6ce119501d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -18,11 +18,10 @@ USES=		tar:bzip2
 
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
-USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig python:2
 USE_XORG=	xpm
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		referencehack
-USE_PYTHON=	2
 INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 9e9b1ddb49b8..be8f762bfd9a 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -23,12 +23,11 @@ LIB_DEPENDS=	libgweather.so:${PORTSDIR}/net/libgweather \
 CONFLICTS=	gnome-panel-3.[0-9]*
 
 USE_XORG=	ice sm x11 xau xrandr
-USE_PYTHON=	2
 INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES+=		gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig python:2
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils referencehack librsvg2
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 1af4bd430ccd..c2b3c0bf243e 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -61,7 +61,7 @@ NO_MTREE=	yes
 NO_INSTALL=	yes
 
 .if !defined(GNOME_SLAVE)
-USE_PYTHON=	yes
+USES+=		python
 .endif
 
 .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index 75b918cecb3b..48b32dac955d 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Start gnome-terminal from a list of configured profiles (incl. Applet)
 
-USES=		tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 USE_GNOME=	pygnome2 pygnomeextras gnomeprefix
 
 do-build:
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index 717efc54082a..7c8535ceaf6a 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -47,8 +47,7 @@ REINPLACE_FILES=	guake guake-prefs prefs.py
 
 #USE_GITHUB=	yes
 USE_GNOME=	gtk20 pygnome2
-USE_PYTHON=	2
-USES=		desktop-file-utils gmake libtool pkgconfig
+USES=		desktop-file-utils gmake libtool pkgconfig python:2
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 
diff --git a/x11/hotwire-shell/Makefile b/x11/hotwire-shell/Makefile
index 66da221aa53d..c8922853de29 100644
--- a/x11/hotwire-shell/Makefile
+++ b/x11/hotwire-shell/Makefile
@@ -20,9 +20,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/p
 		${PYXML}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_GNOME=	pygnome2 pygtk2 pygtksourceview
 INSTALLS_ICONS=	yes
 
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 1c234bb7131c..9e8acbeca343 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -28,7 +28,7 @@ LUA_DESC=	Lua bindings
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	2
+USES+=		python:2
 USE_GNOME+=	pygtk2
 .else
 CONFIGURE_ARGS+=	--disable-python
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 1f6ec6b5118e..f466523d0a22 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -21,10 +21,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/l
 CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
 
 XORG_CAT=	lib
-USES=		gmake
+USES=		gmake python:2,build
 USE_GNOME=	libxslt:build
 USE_XORG=	xau xdmcp
-USE_PYTHON_BUILD=2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index 9dc00ea63811..487653916ac7 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libNucleo.so:${PORTSDIR}/x11-toolkits/nucleo \
 		libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
 
-USES=		gettext libtool pathfix pkgconfig shebangfix tar:bzip2
+USES=		gettext libtool pathfix pkgconfig python shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \
 		${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.6.in \
 		${WRKSRC}/fvwm-insitu/bin/fvwm-menu-desktop.in \
@@ -36,7 +36,6 @@ perl_OLD_CMD=	@PERL@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fontdir=${LOCALBASE}/lib/X11/fonts
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 USE_XORG=	xcursor xft xinerama xpm xrender xt xtst
 WANT_GNOME=	yes
 MAKE_ARGS=	METISSE_DOC_DIR="${DOCSDIR}"
diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile
index 486af9138f7e..b1ef35587d15 100644
--- a/x11/ooxcb/Makefile
+++ b/x11/ooxcb/Makefile
@@ -11,8 +11,7 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Python binding to the X server using xcb
 
 USE_XORG=	xcb
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 0e004d67d6e2..b7770d154769 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Wallpaper management tool 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
 
-USE_PYTHON=	yes
+USES=		python
 
 WRKSRC=		${WRKDIR}/Wallpaper
 
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index 9acbfb0c3330..8ce3c813125a 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -19,8 +19,8 @@ OPTIONS_DEFINE=	NLS GCONF
 GCONF_DESC=	Use GNOME Terminal settings
 OPTIONS_DEFAULT=	NLS GCONF
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	Terminator
 
 INSTALLS_ICONS=	yes
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index d8fbf45f179e..e1b6dac44f8d 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -35,7 +35,7 @@ DOCS=		AUTHORS ChangeLog README
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYCONF}
-USE_PYTHON=	yes
+USES+=		python
 USE_GNOME=	gtk20 pygtk2
 CMAKE_ARGS+=	-DENABLE_TINT2CONF:BOOL=ON
 PYCONF_SRC=	${WRKSRC}/src/tint2conf
diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile
index d640802dde32..f5651a0162af 100644
--- a/x11/wbarconf/Makefile
+++ b/x11/wbarconf/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	wbar:${PORTSDIR}/x11/wbar
 
 USE_GNOME=	pygobject pygtk2 gtk20
-USE_PYTHON=	yes
-USES=		gettext desktop-file-utils shebangfix
+USES=		gettext desktop-file-utils python shebangfix
 SHEBANG_LANG=	python
 SHEBANG_FILES=	${WRKSRC}/wbarconf
 python_OLD_CMD=	/usr/bin/env python2
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index b03f83be924f..04382dd70d07 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -15,10 +15,9 @@ LICENSE=	GPLv3 # (or later)
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:${PORTSDIR}/devel/py-cheetah
 LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
 
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig python
 USE_XORG=	recordproto x11 xext xmu xscrnsaver xtst
 USE_GNOME=	intlhack gconf2 gnomehier gtkmm24
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --enable-gconf --disable-gnome3 \
 		--disable-indicator
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 55bc268166bd..b776713b8ed3 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -13,7 +13,7 @@ COMMENT=	The X protocol C-language Binding (XCB) protocol
 BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
 
 XORG_CAT=	proto
-USE_PYTHON=	2
+USES=		python:2
 
 DATADIR=	${PREFIX}/share/xcb
 
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 103671ecbddc..248c2b93040b 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Python bindings to access X Window System protocol via libxcb
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
 		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 
-USES=		libtool pathfix pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		libtool pathfix pkgconfig python tar:bzip2
 USE_XORG=	xcb
 PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt