Changes 3.5.0:

* added Symmetric/Hermitian LDLT factorization routines with rook pivoting algorithm
* 2-by-1 CSD to be used for tall and skinny matrix with orthonormal columns (in LAPCK 3.4.0, we already integrated CSD of a full square orthogonal matrix)
* New stopping criteria for balancing.

3 files changed, 9 insertions, 65 deletions

diff --git a/math/blas/Makefile b/math/blas/Makefile
index e171d5168d4..c7474296dc3 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,30 +1,17 @@
-# $NetBSD: Makefile,v 1.31 2013/06/03 08:04:56 tron Exp $
+# $NetBSD: Makefile,v 1.32 2014/02/28 09:39:56 adam Exp $
 
-DISTNAME=	blas
-PKGNAME=	blas-1.1
-PKGREVISION=	2
-CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_NETLIB:=blas/}
-EXTRACT_SUFX=	.tgz
+.include "../../math/lapack/Makefile.common"
 
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.netlib.org/blas/
-COMMENT=	Basic Linear Algebra Subprograms (Fortran)
+PKGNAME=	${DISTNAME:S/lapack/blas/}
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+COMMENT=	Basic Linear Algebra Subprograms (Fortran)
 
-DIST_SUBDIR=		${PKGNAME_NOREV}
-WRKSRC=			${WRKDIR}/BLAS
-USE_LANGUAGES=		c fortran
-USE_LIBTOOL=		yes
+PATCHDIR=	${.CURDIR}/../../math/lapack/patches
 
-# Pass along the major and minor of the version number as the major and
-# minor of the shared library to be built.
-#
-MAKE_ENV+=	SHLIB_MAJOR=${PKGNAME_NOREV:S/${PKGBASE}-//:C/[.].*$//}
-MAKE_ENV+=	SHLIB_MINOR=${PKGNAME_NOREV:S/${PKGBASE}-//:C/^.*[.]//}
+BUILD_TARGET=	blaslib
 
-post-extract:
-	cp -f ${FILESDIR}/Makefile.blas ${WRKSRC}/Makefile
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.la \
+		${DESTDIR}${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/blas/distinfo b/math/blas/distinfo
deleted file mode 100644
index c6fe84b8df1..00000000000
--- a/math/blas/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2008/03/07 07:14:24 jlam Exp $
-
-SHA1 (blas-1.1/blas.tgz) = 0aeca4ed45f2e5519977747ed6bcf80d1b0335d2
-RMD160 (blas-1.1/blas.tgz) = ea5c7fed5fe3dadf36023f0ee1222b5200075459
-Size (blas-1.1/blas.tgz) = 98957 bytes
diff --git a/math/blas/files/Makefile.blas b/math/blas/files/Makefile.blas
deleted file mode 100644
index d96f73b4a6c..00000000000
--- a/math/blas/files/Makefile.blas
+++ /dev/null
@@ -1,38 +0,0 @@
-prefix=	${PREFIX}
-libdir=	$(prefix)/lib
-
-OBJS=	caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o cgerc.o	\
-	cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o cher2k.o cherk.o \
-	chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o csscal.o cswap.o \
-	csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o ctpmv.o ctpsv.o	\
-	ctrmm.o ctrmv.o ctrsm.o	ctrsv.o dasum.o daxpy.o dcabs1.o	\
-	dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o dger.o dnrm2.o drot.o	\
-	drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o dspr.o	\
-	dspr2.o	dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o dsyr2k.o dsyrk.o	\
-	dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o	dtrsv.o \
-	dzasum.o dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o	\
-	sasum.o saxpy.o scabs1.o scasum.o scnrm2.o scopy.o sdot.o	\
-	sdsdot.o sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o	\
-	srotm.o srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o sswap.o	\
-	ssymm.o ssymv.o	ssyr.o ssyr2.o ssyr2k.o ssyrk.o stbmv.o stbsv.o \
-	stpmv.o	stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o	\
-	zaxpy.o	zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o	\
-	zgemm.o	zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o	\
-	zher2.o zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o \
-	zswap.o zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o	\
-	ztpsv.o ztrmm.o ztrmv.o ztrsm.o ztrsv.o
-
-all:	libblas.la
-
-.f.o:
-	${LIBTOOL} --mode=compile --tag=CC ${COMPILE.f} ${.IMPSRC}
-
-libblas.la: $(OBJS)
-	${LIBTOOL} --mode=link --tag=F77 ${FC} -o ${.TARGET} ${OBJS:.o=.lo}	\
-		-rpath $(libdir)					\
-		-version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
-
-install: libblas.la
-	${BSD_INSTALL_LIB_DIR} ${DESTDIR}$(libdir)
-	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libblas.la		\
-		${DESTDIR}$(libdir)