7 files changed, 45 insertions, 60 deletions

diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 24670bff1398..d18bffaefa59 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -6,28 +6,42 @@
 #
 
 PORTNAME=	superlu
-PORTVERSION=	2.0.20030221
+PORTVERSION=	2.0.20030603
 CATEGORIES=	math
-MASTER_SITES=	http://www.nersc.gov/~xiaoye/SuperLU/
+MASTER_SITES=	http://www.nersc.gov/~xiaoye/SuperLU/ \
+		http://www.nersc.gov/~xiaoye/
 DISTNAME=	${PORTNAME}_2.0
+.ifndef NOPORTDOCS
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} superlu_ug.ps.gz SLU_general.ps.gz simax95.ps.gz
+.endif
+DIST_SUBDIR=	superlu
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A library of routines for performing sparse factorization
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libblas.a:${PORTSDIR}/math/blas
+BUILD_DEPENDS=	${LOCALBASE}/lib/libf77blas.a:${PORTSDIR}/math/atlas
 
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/SuperLU
 ALL_TARGET=	superlulib
-#
-#	NOTE:	The Matlab interface was not built.
-#
+
+BLAS_LIBS=	${LOCALBASE}/lib/libf77blas.a ${LOCALBASE}/lib/libatlas.a
+
+post-patch:
+	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+${BLAS_LIBS}+' \
+	${WRKSRC}/make.inc
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsuperlu.* ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/SRC/supermatrix.h ${PREFIX}/include
+	@${MKDIR} ${PREFIX}/include/superlu
+	${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${PREFIX}/include/superlu
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/SuperLU
-	${INSTALL_DATA} ${WRKSRC}/INSTALL/*.ps ${PREFIX}/share/doc/SuperLU
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL/*.ps ${DOCSDIR}
+	${GZIP_CMD} ${DOCSDIR}/*.ps
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/SLU_general.ps.gz ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax95.ps.gz ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/superlu/distinfo b/math/superlu/distinfo
index b80c58ffb29a..9a58ad9bb9c1 100644
--- a/math/superlu/distinfo
+++ b/math/superlu/distinfo
@@ -1 +1,4 @@
-MD5 (superlu_2.0.tar.gz) = bab0e709aa2f8c09a8adca7b4bb69c44
+MD5 (superlu/superlu_2.0.tar.gz) = bab0e709aa2f8c09a8adca7b4bb69c44
+MD5 (superlu/superlu_ug.ps.gz) = 90584bce50268ad36b34577152974a0f
+MD5 (superlu/SLU_general.ps.gz) = c51b5e8149c8fe3e46b5e7da2c0f819b
+MD5 (superlu/simax95.ps.gz) = a2d176cbf56fe4a922cfec9a3e2546b0
diff --git a/math/superlu/files/patch-ac b/math/superlu/files/patch-SRC+sp_coletree.c
index f0a53b9b793e..f0a53b9b793e 100644
--- a/math/superlu/files/patch-ac
+++ b/math/superlu/files/patch-SRC+sp_coletree.c
diff --git a/math/superlu/files/patch-ab b/math/superlu/files/patch-SRC+util.h
index 991672c33292..991672c33292 100644
--- a/math/superlu/files/patch-ab
+++ b/math/superlu/files/patch-SRC+util.h
diff --git a/math/superlu/files/patch-aa b/math/superlu/files/patch-aa
deleted file mode 100644
index 49d316a59a86..000000000000
--- a/math/superlu/files/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
---- make.inc.orig	Tue Feb 15 13:29:45 2000
-+++ make.inc	Sun Oct 15 18:11:48 2000
-@@ -16,14 +16,14 @@
- #
- #  The machine (platform) identifier to append to the library names
- #
--PLAT = _solaris
-+#PLAT =
- 
- #
- #  The name of the libraries to be created/linked to
- #
- TMGLIB       = tmglib$(PLAT).a
--SUPERLULIB   = superlu$(PLAT).a
--BLASLIB      = ../blas$(PLAT).a
-+SUPERLULIB   = libsuperlu$(PLAT).a
-+BLASLIB      = ${LOCALBASE}/lib/libblas$(PLAT).a
- 
- #
- #  The archiver and the flag(s) to use when building archive (library)
-@@ -33,12 +33,12 @@
- ARCHFLAGS    = cr
- RANLIB       = ranlib
- 
--CC           = cc
--CFLAGS       = -xO3 -xcg92
--#CFLAGS       = -Wall -O2 
--FORTRAN	     = f77
--FFLAGS       = -O
--LOADER       = cc
-+CC           ?= cc
-+#CFLAGS       = -xO3 -xcg92
-+CFLAGS       ?= -Wall -O2 
-+FORTRAN	     = ${FC}
-+FFLAGS       ?= -O
-+LOADER       = ${CC}
- LOADOPTS     = #-xO3
- 
- #
-@@ -48,4 +48,4 @@
- #
- # The directory in which Matlab is installed
- #
--MATLAB	     = /usr/sww/matlab
-+MATLAB	     = ${LOCALBASE}/matlab
diff --git a/math/superlu/pkg-descr b/math/superlu/pkg-descr
index 9a98551b86a1..51f1af7e5fe7 100644
--- a/math/superlu/pkg-descr
+++ b/math/superlu/pkg-descr
@@ -1,4 +1,3 @@
-
 			SuperLU (Version 2.0)
 			=====================
 
@@ -22,3 +21,4 @@ WWW: http://www.nersc.gov/~xiaoye/SuperLU/
 Authors:	Jim Demmel      demmel@cs.berkeley.edu
 		John Gilbert    gilbert@parc.xerox.com
 		Xiaoye S. Li    xiaoye@cs.berkeley.edu
+NOTE: This library has to be linked with BLAS or a compatible library.
diff --git a/math/superlu/pkg-plist b/math/superlu/pkg-plist
index 4b9cd2cf7965..9365c9353b5b 100644
--- a/math/superlu/pkg-plist
+++ b/math/superlu/pkg-plist
@@ -1,4 +1,17 @@
-include/supermatrix.h                                                          
+include/superlu/Cnames.h
+include/superlu/colamd.h
+include/superlu/csp_defs.h
+include/superlu/dcomplex.h
+include/superlu/dsp_defs.h
+include/superlu/scomplex.h
+include/superlu/ssp_defs.h
+include/superlu/supermatrix.h
+include/superlu/util.h
+include/superlu/zsp_defs.h
 lib/libsuperlu.a
-%%PORTDOCS%%share/doc/SuperLU/ug.ps
-%%PORTDOCS%%@dirrm share/doc/SuperLU
+@dirrm include/superlu
+%%PORTDOCS%%share/doc/superlu/SLU_general.ps.gz
+%%PORTDOCS%%share/doc/superlu/simax95.ps.gz
+%%PORTDOCS%%share/doc/superlu/ug.ps.gz
+%%PORTDOCS%%@dirrm share/doc/superlu
+