Attachment #142632 for bug #189691

View | Details | Raw Unified | Return to bug 189691
Collapse All | Expand All

Lines 11-16 COMMENT= Build tool alternative to make Link Here

(-)b/devel/scons/Makefile (+3 lines)
11		11
12	LICENSE= MIT	12	LICENSE= MIT
13		13
		14	RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
		15
14	USE_PYTHON= 2	16	USE_PYTHON= 2
15	USE_PYDISTUTILS= yes	17	USE_PYDISTUTILS= yes
16	PYDISTUTILS_AUTOPLIST= yes	18	PYDISTUTILS_AUTOPLIST= yes
Lines 22-26 post-patch: Link Here
22	-e 's,distutils\.command\.install$$,setuptools\.command\.install,' \	24	-e 's,distutils\.command\.install$$,setuptools\.command\.install,' \
23	-e 's,distutils\.command\.install\.,setuptools\.command\.install\.,' \	25	-e 's,distutils\.command\.install\.,setuptools\.command\.install\.,' \
24	${WRKSRC}/setup.py	26	${WRKSRC}/setup.py
		27	@${FIND} ${WRKSRC} -name \*.orig -delete
25		28
26	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Added Link Here

(-)b/devel/scons/files/patch-engine_SCons_Tool_m4.py (+11 lines)
1	--- engine/SCons/Tool/m4.py 2013-03-03 16:48:40.000000000 +0200
2	+++ engine/SCons/Tool/m4.py 2014-05-11 08:08:11.000000000 +0300
3	@@ -49,7 +49,7 @@
4	# file and run from there.
5	# The src_suffix setup is like so: file.c.m4 -> file.c,
6	# file.cpp.m4 -> file.cpp etc.
7	- env['M4'] = 'm4'
8	+ env['M4'] = 'gm4'
9	env['M4FLAGS'] = SCons.Util.CLVar('-E')
10	env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}'
11

Return to bug 189691