diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD
index 439c000b04..46f795be14 100644
--- a/mingw-w64-gdal/PKGBUILD
+++ b/mingw-w64-gdal/PKGBUILD
@@ -8,15 +8,14 @@ _realname=gdal
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://gdal.org/"
 license=('custom')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-postgresql")
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-cfitsio"
          "${MINGW_PACKAGE_PREFIX}-crypto++"
          "${MINGW_PACKAGE_PREFIX}-curl"
@@ -122,4 +121,7 @@ package () {
 
   # install license
   install -D -m644 LICENSE.TXT "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+
+  local PREFIX_WIN=$(cygpath -am ${MINGW_PREFIX})
+  sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/gdal-config
 }
diff --git a/mingw-w64-libgeotiff/PKGBUILD b/mingw-w64-libgeotiff/PKGBUILD
index ae67736059..af676927b1 100644
--- a/mingw-w64-libgeotiff/PKGBUILD
+++ b/mingw-w64-libgeotiff/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libgeotiff
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="TIFF based interchange format for georeferenced raster imagery (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
diff --git a/mingw-w64-libspatialite/PKGBUILD b/mingw-w64-libspatialite/PKGBUILD
index 95aa31f64d..b1701ae846 100644
--- a/mingw-w64-libspatialite/PKGBUILD
+++ b/mingw-w64-libspatialite/PKGBUILD
@@ -7,13 +7,14 @@ _realname=libspatialite
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="SQLite extension to support spatial data types and operations (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://www.gaia-gis.it/fossil/libspatialite/index"
 license=('MPL' 'GPL' 'LGPL')
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-geos"
          "${MINGW_PACKAGE_PREFIX}-librttopo"
          "${MINGW_PACKAGE_PREFIX}-libfreexl"
@@ -44,9 +45,9 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
-  
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
@@ -59,7 +60,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   # Fix mod_spatialite location to be possible: SELECT load_extension('mod_spatialite');
   mv "${pkgdir}${MINGW_PREFIX}/lib/mod_spatialite.dll" "${pkgdir}${MINGW_PREFIX}/bin/"
diff --git a/mingw-w64-postgis/PKGBUILD b/mingw-w64-postgis/PKGBUILD
index 5d1c8424ff..6ca4e38eda 100644
--- a/mingw-w64-postgis/PKGBUILD
+++ b/mingw-w64-postgis/PKGBUILD
@@ -4,7 +4,7 @@ _realname=postgis
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.1.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Spatial and Geographic objects for PostgreSQL (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -19,8 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-postgresql"
          #"${MINGW_PACKAGE_PREFIX}-protobuf-c"
          "${MINGW_PACKAGE_PREFIX}-proj"
-         $([[ ${MSYSTEM} == MINGW* ]] && echo "${MINGW_PACKAGE_PREFIX}-gdal")
-         )
+         "${MINGW_PACKAGE_PREFIX}-gdal")
 options=('staticlibs' 'strip')
 source=("https://download.osgeo.org/postgis/source/${_realname}-${pkgver}.tar.gz"
         pg_config)
@@ -43,7 +42,6 @@ build() {
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
     --without-protobuf \
-    $( [[ ${MSYSTEM} == MINGW* ]] || echo --without-raster ) \
     --with-pgconfig=${srcdir}/pg_config
 
   make
diff --git a/mingw-w64-shapelib/PKGBUILD b/mingw-w64-shapelib/PKGBUILD
index af106b4550..654d870156 100644
--- a/mingw-w64-shapelib/PKGBUILD
+++ b/mingw-w64-shapelib/PKGBUILD
@@ -4,29 +4,23 @@ _realname=shapelib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="simple C API for reading and writing ESRI Shapefiles (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="http://shapelib.maptools.org/"
 license=("LGPL" "MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-proj")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=(strip staticlibs)
 source=("https://download.osgeo.org/shapelib/${_realname}-${pkgver}.tar.gz")
 sha256sums=('1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1')
 
-prepare() {
-  cd ${srcdir}/${_realname}-${pkgver}
-}
-
 build() {
   #export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
-  
-  CPPFLAGS+=" -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
-  
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -38,7 +32,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
   find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
 }
diff --git a/mingw-w64-spatialite-gui/PKGBUILD b/mingw-w64-spatialite-gui/PKGBUILD
index b3cc10e766..2d422c7eac 100644
--- a/mingw-w64-spatialite-gui/PKGBUILD
+++ b/mingw-w64-spatialite-gui/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pkgver=2.1.0-beta1
 pkgver=${_pkgver/-beta1/}
-pkgrel=3
+pkgrel=4
 pkgdesc='spatialite-gui is an open source Graphical User Interface (GUI) tool supporting SpatiaLite (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -15,6 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-libspatialite"
          "${MINGW_PACKAGE_PREFIX}-librasterlite2"
          "${MINGW_PACKAGE_PREFIX}-libxlsxwriter"
+         "${MINGW_PACKAGE_PREFIX}-proj"
          "${MINGW_PACKAGE_PREFIX}-virtualpg"
          "${MINGW_PACKAGE_PREFIX}-wxWidgets")
 options=('strip' 'staticlibs')
@@ -33,8 +34,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realpath}/configure \
     --host=${MINGW_CHOST} \
@@ -46,7 +47,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR=${pkgdir} install
 }