diff --git a/mingw-w64-apr-util/PKGBUILD b/mingw-w64-apr-util/PKGBUILD
index 0c37a5f0af..41c0aec1cf 100644
--- a/mingw-w64-apr-util/PKGBUILD
+++ b/mingw-w64-apr-util/PKGBUILD
@@ -4,7 +4,7 @@ _realname=apr-util
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The Apache Portable Runtime (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -24,11 +24,11 @@ license=('APACHE')
 source=(https://www.apache.org/dist/apr/${_realname}-${pkgver}.tar.bz2
         'plugins.patch'
         'fix-dll-build.patch'
-		'002-add_mod-static.patch')
+        '002-add_mod-static.patch')
 sha256sums=('d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b'
             'd79c9202ce6ddc9a67a671ec5bcf495672330a4fa7e29446fa54db793f3f09fe'
             'b33b18e612f54ea15c9303aede19e4a2b9ec2550fd081add61d13eff6446d44a'
-			'69a356e706619b48ebaeabef53bae4f6eaed45f1a61a20f4b230f2faa1f3124e')
+            '69a356e706619b48ebaeabef53bae4f6eaed45f1a61a20f4b230f2faa1f3124e')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -41,14 +41,11 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
     --with-apr=${MINGW_PREFIX} \
     --with-expat=${MINGW_PREFIX} \
@@ -72,12 +69,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   # in case of failing tests
   make -j1 check || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-aria2/PKGBUILD b/mingw-w64-aria2/PKGBUILD
index 5cb6489b73..74b01d6df8 100644
--- a/mingw-w64-aria2/PKGBUILD
+++ b/mingw-w64-aria2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=aria2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.36.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-protocol & multi-source, cross platform download utility (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -33,9 +33,7 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   # disabling gnutls and wintls so we will fall back to openssl
   ../${_realname}-release-${pkgver}/configure \
diff --git a/mingw-w64-arrow/PKGBUILD b/mingw-w64-arrow/PKGBUILD
index 60440f8cd6..1cf350b3a8 100644
--- a/mingw-w64-arrow/PKGBUILD
+++ b/mingw-w64-arrow/PKGBUILD
@@ -4,7 +4,7 @@ _realname=arrow
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=10.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -30,15 +30,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-abseil-cpp"
          "${MINGW_PACKAGE_PREFIX}-uriparser"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
-makedepends=("${MINGW_PACKAGE_PREFIX}-boost"
-             "${MINGW_PACKAGE_PREFIX}-clang"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-boost"
+             "${MINGW_PACKAGE_PREFIX}-clang"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
              "${MINGW_PACKAGE_PREFIX}-rapidjson")
-options=("staticlibs" "strip" "!buildflags")
+options=("!buildflags")
 source=("apache-arrow-${pkgver}.tar.gz"::"https://www.apache.org/dyn/closer.lua?action=download\&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz"
         "apache-arrow-${pkgver}.tar.gz.asc"::"https://www.apache.org/dyn/closer.lua?action=download\&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz.asc"
         "001-aarch64.patch")
@@ -73,8 +73,7 @@ prepare() {
 
 build() {
   [[ -d ${cpp_build_dir} ]] && rm -rf ${cpp_build_dir}
-  mkdir -p ${cpp_build_dir}
-  pushd ${cpp_build_dir}
+  mkdir -p ${cpp_build_dir} && pushd ${cpp_build_dir}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe -Wno-dev \
@@ -113,7 +112,7 @@ build() {
   [[ -d ${c_glib_build_dir} ]] && rm -rf ${c_glib_build_dir}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
+  ${MINGW_PREFIX}/bin/meson setup \
     ${c_glib_build_dir} \
     ${source_dir}/c_glib \
     --buildtype=${meson_build_type} \
diff --git a/mingw-w64-badvpn/PKGBUILD b/mingw-w64-badvpn/PKGBUILD
index a85bd6d886..3ea36d85b3 100644
--- a/mingw-w64-badvpn/PKGBUILD
+++ b/mingw-w64-badvpn/PKGBUILD
@@ -5,14 +5,15 @@ _realname=badvpn
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.999.130
-pkgrel=3
+pkgrel=4
 pkgdesc="NCD scripting language, tun2socks proxifier, P2P VPN (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/ambrop72/badvpn"
 license=('BSD')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake")
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-nspr"
          "${MINGW_PACKAGE_PREFIX}-nss"
@@ -21,12 +22,11 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ambrop72/badvpn/arc
 sha256sums=('bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109')
 
 build() {
-  mkdir -p "${srcdir}"/build-${CARCH}
-  cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G "MSYS Makefiles" \
+    -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INCLUDE_PATH="${MINGW_PREFIX}/include/nspr:${MINGW_PREFIX}/include/nss3" \
@@ -34,11 +34,11 @@ build() {
     -DBUILD_TESTS=OFF \
     ../${_realname}-${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build-${MSYSTEM}
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
   install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }
diff --git a/mingw-w64-capnproto/PKGBUILD b/mingw-w64-capnproto/PKGBUILD
index e6c214cfd5..f845fa1f37 100644
--- a/mingw-w64-capnproto/PKGBUILD
+++ b/mingw-w64-capnproto/PKGBUILD
@@ -10,7 +10,7 @@ _realname=capnproto
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Cap'n Proto serialization/RPC system (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -19,9 +19,9 @@ license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "unzip")
 source=("${_realname}-${pkgver}.zip::https://github.com/capnproto/capnproto/archive/refs/tags/v${pkgver}.zip")
 noextract=("${_realname}-${pkgver}.zip")
@@ -33,7 +33,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
 MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-civetweb/PKGBUILD b/mingw-w64-civetweb/PKGBUILD
index f71e58a2e2..15a1c97e63 100644
--- a/mingw-w64-civetweb/PKGBUILD
+++ b/mingw-w64-civetweb/PKGBUILD
@@ -4,7 +4,7 @@ _realname=civetweb
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Embedded C/C++ web server (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -15,12 +15,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-openssl"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-options=('strip' 'staticlibs')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/civetweb/civetweb/archive/v$pkgver.tar.gz")
 sha256sums=('90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9')
 
 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-cjose/PKGBUILD b/mingw-w64-cjose/PKGBUILD
index 7bc91e6d19..90dad58656 100644
--- a/mingw-w64-cjose/PKGBUILD
+++ b/mingw-w64-cjose/PKGBUILD
@@ -4,7 +4,7 @@ _realname=cjose
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="C library implementing the Javascript Object Signing and Encryption (JOSE) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -29,26 +29,28 @@ prepare() {
   cd "${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/001-cjose-0.6.1-fix-mingw-build.patch"
   autoreconf --force --install
+  sed -e "s|-Werror||g" -i src/Makefile*
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cp -r ${_realname}-${pkgver} build-${MSYSTEM} && cd build-${MSYSTEM}
+
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
     --with-openssl=${MINGW_PREFIX} \
     --with-jansson=${MINGW_PREFIX}
+
   make
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD
index 5a60c97b4e..90ee768695 100644
--- a/mingw-w64-curl/PKGBUILD
+++ b/mingw-w64-curl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-winssl")
 pkgver=7.87.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Command line tool and library for transferring data with URLs (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -18,8 +18,8 @@ _openssl_depends=("${MINGW_PACKAGE_PREFIX}-openssl"
                   "${MINGW_PACKAGE_PREFIX}-nghttp2")
 _gnutls_depends=("${MINGW_PACKAGE_PREFIX}-rtmpdump"
                  "${MINGW_PACKAGE_PREFIX}-gnutls")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
              "${_cert_depends[@]}"
              "${_openssl_depends[@]}"
              "${_gnutls_depends[@]}")
@@ -30,7 +30,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libpsl"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
-options=('staticlibs')
 source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//./_}/${_realname}-${pkgver}.tar.xz"{,.asc}
         "pathtools.c"
         "pathtools.h"
@@ -111,7 +110,6 @@ do_build() {
   fi
 
   msg2 "Building static library"
-  [[ -d "${_destdir}-static" ]] && rm -rf "${_destdir}-static"
   mkdir -p "${_destdir}-static" && cd "${_destdir}-static"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -137,7 +135,6 @@ do_build() {
   make
 
   msg2 "Building shared library"
-  [[ -d "${_destdir}-shared" ]] && rm -rf "${_destdir}-shared"
   mkdir -p "${_destdir}-shared" && cd "${_destdir}-shared"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-cyrus-sasl/PKGBUILD b/mingw-w64-cyrus-sasl/PKGBUILD
index 219535e22e..7b293a1f92 100644
--- a/mingw-w64-cyrus-sasl/PKGBUILD
+++ b/mingw-w64-cyrus-sasl/PKGBUILD
@@ -35,7 +35,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gdbm"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-sqlite3")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
-options=('emptydirs' 'strip' '!makeflags')
+options=('!makeflags')
 source=(https://github.com/cyrusimap/${_realname}/releases/download/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz{,.sig}
         pathtools.c
         pathtools.h
@@ -97,9 +97,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # Useful ref:
   # https://fedorapeople.org/cgit/elmarco/public_git/mingw32-cyrus-sasl.git/tree/mingw32-cyrus-sasl.spec
@@ -140,7 +138,7 @@ build() {
 package() {
   local _plugindir=${MINGW_PREFIX}/lib/sasl2
 
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install sasldir=${_plugindir}
 
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
diff --git a/mingw-w64-dcmtk/PKGBUILD b/mingw-w64-dcmtk/PKGBUILD
index 622ff79d6f..03a749ddd3 100644
--- a/mingw-w64-dcmtk/PKGBUILD
+++ b/mingw-w64-dcmtk/PKGBUILD
@@ -4,7 +4,7 @@ _realname=dcmtk
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=3.6.7
-pkgrel=4
+pkgrel=5
 pkgdesc="A collection of libraries and applications implementing large parts of the DICOM standard (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -19,10 +19,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-icu"
          "${MINGW_PACKAGE_PREFIX}-openjpeg2"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=("https://dicom.offis.de/download/dcmtk/dcmtk${pkgver//./}/${_realname}-${pkgver}.tar.gz"
         "001-fix-cmake-config-install-destination.patch"
         "002-properly-detect-canonical-host.patch")
@@ -40,9 +40,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${MSYSTEM}
-
   # this is just to get arith.h
   cd "${srcdir}"/${_realname}-${pkgver}
 
@@ -51,7 +48,7 @@ build() {
   install -D config/include/dcmtk/config/arith.h "${srcdir}"/build-${MSYSTEM}/config/include/dcmtk/config/arith.h
 
   # continue the build using cmake
-  cd "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-fossil/PKGBUILD b/mingw-w64-fossil/PKGBUILD
index 6ad4f757da..e0f8d94172 100644
--- a/mingw-w64-fossil/PKGBUILD
+++ b/mingw-w64-fossil/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.20
 _pkgsha=210e89a0
-pkgrel=1
+pkgrel=2
 pkgdesc='Simple, high-reliability, distributed software configuration management (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,16 +18,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-readline"
          "${MINGW_PACKAGE_PREFIX}-sqlite3"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-tcl" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-tcl")
 optdepends=("${MINGW_PACKAGE_PREFIX}-putty: SSH transport")
 source=("https://www.fossil-scm.org/home/tarball/${_pkgsha}/${_realname}-src-${pkgver}.tar.gz"
         "win.patch"
         "readline.patch"
-	"win-tcl-unix-path.patch")
+        "win-tcl-unix-path.patch")
 sha256sums=('0892ea4faa573701ca285a3d4a2d203e8abbb022affe3b1be35658845e8de721'
             '93e1bc5ff79e0df414fa0858894477bc41bc4a33fd6ec15ec3b7d5771e1d7090'
             '887c8b16de984156cb13bfdbc5715b1eff0123af0d07e6dc08265dbef0a1d519'
-	    '96090936b1aee3539211c400a4c8a7a9475c71f47238967a1924229798a2910b')
+            '96090936b1aee3539211c400a4c8a7a9475c71f47238967a1924229798a2910b')
 
 prepare() {
   cd "${srcdir}/${_realname}-src-${pkgver}"
@@ -39,9 +39,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   MSYS2_ARG_CONV_EXCL=--prefix \
   ../${_realname}-src-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-freerdp/PKGBUILD b/mingw-w64-freerdp/PKGBUILD
index ca03575d15..77830b6569 100644
--- a/mingw-w64-freerdp/PKGBUILD
+++ b/mingw-w64-freerdp/PKGBUILD
@@ -4,7 +4,7 @@ _realname=freerdp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,12 +16,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-ffmpeg"
          "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
          "${MINGW_PACKAGE_PREFIX}-libusb"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-iconv"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-options=('strip' '!debug' 'staticlibs')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.gz"
+             "${MINGW_PACKAGE_PREFIX}-iconv")
+source=("https://github.com/${_realname}/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-fix-warnings-mingw.patch"
         "0002-fix-build-errors-mingw.patch"
         "0003-remove-declspec-import-export.patch"
@@ -72,10 +71,12 @@ prepare() {
   patch -Np1 -i "${srcdir}/0007-read-QuadPart-from-LARGE_INTEGER.patch"
 
   patch -Np1 -i "${srcdir}/0008-fix-build-clang-x64.patch"
+
+  # https://github.com/FreeRDP/FreeRDP/commit/511444a6
+  rm -f cmake/FindOpenSSL.cmake
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CFLAGS+=" -Wno-format -Wno-int-conversion" \
diff --git a/mingw-w64-freetds/PKGBUILD b/mingw-w64-freetds/PKGBUILD
index f60b9e47ab..aaab31a095 100644
--- a/mingw-w64-freetds/PKGBUILD
+++ b/mingw-w64-freetds/PKGBUILD
@@ -5,7 +5,7 @@ _realname=freetds
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.3.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A free implementation of Sybase's DB-Library, CT-Library and ODBC libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -15,9 +15,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-libiconv")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('strip' '!libtool' 'staticlibs')
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 source=(https://www.freetds.org/files/stable/freetds-${pkgver}.tar.bz2
         0001-Don-t-use-MSYS2-file-libws2_32.patch)
 sha256sums=('ffb323a25450f45700f3fe9d3e3fea688678f0235bd213139519f33375dfcf24'
@@ -31,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../freetds-${pkgver}/configure \
diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD
index a3be74a6b3..2ad7f1cf8b 100644
--- a/mingw-w64-gdal/PKGBUILD
+++ b/mingw-w64-gdal/PKGBUILD
@@ -8,7 +8,7 @@ _realname=gdal
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -42,6 +42,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-armadillo"
          "${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-netcdf"
          "${MINGW_PACKAGE_PREFIX}-openjpeg2"
+         "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-pcre2"
          "${MINGW_PACKAGE_PREFIX}-poppler"
          "${MINGW_PACKAGE_PREFIX}-postgresql"
@@ -80,7 +81,6 @@ build() {
   fi
 
   msg2 "Building static library"
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -99,7 +99,6 @@ build() {
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
 
   msg2 "Building shared library"
-  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-gdcm/PKGBUILD b/mingw-w64-gdcm/PKGBUILD
index 6effc32ddb..b58cd796dc 100644
--- a/mingw-w64-gdcm/PKGBUILD
+++ b/mingw-w64-gdcm/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gdcm
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.0.20
-pkgrel=2
+pkgrel=3
 pkgdesc="The Grassroots DICOM library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -21,11 +21,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-expat"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-poppler"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-docbook-xsl"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
+             "${MINGW_PACKAGE_PREFIX}-docbook-xsl")
 source=(#"https://downloads.sourceforge.net/project/gdcm/gdcm%202.x/GDCM%20${pkgver}/gdcm-${pkgver}.tar.bz2"
         gdcm-${pkgver}.tar.gz::https://github.com/malaterre/GDCM/archive/v${pkgver}.tar.gz
         0002-cmake-config-destination.patch
@@ -73,7 +73,6 @@ build() {
   fi
 
   echo "==> Build static version"
-  [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
   mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
 
   CXXFLAGS+=" -Wno-ignored-attributes" \
@@ -114,7 +113,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   echo "==> Build shared version"
-  [[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
   mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
 
   CXXFLAGS+=" -Wno-ignored-attributes" \
diff --git a/mingw-w64-glib-networking/PKGBUILD b/mingw-w64-glib-networking/PKGBUILD
index e8f0102a8b..3c2fcb3ca0 100644
--- a/mingw-w64-glib-networking/PKGBUILD
+++ b/mingw-w64-glib-networking/PKGBUILD
@@ -4,15 +4,15 @@ _realname=glib-networking
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.74.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network-related GIO modules for glib (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://gitlab.gnome.org/GNOME/glib-networking"
 license=('spdx:LGPL-2.1-or-later')
-makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gettext"
          "${MINGW_PACKAGE_PREFIX}-glib2"
@@ -22,20 +22,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gsettings-desktop-schemas")
 replaces=("${MINGW_PACKAGE_PREFIX}-glib-openssl")
 conflicts=("${MINGW_PACKAGE_PREFIX}-glib-openssl")
-options=('staticlibs' 'strip')
 source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz")
 sha256sums=('1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b')
 
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-}
-
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson.exe \
+  ${MINGW_PREFIX}/bin/meson.exe setup \
     --prefix="${MINGW_PREFIX}" \
     --buildtype plain \
     --wrap-mode=nodownload \
diff --git a/mingw-w64-grpc/PKGBUILD b/mingw-w64-grpc/PKGBUILD
index 68d10f5e3c..03b0f72361 100644
--- a/mingw-w64-grpc/PKGBUILD
+++ b/mingw-w64-grpc/PKGBUILD
@@ -5,7 +5,7 @@ _realname=grpc
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.51.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Google's high performance, open source, general RPC framework (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -18,9 +18,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-protobuf"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-re2")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/grpc/grpc/archive/v${pkgver}.tar.gz")
 sha256sums=('b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229')
 noextract=(${_realname}-${pkgver}.tar.gz)
@@ -47,10 +47,8 @@ build() {
   CPPFLAGS="${CPPFLAGS//-D__USE_MINGW_ANSI_STDIO=1/}"
   # add STRSAFE_NO_DEPRECATE define, otherwise strsafe breaks libc++ headers
   CXXFLAGS+=" -DSTRSAFE_NO_DEPRECATE"
-  case "${MINGW_PACKAGE_PREFIX}" in
-    *-clang-x86_64*)
-    ;;
-    *-x86_64*)
+  case "${CARCH}" in
+    x86_64)
       # https://github.com/msys2/MINGW-packages/issues/8984
       LDFLAGS+=" -Wl,--disable-dynamicbase,--default-image-base-low"
     ;;
diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD
index 2af551dbb5..c24ae97212 100644
--- a/mingw-w64-gst-plugins-bad/PKGBUILD
+++ b/mingw-w64-gst-plugins-bad/PKGBUILD
@@ -6,7 +6,7 @@ _realname=gst-plugins-bad
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-gst-plugins-bad-libs" "${MINGW_PACKAGE_PREFIX}-gst-plugins-bad")
 pkgver=1.20.5
-pkgrel=2
+pkgrel=3
 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
diff --git a/mingw-w64-hexchat/PKGBUILD b/mingw-w64-hexchat/PKGBUILD
index 982a5b6c6b..e8f5641595 100644
--- a/mingw-w64-hexchat/PKGBUILD
+++ b/mingw-w64-hexchat/PKGBUILD
@@ -4,7 +4,7 @@ _realname=hexchat
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.16.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A popular and easy to use graphical IRC (chat) client (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,11 +18,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-dbus-glib"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-pango")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-iso-codes"
              "${MINGW_PACKAGE_PREFIX}-luajit"
-             "${MINGW_PACKAGE_PREFIX}-meson"
              #"${MINGW_PACKAGE_PREFIX}-perl"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-python-cffi")
 optdepends=("${MINGW_PACKAGE_PREFIX}-enchant: Spell check"
             "${MINGW_PACKAGE_PREFIX}-iso-codes: Display language names instead of codes"
diff --git a/mingw-w64-hiredis/PKGBUILD b/mingw-w64-hiredis/PKGBUILD
index 56fbd605fd..6c2df0d586 100644
--- a/mingw-w64-hiredis/PKGBUILD
+++ b/mingw-w64-hiredis/PKGBUILD
@@ -4,7 +4,7 @@ _realname=hiredis
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Minimalistic C client for Redis"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -20,7 +20,6 @@ source=("https://github.com/redis/hiredis/archive/v${pkgver}.tar.gz")
 sha256sums=('fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6')
 
 build() {
-  rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config
diff --git a/mingw-w64-htslib/PKGBUILD b/mingw-w64-htslib/PKGBUILD
index ca0880ccb1..47a50b4428 100644
--- a/mingw-w64-htslib/PKGBUILD
+++ b/mingw-w64-htslib/PKGBUILD
@@ -4,7 +4,7 @@ _realname=htslib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.16
-pkgrel=2
+pkgrel=3
 pkgdesc="library for high-throughput sequencing data formats"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -17,8 +17,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-libsystre"
          "${MINGW_PACKAGE_PREFIX}-libdeflate")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=("https://github.com/samtools/htslib/releases/download/$pkgver/$_realname-$pkgver.tar.bz2"
         0001-makefile-remove-msvc-lib.patch)
 sha256sums=('606b7c7aff73734cf033ecd156f40529fa5792f54524952a28938ca0890d7924'
diff --git a/mingw-w64-i2pd/PKGBUILD b/mingw-w64-i2pd/PKGBUILD
index f655510ffa..aace929641 100644
--- a/mingw-w64-i2pd/PKGBUILD
+++ b/mingw-w64-i2pd/PKGBUILD
@@ -5,7 +5,7 @@ _realname=i2pd
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=2.45.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A full-featured C++ implementation of the I2P router (mingw-w64)'
 url='https://i2pd.website/'
 arch=('any')
@@ -24,14 +24,12 @@ sha256sums=('4050c0a38fda06a76defbd2721f468f5b09889ed7b6b5a7e207e4659d300738f'
 noextract=("${_realname}-${pkgver}.tar.gz") # symlinks
 
 prepare() {
-  cd "${srcdir}"
   tar -xf "${_realname}-${pkgver}.tar.gz" || true
   cd "${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}"/0001-i2pd-makefile.patch
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   cp -rf "${_realname}-${pkgver}" "build-${MSYSTEM}"
   cd "${srcdir}"/build-${MSYSTEM}
 
diff --git a/mingw-w64-idevicerestore/PKGBUILD b/mingw-w64-idevicerestore/PKGBUILD
index 98ee2d5358..a2aaa52e96 100644
--- a/mingw-w64-idevicerestore/PKGBUILD
+++ b/mingw-w64-idevicerestore/PKGBUILD
@@ -4,18 +4,18 @@ _realname=idevicerestore
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A command-line application to restore firmware files to iOS devices. (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://www.libimobiledevice.org/'
 license=('GPL2+')
-options=('staticlibs')
 source=(https://github.com/libimobiledevice/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.bz2
         010-o2.patch)
 depends=("${MINGW_PACKAGE_PREFIX}-libimobiledevice"
          "${MINGW_PACKAGE_PREFIX}-libirecovery"
          "${MINGW_PACKAGE_PREFIX}-libzip"
+         "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-curl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 sha256sums=('32712e86315397fd2e8999e77a2d2f790c67f6b4aa50d4d1c64cb2c4609836f7'
@@ -29,9 +29,8 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -46,11 +45,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make check
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-ldns/PKGBUILD b/mingw-w64-ldns/PKGBUILD
index 7088a60ca9..4f90413a86 100644
--- a/mingw-w64-ldns/PKGBUILD
+++ b/mingw-w64-ldns/PKGBUILD
@@ -10,13 +10,12 @@ arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
-makedepends=("${MINGW_PACKAGE_PREFIX}-doxygen"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-python"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
+             "${MINGW_PACKAGE_PREFIX}-doxygen")
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
 optdepends=("${MINGW_PACKAGE_PREFIX}-dnssec-anchors")
-options=(strip staticlibs)
 source=("https://www.nlnetlabs.nl/downloads/${_realname}/${_realname}-${pkgver}.tar.gz"{,.asc}
         001-include-missing-header-ws2tcpip.patch
         pathtools.c
diff --git a/mingw-w64-libarchive/PKGBUILD b/mingw-w64-libarchive/PKGBUILD
index 0a14efdf74..4de72fb5d0 100644
--- a/mingw-w64-libarchive/PKGBUILD
+++ b/mingw-w64-libarchive/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libarchive
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-format archive and compression library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -22,7 +22,6 @@ depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs
          ${MINGW_PACKAGE_PREFIX}-xz
          ${MINGW_PACKAGE_PREFIX}-zlib
          ${MINGW_PACKAGE_PREFIX}-zstd)
-options=('!libtool')
 source=("https://github.com/libarchive/libarchive/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz")
 sha256sums=('9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d')
 
diff --git a/mingw-w64-libevent/PKGBUILD b/mingw-w64-libevent/PKGBUILD
index a1667dcf40..1cb7fc38c2 100644
--- a/mingw-w64-libevent/PKGBUILD
+++ b/mingw-w64-libevent/PKGBUILD
@@ -5,15 +5,15 @@ _realname=libevent
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1.12
-pkgrel=5
+pkgrel=6
 pkgdesc="An event notification library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://libevent.org"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
+depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
+         "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-openssl"
              "${MINGW_PACKAGE_PREFIX}-autotools")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python")
 source=(https://github.com/${_realname}/${_realname}/releases/download/release-${pkgver}-stable/${_realname}-${pkgver}-stable.tar.gz
@@ -34,11 +34,11 @@ build() {
   [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+  CFLAGS+=" -Wno-int-conversion" \
   ../${_realname}-${pkgver}-stable/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
     --sysconfdir=${MINGW_PREFIX}/etc
 
   make
diff --git a/mingw-w64-libgda/PKGBUILD b/mingw-w64-libgda/PKGBUILD
index 02db743ac4..fa0aa6d430 100644
--- a/mingw-w64-libgda/PKGBUILD
+++ b/mingw-w64-libgda/PKGBUILD
@@ -4,11 +4,11 @@ _realname=libgda
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.2.9
-pkgrel=3
+pkgrel=4
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
 pkgdesc="Data abstraction library based on GLib (mingw-w64)"
-license=("LGPL 2")
+license=("LGPL2")
 url="https://www.gnome-db.org/"
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-gtksourceview3"
@@ -18,23 +18,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-libsoup"
          "${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-libxslt"
-         "${MINGW_PACKAGE_PREFIX}-glade")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+         "${MINGW_PACKAGE_PREFIX}-glade"
+         "${MINGW_PACKAGE_PREFIX}-openssl")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-iso-codes"
              #"${MINGW_PACKAGE_PREFIX}-db"
              "${MINGW_PACKAGE_PREFIX}-firebird2"
              "${MINGW_PACKAGE_PREFIX}-postgresql"
              "${MINGW_PACKAGE_PREFIX}-libmariadbclient"
              "${MINGW_PACKAGE_PREFIX}-openldap"
-             "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
-             "flex"
-             "gettext"
              "gnome-doc-utils"
              "gtk-doc"
-             "libintl"
-             "patch")
-options=('strip' '!debug' 'staticlibs')
+             "intltool")
 source=(https://download.gnome.org/sources/${_realname}/${pkgver:0:3}/${_realname}-${pkgver}.tar.xz
         001-lemon.patch
         002-mysql-m4.patch
@@ -74,16 +71,13 @@ prepare() {
 }
 
 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}"
 
   # --with-java=no as CI has Java preinstlled
 
   CFLAGS+=" -Wno-deprecated-declarations" \
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
     --build=${MINGW_CHOST} \
     --prefix=${MINGW_PREFIX} \
     --libexecdir=${MINGW_PREFIX}/lib \
@@ -105,6 +99,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-libgit2/PKGBUILD b/mingw-w64-libgit2/PKGBUILD
index 3b5c917f9c..8e25474fa6 100644
--- a/mingw-w64-libgit2/PKGBUILD
+++ b/mingw-w64-libgit2/PKGBUILD
@@ -5,13 +5,12 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-winhttp")
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A linkable library for Git (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/libgit2/libgit2'
 license=('GPL2' 'custom')
-options=('strip')
 depends=("${MINGW_PACKAGE_PREFIX}-http-parser"
          "${MINGW_PACKAGE_PREFIX}-libssh2"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
@@ -19,10 +18,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-http-parser"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 _openssl_depends=("${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-cmake"
   "${MINGW_PACKAGE_PREFIX}-ninja"
   "${MINGW_PACKAGE_PREFIX}-python"
-  "${MINGW_PACKAGE_PREFIX}-cc"
 )
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz"
         "0001-libgit2-1.4.2-rc-filename.patch")
@@ -40,7 +39,6 @@ prepare() {
 do_build() {
   _variant=$1
   _destdir="${srcdir}/build-${MSYSTEM}${_variant}"
-  [[ -d "${_destdir}" ]] && rm -rf "${_destdir}"
   mkdir -p "${_destdir}" && cd "${_destdir}"
 
   declare -a _extra_config
@@ -65,6 +63,7 @@ do_build() {
     -DUSE_HTTP_PARSER=system \
     -DREGEX_BACKEND=pcre2 \
     "${_extra_config[@]}" \
+    -DBUILD_TESTS=OFF \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake --build .
@@ -77,9 +76,13 @@ build() {
 
 check() {
   cd "${srcdir}"/build-${MSYSTEM}-openssl
+  ${MINGW_PREFIX}/bin/cmake -DBUILD_TESTS=ON ../${_realname}-${pkgver}
+  ${MINGW_PREFIX}/bin/cmake --build .
   ${MINGW_PREFIX}/bin/ctest . || true
 
   cd "${srcdir}"/build-${MSYSTEM}-winhttp
+  ${MINGW_PREFIX}/bin/cmake -DBUILD_TESTS=ON ../${_realname}-${pkgver}
+  ${MINGW_PREFIX}/bin/cmake --build .
   ${MINGW_PREFIX}/bin/ctest . || true
 }
 
diff --git a/mingw-w64-libimobiledevice/PKGBUILD b/mingw-w64-libimobiledevice/PKGBUILD
index 5c07aa0034..1a9158d546 100644
--- a/mingw-w64-libimobiledevice/PKGBUILD
+++ b/mingw-w64-libimobiledevice/PKGBUILD
@@ -4,13 +4,12 @@ _realname=libimobiledevice
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc='A cross-platform protocol library to communicate with iOS devices (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://www.libimobiledevice.org/'
 license=('GPL2+')
-options=('staticlibs')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libimobiledevice/libimobiledevice/archive/${pkgver}.tar.gz"
         001-1.3.0-Fix-windows-build.patch
         002-1.3.0-Link-Iphlpapi.patch
@@ -19,7 +18,9 @@ source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libimobiledevice/libi
 depends=("${MINGW_PACKAGE_PREFIX}-libusbmuxd"
          "${MINGW_PACKAGE_PREFIX}-libplist"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-cython")
 sha256sums=('acbfb73eabee162e64c0d9de207d71c0a5f47c40cd5ad32a5097f734328ce10a'
             'c72055c417d6fd10106793fd193c64e0147240f584c9025561cb9cd28bee112d'
             '693d2df13fd344ef67e41c7a769c12843a60a7d89a825e118a40914ed407a4fb'
@@ -39,8 +40,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   PYTHON=${MINGW_PREFIX}/bin/python \
   ../${_realname}-${pkgver}/configure \
@@ -55,12 +55,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make check
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 
   rm -f ${pkgdir}${MINGW_PREFIX}/lib/python*/site-packages/*.a
diff --git a/mingw-w64-libmowgli/PKGBUILD b/mingw-w64-libmowgli/PKGBUILD
index 708e439e8c..23aea5130d 100644
--- a/mingw-w64-libmowgli/PKGBUILD
+++ b/mingw-w64-libmowgli/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libmowgli
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Performance and usability-oriented extensions to C (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -12,7 +12,6 @@ url="https://github.com/atheme"
 license=('GPL')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('staticlibs' 'strip')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/atheme/${_realname}-2/archive/v${pkgver}.tar.gz
         libmowgli-mingw-fix.patch)
 sha256sums=('b7faab2fb9f46366a52b51443054a2ed4ecdd04774c65754bf807c5e9bdda477'
@@ -23,14 +22,11 @@ prepare() {
 
   # inet_pton & inet_ntop are already defined in ws2tcpip.h
   patch -p1 -i ${srcdir}/libmowgli-mingw-fix.patch
-
-  cd ${srcdir}
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  cp -rf ${_realname}-2-${pkgver} build-${MSYSTEM}
 }
 
 build() {
-  cd ${srcdir}/build-${MSYSTEM}
+  cp -rf ${_realname}-2-${pkgver} build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libpcap/PKGBUILD b/mingw-w64-libpcap/PKGBUILD
index 657a87ed14..1a7f8a47f0 100644
--- a/mingw-w64-libpcap/PKGBUILD
+++ b/mingw-w64-libpcap/PKGBUILD
@@ -4,17 +4,16 @@ _realname=libpcap
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A system-independent interface for user-level packet capture (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://www.tcpdump.org/"
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-options=('strip' '!debug' 'staticlibs')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("https://www.tcpdump.org/release/${_realname}-${pkgver}.tar.gz"{,.sig}
         "0001-cmake-install-rpcapd-bindir.patch"
         "0002-cmake-keep-lib-prefixed-dll.patch"
@@ -34,8 +33,7 @@ prepare() {
 }
 
 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}"
 
   declare -a _extra_config
   if check_option "debug" "n"; then
@@ -57,13 +55,13 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do
diff --git a/mingw-w64-librdkafka/PKGBUILD b/mingw-w64-librdkafka/PKGBUILD
index 063f5a7023..95d1b91541 100644
--- a/mingw-w64-librdkafka/PKGBUILD
+++ b/mingw-w64-librdkafka/PKGBUILD
@@ -4,15 +4,15 @@ _realname=librdkafka
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Kafka C/C++ client library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/edenhill/librdkafka"
 license=('spdx:BSD-2-Clause')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
          "${MINGW_PACKAGE_PREFIX}-curl"
          "${MINGW_PACKAGE_PREFIX}-lz4"
diff --git a/mingw-w64-libshout/PKGBUILD b/mingw-w64-libshout/PKGBUILD
index 91bc526841..914204e7d6 100644
--- a/mingw-w64-libshout/PKGBUILD
+++ b/mingw-w64-libshout/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libshout
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for accessing a shoutcast/icecast server (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
diff --git a/mingw-w64-libsrtp/PKGBUILD b/mingw-w64-libsrtp/PKGBUILD
index 8bf6bbef97..ac4aac7da7 100644
--- a/mingw-w64-libsrtp/PKGBUILD
+++ b/mingw-w64-libsrtp/PKGBUILD
@@ -4,33 +4,28 @@ _realname=libsrtp
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for SRTP (Secure Realtime Transport Protocol) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://github.com/cisco/libsrtp'
 license=('BSD-based')
 makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-meson"
   "${MINGW_PACKAGE_PREFIX}-pkg-config"
   "${MINGW_PACKAGE_PREFIX}-doxygen"
-  "${MINGW_PACKAGE_PREFIX}-cc"
 )
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cisco/${_realname}/archive/v${pkgver}.tar.gz")
 sha256sums=('3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628')
 
-prepare() {
-  cd ${srcdir}/${_realname}-${pkgver}
-}
-
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   # crypto-library-kdf only disabled because it fails to build with openssl
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  meson \
+  ${MINGW_PREFIX}/bin/meson setup \
     --prefix="${MINGW_PREFIX}" \
     --wrap-mode=nodownload \
     --auto-features=enabled \
@@ -41,17 +36,17 @@ build() {
     -Dcrypto-library-kdf=disabled \
     ../${_realname}-${pkgver}
 
-  meson compile
+  ${MINGW_PREFIX}/bin/meson compile
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
-  meson test
+  ${MINGW_PREFIX}/bin/meson test
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
-  DESTDIR="${pkgdir}" meson install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install
 }
diff --git a/mingw-w64-libssh/PKGBUILD b/mingw-w64-libssh/PKGBUILD
index c9fc2a19c6..e5edfce885 100644
--- a/mingw-w64-libssh/PKGBUILD
+++ b/mingw-w64-libssh/PKGBUILD
@@ -4,21 +4,20 @@ _realname=libssh
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for accessing ssh client services through C libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.libssh.org/"
 license=('spdx:LGPL-2.1-or-later')
-makedepends=("${MINGW_PACKAGE_PREFIX}-pkg-config"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cmocka"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
-options=('staticlibs' 'strip')
+checkdepends=("${MINGW_PACKAGE_PREFIX}-cmocka")
 validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
 source=("https://www.libssh.org/files/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"{,.asc}
         "mingw-as-unix.patch"
@@ -54,7 +53,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     "${_extra_config[@]}" \
     -DWITH_GSSAPI=OFF \
-    -DUNIT_TESTING=ON \
+    -DUNIT_TESTING=OFF \
     -DBUILD_STATIC_LIB=ON \
     -DBUILD_SHARED_LIBS=ON \
     ../${_realname}-${pkgver}
@@ -64,6 +63,8 @@ build() {
 
 check() {
   cd "${srcdir}/build-${MSYSTEM}"
+  ${MINGW_PREFIX}/bin/cmake -DUNIT_TESTING=ON ../${_realname}-${pkgver}
+  ${MINGW_PREFIX}/bin/cmake --build .
   ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }
 
diff --git a/mingw-w64-libssh2/PKGBUILD b/mingw-w64-libssh2/PKGBUILD
index aea6d8a3c1..3bf9c3a776 100644
--- a/mingw-w64-libssh2/PKGBUILD
+++ b/mingw-w64-libssh2/PKGBUILD
@@ -5,17 +5,16 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-wincng")
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://libssh2.org/"
 license=("BSD")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-openssl"
-             "${MINGW_PACKAGE_PREFIX}-zlib"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-options=('staticlibs' 'strip')
+             "${MINGW_PACKAGE_PREFIX}-zlib")
 source=("https://libssh2.org/download/${_realname}-${pkgver}.tar.gz"{,.asc}
         fix-pkgconfig.patch)
 sha256sums=('2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51'
@@ -31,8 +30,7 @@ prepare() {
 }
 
 do_build() {
-  builddir="${srcdir}/build-${CARCH}-$1"
-  [[ -d "$builddir" ]] && rm -rf "${builddir}"
+  builddir="${srcdir}/build-${MSYSTEM}-$1"
   mkdir -p "${builddir}" && cd "${builddir}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -50,15 +48,15 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${CARCH}-openssl"
+  cd "${srcdir}/build-${MSYSTEM}-openssl"
   make check || true
 
-  cd "${srcdir}/build-${CARCH}-wincng"
+  cd "${srcdir}/build-${MSYSTEM}-wincng"
   make check || true
 }
 
 do_package() {
-  cd "${srcdir}/build-${CARCH}-$1"
+  cd "${srcdir}/build-${MSYSTEM}-$1"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
@@ -66,7 +64,7 @@ do_package() {
 
 package_libssh2() {
   depends=("${MINGW_PACKAGE_PREFIX}-openssl"
-          "${MINGW_PACKAGE_PREFIX}-zlib")
+           "${MINGW_PACKAGE_PREFIX}-zlib")
   provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-wincng")
   do_package openssl
diff --git a/mingw-w64-libtorrent-rasterbar/PKGBUILD b/mingw-w64-libtorrent-rasterbar/PKGBUILD
index 06af3629a9..785f98980a 100644
--- a/mingw-w64-libtorrent-rasterbar/PKGBUILD
+++ b/mingw-w64-libtorrent-rasterbar/PKGBUILD
@@ -7,7 +7,7 @@ _realname=libtorrent-rasterbar
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.0.8
-pkgrel=1
+pkgrel=2
 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')
@@ -21,7 +21,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
-options=('staticlibs' 'strip')
 source=("https://github.com/arvidn/libtorrent/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-no-offset-64.patch")
 sha256sums=('09dd399b4477638cf140183f5f85d376abffb9c192bc2910002988e27d69e13e'
@@ -47,8 +46,7 @@ build() {
   # https://github.com/arvidn/libtorrent/issues/6880
   CXXFLAGS+=" -Wno-narrowing"
 
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
-  mkdir "${srcdir}/build-${MINGW_CHOST}-shared" && cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  mkdir "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -63,8 +61,7 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
+  mkdir "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -81,11 +78,11 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}-static"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 
diff --git a/mingw-w64-libwebsockets/PKGBUILD b/mingw-w64-libwebsockets/PKGBUILD
index 03e7fa4c4b..38a7900efb 100644
--- a/mingw-w64-libwebsockets/PKGBUILD
+++ b/mingw-w64-libwebsockets/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libwebsockets
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="C library for websocket clients and servers (mingw-w64)"
@@ -12,13 +12,13 @@ url='https://libwebsockets.org/'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/warmcat/${_realname}/archive/v${pkgver}.tar.gz"
         001-posix-layout.patch
         002-cmake-remove-build-hash.patch)
-options=(!strip !buildflags staticlibs)
+options=(!strip !buildflags)
 sha256sums=('6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1'
             '9bdfdffc74e348692b20b08881ec682ee7aa7ba65b370199dd52f99331013cdc'
             '90ad5e561980d820ffe2c84823e4da16bfb875d205cfedab221543436ab702b7')
@@ -30,9 +30,15 @@ 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
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"Ninja" \
@@ -40,7 +46,7 @@ build() {
     -DLWS_WITH_DIR=OFF \
     -DLWS_WITHOUT_DAEMONIZE=ON \
     -DLWS_WITHOUT_TESTAPPS=ON \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
diff --git a/mingw-w64-live-media/PKGBUILD b/mingw-w64-live-media/PKGBUILD
index 74cc6b9758..8bb39f0a64 100644
--- a/mingw-w64-live-media/PKGBUILD
+++ b/mingw-w64-live-media/PKGBUILD
@@ -7,7 +7,7 @@ _realname=live-media
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2022.04.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of C++ libraries for multimedia streaming (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -15,8 +15,7 @@ license=('spdx:LGPL-3.0-or-later')
 url="http://live555.com/liveMedia"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("rsync" "${MINGW_PACKAGE_PREFIX}-cc")
-options=('staticlibs')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "rsync")
 source=("https://download.videolan.org/contrib/live555/live.${pkgver}.tar.gz"
         0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
         0002-expose-server_string.patch
@@ -49,9 +48,7 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/live
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
   # This cp is necessary since these are symlink targets but get extracted
   # later. While this shouldn't matter (symlink targets are allowed not to
   # exist on Windows as per Unix), it currently does as various MSYS2 tools
@@ -64,7 +61,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
 
   make install DESTDIR=${pkgdir} PREFIX=${MINGW_PREFIX}
   make install_shared_libraries DESTDIR=${pkgdir} PREFIX=${MINGW_PREFIX}
diff --git a/mingw-w64-minizip-ng/PKGBUILD b/mingw-w64-minizip-ng/PKGBUILD
index 9293c87c34..050d12ba98 100644
--- a/mingw-w64-minizip-ng/PKGBUILD
+++ b/mingw-w64-minizip-ng/PKGBUILD
@@ -4,7 +4,7 @@ _realname=minizip-ng
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=3.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Fork of the popular zip manipulation library found in the zlib distribution. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -12,8 +12,9 @@ url='https://github.com/zlib-ng/minizip-ng/'
 license=('spdx:Zlib')
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}2")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}2")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
@@ -31,7 +32,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -d "${srcdir}"/shared-${MSYSTEM} ]] && rm -rf "${srcdir}"/shared-${MSYSTEM}
   mkdir -p "${srcdir}"/shared-${MSYSTEM} && cd "${srcdir}"/shared-${MSYSTEM}
 
   LDFLAGS+=" -Wl,--export-all-symbols" \
@@ -54,7 +54,6 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake --build .
 
-  [[ -d "${srcdir}"/static-${MSYSTEM} ]] && rm -rf "${srcdir}"/static-${MSYSTEM}
   mkdir -p "${srcdir}"/static-${MSYSTEM} && cd "${srcdir}"/static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-mosquitto/PKGBUILD b/mingw-w64-mosquitto/PKGBUILD
index e0752eab9d..4054e56b8b 100644
--- a/mingw-w64-mosquitto/PKGBUILD
+++ b/mingw-w64-mosquitto/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mosquitto
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source MQTT Broker (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -15,12 +15,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-c-ares"
          "${MINGW_PACKAGE_PREFIX}-libwebsockets"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-winpthreads"
-             "${MINGW_PACKAGE_PREFIX}-docbook-xsl"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-options=('staticlibs' '!strip' '!buildflags')
+             "${MINGW_PACKAGE_PREFIX}-docbook-xsl")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/eclipse/mosquitto/archive/v${pkgver}.tar.gz"
         '004-mosquitto-2.0.13-make-man.patch')
 sha256sums=('26dc3f1758b00c1725a0e4dd32f40c61f374375717f09b6af2bac62c5b44f1eb'
@@ -33,14 +32,20 @@ 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
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     -DCMAKE_INSTALL_SBINDIR=bin \
     -DWITH_STATIC_LIBRARIES=ON \
     -DWITH_PIC=ON \
diff --git a/mingw-w64-mupdf/PKGBUILD b/mingw-w64-mupdf/PKGBUILD
index 76c09a7183..cc10c858ff 100644
--- a/mingw-w64-mupdf/PKGBUILD
+++ b/mingw-w64-mupdf/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools"
 )
 pkgver=1.21.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -23,6 +23,7 @@ depends=(
   "${MINGW_PACKAGE_PREFIX}-jbig2dec"
   "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
   "${MINGW_PACKAGE_PREFIX}-openjpeg2"
+  "${MINGW_PACKAGE_PREFIX}-openssl"
   "${MINGW_PACKAGE_PREFIX}-gumbo-parser"
 )
 makedepends=(
diff --git a/mingw-w64-neon/PKGBUILD b/mingw-w64-neon/PKGBUILD
index 145f24e2fd..c9f0268359 100644
--- a/mingw-w64-neon/PKGBUILD
+++ b/mingw-w64-neon/PKGBUILD
@@ -4,7 +4,7 @@ _realname=neon
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.32.4
-pkgrel=1
+pkgrel=2
 pkgdesc="HTTP and WebDAV client library with a C interface (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -13,9 +13,9 @@ license=('GPL' 'LGPL')
 depends=("${MINGW_PACKAGE_PREFIX}-expat"
          "${MINGW_PACKAGE_PREFIX}-gettext"
          "${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-ca-certificates")
+         "${MINGW_PACKAGE_PREFIX}-ca-certificates"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('libtool' 'staticlibs') # FS#16067
 source=(https://notroj.github.io/neon/${_realname}-${pkgver}.tar.gz
         0001-m4-check-libintl-functions.patch
         0002-makefile-fix-doc-dir.patch
diff --git a/mingw-w64-nodejs/PKGBUILD b/mingw-w64-nodejs/PKGBUILD
index a4ea1f95b0..c847564e1d 100644
--- a/mingw-w64-nodejs/PKGBUILD
+++ b/mingw-w64-nodejs/PKGBUILD
@@ -9,7 +9,7 @@ _realname=nodejs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=18.12.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An open-source, cross-platform JavaScript runtime environment (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
diff --git a/mingw-w64-openldap/PKGBUILD b/mingw-w64-openldap/PKGBUILD
index 9d7b1759ea..f04f0191b2 100644
--- a/mingw-w64-openldap/PKGBUILD
+++ b/mingw-w64-openldap/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openldap
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.6.3
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol (only client) (mingw-w64)"
@@ -17,7 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-libsystre"
              "groff")
-options=('strip' 'staticlibs' '!makeflags')
+options=('!makeflags')
 license=("The OpenLDAP Public License")
 url="https://www.openldap.org/"
 source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/${_realname}-${pkgver}.tgz
@@ -57,7 +57,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   unset CPPFLAGS
diff --git a/mingw-w64-opusfile/PKGBUILD b/mingw-w64-opusfile/PKGBUILD
index 8546e6005a..2425bb004e 100644
--- a/mingw-w64-opusfile/PKGBUILD
+++ b/mingw-w64-opusfile/PKGBUILD
@@ -4,7 +4,7 @@ _realname=opusfile
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.12
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for opening, seeking, and decoding .opus files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -14,7 +14,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-libogg"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-opus")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('strip' 'staticlibs')
 source=("https://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz"
         'no-openssl-wincert.patch')
 sha256sums=('118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b'
@@ -29,9 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "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} \
     --build=${MINGW_CHOST} \
@@ -44,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   # Install license
diff --git a/mingw-w64-osslsigncode/PKGBUILD b/mingw-w64-osslsigncode/PKGBUILD
index b63e28cf79..2ee31d220e 100644
--- a/mingw-w64-osslsigncode/PKGBUILD
+++ b/mingw-w64-osslsigncode/PKGBUILD
@@ -4,7 +4,7 @@ _realname=osslsigncode
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Tool for Authenticode signing of PE, CAB and MSI files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -13,7 +13,8 @@ license=("GPL3")
 depends=("${MINGW_PACKAGE_PREFIX}-curl"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake")
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/mtrojnar/${_realname}/archive/${pkgver}.tar.gz"
         "0001-fix-install-destination.patch")
 sha256sums=('1b9229fa48c2694e23aa6f85b0e33767b18d4697f422629bb10abc67c0497e0d'
@@ -35,7 +36,6 @@ prepare() {
 }
 
 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-paho.mqtt.c/PKGBUILD b/mingw-w64-paho.mqtt.c/PKGBUILD
index f525ccf069..ae232c19cf 100644
--- a/mingw-w64-paho.mqtt.c/PKGBUILD
+++ b/mingw-w64-paho.mqtt.c/PKGBUILD
@@ -5,34 +5,28 @@ _realname=paho.mqtt.c
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.3.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Eclipse Paho MQTT C client (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://eclipse.org/paho/clients/c/'
 license=('EPL/EDL')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-			 "${MINGW_PACKAGE_PREFIX}-ninja"
-			 "${MINGW_PACKAGE_PREFIX}-openssl"
-       "${MINGW_PACKAGE_PREFIX}-cc"
-			 "unzip")
-optdepends=("${MINGW_PACKAGE_PREFIX}-openssl")
-options=('strip' 'staticlibs')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+			       "${MINGW_PACKAGE_PREFIX}-cmake"
+			       "${MINGW_PACKAGE_PREFIX}-ninja"
+             "unzip")
+depends=("${MINGW_PACKAGE_PREFIX}-openssl")
 source=("${_realname}-${pkgver}.zip"::"https://github.com/eclipse/${_realname}/archive/v${pkgver}.zip")
-sha256sums=('78AEB3E114D3550C5285D7C4C805135E4AAEF0E43B278A4797E590FA58D10D06')
+sha256sums=('78aeb3e114d3550c5285d7c4c805135e4aaef0e43b278a4797e590fa58d10d06')
 noextract=("${_realname}-${pkgver}.zip")
 
 prepare() {
   unzip "${_realname}-${pkgver}.zip"
-  cd "${srcdir}"/${_realname}-${pkgver}
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
-  CFLAGS+=" -D_WINDOWS"
-  CXXFLAGS+=" -D_WINDOWS"  
   declare -a extra_config
   if check_option "debug" "n"; then
     extra_config+=("-DCMAKE_BUILD_TYPE=Release")
@@ -40,24 +34,25 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
+  CFLAGS+=" -D_WINDOWS"
+  CXXFLAGS+=" -D_WINDOWS"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       "${extra_config[@]}" \
       -DPAHO_BUILD_STATIC=ON \
-      -DPAHO_WITH_SSL=TRUE \
-	  -DPAHO_BUILD_DOCUMENTATION=FALSE \
-	  -DPAHO_BUILD_SAMPLES=TRUE \
-      -S ../${_realname}-${pkgver} \
-	  -B ./
+      -DPAHO_WITH_SSL=ON \
+	    -DPAHO_BUILD_DOCUMENTATION=OFF \
+	    -DPAHO_BUILD_SAMPLES=ON \
+      ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
 
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}"/build-${MSYSTEM}
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
   install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }
diff --git a/mingw-w64-pdal/PKGBUILD b/mingw-w64-pdal/PKGBUILD
index 58aebc196e..84cff05005 100644
--- a/mingw-w64-pdal/PKGBUILD
+++ b/mingw-w64-pdal/PKGBUILD
@@ -4,7 +4,7 @@ _realname=pdal
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A C++ library for translating and manipulating point cloud data (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -15,8 +15,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-hdf5"
-             $([[ ${MSYSTEM} == CLANGARM64 ]] || echo "${MINGW_PACKAGE_PREFIX}-tiledb"))
+             "${MINGW_PACKAGE_PREFIX}-hdf5")
+            #"${MINGW_PACKAGE_PREFIX}-tiledb")
 optdepends=("${MINGW_PACKAGE_PREFIX}-hdf5: HDF plugin, read data in the HDF format"
             "${MINGW_PACKAGE_PREFIX}-tiledb: TileDB plugin, read/write data from TileDB")
 source=("https://github.com/PDAL/PDAL/releases/download/${pkgver}/PDAL-${pkgver}-src.tar.gz"
@@ -46,7 +46,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
@@ -65,7 +64,7 @@ build() {
     -DBUILD_SHARED_LIBS=ON \
     -DWITH_TESTS=OFF \
     -DBUILD_PLUGIN_HDF=ON \
-    -DBUILD_PLUGIN_TILEDB=$([[ ${MSYSTEM} != CLANGARM64 ]] && echo "ON" || echo "OFF") \
+    -DBUILD_PLUGIN_TILEDB=OFF \
     ../PDAL-${pkgver}-src
 
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
diff --git a/mingw-w64-poco/PKGBUILD b/mingw-w64-poco/PKGBUILD
index f960cfc0d6..f3c5c43cbb 100644
--- a/mingw-w64-poco/PKGBUILD
+++ b/mingw-w64-poco/PKGBUILD
@@ -4,7 +4,7 @@ _realname=poco
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.11.6
-pkgrel=1
+pkgrel=2
 pkgdesc="POrtable COmponents C++ Libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -24,7 +24,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-postgresql"
          "${MINGW_PACKAGE_PREFIX}-sqlite3"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-options=('staticlibs' 'strip')
 source=(https://pocoproject.org/releases/${_realname}-${pkgver}/${_realname}-${pkgver}-all.tar.gz
         004-format-string-using-ostringstream.patch
         005-dont-compare-signed-unsigned.patch
@@ -81,14 +80,20 @@ build() {
     ;;
   esac
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     -DCMAKE_C_FLAGS="${CPPFLAGS} -DPCRE_STATIC ${CFLAGS}" \
     -DCMAKE_CXX_FLAGS="${CPPFLAGS} -DPCRE_STATIC ${CXXFLAGS}" \
     -DBUILD_SHARED_LIBS=OFF \
@@ -99,14 +104,13 @@ build() {
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
-  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     -DCMAKE_C_FLAGS="${CPPFLAGS} ${CFLAGS}" \
     -DCMAKE_CXX_FLAGS="${CPPFLAGS} ${CXXFLAGS}" \
     -DBUILD_SHARED_LIBS=ON \
diff --git a/mingw-w64-podofo/PKGBUILD b/mingw-w64-podofo/PKGBUILD
index 75b65afed0..3a96cd9fd8 100644
--- a/mingw-w64-podofo/PKGBUILD
+++ b/mingw-w64-podofo/PKGBUILD
@@ -4,7 +4,7 @@ _realname=podofo
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.8
-pkgrel=3
+pkgrel=4
 pkgdesc="A C++ library to work with the PDF file format (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -17,10 +17,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-fontconfig"
          "${MINGW_PACKAGE_PREFIX}-libunistring"
          "${MINGW_PACKAGE_PREFIX}-lua"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cppunit"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cppunit")
 source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz"
         "find-modules.patch"
         "fix-export.patch"
@@ -43,26 +43,32 @@ 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
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"Ninja" \
     -Wno-dev \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DFREETYPE_INCLUDE_DIR=${MINGW_PREFIX}/include/freetype2 \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     -DPODOFO_BUILD_SHARED=ON \
     -DPODOFO_HAVE_JPEG_LIB=ON \
     -DPODOFO_HAVE_PNG_LIB=ON \
     -DPODOFO_HAVE_TIFF_LIB=ON \
     ../${_realname}-${pkgver}
 
-  cmake --build .
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
   cd build-${MSYSTEM}
-  DESTDIR=${pkgdir} cmake --install .
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 }
diff --git a/mingw-w64-postgresql/PKGBUILD b/mingw-w64-postgresql/PKGBUILD
index 4c5f5b97fe..f88887d989 100644
--- a/mingw-w64-postgresql/PKGBUILD
+++ b/mingw-w64-postgresql/PKGBUILD
@@ -4,7 +4,7 @@ _realname=postgresql
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -25,7 +25,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd"
          "winpty")
-options=('staticlibs' 'strip')
 source=("https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2"
         postgresql-12.0-mingw-link.patch
         postgresql-9.5.1-pl-perl.patch
@@ -71,7 +70,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   export PYTHON=${MINGW_PREFIX}/bin/python
diff --git a/mingw-w64-python-cryptography/PKGBUILD b/mingw-w64-python-cryptography/PKGBUILD
index 21df758ffa..997ee4cfe3 100644
--- a/mingw-w64-python-cryptography/PKGBUILD
+++ b/mingw-w64-python-cryptography/PKGBUILD
@@ -4,10 +4,12 @@ _realname=cryptography
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+           "${MINGW_PACKAGE_PREFIX}-python-${_realname}3")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+          "${MINGW_PACKAGE_PREFIX}-python-${_realname}3")
 pkgver=39.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers (mingw-w64)"
 url='https://github.com/pyca/cryptography'
 license=('Apache')
@@ -16,16 +18,14 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-cffi")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-python-setuptools-rust")
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-rust"
+             "${MINGW_PACKAGE_PREFIX}-cc")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
               #"${MINGW_PACKAGE_PREFIX}-python-iso8601"
               "${MINGW_PACKAGE_PREFIX}-python-pretend"
               #"${MINGW_PACKAGE_PREFIX}-python-cryptography-vectors"
               "${MINGW_PACKAGE_PREFIX}-python-hypothesis"
               "${MINGW_PACKAGE_PREFIX}-python-pytz")
-conflicts=("${MINGW_PACKAGE_PREFIX}-python-${_realname}3")
-replaces=("${MINGW_PACKAGE_PREFIX}-python-${_realname}3")
 source=(https://pypi.io/packages/source/c/cryptography/${_realname}-${pkgver}.tar.gz
         001-disable-abi3.patch)
 sha256sums=('f964c7dcf7802d133e8dbd1565914fa0194f9d683d82411989889ecd701e8adf'
diff --git a/mingw-w64-python-pycurl/PKGBUILD b/mingw-w64-python-pycurl/PKGBUILD
index eca8e05507..9aedb78971 100644
--- a/mingw-w64-python-pycurl/PKGBUILD
+++ b/mingw-w64-python-pycurl/PKGBUILD
@@ -4,7 +4,7 @@ _realname=pycurl
 pkgbase=mingw-w64-python-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-python-${_realname}
 pkgver=7.45.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A Python 3.x interface to libcurl (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -15,24 +15,24 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
-source=(https://github.com/pycurl/${_realname}/archive/REL_${pkgver//./_}.tar.gz
+source=(https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz
         001-pycurl-setup-fix.patch
         002-pycurl-docdir-path-fix.patch)
-sha256sums=('1aaaf415a5affe141593b3edf6ce187a79d99fbeb65c0b18490b03edc606394c'
+sha256sums=('5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca'
             'cd2ea373f576b35967f99e6e183a92faf3fb0908456be2157cbf4ec44ba648d8'
             '4c9cc653e3037cc89b851958cb193d05f7580d654cf57a15fe69f5e4a3e7727a')
 
 prepare() {
-  rm -rf python-build-${MSYSTEM} | true
-  cp -r "${_realname}-REL_${pkgver//./_}" "python-build-${MSYSTEM}"
-
-  cd "python-build-${MSYSTEM}"
+  cd "${srcdir}"/${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/001-pycurl-setup-fix.patch
   patch -p1 -i ${srcdir}/002-pycurl-docdir-path-fix.patch
+
+  cd "${srcdir}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build --with-openssl \
     --curl-config=${MINGW_PREFIX}/bin/curl-config
diff --git a/mingw-w64-python-pygit2/PKGBUILD b/mingw-w64-python-pygit2/PKGBUILD
index 9ee6f01f90..d0c3ff2e70 100644
--- a/mingw-w64-python-pygit2/PKGBUILD
+++ b/mingw-w64-python-pygit2/PKGBUILD
@@ -4,20 +4,20 @@ _realname=pygit2
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Python bindings for libgit2 (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://github.com/libgit2/pygit2'
 license=('GPL2')
-depends=("${MINGW_PACKAGE_PREFIX}-libgit2>=1:1.4.0"
+depends=("${MINGW_PACKAGE_PREFIX}-libgit2"
          "${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-cffi"
          "${MINGW_PACKAGE_PREFIX}-python-cached-property")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('c352cf8712094b6fa997a24d76e906d13f02ad5f54f66ce2fb3fdc3890150546')
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('793f583fd33620f0ac38376db0f57768ef2922b89b459e75b1ac440377eb64ec')
 
 prepare() {
   cd "${srcdir}"
@@ -26,7 +26,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-qbittorrent/PKGBUILD b/mingw-w64-qbittorrent/PKGBUILD
index bb05dcd630..afc907c49a 100644
--- a/mingw-w64-qbittorrent/PKGBUILD
+++ b/mingw-w64-qbittorrent/PKGBUILD
@@ -4,22 +4,23 @@ _realname=qbittorrent
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=4.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://qbittorrent.org/"
 license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-boost"
+         "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-qt5-svg"
          "${MINGW_PACKAGE_PREFIX}-qt5-winextras"
          "${MINGW_PACKAGE_PREFIX}-libtorrent-rasterbar"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python: needed for torrent search tab")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-qt5-tools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-qt5-tools")
 source=("https://downloads.sourceforge.net/sourceforge/qbittorrent/${_realname}-${pkgver}.tar.xz"{,.asc}
         001-PROCESS_CLASS_INFORMATION-require-win8.patch
         002-winconf-prepare-env-for-mingw.patch
@@ -43,7 +44,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   cp -rf ${_realname}-${pkgver} build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ./configure \
@@ -52,6 +52,7 @@ build() {
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
     --with-boost-system=boost_system-mt
+
   make
 }
 
diff --git a/mingw-w64-qca-qt5/PKGBUILD b/mingw-w64-qca-qt5/PKGBUILD
index 4681521661..1bf0c779be 100644
--- a/mingw-w64-qca-qt5/PKGBUILD
+++ b/mingw-w64-qca-qt5/PKGBUILD
@@ -4,7 +4,7 @@ _realname=qca
 pkgbase=mingw-w64-${_realname}-qt5
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-qt5"
 pkgver=2.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt Cryptographic Architecture (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -12,11 +12,11 @@ url="https://userbase.kde.org/QCA"
 license=('LGPL')
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5-git")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-doxygen"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-doxygen")
 depends=("${MINGW_PACKAGE_PREFIX}-ca-certificates"
          "${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
          "${MINGW_PACKAGE_PREFIX}-gnupg"
@@ -50,27 +50,32 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM}
-  cd ${srcdir}/build-${MSYSTEM}
+  mkdir ${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
 
   #QC_CERTSTORE_PATH=${MINGW_PREFIX}/ssl/certs/ca-bundle.crt
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;DQC_CERTSTORE_PATH=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_botan_PLUGIN=no \
-    -DBUILD_TESTS=False \
+    ${_extra_config[@]} \
+    -DWITH_botan_PLUGIN=OFF \
+    -DBUILD_TESTS=OFF \
     -DQCA_SUFFIX=qt5 \
     -DQCA_SYSTEMSTORE_PATH=../ssl/certs/ca-bundle.crt \
     -DQCA_INSTALL_IN_QT_PREFIX=ON \
     ../${_realname}-${pkgver}.
 
-  cmake --build .
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
   cd ${srcdir}/build-${MSYSTEM}
-  DESTDIR="${pkgdir}" cmake --install .
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
 }
diff --git a/mingw-w64-rabbitmq-c/PKGBUILD b/mingw-w64-rabbitmq-c/PKGBUILD
index 5c0a946cd6..f6ef2abc7f 100644
--- a/mingw-w64-rabbitmq-c/PKGBUILD
+++ b/mingw-w64-rabbitmq-c/PKGBUILD
@@ -4,7 +4,7 @@ _realname=rabbitmq-c
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="RabbitMQ C client (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,7 +16,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-popt"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
-options=('strip' 'staticlibs')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/alanxz/${_realname}/archive/v${pkgver}.tar.gz"
         "0001-librabbitmq-CMakeLists.txt.patch")
 sha256sums=('437d45e0e35c18cf3e59bcfe5dfe37566547eb121e69fca64b98f5d2c1c2d424'
diff --git a/mingw-w64-restbed/PKGBUILD b/mingw-w64-restbed/PKGBUILD
index 4a8605b918..2c8f87217b 100644
--- a/mingw-w64-restbed/PKGBUILD
+++ b/mingw-w64-restbed/PKGBUILD
@@ -5,17 +5,18 @@ _commit=6a9b52b3b8b4b37749f9b42b669de6b9568e8552
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.7.0.r1282.6a9b52b
-pkgrel=1
+pkgrel=2
 pkgdesc="Corvusoft's Restbed framework brings asynchronous RESTful functionality to C++14 applications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/Corvusoft/restbed"
 license=('AGPL' 'CPL')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-asio"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "git")
 source=("${_realname}::git+https://github.com/Corvusoft/${_realname}#commit=$_commit"
         "0001-fix-CMakeLists.txt.patch"
         "0002-fix-dll-import-export-instructions.patch")
@@ -35,16 +36,21 @@ prepare() {
 }
 
 build() {
-  # Shared 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}
+
+  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.exe \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-      -DCMAKE_BUILD_TYPE="Release" \
-      -DBUILD_TESTS=NO \
+      ${_extra_config[@]} \
+      -DBUILD_TESTS=OFF \
       ../${_realname}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
@@ -52,13 +58,13 @@ build() {
 
 check() {
   # Shared Check
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   PATH=$PWD/src:$PATH ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
   # License
   install -Dm644 "${srcdir}/${_realname}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
diff --git a/mingw-w64-ruby/PKGBUILD b/mingw-w64-ruby/PKGBUILD
index 2aedd2c7db..3fc750d343 100644
--- a/mingw-w64-ruby/PKGBUILD
+++ b/mingw-w64-ruby/PKGBUILD
@@ -10,15 +10,15 @@ _realname=ruby
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="An object-oriented language for quick and easy programming (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://www.ruby-lang.org/en"
 license=("BSD, custom")
-makedepends=("${MINGW_PACKAGE_PREFIX}-doxygen"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-doxygen"
              "${MINGW_PACKAGE_PREFIX}-graphviz")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gdbm"
@@ -28,7 +28,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-gmp"
          "${MINGW_PACKAGE_PREFIX}-tk")
-options=('staticlibs' 'strip')
 source=("https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/${_realname}-${pkgver}.tar.gz"
         0003-fix-check-types.patch
         0007-nm-use-full-options.patch
@@ -173,7 +172,6 @@ build() {
     CXXFLAGS+=" -Wno-unknown-attributes"
   fi
 
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -184,6 +182,7 @@ build() {
     $( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && \
       echo "--with-setjmp-type=setjmp" \
            '--with-soname=$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' || true )
+
   make
 }
 
diff --git a/mingw-w64-s2geometry/PKGBUILD b/mingw-w64-s2geometry/PKGBUILD
index 11b5aaae53..fb85b8274f 100644
--- a/mingw-w64-s2geometry/PKGBUILD
+++ b/mingw-w64-s2geometry/PKGBUILD
@@ -5,7 +5,7 @@ _pyname=pywraps2
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_pyname}")
 pkgver=0.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A library for manipulating geometric shapes (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -36,7 +36,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a extra_config
diff --git a/mingw-w64-spice-gtk/001-fix-undefined-variables.patch b/mingw-w64-spice-gtk/001-fix-undefined-variables.patch
new file mode 100644
index 0000000000..657558f802
--- /dev/null
+++ b/mingw-w64-spice-gtk/001-fix-undefined-variables.patch
@@ -0,0 +1,22 @@
+--- a/src/spice-widget-egl.c
++++ b/src/spice-widget-egl.c
+@@ -67,16 +66,16 @@                         \
+ ";
+ 
+ static void apply_ortho(guint mproj, float left, float right,
+-                        float bottom, float top, float near, float far)
++                        float bottom, float top, float near_spice, float far_spice)
+ 
+ {
+     float a = 2.0f / (right - left);
+     float b = 2.0f / (top - bottom);
+-    float c = -2.0f / (far - near);
++    float c = -2.0f / (far_spice - near_spice);
+ 
+     float tx = - (right + left) / (right - left);
+     float ty = - (top + bottom) / (top - bottom);
+-    float tz = - (far + near) / (far - near);
++    float tz = - (far_spice + near_spice) / (far_spice - near_spice);
+ 
+     float ortho[16] = {
+         a, 0, 0, 0,
diff --git a/mingw-w64-spice-gtk/004-link-to-epoxy.patch b/mingw-w64-spice-gtk/004-link-to-epoxy.patch
new file mode 100644
index 0000000000..944fe0305c
--- /dev/null
+++ b/mingw-w64-spice-gtk/004-link-to-epoxy.patch
@@ -0,0 +1,13 @@
+--- a/meson.build
++++ b/meson.build
+@@ -150,8 +150,8 @@
+ summary_info += {'gtk': d.found()}
+ if d.found()
+   spice_gtk_deps += d
++  spice_gtk_deps += dependency('epoxy')
+   if host_machine.system() != 'windows'
+-    spice_gtk_deps += dependency('epoxy')
+     spice_gtk_deps += dependency('x11')
+     d = dependency('libva-x11', required: false)
+     if d.found()
+
diff --git a/mingw-w64-spice-gtk/PKGBUILD b/mingw-w64-spice-gtk/PKGBUILD
index 80a2be705d..839010b35c 100644
--- a/mingw-w64-spice-gtk/PKGBUILD
+++ b/mingw-w64-spice-gtk/PKGBUILD
@@ -4,7 +4,7 @@ _realname=spice-gtk
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.41
-pkgrel=2
+pkgrel=3
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="GTK3 widget for SPICE clients (mingw-w64)"
@@ -29,29 +29,33 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
              "${MINGW_PACKAGE_PREFIX}-python-six")
-options=('strip' '!debug' 'staticlibs')
-license=("GPL 2")
+license=("GPL2")
 url="https://www.spice-space.org/"
 source=(https://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.xz{,.sig}
+        001-fix-undefined-variables.patch
         002-export-symbols.patch
-        003-fix-keymapgen-call.patch)
+        003-fix-keymapgen-call.patch
+        004-link-to-epoxy.patch)
 sha256sums=('d8f8b5cbea9184702eeb8cc276a67d72acdb6e36e7c73349fb8445e5bca0969f'
             'SKIP'
+            '33a1a6e5c9d58b20d736f69edff4c7973e057724b0b154619388c2e569aae018'
             '3295af8a5656adad24c2b3f8858d458597f14acb00bb5782412c2a115cacf507'
-            '242e8184ab3f53bf895704276f6ffbfd7dab70aafe91f53c49db1cd39d085c64')
+            '242e8184ab3f53bf895704276f6ffbfd7dab70aafe91f53c49db1cd39d085c64'
+            'a56b0e489bc56ec1813d1eda6c6163814c4a5f1b4c919ef92c2d91a7c094ecf2')
 validpgpkeys=('206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho <me@victortoso.com>
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
   cp -p src/spice-glib-sym-file src/spice-glib-sym-file.def
   cp -p src/spice-gtk-sym-file src/spice-gtk-sym-file.def
+  patch -p1 -i ${srcdir}/001-fix-undefined-variables.patch
   patch -p1 -i ${srcdir}/002-export-symbols.patch
   patch -p1 -i ${srcdir}/003-fix-keymapgen-call.patch
+  patch -p1 -i ${srcdir}/004-link-to-epoxy.patch
 }
 
 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}"
 
   declare -a extra_config
   if [[ "${MSYSTEM}" == "CLANGARM64" ]]; then
@@ -59,7 +63,7 @@ build() {
   fi
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson.exe \
+  ${MINGW_PREFIX}/bin/meson.exe setup \
     --prefix="${MINGW_PREFIX}" \
     --buildtype=plain \
     --wrap-mode=nodownload \
@@ -74,12 +78,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/meson.exe test || true
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
 
   # Remove full path reference
diff --git a/mingw-w64-spice/PKGBUILD b/mingw-w64-spice/PKGBUILD
index d0a8f40f50..696ef415ba 100644
--- a/mingw-w64-spice/PKGBUILD
+++ b/mingw-w64-spice/PKGBUILD
@@ -2,13 +2,12 @@ _realname=spice
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.15.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="SPICE: Simple Protocol for Independent Computing Environments (mingw-w64)"
 license=("LGPLv2.1")
 url="https://www.spice-space.org/"
-options=('!emptydirs')
 depends=(
              "${MINGW_PACKAGE_PREFIX}-glib2"
              "${MINGW_PACKAGE_PREFIX}-gstreamer"
@@ -28,10 +27,10 @@ optdepends=(
              "${MINGW_PACKAGE_PREFIX}-gst-libav:        for the avenc_mjpeg GStreamer element"
 )
 makedepends=(
-             "${MINGW_PACKAGE_PREFIX}-asciidoc"
              "${MINGW_PACKAGE_PREFIX}-cc"
-             "autoconf-archive"
              "${MINGW_PACKAGE_PREFIX}-autotools"
+             "autoconf-archive"
+             "${MINGW_PACKAGE_PREFIX}-asciidoc"
 )
 source=(https://www.spice-space.org/download/releases/spice-server/${_realname}-${pkgver}.tar.bz2{,.sig})
 validpgpkeys=('206D3B352F566F3B0E6572E997D9123DE37A484F')
@@ -48,7 +47,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   # --disable-silent-rules: verbose build
diff --git a/mingw-w64-sqlcipher/PKGBUILD b/mingw-w64-sqlcipher/PKGBUILD
index 2726cbabf4..63fa82d65e 100644
--- a/mingw-w64-sqlcipher/PKGBUILD
+++ b/mingw-w64-sqlcipher/PKGBUILD
@@ -4,7 +4,7 @@ _realname=sqlcipher
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="SQLite extension that provides transparent 256-bit AES encryption of database files"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -14,9 +14,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-readline")
 makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-tcl"
+  "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-autotools"
-  "${MINGW_PACKAGE_PREFIX}-cc")
+  "${MINGW_PACKAGE_PREFIX}-tcl")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/archive/v${pkgver}.tar.gz"
         "02-fix-tcl-find.patch")
 sha256sums=('5c9d672eba6be4d05a9a8170f70170e537ae735a09c3de444a8ad629b595d5e2'
@@ -30,8 +30,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --build=${MINGW_CHOST} \
@@ -56,7 +55,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}"/${_realname}-${pkgver}
diff --git a/mingw-w64-srt/PKGBUILD b/mingw-w64-srt/PKGBUILD
index 908e17848e..3754b596c6 100644
--- a/mingw-w64-srt/PKGBUILD
+++ b/mingw-w64-srt/PKGBUILD
@@ -4,7 +4,7 @@ _realname=srt
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Secure Reliable Transport (SRT) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -13,10 +13,10 @@ url="https://www.srtalliance.org/"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/Haivision/srt/archive/v${pkgver}.tar.gz"
         0006-no-msvc-compat-headers.patch)
 sha256sums=('af891e7a7ffab61aa76b296982038b3159da690f69ade7c119f445d924b3cf53'
@@ -35,11 +35,18 @@ prepare() {
 build() {
   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
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      -DCMAKE_BUILD_TYPE=Release \
+      ${_extra_config[@]} \
       -DENABLE_SHARED=ON \
       -DENABLE_STATIC=ON \
       -DENABLE_RELATIVE_LIBPATH=ON \
diff --git a/mingw-w64-tor/PKGBUILD b/mingw-w64-tor/PKGBUILD
index 938eb1cac3..50e2a8970e 100644
--- a/mingw-w64-tor/PKGBUILD
+++ b/mingw-w64-tor/PKGBUILD
@@ -4,7 +4,7 @@ _realname=tor
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.4.7.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Anonymizing overlay network (mingw-w64)"
 url="https://www.torproject.org/"
 license=('spdx:BSD-3-Clause')
@@ -16,16 +16,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-libevent"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
 makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-ca-certificates"
+  "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-autotools"
-  "${MINGW_PACKAGE_PREFIX}-cc")
-options=('strip')
+  "${MINGW_PACKAGE_PREFIX}-ca-certificates")
 source=("https://dist.torproject.org/${_realname}-${pkgver}.tar.gz")
 sha256sums=('647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b')
 #validpgpkeys=('2133BC600AB133E1D826D173FE43009C4607B1FB') # Nick Mathewson <nickm@alum.mit.edu>
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CPPFLAGS="-isystem ${MINGW_PREFIX}/include"
diff --git a/mingw-w64-transmission/PKGBUILD b/mingw-w64-transmission/PKGBUILD
index 01c5d6cf3c..4793c5c7e0 100644
--- a/mingw-w64-transmission/PKGBUILD
+++ b/mingw-w64-transmission/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-cli"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-gtk"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-qt")
 pkgver=3.00
-pkgrel=4
+pkgrel=5
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://www.transmissionbt.com/'
@@ -27,7 +27,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-qt5-tools"
              "${MINGW_PACKAGE_PREFIX}-qt5-winextras"
              "intltool")
-options=('strip' 'staticlibs')
 source=("https://github.com/transmission/transmission-releases/raw/master/transmission-${pkgver}.tar.xz"
         "https://raw.githubusercontent.com/transmission/transmission/${pkgver}/po/pt_PT.po" # missing in tarball
         "001-transmission-3.00-openssl-3.patch")
@@ -45,7 +44,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # This icon is missing in the tarball, and does not get copied to the build directory,
@@ -123,7 +121,7 @@ package_transmission-gtk() {
 package_transmission-qt() {
   pkgdesc='Fast, easy, and free BitTorrent client - Qt GUI (mingw-w64)'
   depends+=("${MINGW_PACKAGE_PREFIX}-qt5-base"
-           "${MINGW_PACKAGE_PREFIX}-qt5-winextras")
+            "${MINGW_PACKAGE_PREFIX}-qt5-winextras")
   optdepends=("${MINGW_PACKAGE_PREFIX}-transmission-cli: daemon and web support")
 
   cd "${srcdir}/build-${MSYSTEM}/qt"
diff --git a/mingw-w64-unbound/PKGBUILD b/mingw-w64-unbound/PKGBUILD
index 75f3a721c7..4f37a06d7d 100644
--- a/mingw-w64-unbound/PKGBUILD
+++ b/mingw-w64-unbound/PKGBUILD
@@ -4,19 +4,18 @@ _realname=unbound
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Validating, recursive, and caching DNS resolver (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://unbound.net/'
 license=('spdx:BSD-3-Clause')
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-expat"
          #"${MINGW_PACKAGE_PREFIX}-libevent"
          "${MINGW_PACKAGE_PREFIX}-ldns")
-options=(strip staticlibs)
 source=("https://unbound.net/downloads/${_realname}-${pkgver}.tar.gz"{,.asc}
         'manifest')
 sha256sums=('dcbc95d7891d9f910c66e4edc9f1f2fde4dea2eec18e3af9f75aed44a02f1341'
@@ -29,9 +28,10 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   cp -f ${srcdir}/manifest anchor-update.exe.manifest
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -48,6 +48,7 @@ build() {
     --without-pyunbound \
     --without-pythonmodule \
     --with-ssl=${MINGW_PREFIX}
+
   make
 }
 
diff --git a/mingw-w64-wget/PKGBUILD b/mingw-w64-wget/PKGBUILD
index 56d886f48c..cf603d4d19 100644
--- a/mingw-w64-wget/PKGBUILD
+++ b/mingw-w64-wget/PKGBUILD
@@ -5,7 +5,7 @@ _realname=wget
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.20.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Wget retrieves files using HTTP, HTTPS and FTP (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,8 +16,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-pcre2"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-c-ares"
          "${MINGW_PACKAGE_PREFIX}-gpgme")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.lz"{,.sig}
         taskbar-progress.patch
         openssl-windows-cert-store.patch
@@ -41,7 +41,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-wget2/PKGBUILD b/mingw-w64-wget2/PKGBUILD
index 85c829adc8..09f0f4481c 100644
--- a/mingw-w64-wget2/PKGBUILD
+++ b/mingw-w64-wget2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=wget2
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Updated version of popular wget URL retrieval tool (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -20,10 +20,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-brotli"
          "${MINGW_PACKAGE_PREFIX}-xz"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
-makedepends=("${MINGW_PACKAGE_PREFIX}-doxygen"
-             "${MINGW_PACKAGE_PREFIX}-python"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-python"
+             "${MINGW_PACKAGE_PREFIX}-doxygen")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-libmicrohttpd")
 source=("https://ftp.gnu.org/gnu/wget/${_realname}-${pkgver}.tar.lz"{,.sig}
         "mingw-dllexport.patch")
@@ -44,7 +44,6 @@ build() {
   # https://github.com/msys2/MINGW-packages/issues/11743
   export gl_cv_have_weak=no
 
-  [[ -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-winsparkle/PKGBUILD b/mingw-w64-winsparkle/PKGBUILD
index 12dc800a30..953e0621d0 100644
--- a/mingw-w64-winsparkle/PKGBUILD
+++ b/mingw-w64-winsparkle/PKGBUILD
@@ -7,7 +7,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 pkgver=0.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc='App update framework for Windows, inspired by Sparkle for OS X (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
diff --git a/mingw-w64-wt/PKGBUILD b/mingw-w64-wt/PKGBUILD
index 93d96bdd6d..9da7adb406 100644
--- a/mingw-w64-wt/PKGBUILD
+++ b/mingw-w64-wt/PKGBUILD
@@ -4,7 +4,7 @@ _realname=wt
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ library and application server for developing and deploying web applications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
diff --git a/mingw-w64-xmlsec/PKGBUILD b/mingw-w64-xmlsec/PKGBUILD
index 9e87bc2108..c4daa82edc 100644
--- a/mingw-w64-xmlsec/PKGBUILD
+++ b/mingw-w64-xmlsec/PKGBUILD
@@ -4,7 +4,7 @@ _realname=xmlsec
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.2.37
-pkgrel=3
+pkgrel=4
 pkgdesc="XML Security Library is a C library based on LibXML2 (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')