Move math/mumps to math mumps4:

- MUMPS 4 is the legacy version, kept for license reason;

- math/mumps  to be used for versions 5.x.

Submitted by:	pfg

12 files changed, 42 insertions, 37 deletions

diff --git a/MOVED b/MOVED
index 348000ada759..1f02fbd18d03 100644
--- a/MOVED
+++ b/MOVED
@@ -11679,3 +11679,4 @@ x11/altyo||2019-03-06|Has expired: Broken for more than 6 months
 x11/pantheon-terminal||2019-03-06|Has expired: Broken for more than 6 months
 x11-wm/e-module-everything-websearch||2019-03-06|Has expired: Broken for more than 6 months
 net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-02-15|Renamed upstream
+math/mumps|math/mumps4|2019-03-10|MUMPS 4 is the legacy version
diff --git a/math/Makefile b/math/Makefile
index 7e246534eb83..bfc33ee775cb 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -381,8 +381,8 @@
     SUBDIR += mprime
     SUBDIR += mtrxmath
     SUBDIR += multichoose
-    SUBDIR += mumps
     SUBDIR += mumps-edf
+    SUBDIR += mumps4
     SUBDIR += muparser
     SUBDIR += nanoflann
     SUBDIR += naturalmath
diff --git a/math/mumps/Makefile b/math/mumps4/Makefile
index 79f8ba24f501..f8bb304cf805 100644
--- a/math/mumps/Makefile
+++ b/math/mumps4/Makefile
@@ -1,9 +1,8 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
-PORTNAME=	mumps
-PORTVERSION=	4.10.0	# Please do not upgrade to 5+: if needed repocopy to math/mumps5
-PORTREVISION=	12
+PORTNAME=	mumps4
+PORTVERSION=	4.10.0	# Please do not upgrade to 5+: use math/mumps
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
@@ -39,7 +38,7 @@ USE_LDCONFIG=	yes
 VEM=		${PORTVERSION:R:R}
 LIBS=		cmumps dmumps mumps_common pord smumps zmumps
 
-CONFLICTS=	mumps-5*
+CONFLICTS=	mumps-edf-5*
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math
@@ -96,13 +95,16 @@ pre-build:
 .endif
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
 .for lib in ${LIBS}
-	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so)
+	(cd ${STAGEDIR}${PREFIX}/lib &&	\
+		${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}4.so)
 . endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
diff --git a/math/mumps/distinfo b/math/mumps4/distinfo
index aca42d6ee1bc..aca42d6ee1bc 100644
--- a/math/mumps/distinfo
+++ b/math/mumps4/distinfo
diff --git a/math/mumps/files/patch-Make.inc_Makefile.inc.generic b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic
index c6202a95efed..c6202a95efed 100644
--- a/math/mumps/files/patch-Make.inc_Makefile.inc.generic
+++ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic
diff --git a/math/mumps/files/patch-Make.inc_Makefile.inc.generic.SEQ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
index dfbe12362ca7..dfbe12362ca7 100644
--- a/math/mumps/files/patch-Make.inc_Makefile.inc.generic.SEQ
+++ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ
diff --git a/math/mumps/files/patch-Makefile b/math/mumps4/files/patch-Makefile
index b8022b5fa8f8..b8022b5fa8f8 100644
--- a/math/mumps/files/patch-Makefile
+++ b/math/mumps4/files/patch-Makefile
diff --git a/math/mumps/files/patch-PORD_lib_Makefile b/math/mumps4/files/patch-PORD_lib_Makefile
index 6b3f9cca85e8..6b3f9cca85e8 100644
--- a/math/mumps/files/patch-PORD_lib_Makefile
+++ b/math/mumps4/files/patch-PORD_lib_Makefile
diff --git a/math/mumps/files/patch-libseq_Makefile b/math/mumps4/files/patch-libseq_Makefile
index 200f519fa80e..200f519fa80e 100644
--- a/math/mumps/files/patch-libseq_Makefile
+++ b/math/mumps4/files/patch-libseq_Makefile
diff --git a/math/mumps/files/patch-src_Makefile b/math/mumps4/files/patch-src_Makefile
index 035e47408c6a..035e47408c6a 100644
--- a/math/mumps/files/patch-src_Makefile
+++ b/math/mumps4/files/patch-src_Makefile
diff --git a/math/mumps/pkg-descr b/math/mumps4/pkg-descr
index ce8f956266a4..cc7a1b0bcc23 100644
--- a/math/mumps/pkg-descr
+++ b/math/mumps4/pkg-descr
@@ -13,4 +13,6 @@ format; elemental format.
 - Partial factorization and Schur complement matrix.
 - Several orderings interfaced : AMD, AMF, PORD, METIS
 
+Note: This is the last version released under Public Domain.
+
 WWW: http://graal.ens-lyon.fr/MUMPS/
diff --git a/math/mumps/pkg-plist b/math/mumps4/pkg-plist
index 08a9a1b98578..38a59af1e7b0 100644
--- a/math/mumps/pkg-plist
+++ b/math/mumps4/pkg-plist
@@ -1,38 +1,38 @@
-include/cmumps_c.h
-include/cmumps_root.h
-include/cmumps_struc.h
-include/dmumps_c.h
-include/dmumps_root.h
-include/dmumps_struc.h
-include/mumps_c_types.h
-include/mumps_compat.h
-include/smumps_c.h
-include/smumps_root.h
-include/smumps_struc.h
-include/zmumps_c.h
-include/zmumps_root.h
-include/zmumps_struc.h
-lib/libcmumps.a
-lib/libcmumps.so
+include/mumps4/cmumps_c.h
+include/mumps4/cmumps_root.h
+include/mumps4/cmumps_struc.h
+include/mumps4/dmumps_c.h
+include/mumps4/dmumps_root.h
+include/mumps4/dmumps_struc.h
+include/mumps4/mumps_c_types.h
+include/mumps4/mumps_compat.h
+include/mumps4/smumps_c.h
+include/mumps4/smumps_root.h
+include/mumps4/smumps_struc.h
+include/mumps4/zmumps_c.h
+include/mumps4/zmumps_root.h
+include/mumps4/zmumps_struc.h
+lib/libcmumps4.so
 lib/libcmumps.so.4
-lib/libdmumps.a
-lib/libdmumps.so
+lib/libdmumps4.so
 lib/libdmumps.so.4
-lib/libmpiseq.a
-lib/libmpiseq.so
+lib/libmpiseq4.so
 lib/libmpiseq.so.4
-lib/libmumps_common.a
-lib/libmumps_common.so
+lib/libmumps_common4.so
 lib/libmumps_common.so.4
-lib/libpord.a
-lib/libpord.so
+lib/libpord4.so
 lib/libpord.so.4
-lib/libsmumps.a
-lib/libsmumps.so
+lib/libsmumps4.so
 lib/libsmumps.so.4
-lib/libzmumps.a
-lib/libzmumps.so
+lib/libzmumps4.so
 lib/libzmumps.so.4
+lib/mumps4/libcmumps.a
+lib/mumps4/libdmumps.a
+lib/mumps4/libmpiseq.a
+lib/mumps4/libmumps_common.a
+lib/mumps4/libpord.a
+lib/mumps4/libsmumps.a
+lib/mumps4/libzmumps.a
 %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.pdf
 %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.ps.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile