Attachment 127509 Details for Bug 171349 – file.diff

[patch] file.diff

file.diff (text/plain), 3.68 KB, created by Li-Lun Wang on 2012-09-05 17:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Li-Lun Wang

Created: 2012-09-05 17:40:01 UTC

Size: 3.68 KB

patch

obsolete

>diff -urN math/py-numpy.orig/Makefile math/py-numpy/Makefile
>--- math/py-numpy.orig/Makefile	2012-06-22 03:23:29.000000000 -0500
>+++ math/py-numpy/Makefile	2012-09-05 11:00:27.564111906 -0500
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	numpy
> PORTVERSION=	1.6.2
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	math python
> MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \
>@@ -24,7 +25,10 @@
> 
> RUN_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
> 
>-OPTIONS=	ATLAS "Use optimized blas library" Off
>+OPTIONS_DEFINE=	ATLAS SUITESPARSE
>+OPTIONS_DEFAULT=	SUITESPARSE
>+ATLAS_DESC=	Use optimized blas library
>+SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
> 
> USE_FORTRAN=	yes
> USE_PYTHON=	yes
>@@ -53,7 +57,7 @@
> DISTFILES+=	${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp
> .endif
> 
>-.if defined(WITH_ATLAS)
>+.if ${PORT_OPTIONS:MATLAS}
> LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
> .if !exists(${LOCALBASE}/lib/libalapack.a)
> IGNORE=	atlas needs to be built with WITH_STATIC for numpy to function properly
>@@ -63,7 +67,7 @@
> 		blas.2:${PORTSDIR}/math/blas
> .endif
> 
>-.if exists(${LOCALBASE}/lib/libumfpack.so.1)
>+.if ${PORT_OPTIONS:MSUITESPARSE}
> LIB_DEPENDS+=	umfpack.1:${PORTSDIR}/math/suitesparse
> .endif
> 
>@@ -90,17 +94,17 @@
> 		${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \
>  	fi
> .endif
>-.ifdef WITH_ATLAS
>-	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
>-	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
>-	    -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" \
>-		${WRKSRC}/site.cfg
>+.if ${PORT_OPTIONS:MATLAS}
>+	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg
> .else
>+	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
>+.endif
>+.if !${PORT_OPTIONS:MSUITESPARSE}
>+	@${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg
>+.endif
> 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \
> 	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
>-	    -e "s+%%ATLASLIBS%%+lapack, blas+" \
>-		 ${WRKSRC}/site.cfg
>-.endif
>+		${WRKSRC}/site.cfg
> 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
> 
> pre-install:
>diff -urN science/py-scipy.orig/Makefile science/py-scipy/Makefile
>--- science/py-scipy.orig/Makefile	2012-05-31 14:01:17.641456000 -0500
>+++ science/py-scipy/Makefile	2012-09-05 11:08:31.764191151 -0500
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	scipy
> PORTVERSION=	0.10.1
>+PORTREVISION=	1
> CATEGORIES=	science python
> MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME}/:doc \
> 		SF:source
>@@ -21,7 +22,8 @@
> BUILD_DEPENDS+=	${PYNUMPY} \
> 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
> LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
>-RUN_DEPENDS=	${PYNUMPY}
>+RUN_DEPENDS=	${PYNUMPY}	\
>+		nosetests:${PORTSDIR}/devel/py-nose
> 
> LATEST_LINK=	py-${PORTNAME}
> OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options
>@@ -29,7 +31,11 @@
> USE_FORTRAN=	yes
> USE_PYTHON=	2.5+
> USE_PYDISTUTILS=	yes
>-OPTIONS=	ATLAS "Use optimized blas library" OFF
>+
>+OPTIONS_DEFINE=	ATLAS SUITESPARSE
>+OPTIONS_DEFAULT=	SUITESPARSE
>+ATLAS_DESC=	Use optimized blas library
>+SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
> 
> post-patch:
> 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
>@@ -37,7 +43,7 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITH_ATLAS)
>+.if ${PORT_OPTIONS:MATLAS}
> LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
> .if !exists(${LOCALBASE}/lib/libalapack.a)
> IGNORE=		atlas needs to be built with WITH_STATIC for scipy to function properly
>@@ -47,7 +53,7 @@
> 		blas.2:${PORTSDIR}/math/blas
> .endif
> 
>-.if exists(${LOCALBASE}/lib/libumfpack.so.1)
>+.if ${PORT_OPTIONS:MSUITESPARSE}
> BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
> LIB_DEPENDS+=	umfpack.1:${PORTSDIR}/math/suitesparse
> .endif

Actions: View | Diff

Attachments on bug 171349: 127509