diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 652c18f8bfde..9a64b2de4004 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	Openstreetmap mapping program
 WWW=		http://merkaartor.be/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
 		libquazip1-qt5.so:archivers/quazip@qt5
 
 USES=		compiler:c++11-lang gnome pkgconfig qmake qt:5 sqlite:3
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 USE_LDCONFIG=	yes
 
 QMAKE_ARGS=	SYSTEM_QUAZIP=1
 USE_QT=		buildtools:build \
 		concurrent core gui imageformats network printsupport svg \
 		webengine widgets xml
 
 OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS PROTOBUF ZBAR
 OPTIONS_DEFAULT=	GEOIMAGE
 
 GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
 GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
 GEOIMAGE_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 PROTOBUF_DESC=	Protobuf Binary Format support
 PROTOBUF_QMAKE_ON=	PROTOBUF=1
 PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
 # graphics/zbar needs to be built with Qt support (and needs a Qt5 version)
 ZBAR_BROKEN=	Does not build with option ZBAR selected
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
 NLS_USES=	qt:5
 NLS_USE=	QT=linguisttools:build
 
 OPTIONS_SUB=	yes
 
 pre-build-NLS-on:
 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
 
 pre-build-PROTOBUF-on:
 	@cd ${WRKSRC}/src/ImportExport && ${LOCALBASE}/bin/protoc --cpp_out=. \
 		fileformat.proto osmformat.proto
 
 post-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
 		${STAGEDIR}${DATADIR}/translations)
 
 .include <bsd.port.mk>
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 72d107c22646..102ce9858873 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	qmapshack
 DISTVERSIONPREFIX=	V_
 DISTVERSION=	1.19.0
