2 files changed, 53 insertions, 65 deletions

diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 91bc4620f545..8afdcb101d81 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -32,20 +32,17 @@ USE_LDCONFIG=	yes
 
 #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
-.elif ${OSVERSION} < 501000 && ${ARCH} == "alpha"
-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
 
 # only affects for lapack sub project
 .if defined(WITH_OPTIMIZED_FLAGS)
@@ -103,11 +100,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
 
 pre-configure:
 	@${ECHO_MSG} "Warning:"
@@ -170,9 +162,7 @@ do-build:
 	@(cd ${WRKSRC}; ${MAKE} ${.MAKEFLAGS} "ARCH=NON_THREADED" install arch=NON_THREADED)
 	@(cd ${WRKSRC}; ${MAKE} ${.MAKEFLAGS} "ARCH=THREADED" install arch=THREADED)
 .endif
-.if defined(WITH_TESTS)
 	@${MAKE} test
-.endif
 
 post-build:
 .if defined(WITH_STATICLIB)
@@ -262,7 +252,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/bin/NON_THREADED_PIC ; ${INSTALL_PROGRAM} $${i} ${EXAMPLESDIR} ; \
@@ -270,6 +259,5 @@ do-install:
 	@for i in ${ALLTESTS_PT} ; do \
 	cd ${WRKDIR}/ATLAS/bin/THREADED_PIC ; ${INSTALL_PROGRAM} $${i} ${EXAMPLESDIR} ; \
 	done
-.endif
 .include <${FILESDIR}/Makefile.test>
 .include <bsd.port.post.mk>
diff --git a/math/atlas/pkg-plist b/math/atlas/pkg-plist
index 5bd38528d5ec..f72987bc9372 100644
--- a/math/atlas/pkg-plist
+++ b/math/atlas/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%%