math/mumps4: modernize the port.

- Make the blas naming more conistent with blaslapack (this doesn't use
  lapack though).
- Adopt more standard FFLAGs.
- Turn Metis4 into an option (was broken).

Approved by:	thierry (mentor)

3 files changed, 16 insertions, 13 deletions

diff --git a/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
index dfbe12362ca7..e2149348c2de 100644
--- a/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
+++ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
@@ -14,11 +14,16 @@
  LPORD    = -L$(LPORDDIR) -lpord
  
 -#LMETISDIR = /local/metis/
-+#LMETISDIR = @LOCALBASE@/lib
++LMETISDIR = @LOCALBASE@/lib
  #IMETIS    = # Should be provided if you use parmetis
  
  # You have to choose one among the following two lines depending on
-@@ -72,7 +72,7 @@ LPORD    = -L$(LPORDDIR) -lpord
+@@ -67,12 +67,11 @@ LPORD    = -L$(LPORDDIR) -lpord
+ # line (remember to add -Dparmetis in the ORDERINGSF variable below)
+ 
+ #LMETIS    = -L$(LMETISDIR) -lmetis
+-#LMETIS    = -L$(LMETISDIR) -lparmetis -lmetis
+ 
  # The following variables will be used in the compilation process.
  # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
  #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis
@@ -27,7 +32,7 @@
  ORDERINGSC  = $(ORDERINGSF)
  
  LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
-@@ -95,11 +95,11 @@ OUTF    = -o 
+@@ -95,11 +94,11 @@ OUTF    = -o 
  # RM : remove files
  RM      = /bin/rm -f
  # CC : C compiler
@@ -42,7 +47,7 @@
  # AR : Archive object in a library
  #      keep a space at the end if options have to be separated from lib name
  AR      = ar vr 
-@@ -112,14 +112,14 @@ RANLIB  = ranlib
+@@ -112,14 +111,14 @@ RANLIB  = ranlib
  # the sequential library provided by MUMPS, to use instead
  # of ScaLAPACK and MPI.
  INCSEQ  = -I$(topdir)/libseq
@@ -60,7 +65,7 @@
  
  # FORTRAN/C COMPATIBILITY:
  #  Use:
-@@ -132,12 +132,12 @@ LIBOTHERS = -lpthread
+@@ -132,12 +131,12 @@ LIBOTHERS = -lpthread
  #     leave empty if your Fortran compiler does not change the symbols.
  #
  
diff --git a/math/mumps4/files/patch-PORD_lib_Makefile b/math/mumps4/files/patch-PORD_lib_Makefile
index 6b3f9cca85e8..a5383845d4d8 100644
--- a/math/mumps4/files/patch-PORD_lib_Makefile
+++ b/math/mumps4/files/patch-PORD_lib_Makefile
@@ -1,6 +1,6 @@
 --- PORD/lib/Makefile.orig	2011-05-10 12:56:32 UTC
 +++ PORD/lib/Makefile
-@@ -21,10 +21,15 @@ OBJS = graph.o gbipart.o gbisect.o ddcre
+@@ -21,9 +21,14 @@ OBJS = graph.o gbipart.o gbisect.o ddcreate.o ddbisect
  .c.o:
  	$(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o
  
@@ -11,10 +11,9 @@
 +libpord$(LIBEXT): $(OBJS)
 +	$(AR) $@ $(OBJS)
  	$(RANLIB) $@
- 
++
 +libpord.so.@SOVER@: $(OBJS)
 +	$(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT).so.@SOVER@ -o libpord$(PLAT).so.@SOVER@ -Wl,-z,defs
-+
+ 
  clean:
  	rm -f *.o
- 
diff --git a/math/mumps4/files/patch-src_Makefile b/math/mumps4/files/patch-src_Makefile
index 035e47408c6a..cf8c0346d351 100644
--- a/math/mumps4/files/patch-src_Makefile
+++ b/math/mumps4/files/patch-src_Makefile
@@ -11,7 +11,7 @@
  
  OBJS_COMMON = \
          mumps_part9.o\
-@@ -53,13 +55,19 @@ OBJS = 	$(ARITH)mumps_part1.o\
+@@ -53,12 +55,18 @@ OBJS = 	$(ARITH)mumps_part1.o\
  
  
  $(libdir)/libmumps_common$(PLAT)$(LIBEXT):	$(OBJS_COMMON)
@@ -26,10 +26,9 @@
 -	$(AR)$@ $?
 +	$(AR) $@ $?
  	$(RANLIB) $@
- 
++
 +$(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@:    $(OBJS)
 +	$(FC) -shared ${.ALLSRC} -Wl,-soname,lib$(ARITH)mumps$(PLAT).so.@SOVER@ -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(LIBPAR) -lblas $(SCALAP) $(LIBOTHERS) -o $(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@ -Wl,-z,defs
-+
+ 
  $(ARITH)mumps_load.o:		$(ARITH)mumps_comm_buffer.o \
  				$(ARITH)mumps_struc_def.o
-