diff --git a/databases/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile
index 24116ef6db97..4f5be13a2b43 100644
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	spatialite-tools
 PORTVERSION=	5.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Collection of CLI tools supporting SpatiaLite
 WWW=		http://www.gaia-gis.it/fossil/spatialite-tools/index
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libfreexl.so:textproc/freexl \
 		libexpat.so:textproc/expat2 \
 		libspatialite.so:databases/spatialite \
 		libreadosm.so:astro/readosm
 
 GNU_CONFIGURE=	yes
 USES=		gmake gnome iconv minizip pkgconfig sqlite
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile
index 30d31168bec8..5f868431c4e0 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	spatialite
 PORTVERSION=	5.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/libspatialite-sources/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Spatial Extensions for SQLite
 WWW=		https://www.gaia-gis.it/gaia-sins/
 
 LICENSE=	GPLv2 # Only GPLv2 since we enable rttopo and gcp
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libfreexl.so:textproc/freexl \
 		librttopo.so:devel/librttopo
 
 GNU_CONFIGURE=	yes
 USES=		gmake gnome iconv libtool pathfix minizip pkgconfig sqlite
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS+=	--enable-gcp=yes --enable-libxml2=yes --enable-rttopo=yes \
 			CFLAGS="${CFLAGS}" \
 			LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 INSTALL_TARGET=install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.am
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index a29336a94535..683a8b808317 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	spatialite_gui
 DISTVERSION=	2.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 DISTVERSIONSUFFIX=	-beta1
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Graphical User Interface (GUI) tool supporting SpatiaLite
 WWW=		https://www.gaia-gis.it/fossil/spatialite_gui/index
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librasterlite2.so:graphics/librasterlite2 \
 		libfreexl.so:textproc/freexl \
 		libspatialite.so:databases/spatialite \
 		libxlsxwriter.so:math/libxlsxwriter \
 		libvirtualpg.so:databases/virtualpg \
 		librttopo.so:devel/librttopo \
 		libcurl.so:ftp/curl \
 		libminizip.so:archivers/minizip \
 		libproj.so:graphics/proj \
 		libgeos_c.so:graphics/geos
 
 USES=		compiler:c++11-lang gmake gnome iconv localbase:ldflags \
 		pgsql pkgconfig sqlite
 USE_WX=		3.0
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 
 CPPFLAGS+=	`${WX_CONFIG} --cppflags`
 LDFLAGS+=	${ICONV_LIB} `${WX_CONFIG} --libs` -lsqlite3
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		--with-wxconfig=${WX_CONFIG}
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 0b55926c8b37..50d0519cad92 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,220 +1,220 @@
 PORTNAME=	gdal
 PORTVERSION=	3.7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 WWW=		https://gdal.org/ \
 		https://github.com/OSGeo/gdal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	libgeotiff>=1.5.0:graphics/libgeotiff \
 		proj>=6,1:graphics/proj
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++17-lang cpe iconv jpeg localbase pkgconfig ssl tar:xz
 
 CMAKE_OFF=	BUILD_CSHARP_BINDINGS \
 		BUILD_DOCS \
 		BUILD_JAVA_BINDINGS \
 		BUILD_PYTHON_BINDINGS \
 		BUILD_TESTING \
 		CLANG_TIDY_ENABLED \
 		CSHARP_MONO \
 		ENABLE_DEFLATE64 \
 		GDAL_ENABLE_HDF5_GLOBAL_LOCK  \
 		GDAL_ENABLE_PLUGINS \
 		GDAL_ENABLE_PLUGINS_NO_DEPS \
 		GDAL_SET_INSTALL_RELATIVE_RPATH \
 		GDAL_USE_INTERNAL_LIBS \
 		GDAL_USE_GEOTIFF_INTERNAL \
 		GDAL_USE_GIF_INTERNAL \
 		GDAL_USE_JPEG12_INTERNAL \
 		GDAL_USE_JPEG_INTERNAL \
 		GDAL_USE_JSONC_INTERNAL \
 		GDAL_USE_LERC_INTERNAL \
 		GDAL_USE_LIBCSF_INTERNAL \
 		GDAL_USE_OPENCAD \
 		GDAL_USE_OPENCAD_INTERNAL \
 		GDAL_USE_PNG_INTERNAL \
 		GDAL_USE_PUBLICDECOMPWT \
 		GDAL_USE_QHULL_INTERNAL \
 		GDAL_USE_SHAPELIB \
 		GDAL_USE_TIFF_INTERNAL \
 		GDAL_USE_ZLIB_INTERNAL \
 		HDFS_ENABLED \
 		SWIG_REGENERATE_PYTHON
 CMAKE_ON=	BUILD_APPS \
 		BUILD_SHARED_LIBS \
 		BUILD_STATIC_LIBS \
 		ENABLE_GNM \
 		ENABLE_IPO \
 		ENABLE_PAM \
 		GDAL_BUILD_OPTIONAL_DRIVERS \
 		GDAL_HIDE_INTERNAL_SYMBOLS \
 		GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE \
 		GDAL_SPLIT_EXPORTED_LIBS \
 		GDAL_USE_EXTERNAL_LIBS \
 		GDAL_USE_GEOTIFF \
 		GDAL_USE_GIF \
 		GDAL_USE_ICONV \
 		GDAL_USE_JPEG \
 		GDAL_USE_JPEG12 \
 		GDAL_USE_JSONC \
 		GDAL_USE_LIBCSF \
 		GDAL_USE_LIBLZMA \
 		GDAL_USE_OPENSSL \
 		GDAL_USE_PNG \
 		GDAL_USE_QHULL \
 		GDAL_USE_SHAPELIB_INTERNAL \
 		GDAL_USE_TIFF \
 		GDAL_USE_ZLIB \
 		OGR_BUILD_OPTIONAL_DRIVERS \
 		OGR_SQLITE_ALLOW_LOAD_EXTENSIONS \
 		USE_CCACHE
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_odbc.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=CURL DEFLATE EXPAT FREEXL GEOS LERC LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_SUB=	yes
 BRUNSLI_DESC=	Brunsli support via libbrunsli library
 CRYPTOPP_DESC=	Cryptopp support
 DEFLATE_DESC=	Faster deflate support via libdeflate library
 EXR_DESC=	EXR support via OpenEXR library
 LERC_DESC=	LERC (Limited Error Raster Compression) support
 PCRE_DESC=	Regular expression support for SQLite
 PCRE2_DESC=	Regular expression support for SQLite
 RASTERLITE2_DESC=	RasterLite2 support
 TILEDB_DESC=	TileDB support
 
 ARMADILLO_CMAKE_BOOL=	GDAL_USE_ARMADILLO
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 BRUNSLI_CMAKE_BOOL=	GDAL_USE_BRUNSLI
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
 CFITSIO_CMAKE_BOOL=	GDAL_USE_CFITSIO
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CRYPTOPP_CMAKE_BOOL=	GDAL_USE_CRYPTOPP
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CURL_CMAKE_BOOL=	GDAL_USE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DEFLATE_CMAKE_BOOL=	GDAL_USE_DEFLATE
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
 ECW_CMAKE_BOOL=		GDAL_USE_ECW
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CMAKE_BOOL=	GDAL_USE_EXPAT
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXR_CFLAGS=		-DInt64=uint64_t
 EXR_CMAKE_BOOL=		GDAL_USE_EXR
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 FREEXL_CMAKE_BOOL=	GDAL_USE_FREEXL
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CMAKE_BOOL=	GDAL_USE_GEOS
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CMAKE_BOOL=		GDAL_USE_GTA
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CMAKE_BOOL=	GDAL_USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HEIF_CMAKE_BOOL=	GDAL_USE_HEIF
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 KML_CMAKE_BOOL=		GDAL_USE_LIBKML
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LERC_CMAKE_BOOL=	GDAL_USE_LERC
 LERC_LIB_DEPENDS=	libLerc.so:graphics/lerc
 LIBXML2_CMAKE_BOOL=	GDAL_USE_LIBXML2
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LZ4_CMAKE_BOOL=		GDAL_USE_LZ4
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 MYSQL_CMAKE_BOOL=	GDAL_USE_MYSQL
 MYSQL_USES=		mysql
 NETCDF_CMAKE_BOOL=	GDAL_USE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CMAKE_BOOL=	GDAL_USE_ODBC
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CMAKE_BOOL=	GDAL_USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CMAKE_BOOL=	GDAL_USE_PCRE
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE2_CMAKE_BOOL=	GDAL_USE_PCRE2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PGSQL_CMAKE_BOOL=	GDAL_USE_POSTGRESQL
 PGSQL_USES=		pgsql
 PODOFO_CMAKE_BOOL=	GDAL_USE_PODOFO
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CMAKE_BOOL=	GDAL_USE_POPPLER
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 RASTERLITE2_CMAKE_BOOL=	GDAL_USE_RASTERLITE2
 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
 SFCGAL_CMAKE_BOOL=	GDAL_USE_SFCGAL
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CMAKE_BOOL=	GDAL_USE_SPATIALITE
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CMAKE_BOOL=	GDAL_USE_SQLITE3
 SQLITE_USES=		sqlite
 TILEDB_CMAKE_BOOL=	GDAL_USE_TILEDB
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
 WEBP_CMAKE_BOOL=	GDAL_USE_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CMAKE_BOOL=	GDAL_USE_XERCES
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CMAKE_BOOL=	GDAL_USE_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 	@${RM} -r ${WRKSRC}/third_party/LercLib/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 #	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile
index 42742b1466bb..5bfceed92cbc 100644
--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	librasterlite2
 PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=-beta1
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/librasterlite2-sources/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library that stores and retrieves raster coverages using a SpatiaLite
 WWW=		https://www.gaia-gis.it/fossil/librasterlite2/index
 
 LICENSE=	MPL11 GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd \
 		libspatialite.so:databases/spatialite \
 		libgeotiff.so:graphics/libgeotiff \
 		libjbig.so:graphics/jbigkit \
 		libpng.so:graphics/png \
 		libgif.so:graphics/giflib \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libopenjp2.so:graphics/openjpeg \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libcairo.so:graphics/cairo \
 		libcurl.so:ftp/curl \
 		libfreexl.so:textproc/freexl
 
 GNU_CONFIGURE=	yes
 USES=		gmake iconv jpeg libtool pathfix pkgconfig sqlite
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBS+=		-lsqlite3 -lm
 
 .include <bsd.port.mk>
diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile
index 4577d560ec15..51c159eb2ffa 100644
--- a/textproc/freexl/Makefile
+++ b/textproc/freexl/Makefile
@@ -1,20 +1,23 @@
 PORTNAME=	freexl
-DISTVERSION=	1.0.6
+DISTVERSION=	2.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	https://www.gaia-gis.it/gaia-sins/freexl-sources/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library to extract valid data from within an Excel (.xls) spreadsheet
 WWW=		https://www.gaia-gis.it/fossil/freexl/index
 
 LICENSE=	GPLv2+ LGPL21+ MPL11
 LICENSE_COMB=	dual
 
-USES=		cpe gmake iconv libtool pathfix
+LIB_DEPENDS=	libexpat.so:textproc/expat2
+
+USES=		cpe gmake iconv libtool pathfix minizip
 CPE_VENDOR=	${PORTNAME}_project
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_search_locale_charset=no
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-
+CFLAGS+=	-I${PREFIX}/include
+LIBS+=		-L${PREFIX}/lib
 .include <bsd.port.mk>
diff --git a/textproc/freexl/distinfo b/textproc/freexl/distinfo
index beadf4c6576c..6081fc579c80 100644
--- a/textproc/freexl/distinfo
+++ b/textproc/freexl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598954264
-SHA256 (freexl-1.0.6.tar.gz) = 3de8b57a3d130cb2881ea52d3aa9ce1feedb1b57b7daa4eb37f751404f90fc22
-SIZE (freexl-1.0.6.tar.gz) = 941179
+TIMESTAMP = 1690455281
+SHA256 (freexl-2.0.0.tar.gz) = 176705f1de58ab7c1eebbf5c6de46ab76fcd8b856508dbd28f5648f7c6e1a7f0
+SIZE (freexl-2.0.0.tar.gz) = 991565
diff --git a/textproc/freexl/pkg-plist b/textproc/freexl/pkg-plist
index aa5908795260..34a6e561165d 100644
--- a/textproc/freexl/pkg-plist
+++ b/textproc/freexl/pkg-plist
@@ -1,6 +1,6 @@
 include/freexl.h
 lib/libfreexl.a
 lib/libfreexl.so
 lib/libfreexl.so.1
-lib/libfreexl.so.1.1.0
+lib/libfreexl.so.1.2.0
 libdata/pkgconfig/freexl.pc