Index: head/Mk/Uses/waf.mk
===================================================================
--- head/Mk/Uses/waf.mk
+++ head/Mk/Uses/waf.mk
@@ -22,7 +22,7 @@
 .endif
 
 .if !${USES:Mpython*}
-python_ARGS=	2.7,build
+python_ARGS=	build
 .include "${USESDIR}/python.mk"
 .endif
 
Index: head/audio/abraca/Makefile
===================================================================
--- head/audio/abraca/Makefile
+++ head/audio/abraca/Makefile
@@ -19,7 +19,7 @@
 RUN_DEPENDS=	gnome-themes-extra>=3.0.0:x11-themes/gnome-themes-extra \
 		gnome-icon-theme>=0:misc/gnome-icon-theme
 
-USES=		gnome pkgconfig tar:bzip2 waf
+USES=		gnome pkgconfig python:2.7,build tar:bzip2 waf
 USE_GNOME=	gtk30 intltool
 
 MAKE_ARGS=	MANDIR=${MANPREFIX}/man
Index: head/audio/blop-lv2/Makefile
===================================================================
--- head/audio/blop-lv2/Makefile
+++ head/audio/blop-lv2/Makefile
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS=	lv2>0:audio/lv2
 
-USES=		waf pkgconfig tar:bz2
+USES=		pkgconfig python:2.7,build tar:bz2 waf
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/blop.lv2/*.so
Index: head/audio/bs2b-lv2/Makefile
===================================================================
--- head/audio/bs2b-lv2/Makefile
+++ head/audio/bs2b-lv2/Makefile
@@ -16,7 +16,7 @@
 		lvtk>0:audio/lvtk
 LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 
-USES=		pkgconfig waf
+USES=		pkgconfig python:2.7,build waf
 USE_GITHUB=	yes
 GH_ACCOUNT=	nilninull
 GH_PROJECT=	${PORTNAME}-lv2
Index: head/audio/cpp-xmms2/Makefile
===================================================================
--- head/audio/cpp-xmms2/Makefile
+++ head/audio/cpp-xmms2/Makefile
@@ -12,7 +12,7 @@
 LIB_DEPENDS=	libxmmsclient.so:audio/xmms2
 
 MASTERDIR=	${.CURDIR}/../xmms2
-USES=		gnome ssl
+USES=		gnome python:2.7,build ssl
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 
Index: head/audio/jalv/Makefile
===================================================================
--- head/audio/jalv/Makefile
+++ head/audio/jalv/Makefile
@@ -23,7 +23,7 @@
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:c++11-lang gnome pkgconfig qmake:no_configure,no_env \
+USES=		compiler:c++11-lang gnome pkgconfig python:2.7,build qmake:no_configure,no_env \
 		qt:5 tar:bz2 waf
 CONFIGURE_ARGS=	--no-qt4
 USE_CXXSTD=	c++11
Index: head/audio/lvtk/Makefile
===================================================================
--- head/audio/lvtk/Makefile
+++ head/audio/lvtk/Makefile
@@ -14,7 +14,7 @@
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		${LOCALBASE}/include/gtkmm-2.4/gtkmm.h:x11-toolkits/gtkmm24
 
-USES=		waf pkgconfig
+USES=		pkgconfig python:2.7,build waf
 USE_GITHUB=	yes
 GH_TAGNAME=	7c0ffdf
 
Index: head/audio/nekobee/Makefile
===================================================================
--- head/audio/nekobee/Makefile
+++ head/audio/nekobee/Makefile
@@ -22,7 +22,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	gordonjcp
 
-USES=		gnome pkgconfig waf
+USES=		gnome pkgconfig python:2.7,build waf
 USE_GNOME=	gtk20
 
 CPPFLAGS+=	-I${LOCALBASE}/include/dssi -I${LOCALBASE}/include
Index: head/audio/p5-xmms2/Makefile
===================================================================
--- head/audio/p5-xmms2/Makefile
+++ head/audio/p5-xmms2/Makefile
@@ -12,7 +12,7 @@
 
 MASTERDIR=	${.CURDIR}/../xmms2
 
-USES=		perl5 ssl
+USES=		perl5 python:2.7,build ssl
 
 BROKEN_SSL=	openssl
 
Index: head/audio/patchage/Makefile
===================================================================
--- head/audio/patchage/Makefile
+++ head/audio/patchage/Makefile
@@ -25,7 +25,7 @@
 		libglademm-2.4.so:devel/libglademm24 \
 		libflowcanvas.so:x11-toolkits/flowcanvas
 
-USES=		compiler:c++11-lang gnome pkgconfig tar:bzip2 waf
+USES=		compiler:c++11-lang gnome pkgconfig python:2.7,build tar:bzip2 waf
 USE_CXXSTD=	c++11
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
Index: head/audio/raul/Makefile
===================================================================
--- head/audio/raul/Makefile
+++ head/audio/raul/Makefile
@@ -15,7 +15,7 @@
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
-USES=		gnome pkgconfig tar:bzip2 waf
+USES=		gnome pkgconfig python:2.7,build tar:bzip2 waf
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
Index: head/audio/triceratops-lv2/Makefile
===================================================================
--- head/audio/triceratops-lv2/Makefile
+++ head/audio/triceratops-lv2/Makefile
@@ -18,7 +18,7 @@
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:c++11-lang gnome pkgconfig waf
+USES=		compiler:c++11-lang gnome pkgconfig python:2.7,build waf
 USE_GNOME=	cairo cairomm gdkpixbuf2 gtk20 gtkmm24
 NO_WRKSUBDIR=	yes
 LDFLAGS_i386=	-Wl,-znotext
Index: head/audio/xmms2/Makefile
===================================================================
--- head/audio/xmms2/Makefile
+++ head/audio/xmms2/Makefile
@@ -20,7 +20,7 @@
 
 .if !defined(XMMS2_SLAVE)
 USE_GNOME=	glib20
-USES+=		gnome readline sqlite
+USES+=		gnome python:2.7,build readline sqlite
 
 USE_LDCONFIG=	yes
 
Index: head/benchmarks/glmark2/Makefile
===================================================================
--- head/benchmarks/glmark2/Makefile
+++ head/benchmarks/glmark2/Makefile
@@ -14,7 +14,7 @@
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		gl jpeg localbase:ldflags pkgconfig waf
+USES=		gl jpeg localbase:ldflags pkgconfig python:2.7,build waf
 USE_GL=		egl gl glesv2
 CONFIGURE_ARGS=	--with-flavors=x11-gl,x11-glesv2 --no-opt --no-debug
 
Index: head/devel/cquery/Makefile
===================================================================
--- head/devel/cquery/Makefile
+++ head/devel/cquery/Makefile
@@ -14,7 +14,7 @@
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libclang.so:devel/llvm${LLVM_DEFAULT}
 
-USES=		compiler:c++14-lang waf
+USES=		compiler:c++14-lang python:2.7,build waf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cquery-project
Index: head/devel/termbox/Makefile
===================================================================
--- head/devel/termbox/Makefile
+++ head/devel/termbox/Makefile
@@ -12,7 +12,7 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		waf
+USES=		python:2.7,build waf
 USE_GITHUB=	yes
 GH_ACCOUNT=	nsf
 USE_LDCONFIG=	yes
Index: head/graphics/webp-pixbuf-loader/Makefile
===================================================================
--- head/graphics/webp-pixbuf-loader/Makefile
+++ head/graphics/webp-pixbuf-loader/Makefile
@@ -11,7 +11,7 @@
 
 LIB_DEPENDS=	libwebp.so:graphics/webp
 
-USES=		gnome perl5 pkgconfig waf
+USES=		gnome perl5 pkgconfig python:2.7,build waf
 USE_GNOME=	gdkpixbuf2
 USE_GITHUB=	yes
 GH_ACCOUNT=	aruiz
Index: head/net/norm/Makefile
===================================================================
--- head/net/norm/Makefile
+++ head/net/norm/Makefile
@@ -11,7 +11,7 @@
 
 WRKSRC=		${WRKDIR}/norm-${DISTVERSION}
 
-USES=		waf tar:tgz libtool
+USES=		libtool python:2.7,build tar:tgz waf
 USE_LDCONFIG=	yes
 PLIST_FILES=	include/normApi.h lib/libnorm.so lib/libnorm.so.1 \
 		lib/libnorm.so.1.0.0
Index: head/x11-toolkits/flowcanvas/Makefile
===================================================================
--- head/x11-toolkits/flowcanvas/Makefile
+++ head/x11-toolkits/flowcanvas/Makefile
@@ -18,7 +18,7 @@
 		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
 		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
-USES=		compiler:c++11-lang pkgconfig tar:bzip2 waf
+USES=		compiler:c++11-lang pkgconfig python:2.7,build tar:bzip2 waf
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
Index: head/x11-toolkits/ntk/Makefile
===================================================================
--- head/x11-toolkits/ntk/Makefile
+++ head/x11-toolkits/ntk/Makefile
@@ -16,7 +16,7 @@
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
-USES=		gnome jpeg localbase:ldflags pkgconfig waf xorg
+USES=		gnome jpeg localbase:ldflags pkgconfig python:2.7,build waf xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	original-male
 USE_GNOME=	cairo