7 files changed, 55 insertions, 52 deletions

diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 545c4756bb94..145261c7e762 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:	SuperLU
-# Version required:	1.1
-# Date created:         31 Oct 97
-# Whom:                 Pedro Giffuni <giffunip@asme.org>
+# Version required:	2.0
+# Date created:		31 Oct 97
+# Whom:			Pedro Giffuni <giffunip@asme.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	superlu_1.1
-PKGNAME=	superlu-1.1
+DISTNAME=	superlu_2.0
+PKGNAME=	superlu-2.0
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.cs.berkeley.edu/pub/lapack/SuperLU/	\
-		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/cs.berkeley.edu/lapack/SuperLU/
+MASTER_SITES=	http://www.nersc.gov/~xiaoye/SuperLU/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libblas.a:${PORTSDIR}/math/blas
+BUILD_DEPENDS=	${LOCALBASE}/lib/libblas.a:${PORTSDIR}/math/blas
 
 WRKSRC=		${WRKDIR}/SuperLU
 ALL_TARGET=	superlulib
@@ -22,11 +21,12 @@ ALL_TARGET=	superlulib
 #	NOTE:	The Matlab interface was not built.
 #
 
-post-install:
-	$(INSTALL_DATA) ${WRKSRC}/libsuperlu.* ${PREFIX}/lib
-	$(INSTALL_DATA) ${WRKSRC}/SRC/supermatrix.h ${PREFIX}/include
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/libsuperlu.* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/SRC/supermatrix.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/SuperLU
+	@${MKDIR} ${PREFIX}/share/doc/SuperLU
 	${INSTALL_DATA} ${WRKSRC}/INSTALL/*.ps ${PREFIX}/share/doc/SuperLU
 .endif
+
 .include <bsd.port.mk>
diff --git a/math/superlu/distinfo b/math/superlu/distinfo
index c342e8fb6a87..9e3b8c6e9322 100644
--- a/math/superlu/distinfo
+++ b/math/superlu/distinfo
@@ -1 +1 @@
-MD5 (superlu_1.1.tar.gz) = 476515c112be637339617bc29aecade7
+MD5 (superlu_2.0.tar.gz) = 4a1b1a193bf409b76b663d94f9a2d64d
diff --git a/math/superlu/files/patch-aa b/math/superlu/files/patch-aa
index ca6dfb50de76..73e92f06ae53 100644
--- a/math/superlu/files/patch-aa
+++ b/math/superlu/files/patch-aa
@@ -1,6 +1,6 @@
---- make.inc.orig	Fri Mar 27 07:58:12 1998
-+++ make.inc	Mon May 10 01:43:38 1999
-@@ -14,14 +14,14 @@
+--- make.inc.orig	Fri Aug  6 15:10:24 1999
++++ make.inc	Thu Dec 16 04:00:37 1999
+@@ -16,14 +16,14 @@
  #
  #  The machine (platform) identifier to append to the library names
  #
@@ -14,28 +14,31 @@
 -SUPERLULIB   = superlu$(PLAT).a
 -BLASLIB      = ../blas$(PLAT).a
 +SUPERLULIB   = libsuperlu$(PLAT).a
-+BLASLIB      = $(PREFIX)/lib/libblas$(PLAT).a
++BLASLIB      = ${LOCALBASE}/lib/libblas$(PLAT).a
  
  #
  #  The archiver and the flag(s) to use when building archive (library)
-@@ -31,10 +31,10 @@
+@@ -33,12 +33,12 @@
  ARCHFLAGS    = cr
  RANLIB       = ranlib
  
--CC           = cc
--CFLAGS       = -xO3 -xcg92
--LOADER       = cc
--LOADOPTS     = -xO3
-+CC           = gcc
-+CFLAGS       = -O3
-+LOADER       = gcc
-+LOADOPTS     = -O3
+-CC           = gcc
++CC           ?= gcc
+ #CFLAGS       = -xO3 -xcg92
+-CFLAGS       = -Wall -O2 
+-FORTRAN	     = f77
+-FFLAGS       = -O
+-LOADER       = gcc
++CFLAGS       ?= -Wall -O2 
++FORTRAN	     = ${FC}
++FFLAGS       ?= -O
++LOADER       = ${CC}
+ LOADOPTS     = #-xO3
  
  #
- #  C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)
-@@ -43,4 +43,4 @@
+@@ -48,4 +48,4 @@
  #
  # The directory in which Matlab is installed
  #
 -MATLAB	     = /usr/sww/matlab
-+MATLAB	     = ${PREFIX}/matlab
++MATLAB	     = ${LOCALBASE}/matlab
diff --git a/math/superlu/files/patch-ab b/math/superlu/files/patch-ab
index 3bf013f88843..991672c33292 100644
--- a/math/superlu/files/patch-ab
+++ b/math/superlu/files/patch-ab
@@ -1,26 +1,14 @@
-*** SRC/util.h.orig	Sat Nov 22 22:25:23 1997
---- SRC/util.h	Sat Nov 22 22:29:50 1997
+*** SRC/util.h.orig	Fri Aug  6 04:21:40 1999
+--- SRC/util.h	Thu Dec 16 03:32:32 1999
 ***************
-*** 2,10 ****
-  #define __SUPERLU_UTIL
-  
-  #include <stdio.h>
-  #include <stdlib.h>
-! #include <string.h>
-  #include <malloc.h>
-  #include <assert.h>
-  
-  /* Macros */
---- 2,13 ----
-  #define __SUPERLU_UTIL
-  
+*** 4,10 ****
+--- 4,12 ----
   #include <stdio.h>
-+ #ifdef __STDC__
   #include <stdlib.h>
-! #else
+  #include <string.h>
++ #ifndef __STDC__
   #include <malloc.h>
 + #endif
-+ #include <string.h>
   #include <assert.h>
   
   /* Macros */
diff --git a/math/superlu/files/patch-ac b/math/superlu/files/patch-ac
new file mode 100644
index 000000000000..f0a53b9b793e
--- /dev/null
+++ b/math/superlu/files/patch-ac
@@ -0,0 +1,14 @@
+*** 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"
+  
diff --git a/math/superlu/pkg-descr b/math/superlu/pkg-descr
index e40a9d99a630..1bd4aecd3cd0 100644
--- a/math/superlu/pkg-descr
+++ b/math/superlu/pkg-descr
@@ -1,6 +1,6 @@
 
-			SuperLU Version 1.0
-			===================
+			SuperLU (Version 2.0)
+			=====================
 
 SuperLU contains a set of subroutines to solve a sparse linear system
 A*X=B. It uses Gaussian elimination with partial pivoting (GEPP).
@@ -19,7 +19,7 @@ for the double-precision complex version start with letter "z"
 
 			===================
 			
-WWW: http://www.cs.berkeley.edu/~xiaoye/superlu.html
+WWW: http://www.nersc.gov/~xiaoye/SuperLU/
 Authors:
         Jim Demmel      demmel@cs.berkeley.edu
         John Gilbert    gilbert@parc.xerox.com
diff --git a/math/superlu/pkg-plist b/math/superlu/pkg-plist
index 5fdc4e4128ef..512b3a8de694 100644
--- a/math/superlu/pkg-plist
+++ b/math/superlu/pkg-plist
@@ -1,6 +1,4 @@
 include/supermatrix.h                                                          
 lib/libsuperlu.a
 share/doc/SuperLU/ug.ps
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/SuperLU