diff --git a/devel/scons/Makefile b/devel/scons/Makefile index 1cdf97e766d2..9fb8d30cd0cd 100644 --- a/devel/scons/Makefile +++ b/devel/scons/Makefile @@ -1,34 +1,33 @@ # Created by: Peter Haight PORTNAME= scons PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= SF PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Build tool alternative to make LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= gm4:devel/m4 - USES= python:2.7+ shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes PLIST_SUB= SCONS_VER=${PORTVERSION} SHEBANG_FILES= script/scons* post-patch: @${REINPLACE_CMD} -e 's|distutils\(\.command\.install\)$$|setuptools\1|; s|distutils\(\.command\.install\.\)|setuptools\1|' ${WRKSRC}/setup.py @${FIND} ${WRKSRC} -name '*.orig' -delete .include PYDISTUTILS_INSTALLARGS+= --standard-lib .include diff --git a/devel/scons/files/patch-engine_SCons_Tool_m4.py b/devel/scons/files/patch-engine_SCons_Tool_m4.py deleted file mode 100644 index f5783ba4a4d6..000000000000 --- a/devel/scons/files/patch-engine_SCons_Tool_m4.py +++ /dev/null @@ -1,11 +0,0 @@ ---- engine/SCons/Tool/m4.py.orig 2015-11-09 11:25:09 UTC -+++ engine/SCons/Tool/m4.py -@@ -49,7 +49,7 @@ def generate(env): - # file and run from there. - # The src_suffix setup is like so: file.c.m4 -> file.c, - # file.cpp.m4 -> file.cpp etc. -- env['M4'] = 'm4' -+ env['M4'] = 'gm4' - env['M4FLAGS'] = SCons.Util.CLVar('-E') - env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}' -