Update math/blas to version 1.1. Changes from version 1.0 include:

- The addition of several new routines for complex number operations.

- Minor changes in the function implementations to use the new
  operations.

+ Support user-destdir installation.

+ Move Makefile for building the BLAS library from patch-aa into
  files/Makefile.blas.  It's simpler to edit this file than to create
  new patches.

4 files changed, 56 insertions, 51 deletions

diff --git a/math/blas/Makefile b/math/blas/Makefile
index d1cedc2f21a..9de386e52b3 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/12/02 12:14:15 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/07 07:14:24 jlam Exp $
 #
 
 DISTNAME=	blas
-PKGNAME=	blas-1.0
-PKGREVISION=	3
+PKGNAME=	blas-1.1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/blas/
 EXTRACT_SUFX=	.tgz
@@ -13,11 +12,20 @@ HOMEPAGE=	http://www.netlib.org/blas/
 COMMENT=	Basic Linear Algebra Subprograms (Fortran)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}
+DIST_SUBDIR=		${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/BLAS
 USE_LANGUAGES=		c fortran
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
 
-INSTALLATION_DIRS=	lib
+# 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/^.*[.]//}
+
+post-extract:
+	cp -f ${FILESDIR}/Makefile.blas ${WRKSRC}/Makefile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/blas/distinfo b/math/blas/distinfo
index 653faaa5b23..c6fe84b8df1 100644
--- a/math/blas/distinfo
+++ b/math/blas/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/09/05 13:22:00 adam Exp $
+$NetBSD: distinfo,v 1.6 2008/03/07 07:14:24 jlam Exp $
 
-SHA1 (blas.tgz) = ab73fcc69d0c74888aea67a698f60cd91b0d3af2
-RMD160 (blas.tgz) = d2cea3ae6156b6f583fae5e590695ffb306abb80
-Size (blas.tgz) = 94981 bytes
-SHA1 (patch-aa) = 01fb22077a0448bb7488d07aaf54d2627c812bf4
+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
new file mode 100644
index 00000000000..c4ae5188b59
--- /dev/null
+++ b/math/blas/files/Makefile.blas
@@ -0,0 +1,38 @@
+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 ${CC} -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)
diff --git a/math/blas/patches/patch-aa b/math/blas/patches/patch-aa
deleted file mode 100644
index 5cce16b728e..00000000000
--- a/math/blas/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/05 13:22:00 adam Exp $
-
---- /dev/null	2003-11-20 10:35:58.000000000 +0100
-+++ Makefile
-@@ -0,0 +1,35 @@
-+LIB	= blas
-+
-+all:	lib$(LIB).a
-+
-+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 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
-+
-+.f.o:
-+	${LIBTOOL} --mode=compile --tag=CC ${COMPILE.f} ${.IMPSRC}
-+
-+lib$(LIB).a: $(OBJS)
-+	${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} \
-+		-rpath ${PREFIX}/lib -version-info 1:0
-+
-+install: lib$(LIB).a
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${.ALLSRC:.a=.la} \
-+		${PREFIX}/lib