git: 831a9b667f85 - main - math/coinmumps: Rename into math/coin-or-mumps
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Feb 2022 20:02:21 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=831a9b667f853d7c9e30e60eafbaa9bc7458f1e0
commit 831a9b667f853d7c9e30e60eafbaa9bc7458f1e0
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-02-23 19:13:41 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-02-23 20:02:16 +0000
math/coinmumps: Rename into math/coin-or-mumps
coinmumps wasn't used because it can only be used from Coin-OR
projects and there are no mentions in the tree.
But the upcoming Ipopt update would use math/coin-or-mumps.
---
MOVED | 1 +
math/Makefile | 1 -
math/{coinmumps => coin-or-mumps}/Makefile | 28 ++++++++++++++--------------
math/coin-or-mumps/distinfo | 5 +++++
math/coin-or-mumps/pkg-descr | 5 +++++
math/{coinmumps => coin-or-mumps}/pkg-plist | 2 +-
math/coinmumps/distinfo | 5 -----
math/coinmumps/pkg-descr | 5 -----
8 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/MOVED b/MOVED
index e77aba78ba96..1fb422730b68 100644
--- a/MOVED
+++ b/MOVED
@@ -16894,3 +16894,4 @@ sysutils/intel-pcm-devel||2022-02-19|intel-pcm-devel has been removed, encouragi
graphics/copperspice|x11-toolkits/copperspice|2022-02-20|Revive in more appropriate category
math/mathics-django||2022-02-20|Mathics-Django now requires npm: you can use math/mathicsscript instead
net-mgmt/percona-monitoring-plugins||2022-02-22|Has expired: Upstream EOL reached on 2020-08-01
+math/coinmumps|math/coin-or-mumps|2022-02-23|Renamed into a more appropriate name
diff --git a/math/Makefile b/math/Makefile
index fb4978580aec..211cc65c4468 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -219,7 +219,6 @@
SUBDIR += coin-or-metis
SUBDIR += coin-or-mumps
SUBDIR += coinmp
- SUBDIR += coinmumps
SUBDIR += coinutils
SUBDIR += colpack
SUBDIR += combblas
diff --git a/math/coinmumps/Makefile b/math/coin-or-mumps/Makefile
similarity index 61%
rename from math/coinmumps/Makefile
rename to math/coin-or-mumps/Makefile
index 30e6bf4aeb10..b0b8f85dec0f 100644
--- a/math/coinmumps/Makefile
+++ b/math/coin-or-mumps/Makefile
@@ -1,31 +1,31 @@
-PORTNAME= coinmumps
+PORTNAME= mumps
DISTVERSIONPREFIX= releases/
-DISTVERSION= 1.6.2
+DISTVERSION= 1.6.3
CATEGORIES= math
-MASTER_SITES= http://coin-or-tools.github.io/ThirdParty-Mumps/:mumps
+MASTER_SITES= http://mumps.enseeiht.fr/:mumps
PKGNAMEPREFIX= coin-or-
DISTFILES= MUMPS_${MUMPS_VERSION}.tar.gz:mumps
MAINTAINER= yuri@FreeBSD.org
-COMMENT= MUltifrontal Massively Parallel sparse direct Solver (MUMPS)
+COMMENT= COIN-OR autotools harness to build Mumps
-LICENSE= PD
-LICENSE_FILE= ${WRKDIR}/MUMPS_${MUMPS_VERSION}/LICENSE
+LICENSE= EPL
-LIB_DEPENDS= libblas.so:math/blas
+LIB_DEPENDS= libblas.so:math/blas \
+ libcoinmetis.so:math/coin-or-metis
-USES= fortran gmake libtool
+USES= fortran gmake libtool pkgconfig
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-
USE_GITHUB= yes
GH_ACCOUNT= coin-or-tools
GH_PROJECT= ThirdParty-Mumps
+GNU_CONFIGURE= yes
+
INSTALL_TARGET= install-strip
-MUMPS_VERSION= 4.10.0
+MUMPS_VERSION= 4.10.0 # from the script get.Mumps
.include <bsd.port.pre.mk>
@@ -35,10 +35,10 @@ MUMPS_VERSION= 4.10.0
FFLAGS+= -fallow-argument-mismatch
.endif
-post-extract:
- @${RLN} ${WRKDIR}/MUMPS_${MUMPS_VERSION} ${WRKSRC}/MUMPS
+post-extract: # link MUMPS into the location in the tree
+ @cd ${WRKSRC} && ${LN} -s ${WRKDIR}/MUMPS_${MUMPS_VERSION} MUMPS
-post-patch: # from get.Mumps
+pre-build: # patching from get.Mumps
@cd ${WRKSRC} && \
${PATCH} -p0 < mumps.patch && \
${PATCH} -p0 < mumps_mpi.patch && \
diff --git a/math/coin-or-mumps/distinfo b/math/coin-or-mumps/distinfo
new file mode 100644
index 000000000000..f007decca5d9
--- /dev/null
+++ b/math/coin-or-mumps/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1645642530
+SHA256 (MUMPS_4.10.0.tar.gz) = d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933
+SIZE (MUMPS_4.10.0.tar.gz) = 2481516
+SHA256 (coin-or-tools-ThirdParty-Mumps-releases-1.6.3_GH0.tar.gz) = c66a2e77c601e8e094c6b71c1b13d015745481afb286e5776bb4379e241168c8
+SIZE (coin-or-tools-ThirdParty-Mumps-releases-1.6.3_GH0.tar.gz) = 269165
diff --git a/math/coin-or-mumps/pkg-descr b/math/coin-or-mumps/pkg-descr
new file mode 100644
index 000000000000..f6e28d98c5fe
--- /dev/null
+++ b/math/coin-or-mumps/pkg-descr
@@ -0,0 +1,5 @@
+This is an autotools-based build system to build and install
+MUltifrontal Massively Parallel sparse direct Solver (MUMPS).
+This installation of MUMPS is used by some other COIN-OR projects.
+
+WWW: https://github.com/coin-or-tools/ThirdParty-Mumps
diff --git a/math/coinmumps/pkg-plist b/math/coin-or-mumps/pkg-plist
similarity index 89%
rename from math/coinmumps/pkg-plist
rename to math/coin-or-mumps/pkg-plist
index 9bf45156bcb1..014b4b648744 100644
--- a/math/coinmumps/pkg-plist
+++ b/math/coin-or-mumps/pkg-plist
@@ -4,5 +4,5 @@ include/coin/ThirdParty/mumps_compat.h
include/coin/ThirdParty/mumps_mpi.h
lib/libcoinmumps.so
lib/libcoinmumps.so.1
-lib/libcoinmumps.so.1.6.2
+lib/libcoinmumps.so.1.6.3
libdata/pkgconfig/coinmumps.pc
diff --git a/math/coinmumps/distinfo b/math/coinmumps/distinfo
deleted file mode 100644
index 81511cdbaec2..000000000000
--- a/math/coinmumps/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1603072890
-SHA256 (MUMPS_4.10.0.tar.gz) = d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933
-SIZE (MUMPS_4.10.0.tar.gz) = 2481516
-SHA256 (coin-or-tools-ThirdParty-Mumps-releases-1.6.2_GH0.tar.gz) = 0cfdd30b9cb42d9539ad9c495629f56dd1fc0b59cea691bbe71a129fabd8895d
-SIZE (coin-or-tools-ThirdParty-Mumps-releases-1.6.2_GH0.tar.gz) = 269074
diff --git a/math/coinmumps/pkg-descr b/math/coinmumps/pkg-descr
deleted file mode 100644
index 98f3a540d68a..000000000000
--- a/math/coinmumps/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-An autotools-based build system to build and install MUltifrontal Massively
-Parallel sparse direct Solver (MUMPS). This installation of MUMPS is used by
-some other COIN-OR projects.
-
-WWW: https://github.com/coin-or-tools/ThirdParty-Mumps