Update to 3.0 since the 2.0 tarball has changed.

Changes:
* Version 3.0, 10-15-03
   - add "options" and "stat" argument for the driver routines
     DGSSV/DGSSVX. This interface is more user-friendly and flexible.
   - add more examples in EXAMPLE/
   - add a "symmetric mode" with better performance when the matrix is
     symmetric, or diagonal dominant, or positive definite, or nearly so.
Also, make 'test' target do something.

4 files changed, 46 insertions, 22 deletions

diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 1cae84466cd..6e34a026be2 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:48:12 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/11 11:53:56 wiz Exp $
 
-DISTNAME=		superlu_2.0
-PKGNAME=		superlu-2.0
-PKGREVISION=		2
-WRKSRC=			${WRKDIR}/SuperLU
+DISTNAME=		superlu_3.0
+PKGNAME=		superlu-3.0
+WRKSRC=			${WRKDIR}/SuperLU_3.0
 CATEGORIES=		math
 MASTER_SITES=		http://www.nersc.gov/~xiaoye/SuperLU/
 
@@ -17,6 +16,8 @@ BLAS_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		BLAS_PREFIX=blas
 
 ALL_TARGET=		superlulib
+TEST_DIRS=		${WRKSRC}/TESTING/MATGEN ${WRKSRC}/TESTING
+TEST_TARGET=		all
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsuperlu.a ${PREFIX}/lib
diff --git a/math/superlu/distinfo b/math/superlu/distinfo
index 73717efe367..c5a91bb0032 100644
--- a/math/superlu/distinfo
+++ b/math/superlu/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/01/22 22:07:30 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2003/11/11 11:53:56 wiz Exp $
 
-SHA1 (superlu_2.0.tar.gz) = 7c36f8f6126c0e970f20d70a165088493c9a1d3c
-Size (superlu_2.0.tar.gz) = 1075823 bytes
-SHA1 (patch-aa) = bd4520f474a6bcac6e5420aa4cb7a501bb2cd8d5
+SHA1 (superlu_3.0.tar.gz) = 8c05fc06fe4e349d9945e3164fd1d3efc8fcc991
+Size (superlu_3.0.tar.gz) = 1105196 bytes
+SHA1 (patch-aa) = 196ec71f5bd05f92462e27f050a500d094d28c16
+SHA1 (patch-ab) = 568122da7d4879e967725ae15bc69b103cedddc6
diff --git a/math/superlu/patches/patch-aa b/math/superlu/patches/patch-aa
index fd97af5b5ef..adcce2518d3 100644
--- a/math/superlu/patches/patch-aa
+++ b/math/superlu/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/02 01:24:09 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/11/11 11:53:56 wiz Exp $
 
---- make.inc.orig	Tue Feb 15 21:29:45 2000
+--- make.inc.orig	Sat Oct 11 00:24:49 2003
 +++ make.inc
 @@ -16,30 +16,31 @@
  #
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/02 01:24:09 jtb Exp $
 -BLASLIB      = ../blas$(PLAT).a
 +TMGLIB       = tmglib.a
 +SUPERLULIB   = libsuperlu.a
-+BLASDEF      = -DUSE_VENDOR_BLAS
++BLASDEF	     = -DUSE_VENDOR_BLAS
 +BLASLIB      = -L${BLAS_PREFIX}/lib -lblas
  
  #
@@ -27,27 +27,27 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/02 01:24:09 jtb Exp $
 -ARCH         = ar
 -ARCHFLAGS    = cr
 -RANLIB       = ranlib
-+ARCH         = $(AR)
++ARCH         = ${AR}
 +ARCHFLAGS    = cru
 +#RANLIB       = ranlib
  
 -CC           = cc
--CFLAGS       = -xO3 -xcg92
-+# CC           = cc
-+#CFLAGS       = -xO3 -xcg92
- #CFLAGS       = -Wall -O2 
+-CFLAGS       = -g -DDEBUGlevel=1 #-xO3 -xcg92
++#CC           = cc
++#CFLAGS       = -g -DDEBUGlevel=1 #-xO3 -xcg92
+ #CFLAGS       = -Wall -g #-O2 
 -FORTRAN	     = f77
 -FFLAGS       = -O
 -LOADER       = cc
--LOADOPTS     = #-xO3
-+FORTRAN	     = $(FC)
+-LOADOPTS     = -g #-xO3
++FORTRAN	     = ${FC}
 +#FFLAGS       = -O
-+LOADER       = $(CC)
-+LOADOPTS     = $(LDFLAGS)
++LOADER       = ${CC}
++LOADOPTS     = ${LDFLAGS}
  
  #
  #  C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)
-@@ -48,4 +49,4 @@
+@@ -48,4 +49,4 @@ CDEFS        = -DAdd_
  #
  # The directory in which Matlab is installed
  #
diff --git a/math/superlu/patches/patch-ab b/math/superlu/patches/patch-ab
new file mode 100644
index 00000000000..6296722166f
--- /dev/null
+++ b/math/superlu/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2003/11/11 11:53:56 wiz Exp $
+
+--- TESTING/dtest.csh.orig	Thu Oct  2 01:27:24 2003
++++ TESTING/dtest.csh
+@@ -26,7 +26,7 @@ foreach m ($MATRICES)
+           foreach l ($LWORK)
+ 	    echo '' >> $ofile
+             echo 'n='$n 'nrhs='$s 'lwork='$l >> $ofile
+-            dtest -t "LA" -l $l -n $n -s $s >> $ofile
++            ./dtest -t "LA" -l $l -n $n -s $s >> $ofile
+           end
+         end
+       end
+@@ -40,7 +40,7 @@ foreach m ($MATRICES)
+         foreach l ($LWORK)
+ 	    echo '' >> $ofile
+             echo 'nrhs='$s 'lwork='$l >> $ofile
+-            dtest -t "SP" -s $s -l $l < ../EXAMPLE/$m >> $ofile
++            ./dtest -t "SP" -s $s -l $l < ../EXAMPLE/$m >> $ofile
+         end
+     end
+   endif