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

Collapse All | Expand All

(-)devel/boost-libs/Makefile (-5 / +15 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	boost-libs
4
PORTNAME=	boost-libs
5
PORTREVISION=	9
6
5
COMMENT=	Free portable C++ libraries (without Boost.Python)
7
COMMENT=	Free portable C++ libraries (without Boost.Python)
6
8
7
PORTREVISION=	8
8
9
BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
9
BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
10
10
11
OPTIONS_DEFINE=	VERBOSE_BUILD DEBUG ICU OPTIMIZED_CFLAGS
11
OPTIONS_DEFINE=	VERBOSE_BUILD DEBUG ICU OPTIMIZED_CFLAGS
Lines 14-22 Link Here
14
ICU_DESC=		Boost.Regex with ICU unicode support
14
ICU_DESC=		Boost.Regex with ICU unicode support
15
15
16
ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
16
ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
17
ICU_VARS=		BJAM_ARGS+=-sICU_PATH=${LOCALBASE}
17
ICU_VARS=		BJAM_ARGS+=boost.locale.iconv=off \
18
			BJAM_ARGS+=-sICU_PATH=${LOCALBASE}
18
ICU_USES_OFF=		iconv
19
ICU_USES_OFF=		iconv
19
ICU_VARS_OFF=		BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX}
20
ICU_VARS_OFF=		BJAM_ARGS+=boost.locale.icu=off
21
# Would like to also specify: BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX},
22
# but does not work, probably because ${ICONV_PREFIX} is set too late, so
23
# we have to use .if below
20
24
21
.include "${.CURDIR}/../boost-all/common.mk"
25
.include "${.CURDIR}/../boost-all/common.mk"
22
26
Lines 32-37 Link Here
32
PLIST_SUB+=	COROUTINE="" CONTEXT="" LOCALE="" LOG=""
36
PLIST_SUB+=	COROUTINE="" CONTEXT="" LOCALE="" LOG=""
33
.endif
37
.endif
34
38
39
.include <bsd.port.pre.mk>
40
41
.if !${PORT_OPTIONS:MICU}
42
BJAM_ARGS+=	-sICONV_PATH=${ICONV_PREFIX}
43
.endif
44
35
do-build:
45
do-build:
36
	@cd ${WRKSRC} && \
46
	@cd ${WRKSRC} && \
37
		${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} stage
47
		${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} stage
Lines 60-63 Link Here
60
		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
70
		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
61
		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
71
		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
62
72
63
.include <bsd.port.mk>
73
.include <bsd.port.post.mk>

Return to bug 198658