* Update to version 2.2.1.

* Fixed MASTER_SITES
* Revised pkg/DESCR

PR:		15502
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

3 files changed, 11 insertions, 37 deletions

diff --git a/math/umfpack/Makefile b/math/umfpack/Makefile
index 99918d6f0fec..113039c9d3f2 100644
--- a/math/umfpack/Makefile
+++ b/math/umfpack/Makefile
@@ -1,29 +1,27 @@
 # New ports collection makefile for:	UMFPACK
-# Version required:	2.2
-# Date created:         5 Nov 97
-# Whom:                 Pedro Giffuni <giffunip@asme.org>
+# Version required:	2.2.1
+# Date created:		5 Nov 97
+# Whom:			Pedro Giffuni <giffunip@asme.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	umfpack2.2
-PKGNAME=	umfpack-2.2
+DISTNAME=	UMFPACK2.2.1
+PKGNAME=	umfpack-2.2.1
 CATEGORIES=	math
-MASTER_SITES=	http://netlib.bell-labs.com/netlib/linalg/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.cise.ufl.edu/pub/faculty/davis/umfpack/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libblas.a:${PORTSDIR}/math/blas
+BUILD_DEPENDS=	${LOCALBASE}/lib/libblas.a:${PORTSDIR}/math/blas
 
 NO_CDROM=	'Must not be sold'
-WRKSRC=         ${WRKDIR}/UMFPACK2.2
 ALL_TARGET=	libumfpack.a
 
 do-install:
-	$(INSTALL_DATA) ${WRKSRC}/libumfpack.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libumfpack.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/umfpack
+	@${MKDIR} ${PREFIX}/share/doc/umfpack
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/umfpack
 	${GZIP_CMD} ${PREFIX}/share/doc/umfpack/README
 .endif
diff --git a/math/umfpack/distinfo b/math/umfpack/distinfo
index 468d726288e5..811dd908072f 100644
--- a/math/umfpack/distinfo
+++ b/math/umfpack/distinfo
@@ -1 +1 @@
-MD5 (umfpack2.2.tgz) = 37bd9386b2f06a48a76559af600969db
+MD5 (UMFPACK2.2.1.tar.gz) = b8668f68715929be9c7e30400c1cd6f7
diff --git a/math/umfpack/pkg-descr b/math/umfpack/pkg-descr
index 1668614f29a1..6c105e99b54e 100644
--- a/math/umfpack/pkg-descr
+++ b/math/umfpack/pkg-descr
@@ -9,28 +9,4 @@ estimates, can be performed.  Single and double precision, complex, and
 complex double precision (complex*16) routines are available.  (Note that
 complex*16 is not ANSI Fortran-77, but is a common extension to it).
 
-For more information
---------------------
-
-For more information, see T. A. Davis and I. S. Duff, "An
-unsymmetric-pattern multifrontal method for sparse LU factorization",
-SIAM J. Matrix Analysis and Applications (to appear), also
-technical report TR-94-038, CISE Dept., Univ. of Florida,
-P.O. Box 116120, Gainesville, FL 32611-6120, USA.  The method used
-here is a modification of that method, described in T. A. Davis,
-"A combined unifrontal/multifrontal method for unsymmetric sparse
-matrices," TR-94-005, and in T. A. Davis and I. S. Duff, (same title),
-TR-95-020.  (Technical reports are available via WWW at
-http://www.cis.ufl.edu/).  The (unsymmetric) approximate degree update
-algorithm used here has been incorporated into a symmetric approximate
-minimum degree ordering algorithm, described in P. Amestoy, T. A. Davis,
-and I. S. Duff, "An approximate minimum degree ordering algorithm",
-SIAM Journal on Matrix Analysis and Applications (to appear, also TR-94-039).
-The approximate minimum degree ordering algorithm is implemented as MC47
-in the Harwell Subroutine Library (MC47 is not used in UMFPACK).
-Also take a look at our World Wide Web home pages:
-        Tim Davis:  http://www.cis.ufl.edu/~davis
-                    (also email: davis@cis.ufl.edu).
-        Iain Duff:  http://www.cis.rl.ac.uk/people/isd/contact.html
-______________
-	Timothy A. Davis and Iain S. Duff.  Copyright (C) 1997.
+WWW: http://www.cise.ufl.edu/~davis/umfpack.html