4 files changed, 76 insertions, 103 deletions

diff --git a/math/umfpack/files/Make.freebsd b/math/umfpack/files/Make.freebsd
new file mode 100644
index 000000000000..8548fa0f1b89
--- /dev/null
+++ b/math/umfpack/files/Make.freebsd
@@ -0,0 +1,45 @@
+#-------------------------------------------------------------------------------
+# 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.include b/math/umfpack/files/patch-Make+Make.include
new file mode 100644
index 000000000000..b2b914783d73
--- /dev/null
+++ b/math/umfpack/files/patch-Make+Make.include
@@ -0,0 +1,31 @@
+--- Make/Make.include.orig	Wed Apr 23 14:08:18 2003
++++ Make/Make.include	Thu Jun 19 14:01:42 2003
+@@ -10,15 +10,15 @@
+ # AMD, or both AMD and UMFPACK, you only need to edit this one file (and
+ # optionaly, one of the ../Make/Make.<arch> files below).
+ 
+-CFLAGS = -O
++CFLAGS ?= -O
+ RANLIB = ranlib
+ LIB = -lm
+ RM = rm -f
+ MV = mv -f
+-F77 = f77
+-F77FLAGS = -O
+-F77LIB =
+-AR = ar
++F77 ?= f77
++F77FLAGS = ${FFLAGS}
++#F77LIB =
++AR ?= ar
+ 
+ #-------------------------------------------------------------------------------
+ # for the AMD and UMFPACK mexFunctions (-DNBLAS and -DNUTIL for UMFPACK only)
+@@ -49,6 +49,7 @@
+ # CC = ... to redefine the name of your C compiler, for example.  Without
+ # any specific changes, this Makefile should work on nearly all systems.
+ 
++include ../Make/Make.freebsd
+ # include ../Make/Make.linux
+ # include ../Make/Make.sgi
+ # include ../Make/Make.solaris
diff --git a/math/umfpack/files/patch-aa b/math/umfpack/files/patch-aa
deleted file mode 100644
index abbcb8645e3d..000000000000
--- a/math/umfpack/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.orig	Mon Jul  7 12:03:46 1997
---- Makefile	Sun Dec 14 15:18:13 1997
-***************
-*** 19,25 ****
-  	  umz2er.o umz2p1.o umz2p2.o \
-  	  umz2rf.o umz2ra.o umz2r0.o umz2r2.o umz2rg.o umz21i.o
-  
-! HARWELL	= mc21b.o mc13e.o
-  
-  BLASLIB	= libblas.a
-  UMFPACKLIB = libumfpack.a
---- 19,25 ----
-  	  umz2er.o umz2p1.o umz2p2.o \
-  	  umz2rf.o umz2ra.o umz2r0.o umz2r2.o umz2rg.o umz21i.o
-  
-! #HARWELL	= mc21b.o mc13e.o
-  
-  BLASLIB	= libblas.a
-  UMFPACKLIB = libumfpack.a
diff --git a/math/umfpack/files/patch-ba b/math/umfpack/files/patch-ba
deleted file mode 100644
index 6ac80f2b2a40..000000000000
--- a/math/umfpack/files/patch-ba
+++ /dev/null
@@ -1,84 +0,0 @@
-Note: Although the Harwell routines are available in Netlib, they are a
-commercial product. This patch disables their use.
-
-*** umc2fb.f.orig	Fri Nov  7 11:32:20 1997
---- umc2fb.f	Fri Nov  7 11:43:14 1997
-***************
-*** 168,173 ****
---- 168,177 ----
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-  
-+ 	RETURN
-+ C=======================================================================
-+ C	The rest will be ignored !!!!!!!! (We are not using Harwell)	
-+ C=======================================================================
-          NZDIA = NZ
-          NZOFF = 0
-  
-*** umd2fb.f.orig	Fri Nov  7 11:32:30 1997
---- umd2fb.f	Fri Nov  7 11:44:14 1997
-***************
-*** 167,173 ****
-  C  EXECUTABLE STATEMENTS:
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-! 
-          NZDIA = NZ
-          NZOFF = 0
-  
---- 167,176 ----
-  C  EXECUTABLE STATEMENTS:
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-! 	RETURN
-! C=======================================================================
-! C	The rest will be ignored !!!!!!!! (We are not using Harwell)	
-! C=======================================================================
-          NZDIA = NZ
-          NZOFF = 0
-  
-*** ums2fb.f.orig	Fri Nov  7 11:32:44 1997
---- ums2fb.f	Fri Nov  7 11:44:54 1997
-***************
-*** 167,173 ****
-  C  EXECUTABLE STATEMENTS:
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-! 
-          NZDIA = NZ
-          NZOFF = 0
-  
---- 167,176 ----
-  C  EXECUTABLE STATEMENTS:
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-! 	RETURN
-! C=======================================================================
-! C	The rest will be ignored !!!!!!!! (We are not using Harwell)	
-! C=======================================================================
-          NZDIA = NZ
-          NZOFF = 0
-  
-*** umz2fb.f.orig	Fri Nov  7 11:32:57 1997
---- umz2fb.f	Fri Nov  7 11:45:42 1997
-***************
-*** 167,173 ****
-  C  EXECUTABLE STATEMENTS:
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-! 
-          NZDIA = NZ
-          NZOFF = 0
-  
---- 167,176 ----
-  C  EXECUTABLE STATEMENTS:
-  C       if (MC21B and MC13E not available during installation) return
-  C=======================================================================
-! 	RETURN
-! C=======================================================================
-! C	The rest will be ignored !!!!!!!! (We are not using Harwell)	
-! C=======================================================================
-          NZDIA = NZ
-          NZOFF = 0
-