5 files changed, 5 insertions, 123 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 2e2fe946eb19..5bc9b7b69611 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lapack
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/lapack/
 DISTNAME=	LAPACK
@@ -15,6 +16,10 @@ DISTFILES=	lapack.tgz manpages.tgz
 MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	A library of Fortran 77 subroutines for linear algebra
 
+LIB_DEPENDS=    blas.1:${PORTSDIR}/math/blas
+
+CONFLICTS=	atlas*
+
 DIST_SUBDIR=	lapack
 
 INSTALLS_SHLIB=	yes
@@ -226,17 +231,13 @@ pre-install:
 .endif
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.* ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/SRC/liblapack.* ${PREFIX}/lib
 .if !defined(NO_PROFILE)
-	${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas_p.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/SRC/liblapack_p.a ${PREFIX}/lib
 .endif
 .if ${PORTOBJFORMAT} == "elf"
-	${LN} -sf libblas.so.2 ${PREFIX}/lib/libblas.so
 	${LN} -sf liblapack.so.3 ${PREFIX}/lib/liblapack.so
 .else
-	${LN} -sf libblas.so.2.0 ${PREFIX}/lib/libblas.so
 	${LN} -sf liblapack.so.3.0 ${PREFIX}/lib/liblapack.so
 .endif
 	${INSTALL_MAN} ${WRKDIR}/blas/man/manl/*.l ${PREFIX}/man/manl
diff --git a/math/lapack/files/patch-ad b/math/lapack/files/patch-ad
deleted file mode 100644
index d88b6f107fd7..000000000000
--- a/math/lapack/files/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-*** BLAS/SRC/zrotg.f~	Fri Oct 30 21:09:39 1992
---- BLAS/SRC/zrotg.f	Mon Jul  3 01:28:54 1995
-***************
-*** 10,17 ****
-           go to 20
-     10 continue
-           scale = cdabs(ca) + cdabs(cb)
-!          norm = scale*dsqrt((cdabs(ca/dcmplx(scale,0.0d0)))**2 +
-!      *                      (cdabs(cb/dcmplx(scale,0.0d0)))**2)
-           alpha = ca /cdabs(ca)
-           c = cdabs(ca) / norm
-           s = alpha * dconjg(cb) / norm
---- 10,18 ----
-           go to 20
-     10 continue
-           scale = cdabs(ca) + cdabs(cb)
-!          c = (cdabs(ca/dcmplx(scale,0.0d0)))**2 +
-!      *                      (cdabs(cb/dcmplx(scale,0.0d0)))**2
-!          norm = scale*dsqrt(c)
-           alpha = ca /cdabs(ca)
-           c = cdabs(ca) / norm
-           s = alpha * dconjg(cb) / norm
diff --git a/math/lapack/files/patch-ae b/math/lapack/files/patch-ae
deleted file mode 100644
index 7c7ca2d70d96..000000000000
--- a/math/lapack/files/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
-*** BLAS/SRC/zrotg.f~	Mon Jul  3 19:23:21 1995
---- BLAS/SRC/zrotg.f	Tue Jul  4 13:11:24 1995
-***************
-*** 3,20 ****
-        double precision c
-        double precision norm,scale
-        double complex alpha
-!       if (cdabs(ca) .ne. 0.0d0) go to 10
-           c = 0.0d0
-           s = (1.0d0,0.0d0)
-           ca = cb
-           go to 20
-     10 continue
-!          scale = cdabs(ca) + cdabs(cb)
-!          c = (cdabs(ca/dcmplx(scale,0.0d0)))**2 +
-!      *                      (cdabs(cb/dcmplx(scale,0.0d0)))**2
-           norm = scale*dsqrt(c)
-!          alpha = ca /cdabs(ca)
-!          c = cdabs(ca) / norm
-           s = alpha * dconjg(cb) / norm
-           ca = alpha * norm
-     20 continue
---- 3,20 ----
-        double precision c
-        double precision norm,scale
-        double complex alpha
-!       if (abs(ca) .ne. 0.0d0) go to 10
-           c = 0.0d0
-           s = (1.0d0,0.0d0)
-           ca = cb
-           go to 20
-     10 continue
-!          scale = abs(ca) + abs(cb)
-!          c = (abs(ca/dcmplx(scale,0.0d0)))**2 +
-!      *                      (abs(cb/dcmplx(scale,0.0d0)))**2
-           norm = scale*dsqrt(c)
-!          alpha = ca /abs(ca)
-!          c = abs(ca) / norm
-           s = alpha * dconjg(cb) / norm
-           ca = alpha * norm
-     20 continue
diff --git a/math/lapack/pkg-plist b/math/lapack/pkg-plist
index 053b446e064c..471e9a2a7f3b 100644
--- a/math/lapack/pkg-plist
+++ b/math/lapack/pkg-plist
@@ -1,7 +1,3 @@
-lib/libblas.a
-lib/libblas.so
-lib/libblas.so.2
-lib/libblas_p.a
 lib/liblapack.a
 lib/liblapack.so
 lib/liblapack.so.3
diff --git a/math/lapack/scripts/configure b/math/lapack/scripts/configure
index c11a54624c46..207c20371ff3 100644
--- a/math/lapack/scripts/configure
+++ b/math/lapack/scripts/configure
@@ -4,58 +4,6 @@ else
     LIBG2C=g2c
 fi
 
-cd $WRKSRC/BLAS/SRC || exit 1
-
-mv Makefile Makefile.old
-
-cat >Makefile <<END
-LIB=	blas
-SHLIB_MAJOR=	2
-SHLIB_MINOR=	0
-
-LDADD=	-l${LIBG2C}
-
-END
-cat >>Makefile <<'END'
-SBLAS1=	isamax.f sasum.f saxpy.f scopy.f sdot.f snrm2.f \
-	srot.f srotg.f sscal.f sswap.f
-CBLAS1 = scasum.f scnrm2.f icamax.f caxpy.f ccopy.f \
-	cdotc.f cdotu.f csscal.f crotg.f cscal.f cswap.f
-DBLAS1 = idamax.f dasum.f daxpy.f dcopy.f ddot.f dnrm2.f \
-	drot.f drotg.f dscal.f dswap.f
-ZBLAS1 = dcabs1.f dzasum.f dznrm2.f izamax.f zaxpy.f zcopy.f \
-	zdotc.f zdotu.f zdscal.f zrotg.f zscal.f zswap.f
-
-ALLBLAS  = lsame.f xerbla.f
-
-SBLAS2 = sgemv.f sgbmv.f ssymv.f ssbmv.f sspmv.f \
-	strmv.f stbmv.f stpmv.f strsv.f stbsv.f stpsv.f \
-	sger.f ssyr.f sspr.f ssyr2.f sspr2.f
-CBLAS2 = cgemv.f cgbmv.f chemv.f chbmv.f chpmv.f \
-	ctrmv.f ctbmv.f ctpmv.f ctrsv.f ctbsv.f ctpsv.f \
-	cgerc.f cgeru.f cher.f chpr.f cher2.f chpr2.f
-DBLAS2 = dgemv.f dgbmv.f dsymv.f dsbmv.f dspmv.f \
-	dtrmv.f dtbmv.f dtpmv.f dtrsv.f dtbsv.f dtpsv.f \
-	dger.f dsyr.f dspr.f dsyr2.f dspr2.f
-ZBLAS2 = zgemv.f zgbmv.f zhemv.f zhbmv.f zhpmv.f \
-	ztrmv.f ztbmv.f ztpmv.f ztrsv.f ztbsv.f ztpsv.f \
-	zgerc.f zgeru.f zher.f zhpr.f zher2.f zhpr2.f
-
-SBLAS3 = sgemm.f ssymm.f ssyrk.f ssyr2k.f strmm.f strsm.f 
-CBLAS3 = cgemm.f csymm.f csyrk.f csyr2k.f ctrmm.f ctrsm.f \
-	chemm.f cherk.f cher2k.f
-DBLAS3 = dgemm.f dsymm.f dsyrk.f dsyr2k.f dtrmm.f dtrsm.f
-ZBLAS3 = zgemm.f zsymm.f zsyrk.f zsyr2k.f ztrmm.f ztrsm.f \
-	zhemm.f zherk.f zher2k.f
-
-SRCS= 	$(ALLBLAS) $(SBLAS1) $(SBLAS2) $(SBLAS3) \
-	$(DBLAS1) $(DBLAS2) $(DBLAS3) \
-	$(CBLAS1) $(CBLAS2) $(CBLAS3) \
-	$(ZBLAS1) $(ZBLAS2) $(ZBLAS3)
-
-.include <bsd.lib.mk>
-END
-
 cd $WRKSRC/SRC || exit 1
 mv Makefile Makefile.old