Upgrade to to version 4.4.

PR:		ports/79004
Submitted by:	Pedro F. Giffuni

5 files changed, 46 insertions, 52 deletions

diff --git a/math/umfpack/Makefile b/math/umfpack/Makefile
index 78b40ffd4c30..6371cda032f3 100644
--- a/math/umfpack/Makefile
+++ b/math/umfpack/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	umfpack
-PORTVERSION=	4.3
+PORTVERSION=	4.4
 CATEGORIES=	math
 MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/umfpack/v${PORTVERSION}/
 DISTNAME=	UMFPACKv${PORTVERSION}
@@ -20,7 +20,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/UMFPACK
 ALL_TARGET=	lib
 
 post-extract:
-	${CP} ${FILESDIR}/Make.freebsd ${WRKDIR}/${DISTNAME}/AMD/Make
+	${CP}	${WRKDIR}/${DISTNAME}/AMD/Make/Make.linux	\
+		${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Lib/libamd.a ${PREFIX}/lib
@@ -34,8 +35,8 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Doc/*.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${GZIP_CMD} ${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
+	${GZIP_CMD} ${DOCSDIR}/README.txt
 	${INSTALL_DATA} ${WRKSRC}/Doc/*.pdf  ${DOCSDIR}
 	@${FIND} ${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/math/umfpack/distinfo b/math/umfpack/distinfo
index 1ca836b2b11b..9bcf3f103744 100644
--- a/math/umfpack/distinfo
+++ b/math/umfpack/distinfo
@@ -1,2 +1,2 @@
-MD5 (UMFPACKv4.3.tar.gz) = f9d753fbd1922ec7f3d04157970182ab
-SIZE (UMFPACKv4.3.tar.gz) = 1195462
+MD5 (UMFPACKv4.4.tar.gz) = 6f4de37ec711c406a50f5d6760ea9f06
+SIZE (UMFPACKv4.4.tar.gz) = 1226870
diff --git a/math/umfpack/files/Make.freebsd b/math/umfpack/files/Make.freebsd
deleted file mode 100644
index 8548fa0f1b89..000000000000
--- a/math/umfpack/files/Make.freebsd
+++ /dev/null
@@ -1,45 +0,0 @@
-#-------------------------------------------------------------------------------
-# FreeBSD configuration (for both AMD and UMFPACK)
-#-------------------------------------------------------------------------------
-
-# Using GNU gcc and f77 compilers:
-CC ?= gcc
-CFLAGS ?= -O3 -fPIC
-
-# Using Intel's icc and ifc compilers:
-# F77 = ifc
-# CC = icc
-# CFLAGS = -ansi -O3 -ip -tpp7 -xW -vec_report0
-# CFLAGS = -pg -g
-
-# Using gcc compiler with picky tests
-# CC = gcc
-# CFLAGS = -ansi -pedantic -W -Wall -Wno-parentheses -Wshadow -Wcast-align -Winline -Wstrict-prototypes -Wno-unknown-pragmas -O3 -fPIC
-
-# for gcc and gcov:
-# CC = gcc
-# CFLAGS = -pg -ftest-coverage -fprofile-arcs
-
-# Running splint
-# CC = - splint
-# CFLAGS = -weak -fixedformalarray -badflag -fileextensions +relaxtypes +posixlib -unrecog
-
-#-------------------------------------------------------------------------------
-# BLAS options (for UMFPACK only)
-#-------------------------------------------------------------------------------
-
-# 1: with no BLAS (this will be slow)
-# CONFIG = -DNBLAS
-# LIB = -lm
-
-# 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
-CONFIG = -DCBLAS -I../ATLAS/include -I${LOCALBASE}/include
-LIB = -L${LOCALBASE}/lib -lcblas -latlas -lm
-
-# 3: with Fortran interface to the ATLAS BLAS
-# CONFIG = -I${LOCALBASE}/include
-# LIB = -L${LOCALBASE}/lib -lf77blas -latlas -lg2c -lm
-
-# 4: with Fortran interface to the BLAS, and Goto's BLAS (untested)
-# CONFIG =
-# LIB = -lgoto -lxerbla -lfrtbegin -lg2c -lm -lunwind -lcprts
diff --git a/math/umfpack/files/patch-Make+Make.freebsd b/math/umfpack/files/patch-Make+Make.freebsd
new file mode 100644
index 000000000000..6e68a56ca995
--- /dev/null
+++ b/math/umfpack/files/patch-Make+Make.freebsd
@@ -0,0 +1,36 @@
+--- Make/Make.freebsd.orig	Fri Mar 18 22:29:13 2005
++++ Make/Make.freebsd	Fri Mar 18 22:30:13 2005
+@@ -6,8 +6,8 @@
+ # if you use the Intel compiler and the Fortran BLAS.
+ 
+ # Using GNU gcc and f77 compilers:
+-  CC = gcc
+-  CFLAGS = -O3 -fPIC
++  CC ?= cc
++  CFLAGS ?= -O3 -fPIC
+ 
+ # Using Intel's icc and ifc compilers:
+ # F77 = ifc
+@@ -36,16 +36,16 @@
+ # LIB = -lm
+ 
+ # 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
+-# CONFIG = -DCBLAS -I../ATLAS/include
+-# LIB = -lcblas -latlas -lm
++CONFIG = -DCBLAS -I../ATLAS/include -I${LOCALBASE}/include
++LIB = -L${LOCALBASE}/lib -lcblas -latlas -lm
+ 
+ # 3: with Fortran interface to the ATLAS BLAS
+-# CONFIG =
+-# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm
++# CONFIG = -I${LOCALBASE}/include
++# LIB = -L${LOCALBASE}/lib -lf77blas -latlas -lfrtbegin -lg2c -lm
+ 
+ # 4: with Fortran interface to the BLAS, and Goto's BLAS
+-  CONFIG =
+-  LIB = -lgoto -lxerbla -lfrtbegin -lg2c -lm
++#  CONFIG =
++#  LIB = -lgoto -lxerbla -lfrtbegin -lg2c -lm
+ 
+ # 5: with Fortran interface to the BLAS, and Goto's BLAS, and no divide-by-zero
+ # CONFIG = -DNO_DIVIDE_BY_ZERO
diff --git a/math/umfpack/pkg-plist b/math/umfpack/pkg-plist
index c2d092aa2dbf..f0e41c4859bb 100644
--- a/math/umfpack/pkg-plist
+++ b/math/umfpack/pkg-plist
@@ -4,6 +4,7 @@ include/UMFPACK/umfpack_col_to_triplet.h
 include/UMFPACK/umfpack_defaults.h
 include/UMFPACK/umfpack_free_numeric.h
 include/UMFPACK/umfpack_free_symbolic.h
+include/UMFPACK/umfpack_get_determinant.h
 include/UMFPACK/umfpack_get_lunz.h
 include/UMFPACK/umfpack_get_numeric.h
 include/UMFPACK/umfpack_get_symbolic.h
@@ -34,7 +35,7 @@ lib/libamd.a
 lib/libumfpack.a
 %%PORTDOCS%%%%DOCSDIR%%/AMD_UserGuide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/QuickStart.pdf
-%%PORTDOCS%%%%DOCSDIR%%/README.gz
+%%PORTDOCS%%%%DOCSDIR%%/README.txt.gz
 %%PORTDOCS%%%%DOCSDIR%%/UserGuide.pdf
 %%PORTDOCS%%%%EXAMPLESDIR%%/HB/arc130.rua
 %%PORTDOCS%%%%EXAMPLESDIR%%/HB/can_24.psa
@@ -50,6 +51,7 @@ lib/libumfpack.a
 %%PORTDOCS%%%%EXAMPLESDIR%%/readhb.f
 %%PORTDOCS%%%%EXAMPLESDIR%%/readhb_nozeros.f
 %%PORTDOCS%%%%EXAMPLESDIR%%/readhb_size.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple_compile
 %%PORTDOCS%%%%EXAMPLESDIR%%/symbolic.umf
 %%PORTDOCS%%%%EXAMPLESDIR%%/umf4.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/umf4.out