Changes 3.1.1:

* Add blas routines so that the blas provided is complete
* Provide 5 flavours of SECOND and DSECND
* Bug fixes

7 files changed, 66 insertions, 74 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index ab45ed23f2b..fdd8cb76372 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/12/02 11:20:53 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.23 2007/12/10 17:50:31 adam Exp $
 
-DISTNAME=	lapack
-PKGNAME=	lapack-20010201
-PKGREVISION=	4
+DISTNAME=	lapack-lite-3.1.1
+PKGNAME=	lapack-3.1.1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/lapack/			\
 		ftp://netlib.no/netlib/lapack/			\
@@ -16,8 +14,6 @@ COMMENT=	Linear Algebra PACKage
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/LAPACK
-DIST_SUBDIR=		lapack-20010201
 USE_LANGUAGES=		c fortran
 USE_LIBTOOL=		YES
 BUILD_TARGET=		lapacklib
diff --git a/math/lapack/buildlink3.mk b/math/lapack/buildlink3.mk
index c5b695423a2..bc804754892 100644
--- a/math/lapack/buildlink3.mk
+++ b/math/lapack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/12/10 17:50:31 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LAPACK_BUILDLINK3_MK:=	${LAPACK_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	lapack
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lapack
 
 .if !empty(LAPACK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.lapack+=	lapack>=20010201nb1
-BUILDLINK_ABI_DEPENDS.lapack+=	lapack>=20010201nb2
+BUILDLINK_API_DEPENDS.lapack+=	lapack>=3.1.1
+BUILDLINK_ABI_DEPENDS.lapack+=	lapack>=3.1.1
 BUILDLINK_PKGSRCDIR.lapack?=	../../math/lapack
 .endif	# LAPACK_BUILDLINK3_MK
 
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index afd345865fb..e01b1d94921 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 12:06:55 agc Exp $
+$NetBSD: distinfo,v 1.10 2007/12/10 17:50:31 adam Exp $
 
-SHA1 (lapack-20010201/lapack.tgz) = 47d85508d87d60e32b613ef0c951d0be4bf10e72
-RMD160 (lapack-20010201/lapack.tgz) = 630f9d7b4b37b0d39bccd4816198271b7e9e0cce
-Size (lapack-20010201/lapack.tgz) = 4991992 bytes
-SHA1 (patch-aa) = cad0f70bf4f738ea7c72d87abc8681d78cb55f02
-SHA1 (patch-ab) = 397cd0c42776287040cf258ac5eb526a869790d9
+SHA1 (lapack-lite-3.1.1.tgz) = 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5
+RMD160 (lapack-lite-3.1.1.tgz) = d81baafd1f0f9859d9f75ac9b658f743544b5f5b
+Size (lapack-lite-3.1.1.tgz) = 5332509 bytes
+SHA1 (patch-aa) = 55aa7680024f2071d83f714bdaf3525dcd2e41ad
+SHA1 (patch-ab) = fd5989eaafc622f29284759f538ccc0f11dfe624
+SHA1 (patch-ac) = 649f7e40142936af49c8c9dbec376bdd1a11b05a
+SHA1 (patch-ad) = e727bd3e83351f03c3a6cf2b8d5f33d5cbbc37da
diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa
index 19fdf96f6b3..fcfa25f6172 100644
--- a/math/lapack/patches/patch-aa
+++ b/math/lapack/patches/patch-aa
@@ -1,58 +1,25 @@
-$NetBSD: patch-aa,v 1.4 2005/01/03 15:33:55 wennmach Exp $
+$NetBSD: patch-aa,v 1.5 2007/12/10 17:50:31 adam Exp $
 
-Enable all routines (single & double precision, single and double
-complex, auxilary routines in the "all" target. Enable libtool.
-
---- SRC/Makefile.orig	1999-11-04 20:26:09.000000000 +0100
-+++ SRC/Makefile	2004-12-23 09:22:31.000000000 +0100
-@@ -1,4 +1,4 @@
--include ../make.inc
-+#include ../make.inc
- 
- #######################################################################
- #  This is the makefile to create a library for LAPACK.
-@@ -277,27 +277,11 @@
-    zunmtr.o zupgtr.o \
-    zupmtr.o izmax1.o dzsum1.o
+--- SRC/Makefile.orig	2007-02-26 19:20:07.000000000 +0100
++++ SRC/Makefile
+@@ -294,8 +294,8 @@ ALLOBJ=$(SLASRC) $(DLASRC) $(CLASRC) $(Z
+ 	$(ALLAUX)
  
--all: single complex double complex16
--
--single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
--	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
--	$(SCLAUX)
--	$(RANLIB) ../$(LAPACKLIB)
--
--complex: $(CLASRC) $(ALLAUX) $(SCLAUX)
--	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
--	$(SCLAUX)
--	$(RANLIB) ../$(LAPACKLIB)
--
--double: $(DLASRC) $(ALLAUX) $(DZLAUX)
--	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
--	$(DZLAUX)
--	$(RANLIB) ../$(LAPACKLIB)
--
--complex16: $(ZLASRC) $(ALLAUX) $(DZLAUX)
--	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
--	$(DZLAUX)
--	$(RANLIB) ../$(LAPACKLIB)
-+all: $(ALLAUX) $(SCLAUX) $(DZLAUX) $(SLASRC) $(CLASRC) $(DLASRC) $(ZLASRC)
-+	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la            \
-+	$(ALLAUX:.o=.lo) $(SCLAUX:.o=.lo) $(DZLAUX:.o=.lo) $(SLASRC:.o=.lo) \
-+	$(DLASRC:.o=.lo) $(CLASRC:.o=.lo) $(ZLASRC:.o=.lo)                  \
-+	-rpath ${PREFIX}/lib -version-info 3:0
+ ../$(LAPACKLIB): $(ALLOBJ)
+-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../$(LAPACKLIB) \
++	$(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 3:0
  
- $(ALLAUX): $(FRC)
- $(SCLAUX): $(FRC)
-@@ -313,10 +297,6 @@
- clean:
+ single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
+ 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
+@@ -332,8 +332,6 @@ clean:
  	rm -f *.o
  
--slamch.o: slamch.f
--	$(FORTRAN) $(NOOPT) -c $<
--dlamch.o: dlamch.f
--	$(FORTRAN) $(NOOPT) -c $<
- 
  .f.o: 
--	$(FORTRAN) $(OPTS) -c $<
+-	$(FORTRAN) $(OPTS) -c $< -o $@
 +	${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $<
+ 
+-slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+-dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+ 
diff --git a/math/lapack/patches/patch-ab b/math/lapack/patches/patch-ab
index a9a7f49c13d..4542af0ac7d 100644
--- a/math/lapack/patches/patch-ab
+++ b/math/lapack/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2005/01/03 15:38:05 wennmach Exp $
+$NetBSD: patch-ab,v 1.6 2007/12/10 17:50:31 adam Exp $
 
-Do not include boilerplate make.inc.
-
---- Makefile.orig	2004-12-23 09:35:14.000000000 +0100
-+++ Makefile	2004-12-23 09:36:02.000000000 +0100
+--- Makefile.orig	2007-02-22 22:55:00.000000000 +0100
++++ Makefile
 @@ -4,7 +4,7 @@
- #  June 30, 1999
+ #  February 2007
  #
  
 -include make.inc
 +#include make.inc
  
- all: install lib testing blas_testing timing blas_timing
+ all: lapack_install lib lapack_testing blas_testing
  
diff --git a/math/lapack/patches/patch-ac b/math/lapack/patches/patch-ac
new file mode 100644
index 00000000000..1da198289aa
--- /dev/null
+++ b/math/lapack/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2007/12/10 17:50:31 adam Exp $
+
+--- /dev/null	2007-11-22 18:29:57.000000000 +0100
++++ make.inc
+@@ -0,0 +1,10 @@
++SHELL=		/bin/sh
++PLAT=		_${MACHINE}
++FORTRAN=	${FC}
++OPTS=		${FFLAGS}
++DRVOPTS=	$(OPTS)
++NOOPT=
++LOADER=		${FC}
++LOADOPTS=
++TIMER=		EXT_ETIME
++LAPACKLIB=	liblapack.la
diff --git a/math/lapack/patches/patch-ad b/math/lapack/patches/patch-ad
new file mode 100644
index 00000000000..94f252f64d5
--- /dev/null
+++ b/math/lapack/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2007/12/10 17:50:31 adam Exp $
+
+--- INSTALL/Makefile.orig	2007-11-22 18:51:41.000000000 +0100
++++ INSTALL/Makefile
+@@ -29,7 +29,6 @@ testversion: ilaver.o LAPACK_version.o
+ clean:
+ 	rm -f *.o
+ 
+-slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+-dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+ 
+-.f.o: ; $(FORTRAN) $(OPTS) -c $< -o $@
++.f.o:
++	${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $<