diff --git a/mingw-w64-adol-c/PKGBUILD b/mingw-w64-adol-c/PKGBUILD
index 905453e179..a054a8082f 100644
--- a/mingw-w64-adol-c/PKGBUILD
+++ b/mingw-w64-adol-c/PKGBUILD
@@ -7,13 +7,13 @@ pkgver=2.7.2
 pkgrel=6
 pkgdesc='Automatic Differentiation of Algorithms written in C/C++ (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/coin-or/ADOL-C'
+license=('spdx:EPL-1.0')
 depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-omp")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-license=('EPL')
-url='https://github.com/coin-or/ADOL-C'
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=(https://github.com/coin-or/ADOL-C/archive/releases/${pkgver}.tar.gz)
 sha256sums=('701E0856BAAE91B98397960D5E0A87A549988DE9D4002D0E9A56FA08F5455F6E')
 
@@ -23,7 +23,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   local -a extra_config
diff --git a/mingw-w64-cereal/PKGBUILD b/mingw-w64-cereal/PKGBUILD
index 44a5955a5b..c3283d3e89 100644
--- a/mingw-w64-cereal/PKGBUILD
+++ b/mingw-w64-cereal/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.3.2
 pkgrel=1
 pkgdesc="A C++11 library for serialization (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://uscilab.github.io/cereal/"
 license=('spdx:BSD-3-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-boost")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-gflags")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/USCiLab/cereal/archive/v${pkgver}.tar.gz"
+source=("https://github.com/USCiLab/cereal/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "${_realname}-1.2.2.patch")
 sha256sums=('16a7ad9b31ba5880dac55d62b5d6f243c3ebc8d46a3514149e56b5e7ea81f85f'
             '1f82ffd1cac9b171ef4a60612492fef2216c851960f84543742ac4206fcc5a94')
@@ -26,9 +26,7 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  mkdir "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -Wno-unused-variable"
   CXXFLAGS+=" -Wno-unused-variable"
@@ -44,12 +42,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/ctest.exe || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
diff --git a/mingw-w64-cninja/PKGBUILD b/mingw-w64-cninja/PKGBUILD
index 707ce01e1d..9c3c00e077 100644
--- a/mingw-w64-cninja/PKGBUILD
+++ b/mingw-w64-cninja/PKGBUILD
@@ -5,11 +5,11 @@ pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=3.7.9
 pkgrel=1
-pkgdesc="cninja, an opinionated cmake config manager"
+pkgdesc="cninja, an opinionated cmake config manager (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/jcelerier/cninja"
-license=('AGPLv3')
+license=('spdx:AGPL-3.o-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-cmake"
          "${MINGW_PACKAGE_PREFIX}-clang"
          "${MINGW_PACKAGE_PREFIX}-lld"
@@ -20,8 +20,7 @@ source=("https://github.com/jcelerier/cninja/releases/download/v${pkgver}/cninja
 sha512sums=('db3b409d0e0c5250134a550fee8658110319d4a795aede757c1399650081c439d36ff5d16dda3643b41c66940cf6e99fc7e5230339bbc55590522ba58f82e92b')
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} 
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
  
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -31,12 +30,12 @@ build() {
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
      "$srcdir"
 
-  cmake --build .
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" cmake --build . --target install/strip
+  cd "$srcdir/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
 
   install -D -m644 "$srcdir/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/mingw-w64-dosbox/PKGBUILD b/mingw-w64-dosbox/PKGBUILD
index 3d2f19f41f..6488a9652f 100644
--- a/mingw-w64-dosbox/PKGBUILD
+++ b/mingw-w64-dosbox/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.80.1
 pkgrel=1
 pkgdesc="Emulator with builtin DOS for running DOS Games (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/dosbox-staging/dosbox-staging'
 license=('spdx:GPL-2.0-or-later')
 depends=(
@@ -24,17 +24,13 @@ depends=(
     "${MINGW_PACKAGE_PREFIX}-speexdsp"
     "${MINGW_PACKAGE_PREFIX}-iir"
 )
-makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pkgconf")
 source=("https://github.com/dosbox-staging/dosbox-staging/archive/refs/tags/v${pkgver}.tar.gz")
 sha256sums=('2ca69e65e6c181197b63388c60487a3bcea804232a28c44c37704e70d49a0392')
 
-prepare() {
-  cd "${srcdir}/${_forkname}-${pkgver}"
-}
-
 build() {
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
diff --git a/mingw-w64-expresscpp/PKGBUILD b/mingw-w64-expresscpp/PKGBUILD
index bc3df58a18..5db72d4c14 100644
--- a/mingw-w64-expresscpp/PKGBUILD
+++ b/mingw-w64-expresscpp/PKGBUILD
@@ -6,16 +6,16 @@ pkgver=0.20.0
 pkgrel=3
 pkgdesc='Fast, unopinionated, minimalist web framework for C++ Perfect for building REST APIs.(mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://github.com/expresscpp/expresscpp'
-license=(MIT)
+license=(spdx:MIT)
 depends=("${MINGW_PACKAGE_PREFIX}-fmt"
          "${MINGW_PACKAGE_PREFIX}-nlohmann-json"
          "${MINGW_PACKAGE_PREFIX}-boost")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=("expresscpp-${pkgver}.tar.gz::https://github.com/expresscpp/expresscpp/archive/v${pkgver}.tar.gz"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
+source=("https://github.com/expresscpp/expresscpp/archive/v${pkgver}/expresscpp-${pkgver}.tar.gz"
 "0001-Windows-dll-mingw.patch")
 sha512sums=('afe554f01d8f43253a23daea086e9b67d9593b057534929e18ead99da5e41cb826374cf8c67b3df8c25e78aa6966fdb3afa0659482f96da67cec460882aa5461'
             'a0a9bc22817835ff35c33f8dbf6311bd35d5a6a898fac1fc99427e6212ad376c314c270cf4ac8ac899f35f446ad4b361f12cd43a04b42617263518845fbd2bc7')
@@ -25,20 +25,21 @@ prepare(){
   patch -Np1 -i "${srcdir}/0001-Windows-dll-mingw.patch"
 }
 build() {
-  cd ${srcdir}/expresscpp-${pkgver}
-        MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-        ${MINGW_PREFIX}/bin/cmake \
-        -GNinja \
-        -DBUILD_SHARED_LIBS=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-        -B build-${MINGW_CHOST}
 
-  cmake --build build-${MINGW_CHOST}
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    ${MINGW_PREFIX}/bin/cmake \
+      -GNinja \
+      -DBUILD_SHARED_LIBS=ON \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      -S expresscpp-${pkgver} \
+      -B build-${MSYSTEM}
+
+  ${MINGW_PREFIX}/bin/cmake --build build-${MSYSTEM}
 }
 
 package() {
-  cd ${srcdir}/expresscpp-${pkgver}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
 
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
 }
diff --git a/mingw-w64-freeimage/PKGBUILD b/mingw-w64-freeimage/PKGBUILD
index 08bde5c351..00d18b80eb 100644
--- a/mingw-w64-freeimage/PKGBUILD
+++ b/mingw-w64-freeimage/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=13
 libver=3
 pkgdesc="Library project for developers who would like to support popular graphics image formats (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('spdx:FreeImage OR GPL-2.0-or-later')
 url="https://freeimage.sourceforge.io/"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -26,8 +26,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-iconv"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
-             "dos2unix" "make" "lndir")
-options=('strip' 'staticlibs' '!buildflags')
+             "dos2unix"
+             "lndir")
+options=('!buildflags')
 source=("https://downloads.sourceforge.net/sourceforge/freeimage/${_realname}${pkgver//./}.zip"
         'FreeImage-3.18.0_mingw-makefiles.patch'
         'FreeImage-3.18.0_unbundle.patch'
diff --git a/mingw-w64-highlight/PKGBUILD b/mingw-w64-highlight/PKGBUILD
index 4f2d756d98..5fecc66d79 100644
--- a/mingw-w64-highlight/PKGBUILD
+++ b/mingw-w64-highlight/PKGBUILD
@@ -5,15 +5,15 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.10
 pkgrel=1
-url="http://www.andre-simon.de/doku/highlight/highlight.html"
 pkgdesc="Fast and flexible source code highlighter (CLI version) (mingw-w64)"
-license=('spdx:GPL-3.0-or-later')
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="http://www.andre-simon.de/doku/highlight/highlight.html"
+msys2_repository_url="https://gitlab.com/saalen/highlight/"
 msys2_references=(
   'archlinux: highlight'
 )
-msys2_repository_url="https://gitlab.com/saalen/highlight/"
+license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-lua")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-lib2geom/PKGBUILD b/mingw-w64-lib2geom/PKGBUILD
index d2980d1c1c..3ac9fd32e5 100644
--- a/mingw-w64-lib2geom/PKGBUILD
+++ b/mingw-w64-lib2geom/PKGBUILD
@@ -7,9 +7,9 @@ pkgver=1.3
 pkgrel=2
 pkgdesc='Easy to use 2D geometry library in C++ (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://gitlab.com/inkscape/lib2geom'
-license=('spdx:LGPL-2.1-or-later' 'spdx:MPL-1.1')
+license=('spdx:LGPL-2.1-or-later OR MPL-1.1')
 depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-double-conversion"
          "${MINGW_PACKAGE_PREFIX}-glib2"
diff --git a/mingw-w64-libbsdf/PKGBUILD b/mingw-w64-libbsdf/PKGBUILD
index 958312f189..72350f0c22 100644
--- a/mingw-w64-libbsdf/PKGBUILD
+++ b/mingw-w64-libbsdf/PKGBUILD
@@ -6,22 +6,20 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.11.0
 pkgrel=1
-epoch=
 pkgdesc="Library for handling BSDF files (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/KimuraRyo/libbsdf'
 license=('spdx:MPL-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-eigen3")
-source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KimuraRyo/${_realname}/archive/v${pkgver}.tar.gz")
+source=("https://github.com/KimuraRyo/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('1f830d4a28b0c81b77ef4bfd0d8e2dadf46b4369e4d53f43a37d761566387411')
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-libodfgen/PKGBUILD b/mingw-w64-libodfgen/PKGBUILD
index 1e5d86d839..fde95bd80e 100644
--- a/mingw-w64-libodfgen/PKGBUILD
+++ b/mingw-w64-libodfgen/PKGBUILD
@@ -7,15 +7,14 @@ pkgver=0.1.8
 pkgrel=4
 pkgdesc="Library to generate ODF documents (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://sourceforge.net/p/libwpd/libodfgen/"
-license=("LGPL 2.1")
+license=("spdx:LGPL-2.1-or-later OR MPL-2.0")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-doxygen")
 depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-librevenge")
-options=(staticlibs strip)
 source=("https://sourceforge.net/projects/libwpd/files/libodfgen/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz")
 sha256sums=('55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625')
 
@@ -25,9 +24,10 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  cp -r ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  cp -r ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}"
+
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LGPL" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LGPL"
diff --git a/mingw-w64-libtorrent-rasterbar/PKGBUILD b/mingw-w64-libtorrent-rasterbar/PKGBUILD
index 50e37a2c6c..4fa482b64d 100644
--- a/mingw-w64-libtorrent-rasterbar/PKGBUILD
+++ b/mingw-w64-libtorrent-rasterbar/PKGBUILD
@@ -10,8 +10,8 @@ pkgver=2.0.9
 pkgrel=1
 pkgdesc="libtorrent is a feature complete C++ bittorrent implementation focusing on efficiency and scalability (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=('BSD')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+license=('spdx:BSD-3-Clause')
 url="https://libtorrent.org/"
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}2")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}2")
diff --git a/mingw-w64-libvncserver/PKGBUILD b/mingw-w64-libvncserver/PKGBUILD
index a743cf553c..fecbd7a9f9 100644
--- a/mingw-w64-libvncserver/PKGBUILD
+++ b/mingw-w64-libvncserver/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=0.9.14
 pkgrel=1
 pkgdesc="Cross-platform C libraries that allow you to easily implement VNC server or client functionality (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://libvnc.github.io/"
-license=('GPL2')
+msys2_repository_url="https://github.com/LibVNC/libvncserver"
+license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gnutls"
          "${MINGW_PACKAGE_PREFIX}-libpng"
@@ -29,7 +30,6 @@ source=("https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${pkgver}.t
 sha256sums=('83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5')
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-libwpg/PKGBUILD b/mingw-w64-libwpg/PKGBUILD
index 509b253b43..5f2010dad2 100644
--- a/mingw-w64-libwpg/PKGBUILD
+++ b/mingw-w64-libwpg/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=0.3.4
 pkgrel=1
 pkgdesc="Library to read and parse graphics in WordPerfect Graphics format (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://libwpg.sourceforge.io/"
-license=('spdx:LGPL-2.1-or-later' 'spdx:MPL-2.0')
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-boost"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+license=('spdx:LGPL-2.1-or-later OR MPL-2.0')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-boost")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-librevenge"
          "${MINGW_PACKAGE_PREFIX}-libwpd")
diff --git a/mingw-w64-mapbox-earcut/PKGBUILD b/mingw-w64-mapbox-earcut/PKGBUILD
index 254e7e084a..82066d350f 100644
--- a/mingw-w64-mapbox-earcut/PKGBUILD
+++ b/mingw-w64-mapbox-earcut/PKGBUILD
@@ -8,23 +8,23 @@ pkgver=1.0.1
 pkgrel=2
 pkgdesc="Python bindings for the mapbox earcut C++ polygon triangulation library. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/skogler/mapbox_earcut_python'
 msys2_references=(
   'aur: python-mapbox-earcut'
   'pypi: mapbox-earcut'
 )
-url='https://pypi.org/project/mapbox-earcut/'
 license=('spdx:ISC')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-pybind11"
   "${MINGW_PACKAGE_PREFIX}-python"
   "${MINGW_PACKAGE_PREFIX}-python-numpy"
 )
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-pybind11"
-             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-pybind11"
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake")
 source=(
   "${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
 )
diff --git a/mingw-w64-mscgen/PKGBUILD b/mingw-w64-mscgen/PKGBUILD
index 6f2f941623..12c8b82e9a 100644
--- a/mingw-w64-mscgen/PKGBUILD
+++ b/mingw-w64-mscgen/PKGBUILD
@@ -7,12 +7,13 @@ pkgver=0.20
 pkgrel=2
 pkgdesc="Message Sequence Chart Generator (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.mcternan.me.uk/mscgen/'
-license=('GPL')
+license=('spdx:GPL-2.0-only')
 depends=("${MINGW_PACKAGE_PREFIX}-libgd"
          "${MINGW_PACKAGE_PREFIX}-freetype")
-makedepends=("flex" "bison" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=("https://www.mcternan.me.uk/mscgen/software/${_realname}-src-${pkgver}.tar.gz"
         "0.20-escape.patch"
         "0.20-language.patch"
@@ -33,14 +34,11 @@ prepare() {
   # getenv_s is declared differently in stdlib_s.h (error: conflicting types for 'getenv_s')
   # rename it to avoid compiling error
   patch -p1 -i ${srcdir}/0.20-mingw-fix.patch
-
-  cd ${srcdir}
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  cp -rf ${_realname}-${pkgver} build-${MSYSTEM}
 }
 
 build() {
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-nvidia-cg-toolkit/PKGBUILD b/mingw-w64-nvidia-cg-toolkit/PKGBUILD
index 7b93c505dd..89417d16b4 100644
--- a/mingw-w64-nvidia-cg-toolkit/PKGBUILD
+++ b/mingw-w64-nvidia-cg-toolkit/PKGBUILD
@@ -8,10 +8,13 @@ pkgver=3.1
 pkgrel=2
 pkgdesc="NVIDIA Cg libraries (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://developer.nvidia.com/cg-toolkit"
 license=("custom")
-makedepends=("dos2unix" "${MINGW_PACKAGE_PREFIX}-innoextract" "${MINGW_PACKAGE_PREFIX}-tools" "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-innoextract"
+             "${MINGW_PACKAGE_PREFIX}-tools"
+             "dos2unix")
 depends=("${MINGW_PACKAGE_PREFIX}-crt")
 options=('!strip')
 source=("https://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_Setup.exe")
diff --git a/mingw-w64-openvdb/PKGBUILD b/mingw-w64-openvdb/PKGBUILD
index 98f52cd3d8..92866ec654 100644
--- a/mingw-w64-openvdb/PKGBUILD
+++ b/mingw-w64-openvdb/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=11.0.0
 pkgrel=1
 pkgdesc="Sparse volume data structure and tools (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64' 'mingw32' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.openvdb.org/"
 msys2_repository_url="https://github.com/AcademySoftwareFoundation/openvdb"
 msys2_references=(
diff --git a/mingw-w64-pdf2svg/PKGBUILD b/mingw-w64-pdf2svg/PKGBUILD
index 5e088139bb..069d612c15 100644
--- a/mingw-w64-pdf2svg/PKGBUILD
+++ b/mingw-w64-pdf2svg/PKGBUILD
@@ -7,19 +7,19 @@ pkgver=0.2.3
 pkgrel=18
 pkgdesc="A pdf to svg converter (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="http://www.cityinthesky.co.uk/opensource/pdf2svg/"
-license=('GPL')
+msys2_repository_url="https://github.com/dawbarton/pdf2svg"
+license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-poppler")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/dawbarton/pdf2svg/archive/v${pkgver}.tar.gz)
+source=(https://github.com/dawbarton/pdf2svg/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('4fb186070b3e7d33a51821e3307dce57300a062570d028feccd4e628d50dea8a')
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
      --prefix=${MINGW_PREFIX} \
@@ -30,7 +30,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${MINGW_CHOST}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
   
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
diff --git a/mingw-w64-pngquant/PKGBUILD b/mingw-w64-pngquant/PKGBUILD
index 419b0447b1..5ed2c9b6b3 100644
--- a/mingw-w64-pngquant/PKGBUILD
+++ b/mingw-w64-pngquant/PKGBUILD
@@ -7,14 +7,14 @@ pkgver=2.17.0
 pkgrel=1
 pkgdesc="Command-line utility to quantize PNGs down to 8-bit paletted PNGs (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://pngquant.org/'
-license=("BSD")
+license=("spdx:GPL-3.0-or-later")
 depends=("${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-lcms2"
          "${MINGW_PACKAGE_PREFIX}-libimagequant")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/kornelski/${_realname}/archive/${pkgver}.tar.gz")
+source=("https://github.com/kornelski/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('bc1baa43c814b4416bb63d7b2168d4e5395cfc69a00f8997a595361caa507887')
 
 prepare() {
diff --git a/mingw-w64-prjtrellis/PKGBUILD b/mingw-w64-prjtrellis/PKGBUILD
index 1c4905a932..745e194282 100644
--- a/mingw-w64-prjtrellis/PKGBUILD
+++ b/mingw-w64-prjtrellis/PKGBUILD
@@ -7,13 +7,13 @@ pkgver=1.4
 pkgrel=3
 pkgdesc="Documenting the Lattice ECP5 bit-stream format (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/YosysHQ/prjtrellis"
 license=('spdx:MIT')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 depends=(
   "${MINGW_PACKAGE_PREFIX}-boost"
-  $([[ ${MSYSTEM} == MINGW32 ]] || echo "${MINGW_PACKAGE_PREFIX}-python")  # memory footprint of cc1plus is too large for mingw32
+  "${MINGW_PACKAGE_PREFIX}-python"
 )
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
@@ -21,10 +21,8 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-ninja"
   "git"
 )
-
 _commit_db='35d900a94ff0db152679a67bf6e4fbf40ebc34aa'
-
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/YosysHQ/prjtrellis/archive/refs/tags/${pkgver}.tar.gz"
+source=("https://github.com/YosysHQ/prjtrellis/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
         "${_realname}-db"::"git+https://github.com/YosysHQ/prjtrellis-db.git#commit=${_commit_db}")
 sha256sums=('46fe9d98676953e0cccf1d6332755d217a0861e420f1a12dabfda74d81ccc147'
             'SKIP')
@@ -44,18 +42,15 @@ build() {
     _extra_config+=(-DCMAKE_BUILD_TYPE=Release)
   fi
 
-  if [[ ${MSYSTEM} == MINGW32 ]]; then
-    _extra_config+=("-DBUILD_PYTHON=OFF")
-  else
-    _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
-    _extra_config+=("-DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python" "-DPython3_LIBRARY=${MINGW_PREFIX}/lib/libpython${_pyver}.dll.a")
-  fi
+  _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -GNinja \
       -DCMAKE_PREFIX_PATH="${MINGW_PREFIX}" \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+      -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
+      -DPython3_LIBRARY=${MINGW_PREFIX}/lib/libpython${_pyver}.dll.a \
       "${_extra_config[@]}" \
       ../${_realname}-${pkgver}/libtrellis
 
diff --git a/mingw-w64-python-contourpy/PKGBUILD b/mingw-w64-python-contourpy/PKGBUILD
index 66ff7e8d2e..79d2b75a5e 100644
--- a/mingw-w64-python-contourpy/PKGBUILD
+++ b/mingw-w64-python-contourpy/PKGBUILD
@@ -7,13 +7,13 @@ pkgver=1.2.0
 pkgrel=1
 pkgdesc="Python library for calculating contours of 2D quadrilateral grids (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://contourpy.readthedocs.io/'
+msys2_repository_url='https://github.com/contourpy/contourpy/'
 msys2_references=(
   'archlinux: python-contourpy'
   'pypi: contourpy'
 )
-msys2_repository_url='https://github.com/contourpy/contourpy/'
-url='https://contourpy.readthedocs.io/'
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-numpy")
diff --git a/mingw-w64-python-pptx/PKGBUILD b/mingw-w64-python-pptx/PKGBUILD
index 346085cccf..8ad9fdaae4 100644
--- a/mingw-w64-python-pptx/PKGBUILD
+++ b/mingw-w64-python-pptx/PKGBUILD
@@ -10,13 +10,13 @@ replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.6.23
 pkgrel=1
 pkgdesc="Create Open XML PowerPoint documents in Python (mingw-w64)"
-url="https://github.com/scanny/python-pptx"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(
   'aur: python-pptx'
   'pypi: python-pptx'
 )
+url="https://github.com/scanny/python-pptx"
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python-lxml"
          "${MINGW_PACKAGE_PREFIX}-python-pillow"
diff --git a/mingw-w64-python-pyscroll/PKGBUILD b/mingw-w64-python-pyscroll/PKGBUILD
index 7d1fc166ec..a9efcf1a81 100644
--- a/mingw-w64-python-pyscroll/PKGBUILD
+++ b/mingw-w64-python-pyscroll/PKGBUILD
@@ -7,14 +7,14 @@ pkgver=2.29
 pkgrel=2
 pkgdesc="Make scrolling games with animated maps in pygame (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/bitcraft/pyscroll"
-license=('LGPL')
+license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-pygame")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python-pytmx: Support for pytmx loaded maps from Tiled Map Editor")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=("${_realname}-$pkgver.tar.gz::${url}/archive/v${pkgver}.tar.gz")
+source=("${url}/archive/v${pkgver}/${_realname}-$pkgver.tar.gz")
 sha256sums=('21ef22c2261e48aa4ac976fff899a2cfc244fa948ffec4cb910a2c89e3b171ea')
 
 prepare() {
@@ -23,7 +23,6 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
diff --git a/mingw-w64-rubberband/PKGBUILD b/mingw-w64-rubberband/PKGBUILD
index ab3f55ccdd..fdd4f22536 100644
--- a/mingw-w64-rubberband/PKGBUILD
+++ b/mingw-w64-rubberband/PKGBUILD
@@ -7,14 +7,14 @@ pkgver=3.3.0
 pkgrel=1
 pkgdesc="High quality software library for audio time-stretching and pitch-shifting. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://breakfastquay.com/rubberband/"
 license=('spdx:GPL-2.0-or-later')
-makedepends=("${MINGW_PACKAGE_PREFIX}-boost"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-pkgconf")
+             "${MINGW_PACKAGE_PREFIX}-pkgconf"
+             "${MINGW_PACKAGE_PREFIX}-boost")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-libsamplerate"
diff --git a/mingw-w64-sigutils/PKGBUILD b/mingw-w64-sigutils/PKGBUILD
index a29c705c23..5a94129ff1 100644
--- a/mingw-w64-sigutils/PKGBUILD
+++ b/mingw-w64-sigutils/PKGBUILD
@@ -5,16 +5,16 @@ pkgver=0.3.0
 pkgrel=1
 pkgdesc="Small signal processing utility library  (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/BatchDrake/sigutils"
-license=('LGPL')
+license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-libsndfile"
          "${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-volk")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-make"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=(https://github.com/BatchDrake/sigutils/archive/refs/tags/v${pkgver}.tar.gz
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-make")
+source=(https://github.com/BatchDrake/sigutils/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz
         "0001-fix-dll-install-location.patch")
 sha256sums=('f39686bf78d7773f6e0305c27d7b5db7950b96dd40f89eefb307331daf49b0e9'
             'f01130ccf47656f7b209e45596d470c5af4c8cd0031d3518b9438913c5669694')
diff --git a/mingw-w64-thrift/PKGBUILD b/mingw-w64-thrift/PKGBUILD
index 8601906b59..516a86d31f 100644
--- a/mingw-w64-thrift/PKGBUILD
+++ b/mingw-w64-thrift/PKGBUILD
@@ -9,16 +9,16 @@ pkgver=0.19.0
 pkgrel=1
 pkgdesc="Apache Thrift is a software framework for scalable cross-language services development (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://thrift.apache.org/'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-boost"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-boost")
 source=("https://archive.apache.org/dist/thrift/${pkgver}/${_realname}-${pkgver}.tar.gz"{,.asc}
         001-math-define-pi.patch
         002-thrift-add-stdint.patch)
diff --git a/mingw-w64-usql/PKGBUILD b/mingw-w64-usql/PKGBUILD
index 8926eed3a9..480bfb789c 100644
--- a/mingw-w64-usql/PKGBUILD
+++ b/mingw-w64-usql/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.8.1
 pkgrel=3
 pkgdesc="SQL parser engine for C++ (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/cybergarage/usql"
 license=('custom')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -16,19 +16,18 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-boost")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools" \
              "${checkdepends[@]}")
-source=("${_realname}-${pkgver}.tar.gz::https://codeload.github.com/cybergarage/usql/tar.gz/${pkgver}"
-        "${_realname}-${pkgver}.patch")
+source=("https://github.com/cybergarage/usql/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+        "usql-0.8.1.patch")
 sha256sums=('a4d928692bdf4e7380dde40ae09c4ed4a3cdb8ae0b3b7ab5a268d884e45d9add'
             '1714a4e70a8d5ab4cbd55da8f2241b6c2672284b7b24f94ddd0dfd98bbb3ec31')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -Np1 -i "../${_realname}-${pkgver}.patch"
+  patch -Np1 -i "../usql-0.8.1.patch"
   autoreconf -fvi
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-vera++/PKGBUILD b/mingw-w64-vera++/PKGBUILD
index 2f2215f6ec..b63375ce07 100644
--- a/mingw-w64-vera++/PKGBUILD
+++ b/mingw-w64-vera++/PKGBUILD
@@ -7,14 +7,14 @@ pkgver=1.3.0
 pkgrel=8
 pkgdesc="A programmable tool for verification, analysis and transformation of C++ source code"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://bitbucket.org/verateam/vera"
 license=('spdx:BSL-1.0')
-depends=(${MINGW_PACKAGE_PREFIX}-tcl
-         ${MINGW_PACKAGE_PREFIX}-boost
-         ${MINGW_PACKAGE_PREFIX}-python)
-makedepends=(${MINGW_PACKAGE_PREFIX}-cmake
-             "${MINGW_PACKAGE_PREFIX}-cc")
+depends=("${MINGW_PACKAGE_PREFIX}-tcl"
+         "${MINGW_PACKAGE_PREFIX}-boost"
+         "${MINGW_PACKAGE_PREFIX}-python")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake")
 source=(https://bitbucket.org/verateam/vera/downloads/${_realname}-${pkgver}.tar.gz
         0001-fix_python_detection_issues.patch)
 sha256sums=('9415657a09438353489db10ca860dd6459e446cfd9c649a1a2e02268da66f270'
@@ -26,8 +26,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -r build-${MINGW_CHOST}
-  mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -38,10 +37,10 @@ build() {
     -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python \
     ../${_realname}-${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
-  cd build-${MINGW_CHOST}
-  make DESTDIR="${pkgdir}" install
+  cd build-${MSYSTEM}
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
 }
diff --git a/mingw-w64-yaml-cpp/PKGBUILD b/mingw-w64-yaml-cpp/PKGBUILD
index 109d35ed50..9bbd79f29d 100644
--- a/mingw-w64-yaml-cpp/PKGBUILD
+++ b/mingw-w64-yaml-cpp/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.8.0
 pkgrel=1
 pkgdesc="A YAML parser and emitter in C++ matching the YAML 1.2 spec (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/jbeder/yaml-cpp"
 license=("spdx:MIT")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-boost")
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/jbeder/yaml-cpp/archive/${pkgver}.tar.gz)
+source=(https://github.com/jbeder/yaml-cpp/archive/${pkgver}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16')
 
 build() {