Attachment #127509 for bug #171349

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

Lines 7-12 Link Here

(-)math/py-numpy/Makefile (-11 / +15 lines)
7		7
8	PORTNAME= numpy	8	PORTNAME= numpy
9	PORTVERSION= 1.6.2	9	PORTVERSION= 1.6.2
		10	PORTREVISION= 1
10	PORTEPOCH= 1	11	PORTEPOCH= 1
11	CATEGORIES= math python	12	CATEGORIES= math python
12	MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \	13	MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \
Lines 24-30 Link Here
24		25
25	RUN_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose	26	RUN_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose
26		27
27	OPTIONS= ATLAS "Use optimized blas library" Off	28	OPTIONS_DEFINE= ATLAS SUITESPARSE
		29	OPTIONS_DEFAULT= SUITESPARSE
		30	ATLAS_DESC= Use optimized blas library
		31	SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse
28		32
29	USE_FORTRAN= yes	33	USE_FORTRAN= yes
30	USE_PYTHON= yes	34	USE_PYTHON= yes
Lines 53-59 Link Here
53	DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp	57	DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp
54	.endif	58	.endif
55		59
56	.if defined(WITH_ATLAS)	60	.if ${PORT_OPTIONS:MATLAS}
57	LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas	61	LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas
58	.if !exists(${LOCALBASE}/lib/libalapack.a)	62	.if !exists(${LOCALBASE}/lib/libalapack.a)
59	IGNORE= atlas needs to be built with WITH_STATIC for numpy to function properly	63	IGNORE= atlas needs to be built with WITH_STATIC for numpy to function properly
Lines 63-69 Link Here
63	blas.2:${PORTSDIR}/math/blas	67	blas.2:${PORTSDIR}/math/blas
64	.endif	68	.endif
65		69
66	.if exists(${LOCALBASE}/lib/libumfpack.so.1)	70	.if ${PORT_OPTIONS:MSUITESPARSE}
67	LIB_DEPENDS+= umfpack.1:${PORTSDIR}/math/suitesparse	71	LIB_DEPENDS+= umfpack.1:${PORTSDIR}/math/suitesparse
68	.endif	72	.endif
69		73
Lines 90-106 Link Here
90	${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \	94	${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \
91	fi	95	fi
92	.endif	96	.endif
93	.ifdef WITH_ATLAS	97	.if ${PORT_OPTIONS:MATLAS}
94	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \	98	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg
95	-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
96	-e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" \
97	${WRKSRC}/site.cfg
98	.else	99	.else
		100	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
		101	.endif
		102	.if !${PORT_OPTIONS:MSUITESPARSE}
		103	@${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg
		104	.endif
99	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \	105	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
100	-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \	106	-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
101	-e "s+%%ATLASLIBS%%+lapack, blas+" \	107	${WRKSRC}/site.cfg
102	${WRKSRC}/site.cfg
103	.endif
104	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py	108	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
105		109
106	pre-install:	110	pre-install:

Lines 7-12 Link Here

(-)science/py-scipy/Makefile (-4 / +10 lines)
7		7
8	PORTNAME= scipy	8	PORTNAME= scipy
9	PORTVERSION= 0.10.1	9	PORTVERSION= 0.10.1
		10	PORTREVISION= 1
10	CATEGORIES= science python	11	CATEGORIES= science python
11	MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME}/:doc \	12	MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME}/:doc \
12	SF:source	13	SF:source
Lines 21-27 Link Here
21	BUILD_DEPENDS+= ${PYNUMPY} \	22	BUILD_DEPENDS+= ${PYNUMPY} \
22	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft	23	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
23	LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3	24	LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3
24	RUN_DEPENDS= ${PYNUMPY}	25	RUN_DEPENDS= ${PYNUMPY} \
		26	nosetests:${PORTSDIR}/devel/py-nose
25		27
26	LATEST_LINK= py-${PORTNAME}	28	LATEST_LINK= py-${PORTNAME}
27	OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options	29	OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options
Lines 29-35 Link Here
29	USE_FORTRAN= yes	31	USE_FORTRAN= yes
30	USE_PYTHON= 2.5+	32	USE_PYTHON= 2.5+
31	USE_PYDISTUTILS= yes	33	USE_PYDISTUTILS= yes
32	OPTIONS= ATLAS "Use optimized blas library" OFF	34
		35	OPTIONS_DEFINE= ATLAS SUITESPARSE
		36	OPTIONS_DEFAULT= SUITESPARSE
		37	ATLAS_DESC= Use optimized blas library
		38	SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse
33		39
34	post-patch:	40	post-patch:
35	@${GREP} -lR "malloc\.h" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} \	41	@${GREP} -lR "malloc\.h" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} \
Lines 37-43 Link Here
37		43
38	.include <bsd.port.pre.mk>	44	.include <bsd.port.pre.mk>
39		45
40	.if defined(WITH_ATLAS)	46	.if ${PORT_OPTIONS:MATLAS}
41	LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas	47	LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas
42	.if !exists(${LOCALBASE}/lib/libalapack.a)	48	.if !exists(${LOCALBASE}/lib/libalapack.a)
43	IGNORE= atlas needs to be built with WITH_STATIC for scipy to function properly	49	IGNORE= atlas needs to be built with WITH_STATIC for scipy to function properly
Lines 47-53 Link Here
47	blas.2:${PORTSDIR}/math/blas	53	blas.2:${PORTSDIR}/math/blas
48	.endif	54	.endif
49		55
50	.if exists(${LOCALBASE}/lib/libumfpack.so.1)	56	.if ${PORT_OPTIONS:MSUITESPARSE}
51	BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13	57	BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
52	LIB_DEPENDS+= umfpack.1:${PORTSDIR}/math/suitesparse	58	LIB_DEPENDS+= umfpack.1:${PORTSDIR}/math/suitesparse
53	.endif	59	.endif

Return to bug 171349