Update USES=scons to specify scons of Python 2

- While I'm here, convert emulators/gem5 and games/marsnomercy to USES=scons

35 files changed, 42 insertions, 46 deletions

diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index b5e8ad4df90d..cc7449daa86f 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe pathfix pkgconfig python:3.6+ scons shebangfix
+USES=		cpe pathfix pkgconfig python:3.6+ scons:python2 shebangfix
 CPE_VENDOR=	gpsd_project
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	gpsd
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 59489756c62d..c6e7158c2b47 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS=	libaubio.so:audio/aubio \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
-USES=		cpe gettext gnome pkgconfig scons tar:bzip2
+USES=		cpe gettext gnome pkgconfig scons:python2 tar:bzip2
 MAKE_ARGS+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
 CFLAGS+=	-I${LOCALBASE}/include -DHAVE_AUBIO4
 USE_GNOME=	atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 \
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index b9e46090b046..790f12448bac 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -33,7 +33,7 @@ LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
 		libprotobuf.so:devel/protobuf \
 		liblilv-0.so:audio/lilv
 
-USES=		compiler:c++11-lang gl iconv qt:5 pkgconfig scons xorg
+USES=		compiler:c++11-lang gl iconv qt:5 pkgconfig scons:python2 xorg
 USE_XORG=	x11
 USE_GL=		gl glu
 USE_GITHUB=	yes
diff --git a/audio/mixxx21/Makefile b/audio/mixxx21/Makefile
index 44834fd88b94..d676c0a71f90 100644
--- a/audio/mixxx21/Makefile
+++ b/audio/mixxx21/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
 		libtag.so:audio/taglib \
 		libprotobuf.so:devel/protobuf
 
-USES=		compiler:c++11-lang gl iconv qt:5 pkgconfig scons xorg
+USES=		compiler:c++11-lang gl iconv qt:5 pkgconfig scons:python2 xorg
 USE_XORG=	x11
 USE_GL=		gl glu
 USE_GITHUB=	yes
diff --git a/chinese/sunpinyin/Makefile b/chinese/sunpinyin/Makefile
index b5621f6c4e3b..9bedb7c52bee 100644
--- a/chinese/sunpinyin/Makefile
+++ b/chinese/sunpinyin/Makefile
@@ -21,7 +21,7 @@ GH_TAGNAME=	a8bd811
 
 MAKE_ARGS+=	--prefix=${PREFIX}
 USE_LDCONFIG=	yes
