Make liblapack contain routines for all types (real, double, complex16,

and complex). Due to an error in the previous patch-aa, liblapack only
contained the complex16 routines.
Bump PKGREVISION.

3 files changed, 31 insertions, 29 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 07728b90ce7..2c8300f0a0d 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2004/12/03 15:15:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/22 10:17:28 wennmach Exp $
 #
 
 DISTNAME=	lapack
 PKGNAME=	lapack-20010201
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/lapack/			\
 		ftp://netlib.bell-labs.com/netlib/lapack/	\
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index 900183aa0b0..e6e56674089 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2003/12/04 10:32:30 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/12/22 10:17:28 wennmach Exp $
 
 SHA1 (lapack-20010201/lapack.tgz) = 47d85508d87d60e32b613ef0c951d0be4bf10e72
 Size (lapack-20010201/lapack.tgz) = 4991992 bytes
-SHA1 (patch-aa) = 234db1695338dd0c6178949534396700e9e557d5
+SHA1 (patch-aa) = c5599ed209509fdd37f8041de3e49c1da283ac66
diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa
index 8cb8adea731..8a9c1bab031 100644
--- a/math/lapack/patches/patch-aa
+++ b/math/lapack/patches/patch-aa
@@ -1,45 +1,47 @@
-$NetBSD: patch-aa,v 1.2 2003/12/04 10:32:30 adam Exp $
+$NetBSD: patch-aa,v 1.3 2004/12/22 10:17:28 wennmach Exp $
 
---- SRC/Makefile.orig	1999-11-04 20:26:09.000000000 +0100
-+++ SRC/Makefile
-@@ -280,24 +280,24 @@ ZLASRC = \
- all: single complex double complex16
+--- SRC/Makefile.orig	Thu Nov  4 20:26:09 1999
++++ SRC/Makefile	Wed Dec 22 10:52:43 2004
+@@ -1,4 +1,4 @@
+-include ../make.inc
++#include ../make.inc
  
- single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
+ #######################################################################
+ #  This is the makefile to create a library for LAPACK.
+@@ -277,27 +277,11 @@
+    zunmtr.o zupgtr.o \
+    zupmtr.o izmax1.o dzsum1.o
+ 
+-all: single complex double complex16
+-
+-single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
 -	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
 -	$(SCLAUX)
 -	$(RANLIB) ../$(LAPACKLIB)
-+	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la	\
-+		$(SLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(SCLAUX:.o=.lo)	\
-+		-rpath ${PREFIX}/lib -version-info 3:0
- 
- complex: $(CLASRC) $(ALLAUX) $(SCLAUX)
+-
+-complex: $(CLASRC) $(ALLAUX) $(SCLAUX)
 -	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
 -	$(SCLAUX)
 -	$(RANLIB) ../$(LAPACKLIB)
-+	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la	\
-+		$(CLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(SCLAUX:.o=.lo)	\
-+		-rpath ${PREFIX}/lib -version-info 3:0
- 
- double: $(DLASRC) $(ALLAUX) $(DZLAUX)
+-
+-double: $(DLASRC) $(ALLAUX) $(DZLAUX)
 -	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
 -	$(DZLAUX)
 -	$(RANLIB) ../$(LAPACKLIB)
-+	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la	\
-+		$(DLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(DZLAUX:.o=.lo)	\
-+		-rpath ${PREFIX}/lib -version-info 3:0
- 
- complex16: $(ZLASRC) $(ALLAUX) $(DZLAUX)
+-
+-complex16: $(ZLASRC) $(ALLAUX) $(DZLAUX)
 -	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
 -	$(DZLAUX)
 -	$(RANLIB) ../$(LAPACKLIB)
-+	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la	\
-+		$(ZLASRC:.o=.lo) $(ALLAUX:.o=.lo) $(DZLAUX:.o=.lo)	\
-+		-rpath ${PREFIX}/lib -version-info 3:0
++all: $(ALLAUX) $(SCLAUX) $(SLASRC) $(CLASRC) $(DLASRC) $(ZLASRC)
++	${LIBTOOL} --mode=link --tag=CC ${FC} -o ../liblapack.la \
++	$(ALLAUX:.o=.lo) $(SCLAUX:.o=.lo) $(SLASRC:.o=.lo)       \
++	$(DLASRC:.o=.lo) $(CLASRC:.o=.lo) $(ZLASRC:.o=.lo)       \
++	-rpath ${PREFIX}/lib -version-info 3:0
  
  $(ALLAUX): $(FRC)
  $(SCLAUX): $(FRC)
-@@ -313,10 +313,6 @@ FRC:
+@@ -313,10 +297,6 @@
  clean:
  	rm -f *.o