View | Details | Raw Unified | Return to bug 241463 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/scons.mk (-5 / +22 lines)
Lines 3-23 Link Here
3
# Provide support to use the scons
3
# Provide support to use the scons
4
#
4
#
5
# Feature:	scons
5
# Feature:	scons
6
# Usage:	USES=scons
6
# Usage:	USES=scons:ARGS
7
# Valid ARGS:	2 3
7
#
8
#
9
# 2:		Use python2 to run scons.
10
# 3:		Use python3 to run scons.
11
#
8
# MAINTAINER: python@FreeBSD.org
12
# MAINTAINER: python@FreeBSD.org
9
13
10
.if !defined(_INCLUDE_USES_SCONS_MK)
14
.if !defined(_INCLUDE_USES_SCONS_MK)
11
_INCLUDE_USES_SCONS_MK=	yes
15
_INCLUDE_USES_SCONS_MK=	yes
12
16
13
.if !empty(scons_ARGS)
17
# Default to python2 for backwards compatibility.
14
IGNORE=	Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments
18
_SCONS_PYTHON_FLAVOR=	${PYTHON2_DEFAULT:S/.//:S/^/py/}
19
20
_SCONS_ARGS=	${scons_ARGS:S/,/ /g}
21
.if ${_SCONS_ARGS:M2}
22
_SCONS_PYTHON_FLAVOR=	${PYTHON2_DEFAULT:S/.//:S/^/py/}
23
_SCONS_ARGS:=	${_SCONS_ARGS:N2}
15
.endif
24
.endif
25
.if ${_SCONS_ARGS:M3}
26
_SCONS_PYTHON_FLAVOR=	${PYTHON3_DEFAULT:S/.//:S/^/py/}
27
_SCONS_ARGS:=	${_SCONS_ARGS:N3}
28
.endif
16
29
17
SCONS=		${LOCALBASE}/bin/scons
30
.if !empty(_SCONS_ARGS)
31
IGNORE=	Incorrect 'USES+= scons:${_SCONS_ARGS}' unknown argument
32
.endif
18
33
19
BUILD_DEPENDS+=	${SCONS}:devel/scons
34
SCONS=		${LOCALBASE}/bin/scons-${PYTHON_VER}
20
35
36
BUILD_DEPENDS+=	${SCONS}:devel/scons@${_SCONS_PYTHON_FLAVOR}
37
21
ALL_TARGET=	#
38
ALL_TARGET=	#
22
CCFLAGS?=	${CFLAGS}
39
CCFLAGS?=	${CFLAGS}
23
CPPPATH?=	${LOCALBASE}/include
40
CPPPATH?=	${LOCALBASE}/include
(-)devel/scons/Makefile (-3 / +6 lines)
Lines 5-10 Link Here
5
PORTVERSION=	3.1.1
5
PORTVERSION=	3.1.1
6
CATEGORIES=	devel python
6
CATEGORIES=	devel python
7
MASTER_SITES=	SF
7
MASTER_SITES=	SF
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
9
9
MAINTAINER=	sunpoet@FreeBSD.org
10
MAINTAINER=	sunpoet@FreeBSD.org
10
COMMENT=	Build tool alternative to make
11
COMMENT=	Build tool alternative to make
Lines 14-21 Link Here
14
15
15
RUN_DEPENDS=	gm4:devel/m4
16
RUN_DEPENDS=	gm4:devel/m4
16
17
17
USES=		python:2.7 shebangfix
18
USES=		python shebangfix
18
USE_PYTHON=	autoplist distutils
19
USE_PYTHON=	autoplist concurrent distutils
19
20
20
NO_ARCH=	yes
21
NO_ARCH=	yes
21
22
Lines 27-30 Link Here
27
	@${REINPLACE_CMD} -e 's|distutils\(\.command\.install\)$$|setuptools\1|; s|distutils\(\.command\.install\.\)|setuptools\1|' ${WRKSRC}/setup.py
28
	@${REINPLACE_CMD} -e 's|distutils\(\.command\.install\)$$|setuptools\1|; s|distutils\(\.command\.install\.\)|setuptools\1|' ${WRKSRC}/setup.py
28
	@${FIND} ${WRKSRC} -name '*.orig' -delete
29
	@${FIND} ${WRKSRC} -name '*.orig' -delete
29
30
30
.include <bsd.port.mk>
31
.include <bsd.port.pre.mk>
32
PYDISTUTILS_INSTALLARGS+=	--standard-lib
33
.include <bsd.port.post.mk>

Return to bug 241463