svn commit: r526913 - in head: . math math/mumps4 math/mumps4/files
Rene Ladan
rene at FreeBSD.org
Sun Feb 23 10:07:41 UTC 2020
Author: rene
Date: Sun Feb 23 10:07:39 2020
New Revision: 526913
URL: https://svnweb.freebsd.org/changeset/ports/526913
Log:
Resurrect math/mumps4. I should have just removed the METIS4 option.
Reported by: pfg
Added:
head/math/mumps4/
- copied from r526852, head/math/mumps4/
Modified:
head/MOVED
head/math/Makefile
head/math/mumps4/Makefile
head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic
head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
head/math/mumps4/pkg-descr
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Feb 23 09:54:57 2020 (r526912)
+++ head/MOVED Sun Feb 23 10:07:39 2020 (r526913)
@@ -14384,7 +14384,6 @@ www/trac-watchlist||2020-02-22|Has expired: Broken, us
www/twill||2020-02-22|Has expired: Broken, uses EOLed python27
x11/wbarconf||2020-02-22|Has expired: Broken, uses EOLed python27
x11-wm/simple-ccsm||2020-02-22|Has expired: Broken, uses EOLed python27
-math/mumps4|math/mumps|2020-02-22|Removed, uses expired math/metis4
math/metis4|math/metis|2020-02-22|Has expired: EOL: use math/metis instead
multimedia/cinelerra-gg||2020-02-22|Has expired: Broken, uses EOLed python27
x11-toolkits/py-gnome2||2020-02-22|Has expired: Broken, uses EOLed python27
Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile Sun Feb 23 09:54:57 2020 (r526912)
+++ head/math/Makefile Sun Feb 23 10:07:39 2020 (r526913)
@@ -383,6 +383,7 @@
SUBDIR += mtrxmath
SUBDIR += multichoose
SUBDIR += mumps
+ SUBDIR += mumps4
SUBDIR += muparser
SUBDIR += nanoflann
SUBDIR += naturalmath
Modified: head/math/mumps4/Makefile
==============================================================================
--- head/math/mumps4/Makefile Sat Feb 22 19:08:35 2020 (r526852)
+++ head/math/mumps4/Makefile Sun Feb 23 10:07:39 2020 (r526913)
@@ -30,12 +30,8 @@ LIBS= cmumps dmumps mumps_common pord smumps zmumps
CONFLICTS+= mumps-mpich-4*
-OPTIONS_DEFINE= METIS4 DOCS EXAMPLES
+OPTIONS_DEFINE= DOCS EXAMPLES
-METIS4_DESC= Use math/metis4 for Ordering
-
-METIS4_LIB_DEPENDS+= libmetis.so.1:math/metis4
-
LIBS+= mpiseq
PLIST_SUB+= MUMPSVERSION=${PORTVERSION} MUMPSV=${VEM}
@@ -51,10 +47,6 @@ PLIST_SUB+= MUMPSVERSION=${PORTVERSION} MUMPSV=${VEM}
.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MMETIS4}
-MAKE_ENV+= ORDERINGSF=-Dmetis
-.endif
-
# This is like blaslapack, except we don't use lapack at all
.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
WITH_ATLAS= yes
@@ -87,9 +79,6 @@ pre-build:
s+ at LOCALBASE@+${LOCALBASE}+g;' \
${WRKSRC}/${MF}
.endfor
-.if ${PORT_OPTIONS:MMETIS4}
- ${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc
-.endif
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
Modified: head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic
==============================================================================
--- head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic Sat Feb 22 19:08:35 2020 (r526852)
+++ head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic Sun Feb 23 10:07:39 2020 (r526913)
@@ -1,23 +1,5 @@
--- Make.inc/Makefile.inc.generic.orig 2011-05-10 12:56:32 UTC
+++ Make.inc/Makefile.inc.generic
-@@ -39,7 +39,7 @@
- # Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS.
- #
-
--#SCOTCHDIR = ${HOME}/scotch_5.1_esmumps
-+#SCOTCHDIR = @LOCALBASE@
- #ISCOTCH = -I$(SCOTCHDIR)/include
- # You have to choose one among the following two lines depending on
- # the type of analysis you want to perform. If you want to perform only
-@@ -55,7 +55,7 @@ LPORDDIR = $(topdir)/PORD/lib/
- IPORD = -I$(topdir)/PORD/include/
- LPORD = -L$(LPORDDIR) -lpord
-
--#LMETISDIR = /local/metis/
-+#LMETISDIR = @LOCALBASE@/lib
- #IMETIS = # Should be provided if you use parmetis
-
- # You have to choose one among the following two lines depending on
@@ -70,7 +70,7 @@ LPORD = -L$(LPORDDIR) -lpord
# The following variables will be used in the compilation process.
# Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
Modified: head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
==============================================================================
--- head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ Sat Feb 22 19:08:35 2020 (r526852)
+++ head/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ Sun Feb 23 10:07:39 2020 (r526913)
@@ -9,21 +9,7 @@
#ISCOTCH = -I$(SCOTCHDIR)/include
# You have to choose one among the following two lines depending on
# the type of analysis you want to perform. If you want to perform only
-@@ -57,7 +57,7 @@ LPORDDIR = $(topdir)/PORD/lib/
- IPORD = -I$(topdir)/PORD/include/
- LPORD = -L$(LPORDDIR) -lpord
-
--#LMETISDIR = /local/metis/
-+LMETISDIR = @LOCALBASE@/lib
- #IMETIS = # Should be provided if you use parmetis
-
- # You have to choose one among the following two lines depending on
-@@ -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
-
+@@ -72,7 +72,7 @@ LPORD = -L$(LPORDDIR) -lpord
# 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
@@ -32,7 +18,7 @@
ORDERINGSC = $(ORDERINGSF)
LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
-@@ -95,11 +94,11 @@ OUTF = -o
+@@ -95,11 +95,11 @@ OUTF = -o
# RM : remove files
RM = /bin/rm -f
# CC : C compiler
@@ -47,7 +33,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 +111,14 @@ RANLIB = ranlib
+@@ -112,14 +112,14 @@ RANLIB = ranlib
# the sequential library provided by MUMPS, to use instead
# of ScaLAPACK and MPI.
INCSEQ = -I$(topdir)/libseq
@@ -65,7 +51,7 @@
# FORTRAN/C COMPATIBILITY:
# Use:
-@@ -132,12 +131,12 @@ LIBOTHERS = -lpthread
+@@ -132,12 +132,12 @@ LIBOTHERS = -lpthread
# leave empty if your Fortran compiler does not change the symbols.
#
Modified: head/math/mumps4/pkg-descr
==============================================================================
--- head/math/mumps4/pkg-descr Sat Feb 22 19:08:35 2020 (r526852)
+++ head/math/mumps4/pkg-descr Sun Feb 23 10:07:39 2020 (r526913)
@@ -11,7 +11,7 @@ available).
- Various matrix input formats: assembled format; distributed assembled
format; elemental format.
- Partial factorization and Schur complement matrix.
-- Several orderings interfaced : AMD, AMF, PORD, METIS
+- Several orderings interfaced : AMD, AMF, PORD
Note: This is the last version released under Public Domain.
More information about the svn-ports-all
mailing list