Index: Mk/Uses/scons.mk =================================================================== --- Mk/Uses/scons.mk (revision 516142) +++ Mk/Uses/scons.mk (working copy) @@ -3,21 +3,41 @@ # Provide support to use the scons # # Feature: scons -# Usage: USES=scons +# Usage: USES=scons:ARGS +# Valid ARGS: py27 py36 # +# py27: Use python2.7 to run scons. +# py36: Use python3.6 to run scons. +# # MAINTAINER: python@FreeBSD.org .if !defined(_INCLUDE_USES_SCONS_MK) _INCLUDE_USES_SCONS_MK= yes -.if !empty(scons_ARGS) -IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments +.undef _SCONS_PYTHON_VER +_SCONS_PYTHON_FLAVOR= py27 +_SCONS_PYTHON_VER= 2.7 + +_SCONS_ARGS= ${scons_ARGS:S/,/ /g} +.if ${_SCONS_ARGS:Mpy27} +_SCONS_PYTHON_FLAVOR= py27 +_SCONS_PYTHON_VER= 2.7 +_SCONS_ARGS:= ${_SCONS_ARGS:Npy27} .endif +.if ${_SCONS_ARGS:Mpy36} +_SCONS_PYTHON_FLAVOR= py36 +_SCONS_PYTHON_VER= 3.6 +_SCONS_ARGS:= ${_SCONS_ARGS:Npy36} +.endif -SCONS= ${LOCALBASE}/bin/scons +.if !empty(_SCONS_ARGS) +IGNORE= Incorrect 'USES+= scons:${_SCONS_ARGS}' unknown argument +.endif -BUILD_DEPENDS+= ${SCONS}:devel/scons +SCONS= ${LOCALBASE}/bin/scons-${PYTHON_VER} +BUILD_DEPENDS+= ${SCONS}:devel/scons@${_SCONS_PYTHON_FLAVOR} + ALL_TARGET= # CCFLAGS?= ${CFLAGS} CPPPATH?= ${LOCALBASE}/include Index: devel/scons/Makefile =================================================================== --- devel/scons/Makefile (revision 516142) +++ devel/scons/Makefile (working copy) @@ -5,6 +5,7 @@ PORTVERSION= 3.1.1 CATEGORIES= devel python MASTER_SITES= SF +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Build tool alternative to make @@ -14,9 +15,11 @@ RUN_DEPENDS= gm4:devel/m4 -USES= python:2.7 shebangfix -USE_PYTHON= autoplist distutils +USES= python shebangfix uniquefiles:dirs +USE_PYTHON= autoplist concurrent distutils flavors +PYDISTUTILS_INSTALLARGS+= --standard-lib + NO_ARCH= yes PLIST_SUB= SCONS_VER=${PORTVERSION}