From a263dc524e68c81ed8feb5394fdb9c6f2c1997a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Thu, 2 May 2024 15:36:33 +0100
Subject: [PATCH] mingw-w64-msmpi is not a runtime dependency

---
 mingw-w64-frontistr/PKGBUILD    | 13 +++++++------
 mingw-w64-hypre/PKGBUILD        | 14 +++++++-------
 mingw-w64-lis/PKGBUILD          | 32 ++++++++++++++++----------------
 mingw-w64-mfem/PKGBUILD         | 12 ++++++------
 mingw-w64-moab/PKGBUILD         | 31 ++++++++++++++++++-------------
 mingw-w64-mumps/PKGBUILD        | 14 +++++++-------
 mingw-w64-parmetis/PKGBUILD     | 29 ++++++++++++++++-------------
 mingw-w64-petsc/PKGBUILD        |  9 ++++-----
 mingw-w64-scalapack/PKGBUILD    | 29 ++++++++++++++++-------------
 mingw-w64-scotch/PKGBUILD       | 15 ++++++++-------
 mingw-w64-sundials/PKGBUILD     |  6 +++---
 mingw-w64-superlu_dist/PKGBUILD | 19 ++++++++++---------
 12 files changed, 118 insertions(+), 105 deletions(-)

diff --git a/mingw-w64-frontistr/PKGBUILD b/mingw-w64-frontistr/PKGBUILD
index e1ce502efd..1fbca8bfb2 100644
--- a/mingw-w64-frontistr/PKGBUILD
+++ b/mingw-w64-frontistr/PKGBUILD
@@ -4,16 +4,18 @@ _realname=frontistr
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=5.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Open-Source Large-Scale Parallel FEM Program for Nonlinear Structural Analysis (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
+url="https://www.frontistr.com"
+msys2_repository_url="https://github.com/frontistr/frontistr"
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-omp"
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-parmetis"
          "${MINGW_PACKAGE_PREFIX}-metis"
-         "${MINGW_PACKAGE_PREFIX}-msmpi"
          # "${MINGW_PACKAGE_PREFIX}-mumps" Couldn't be found by cmake!
          "${MINGW_PACKAGE_PREFIX}-netcdf"
          "${MINGW_PACKAGE_PREFIX}-seacas"
@@ -24,9 +26,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-fc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
-license=('MIT')
-url="https://www.frontistr.com"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
 source=("https://github.com/${_realname}/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('d4fb213d7b57ad84dca96949c6ece0d8a4499e4a2dd2deb2d038a2e605bf6005')
 
@@ -48,7 +49,7 @@ build() {
     ${MINGW_PREFIX}/bin/cmake -Wno-dev \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      ${_extra_config[@]} \
+      "${_extra_config[@]}" \
       -DWITH_MPI=ON \
       -DWITH_ML=ON \
       ../${_realname}-${pkgver}
diff --git a/mingw-w64-hypre/PKGBUILD b/mingw-w64-hypre/PKGBUILD
index b12e8a5c4c..f6a2b7f4c3 100644
--- a/mingw-w64-hypre/PKGBUILD
+++ b/mingw-w64-hypre/PKGBUILD
@@ -4,26 +4,26 @@ _realname=hypre
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.31.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A library for solving large, sparse linear systems on massively parallel computers (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
+url='https://www.llnl.gov/casc/hypre/'
+msys2_repository_url='https://github.com/hypre-space/hypre/'
+msys2_documentation_url='https://hypre.readthedocs.io/'
 msys2_references=(
   'aur: hypre'
 )
-msys2_repository_url='https://github.com/hypre-space/hypre/'
-msys2_documentation_url='https://hypre.readthedocs.io/'
-url='https://www.llnl.gov/casc/hypre/'
 license=('spdx:Apache-2.0 OR MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-superlu"
          "${MINGW_PACKAGE_PREFIX}-superlu_dist"
-         "${MINGW_PACKAGE_PREFIX}-msmpi"
          "${MINGW_PACKAGE_PREFIX}-omp")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cmake")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/hypre-space/hypre/archive/refs/tags/v${pkgver}.tar.gz"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
+source=("https://github.com/hypre-space/hypre/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-fix-win32-check.patch")
 sha256sums=('9a7916e2ac6615399de5010eb39c604417bb3ea3109ac90e199c5c63b0cb4334'
             '9402d6d7115dc5e9f65209281c6783d973fe7fdc184963a9b346686023737ba1')
diff --git a/mingw-w64-lis/PKGBUILD b/mingw-w64-lis/PKGBUILD
index aabca6ed47..4a099cb60c 100644
--- a/mingw-w64-lis/PKGBUILD
+++ b/mingw-w64-lis/PKGBUILD
@@ -4,15 +4,17 @@ _realname=lis
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.0.33
-pkgrel=3
+pkgrel=4
 pkgdesc='Library of Iterative Solvers for linear systems (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
-depends=("${MINGW_PACKAGE_PREFIX}-msmpi")
-makedepends=("${MINGW_PACKAGE_PREFIX}-msmpi" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('!docs')
-license=('BSD')
 url='https://www.ssisc.org/lis/'
+msys2_repository_url="https://github.com/anishida/lis"
+license=('spdx:BSD-3-Clause')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-msmpi"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
+options=('!docs')
 source=(https://www.ssisc.org/lis/dl/${_realname}-${pkgver}.zip)
 sha256sums=('9C3A9294D640652DBE278BBAC673FF7855A3785253B81CC2724D06B58A0B2285')
 
@@ -22,23 +24,21 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"
   [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
   cp -r "${_realname}-${pkgver}" "build-${MSYSTEM}"
-
   cd "build-${MSYSTEM}"
-  declare -a extra_conf
-  case ${MSYSTEM} in
-    CLANG*)
-      extra_conf+=("--disable-f90 --disable-fortran");;
-    *)
-      extra_conf+=("--enable-f90 --enable-fortran");;
-  esac
+
+  declare -a _extra_config
+  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
+      _extra_config+=("--disable-f90" "--disable-fortran")
+  else
+      _extra_config+=("--enable-f90" "--enable-fortran")
+      export FFLAGS="-fallow-invalid-boz"
+      CFLAGS+=" -fallow-invalid-boz"
+  fi
 
   ./configure \
     --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
     --enable-mpi \
     --enable-omp \
     --enable-shared \
diff --git a/mingw-w64-mfem/PKGBUILD b/mingw-w64-mfem/PKGBUILD
index 33a1cfcfe3..f078edb5d3 100644
--- a/mingw-w64-mfem/PKGBUILD
+++ b/mingw-w64-mfem/PKGBUILD
@@ -5,17 +5,18 @@ _realname=mfem
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.6
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight, general, scalable C++ library for finite element methods (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
+url='https://github.com/mfem/mfem'
+license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          #"${MINGW_PACKAGE_PREFIX}-adios2"
          "${MINGW_PACKAGE_PREFIX}-hypre"
          "${MINGW_PACKAGE_PREFIX}-netcdf"
          "${MINGW_PACKAGE_PREFIX}-metis"
          "${MINGW_PACKAGE_PREFIX}-mpfr"
-         "${MINGW_PACKAGE_PREFIX}-msmpi"
          #$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-mumps")
          "${MINGW_PACKAGE_PREFIX}-omp"
          "${MINGW_PACKAGE_PREFIX}-openblas"
@@ -26,10 +27,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          #"${MINGW_PACKAGE_PREFIX}-superlu")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
-license=('spdx:BSD-3-Clause')
-url='https://github.com/mfem/mfem'
-source=("${_realname}-${pkgver}.tar.gz::$url/archive/v$pkgver.tar.gz"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
+source=("$url/archive/v$pkgver/${_realname}-${pkgver}.tar.gz"
         "0001-add-missing-header.patch")
 sha256sums=('250bb6aa0fd5f6a6002c072d357656241ed38acfc750e43e87d8c36a8f8a4b4f'
             'ace54fd58cc30397cf8f943824fb12dd0f2b3020eb6dfe65cacd37538762f567')
diff --git a/mingw-w64-moab/PKGBUILD b/mingw-w64-moab/PKGBUILD
index e4d33c5b15..d73da6722b 100644
--- a/mingw-w64-moab/PKGBUILD
+++ b/mingw-w64-moab/PKGBUILD
@@ -4,18 +4,18 @@ _realname=moab
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=5.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc='The Mesh-Oriented datABase MOAB is a component for representing and evaluating mesh data (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
-depends=("${MINGW_PACKAGE_PREFIX}-eigen3"
-         "${MINGW_PACKAGE_PREFIX}-msmpi"
-         "${MINGW_PACKAGE_PREFIX}-openblas")
+url='https://sigma.mcs.anl.gov/moab-library/'
+license=('spdx:LGPL-3.0-or-later')
+depends=("${MINGW_PACKAGE_PREFIX}-openblas")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
-license=('spdx:LGPL-3.0+')
-url='https://sigma.mcs.anl.gov/moab-library/'
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-eigen3"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
 source=(https://ftp.mcs.anl.gov/pub/fathom/${_realname}-${pkgver}.tar.gz
         "0001-no-fortran.patch")
 sha256sums=('2404fab2d84f87be72b57cfef5ea237bfa444aaca059e66a158f22134956fe54'
@@ -37,22 +37,27 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
-    _extra_cmake_flags+=" -DENABLE_FORTRAN=OFF"
+    _extra_config+=("-DENABLE_FORTRAN=OFF")
   fi
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=OFF \
       -DENABLE_MPI=ON \
-      -DENABLE_TESTING=ON \
-      ${_extra_cmake_flags} \
+      -DENABLE_TESTING=OFF \
+      "${_extra_config[@]}" \
       ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake --build .
@@ -60,6 +65,6 @@ build() {
 
 package() {
   cd "${srcdir}/build-${MSYSTEM}"
-  DESTDIR=${pkgdir} cmake --build . --target install
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }
diff --git a/mingw-w64-mumps/PKGBUILD b/mingw-w64-mumps/PKGBUILD
index fa6665aa13..029eab2288 100644
--- a/mingw-w64-mumps/PKGBUILD
+++ b/mingw-w64-mumps/PKGBUILD
@@ -30,24 +30,24 @@ _realname=mumps
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.6.2
-pkgrel=1
+pkgrel=2
+pkgdesc="Sparse direct SLAE solver (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
-pkgdesc="Sparse direct SLAE solver (mingw-w64)"
+url="https://mumps-solver.org"
+license=('spdx:CECILL-C')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-metis"
          "${MINGW_PACKAGE_PREFIX}-parmetis"
          "${MINGW_PACKAGE_PREFIX}-scotch"
-         "${MINGW_PACKAGE_PREFIX}-scalapack"
-         "${MINGW_PACKAGE_PREFIX}-msmpi")
+         "${MINGW_PACKAGE_PREFIX}-scalapack")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-fc"
-             "${MINGW_PACKAGE_PREFIX}-pkgconf")
+             "${MINGW_PACKAGE_PREFIX}-pkgconf"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
 optdepends=("${MINGW_PACKAGE_PREFIX}-tcl: build & run test suite")
-license=('spdx:CECILL-C')
-url="https://mumps-solver.org"
 source=("https://graal.ens-lyon.fr/MUMPS/MUMPS_${pkgver}.tar.gz"
         "0001-makefile.inc.patch"
         "0002-skip-examples.patch"
diff --git a/mingw-w64-parmetis/PKGBUILD b/mingw-w64-parmetis/PKGBUILD
index e8b37b46f4..2c180b18e3 100644
--- a/mingw-w64-parmetis/PKGBUILD
+++ b/mingw-w64-parmetis/PKGBUILD
@@ -10,8 +10,10 @@ arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-metis>=5.1.0" "${MINGW_PACKAGE_PREFIX}-msmpi")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc")
+depends=("${MINGW_PACKAGE_PREFIX}-metis")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
 source=("http://glaros.dtc.umn.edu/gkhome/fetch/sw/${_realname}/parmetis-${pkgver}.tar.gz"
         "0001-mingw-w64-does-not-have-sys-resource-h.patch"
         "0002-mingw-w64-do-not-use-reserved-double-underscored-names.patch"
@@ -33,15 +35,15 @@ prepare() {
 }
 
 build() {
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   for _shared in OFF ON; do
-    cd "$srcdir"/${_realname}-${pkgver}
     mkdir -p "${srcdir}"/build-shared-${_shared}-${MSYSTEM} && cd "${srcdir}"/build-shared-${_shared}-${MSYSTEM}
-    declare -a extra_config
-    if check_option "debug" "n"; then
-      extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-    else
-      extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-    fi
     MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX="  \
       ${MINGW_PREFIX}/bin/cmake                    \
         -G'Ninja'                         \
@@ -60,8 +62,10 @@ package() {
   for _shared in OFF ON; do
     cd "${srcdir}"/build-shared-${_shared}-${MSYSTEM}
     DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
-    mkdir -p "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig"
-    echo "
+  done
+
+  mkdir -p "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig"
+  echo "
       prefix=${MINGW_PREFIX}
       libdir=\${prefix}/lib
       includedir=\${prefix}/include
@@ -73,8 +77,7 @@ package() {
       Cflags: -I\${includedir}
       Libs: -L\${libdir} -l${_realname}
     " | sed '/^\s*$/d;s/^\s*//' > "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/${_realname}.pc"
-  done
-  
+
   mv ${pkgdir}${MINGW_PREFIX}/bin/ptest{,_parmetis}.exe
   mv ${pkgdir}${MINGW_PREFIX}/bin/mtest{,_parmetis}.exe
 }
diff --git a/mingw-w64-petsc/PKGBUILD b/mingw-w64-petsc/PKGBUILD
index 7bb0a6aaa0..d458da0b83 100644
--- a/mingw-w64-petsc/PKGBUILD
+++ b/mingw-w64-petsc/PKGBUILD
@@ -33,10 +33,10 @@ _realname=petsc
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-build")
 pkgver=3.20.2
-pkgrel=3
+pkgrel=4
+pkgdesc='Sparse iterative (non)linear solver package (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-pkgdesc='Sparse iterative (non)linear solver package (mingw-w64)'
 url="https://www.mcs.anl.gov/petsc/"
 msys2_repository_url="https://gitlab.com/petsc/petsc"
 msys2_references=(
@@ -47,13 +47,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
          "${MINGW_PACKAGE_PREFIX}-hwloc"
          "${MINGW_PACKAGE_PREFIX}-metis"
-         $([[ ${CARCH} == aarch64 ]] || echo \
-           "${MINGW_PACKAGE_PREFIX}-msmpi" \
-           "${MINGW_PACKAGE_PREFIX}-parmetis")
+         $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-parmetis")
          "${MINGW_PACKAGE_PREFIX}-omp"
          "${MINGW_PACKAGE_PREFIX}-openblas")
 makedepends=('python'
              "${MINGW_PACKAGE_PREFIX}-cc"
+             $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-msmpi")
              $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc"))
 optdepends=("${MINGW_PACKAGE_PREFIX}-tcl: build & run test suite")
 source=("https://web.cels.anl.gov/projects/petsc/download/release-snapshots/${_realname}-lite-${pkgver}.tar.gz"
diff --git a/mingw-w64-scalapack/PKGBUILD b/mingw-w64-scalapack/PKGBUILD
index a711046f23..9b333825f2 100644
--- a/mingw-w64-scalapack/PKGBUILD
+++ b/mingw-w64-scalapack/PKGBUILD
@@ -4,20 +4,21 @@ _realname=scalapack
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.2.0
-pkgrel=3
+pkgrel=4
+pkgdesc="Scalable Linear Algebra PACKage (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
-pkgdesc="Scalable Linear Algebra PACKage (mingw-w64)"
+url="https://www.netlib.org/scalapack"
+msys2_repository_url="https://github.com/Reference-ScaLAPACK/scalapack/"
+license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
-         "${MINGW_PACKAGE_PREFIX}-openblas"
-         "${MINGW_PACKAGE_PREFIX}-msmpi")
+         "${MINGW_PACKAGE_PREFIX}-openblas")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-fc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
-license=('BSD')
-url="https://www.netlib.org/scalapack"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
 source=("https://www.netlib.org/${_realname}/${_realname}-${pkgver}.tgz"
         '0001-fix-building-with-flang.patch'
         '0002-scalapack-fix-bindir.patch'
@@ -50,11 +51,11 @@ prepare() {
 }
 
 build() {
-  declare -a _btype
-  if check_option "debug" "y"; then
-    _btype=Debug
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
   else
-    _btype=Release
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
   export FC=mpifort
@@ -64,24 +65,26 @@ build() {
     CFLAGS+=" -Wno-implicit-function-declaration"
   fi
 
+  # static
   mkdir -p build-${MSYSTEM}s && cd build-${MSYSTEM}s
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -G"Ninja" \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      -DCMAKE_BUILD_TYPE=${_btype} \
+      "${_extra_config[@]}" \
       -DBUILD_SHARED_LIBS=OFF \
       -DSCALAPACK_BUILD_TESTS=OFF \
       ../${_realname}-${pkgver}
   ${MINGW_PREFIX}/bin/cmake --build .
 
+  # shared
   cd "${srcdir}"
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -G"Ninja" \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      -DCMAKE_BUILD_TYPE=${_btype} \
+      "${_extra_config[@]}" \
       -DBUILD_SHARED_LIBS=ON \
       -DSCALAPACK_BUILD_TESTS=OFF \
       ../${_realname}-${pkgver}
diff --git a/mingw-w64-scotch/PKGBUILD b/mingw-w64-scotch/PKGBUILD
index 5aca25b400..8fe8255d50 100644
--- a/mingw-w64-scotch/PKGBUILD
+++ b/mingw-w64-scotch/PKGBUILD
@@ -6,16 +6,17 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-int64")
 pkgdesc='Graph partitioning and sparse matrix ordering package (mingw-w64)'
 pkgver=7.0.4
-pkgrel=2
+pkgrel=3
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-libsystre"
-         $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-msmpi"))
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
-options=('!strip' 'staticlibs')
-license=('spdx:CECILL-C')
 url="https://www.labri.fr/perso/pelegrin/scotch/"
+msys2_repository_url="https://gitlab.inria.fr/scotch/scotch"
+license=('spdx:CECILL-C')
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-libsystre")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-msmpi"))
+options=('!strip')
 source=("https://gitlab.inria.fr/scotch/scotch/-/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz"
         "Makefile.idx32.inc"
         "Makefile.idx64.inc"
diff --git a/mingw-w64-sundials/PKGBUILD b/mingw-w64-sundials/PKGBUILD
index 328685f65e..af6cebe374 100644
--- a/mingw-w64-sundials/PKGBUILD
+++ b/mingw-w64-sundials/PKGBUILD
@@ -4,7 +4,7 @@ _realname=sundials
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=6.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="SUite of Nonlinear and DIfferential/ALgebraic equation Solvers (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -22,11 +22,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-omp"
          "${MINGW_PACKAGE_PREFIX}-suitesparse"
          $([[ ${CARCH} != x86_64 ]] || echo \
-           "${MINGW_PACKAGE_PREFIX}-msmpi" \
            "${MINGW_PACKAGE_PREFIX}-petsc" \
            "${MINGW_PACKAGE_PREFIX}-superlu_dist"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake")
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             $([[ ${CARCH} != x86_64 ]] || echo "${MINGW_PACKAGE_PREFIX}-msmpi"))
 optdepends=("${MINGW_PACKAGE_PREFIX}-python: for running examples")
 source=(https://github.com/LLNL/sundials/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz
         '0001-hash-size.patch'
diff --git a/mingw-w64-superlu_dist/PKGBUILD b/mingw-w64-superlu_dist/PKGBUILD
index 1348a5c30a..ca3404c94d 100644
--- a/mingw-w64-superlu_dist/PKGBUILD
+++ b/mingw-w64-superlu_dist/PKGBUILD
@@ -4,20 +4,21 @@ _realname=superlu_dist
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=8.2.1
-pkgrel=1
+pkgrel=2
+pkgdesc="Distributed memory sparse direct linear solver (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
-pkgdesc="Distributed memory sparse direct linear solver (mingw-w64)"
 url='https://portal.nersc.gov/project/sparse/superlu/'
+msys2_repository_url="https://github.com/xiaoyeli/superlu_dist"
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-parmetis"
-         "${MINGW_PACKAGE_PREFIX}-msmpi"
          "${MINGW_PACKAGE_PREFIX}-omp")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-msmpi")
 optdepends=("${MINGW_PACKAGE_PREFIX}-tcl: build & run test suite")
 source=("https://github.com/xiaoyeli/${_realname}/archive/v${pkgver}.tar.gz"
         'all.tcl'
@@ -42,18 +43,18 @@ prepare() {
 build() {
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
-  declare -a _btype
-  if check_option "debug" "y"; then
-    _btype=Debug
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
   else
-    _btype=Release
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
   MSYS2_ARG_CONV_EXCL='-DCMAKE_INSTALL_PREFIX=' \
     ${MINGW_PREFIX}/bin/cmake \
       -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      -DCMAKE_BUILD_TYPE=${_btype} \
+      "${_extra_config[@]}" \
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_STATIC_LIBS=ON \
       -DBUILD_TESTING=OFF \