Index: head/math/py-numpy/Makefile
===================================================================
--- head/math/py-numpy/Makefile	(revision 382546)
+++ head/math/py-numpy/Makefile	(revision 382547)
@@ -1,80 +1,96 @@
 # Created by: Tony Maher
 # $FreeBSD$
 
 PORTNAME=	numpy
 PORTVERSION=	1.9.2
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://docs.scipy.org/doc/${PORTNAME}/:doc \
 		SF/${PORTNAME}/NumPy/${PORTVERSION}:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
 		numpy-ref-${DOCVERSION}.pdf:doc \
 		numpy-user-${DOCVERSION}.pdf:doc
 EXTRACT_ONLY=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The New Numeric Extension to Python
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
-
 USES=		fortran python
 USE_PYTHON=	concurrent distutils py3kplist
 LDFLAGS+=	-shared
 
-OPTIONS_DEFINE=		ATLAS SUITESPARSE DOCS
-OPTIONS_DEFAULT=	SUITESPARSE
-ATLAS_DESC=		Use optimized blas library
+OPTIONS_DEFINE=		DOCS SUITESPARSE TESTS
+OPTIONS_SINGLE=		BLASLIB
+OPTIONS_DEFAULT=	NETLIB SUITESPARSE
+OPTIONS_SINGLE_BLASLIB=	ATLAS NETLIB OPENBLAS
 SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
+TESTS_DESC=		Install test suite requirements
 
 PYDISTUTILS_CONFIGUREARGS+=	--fcompiler=gnu95
 PYDISTUTILS_BUILDARGS+=		--fcompiler=gnu95
 
 PORTDOCS=	*
 WRKSRC=		${WRKDIR}/${DISTNAME:S/r/rc/}
 DOCVERSION=	1.9.1
 
-ATLAS_LIB_DEPENDS=	libatlas.so:${PORTSDIR}/math/atlas
-ATLAS_LIB_DEPENDS_OFF=	libblas.so:${PORTSDIR}/math/blas \
-			liblapack.so:${PORTSDIR}/math/lapack
+ATLAS_USES=	blaslapack:atlas
+NETLIB_USES=	blaslapack:netlib
+OPENBLAS_USES=	blaslapack:openblas
 SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse
+TESTS_RUN_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
 PLIST_FILES+=	man/man1/f2py.1.gz
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
 	${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
 
 GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
 
 pre-configure:
-.if ${PORT_OPTIONS:MATLAS}
-	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg
+.if ${PORT_OPTIONS:MOPENBLAS}
+	@${REINPLACE_CMD} -e "s+%%BLASNAME%%+openblas+" \
+		-e "s+%%LIBRARIES%%+libraries+" \
+		-e "s+%%LAPACKLIBS%%+%%BLASLIBS%%+" \
+		-e "s+%%BLASLIBS%%+openblasp, gfortran+" \
+			${WRKSRC}/site.cfg
+.elif ${PORT_OPTIONS:MATLAS}
+	@${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \
+		-e "s+%%LIBRARIES%%+atlas_libs+" \
+		-e "s+%%BLASLIBS%%+%%ATLASLIBS%%+" \
+		-e "s+%%LAPACKLIBS%%+alapack+" \
+		-e "s+%%ATLASLIBS%%+ptf77blas, ptcblas+" \
+			${WRKSRC}/site.cfg
 .else
-	@${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
+	@${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \
+		-e "s+%%LIBRARIES%%+atlas_libs+" \
+		-e "s+%%BLASLIBS%%+blas+" \
+		-e "s+%%LAPACKLIBS%%+lapack+" \
+			${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" \
 		${WRKSRC}/site.cfg
 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1
 .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
 	${LN} -sf ${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/numpy-ref-${DOCVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/numpy-user-${DOCVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/math/py-numpy/files/site.cfg
===================================================================
--- head/math/py-numpy/files/site.cfg	(revision 382546)
+++ head/math/py-numpy/files/site.cfg	(revision 382547)
@@ -1,10 +1,10 @@
 [DEFAULT]
-lapack_type=atlas
 library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%%
 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
-[atlas]
-library_dirs = %%LOCALBASE%%/lib:%%GCCLIBDIR%%
-atlas_libs = %%ATLASLIBS%%
+
+[%%BLASNAME%%]
+%%LIBRARIES%% = %%BLASLIBS%%
+lapack_libs = %%LAPACKLIBS%%