From owner-svn-ports-all@freebsd.org Mon May 25 18:33:52 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B27B332EBCE; Mon, 25 May 2020 18:33:52 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49W5Mh4bNbz4K9V; Mon, 25 May 2020 18:33:52 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98B4816A62; Mon, 25 May 2020 18:33:52 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04PIXqQM059409; Mon, 25 May 2020 18:33:52 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04PIXi8i059371; Mon, 25 May 2020 18:33:44 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202005251833.04PIXi8i059371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 25 May 2020 18:33:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536497 - in head: astro/gpsd audio/ardour audio/mixxx audio/mixxx21 chinese/sunpinyin databases/mongodb36 databases/mongodb40 devel/godot2 devel/mongo-cxx-driver emulators/fceux emulat... X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head: astro/gpsd audio/ardour audio/mixxx audio/mixxx21 chinese/sunpinyin databases/mongodb36 databases/mongodb40 devel/godot2 devel/mongo-cxx-driver emulators/fceux emulators/gem5 emulators/nonpar... X-SVN-Commit-Revision: 536497 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2020 18:33:52 -0000 Author: sunpoet Date: Mon May 25 18:33:44 2020 New Revision: 536497 URL: https://svnweb.freebsd.org/changeset/ports/536497 Log: Update USES=scons to specify scons of Python 2 - While I'm here, convert emulators/gem5 and games/marsnomercy to USES=scons Modified: head/astro/gpsd/Makefile head/audio/ardour/Makefile head/audio/mixxx/Makefile head/audio/mixxx21/Makefile head/chinese/sunpinyin/Makefile head/databases/mongodb36/Makefile head/databases/mongodb40/Makefile head/devel/godot2/Makefile head/devel/mongo-cxx-driver/Makefile head/emulators/fceux/Makefile head/emulators/gem5/Makefile head/emulators/nonpareil/Makefile head/games/battletanks/Makefile head/games/dangerdeep/Makefile head/games/dxx-rebirth/Makefile head/games/freera/Makefile head/games/glob2/Makefile head/games/gtkradiant/Makefile head/games/marsnomercy/Makefile head/games/netpanzer/Makefile head/games/pingus/Makefile head/games/pink-pony/Makefile head/games/rlvm/Makefile head/graphics/goxel/Makefile head/lang/tolua++/Makefile head/math/gringo/Makefile head/multimedia/ffmpeg2theora/Makefile head/net-p2p/linuxdcpp/Makefile head/net/fspclient/Makefile head/net/fspd/Makefile head/net/fsplib/Makefile head/net/xorp/Makefile head/security/orthrus/Makefile head/sysutils/ori/Makefile head/www/serf/Makefile Modified: head/astro/gpsd/Makefile ============================================================================== --- head/astro/gpsd/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/astro/gpsd/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -12,7 +12,7 @@ COMMENT= Daemon that monitors one or more GPSes attach 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 Modified: head/audio/ardour/Makefile ============================================================================== --- head/audio/ardour/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/audio/ardour/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 \ Modified: head/audio/mixxx/Makefile ============================================================================== --- head/audio/mixxx/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/audio/mixxx/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/audio/mixxx21/Makefile ============================================================================== --- head/audio/mixxx21/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/audio/mixxx21/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/chinese/sunpinyin/Makefile ============================================================================== --- head/chinese/sunpinyin/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/chinese/sunpinyin/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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} Modified: head/databases/mongodb36/Makefile ============================================================================== --- head/databases/mongodb36/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/databases/mongodb36/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/databases/mongodb40/Makefile ============================================================================== --- head/databases/mongodb40/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/databases/mongodb40/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/devel/godot2/Makefile ============================================================================== --- head/devel/godot2/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/devel/godot2/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/devel/mongo-cxx-driver/Makefile ============================================================================== --- head/devel/mongo-cxx-driver/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/devel/mongo-cxx-driver/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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} Modified: head/emulators/fceux/Makefile ============================================================================== --- head/emulators/fceux/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/emulators/fceux/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/emulators/gem5/Makefile ============================================================================== --- head/emulators/gem5/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/emulators/gem5/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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,13 +17,16 @@ BROKEN_mips64= fails to build: claims that gcc versio 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 post-patch: @@ -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} \ Modified: head/emulators/nonpareil/Makefile ============================================================================== --- head/emulators/nonpareil/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/emulators/nonpareil/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/games/battletanks/Makefile ============================================================================== --- head/games/battletanks/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/battletanks/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/games/dangerdeep/Makefile ============================================================================== --- head/games/dangerdeep/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/dangerdeep/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -14,7 +14,7 @@ COMMENT= Open source World War II German submarine sim 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 Modified: head/games/dxx-rebirth/Makefile ============================================================================== --- head/games/dxx-rebirth/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/dxx-rebirth/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/games/freera/Makefile ============================================================================== --- head/games/freera/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/freera/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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++ Modified: head/games/glob2/Makefile ============================================================================== --- head/games/glob2/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/glob2/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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}" \ Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/gtkradiant/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -20,7 +20,7 @@ LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkgl 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 Modified: head/games/marsnomercy/Makefile ============================================================================== --- head/games/marsnomercy/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/marsnomercy/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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} @@ -46,9 +45,6 @@ SCONS_ARGS+= with_opengl=1 .else 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/ Modified: head/games/netpanzer/Makefile ============================================================================== --- head/games/netpanzer/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/netpanzer/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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}" Modified: head/games/pingus/Makefile ============================================================================== --- head/games/pingus/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/pingus/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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} Modified: head/games/pink-pony/Makefile ============================================================================== --- head/games/pink-pony/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/pink-pony/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/games/rlvm/Makefile ============================================================================== --- head/games/rlvm/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/games/rlvm/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -28,7 +28,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSan 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 Modified: head/graphics/goxel/Makefile ============================================================================== --- head/graphics/goxel/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/graphics/goxel/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/lang/tolua++/Makefile ============================================================================== --- head/lang/tolua++/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/lang/tolua++/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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} Modified: head/math/gringo/Makefile ============================================================================== --- head/math/gringo/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/math/gringo/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/multimedia/ffmpeg2theora/Makefile ============================================================================== --- head/multimedia/ffmpeg2theora/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/multimedia/ffmpeg2theora/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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}" Modified: head/net-p2p/linuxdcpp/Makefile ============================================================================== --- head/net-p2p/linuxdcpp/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/net-p2p/linuxdcpp/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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= * Modified: head/net/fspclient/Makefile ============================================================================== --- head/net/fspclient/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/net/fspclient/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/net/fspd/Makefile ============================================================================== --- head/net/fspd/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/net/fspd/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 \ Modified: head/net/fsplib/Makefile ============================================================================== --- head/net/fsplib/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/net/fsplib/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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} Modified: head/net/xorp/Makefile ============================================================================== --- head/net/xorp/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/net/xorp/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/security/orthrus/Makefile ============================================================================== --- head/security/orthrus/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/security/orthrus/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/sysutils/ori/Makefile ============================================================================== --- head/sysutils/ori/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/sysutils/ori/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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 Modified: head/www/serf/Makefile ============================================================================== --- head/www/serf/Makefile Mon May 25 18:32:54 2020 (r536496) +++ head/www/serf/Makefile Mon May 25 18:33:44 2020 (r536497) @@ -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