-USES=		gmake iconv perl5 pkgconfig python:2.7 scons shebangfix
+USES=		gmake iconv perl5 pkgconfig python:2.7 scons:python2 shebangfix
 USE_PERL5=	build
 SHEBANG_FILES=	python/*.py
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile
index b0d0627a60a5..a1afda3c9214 100644
--- a/databases/mongodb36/Makefile
+++ b/databases/mongodb36/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy
 
-USES=		compiler:c++14-lang cpe python:2.7,build scons shebangfix
+USES=		compiler:c++14-lang cpe python:2.7,build scons:python2 shebangfix
 USE_RC_SUBR=	mongod
 
 CONFLICTS_BUILD=	mongo-cxx-driver
diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile
index 3fef9c4ca822..1f85e262d831 100644
--- a/databases/mongodb40/Makefile
+++ b/databases/mongodb40/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libsnappy.so:archivers/snappy
 
-USES=		compiler:c++14-lang cpe python:2.7,build scons shebangfix
+USES=		compiler:c++14-lang cpe python:2.7,build scons:python2 shebangfix
 USE_RC_SUBR=	mongod
 
 CONFLICTS_BUILD=	mongo-cxx-driver
diff --git a/devel/godot2/Makefile b/devel/godot2/Makefile
index 8221ab46d4f0..3ba860ab57b9 100644
--- a/devel/godot2/Makefile
+++ b/devel/godot2/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
 
-USES=		compiler:c++11-lib gl pkgconfig scons ssl xorg
+USES=		compiler:c++11-lib gl pkgconfig scons:python2 ssl xorg
 USE_XORG=	x11 xcursor xi xinerama xrandr
 USE_GL=		gl glu
 
diff --git a/devel/mongo-cxx-driver/Makefile b/devel/mongo-cxx-driver/Makefile
index 29cc8b927637..5755e9ef6062 100644
--- a/devel/mongo-cxx-driver/Makefile
+++ b/devel/mongo-cxx-driver/Makefile
@@ -31,7 +31,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
 GH_PROJECT=	mongo-cxx-driver
 
-USES=		compiler:c++11-lang scons ssl
+USES=		compiler:c++11-lang scons:python2 ssl
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
 		--cc=${CC} \
 		--cxx=${CXX}
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index a7e177b916e2..119df2b80273 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	zenity:x11/zenity
 
 USES=		compiler:c++0x desktop-file-utils dos2unix localbase:ldflags \
-		pkgconfig scons sdl xorg
+		pkgconfig scons:python2 sdl xorg
 USE_SDL=	sdl
 USE_XORG=	x11
 USE_GNOME+=	gdkpixbuf2
diff --git a/emulators/gem5/Makefile b/emulators/gem5/Makefile
index cd521d459ae4..4144313e5317 100644
--- a/emulators/gem5/Makefile
+++ b/emulators/gem5/Makefile
@@ -8,8 +8,7 @@ CATEGORIES=	emulators
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	gem5 Simulator System
 
-BUILD_DEPENDS=	swig3.0:devel/swig30 \
-		scons:devel/scons
+BUILD_DEPENDS=	swig3.0:devel/swig30
 
 BROKEN_armv6=		fails to link: undefined reference to HDLcd::BUS_OPTIONS_RESETV
 BROKEN_armv7=		fails to link: undefined reference to HDLcd::BUS_OPTIONS_RESETV
@@ -18,12 +17,15 @@ BROKEN_mips64=		fails to build: claims that gcc version 4.6 or newer required
 BROKEN_FreeBSD_11_powerpc64=	fails to build: claims that gcc version 4.6 or newer required
 BROKEN_FreeBSD_12_powerpc64=	fails to build: claims that gcc version 4.6 or newer required
 
+USES=		gmake scons:python2
+
 DATE=		20140422
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	99d65cc
-SWIG_BIN=	swig3.0
-USES=		gmake
+
+ALL_TARGET=	build/ARM/gem5.opt
+MAKE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
 
 .include <bsd.port.pre.mk>
 
@@ -33,10 +35,8 @@ post-patch:
 		${WRKSRC}/src/dev/terminal.cc \
 		${WRKSRC}/util/term/term.c
 
-do-build:
+pre-build:
 	cd ${WRKSRC} && ${GMAKE} -C util/term
-	cd ${WRKSRC} && ${SETENV} SWIG="${PREFIX}/bin/${SWIG_BIN}" scons \
-		build/ARM/gem5.opt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME} \
diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile
index 6059a4558cfb..3203aca0ad6d 100644
--- a/emulators/nonpareil/Makefile
+++ b/emulators/nonpareil/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		bison gnome pkgconfig scons sdl
+USES=		bison gnome pkgconfig scons:python2 sdl
 USE_GNOME=	gtk20 libxml2
 USE_SDL=	sdl
 
diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile
index bf8c48e49cbe..7bfddc50d1ac 100644
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
 		libvorbisfile.so:audio/libvorbis \
 		libsmpeg.so:multimedia/smpeg
 
-USES=		lua:51 openal:al pkgconfig python:build scons sdl tar:bzip2
+USES=		lua:51 openal:al pkgconfig python:build scons:python2 sdl tar:bzip2
 USE_CXXSTD=	gnu++98
 USE_LDCONFIG=	yes
 USE_SDL=	image sdl
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index 4d366bd571be..b8250b4c9282 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Open source World War II German submarine simulation
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 RUN_DEPENDS=	dangerdeep-data>0:games/dangerdeep-data
 
-USES=		compiler gl scons sdl
+USES=		compiler gl scons:python2 sdl
 USE_GL=		yes
 USE_SDL=	sdl mixer image net
 
diff --git a/games/dxx-rebirth/Makefile b/games/dxx-rebirth/Makefile
index 601d37f2b654..193a72f4bc99 100644
--- a/games/dxx-rebirth/Makefile
+++ b/games/dxx-rebirth/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	as:devel/binutils
 LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libpng.so:graphics/png
 
-USES=		compiler:c++14-lang gl localbase:ldflags pkgconfig scons sdl tar:xz
+USES=		compiler:c++14-lang gl localbase:ldflags pkgconfig scons:python2 sdl tar:xz
 USE_GL=		gl glu
 USE_SDL=	mixer sdl
 
diff --git a/games/freera/Makefile b/games/freera/Makefile
index 5acf7ae11d65..1d5b5a62a984 100644
--- a/games/freera/Makefile
+++ b/games/freera/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Westwood red alert game engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/gpl.txt
 
-USES=		compiler:c++11-lang scons sdl
+USES=		compiler:c++11-lang scons:python2 sdl
 USE_SDL=	sdl mixer
 
 WRKSRC=		${WRKDIR}/freera++
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 1eb8af5f48be..0cd514a64b7e 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 
 OPTIONS_DEFINE=	DOCS PORTAUDIO
 
-USES=		compiler:c++11-lang gl gnome pkgconfig scons sdl
+USES=		compiler:c++11-lang gl gnome pkgconfig scons:python2 sdl
 USE_SDL=	image net sdl ttf
 USE_GL=		gl glu
 MAKE_ARGS=	CCFLAGS="${CFLAGS}" \
diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile
index 9c57cb8994e1..75feef53f813 100644
--- a/games/gtkradiant/Makefile
+++ b/games/gtkradiant/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libmhash.so:security/mhash \
 		libpng.so:graphics/png
 
-USES=		compiler:c++11-lang gnome pkgconfig python:build scons zip
+USES=		compiler:c++11-lang gnome pkgconfig python:build scons:python2 zip
 USE_GNOME=	gtk20 libxml2
 MAKE_ARGS=	${MAKE_ENV} BUILD=release
 SSP_UNSAFE=	yes
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index e0eb0b417b69..e495ee113738 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Turn-based strategy game setting on Mars
 
 LICENSE=	GPLv2 # version unspecified actually
 
-BUILD_DEPENDS=	scons:devel/scons
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		compiler gl sdl
+USES=		compiler gl scons:python2 sdl
 USE_GL=		gl
 USE_SDL=	sdl image ttf
 SCONS_ARGS=	prefix=${PREFIX}
@@ -47,9 +46,6 @@ SCONS_ARGS+=	with_opengl=1
 SCONS_ARGS+=	with_opengl=0
 .endif
 
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons ${SCONS_ARGS}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mars-nomercy ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/mars ${STAGEDIR}${PREFIX}/libexec/mars
diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index b098e2f8d480..7a0bf9b1a855 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LDFLAGS+=	-lpthreads
 
-USES=		gnome scons sdl zip
+USES=		gnome scons:python2 sdl zip
 USE_SDL=	sdl mixer image
 USE_GNOME=	libxml2
 MAKE_ARGS+=	datadir="${DATADIR}"
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 569f9c165341..d9c1f593d9b3 100644
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/signals2.hpp:devel/boost-libs
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		compiler:c++11-lib gl iconv scons sdl tar:bzip2 xorg
+USES=		compiler:c++11-lib gl iconv scons:python2 sdl tar:bzip2 xorg
 USE_GL=		gl
 USE_SDL=	sdl image mixer
 LIBS+=		${ICONV_LIB}
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index 10ad99186f91..e4d5ddc7118c 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libIL.so:graphics/devil \
 USE_GITHUB=	yes
 GH_ACCOUNT=	ginkgo
 
-USES=		pkgconfig scons compiler:c++11-lang gl sdl
+USES=		pkgconfig scons:python2 compiler:c++11-lang gl sdl
 USE_CXXSTD=	c++11
 USE_GL=		gl glu
 USE_SDL=	mixer
diff --git a/games/rlvm/Makefile b/games/rlvm/Makefile
index 929ccb339fbf..c00f5d1e63a1 100644
--- a/games/rlvm/Makefile
+++ b/games/rlvm/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 USE_GITHUB=	yes
 GH_ACCOUNT=	eglaysher
 
-USES=		compiler:c++11-lib gl gnome pkgconfig scons sdl
+USES=		compiler:c++11-lib gl gnome pkgconfig scons:python2 sdl
 USE_GL=		glew glu
 USE_GNOME=	gtk20
 USE_SDL=	image mixer ttf
diff --git a/graphics/goxel/Makefile b/graphics/goxel/Makefile
index 88449e9f67c1..ac6def1bdd4d 100644
--- a/graphics/goxel/Makefile
+++ b/graphics/goxel/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libglfw.so:graphics/glfw \
 		libpng.so:graphics/png
 
-USES=		compiler:c++11-lang pkgconfig scons gnome gl
+USES=		compiler:c++11-lang pkgconfig scons:python2 gnome gl
 USE_GITHUB=	yes
 GH_ACCOUNT=	guillaumechereau
 USE_GNOME=	cairo gtk30
diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile
index 4dafd0b9d846..dbd520d8431c 100644
--- a/lang/tolua++/Makefile
+++ b/lang/tolua++/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.codenix.com/~tolua/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Extended version of tolua, a tool to integrate C/C++ code with Lua
 
-USES=		scons lua:51 tar:bzip2
+USES=		scons:python2 lua:51 tar:bzip2
 MAKE_ARGS=	prefix=${PREFIX} SONAME="libtolua++-${LUA_VER}.so"
 
 CCFLAGS+=	-I${LUA_INCDIR}
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
index 3ff5d22cd9f4..408136b78ee1 100644
--- a/math/gringo/Makefile
+++ b/math/gringo/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	re2c:devel/re2c
 
-USES=		bison compiler:c++11-lib python:2.7 scons
+USES=		bison compiler:c++11-lib python:2.7 scons:python2
 MAKE_ARGS=	${MAKE_ENV}
 CXXFLAGS+=	-std=c++11
 MAKE_ENV=	WITH_LUA=no
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 671ae14e875c..28bb8f71349a 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libkate.so:multimedia/libkate \
 		libtheora.so:multimedia/libtheora
 
-USES=		iconv pkgconfig scons tar:bzip2
+USES=		iconv pkgconfig scons:python2 tar:bzip2
 MAKE_ARGS=	APPEND_CCFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		APPEND_LINKFLAGS="${LDFLAGS} ${LIBS}"
 
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index 665c4463d491..49ec7b088969 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
 
 USES=		compiler:c++11-lang gettext gnome iconv localbase:ldflags \
-		pkgconfig scons ssl tar:bzip2
+		pkgconfig scons:python2 ssl tar:bzip2
 USE_GNOME=	libglade2
 INSTALLS_ICONS=	yes
 PORTDOCS=	*
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index 096e5d92e3a4..341055538867 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Ftp-like client for the FSP service
 
 CONFLICTS_INSTALL=	alliance-*
-USES=		tar:bzip2 scons
+USES=		tar:bzip2 scons:python2
 MAKE_ARGS=	prefix=${PREFIX}
 
 PLIST_FILES=	bin/fsp share/man/man1/fsp.1.gz
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index f581b08b9a21..c9af2901b34e 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	FSP daemon, clients, and scanner
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USES=		scons tar:bzip2
+USES=		scons:python2 tar:bzip2
 
 CLIENTS=	fbye fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \
 		flscmd fmkdir fmvcmd fprocmd fput frmcmd frmdircmd fsetupcmd \
diff --git a/net/fsplib/Makefile b/net/fsplib/Makefile
index 043031b591e8..fa4584ef209a 100644
--- a/net/fsplib/Makefile
+++ b/net/fsplib/Makefile
@@ -13,7 +13,7 @@ LICENSE_NAME=	FSP software suite copyright
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		scons
+USES=		scons:python2
 
 CCFLAGS=	${CXXFLAGS}
 
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 95063ae12fc3..cbcdc93c14e5 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -18,7 +18,7 @@ EXPIRATION_DATE=	2020-09-15
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libpcap.so.1:net/libpcap	# avoid base libpcap
 
-USES=		ncurses scons shebangfix ssl compiler:env python:2.7,build
+USES=		ncurses scons:python2 shebangfix ssl compiler:env python:2.7,build
 USE_GITHUB=	yes
 USE_RC_SUBR=	xorp
 GH_ACCOUNT=	greearb
diff --git a/security/orthrus/Makefile b/security/orthrus/Makefile
index e6373783990f..d442500711cd 100644
--- a/security/orthrus/Makefile
+++ b/security/orthrus/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1
 
-USES=		iconv scons tar:bzip2
+USES=		iconv scons:python2 tar:bzip2
 MAKE_ARGS=	DEBUG=False --install-sandbox=${STAGEDIR}
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/ori/Makefile b/sysutils/ori/Makefile
index b86c85aaf6a7..3919dc69489b 100644
--- a/sysutils/ori/Makefile
+++ b/sysutils/ori/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Ori distributed file system
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libboost_date_time.so:devel/boost-libs
 
-USES=		compiler:c++11-lib fuse pkgconfig scons ssl tar:xz
+USES=		compiler:c++11-lib fuse pkgconfig scons:python2 ssl tar:xz
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto
 MAKE_ARGS=	VERBOSE=1
diff --git a/www/serf/Makefile b/www/serf/Makefile
index ae1bd24788d3..16e8fabf4901 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	serf
 PORTVERSION=	1.3.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	APACHE/serf
 
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS+=	libapr-1.so:devel/apr1
 
-USES=		scons ssl tar:bzip2 cpe
+USES=		scons:python2 ssl tar:bzip2 cpe
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DOCS