+PORTREVISION=	1
 CATEGORIES=	astro
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Ultimate outdoor aficionado's tool
 WWW=		https://github.com/Maproom/qmapshack/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libalglib.so:math/alglib \
 		libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
 		libquazip1-qt6.so:archivers/quazip@qt6 \
 		libroutino.so:astro/routino
 RUN_DEPENDS=	${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
 
 USES=		cmake desktop-file-utils gl jpeg qt:6
 USE_GITHUB=	yes
 GH_ACCOUNT=	Maproom
 USE_GL=	gl
 USE_QT=		5compat base declarative positioning tools webchannel \
 		webengine
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile
index d0a41a2989fd..17e0bef113e1 100644
--- a/cad/sumo/Makefile
+++ b/cad/sumo/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	sumo
 DISTVERSION=	1.2.0
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/
 DISTFILES=	${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX}
 
 MAINTAINER=	enriquefynn@gmail.com
 COMMENT=	Traffic simulation suite for road vehicles, public transportation, etc
 WWW=		http://sumo-sim.org
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libFOX-1.6.so:x11-toolkits/fox16 \
 		libfreetype.so:print/freetype2 \
 		libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libxerces-c.so:textproc/xerces-c3
 
 USES=		compiler:c++11-lang cmake gl jpeg python shebangfix zip xorg
 SHEBANG_FILES=	tools/*.py tools/*/*.py \
 		tools/*/*/*.py tools/*/*/*/*.py \
 		tools/*/*/*/*/*/*.py \
 		tools/game/A10KW/build.sh \
 		tools/game/rebuild_networks.sh \
 		tools/build/rebuild_cscope.sh \
 		tools/build/dailyUpdateMakeGCC.sh
 
 python_OLD_CMD+="/usr/bin/env python"
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xfixes xft xi xrandr xrender
 
 .include <bsd.port.mk>
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index f57c8f9d204b..60bb3c366b37 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	osm2pgsql
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OSM XML data to PostgreSQL database
 WWW=		https://osm2pgsql.org/ \
 		https://wiki.openstreetmap.org/wiki/Osm2pgsql \
 		https://github.com/openstreetmap/osm2pgsql
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=	armv7 i386 powerpc
 NOT_FOR_ARCHS_REASON=	needs a 64 bit architecture
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
 		${LOCALBASE}/include/protozero/version.hpp:devel/protozero \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \
 		${LOCALBASE}/include/CLI/Version.hpp:devel/cli11 \
 		${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs
 
 USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
 		EXTERNAL_PROTOZERO \
 		EXTERNAL_CLI11
 #		EXTERNAL_FMT  # XXX: does not build with libfmt from ports, so use bundled version until upstream fixes
 CMAKE_ARGS=	-DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}"
 
 PORTDOCS=	AUTHORS CONTRIBUTING.md README.md
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS LUAJIT TEST # GEN (utility built with this option is not installed)
 OPTIONS_DEFAULT=GEN
 
 LUAJIT_DESC=		Build with LuaJIT support
 LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
 LUAJIT_USES=		luajit lua:54:build  # lua is needed just for running tests
 LUAJIT_USES_OFF=	lua:54
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_TEST_TARGET=	test
 TEST_CMAKE_ON=		-DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure"
 TEST_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR}
 TEST_TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR}
 #GEN_DESC=		Build experimental osm2pgsql-gen data generalization utility
 #GEN_LIB_DEPENDS=	libpotrace.so:graphics/libpotrace \
 			#libopencv_core.so:graphics/opencv
 #GEN_CMAKE_BOOL=		BUILD_GEN
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \
 		${WRKSRC}/CMakeLists.txt
 # for post-patch-GEN-off: when GEN option is implemented
 	@${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|opencv),no&,' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/grass8/Makefile b/databases/grass8/Makefile
index 800e9f85f150..75b146aad364 100644
--- a/databases/grass8/Makefile
+++ b/databases/grass8/Makefile
@@ -1,151 +1,152 @@
 PORTNAME=	grass
 DISTVERSION=	8.4.2
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
 		http://grass.fbk.eu/%SUBDIR%/ \
 		http://grass.gis-lab.info/%SUBDIR%/ \
 		http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \
 		http://grass.polytechnic.edu.na/%SUBDIR%/ \
 		http://grass.unibuc.ro/%SUBDIR%/ \
 		http://mirrors.ibiblio.org/grass/%SUBDIR%/ \
 		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
 		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
 		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
 MASTER_SITE_SUBDIR=	grass${VER}/source
 PKGNAMESUFFIX=	8
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Open source Geographical Information System (GIS)
 WWW=		https://grass.osgeo.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
 BUILD_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libgeotiff.so:graphics/libgeotiff \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		blaslapack compiler:c11 gl gmake gnome iconv \
 		jpeg perl5 pkgconfig python readline shebangfix sqlite xorg
 SHEBANG_GLOB=	*.py
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
 nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 USE_XORG=	sm ice x11 xext xi xmu xrender xt
 USE_GL=		gl glu
 USE_GNOME=	cairo
 USE_WX=		3.2
 WX_COMPS=	wx python:run
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
 		--with-opengl-includes=${LOCALBASE}/include/ \
 		--with-opengl-libs=${LOCALBASE}/lib/ \
 		--with-freetype \
 		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
 		--with-blas \
 		--with-lapack \
 		--with-cairo \
 		--with-readline \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
 		--with-proj-share=${LOCALBASE}/share/proj \
 		--with-proj-includes=${LOCALBASE}/include \
 		--with-proj-libs=${LOCALBASE}/lib \
 		--with-proj=${LOCALBASE}/bin/proj \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \
 		--prefix=${LOCALBASE} \
 		--exec-prefix=${LOCALBASE}
 
 CFLAGS+=	-std=c11
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 ALL_TARGET=	default
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
 VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		NETCDF NLS PDAL
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL
 OPTIONS_DEFAULT=	NETCDF NLS PDAL PGSQL
 OPTIONS_SUB=		yes
 
 PDAL_DESC=		Enable points cloud data modules
 DB_DESC=		Database support
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libs=${LOCALBASE}/lib/mysql
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}/bin/nc-config
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NLS_CONFIGURE_WITH=	nls
 NLS_USES=		gettext
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_WITH=	odbc
 PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
 PDAL_LIB_DEPENDS=	libpdalcpp.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 
 .if exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--with-openmp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined (GRASS_INST_DIR)
 GRASS_INST_DIR=	${PORTNAME}${VER}
 .endif
 
 MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
 
 post-patch:
 	${REINPLACE_CMD} \
 		's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
 	${REINPLACE_CMD} \
 		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
 # Replace hardcoded python interpreter to PYTHON_CMD
 	${REINPLACE_CMD} 's|"GRASS_PYTHON", "python"|"GRASS_PYTHON", "${PYTHON_CMD}"|g' \
 		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
 	${REINPLACE_CMD} \
 		's|environ\["GRASS_PYTHON"\] = "python3"|environ["GRASS_PYTHON"] = "${PYTHON_CMD}"|g' \
 		${WRKSRC}/python/grass/script/setup.py
 
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
 
 # STRIP PART
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
 .for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram lister/vector lister/cell
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/utils/g.echo
 
 # symlink grass8
 	${LN} -sf ${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 .include <bsd.port.post.mk>
diff --git a/databases/postgis33/Makefile b/databases/postgis33/Makefile
index 426460b79a2b..3c7277519834 100644
--- a/databases/postgis33/Makefile
+++ b/databases/postgis33/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	postgis
 DISTVERSION=	3.3.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	33
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal \
 		libpcre2-8.so:devel/pcre2
 
 USES=		alias compiler:c++14-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 USE_CXXSTD=	c++14
 SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 NLS_DESC=	Enable international language support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 WAGYU_DESC=	Enable WAGYU support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 LOADERGUI_USE=			GNOME=gtk20
 LOADERGUI_USES=			desktop-file-utils
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 WAGYU_CONFIGURE_WITH=		wagyu
 RASTER_CONFIGURE_WITH=		raster
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgis34/Makefile b/databases/postgis34/Makefile
index 47bb57a4477f..b537ab90c47c 100644
--- a/databases/postgis34/Makefile
+++ b/databases/postgis34/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	postgis
 DISTVERSION=	3.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	34
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal \
 		libpcre2-8.so:devel/pcre2
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl loader/postgis.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY LOADERGUI
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 NLS_DESC=	Enable international language support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 LOADERGUI_USE=			GNOME=gtk20
 LOADERGUI_USES=			desktop-file-utils
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 RASTER_CONFIGURE_WITH=		raster
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgis35/Makefile b/databases/postgis35/Makefile
index 7cf3e98c0f60..1549670293a1 100644
--- a/databases/postgis35/Makefile
+++ b/databases/postgis35/Makefile
@@ -1,86 +1,87 @@
 PORTNAME=	postgis
 DISTVERSION=	3.5.4
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	35
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal \
 		libpcre2-8.so:devel/pcre2
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl loader/postgis.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY LOADERGUI
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 NLS_DESC=	Enable international language support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 LOADERGUI_USE=			GNOME=gtk20
 LOADERGUI_USES=			desktop-file-utils
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 RASTER_CONFIGURE_WITH=		raster
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgis36/Makefile b/databases/postgis36/Makefile
index 36d64e2bee3e..53b8ada3d7a1 100644
--- a/databases/postgis36/Makefile
+++ b/databases/postgis36/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	postgis
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal \
 		libpcre2-8.so:devel/pcre2
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl loader/postgis.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY LOADERGUI
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 NLS_DESC=	Enable international language support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 LOADERGUI_USE=			GNOME=gtk20
 LOADERGUI_USES=			desktop-file-utils
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 RASTER_CONFIGURE_WITH=		raster
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile
index 1fae531ad338..21939918c953 100644
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	spatialite-tools
 PORTVERSION=	5.0.1
-PORTREVISION=	12
+PORTREVISION=	13
 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 00a7df3e60af..686a9f958a60 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	spatialite
 PORTVERSION=	5.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 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 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}/configure
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index 3e6238420dd9..ee468c157b7e 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	spatialite_gui
 DISTVERSION=	2.1.0
-PORTREVISION=	18
+PORTREVISION=	19
 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 9b5982206e1a..3b76cb597742 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,272 +1,272 @@
 PORTNAME=	gdal
 PORTVERSION=	3.11.5
-PORTREVISION=	1
+PORTREVISION=	2
 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=	fast_float>=0:math/fast_float \
 		libertiff>=0:graphics/libertiff \
 		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 \
 		BUILD_VSIPRELOAD \
 		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_OFF_${ARCH}}
 CMAKE_OFF_armv7=GDAL_ENABLE_ARM_NEON_OPTIMIZATIONS
 CMAKE_ON=	AVIF_VERSION_CHECK \
 		BUILD_APPS \
 		BUILD_SHARED_LIBS \
 		BUILD_STATIC_LIBS \
 		ENABLE_GNM \
 		ENABLE_IPO \
 		ENABLE_PAM \
 		GDAL_AUTOLOAD_PLUGINS \
 		GDAL_BUILD_OPTIONAL_DRIVERS \
 		GDAL_HIDE_INTERNAL_SYMBOLS \
 		GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE \
 		GDAL_SPLIT_EXPORTED_LIBS \
 		GDAL_USE_CPL_MULTIPROC_PTHREAD \
 		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 \
 		RENAME_INTERNAL_SHAPELIB_SYMBOLS \
 		USE_CCACHE
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	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=	AEC ARMADILLO BLOSC BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT FREEXL GEOS GTA HDF5 HEIF JXL KEA KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENDRIVE OPENEXR OPENJPEG PCRE2 PGSQL QB3 RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=AEC CURL DEFLATE EXPAT FREEXL GEOS LERC LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_EXCLUDE_powerpc=	LERC
 OPTIONS_EXCLUDE_powerpc64=	LERC
 OPTIONS_SUB=	yes
 AEC_DESC=	Adaptive entropy coding library
 BLOSC_DESC=	Blosc support in Zarr driver
 BRUNSLI_DESC=	Brunsli support via libbrunsli library
 CRYPTOPP_DESC=	Cryptopp support
 DEFLATE_DESC=	Faster deflate support via libdeflate library
 KEA_DESC=	KEA format support
 LERC_DESC=	LERC (Limited Error Raster Compression) support
 OPENDRIVE_DESC=	OpenDRIVE format support
 PCRE2_DESC=	Regular expression support for SQLite
 QB3_DESC=	QB3 compression in MRF driver
 RASTERLITE2_DESC=	RasterLite2 support
 TILEDB_DESC=	TileDB support
 
 AEC_CMAKE_BOOL=		GDAL_USE_LIBAEC
 AEC_LIB_DEPENDS=	libaec.so:science/libaec
 ARMADILLO_CMAKE_BOOL=	GDAL_USE_ARMADILLO
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 BLOSC_CMAKE_BOOL=	GDAL_USE_BLOSC
 BLOSC_LIB_DEPENDS=	libblosc.so:archivers/c-blosc
 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
 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
 JXL_CMAKE_BOOL=		GDAL_USE_JXL GDAL_USE_JXL_THREADS
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 KEA_CMAKE_BOOL=		GDAL_USE_KEA
 KEA_LIB_DEPENDS=	libkea.so:graphics/kealib
 KML_CMAKE_BOOL=		GDAL_USE_LIBKML
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml \
 			liburiparser.so:net/uriparser
 KML_USES=		minizip
 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
 OPENDRIVE_CMAKE_BOOL=	GDAL_USE_OPENDRIVE
 OPENDRIVE_LDFLAGS=	-lpugixml
 OPENDRIVE_LIB_DEPENDS=	libOpenDrive.so:graphics/libopendrive \
 			libpugixml.so:textproc/pugixml
 OPENEXR_CFLAGS=		-DInt64=uint64_t
 OPENEXR_CMAKE_BOOL=	GDAL_USE_EXR
 OPENEXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CMAKE_BOOL=	GDAL_USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 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
 QB3_CMAKE_BOOL=		GDAL_USE_LIBQB3
 QB3_LIB_DEPENDS=	libQB3.so:graphics/qb3
 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_XERCESC
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CMAKE_BOOL=	GDAL_USE_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 PLIST_SUB+=	BIGENDIAN="@comment "
 .else
 PLIST_SUB+=	BIGENDIAN=""
 .endif
 
 # Clean up bundled libraries
 .if !defined(MAINTAINER_MODE)
 EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/alg/internal_libqhull \
 			--exclude ${DISTNAME}/frmts/gif/giflib \
 			--exclude ${DISTNAME}/frmts/gtiff/libgeotiff \
 			--exclude ${DISTNAME}/frmts/jpeg/libjpeg \
 			--exclude ${DISTNAME}/frmts/jpeg/libjpeg12 \
 			--exclude ${DISTNAME}/frmts/png/libpng \
 			--exclude ${DISTNAME}/frmts/zlib \
 			--exclude ${DISTNAME}/ogr/ogrsf_frmts/geojson/libjson \
 			--exclude ${DISTNAME}/third_party/fast_float \
 			--exclude ${DISTNAME}/third_party/LercLib \
 			--exclude ${DISTNAME}/third_party/libertiff \
 			--no-same-owner --no-same-permissions
 .else
 post-patch:
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 #	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/ # tif_lerc.c, tif_lzw.c, tif_packbits.c
 	@${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/fast_float/
 	@${RM} -r ${WRKSRC}/third_party/LercLib/
 	@${RM} -r ${WRKSRC}/third_party/libertiff/
 .endif
 
 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/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index 58725d4b62e5..5277b81faafd 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	libgeotiff
 PORTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/OSGeo/libgeotiff/releases/download/${PORTVERSION}/ \
 		https://download.osgeo.org/geotiff/libgeotiff/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for reading and writing GeoTIFF information tags
 WWW=		https://github.com/OSGeo/libgeotiff
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	proj>=6,1:graphics/proj
 LIB_DEPENDS=	libjbig.so:graphics/jbigkit \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff
 
 USES=		jpeg libtool pathfix
 
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--disable-doxygen-chi \
 		--disable-doxygen-chm \
 		--disable-doxygen-doc \
 		--disable-doxygen-dot \
 		--disable-doxygen-html \
 		--disable-doxygen-man \
 		--disable-doxygen-pdf \
 		--disable-doxygen-ps \
 		--disable-doxygen-rtf \
 		--disable-doxygen-xml \
 		--with-jpeg=${LOCALBASE} \
 		--with-libtiff=${LOCALBASE} \
 		--with-proj=${LOCALBASE} \
 		--with-zip=/usr
 CPPFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile
index c787276f20fb..36c2e47b621b 100644
--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	librasterlite2
 PORTVERSION=	1.1.0
-PORTREVISION=	12
+PORTREVISION=	13
 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/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index b7648f51bc52..0893b8fb0820 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -1,140 +1,140 @@
 PORTNAME=	mapnik
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 
 MAINTAINER=	hummeltech@sherpaguru.com
 COMMENT=	Free Toolkit For Developing Mapping Applications
 WWW=		http://www.mapnik.org/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
 		protozero>0:devel/protozero
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
 		libboost_regex.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu
 RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu
 
 USE_GITHUB=	yes
 GH_TUPLE=	catchorg:Catch2:v2.13.10:catch2/test/catch2 \
 		mapbox:geometry.hpp:c83a2ab:geometry_hpp/deps/mapbox/geometry \
 		mapbox:polylabel:0121820:polylabel/deps/mapbox/polylabel \
 		mapbox:variant:a2a4858:variant/deps/mapbox/variant \
 		mapnik:mapnik-vector-tile:5a0cfbb:mapnik_vector_tile/deps/mapbox/mapnik-vector-tile \
 		mapnik:test-data:5716a27:test_data/test/data
 
 USES=		compiler:c++20-lang cmake:testing gnome pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DFONTS_INSTALL_DIR:PATH=share/fonts/dejavu
 CMAKE_ON=	USE_EXTERNAL_MAPBOX_PROTOZERO
 
 OPTIONS_DEFINE=		CAIRO DOCS JPEG PNG PROJ TIFF WEBP AVIF
 OPTIONS_DEFAULT=	CAIRO JPEG PNG PROJ TIFF WEBP AVIF \
 			GDAL OGR PGRASTER POSTGIS SQLITE3 \
 			TESTING \
 			GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER PGSQL2SQLITE SHAPEINDEX SVG2PNG
 OPTIONS_GROUP=		INPUT TESTS UTILS
 OPTIONS_GROUP_INPUT=	GDAL OGR PGRASTER POSTGIS SQLITE3
 OPTIONS_GROUP_TESTS=	BENCHMARK DEMO_CPP DEMO_VIEWER TESTING
 OPTIONS_GROUP_UTILS=	GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER OGRINDEX PGSQL2SQLITE SHAPEINDEX SVG2PNG
 OPTIONS_SUB=		yes
 
 AVIF_CMAKE_BOOL=	USE_AVIF
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 JPEG_CMAKE_BOOL=	USE_JPEG
 JPEG_USES=		jpeg
 PNG_CMAKE_BOOL=		USE_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 TIFF_CMAKE_BOOL=	USE_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 WEBP_CMAKE_BOOL=	USE_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 CAIRO_DESC=		Enable cairo rendering
 PROJ_DESC=		Enable PROJ support
 
 INPUT_DESC=		Input plugins
 GDAL_DESC=		GDAL input plugin
 OGR_DESC=		OGR input plugin
 PGRASTER_DESC=		PGraster input plugin
 POSTGIS_DESC=		PostGIS input plugin
 SQLITE3_DESC=		SQLite input plugin
 
 TESTS_DESC=		Tests & Demos, etc.
 BENCHMARK_DESC=		Benchmark project
 DEMO_CPP_DESC=		Demo c++ application
 DEMO_VIEWER_DESC=	Demo viewer
 TESTING_DESC=		Tests
 
 UTILS_DESC=		Utilities
 GEOMETRY_TO_WKB_DESC=	geometry_to_wkb utility
 MAPNIK_INDEX_DESC=	mapnik_index utility
 MAPNIK_RENDER_DESC=	mapnik_render utility
 OGRINDEX_DESC=		ogrindex utility (currently doesn't build)
 PGSQL2SQLITE_DESC=	pgsql2sqlite utility
 SHAPEINDEX_DESC=	shapeindex utility
 SVG2PNG_DESC=		svg2png utility
 
 CAIRO_CMAKE_BOOL=	USE_CAIRO
 CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 PROJ_CMAKE_BOOL=	USE_PROJ
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 
 GDAL_CMAKE_BOOL=	USE_PLUGIN_INPUT_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 OGR_CMAKE_BOOL=		USE_PLUGIN_INPUT_OGR
 OGR_LIB_DEPENDS=	libgdal.so:graphics/gdal
 PGRASTER_CMAKE_BOOL=	USE_PLUGIN_INPUT_PGRASTER
 PGRASTER_USES=		pgsql
 POSTGIS_CMAKE_BOOL=	USE_PLUGIN_INPUT_POSTGIS
 POSTGIS_USES=		pgsql
 SQLITE3_CMAKE_BOOL=	USE_PLUGIN_INPUT_SQLITE
 SQLITE3_USES=		sqlite:3
 
 BENCHMARK_CMAKE_BOOL=	BUILD_BENCHMARK
 DEMO_CPP_CMAKE_BOOL=	BUILD_DEMO_CPP
 DEMO_VIEWER_CMAKE_BOOL=	BUILD_DEMO_VIEWER
 TESTING_CMAKE_BOOL=	BUILD_TESTING
 
 GEOMETRY_TO_WKB_CMAKE_BOOL=	BUILD_UTILITY_GEOMETRY_TO_WKB
 MAPNIK_INDEX_CMAKE_BOOL=	BUILD_UTILITY_MAPNIK_INDEX
 MAPNIK_RENDER_CMAKE_BOOL=	BUILD_UTILITY_MAPNIK_RENDER
 OGRINDEX_CMAKE_BOOL=		BUILD_UTILITY_OGRINDEX
 PGSQL2SQLITE_CMAKE_BOOL=	BUILD_UTILITY_PGSQL2SQLITE
 SHAPEINDEX_CMAKE_BOOL=		BUILD_UTILITY_SHAPEINDEX
 SVG2PNG_CMAKE_BOOL=		BUILD_UTILITY_SVG2PNG
 
 pre-configure-SQLITE3-on:
 	@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \
 		${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#GIT_REPOSITORY https://github.com/catchorg/Catch2.git#SOURCE_DIR ${WRKSRC}/test/catch2)#g' \
 		-e 's#GIT_TAG        v2.13.7)##g' \
 		${WRKSRC}/test/CMakeLists.txt
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/fonts
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS.md CHANGELOG.md CODE_OF_CONDUCT.md INSTALL.md README.md ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
 	@cd ${WRKSRC} && ${INSTALL_DATA} docs/* ${STAGEDIR}${DOCSDIR}/docs
 
 .include <bsd.port.mk>
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index b32e1b029754..f571a5394d69 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	mapserver
 DISTVERSION=	8.6.0
+PORTREVISION=	1
 CATEGORIES=	graphics www geography
 MASTER_SITES=	https://download.osgeo.org/${PORTNAME}/ \
 		https://github.com/MapServer/MapServer/releases/download/rel-${DISTVERSION:S|.|-|g}/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	System for developing web-based GIS applications
 WWW=		https://mapserver.org/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgif.so:graphics/giflib \
 		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj
 
 USES=		cmake compiler:c++11-lang cpe gnome iconv jpeg \
 		localbase:ldflags
 CPE_VENDOR=	osgeo
 USE_GNOME=	libxml2
 
 CMAKE_OFF=	WITH_CSHARP \
 		WITH_JAVA \
 		WITH_MYSQL \
 		WITH_ORACLE_PLUGIN \
 		WITH_ORACLESPATIAL \
 		WITH_PIXMAN \
 		WITH_RUBY \
 		WITH_SVGCAIRO \
 		WITH_THREAD_SAFETY \
 		WITH_V8
 
 CMAKE_ON=	CMAKE_SKIP_RPATH \
 		WITH_FRIBIDI \
 		WITH_GEOS \
 		WITH_GIF \
 		WITH_HARFBUZZ \
 		WITH_ICONV \
 		WITH_KML \
 		WITH_LIBXML2 \
 		WITH_OGCAPI \
 		WITH_POSTGIS \
 		WITH_SOS \
 		WITH_WMS
 
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_MySQL:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_PIXMAN:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_SVGCairo:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_V8:BOOL=True
 
 OPTIONS_DEFINE=		CAIRO CURL EXEMPI FASTCGI LIBRSVG2 PERL PHPNG \
 			POSTGIS PROTOBUFC PYTHON WCS WFS XMLMAPFILE
 OPTIONS_DEFAULT=	CAIRO CURL FASTCGI LIBRSVG2 POSTGIS PROTOBUFC WCS WFS
 OPTIONS_SUB=		yes
 
 EXEMPI_DESC=		XMP Metadata support
 PHPNG_DESC=		PHPNG (SWIG) mapscript support
 PROTOBUFC_DESC=		Protocol buffers support (req. for vector tiles)
 WFS_DESC=               WFS Server support
 WCS_DESC=               WCS Server support
 XMLMAPFILE_DESC=	XML mapfile support
 
 CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_CMAKE_BOOL=	WITH_CAIRO
 CAIRO_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Cairo:BOOL=True
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	WITH_CURL WITH_CLIENT_WFS WITH_CLIENT_WMS
 CURL_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True
 
 EXEMPI_LIB_DEPENDS=	libexempi.so:textproc/exempi
 EXEMPI_CURL_BOOL=	WITH_EXEMPI
 EXEMPI_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Exempi:BOOL=True
 
 FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
 FASTCGI_CMAKE_BOOL=	WITH_FCGI
 FASTCGI_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_FCGI:BOOL=True
 
 LIBRSVG2_USE=		GNOME=librsvg2
 LIBRSVG2_CMAKE_BOOL=	WITH_RSVG
 LIBRSVG2_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_RSVG:BOOL=True
 LIBRSVG2_IMPLIES=	CAIRO
 
 PERL_BUILD_DEPEDNS=	swig:devel/swig
 PERL_USES=		perl5
 PERL_CMAKE_BOOL=	WITH_PERL
 
 PHPNG_BUILD_DEPENDS=	swig:devel/swig
 PHPNG_CMAKE_BOOL=	WITH_PHPNG
 
 POSTGIS_USES=		pgsql
 POSTGIS_CMAKE_BOOL=	WITH_POSTGIS
 POSTGIS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_PostgreSQL:BOOL=True
 
 PROTOBUFC_LIB_DEPENDS=  libprotobuf-c.so:devel/protobuf-c
 PROTOBUFC_CMAKE_BOOL=   WITH_PROTOBUFC
 PROTOBUFC_CMAKE_OFF=    -DCMAKE_DISABLE_FIND_PACKAGE_ProtobufC:BOOL=True
 
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 
 WCS_CMAKE_BOOL=		WITH_WCS
 
 WFS_CMAKE_BOOL=		WITH_WFS
 
 XMLMAPFILE_USE=		GNOME=libxslt
 XMLMAPFILE_CMAKE_BOOL=	WITH_XMLMAPFILE
 XMLMAPFILE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_LibXslt:BOOL=True
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/legend ${STAGEDIR}${PREFIX}/bin/mapserver_legend
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapserv ${STAGEDIR}${PREFIX}/bin/mapserver_mapserv
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/msencrypt ${STAGEDIR}${PREFIX}/bin/mapserver_msencrypt
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/scalebar ${STAGEDIR}${PREFIX}/bin/mapserver_scalebar
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/shptree ${STAGEDIR}${PREFIX}/bin/mapserver_shptree
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/shptreetst ${STAGEDIR}${PREFIX}/bin/mapserver_shptreetst
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/shptreevis ${STAGEDIR}${PREFIX}/bin/mapserver_shptreevis
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sortshp ${STAGEDIR}${PREFIX}/bin/mapserver_sortshp
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/tile4ms ${STAGEDIR}${PREFIX}/bin/mapserver_tile4ms
 	${INSTALL_LIB} ${BUILD_WRKSRC}/libmapserver.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib
 	${RLN} libmapserver.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
 	${RLN} libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
 
 do-install-PYTHON-on:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/src/mapscript/python/mapscript.py ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/src/mapscript/python/_mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
index 5c3d67e3143d..bc7eaa5e8e84 100644
--- a/graphics/openorienteering-mapper/Makefile
+++ b/graphics/openorienteering-mapper/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	openorienteering-mapper
 PORTVERSION=	0.9.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics geography
 
 MAINTAINER=	sikmir@gmail.com
 COMMENT=	Map drawing program from OpenOrienteering
 WWW=		https://www.openorienteering.org/apps/mapper/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PATCH_SITES=	https://github.com/OpenOrienteering/mapper/commit/
 PATCHFILES=	69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch:-p1 \
 		a3cb8e4518f8d15a6938c9b1620c35703788c6ff.patch:-p1
 
 LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 		libproj.so:graphics/proj
 
 USES=		cmake:noninja compiler:c++14-lang \
 		desktop-file-utils gmake qt:5 shared-mime-info
 USE_QT=		buildtools:build help qmake:build concurrent core gui \
 		network printsupport testlib widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenOrienteering
 GH_PROJECT=	mapper
 
 CMAKE_ARGS+=	-DLICENSING_PROVIDER=freebsd \
 		-DMapper_PACKAGE_NAME=${PORTNAME} \
 		-Wno-dev
 
 OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
 OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
 OPTIONS_SUB=	yes
 DOCS_CMAKE_BOOL=	Mapper_WITH_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_USE=	QT=assistant:run
 EXAMPLES_CMAKE_BOOL=	Mapper_WITH_EXAMPLES
 GDAL_DESC=	Use the GDAL library
 GDAL_CMAKE_BOOL=	Mapper_USE_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 NLS_CMAKE_BOOL=	Mapper_WITH_NLS
 NLS_USE=	QT=linguisttools:build
 NLS_USES=	gettext-runtime
 POSITIONING_DESC=	GPS positioning
 POSITIONING_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=0
 POSITIONING_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=1
 POSITIONING_USE=	QT=location,sensors,serialport
 TEST_CMAKE_BOOL=	Mapper_WITH_TEST
 TEST_USE=	QT=testlib:build
 TEST_TEST_TARGET=	test
 TIFF_DESC=	Support for TIFF
 TIFF_USE=	QT=imageformats
 
 .include <bsd.port.mk>
diff --git a/graphics/ossim/Makefile b/graphics/ossim/Makefile
index bbff70a6d7fa..eb692f5d97b6 100644
--- a/graphics/ossim/Makefile
+++ b/graphics/ossim/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	ossim
 DISTVERSION=	2.12.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://github.com/ossimlabs/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Powerful suite of geospatial libraries and applications
 WWW=		https://github.com/ossimlabs/ossim
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos \
 		libgeotiff.so:graphics/libgeotiff \
 		libjsoncpp.so:devel/jsoncpp \
 		libtiff.so:graphics/tiff \
 		libproj.so:graphics/proj
 
 USES=		cmake compiler:c++17-lang jpeg sqlite
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_OSSIM_APPS \
 		BUILD_OSSIM_ID_SUPPORT
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git
 CMAKE_ARGS=	-DBUILD_LIBRARY_DIR:STRING=lib \
 		-DLIBSUFFIX:STRING="" \
 		-DINSTALL_ARCHIVE_DIR:STRING=lib \
 		-DINSTALL_LIBRARY_DIR:STRING=lib \
 		-DOSSIM_INCLUDE_DIR:STRING=${WRKSRC}/include
 
 OPTIONS_DEFINE=	TEST
 OPTIONS_SUB=	yes
 
 TEST_CMAKE_BOOL=       BUILD_OSSIM_TESTS
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Geo-LibProj-FFI/Makefile b/graphics/p5-Geo-LibProj-FFI/Makefile
index 45d4349f0cef..c0a772c9d987 100644
--- a/graphics/p5-Geo-LibProj-FFI/Makefile
+++ b/graphics/p5-Geo-LibProj-FFI/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	Geo-LibProj-FFI
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Foreign function interface to PROJ coordinate transformation software
 WWW=		https://metacpan.org/dist/Geo-LibProj-FFI
 
 LICENSE=	ART10 ART20 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART20=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libproj.so:graphics/proj
 RUN_DEPENDS=	p5-Convert-Binary-C>=0.04:converters/p5-Convert-Binary-C \
 		p5-Exporter-Easy>=0:devel/p5-Exporter-Easy \
 		p5-FFI-C>=0.08:devel/p5-FFI-C \
 		p5-FFI-Platypus>=1.50:devel/p5-FFI-Platypus
 TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Warnings>=0.010:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/lib/Geo/LibProj/FFI.pm
 	@${RM} ${WRKSRC}/t/00-version.t
 
 .include <bsd.port.mk>
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index c7a5e82372e3..c642539a75b5 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	proj
 DISTVERSION=	9.7.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://github.com/OSGeo/PROJ/releases/download/${DISTVERSION}/ \
 		https://download.osgeo.org/proj/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Cartographic Projections library
 WWW=		https://github.com/OSGeo/PROJ
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff
 TEST_DEPENDS=	googletest>0:devel/googletest
 #RUN_DEPENDS=	proj-data>=0:graphics/proj-data
 
 USES=		compiler:c++17-lang cmake:testing cpe pathfix pkgconfig sqlite
 CPE_VENDOR=	proj_project
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 CMAKE_TESTING_OFF=	TESTING_USE_NETWORK
 CMAKE_TESTING_ON=	BUILD_TESTING \
 			USE_EXTERNAL_GTEST
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyproj/Makefile b/graphics/py-pyproj/Makefile
index 1da716f1cfb6..fce72b1915be 100644
--- a/graphics/py-pyproj/Makefile
+++ b/graphics/py-pyproj/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	pyproj
 PORTVERSION=	3.7.2
+PORTREVISION=	1
 CATEGORIES=	graphics geography python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Cython wrapper to provide python interfaces to PROJ.4 functions
 WWW=		https://pyproj4.github.io/pyproj/stable/ \
 		https://github.com/pyproj4/pyproj
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	proj>=9.4.0,1:graphics/proj \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libproj.so:graphics/proj
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR}
 
 USES=		python:3.11+
 USE_PYTHON=	autoplist concurrent cython3 pep517
 
 MAKE_ENV=	PROJ_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test/sample.out ${WRKSRC}/test/test_*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 50275df276b0..540a438a5e91 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,198 +1,198 @@
 PORTNAME=	qgis
 DISTVERSION=	3.40.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libabsl_log_internal_check_op.so:devel/abseil \
 		libdraco.so:archivers/draco \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfreexl.so:textproc/freexl \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libminizip.so:archivers/minizip \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdalcpp.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqca-qt5.so:devel/qca@qt5 \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		librttopo.so:devel/librttopo \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}laspy>=2.5.1:misc/py-laspy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome iconv pgsql pyqt:5 python qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 pysip qscintilla2 qtbuilder:build sip:build webengine
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		multimedia network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools:build \
 		webchannel webengine widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 # Python_EXECUTABLE: Use the default version if multiple Pythons are available
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DHAVE_PGCONFIG=1 \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 # [2025-10-25] Use internal spatialindex, as the one in the ports is too new:
 # -- Found Spatialindex: /usr/local/lib/libspatialindex.so (2.1.0)
 # CMake Error at CMakeLists.txt:460 (message):
 #   Cannot build QGIS using libspatialindex >= 2.1, see
 #   https://github.com/libspatialindex/libspatialindex/issues/276
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS WITH_COPC \
 		WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_QTWEBENGINE WITH_INTERNAL_SPATIALINDEX
 CMAKE_OFF=	ENABLE_TESTS USE_CCACHE WITH_INTERNAL_MDAL WITH_QTWEBKIT WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		SERVER GRASS
 OPTIONS_DEFAULT=	SERVER GRASS
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes
 
 GRASS_DESC=		Add GRASS GIS to processing tools
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass8:databases/grass8
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS8
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	# Only PostgreSQL Client headers, not Server
 	@${REINPLACE_CMD} -e 's|set(POSTGRES_INCLUDE_DIR \$${PostgreSQL_INCLUDE_DIRS})|set(POSTGRES_INCLUDE ${LOCALBASE}/include)|g' \
 		${WRKSRC}/cmake/FindPostgres.cmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/cmake/FindGRASS.cmake
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index b44be8f17290..b3c22b1badc8 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,198 +1,198 @@
 PORTNAME=	qgis
 DISTVERSION=	3.44.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libabsl_log_internal_check_op.so:devel/abseil \
 		libdraco.so:archivers/draco \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfreexl.so:textproc/freexl \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libminizip.so:archivers/minizip \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdalcpp.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqca-qt5.so:devel/qca@qt5 \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		librttopo.so:devel/librttopo \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}laspy>=2.5.1:misc/py-laspy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome iconv pgsql pyqt:5 python qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 pysip qscintilla2 qtbuilder:build sip:build webengine
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		multimedia network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools:build \
 		webchannel webengine widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 # Python_EXECUTABLE: Use the default version if multiple Pythons are available
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DHAVE_PGCONFIG=1 \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 # [2025-10-25] Use internal spatialindex, as the one in the ports is too new:
 # -- Found Spatialindex: /usr/local/lib/libspatialindex.so (2.1.0)
 # CMake Error at CMakeLists.txt:460 (message):
 #   Cannot build QGIS using libspatialindex >= 2.1, see
 #   https://github.com/libspatialindex/libspatialindex/issues/276
 CMAKE_ON=	USE_OPENCL WITH_ASTYLE WITH_BINDINGS WITH_COPC \
 		WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT \
 		WITH_INTERNAL_LAZPERF WITH_INTERNAL_MDAL \
 		WITH_POSTGRESQL WITH_QTWEBENGINE WITH_INTERNAL_SPATIALINDEX
 CMAKE_OFF=	BUILD_WITH_QT6 ENABLE_TESTS USE_CCACHE WITH_QTWEBKIT \
 		WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		SERVER GRASS
 OPTIONS_DEFAULT=	SERVER GRASS
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes
 
 GRASS_DESC=		Add GRASS GIS to processing tools
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass8:databases/grass8
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS8
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	# Only PostgreSQL Client headers, not Server
 	@${REINPLACE_CMD} -e 's|set(POSTGRES_INCLUDE_DIR \$${PostgreSQL_INCLUDE_DIRS})|set(POSTGRES_INCLUDE ${LOCALBASE}/include)|g' \
 		${WRKSRC}/cmake/FindPostgres.cmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/cmake/FindGRASS.cmake
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/math/R-cran-sf/Makefile b/math/R-cran-sf/Makefile
index 39c6b0071d37..f6ddc330292e 100644
--- a/math/R-cran-sf/Makefile
+++ b/math/R-cran-sf/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	sf
 DISTVERSION=	1.0-21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Simple Features for R
 WWW=		https://cran.r-project.org/web/packages/sf/
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-classInt>=0.4.1:devel/R-cran-classInt \
 		R-cran-DBI>=0.8:databases/R-cran-DBI \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-Rcpp>=0.12.18:devel/R-cran-Rcpp \
 		R-cran-s2>=1.1.0:graphics/R-cran-s2 \
 		R-cran-units>=0.7.0:math/R-cran-units
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles pkgconfig
 
 CONFIGURE_ARGS+=	"--with-proj-api=yes"
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-terra/Makefile b/math/R-cran-terra/Makefile
index 441fa10ce996..e222063772e0 100644
--- a/math/R-cran-terra/Makefile
+++ b/math/R-cran-terra/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	terra
 DISTVERSION=	1.8-86
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Spatiall Data Analysis
 WWW=		https://cran.r-project.org/package=terra
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos_c.so:graphics/geos \
 		libproj.so:graphics/proj
 CRAN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 TEST_DEPENDS=	R-cran-deldir>0:math/R-cran-deldir \
 		R-cran-ncdf4>0:math/R-cran-ncdf4
 
 USES=		cran:auto-plist,compiles sqlite:3
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 73154f0ccd51..7049583cab5c 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	octave-forge-octproj
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/jgpallero/octproj/downloads/
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libproj.so:graphics/proj
 
 USES=		octave
 
 .include <bsd.port.mk>
diff --git a/math/p5-PDL-Transform-Proj4/Makefile b/math/p5-PDL-Transform-Proj4/Makefile
index cc81957458c5..8949c16184b9 100644
--- a/math/p5-PDL-Transform-Proj4/Makefile
+++ b/math/p5-PDL-Transform-Proj4/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	PDL-Transform-Proj4
 PORTVERSION=	2.098
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PDL::Transform interface to the Proj4 projection library
 WWW=		https://metacpan.org/dist/PDL-Transform-Proj4
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
 		${RUN_DEPENDS}
 LIB_DEPENDS=	libproj.so:graphics/proj
 RUN_DEPENDS=	p5-PDL>=2.096:math/p5-PDL
 
 USES=		localbase perl5
 USE_PERL5=	configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL/Transform/Proj4/Proj4.so
 
 .include <bsd.port.mk>
diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index 960937d4872c..9e0b470004af 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	pdal
 DISTVERSION=	2.8.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math databases graphics
 MASTER_SITES=	https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library for translating and manipulating point cloud data
 WWW=		https://www.pdal.io
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libgeotiff.so:graphics/libgeotiff \
 		liblaszip.so:archivers/laszip \
 		libzstd.so:archivers/zstd \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind
 
 USES=		cmake compiler:c++11-lib gnome pathfix pkgconfig ssl tar:bz2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${DISTVERSION}-src
 
 CMAKE_ON=	WITH_LASZIP #LASZIP is recommended
 CMAKE_OFF=	WITH_TESTS
 
 OPTIONS_DEFINE=	BASH \
 		ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO \
 
 OPTIONS_DEFAULT=	BASH \
 			ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO
 
 #Plugins with lib not in port:
 #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
 OPTIONS_SUB=	yes
 
 BASH_DESC=		BASH completion
 ICEBRIDGE_DESC=		Enable Icebridge plugin
 LAZPERF_DESC=		Enable LAZPerf plugin
 MBIO_DESC=		Enable MBIO plugin
 PGPOINTCLOUD_DESC=	Enable Coherent PostgreSQL Point Cloud plugin
 
 BASH_CMAKE_BOOL=	WITH_COMPLETION
 BASH_RUN_DEPENDS=	bash:shells/bash
 
 ICEBRIDGE_CMAKE_BOOL=	BUILD_PLUGIN_ICEBRIDGE
 ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 LAZPERF_CMAKE_BOOL=	WITH_LAZPERF
 LAZPERF_LIB_DEPENDS=	liblazperf.so:archivers/lazperf
 
 MBIO_CMAKE_BOOL=	BUILD_PLUGIN_MBIO
 
 PGPOINTCLOUD_CMAKE_BOOL=	BUILD_PLUGIN_PGPOINTCLOUD
 PGPOINTCLOUD_USES=	pgsql
 
 CXXFLAGS_powerpc64=	-mvsx
 
 pre-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 
 .include <bsd.port.mk>
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 3190196eef11..5f25e05b5553 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -1,109 +1,110 @@
 PORTNAME=	saga
 PORTVERSION=	9.10.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/([0-9]).*/\1/1}/SAGA%20-%20${PORTVERSION}
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	System for Automated Geoscientific Analyses
 WWW=		http://www.saga-gis.org/en/index.html
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexiv2.so:graphics/exiv2 \
 		libfftw3.so:math/fftw3 \
 		libgdal.so:graphics/gdal \
 		libhdf5.so:science/hdf5 \
 		libhpdf.so:print/libharu \
 		libodbc.so:databases/unixODBC \
 		libopencv_core.so:graphics/opencv \
 		libpdalcpp.so:math/pdal \
 		libproj.so:graphics/proj \
 		libsvm.so:science/libsvm \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	swig:devel/swig
 
 USES=		cmake compiler:c++17-lang desktop-file-utils dos2unix \
 		gnome iconv:wchar_t localbase pkgconfig python
 DOS2UNIX_GLOB=	*.cpp *.h *.txt
 USE_LDCONFIG=	yes
 USE_WX=		3.2+
 
 GIT_TAGNAME=	c4a591f4f
 
 CMAKE_ARGS=	-DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h \
 		-DWITH_TOOLS_PDAL:BOOL=TRUE
 CMAKE_ON=	CMAKE_VERBOSE_MAKEFILE
 CMAKE_ON+=	WITH_DEV_TOOLS
 CMAKE_ON+=	WITH_EXCERCISES
 CMAKE_ON+=	WITH_EXIV2
 CMAKE_ON+=	WITH_LIFETIME_TRACKER
 CMAKE_ON+=	WITH_MRMR
 CMAKE_ON+=	WITH_SYSTEM_SVM
 CMAKE_ON+=	WITH_TOOLS_HPDF
 CMAKE_ON+=	WITH_TOOLS_OPENCV
 CMAKE_ON+=	WITH_PYTHON_PKG
 CMAKE_ON+=	WITH_TOOLS_PDAL
 CMAKE_ON+=	WITH_TOOLS_POSTGRES
 CMAKE_ON+=	WITH_TOOLS_PROJ
 CMAKE_OFF=	WITH_CLIPPER_ONE
 CMAKE_OFF+=	WITH_TOOLS_RIEGL
 
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-gis
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	PGSQL OPENMP VIGRA
 OPTIONS_DEFAULT=	PGSQL VIGRA
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_i386=	OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_DEFAULT_powerpc64le=	OPENMP
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=	yes
 OPENMP_DESC=	Enable Multiprocessing (only amd64, i386 and powerpc64*)
 VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
 VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 
 .include <bsd.port.pre.mk>
 
 SUB_FILES=	pkg-message
 
 post-patch:
 .if ${ARCH} == "powerpc"
 	@${REINPLACE_CMD} -e 's|typedef unsigned long	DWORD;|typedef unsigned int	DWORD;|' \
 		${WRKSRC}/src/saga_core/saga_api/api_core.h
 .endif
 	@${REINPLACE_CMD} -e 's|GIT_TAGNAME|${GIT_TAGNAME}|g' \
 		${WRKSRC}/src/saga_core/saga_gui/CMakeLists.txt \
 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
 	@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \
 		${WRKSRC}/src/saga_core/saga_api/saga_api_to_python.py
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR}
 	${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt
 # Put accessories under share/saga, python/data already under site-packages/PySAGA ;)
 	(cd ${WRKSRC}/src/accessories && ${RM} -R python)
 	(cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt
 	${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak
 # library helper files are not needed and cripple some math/qgis extensions
 	@${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la
 
 .include <bsd.port.post.mk>
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 2d765018c904..d1bdbc708e93 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,75 +1,76 @@
 PORTNAME=	cdo
 PORTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/30128/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 WWW=		https://code.mpimet.mpg.de/projects/cdo
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++20-lang gmake libtool localbase pathfix python:build
 
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
 		--disable-fortran \
 		--disable-ieg \
 		--disable-openmp \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 TESTING_UNSAFE=	765 tests fail
 USE_CXXSTD=	c++20
 USE_LDCONFIG=	yes
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_SUB=	yes
 CGRIBEX_DESC=	Use CGRIBEX library for GRIB1 files
 ECCODES_DESC=	Use ecCodes for GRIB files
 HDF5_IMPLIES=	SZIP
 NETCDF_IMPLIES=	HDF5
 UUID_DESC=	UUID support
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 ECCODES_CONFIGURE_WITH=	eccodes
 ECCODES_LIB_DEPENDS=	libeccodes.so:science/eccodes
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_WITH=	proj
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_WITH=	szlib
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 UDUNITS_CONFIGURE_WITH=	udunits2
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UUID_CONFIGURE_OFF=	ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
 UUID_LIB_DEPENDS=	libuuid.so:misc/libuuid
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
 
 test-NETCDF-on:
 	@cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.mk>
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index fc27b0db4de8..b05b532e61d9 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,145 +1,145 @@
 PORTNAME=	gnudatalanguage
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science lang
 MASTER_SITES=	https://github.com/${PORTNAME}/gdl/releases/download/v${PORTVERSION}/
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 DISTNAME=	gdl-${DISTVERSIONPREFIX}${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	Free IDL-compatible incremental compiler
 WWW=		https://github.com/gnudatalanguage/gdl
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libGraphicsMagick.so:graphics/GraphicsMagick	\
 		libgeotiff.so:graphics/libgeotiff	\
 		libfreetype.so:print/freetype2	\
 		libexpat.so:textproc/expat2	\
 		libplplot.so:math/plplot	\
 		libtiff.so:graphics/tiff	\
 		libhpdf.so:print/libharu	\
 		libshp.so:devel/shapelib	\
 		libpng.so:graphics/png		\
 		libsz.so:science/libaec		\
 		libglpk.so:math/glpk		\
 		libps.so:print/pslib		\
 		libgsl.so:math/gsl
 
 #USE_GITHUB=	yes
 #GH_PROJECT=	gdl
 
 USES=		cmake compiler:c++11-lang fortran ncurses pkgconfig readline \
 		xorg
 USE_WX=		3.0+
 USE_XORG=	x11 sm ice xext
 
 # Disable ncurses and readline from ports
 # TODO:	create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz
 
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"	\
 		-DOPENMP:BOOL=ON		\
 		-DNCURSESDIR:STRING="/usr"	\
 		-DGRAPHICSMAGICK:BOOL=YES	\
 		-DX11:BOOL=ON
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 CXXFLAGS+=	-std=gnu++11
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 TEST_TARGET=	test
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 # Upstream prefer GraphicsMagick over ImageMackick
 # see https://github.com/gnudatalanguage/gdl/issues/611
 # and https://github.com/gnudatalanguage/gdl/issues/1044 for ImageMagick 7
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRIB HDF5 LIBPROJ4	\
 		MPICH NETCDF PYTHON QHULL UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GRIB HDF5 LIBPROJ4 NETCDF PYTHON	\
 		QHULL UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
 EIGEN_USES=		eigen:3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
 			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libeccodes.so:science/eccodes
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj.so:graphics/proj
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ:BOOL=NO
 
 MPICH_USES=		mpi
 MPICH_CMAKE_ON=		-DMPI:BOOL=ON -DMPIDIR:PATH=${MPI_HOME}
 MPICH_CMAKE_OFF=	-DMPI:BOOL=OFF -DMPIDIR=/none
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 QHULL_DESC=		Enable Triangulate and Qhull support
 QHULL_LIB_DEPENDS=	libqhull_r.so:math/qhull
 QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS2:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS2:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES
 PLIST=		${.CURDIR}/pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/GDL.so ${STAGEDIR}${PYTHON_SITELIBDIR}/
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index d512d062c0a6..0d44cb9af6cc 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,180 +1,180 @@
 PORTNAME=	paraview
 DISTVERSION=	${PARAVIEW_VER}.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v${PARAVIEW_VER}/
 DISTNAME=	ParaView-v${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Powerful scientific data visualization application
 WWW=		https://www.paraview.org/
 
 # See https://www.paraview.org/license/
 LICENSE=	BSD3CLAUSE
 
 #BROKEN_i386=	no matching member function for call to 'getArrayType'
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cli11>0:devel/cli11	\
 		utf8cpp>0:devel/utf8cpp	\
 		fast_float>0:math/fast_float \
 		nlohmann-json>0:devel/nlohmann-json	\
 		vulkan-headers>0:graphics/vulkan-headers	\
 		${LOCALBASE}/include/exprtk.hpp:math/exprtk	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2 \
 		libjbig.so:graphics/jbigkit \
 		liborc-0.4.so:devel/orc \
 		libpcre.so:devel/pcre \
 		libicuuc.so:devel/icu \
 		libffi.so:devel/libffi \
 		libtbb.so:devel/onetbb \
 		libogg.so:audio/libogg \
 		libgl2ps.so:print/gl2ps \
 		libOT.so:math/openturns \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libhpdf.so:print/libharu \
 		libproj.so:graphics/proj \
 		libpdalcpp.so:math/pdal \
 		libdrm.so:graphics/libdrm \
 		libcgns.so:science/cgnslib \
 		liblz4.so:archivers/liblz4 \
 		libverdict.so:math/verdict \
 		libnetcdf.so:science/netcdf \
 		libjsoncpp.so:devel/jsoncpp \
 		libprotobuf.so:devel/protobuf \
 		libpugixml.so:textproc/pugixml \
 		libavutil.so:multimedia/ffmpeg \
 		libcgraph.so:graphics/graphviz \
 		libxkbcommon.so:x11/libxkbcommon \
 		libtheora.so:multimedia/libtheora \
 		libgeotiff.so:graphics/libgeotiff \
 		libboost_thread.so:devel/boost-libs \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	${PYNUMPY}	\
 		bash:shells/bash	\
 		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		alias cmake compiler:c++17-lang desktop-file-utils eigen:3 fortran gl gnome	\
 		jpeg localbase llvm:min=19 pkgconfig python qt:6 shebangfix sqlite tar:xz xorg
 USE_GL=		glew opengl
 USE_GNOME=	libxml2
 USE_QT=		5compat base svg tools webengine
 #buildtools:build core gui help network opengl qmake:build sql svg	\
 #		webengine widgets x11extras glew xmlpatterns
 USE_XORG=	ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xorgproto xrender	\
 		xxf86vm
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-missing-template-arg-list-after-template-kw	\
 		-I${WRKSRC}/Clients/ParaView/Documentation
 CMAKE_ARGS+=	-DPARAVIEW_BUILD_SHARED_LIBS=ON \
 		-DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
 		-DCMAKE_CXX_STANDARD=17 \
 		-DPARAVIEW_USE_PYTHON:BOOL=ON \
 		-DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
 		-DPARAVIEW_ENABLE_LAS:BOOL=OFF \
 		-DPARAVIEW_ENABLE_WEB:BOOL=ON \
 		-DPARAVIEW_ENABLE_GDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_PDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_MOTIONFX:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF2:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF3:BOOL=ON \
 		-DPARAVIEW_USE_QT:BOOL=ON \
 		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION:BOOL=OFF \
 		-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF \
 		-DVTK_FORBID_DOWNLOADS:BOOL=OFF \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 # VTKm is BROKEN ATM: https://gitlab.kitware.com/paraview/paraview/-/issues/22876
 CMAKE_ARGS+=	-DPARAVIEW_USE_VTKM:BOOL=OFF
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DVTK_FORBID_DOWNLOADS:BOOL=ON
 .endif
 MAKE_ENV=	XDG_CONFIG_HOME=${WRKDIR}
 USE_CXXSTD=	c++17
 
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	VTK/Examples/SearchScript.sh	\
 		VTK/Utilities/Maintenance/*.sh	\
 		Clients/CommandLineExecutables/paraview-config.in
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPICH OSMESA
 OPTIONS_SUB=	yes
 OSMESA_DESC=	Use Mesa for off-screen rendering
 
 # mpi4py and other programs must be compiled against the same MPI provider
 MPICH_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=0:net/py-mpi4py-mpich@${PY_FLAVOR}
 MPICH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=0:net/py-mpi4py-mpich@${PY_FLAVOR}
 MPICH_USES=		mpi # mpich is set by default, use mpi:openmpi if needed
 MPICH_CMAKE_ON=		-DPARAVIEW_USE_MPI:BOOL=ON
 MPICH_CMAKE_OFF=		-DPARAVIEW_USE_MPI:BOOL=OFF
 
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 OSMESA_USES_OFF=	desktop-file-utils
 OSMESA_CMAKE_BOOL=	VTK_OPENGL_HAS_OSMESA
 OSMESA_CMAKE_ON=	-DVTK_USE_X:BOOL="OFF" \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
 OSMESA_CMAKE_OFF=	-DVTK_USE_X:BOOL="ON"
 
 EXAMPLES_CMAKE_BOOL=	PARAVIEW_ENABLE_EXAMPLES
 PORTEXAMPLES=		*
 
 #TEST_CMAKE_ON=		-DPARAVIEW_BUILD_TESTING=WANT	\
 			-DPARAVIEW_BUILD_VTK_TESTING=WANT
 
 # Error with ADIOS2
 #LIB_DEPENDS+=	libadios2_c.so:misc/adios2
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_ADIOS2:BOOL=ON
 # Missing GenericIO for CosmoTools
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=ON
 # Errors with VisItBridge / VisItLib
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
 # MomentInvariants needs to download a module
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_MOMENTINVARIANTS:BOOL=ON
 # No package for graphics/ospray
 #LIB_DEPENDS+=	libospray.so:graphics/ospray
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_RAYTRACING
 
 PLIST_SUB+=	VERMAJORMINOR=${PARAVIEW_VER}
 
 VTK9_CONFLICTS=	vtk.py vtkmodules/__init__.py vtkmodules/all.py	\
 		vtkmodules/gtk vtkmodules/numpy_interface	\
 		vtkmodules/qt vtkmodules/test vtkmodules/tk	\
 		vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py	\
 		vtkmodules/web/errors.py
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py
 
 post-install:
 	# vtk9 is not a real run dependency, but it installs several common files
 .for py in ${VTK9_CONFLICTS}
 	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/${py}
 .endfor
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <./Makefile.version>
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/rubygem-rgeo-proj4/Makefile b/science/rubygem-rgeo-proj4/Makefile
index 06742d12513a..886dafaf581c 100644
--- a/science/rubygem-rgeo-proj4/Makefile
+++ b/science/rubygem-rgeo-proj4/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	rgeo-proj4
 PORTVERSION=	4.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Proj.4 extension for RGeo
 WWW=		https://github.com/rgeo/rgeo-proj4
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libproj.so:graphics/proj
 RUN_DEPENDS=	rubygem-rgeo>=3.0.0<3.1:science/rubygem-rgeo
 
 USES=		gem
 
 CONFIGURE_ARGS=	--with-proj-dir=${LOCALBASE}
 
 .include <bsd.port.mk>