* Fix build of science/py-scipy when math/suitesparse is installed, by

  correctly detect and depend on it in math/py-numpy
* Replace the old numpy documentation with the new numpy book
* Explicitly tell the distutil to use gnu95 fortran compiler
* Use ${PYTHONPREFIX_SITELIBDIR} rather than ${PYTHON_SITELIBDIR} when
  generating the packing list for science/py-scipy
* Bump PORTREVISIONs, for packing lists are changed

PR:		ports/136058
Submitted by:	Li-Lun Wang (Leland Wang) <llwang AT infor.org> (maintainer)

4 files changed, 18 insertions, 10 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 27217cd67a06..520d3979234e 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	numpy
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
@@ -14,7 +15,7 @@ MASTER_SITES=	http://numpy.scipy.org/:doc \
 MASTER_SITE_SUBDIR=	numpy/:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
-		numpy.pdf:doc
+		numpybook.pdf:doc
 EXTRACT_ONLY=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}
 
 MAINTAINER=	llwang@infor.org
@@ -44,8 +45,15 @@ LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack \
 		blas.2:${PORTSDIR}/math/blas
 .endif
 
+.if exists(${LOCALBASE}/lib/libumfpack.so.1)
+LIB_DEPENDS+=	umfpack.1:${PORTSDIR}/math/suitesparse
+.endif
+
+PYDISTUTILS_CONFIGUREARGS+=	--fcompiler=gnu95
+PYDISTUTILS_BUILDARGS+=	--fcompiler=gnu95
+
 post-extract:
-	@${CP} ${DISTDIR}/numpy.pdf ${WRKDIR}
+	@${CP} ${DISTDIR}/numpybook.pdf ${WRKDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
@@ -55,12 +63,12 @@ GCCLIBDIR=	`${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//`
 pre-configure:
 .ifdef WITH_ATLAS
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \
-	    -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
+	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
 	    -e "s+%%ATLASLIBS%%+alapack_r, f77blas_r, cblas_r, atlas_r+" \
 		${WRKSRC}/site.cfg
 .else
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \
-	    -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
+	    -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
 	    -e "s+%%ATLASLIBS%%+lapack, blas+" \
 		 ${WRKSRC}/site.cfg
 .endif
@@ -70,7 +78,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/numpybook.pdf ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 79cd3b045de0..26dd9fb28802 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,6 +1,6 @@
 MD5 (numpy-1.3.0.tar.gz) = 3f7773ff0971a5ebb8591536d8ec7bd6
 SHA256 (numpy-1.3.0.tar.gz) = 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
 SIZE (numpy-1.3.0.tar.gz) = 1995868
-MD5 (numpy.pdf) = 258b3758645568724ab1a3ead67db78a
-SHA256 (numpy.pdf) = 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f
-SIZE (numpy.pdf) = 1234555
+MD5 (numpybook.pdf) = 637180cd704dc8be4036c09412501397
+SHA256 (numpybook.pdf) = 8c9692db7373838c585073e4141ae4bd3b8793dffd59ce3544bf851e71e9b865
+SIZE (numpybook.pdf) = 2148630
diff --git a/math/py-numpy/files/site.cfg b/math/py-numpy/files/site.cfg
index cab4971ae8d9..f3ef2fcda163 100644
--- a/math/py-numpy/files/site.cfg
+++ b/math/py-numpy/files/site.cfg
@@ -1,7 +1,7 @@
 [DEFAULT]
 lapack_type=atlas
 library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%%
-include_dirs = /usr/include:%%LOCALBASE%%/include
+include_dirs = /usr/include:%%LOCALBASE%%/include:%%LOCALBASE%%/include/suitesparse
 src_dirs = %%LOCALBASE%%/src
 # search static libraries (.a) in preference to shared ones (.so)
 search_static_first = 0
diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist
index fc59947f98e3..4c92460185a0 100644
--- a/math/py-numpy/pkg-plist
+++ b/math/py-numpy/pkg-plist
@@ -837,7 +837,7 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/version.py
 %%PYTHON_SITELIBDIR%%/numpy/version.pyc
 %%PYTHON_SITELIBDIR%%/numpy/version.pyo
-%%PORTDOCS%%%%DOCSDIR%%/numpy.pdf
+%%PORTDOCS%%%%DOCSDIR%%/numpybook.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing/tests