5 files changed, 23 insertions, 40 deletions

diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 941c13bf6b3c..71602b5d86e3 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	superlu
-PORTVERSION=	2.0.20030603
+PORTVERSION=	3.0.20040401
 CATEGORIES=	math
 MASTER_SITES=	http://crd.lbl.gov/~xiaoye/SuperLU/ \
 		http://crd.lbl.gov/~xiaoye/
-DISTNAME=	${PORTNAME}_2.0
+DISTNAME=	${PORTNAME}_3.0
 .ifndef NOPORTDOCS
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} superlu_ug.ps.gz SLU_general.ps.gz simax95.ps.gz
 .endif
@@ -23,7 +23,7 @@ COMMENT=	A library of routines for performing sparse factorization
 BUILD_DEPENDS=	${LOCALBASE}/lib/libf77blas.a:${PORTSDIR}/math/atlas
 
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/SuperLU
+WRKSRC=		${WRKDIR}/SuperLU_3.0
 ALL_TARGET=	superlulib
 
 BLAS_LIBS=	${LOCALBASE}/lib/libf77blas.a ${LOCALBASE}/lib/libatlas.a
diff --git a/math/superlu/distinfo b/math/superlu/distinfo
index 8bcf05b789b6..19a757a1cbe6 100644
--- a/math/superlu/distinfo
+++ b/math/superlu/distinfo
@@ -1,5 +1,5 @@
-MD5 (superlu/superlu_2.0.tar.gz) = b3a1001b01b362622449aa609d3f9710
-SIZE (superlu/superlu_2.0.tar.gz) = 1084280
+MD5 (superlu/superlu_3.0.tar.gz) = 86753540ab0ebd7ece2dc03d429ffece
+SIZE (superlu/superlu_3.0.tar.gz) = 1343846
 MD5 (superlu/superlu_ug.ps.gz) = f5c45a16733de9a7c8889abc8eda3798
 SIZE (superlu/superlu_ug.ps.gz) = 204230
 MD5 (superlu/SLU_general.ps.gz) = c51b5e8149c8fe3e46b5e7da2c0f819b
diff --git a/math/superlu/files/patch-SRC+sp_coletree.c b/math/superlu/files/patch-SRC+sp_coletree.c
index f0a53b9b793e..d5021065ef2c 100644
--- a/math/superlu/files/patch-SRC+sp_coletree.c
+++ b/math/superlu/files/patch-SRC+sp_coletree.c
@@ -1,14 +1,12 @@
-*** SRC/sp_coletree.c.orig	Fri Aug  6 05:31:22 1999
---- SRC/sp_coletree.c	Thu Dec 16 03:29:12 1999
-***************
-*** 2,8 ****
---- 2,10 ----
-  /*  Elimination tree computation and layout routines */
-  
-  #include <stdio.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
-  #include <stdlib.h>
-  #include "util.h"
-  
+--- SRC/sp_coletree.c.orig	Fri Sep 26 08:22:05 2003
++++ SRC/sp_coletree.c	Thu Apr  1 20:29:10 2004
+@@ -2,6 +2,9 @@
+ /*  Elimination tree computation and layout routines */
+ 
+ #include <stdio.h>
++#ifndef __STDC__
++#include <malloc.h>
++#endif
+ #include <stdlib.h>
+ #include "dsp_defs.h"
+ 
diff --git a/math/superlu/files/patch-SRC+util.h b/math/superlu/files/patch-SRC+util.h
deleted file mode 100644
index 991672c33292..000000000000
--- a/math/superlu/files/patch-SRC+util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-*** SRC/util.h.orig	Fri Aug  6 04:21:40 1999
---- SRC/util.h	Thu Dec 16 03:32:32 1999
-***************
-*** 4,10 ****
---- 4,12 ----
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
-  #include <assert.h>
-  
-  /* Macros */
diff --git a/math/superlu/files/patch-make.inc b/math/superlu/files/patch-make.inc
index 7cf74c43a602..f26f48e7a13c 100644
--- a/math/superlu/files/patch-make.inc
+++ b/math/superlu/files/patch-make.inc
@@ -1,5 +1,5 @@
---- make.inc.orig	Wed Sep  4 06:02:16 2002
-+++ make.inc	Wed Jun 11 08:48:52 2003
+--- make.inc.orig	Thu Jan 22 09:45:17 2004
++++ make.inc	Thu Apr  1 20:34:07 2004
 @@ -16,14 +16,15 @@
  #
  #  The machine (platform) identifier to append to the library names
@@ -20,23 +20,22 @@
  
  #
  #  The archiver and the flag(s) to use when building archive (library)
-@@ -33,13 +34,12 @@
+@@ -33,12 +34,12 @@
  ARCHFLAGS    = cr
  RANLIB       = ranlib
  
 -CC           = cc
 -CFLAGS       = -xO3 -xcg92
--#CFLAGS       = -Wall -O2 
 -FORTRAN	     = f77
 -FFLAGS       = -O
 -LOADER       = cc
--LOADOPTS     = #-xO3
+-LOADOPTS     = -xO3
 +CC           = %%CC%%
 +CFLAGS       = %%CFLAGS%%
 +FORTRAN	     = %%FC%%
 +FFLAGS       = %%FFLAGS%%
-+LOADER       = ${CC}
-+#LOADOPTS     = -O2
++LOADER       = %%CC%%
++LOADOPTS     = 
  
  #
  #  C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)