BLAS and LAPACK are now build with gfortran so test

section is also available as default.

2 files changed, 55 insertions, 64 deletions

diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index 661dfa66c4c9..bc0dfa53b8d1 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -34,17 +34,17 @@ NOT_FOR_ARCHS=	alpha
 
 #to compile the ATLAS kernel we use gcc3. See ATLAS/INSTALL.txt for details.
 WANT_FORTRAN=	yes
-USE_GCC=4.2+
+BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+FC=	gfortran42
+F77=	gfortran42
 .if ${OSVERSION} > 700000
 BUILD_DEPENDS+=	gcc34:${PORTSDIR}/lang/gcc34
 CCOMPILER=	gcc34
 .else
-CCOMPILER:=	cc
+CCOMPILER=	${CC}
 .endif
-.if defined(WITH_TESTS)
 LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
-.endif
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
@@ -55,9 +55,9 @@ PICFLAG?=	-fpic
 # only affects for lapack sub project
 .if defined(WITH_OPTIMIZED_FLAGS)
 .if defined(CPUTYPE)
-FFLAGS+=	-mtune=${CPUTYPE} -pipe -O2 -ffast-math -fomit-frame-pointer
+FFLAGS+=	-mtune=${CPUTYPE} -pipe -O2 -ffast-math
 .else
-FFLAGS+=	-pipe -O2 -ffast-math -fomit-frame-pointer
+FFLAGS+=	-pipe -O2 -ffast-math
 .endif
 .endif
 .if defined(WITH_STATICLIB)
@@ -65,11 +65,6 @@ PLIST_SUB+=      WITH_STATICLIB=""
 .else
 PLIST_SUB+=      WITH_STATICLIB="@comment "
 .endif
-.if defined(WITH_TESTS)
-PLIST_SUB+=	WITH_TESTS=""
-.else
-PLIST_SUB+=	WITH_TESTS="@comment "
-.endif
 
 post-extract:
 .if !defined(WITH_STATICLIB)
@@ -115,9 +110,7 @@ do-build:
 .endif
 	(cd ${WRKSRC}/NON_THREADED_PIC ; ${MAKE})
 	(cd ${WRKSRC}/THREADED_PIC ; ${MAKE})
-.if defined(WITH_TESTS)
 	@${MAKE} test
-.endif
 
 ATLAS_LIBS1=libalapack libatlas libcblas libf77blas libtstatlas
 ATLAS_LIBS2=libptcblas libptf77blas
@@ -210,7 +203,6 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
-.if defined(WITH_TESTS)
 	${MKDIR} ${EXAMPLESDIR}
 	@for i in ${ALLTESTS} ; do \
 	cd ${WRKDIR}/ATLAS/NON_THREADED_PIC/bin ; ${INSTALL_PROGRAM} $${i} ${EXAMPLESDIR} ; \
@@ -218,7 +210,6 @@ do-install:
 	@for i in ${ALLTESTS_PT} ; do \
 	cd ${WRKDIR}/ATLAS/THREADED_PIC/bin ; ${INSTALL_PROGRAM} $${i} ${EXAMPLESDIR} ; \
 	done
-.endif
 
 .include <${FILESDIR}/Makefile.test>
 .include <bsd.port.post.mk>
diff --git a/math/atlas-devel/pkg-plist b/math/atlas-devel/pkg-plist
index f11f0f568226..0d7e9f7d909a 100644
--- a/math/atlas-devel/pkg-plist
+++ b/math/atlas-devel/pkg-plist
@@ -54,52 +54,52 @@ lib/libtstatlas_r.so
 %%PORTDOCS%%share/doc/atlas/f77blasqref.ps
 %%PORTDOCS%%share/doc/atlas/lapackqref.ps
 %%PORTDOCS%%@dirrm share/doc/atlas
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcl1blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcl2blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcl3blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcl3blastst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcllttst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcllttstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcllttstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xcllttst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xclutst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xclutstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xclutstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xclutst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdl1blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdl2blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdl3blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdl3blastst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdllttst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdllttstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdllttstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdllttst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdlutst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdlutstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdlutstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xdlutst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsl1blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsl2blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsl3blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsl3blastst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsllttst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsllttstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsllttstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xsllttst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xslutst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xslutstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xslutstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xslutst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzl1blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzl2blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzl3blastst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzl3blastst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzllttst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzllttstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzllttstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzllttst_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzlutst
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzlutstF
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzlutstF_pt
-%%WITH_TESTS%%%%EXAMPLESDIR%%/xzlutst_pt
-%%WITH_TESTS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/xcl1blastst
+%%EXAMPLESDIR%%/xcl2blastst
+%%EXAMPLESDIR%%/xcl3blastst
+%%EXAMPLESDIR%%/xcl3blastst_pt
+%%EXAMPLESDIR%%/xcllttst
+%%EXAMPLESDIR%%/xcllttstF
+%%EXAMPLESDIR%%/xcllttstF_pt
+%%EXAMPLESDIR%%/xcllttst_pt
+%%EXAMPLESDIR%%/xclutst
+%%EXAMPLESDIR%%/xclutstF
+%%EXAMPLESDIR%%/xclutstF_pt
+%%EXAMPLESDIR%%/xclutst_pt
+%%EXAMPLESDIR%%/xdl1blastst
+%%EXAMPLESDIR%%/xdl2blastst
+%%EXAMPLESDIR%%/xdl3blastst
+%%EXAMPLESDIR%%/xdl3blastst_pt
+%%EXAMPLESDIR%%/xdllttst
+%%EXAMPLESDIR%%/xdllttstF
+%%EXAMPLESDIR%%/xdllttstF_pt
+%%EXAMPLESDIR%%/xdllttst_pt
+%%EXAMPLESDIR%%/xdlutst
+%%EXAMPLESDIR%%/xdlutstF
+%%EXAMPLESDIR%%/xdlutstF_pt
+%%EXAMPLESDIR%%/xdlutst_pt
+%%EXAMPLESDIR%%/xsl1blastst
+%%EXAMPLESDIR%%/xsl2blastst
+%%EXAMPLESDIR%%/xsl3blastst
+%%EXAMPLESDIR%%/xsl3blastst_pt
+%%EXAMPLESDIR%%/xsllttst
+%%EXAMPLESDIR%%/xsllttstF
+%%EXAMPLESDIR%%/xsllttstF_pt
+%%EXAMPLESDIR%%/xsllttst_pt
+%%EXAMPLESDIR%%/xslutst
+%%EXAMPLESDIR%%/xslutstF
+%%EXAMPLESDIR%%/xslutstF_pt
+%%EXAMPLESDIR%%/xslutst_pt
+%%EXAMPLESDIR%%/xzl1blastst
+%%EXAMPLESDIR%%/xzl2blastst
+%%EXAMPLESDIR%%/xzl3blastst
+%%EXAMPLESDIR%%/xzl3blastst_pt
+%%EXAMPLESDIR%%/xzllttst
+%%EXAMPLESDIR%%/xzllttstF
+%%EXAMPLESDIR%%/xzllttstF_pt
+%%EXAMPLESDIR%%/xzllttst_pt
+%%EXAMPLESDIR%%/xzlutst
+%%EXAMPLESDIR%%/xzlutstF
+%%EXAMPLESDIR%%/xzlutstF_pt
+%%EXAMPLESDIR%%/xzlutst_pt
+@dirrm %%EXAMPLESDIR%%