diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 0e39857c7642..70db286e88eb 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	9
+PORTREVISION=	10
 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 \
 		webkit 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 8d6e26c38599..1da576207e3f 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	qmapshack
 PORTVERSION=	1.16.1
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	V_
 CATEGORIES=	astro
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Ultimate outdoor aficionado's tool
 WWW=		https://github.com/Maproom/qmapshack/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
 		libquazip1-qt5.so:archivers/quazip@qt5 \
 		libroutino.so:astro/routino
 RUN_DEPENDS=	${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gl jpeg \
 		pkgconfig qt:5 xorg
 USE_GITHUB=	yes
 USE_GL=		gl
 USE_QT=		buildtools core dbus declarative gui help linguisttools location network \
 		printsupport qmake sql sql-sqlite3 uitools \
 		webchannel webengine widgets xml
 
 GH_ACCOUNT=	Maproom
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/audio/dpf-plugins-lv2/Makefile b/audio/dpf-plugins-lv2/Makefile
index 828bb392cd35..1654733ca6cf 100644
--- a/audio/dpf-plugins-lv2/Makefile
+++ b/audio/dpf-plugins-lv2/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	dpf-plugins
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of DPF-based LV2 plugins
 WWW=		https://github.com/DISTRHO/DPF-Plugins
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		bash:shells/bash
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		liblo.so:audio/liblo \
 		libprojectM.so:graphics/libprojectm \
 		libpulse-simple.so:audio/pulseaudio
 
 USES=		compiler:c++11-lang gl gmake localbase pkgconfig sdl shebangfix xorg
 USE_XORG=	x11 xcursor xext xrandr
 USE_GL=		gl
 USE_SDL=	sdl2
 
 SHEBANG_FILES=	dpf/utils/generate-ttl.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DISTRHO
 GH_PROJECT=	DPF-Plugins
 
 CXXFLAGS+=	-I${FILESDIR}
 LDFLAGS+=	-pthread
 MAKE_ARGS=	LINUX=true
 
 PLIST_SUB+=	VST_ARCH=${ARCH:S/amd64/x86_64/}
 
 CONFLICTS_INSTALL=	nekobi-lv2 # bin/Nekobi
 
 OPTIONS_DEFINE=		JACK
 OPTIONS_DEFAULT=	JACK
 OPTIONS_SUB=		yes
 
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 OPTIONS_DEFAULT_i386=	SIMD
 
 JACK_MAKE_ARGS=		HAVE_JACK=true
 JACK_MAKE_ARGS_OFF=	HAVE_JACK=false
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 SIMD_MAKE_ENV=		SIMD_FLAGS="-mtune=generic -msse -msse2 -mfpmath=sse"
 
 .include <bsd.port.mk>
diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile
index d665485942f0..2a24528adfbc 100644
--- a/biology/ncbi-cxx-toolkit/Makefile
+++ b/biology/ncbi-cxx-toolkit/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	ncbi-cxx-toolkit
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	26.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology science devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	NCBI C++ Toolkit
 WWW=		https://ncbi.github.io/cxx-toolkit/
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/doc/public/LICENSE
 
 BROKEN_armv6=	platform not defined for FreeBSD arm, see https://github.com/ncbi/ncbi-cxx-toolkit-public/issues/2
 
 LIB_DEPENDS=	libcdd.so:math/cddlib \
 		liblmdb.so:databases/lmdb \
 		libpcre.so:devel/pcre
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++17-lang gmake mysql perl5 python shebangfix ssl xorg
 USE_XORG=	x11 xpm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ncbi
 GH_PROJECT=	${PORTNAME}-public
 
 SHEBANG_FILES=	src/app/blast/get_species_taxids.sh
 SHEBANG_GLOB=	*.pl *.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-debug --with-dll --without-static \
 		--without-vdb
 
 CONFLICTS_INSTALL=	dakota libxdiff ncbi-blast+ ncbi-toolkit proj \
 			py*-speedtest-cli # bin/blast_formatter bin/speedtest bin/test_regexp lib/libeutils.so lib/libproj.so lib/libxdiff.so
 
 post-install:
 	# strip
 	@${FIND} ${STAGEDIR}${PREFIX}/bin -type f | ${GREP} -v -E '\.(sh|py|pl)$$' | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so" | ${XARGS} ${STRIP_CMD}
 	# remove the conflicting files
 	@${RM} \
 		${STAGEDIR}${PREFIX}/lib/libcdd.so \
 		${STAGEDIR}${PREFIX}/lib/liblmdb.so
 	# autoplist: thousands of files
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} * -type f -or -type l >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile
index ddc836714e83..87a9005aee0e 100644
--- a/cad/sumo/Makefile
+++ b/cad/sumo/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	sumo
 DISTVERSION=	1.2.0
-PORTREVISION=	8
+PORTREVISION=	9
 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 5ffa45b886ff..25ff9ae11b42 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	osm2pgsql
 PORTVERSION=	1.8.1
+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
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
 		${LOCALBASE}/include/protozero/version.hpp:devel/protozero
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 
 USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
 		EXTERNAL_PROTOZERO
 #		EXTERNAL_FMT  # XXX: does not build with libfmt 9.x 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
 
 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}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \
 		${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/grass7/Makefile b/databases/grass7/Makefile
index 5a55a7744bab..3948b25e2a1e 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -1,205 +1,205 @@
 PORTNAME=	grass
 PORTVERSION=	7.8.7
-PORTREVISION=	4
+PORTREVISION=	5
 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=	7
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Open source Geographical Information System (GIS)
 WWW=		https://grass.osgeo.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
 BROKEN_sparc64=	Does not configure on sparc64
 
 BUILD_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos
 RUN_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
 
 USES=		blaslapack compiler:c11 gl gmake gnome iconv \
 		jpeg perl5 pkgconfig python:3.6+ readline shebangfix 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_FILES=	pkg-message
 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=		LAS NETCDF NLS PDAL ZSTD
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
 OPTIONS_DEFAULT=	LAS NETCDF NLS PDAL PGSQL SQLITE ZSTD
 OPTIONS_SUB=		yes
 
 # BLAS/LAPACK: Only netlib compile the maxmimum number of modules
 #BLAS_DESC=		BLAS/LAPACK support
 #GOTOBLAS_DESC=		GotoBLAS implementationS
 #ATLAS_USES=		blaslapack:atlas
 #NETLIB_USES=		blaslapack
 #GOTOBLAS_USES=		blaslapack:gotoblas
 #OPENBLAS_USES=		blaslapack:openblas
 LAS_DESC=		Enable LiDAR modules
 PDAL_DESC=		Enable points cloud data modules
 DB_DESC=		Database support
 LAS_CONFIGURE_ON=	--with-liblas=yes
 LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_thread.so:devel/boost-libs \
 			libgeotiff.so:graphics/libgeotiff
 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=	libpdal_base.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .if exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--with-openmp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 USE_GCC=	yes
 PLIST_SUB+=	NOTONI386="@comment "
 .else
 PLIST_SUB+=	NOTONI386=""
 .endif
 
 .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} -e \
 		"s|'make'|'gmake'|g; \
 		 s|gcc|${CC}|" ${WRKSRC}/scripts/g.extension/g.extension.py
 	${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|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \
 		${WRKSRC}/lib/init/grass.sh
 	${REINPLACE_CMD} \
 		"s|environ\['GRASS_PYTHON'\] = "'"python3"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \
 		${WRKSRC}/lib/python/script/setup.py
 
 post-install:
 # remove useless files
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/db.test/
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png
 
 # fix pkg-plist issues
 # poudriere testport, poudriere bulk -t and make ports can create different pkg-plist
 	for i in `${FIND} ${WRKSRC}/scripts -type f \( -name *jpg -o -name *png -o -name *gxm \)  -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	for i in `${FIND} ${WRKSRC}/gui/wxpython -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	for i in `${FIND} ${WRKSRC}/raster -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	for i in `${FIND} ${WRKSRC}/imagery -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/wxpyimgview/wxpyimgview_gui.py ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/wxpyimgview_gui.py
 	${MKDIR} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar
 	${INSTALL_DATA} ${WRKSRC}/scripts/d.polar/ps_defs.eps ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar
 
 # 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}/tools/g.echo
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/*
 
 # symlink grass7
 	${LN} -sf ${PORTNAME}${VER} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 .include <bsd.port.post.mk>
diff --git a/databases/grass8/Makefile b/databases/grass8/Makefile
index b15b19818694..59d62da11177 100644
--- a/databases/grass8/Makefile
+++ b/databases/grass8/Makefile
@@ -1,151 +1,152 @@
 PORTNAME=	grass
 DISTVERSION=	8.2.1
+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:3.6+ 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=	libpdal_base.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/postgis30/Makefile b/databases/postgis30/Makefile
index d7bf8869b7fe..a605d2c24895 100644
--- a/databases/postgis30/Makefile
+++ b/databases/postgis30/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	postgis
 PORTVERSION=	3.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	30
 
 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
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.5+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.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
 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_USE=			GNOME=gtk20
 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
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		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/*
 	${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/postgis31/Makefile b/databases/postgis31/Makefile
index e1990d7055bd..3df0fb4d32bb 100644
--- a/databases/postgis31/Makefile
+++ b/databases/postgis31/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	postgis
 PORTVERSION=	3.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	31
 
 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
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.5+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		raster/test/regress/loader/*.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
 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_USE=			GNOME=gtk20
 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
 
 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/*
 	${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/postgis32/Makefile b/databases/postgis32/Makefile
index 6fb3330ab04e..8d807fea7c9d 100644
--- a/databases/postgis32/Makefile
+++ b/databases/postgis32/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	postgis
 DISTVERSION=	3.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	32
 
 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
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.5+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		raster/test/regress/loader/*.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
 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
 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
 
 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/*
 	${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/postgis33/Makefile b/databases/postgis33/Makefile
index 65da21bf8398..5c8e1debbba6 100644
--- a/databases/postgis33/Makefile
+++ b/databases/postgis33/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	postgis
 DISTVERSION=	3.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 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++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.5+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 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 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/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile
index 145133804109..bbc5078075a4 100644
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	spatialite-tools
 PORTVERSION=	5.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 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 caaf12f58271..650c4c93a81b 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	spatialite
 PORTVERSION=	5.0.1
-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 pathfix minizip pkgconfig sqlite
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS+=	--enable-gcp=yes --enable-libxml2=yes --enable-rttopo=yes \
 			CFLAGS="${CFLAGS}" \
 			LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 INSTALL_TARGET=install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.am
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index 0e514146defe..f7dcca0cbbb1 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	spatialite_gui
 DISTVERSION=	2.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 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}
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libght/Makefile b/devel/libght/Makefile
index eca3ad70ed85..3f0e8e42a8ef 100644
--- a/devel/libght/Makefile
+++ b/devel/libght/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	libght
 PORTVERSION=	0.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	GeoHashTree library for storing and accessing multi-dimensional point clouds
 WWW=		https://github.com/pramsey/libght
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		liblas.so:devel/liblas \
 		libcunit.so:devel/cunit
 
 USES=		cmake gnome
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pramsey
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index 46f3f1281862..34d48ff3ea68 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	rgdal
 DISTVERSION=	1.5-32
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Bindings for the Geospatial Data Abstraction Library
 WWW=		https://cran.r-project.org/web/packages/rgdal/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj
 CRAN_DEPENDS=	R-cran-sp>=1.1.0:math/R-cran-sp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles pkgconfig
 
 .include <bsd.port.mk>
diff --git a/graphics/fpc-proj4/Makefile b/graphics/fpc-proj4/Makefile
index a0326d8ce609..9c543f513525 100644
--- a/graphics/fpc-proj4/Makefile
+++ b/graphics/fpc-proj4/Makefile
@@ -1,19 +1,19 @@
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-proj4
 
 COMMENT=	Free Pascal interface to proj library
 
 USES=		fpc
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR=	${WRKUNITDIR}
 
 OPTIONS_DEFINE=	PROJ
 PROJ_DESC=	Install proj library
 OPTIONS_DEFAULT=	PROJ
 
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index e6796016f1d6..72911e872bc9 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,219 +1,219 @@
 PORTNAME=	gdal
 PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 WWW=		https://gdal.org/ \
 		https://github.com/OSGeo/gdal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	libgeotiff>=1.5.0:graphics/libgeotiff \
 		proj>=6,1:graphics/proj
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libshp.so:devel/shapelib \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++17-lang cpe iconv jpeg localbase pkgconfig ssl tar:xz
 
 CMAKE_OFF=	BUILD_CSHARP_BINDINGS \
 		BUILD_DOCS \
 		BUILD_JAVA_BINDINGS \
 		BUILD_PYTHON_BINDINGS \
 		BUILD_TESTING \
 		CLANG_TIDY_ENABLED \
 		CSHARP_MONO \
 		GDAL_BUILD_OPTIONAL_DRIVERS \
 		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_POSTGRESQL \
 		GDAL_USE_PUBLICDECOMPWT \
 		GDAL_USE_QHULL_INTERNAL \
 		GDAL_USE_SHAPELIB_INTERNAL \
 		GDAL_USE_TIFF_INTERNAL \
 		GDAL_USE_ZLIB_INTERNAL \
 		HDFS_ENABLED \
 		OGR_BUILD_OPTIONAL_DRIVERS \
 		SWIG_REGENERATE_PYTHON
 CMAKE_ON=	BUILD_APPS \
 		BUILD_SHARED_LIBS \
 		BUILD_STATIC_LIBS \
 		ENABLE_GNM \
 		ENABLE_IPO \
 		ENABLE_PAM \
 		GDAL_ENABLE_PLUGINS \
 		GDAL_HIDE_INTERNAL_SYMBOLS \
 		GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE \
 		GDAL_SPLIT_EXPORTED_LIBS \
 		GDAL_USE_EXTERNAL_LIBS \
 		GDAL_USE_GEOTIFF \
 		GDAL_USE_GIF \
 		GDAL_USE_ICONV \
 		GDAL_USE_JPEG \
 		GDAL_USE_JPEG12 \
 		GDAL_USE_JSONC \
 		GDAL_USE_LIBCSF \
 		GDAL_USE_LIBLZMA \
 		GDAL_USE_OPENSSL \
 		GDAL_USE_PNG \
 		GDAL_USE_QHULL \
 		GDAL_USE_SHAPELIB \
 		GDAL_USE_TIFF \
 		GDAL_USE_ZLIB \
 		OGR_SQLITE_ALLOW_LOAD_EXTENSIONS \
 		USE_CCACHE
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_odbc.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_SUB=	yes
 BRUNSLI_DESC=	Brunsli support via libbrunsli library
 CRYPTOPP_DESC=	Cryptopp support
 DEFLATE_DESC=	Faster deflate support via libdeflate library
 EXR_DESC=	EXR support via OpenEXR library
 LERC_DESC=	LERC (Limited Error Raster Compression) support
 PCRE_DESC=	Regular expression support for SQLite
 PCRE2_DESC=	Regular expression support for SQLite
 RASTERLITE2_DESC=	RasterLite2 support
 TILEDB_DESC=	TileDB support
 
 ARMADILLO_CMAKE_BOOL=	GDAL_USE_ARMADILLO
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 BRUNSLI_CMAKE_BOOL=	GDAL_USE_BRUNSLI
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
 CFITSIO_CMAKE_BOOL=	GDAL_USE_CFITSIO
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CRYPTOPP_CMAKE_BOOL=	GDAL_USE_CRYPTOPP
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CURL_CMAKE_BOOL=	GDAL_USE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DEFLATE_CMAKE_BOOL=	GDAL_USE_DEFLATE
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
 ECW_CMAKE_BOOL=		GDAL_USE_ECW
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CMAKE_BOOL=	GDAL_USE_EXPAT
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXR_CFLAGS=		-DInt64=uint64_t
 EXR_CMAKE_BOOL=		GDAL_USE_EXR
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 FREEXL_CMAKE_BOOL=	GDAL_USE_FREEXL
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CMAKE_BOOL=	GDAL_USE_GEOS
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CMAKE_BOOL=		GDAL_USE_GTA
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CMAKE_BOOL=	GDAL_USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HEIF_CMAKE_BOOL=	GDAL_USE_HEIF
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 KML_CMAKE_BOOL=		GDAL_USE_KML
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LERC_CMAKE_BOOL=	GDAL_USE_LERC
 LERC_LIB_DEPENDS=	libLerc.so:graphics/lerc
 LIBXML2_CMAKE_BOOL=	GDAL_USE_LIBXML2
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LZ4_CMAKE_BOOL=		GDAL_USE_LZ4
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 MYSQL_CMAKE_BOOL=	GDAL_USE_MYSQL
 MYSQL_USES=		mysql
 NETCDF_CMAKE_BOOL=	GDAL_USE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CMAKE_BOOL=	GDAL_USE_ODBC
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CMAKE_BOOL=	GDAL_USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CMAKE_BOOL=	GDAL_USE_PCRE
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE2_CMAKE_BOOL=	GDAL_USE_PCRE2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PGSQL_CMAKE_BOOL=	GDAL_USE_PGSQL
 PGSQL_USES=		pgsql
 PODOFO_CMAKE_BOOL=	GDAL_USE_PODOFO
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CMAKE_BOOL=	GDAL_USE_POPPLER
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 RASTERLITE2_CMAKE_BOOL=	GDAL_USE_RASTERLITE2
 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
 SFCGAL_CMAKE_BOOL=	GDAL_USE_SFCGAL
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CMAKE_BOOL=	GDAL_USE_SPATIALITE
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CMAKE_BOOL=	GDAL_USE_SQLITE3
 SQLITE_USES=		sqlite
 TILEDB_CMAKE_BOOL=	GDAL_USE_TILEDB
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
 WEBP_CMAKE_BOOL=	GDAL_USE_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CMAKE_BOOL=	GDAL_USE_XERCES
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CMAKE_BOOL=	GDAL_USE_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 	@${RM} -r ${WRKSRC}/third_party/LercLib/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 #	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index 0dcc366cb0e7..cce09794354e 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	libgeotiff
 PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.osgeo.org/geotiff/libgeotiff/ \
 		LOCAL/sunpoet
 
 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
 
 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-zlib=/usr
 CPPFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/libprojectm/Makefile b/graphics/libprojectm/Makefile
index 396f24687dbf..7dcb2008987c 100644
--- a/graphics/libprojectm/Makefile
+++ b/graphics/libprojectm/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	libprojectM
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.12
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Awesome music visualiser
 WWW=		https://github.com/projectM-visualizer/projectm
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		bash:shells/bash
 LIB_DEPENDS=	libftgl.so:graphics/ftgl \
 		libfreetype.so:print/freetype2 \
 		libvisual-0.4.so:graphics/libvisual04
 RUN_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 
 USES=		autoreconf:build compiler:c++11-lang gl gmake libtool \
 		localbase:ldflags pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	projectM-visualizer
 GH_PROJECT=	projectm
 USE_SDL=	sdl2
 USE_GL=		gl glu glew
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sdl --enable-gles
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_SHELL=	${PREFIX}/bin/bash # https://github.com/projectM-visualizer/projectm/issues/319
 
 USE_LDCONFIG=	yes
 
 USE_CXXSTD=	c++98
 CXXFLAGS+=	-DDATADIR_PATH='\"${LOCALBASE}/share/projectM\"' -I${LOCALBASE}/lib/qt5
 LDFLAGS+=	-L${LOCALBASE}/lib/qt5 # https://github.com/projectM-visualizer/projectm/issues/320
 
 BINARY_ALIAS=	make=${GMAKE}
 
 OPTIONS_DEFINE=			PULSEAUDIO JACK
 OPTIONS_DEFAULT=		PULSEAUDIO
 OPTIONS_SUB=			yes
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_USES=		qt:5
 PULSEAUDIO_USE=			qt=core,gui,opengl,widgets,xml,buildtools:build,qmake:build,linguisttools:build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 PULSEAUDIO_CONFIGURE_ON=	--enable-qt
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_USES=			qt:5
 JACK_USE=			qt=core,gui,opengl,widgets,xml,buildtools:build,qmake:build,linguisttools:build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
 JACK_CONFIGURE_ENABLE=		jack
 JACK_CONFIGURE_ON=		--enable-qt
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MPULSEAUDIO} && ! ${PORT_OPTIONS:MJACK}
 CONFIGURE_ARGS+=	--disable-qt
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO} || ${PORT_OPTIONS:MJACK}
 PLIST_FILES+=	share/icons/hicolor/scalable/apps/projectM.svg
 BINARY_ALIAS+=	qmake=${QMAKE} \
 		moc=${MOC} \
 		uic=${UIC} \
 		rcc=${RCC} \
 		lrelease=${LRELEASE} \
 		lupdate=${LUPDATE}
 .endif
 
 pre-configure:
 	@cd ${WRKSRC}/ && ${SH} autogen.sh
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/share/projectM/config.inp ${STAGEDIR}${PREFIX}/share/projectM/config.inp.sample
 	${INSTALL_DATA} ${WRKSRC}/fonts/Vera.ttf ${STAGEDIR}${PREFIX}/share/projectM/fonts/
 
 .include <bsd.port.mk>
diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile
index 149d15367bfc..05fc7715fce6 100644
--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	librasterlite2
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 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/mapserver/Makefile b/graphics/mapserver/Makefile
index e3e58be5f4ad..6dfd84752363 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -1,218 +1,218 @@
 PORTNAME=		mapserver
 PORTVERSION=		7.6.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=		graphics www geography
 MASTER_SITES=		https://download.osgeo.org/mapserver/
 
 MAINTAINER=		wen@FreeBSD.org
 COMMENT=		System for developing web-based GIS applications
 WWW=		https://mapserver.org/
 
 LICENSE=		MIT
 
 LIB_DEPENDS=		libgd.so:graphics/gd \
 			libproj.so:graphics/proj \
 			libpng.so:graphics/png \
 			libgif.so:graphics/giflib \
 			libsvg.so:graphics/libsvg \
 			libfreetype.so:print/freetype2
 
 USES=			compiler:c++11-lang cpe cmake gnome jpeg \
 			localbase:ldflags
 CPE_VENDOR=		osgeo
 LDFLAGS+=		-pthread
 CMAKE_ARGS+=		-DCMAKE_PREFIX_PATH=${LOCALBASE} \
 			-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 			-DWITH_GD=1
 MAKE_JOBS_UNSAFE=	yes
 
 PROG_FILES=		legend scalebar shp2img shptree shptreetst shptreevis \
 			sortshp msencrypt tile4ms mapserv
 
 OPTIONS_DEFINE=		CAIRO CAIRO_SVG CLIENT_WMS CLIENT_WFS CURL DEBUG \
 			FASTCGI FRIBIDI GDAL GEOS HARFBUZZ KML \
 			PERL PHP POSTGIS PROTOBUFC PYTHON WCS WFS WMS
 OPTIONS_DEFAULT=	CAIRO FRIBIDI GDAL GEOS \
 			HARFBUZZ POSTGIS PROTOBUFC WCS WFS
 CAIRO_SVG_DESC=		Cairo SVG parser support
 GDAL_DESC=		GDAL library support
 FRIBIDI_DESC=		Fribidi library support
 KML_DESC=		KML support
 WMS_DESC=		WMS Server support
 WFS_DESC=		WFS Server support
 WCS_DESC=		WCS Server support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=			python
 BUILD_DEPENDS+=		swig:devel/swig
 CMAKE_ARGS+=		-DWITH_PYTHON=yes
 PLIST_SUB+=		PYTHON=""
 MAP_EGG=		MapScript-${PORTVERSION}-${PYTHON_VERSION:S/thon//}
 PLIST_SUB+=		MAP_EGG=${MAP_EGG}
 .else
 PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=		libcairo.so:graphics/cairo \
 			libexpat.so:textproc/expat2
 CMAKE_ARGS+=		-DWITH_CAIRO=1
 .else
 CMAKE_ARGS+=		-DWITH_CAIRO=0
 .endif
 
 .if ${PORT_OPTIONS:MFRIBIDI}
 LIB_DEPENDS+=		libfribidi.so:converters/fribidi \
 			libharfbuzz.so:print/harfbuzz
 CMAKE_ARGS+=		-DWITH_FRIBIDI=1 -DWITH_HARFBUZZ=1
 .else
 CMAKE_ARGS+=		-DWITH_FRIBIDI=0 -DWITH_HARFBUZZ=0
 .endif
 
 .if ${PORT_OPTIONS:MHARFBUZZ}
 LIB_DEPENDS+=		libfribidi.so:converters/fribidi \
 			libharfbuzz.so:print/harfbuzz
 CMAKE_ARGS+=		-DWITH_FRIBIDI=1 -DWITH_HARFBUZZ=1
 .else
 CMAKE_ARGS+=		-DWITH_FRIBIDI=0 -DWITH_HARFBUZZ=0
 .endif
 
 .if ${PORT_OPTIONS:MPROTOBUFC}
 LIB_DEPENDS+=		libprotobuf-c.so:devel/protobuf-c
 CMAKE_ARGS+=		-DWITH_PROTOBUFC=1
 .else
 CMAKE_ARGS+=		-DWITH_PROTOBUFC=0
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO_SVG}
 LIB_DEPENDS+=		libcairo.so:graphics/cairo \
 			libsvg-cairo.so:graphics/libsvg-cairo \
 			libexpat.so:textproc/expat2
 CMAKE_ARGS+=		-DWITH_SVGCAIRO=1 -DWITH_CAIRO=1
 USES+=			pkgconfig
 .else
 CMAKE_ARGS+=		-DWITH_SVGCAIRO=0
 .endif
 
 .if ${PORT_OPTIONS:MKML}
 LIB_DEPENDS+=		libxml2.so:textproc/libxml2
 CMAKE_ARGS+=		-DWITH_KML=1
 .else
 CMAKE_ARGS+=		-DWITH_KML=0
 .endif
 
 .if ${PORT_OPTIONS:MWMS}
 CMAKE_ARGS+=		-DWITH_WMS=1
 .else
 CMAKE_ARGS+=		-DWITH_WMS=0
 .endif
 
 .if ${PORT_OPTIONS:MWFS}
 CMAKE_ARGS+=		-DWITH_WFS=1
 .else
 CMAKE_ARGS+=		-DWITH_WFS=0
 .endif
 
 .if ${PORT_OPTIONS:MWCS}
 CMAKE_ARGS+=		-DWITH_WCS=1
 .else
 CMAKE_ARGS+=		-DWITH_WCS=0
 .endif
 
 .if ${PORT_OPTIONS:MGDAL}
 USES+=			iconv
 LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_GDAL=1
 .else
 CMAKE_ARGS+=		-DWITH_GDAL=0
 .endif
 
 .if ${PORT_OPTIONS:MGEOS}
 LIB_DEPENDS+=		libgeos.so:graphics/geos
 CMAKE_ARGS+=		-DWITH_GEOS=1
 .else
 CMAKE_ARGS+=		-DWITH_GEOS=0
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGIS}
 USES+=			pgsql
 CMAKE_ARGS+=		-DWITH_POSTGIS=1
 .else
 CMAKE_ARGS+=		-DWITH_POSTGIS=0
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 USES+=			php:build
 CMAKE_ARGS+=		-DWITH_PHP=1
 PLIST_SUB+=		PHP=""
 .else
 CMAKE_ARGS+=		-DWITH_PHP=0
 PLIST_SUB+=		PHP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
 BUILD_DEPENDS=	swig:devel/swig
 CMAKE_ARGS+=	-DWITH_PERL=1
 PLIST_SUB+=	PERL=""
 .else
 CMAKE_ARGS+=	-DWITH_PERL=0
 PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=		libcurl.so:ftp/curl
 CMAKE_ARGS+=		-DWITH_CURL=1
 .else
 CMAKE_ARGS+=		-DWITH_CURL=0
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/cgi-fcgi:www/fcgi
 CMAKE_ARGS+=		-DWITH_FCGI=1
 .else
 CMAKE_ARGS+=		-DWITH_FCGI=0
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Debug
 .else
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT_WMS}
 LIB_DEPENDS+=		libcurl.so:ftp/curl
 LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WMS=1
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT_WFS}
 LIB_DEPENDS+=		libcurl.so:ftp/curl
 LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WFS=1
 .endif
 
 do-install:
 .for f in ${PROG_FILES}
 	${STRIP_CMD} ${BUILD_WRKSRC}/${f}
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
 
 	@${LN} -sf libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
 	@${LN} -sf libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
 
 do-install-PHP-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \
 		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
 	@${ECHO_CMD} "extension=php_mapscript.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-php_mapscript.ini
 
 do-install-PYTHON-on:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
 
 .include <bsd.port.mk>
diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
index 11635a61e94a..681812ce5a28 100644
--- a/graphics/openorienteering-mapper/Makefile
+++ b/graphics/openorienteering-mapper/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	openorienteering-mapper
 PORTVERSION=	0.9.5
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 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
 
 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/proj/Makefile b/graphics/proj/Makefile
index b268a3b0d2c4..3de5c948c334 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	proj
-PORTVERSION=	9.1.1
+PORTVERSION=	9.2.0
 PORTEPOCH=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	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
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff
 #RUN_DEPENDS=	proj-data>=0:graphics/proj-data
 
 USES=		compiler:c++11-lang cmake cpe libtool pathfix pkgconfig sqlite
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 
 CPE_VENDOR=	proj_project
 
 .include <bsd.port.mk>
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index 01e9d76c59f2..6ebc05223898 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673956040
-SHA256 (proj-9.1.1.tar.gz) = 003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39
-SIZE (proj-9.1.1.tar.gz) = 5311995
+TIMESTAMP = 1678364737
+SHA256 (proj-9.2.0.tar.gz) = dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e
+SIZE (proj-9.2.0.tar.gz) = 5521397
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index e4e62e2efc47..1b8786d0e47a 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -1,61 +1,62 @@
 bin/cct
 bin/cs2cs
 bin/geod
 bin/gie
 bin/invgeod
 bin/invproj
 bin/proj
 bin/projinfo
 bin/projsync
 include/geodesic.h
 include/proj.h
 include/proj/common.hpp
+include/proj/coordinates.hpp
 include/proj/coordinateoperation.hpp
 include/proj/coordinatesystem.hpp
 include/proj/crs.hpp
 include/proj/datum.hpp
 include/proj/io.hpp
 include/proj/metadata.hpp
 include/proj/nn.hpp
 include/proj/util.hpp
 include/proj_constants.h
 include/proj_experimental.h
 include/proj_symbol_rename.h
 lib/cmake/proj/proj-config-version.cmake
 lib/cmake/proj/proj-config.cmake
 lib/cmake/proj/proj-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj/proj-targets.cmake
 lib/cmake/proj/proj4-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj/proj4-targets.cmake
 lib/cmake/proj4/proj-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj4/proj-targets.cmake
 lib/cmake/proj4/proj4-config-version.cmake
 lib/cmake/proj4/proj4-config.cmake
 lib/cmake/proj4/proj4-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj4/proj4-targets.cmake
 lib/libproj.so
 lib/libproj.so.25
-lib/libproj.so.25.9.1.1
+lib/libproj.so.25.9.2.0
 libdata/pkgconfig/proj.pc
 share/man/man1/cct.1.gz
 share/man/man1/cs2cs.1.gz
 share/man/man1/geod.1.gz
 share/man/man1/gie.1.gz
 share/man/man1/proj.1.gz
 share/man/man1/projinfo.1.gz
 share/man/man1/projsync.1.gz
 %%DATADIR%%/CH
 %%DATADIR%%/GL27
 %%DATADIR%%/ITRF2000
 %%DATADIR%%/ITRF2008
 %%DATADIR%%/ITRF2014
 %%DATADIR%%/deformation_model.schema.json
 %%DATADIR%%/nad.lst
 %%DATADIR%%/nad27
 %%DATADIR%%/nad83
 %%DATADIR%%/other.extra
 %%DATADIR%%/proj.db
 %%DATADIR%%/proj.ini
 %%DATADIR%%/projjson.schema.json
 %%DATADIR%%/triangulation.schema.json
 %%DATADIR%%/world
diff --git a/graphics/py-pyproj/Makefile b/graphics/py-pyproj/Makefile
index 6c483146c19f..07c2902dbdcf 100644
--- a/graphics/py-pyproj/Makefile
+++ b/graphics/py-pyproj/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	pyproj
 PORTVERSION=	3.4.1
+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://github.com/pyproj4/pyproj
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	proj>=8.2.0,1:graphics/proj
 LIB_DEPENDS=	libproj.so:graphics/proj
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 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 00eec768dc6d..33c78543a86d 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,182 +1,182 @@
 PORTNAME=	qgis
 DISTVERSION=	3.22.15
-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 \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-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}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>=3.0.5: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}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		liblazperf.so:archivers/lazperf \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		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}dateutil>=2.8.2:devel/py-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}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}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}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.8+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools:build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \
 		-DWITH_INTERNAL_MDAL:BOOL=false \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \
 		WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # 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 fd422847a7b2..9fe289d02a96 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,181 +1,181 @@
 PORTNAME=	qgis
 DISTVERSION=	3.28.3
-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 \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-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}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		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}dateutil>=2.8.2:devel/py-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}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}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.8+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools:build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS \
 		WITH_COPC WITH_CUSTOM_WIDGETS WITH_EPT  WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL 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=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # 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/PDL/Makefile b/math/PDL/Makefile
index 5737f60c032a..0b4b5fe55229 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	PDL
 PORTVERSION=	2.019
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl Data Language
 WWW=		https://metacpan.org/release/PDL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 BROKEN_i386=	ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output
 .endif
 BROKEN_aarch64=	ld: error: relocation R_AARCH64_ADR_PREL_PG_HI21 cannot be used against symbol __stack_chk_guard; recompile with -fPIC
 
 BUILD_DEPENDS=	p5-Devel-CheckLib>=1.01:devel/p5-Devel-CheckLib \
 		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Astro-FITS-Header>=0:astro/p5-Astro-FITS-Header \
 		p5-Convert-UU>=0:converters/p5-Convert-UU \
 		p5-File-Map>=0.57:devel/p5-File-Map \
 		p5-Inline>=0.68:devel/p5-Inline \
 		p5-Inline-C>=0.62:devel/p5-Inline-C \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-Module-Compile>=0.23:devel/p5-Module-Compile
 TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
 		p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 PORTSCOUT=	limit:^[0-9]\.[0-9][0-9]+[0-9\.]*$$
 
 USES=		gmake perl5
 USE_PERL5=	configure
 MAKE_ENV=	PERL5LIB=${WRKSRC}/blib/lib
 PLIST_FILES=	bin/pdl bin/pdl2 bin/pdldoc bin/perldl bin/pptemplate \
 		${SITE_ARCH_REL}/Inline/Pdlpp.pm \
 		${SITE_ARCH_REL}/Inline/MakePdlppInstallable.pm
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	PGPLOT PLPLOT OPENGL GD FFTW GSL HDF PROJ F77 READLINE SINK
 OPTIONS_DEFAULT=PGPLOT FFTW F77
 
 # graphics/p5-OpenGL require manual building
 .if empty(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	OPENGL
 .endif
 
 PGPLOT_DESC=	Enable PDL::Graphics::PGPLOT
 PLPLOT_DESC=	Enable PDL::Graphics::PLplot
 OPENGL_DESC=	Enable PDL::Graphics::TriD and OpenGL
 GD_DESC=	Enable PDL::IO::GD
 FFTW_DESC=	Enable PDL::FFTW
 GSL_DESC=	Enable PDL::GSL interface
 HDF_DESC=	Enable PDL::IO::HDF interface
 PROJ_DESC=	Enable PDL::GIS::Proj interface
 F77_DESC=	Enable PDL::Minuit and PDL::Slatec
 READLINE_DESC=	Use GNU readline
 SINK_DESC=	Include PDL kitchen sink
 
 PGPLOT_BUILD_DEPENDS=	p5-PGPLOT>=0:graphics/p5-PGPLOT
 PLPLOT_LIB_DEPENDS=	libplplotd.so:math/plplot
 OPENGL_BUILD_DEPENDS=	p5-OpenGL>=0.65:graphics/p5-OpenGL
 OPENGL_RUN_DEPENDS:=	${OPENGL_BUILD_DEPENDS}
 OPENGL_USES=		gl
 OPENGL_USE=		gl=glu
 GD_LIB_DEPENDS=		libgd.so:graphics/gd
 F77_BUILD_DEPENDS=	p5-ExtUtils-F77>=0:lang/p5-ExtUtils-F77
 FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 HDF_LIB_DEPENDS=	libdf.so:science/hdf
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 READLINE_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_RUN_DEPENDS_OFF=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 SINK_RUN_DEPENDS=	ppmtogif:graphics/netpbm \
 			mpeg_encode:multimedia/mpeg_encode
 
 post-patch:
 	@${GREP} -lR '#!/.*bin/perl' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|#!/.*bin/perl|#!${PERL}|' -i ''
 	@${GREP} -lR 'x86_64' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|x86_64|amd64|g' -i ''
 	@${REINPLACE_CMD} -e "/POSIX_THREADS_LIBS/ s|undef|'-lpthread'|" \
 		${WRKSRC}/perldl.conf
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -name '*.so' \
 		| ${XARGS} ${STRIP_CMD}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pdl
 # autogen plist
 	@(cd ${WRKSRC}; ${PERL} -Iblib/lib -Iblib/arch Doc/scantree.pl)
 	@(cd ${WRKSRC}/blib/man3 ; \
 	  ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX}/man/man3/,;s/3$$/3.gz/" \
 		>> ${TMPPLIST} ; \
 	  cd ${WRKSRC}/blib/man1 ; \
 	  ${FIND} *.1 | ${SED} "s,^,${MAN1PREFIX}/man/man1/,;s/1$$/1.gz/" \
 		>> ${TMPPLIST})
 	@(${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/PDL* -type f | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \
 	  ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f \
 		-name "[A-Z]*" | ${SED} "s,^${STAGEDIR}${PREFIX}/,," \
 		>> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sf/Makefile b/math/R-cran-sf/Makefile
index 9fa379c83191..0c19b32a786c 100644
--- a/math/R-cran-sf/Makefile
+++ b/math/R-cran-sf/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	sf
 DISTVERSION=	1.0-8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@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.0.7:graphics/R-cran-s2 \
 		R-cran-units>=0.7.0:math/R-cran-units
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 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 36ce3c9c13e2..5000ae51b7e0 100644
--- a/math/R-cran-terra/Makefile
+++ b/math/R-cran-terra/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	terra
 DISTVERSION=	1.6-17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Spatiall Data Analysis
 WWW=		https://cran.r-project.org/web/packages/terra/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.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}
 
 USES=		compiler:c++11-lang 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 ad1126847d54..44811f0b3f79 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-octproj
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 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
 
 post-patch:
 	${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/saga/Makefile b/math/saga/Makefile
index e6453b36e883..5fd060a0a6eb 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	saga
 PORTVERSION=	8.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/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=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		swig:devel/swig
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		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 \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libsvm.so:science/libsvm \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	swig:devel/swig
 
 USES=		cmake compiler:c++11-lib dos2unix gnome \
 		iconv:wchar_t libtool localbase pkgconfig python
 DOS2UNIX_GLOB=	*.cpp *.h
 USE_LDCONFIG=	yes
 USE_WX=		3.2+
 
 GIT_TAGNAME=	570fadfa8
 
 CMAKE_ARGS=	-DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h
 CMAKE_ON=	WITH_DEV_TOOLS WITH_EXCERCISES WITH_MRMR WITH_SYSTEM_SVM
 CMAKE_ON+=	CMAKE_VERBOSE_MAKEFILE
 CMAKE_OFF=	WITH_CLIPPER_ONE
 CMAKE_OFF+=	WITH_TOOLS_LAS WITH_TRIANGLE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/saga-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>
 
 # make describe needs them here
 CPP=		clang-cpp${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 
 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/accessories/templates/template4saga-tools/my_tool_library/Makefile
 
 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
 # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820)
 	(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
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 # 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/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 747db9851dcf..70cfd62212d4 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -1,163 +1,163 @@
 PORTNAME=	lives
 DISTVERSION=	3.2.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Video editing system
 WWW=		http://lives-video.com/
 
 LICENSE=		GPLv3+ LGPL3+
 LICENSE_COMB=		multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		analyseplugin:audio/ladspa
 LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
 		libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg \
 		libmjpegutils.so:multimedia/mjpegtools
 RUN_DEPENDS=	analyseplugin:audio/ladspa \
 		ffprobe:multimedia/ffmpeg \
 		sox:audio/sox
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
 		gl gnome libtool localbase pathfix perl5 pkgconfig python \
 		sdl shebangfix xorg
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi smogrify \
 		tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
 		lives-plugins/marcos-encoders/*encoder* \
 		lives-plugins/plugins/encoders/multi_encoder3 \
 		lives-plugins/plugins/playback/audiostream/audiostreamer.pl
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xrender
 USE_GL=		gl glu
 USE_SDL=	sdl sdl2
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-ldvgrab --disable-prctl --disable-system-weed --disable-dirac
 INSTALL_TARGET=	install-strip
 
 DOC_FILES=	AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS README \
 		OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
 		RFX/RFX.spec docs/c++-bindings.odt docs/clip_format.txt \
 		lives-plugins/marcos-encoders/README.multi_encoder \
 		weed-docs/weedspec.txt weed-docs/weedevents.txt
 
 OPTIONS_DEFINE=			ALSA DOCS DOXYGEN DV FFTW FREI0R JACK IMAGEMAGICK LIBEXPLAIN \
 				LIBVISUAL OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \
 				THEORA V4L WAYLAND
 OPTIONS_GROUP=			RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3
 OPTIONS_GROUP_RUNTIME=		CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
 				SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
 OPTIONS_GROUP_EXT_WIN_CAPTURE=	WMCTRL XDOTOOL
 OPTIONS_GROUP_MP3=		MPG123 MPG321
 OPTIONS_GROUP_MPLAYERS=		MPLAYER MPV
 OPTIONS_DEFAULT=		CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
 				MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV \
 				THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
 OPTIONS_SUB=			yes
 
 ALSA_CONFIGURE_OFF=		--disable-alsa
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 CDDA2WAV_RUN_DEPENDS=		cdda2wav:sysutils/cdrtools
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=		--disable-doxygen
 DV_CONFIGURE_OFF=		--disable-libdv
 DV_LIB_DEPENDS=			libdv.so:multimedia/libdv
 DV_RUN_DEPENDS=			encodedv:multimedia/libdv
 EXT_WIN_CAPTURE_DESC=		Allows external window capture via xdotool or wmctrl
 FFTW_CONFIGURE_OFF=		--disable-fftw3f
 FFTW_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
 				libfftw3f.so:math/fftw3-float
 FREI0R_BUILD_DEPENDS=		frei0r>0:graphics/frei0r
 FREI0R_CONFIGURE_OFF=		--disable-frei0r
 FREI0R_RUN_DEPENDS=		frei0r>0:graphics/frei0r
 GHOSTSCRIPT_USES=		ghostscript:run
 IMAGEMAGICK_USES=		magick:run
 JACK_CONFIGURE_OFF=		--disable-jack
 JACK_LIB_DEPENDS=		libjack.so:audio/jack \
 				libjackserver.so:audio/jack
 LAME_RUN_DEPENDS=		lame:audio/lame
 LIBEXPLAIN_CONFIGURE_OFF=	--disable-libexplain
 LIBEXPLAIN_DESC=		Used to explain Unix and Linux system call errors
 LIBEXPLAIN_LIB_DEPENDS=		libexplain.so:devel/libexplain
 LIBVISUAL_CONFIGURE_OFF=	--disable-libvisual
 LIBVISUAL_LIB_DEPENDS=		libvisual-0.4.so:graphics/libvisual04
 MATROSKA_RUN_DEPENDS=		mkvmerge:multimedia/mkvtoolnix
 MENCODER_RUN_DEPENDS=		mencoder:multimedia/mencoder
 MENCODER_DESC=			Use mencoder as video file and movie encoder
 MP3_DESC=			Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
 MPG123_RUN_DEPENDS=		mpg123:audio/mpg123
 MPG321_DESC=			MP3 decoding support via mpg321
 MPG321_RUN_DEPENDS=		mpg321:audio/mpg321
 MPLAYER_RUN_DEPENDS=		mplayer:multimedia/mplayer
 MPLAYERS_DESC=			Install mplayer/mpv (runtime check)
 MPV_DESC=			MPV media player support
 MPV_RUN_DEPENDS=		mpv:multimedia/mpv
 NLS_USES=			gettext-tools
 OGG_CONFIGURE_OFF=		--disable-ogg
 OGG_LIB_DEPENDS=		libogg.so:audio/libogg
 OGG123_DESC=			Use ogg123 from vorbis-tools
 OGG123_RUN_DEPENDS=		ogg123:audio/vorbis-tools
 OGM_DESC=			Use ogmtools for manipulating with OGM files
 OGM_RUN_DEPENDS=		ogmmerge:multimedia/ogmtools
 OPENCV_CONFIGURE_OFF=		--disable-opencv
 OPENCV_LIB_DEPENDS=		libopencv_calib3d.so:graphics/opencv \
 				libopencv_core.so:graphics/opencv
 SSWF_DESC=			Use sswf for manipulating with Flash movies
 SSWF_RUN_DEPENDS=		sswf:graphics/sswf
 THEORA_CONFIGURE_OFF=		--disable-theora
 THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 OPTIMIZED_CFLAGS_CONFIGURE_ON=	--enable-turbo
 PROJECTM_CONFIGURE_OFF=		--disable-projectM
 PROJECTM_DESC=			projectM support
 PROJECTM_LIB_DEPENDS=		libprojectM.so:graphics/libprojectm
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 RUNTIME_DESC=			Runtime detected utilities
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_OFF=		--disable-v4l
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 WAYLAND_CONFIGURE_OFF=		--disable-wayland
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libwayland-egl.so:graphics/wayland \
 				libwayland-cursor.so:graphics/wayland
 WMCTRL_DESC=			Install wmctrl
 WMCTRL_RUN_DEPENDS=		wmctrl:x11/wmctrl
 YTDLP_DESC=			Install yt-dlp (youtube-dl fork) - requires SYMLINK option
 YTDLP_RUN_DEPENDS=		yt-dlp:www/yt-dlp
 X264_RUN_DEPENDS=		x264:multimedia/x264
 XDG_SCREENSAVER_DESC=		Used to disable screensaver during playback
 XDG_SCREENSAVER_RUN_DEPENDS=	xdg-screensaver:devel/xdg-utils
 XDOTOOL_DESC=			Install xdotool
 XDOTOOL_RUN_DEPENDS=		xdotool:x11/xdotool
 XWININFO_DESC=			Used for external window capture
 XWININFO_RUN_DEPENDS=		xwininfo:x11/xwininfo
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 		's/^LIBS = $$/&@LIBS@/'
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \
 		${WRKSRC}/lives-plugins/weed-plugins/frei0r.c
 	@${REINPLACE_CMD} 's|/usr/bin/perl|${perl_CMD}|' \
 		${WRKSRC}/build-lives-rfx-plugin
 
 pre-build-NLS-on:
 	@(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} update-po)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \
 		-not -type d >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 5d67d3e680a0..131271792a7a 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -1,328 +1,328 @@
 PORTNAME=	qmmp
 PORTVERSION=	1.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/${PORTNAME}/${PORTVERSION:R}/ \
 	SF/qmmp-dev/${PORTNAME}/${PORTVERSION:R}/
 PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Qt5-based multimedia player
 WWW=		https://qmmp.ylsoftware.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	${PORTNAME}-qt6
 PORTSCOUT=	limit:^1\..*
 
 USES=		cmake gnome pathfix pkgconfig tar:bzip2
 USE_QT=		core gui network widgets xml \
 		buildtools:build linguisttools:build qmake:build
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	USE_MMS
 
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
 		PLUGIN_PLAYLIST PLUGIN_NETWORKING MISC
 
 PLUGIN_APPLICATION_DESC=	Main program view
 OPTIONS_GROUP_PLUGIN_APPLICATION=	GNOMEHOTKEY HISTORY HOTKEY KDENOTIFY \
 		NOTIFIER QMMP_DIALOG QSUI SKINNEDUI STATICON TWOPANELDIALOG
 
 DOCUMENTS_DESC=	Documentation and API Reference
 OPTIONS_GROUP_DOCUMENTS=	DOCS DOXYGEN
 
 PLUGIN_FORMATS_DESC=	Support various media formats
 OPTIONS_GROUP_PLUGIN_FORMATS=	ARCHIVE CDDA FAAD FFMPEG FLAC GME \
 		MAD MPG123 MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI XMP
 
 PLUGIN_DSP_EFFECTS_DESC=	DSP effects
 OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B CROSSFADE LADSPA SOXR STEREO
 
 PLUGIN_VISUAL_EFFECTS_DESC=	Visual effects
 OPTIONS_GROUP_PLUGIN_VISUAL_EFFECTS=	ANALYZER PROJECTM
 
 PLUGIN_OUTPUT_DESC=	Output sound systems
 OPTIONS_GROUP_PLUGIN_OUTPUT=	ALSA JACK NULLOUT OSS OSS4 \
 		PULSEAUDIO QTMULTIMEDIA SHOUTCAST
 
 PLUGIN_PLAYLIST_DESC=	Playlist operation
 OPTIONS_GROUP_PLUGIN_PLAYLIST=	COPYPASTE DIR_ASSOC FILEOPS \
 		TRACKCHANGE UDISKS
 
 PLUGIN_NETWORKING_DESC=	Features via the Net
 OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS SB SCROBBLER
 
 MISC_DESC=	Other features
 OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA FILEWRITER MPLAYER MPRIS RGSCAN SID
 
 OPTIONS_DEFAULT=	ALSA ANALYZER ARCHIVE BS2B CDDA CONVERTER COPYPASTE COVER \
 		CROSSFADE CUE CURL DIR_ASSOC ENCA FFMPEG FILEOPS FILEWRITER FLAC \
 		GNOMEHOTKEY GME HISTORY HOTKEY JACK KDENOTIFY LADSPA LYRICS \
 		MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
 		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA RGSCAN \
 		SHOUTCAST SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
 		TRACKCHANGE TWOPANELDIALOG UDISKS VORBIS WAVPACK WILDMIDI XMP
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
 QSUI_CMAKE_BOOL=	USE_QSUI
 
 SKINNEDUI_DESC=	Skinned GUI
 SKINNEDUI_USES=	qt:5 xorg
 SKINNEDUI_USE=	QT=x11extras XORG=x11
 SKINNEDUI_CMAKE_BOOL=	USE_SKINNED
 
 DIR_ASSOC_DESC=	inode/directory mime type association
 DIR_ASSOC_CMAKE_BOOL=	USE_DIR_ASSOC
 DIR_ASSOC_USES=	desktop-file-utils
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack \
 		libsoxr.so:audio/libsoxr
 JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
 JACK_CMAKE_BOOL=	USE_JACK
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 BS2B_DESC=		Support the Bauer stereophonic2binaural effect
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CMAKE_BOOL=	USE_BS2B
 
 HISTORY_DESC=	Information about listened tracks
 HISTORY_USES=	qt:5
 HISTORY_USE=	QT=sql
 HISTORY_CMAKE_BOOL=	USE_HISTORY
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 QTMULTIMEDIA_DESC=	Support to use Qt low-level multimedia API
 QTMULTIMEDIA_USES=	qt:5
 QTMULTIMEDIA_USE=	QT=multimedia
 QTMULTIMEDIA_CMAKE_BOOL=	USE_QTMULTIMEDIA
 
 SHOUTCAST_LIB_DEPENDS=	libogg.so:audio/libogg \
 		libshout.so:audio/libshout \
 		libsoxr.so:audio/libsoxr \
 		libvorbis.so:audio/libvorbis
 SHOUTCAST_CMAKE_BOOL=	USE_SHOUT
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libtag.so:audio/taglib
 FLAC_CMAKE_BOOL=	USE_FLAC
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
 		libtag.so:audio/taglib
 MUSEPACK_CMAKE_BOOL=	USE_MPC
 
 GME_DESC=		Support video game music files
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CMAKE_BOOL=	USE_GME
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
 		libtag.so:audio/taglib
 FAAD_CMAKE_BOOL=	USE_AAC
 
 CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
 		libcddb.so:audio/libcddb \
 		libcdio_cdda.so:sysutils/libcdio-paranoia
 CDDA_CMAKE_BOOL=	USE_CDA
 
 ENCA_DESC=		Support automatic character set detection
 ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CMAKE_BOOL=	USE_ENCA
 
 FILEWRITER_DESC=	Dump output sound into ogg audio file
 FILEWRITER_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 FILEWRITER_CMAKE_BOOL=	USE_FILEWRITER
 
 MPLAYER_DESC=	Enable showing videos by mplayer
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPLAYER_CMAKE_BOOL=	USE_MPLAYER
 
 PROJECTM_DESC=	Support the projectM music visualiser
 PROJECTM_LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
 PROJECTM_USES=		gl
 PROJECTM_USE=		GL=gl
 PROJECTM_CMAKE_BOOL=	USE_PROJECTM
 
 OSS_CMAKE_BOOL=	USE_OSS
 
 OSS4_DESC=		Open Sound System (ver4) support
 OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
 OSS4_CMAKE_BOOL=	USE_OSS4
 
 LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 LADSPA_CMAKE_BOOL=	USE_LADSPA
 
 WILDMIDI_DESC=	Support to playback MIDI files
 WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
 WILDMIDI_CMAKE_BOOL=	USE_MIDI
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
 		libtag.so:audio/taglib
 MAD_CMAKE_BOOL=	USE_MAD
 
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123 \
 		libtag.so:audio/taglib
 MPG123_CMAKE_BOOL=	USE_MPG123
 
 OPUS_DESC=		Enable reading opusfile tags
 OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
 		libopus.so:audio/opus \
 		libtag.so:audio/taglib
 OPUS_CMAKE_BOOL=	USE_OPUS
 
 RGSCAN_DESC=	ReplayGain scanner
 RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
 RGSCAN_CMAKE_BOOL=	USE_RGSCAN
 
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_BOOL=	USE_SNDFILE
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libtag.so:audio/taglib
 VORBIS_CMAKE_BOOL=	USE_VORBIS
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_BOOL=	USE_WAVPACK
 
 XMP_DESC=		Support various module formats using libxmp
 XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
 XMP_CMAKE_BOOL=	USE_XMP
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	USE_CURL
 
 CUE_CMAKE_BOOL=	USE_CUE
 
 NULLOUT_DESC=	Support null output
 NULLOUT_CMAKE_BOOL=	USE_NULL
 
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	USE_SOXR
 
 CROSSFADE_DESC=	Support cross-fade effect
 CROSSFADE_CMAKE_BOOL=	USE_CROSSFADE
 
 STEREO_DESC=	Support stereo effect
 STEREO_CMAKE_BOOL=	USE_STEREO
 
 ANALYZER_DESC=	Support spectrum analyzer visualization
 ANALYZER_CMAKE_BOOL=	USE_ANALYZER
 
 ARCHIVE_DESC=	Read archived media file
 ARCHIVE_USES=	libarchive
 ARCHIVE_CMAKE_BOOL=	USE_ARCHIVE
 
 CONVERTER_DESC=	Support file type converter
 CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
 CONVERTER_CMAKE_BOOL=	USE_CONVERTER
 
 COPYPASTE_DESC=	Enable copy/paste track infos between playlists
 COPYPASTE_CMAKE_BOOL=	USE_COPYPASTE
 
 MPRIS_DESC=	Support the Media Player Remote
 MPRIS_USES=	qt:5
 MPRIS_USE=	QT=dbus
 MPRIS_CMAKE_BOOL=	USE_MPRIS
 
 SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
 SCROBBLER_CMAKE_BOOL=	USE_SCROBBLER
 
 SID_DESC=	Support sid
 SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CMAKE_BOOL=	USE_SID
 
 STATICON_DESC=	Support to show status icon
 STATICON_CMAKE_BOOL=	USE_STATICON
 
 SB_DESC=	Browser for IceCast stream directory
 SB_CMAKE_BOOL=	USE_SB
 
 NOTIFIER_DESC=	Support to popup notifier
 NOTIFIER_CMAKE_BOOL=	USE_NOTIFIER
 
 LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
 LYRICS_CMAKE_BOOL=	USE_LYRICS
 
 HOTKEY_DESC=	Support global shortcut keys
 HOTKEY_USES=	qt:5
 HOTKEY_USE=	QT=x11extras XORG=x11
 HOTKEY_CMAKE_BOOL=	USE_HOTKEY
 
 GNOMEHOTKEY_DESC=	Support GNOME/Cinnamon shortcut keys
 GNOMEHOTKEY_USES=	qt:5
 GNOMEHOTKEY_USE=	QT=dbus
 GNOMEHOTKEY_CMAKE_BOOL=	USE_GNOMEHOTKEY
 
 FILEOPS_DESC=	Support file operation
 FILEOPS_CMAKE_BOOL=	USE_FILEOPS
 
 COVER_DESC=	Support to show cover images
 COVER_CMAKE_BOOL=	USE_COVER
 
 KDENOTIFY_DESC=	Support to popup notifier for KDE
 KDENOTIFY_USES=	qt:5
 KDENOTIFY_USE=	QT=dbus
 KDENOTIFY_CMAKE_BOOL=	USE_KDENOTIFY
 
 TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 UDISKS_DESC=	Support removable disc detection using UDisks
 UDISKS_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
 UDISKS_USES=	qt:5
 UDISKS_USE=	QT=dbus
 UDISKS_CMAKE_BOOL=	USE_UDISKS
 
 QMMP_DIALOG_DESC=	An original dialog
 QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//} LIB_SUFFX=-${PORTVERSION:R} BIN_SUFFX=-${PORTVERSION:R:R}
 
 PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
 PORTDOCS=	README README.RUS AUTHORS
 
 .include <bsd.port.options.mk>
 
 .if (${PORT_OPTIONS:MMAD} || ${PORT_OPTIONS:MMPG123})
 PLIST_SUB+=	MPEG=""
 .else
 PLIST_SUB+=	MPEG="@comment "
 .endif
 
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
 
 pre-configure:
 	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen Doxyfile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
 		cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
 	cd ${WRKSRC}/doc/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html
 	@${FIND} -P ${STAGEDIR}${DOCSDIR}/html -type f 2>/dev/null | \
 		${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp-qt6/Makefile b/multimedia/qmmp-qt6/Makefile
index 233f3b9e4c37..3aa698166788 100644
--- a/multimedia/qmmp-qt6/Makefile
+++ b/multimedia/qmmp-qt6/Makefile
@@ -1,326 +1,326 @@
 PORTNAME=	qmmp
 PORTVERSION=	2.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/${PORTNAME}/${PORTVERSION:R}/ \
 	SF/qmmp-dev/${PORTNAME}/${PORTVERSION:R}/
 PKGNAMESUFFIX=	-qt6
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Qt6-based multimedia player
 WWW=		https://qmmp.ylsoftware.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	${PORTNAME}-qt5
 PORTSCOUT=	limit:^1\..*
 
 USES=		cmake gl gnome pathfix pkgconfig qt:6 tar:bzip2
 USE_GL=		gl opengl
 USE_QT=		base:build declarative:build tools:build
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	USE_MMS
 
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
 		PLUGIN_PLAYLIST PLUGIN_NETWORKING MISC
 
 PLUGIN_APPLICATION_DESC=	Main program view
 OPTIONS_GROUP_PLUGIN_APPLICATION=	GNOMEHOTKEY HISTORY HOTKEY KDENOTIFY \
 		NOTIFIER QMMP_DIALOG QSUI SKINNEDUI STATICON TWOPANELDIALOG
 
 DOCUMENTS_DESC=	Documentation and API Reference
 OPTIONS_GROUP_DOCUMENTS=	DOCS DOXYGEN
 
 PLUGIN_FORMATS_DESC=	Support various media formats
 OPTIONS_GROUP_PLUGIN_FORMATS=	ARCHIVE CDDA FAAD FFMPEG FLAC GME \
 		MAD MPG123 MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI XMP
 
 PLUGIN_DSP_EFFECTS_DESC=	DSP effects
 OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B CROSSFADE LADSPA SOXR STEREO
 
 PLUGIN_VISUAL_EFFECTS_DESC=	Visual effects
 OPTIONS_GROUP_PLUGIN_VISUAL_EFFECTS=	ANALYZER PROJECTM
 
 PLUGIN_OUTPUT_DESC=	Output sound systems
 OPTIONS_GROUP_PLUGIN_OUTPUT=	ALSA JACK NULLOUT OSS OSS4 \
 		PULSEAUDIO QTMULTIMEDIA SHOUTCAST
 
 PLUGIN_PLAYLIST_DESC=	Playlist operation
 OPTIONS_GROUP_PLUGIN_PLAYLIST=	COPYPASTE DIR_ASSOC FILEOPS \
 		TRACKCHANGE UDISKS
 
 PLUGIN_NETWORKING_DESC=	Features via the Net
 OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS SB SCROBBLER
 
 MISC_DESC=	Other features
 OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA FILEWRITER MPLAYER MPRIS RGSCAN SID
 
 OPTIONS_DEFAULT=	ALSA ANALYZER ARCHIVE BS2B CDDA CONVERTER COPYPASTE COVER \
 		CROSSFADE CUE CURL DIR_ASSOC ENCA FFMPEG FILEOPS FILEWRITER FLAC \
 		GNOMEHOTKEY GME HISTORY HOTKEY JACK KDENOTIFY LADSPA LYRICS \
 		MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
 		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI RGSCAN \
 		SHOUTCAST SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
 		TRACKCHANGE TWOPANELDIALOG UDISKS VORBIS WAVPACK WILDMIDI XMP
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
 QSUI_CMAKE_BOOL=	USE_QSUI
 
 SKINNEDUI_DESC=	Skinned GUI
 SKINNEDUI_USES=	xorg
 SKINNEDUI_USE=	QT=base XORG=x11
 SKINNEDUI_CMAKE_BOOL=	USE_SKINNED
 
 DIR_ASSOC_DESC=	inode/directory mime type association
 DIR_ASSOC_CMAKE_BOOL=	USE_DIR_ASSOC
 DIR_ASSOC_USES=	desktop-file-utils
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack \
 		libsoxr.so:audio/libsoxr
 JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
 JACK_CMAKE_BOOL=	USE_JACK
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 BS2B_DESC=		Support the Bauer stereophonic2binaural effect
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CMAKE_BOOL=	USE_BS2B
 
 HISTORY_DESC=	Information about listened tracks
 HISTORY_USE=	QT=base
 HISTORY_CMAKE_BOOL=	USE_HISTORY
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 QTMULTIMEDIA_DESC=	Support to use Qt low-level multimedia API
 QTMULTIMEDIA_USE=	QT=multimedia
 QTMULTIMEDIA_CMAKE_BOOL=	USE_QTMULTIMEDIA
 
 SHOUTCAST_LIB_DEPENDS=	libogg.so:audio/libogg \
 		libshout.so:audio/libshout \
 		libsoxr.so:audio/libsoxr \
 		libvorbis.so:audio/libvorbis
 SHOUTCAST_CMAKE_BOOL=	USE_SHOUT
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
 			libtag.so:audio/taglib
 FLAC_USES=		iconv
 FLAC_CMAKE_BOOL=	USE_FLAC
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
 			libtag.so:audio/taglib
 MUSEPACK_USES=		iconv
 MUSEPACK_CMAKE_BOOL=	USE_MPC
 
 GME_DESC=		Support video game music files
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CMAKE_BOOL=	USE_GME
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
 			libtag.so:audio/taglib
 FAAD_USES=		iconv
 FAAD_CMAKE_BOOL=	USE_AAC
 
 CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
 		libcddb.so:audio/libcddb \
 		libcdio_cdda.so:sysutils/libcdio-paranoia
 CDDA_CMAKE_BOOL=	USE_CDA
 
 ENCA_DESC=		Support automatic character set detection
 ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CMAKE_BOOL=	USE_ENCA
 
 FILEWRITER_DESC=	Dump output sound into ogg audio file
 FILEWRITER_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 FILEWRITER_CMAKE_BOOL=	USE_FILEWRITER
 
 MPLAYER_DESC=	Enable showing videos by mplayer
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPLAYER_CMAKE_BOOL=	USE_MPLAYER
 
 PROJECTM_DESC=	Support the projectM music visualiser
 PROJECTM_LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
 PROJECTM_CMAKE_BOOL=	USE_PROJECTM
 
 OSS_CMAKE_BOOL=	USE_OSS
 
 OSS4_DESC=		Open Sound System (ver4) support
 OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
 OSS4_CMAKE_BOOL=	USE_OSS4
 
 LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 LADSPA_CMAKE_BOOL=	USE_LADSPA
 
 WILDMIDI_DESC=	Support to playback MIDI files
 WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
 WILDMIDI_CMAKE_BOOL=	USE_MIDI
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
 		libtag.so:audio/taglib
 MUAD_USES=		iconv
 MAD_CMAKE_BOOL=	USE_MAD
 
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123 \
 		libtag.so:audio/taglib
 MPG123K_USES=		iconv
 MPG123_CMAKE_BOOL=	USE_MPG123
 
 OPUS_DESC=		Enable reading opusfile tags
 OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
 		libopus.so:audio/opus \
 		libtag.so:audio/taglib
 OPUS_USES=		iconv
 OPUS_CMAKE_BOOL=	USE_OPUS
 
 RGSCAN_DESC=	ReplayGain scanner
 RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
 RGSCAN_CMAKE_BOOL=	USE_RGSCAN
 
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_BOOL=	USE_SNDFILE
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libtag.so:audio/taglib
 VORBIS_USES=		iconv
 VORBIS_CMAKE_BOOL=	USE_VORBIS
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_BOOL=	USE_WAVPACK
 
 XMP_DESC=		Support various module formats using libxmp
 XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
 XMP_CMAKE_BOOL=	USE_XMP
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	USE_CURL
 
 CUE_CMAKE_BOOL=	USE_CUE
 
 NULLOUT_DESC=	Support null output
 NULLOUT_CMAKE_BOOL=	USE_NULL
 
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	USE_SOXR
 
 CROSSFADE_DESC=	Support cross-fade effect
 CROSSFADE_CMAKE_BOOL=	USE_CROSSFADE
 
 STEREO_DESC=	Support stereo effect
 STEREO_CMAKE_BOOL=	USE_STEREO
 
 ANALYZER_DESC=	Support spectrum analyzer visualization
 ANALYZER_CMAKE_BOOL=	USE_ANALYZER
 
 ARCHIVE_DESC=	Read archived media file
 ARCHIVE_USES=	libarchive
 ARCHIVE_CMAKE_BOOL=	USE_ARCHIVE
 
 CONVERTER_DESC=	Support file type converter
 CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
 CONVERTER_CMAKE_BOOL=	USE_CONVERTER
 
 COPYPASTE_DESC=	Enable copy/paste track infos between playlists
 COPYPASTE_CMAKE_BOOL=	USE_COPYPASTE
 
 MPRIS_DESC=	Support the Media Player Remote
 MPRIS_USE=	QT=base
 MPRIS_CMAKE_BOOL=	USE_MPRIS
 
 SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
 SCROBBLER_CMAKE_BOOL=	USE_SCROBBLER
 
 SID_DESC=	Support sid
 SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CMAKE_BOOL=	USE_SID
 
 STATICON_DESC=	Support to show status icon
 STATICON_CMAKE_BOOL=	USE_STATICON
 
 SB_DESC=	Browser for IceCast stream directory
 SB_CMAKE_BOOL=	USE_SB
 
 NOTIFIER_DESC=	Support to popup notifier
 NOTIFIER_CMAKE_BOOL=	USE_NOTIFIER
 
 LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
 LYRICS_CMAKE_BOOL=	USE_LYRICS
 
 HOTKEY_DESC=	Support global shortcut keys
 HOTKEY_USE=	QT=base XORG=x11
 HOTKEY_CMAKE_BOOL=	USE_HOTKEY
 
 GNOMEHOTKEY_DESC=	Support GNOME/Cinnamon shortcut keys
 GNOMEHOTKEY_USE=	QT=base
 GNOMEHOTKEY_CMAKE_BOOL=	USE_GNOMEHOTKEY
 
 FILEOPS_DESC=	Support file operation
 FILEOPS_CMAKE_BOOL=	USE_FILEOPS
 
 COVER_DESC=	Support to show cover images
 COVER_CMAKE_BOOL=	USE_COVER
 
 KDENOTIFY_DESC=	Support to popup notifier for KDE
 KDENOTIFY_USE=	QT=base
 KDENOTIFY_CMAKE_BOOL=	USE_KDENOTIFY
 
 TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 UDISKS_DESC=	Support removable disc detection using UDisks
 UDISKS_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
 UDISKS_USE=	QT=base
 UDISKS_CMAKE_BOOL=	USE_UDISKS
 
 QMMP_DIALOG_DESC=	An original dialog
 QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//} LIB_SUFFX=-${PORTVERSION:R} BIN_SUFFX=-${PORTVERSION:R:R}
 
 PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
 PORTDOCS=	README README.RUS AUTHORS
 
 .include <bsd.port.options.mk>
 
 .if (${PORT_OPTIONS:MMAD} || ${PORT_OPTIONS:MMPG123})
 PLIST_SUB+=	MPEG=""
 .else
 PLIST_SUB+=	MPEG="@comment "
 .endif
 
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
 
 pre-configure:
 	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen Doxyfile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
 		cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
 	cd ${WRKSRC}/doc/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html
 	@${FIND} -P ${STAGEDIR}${DOCSDIR}/html -type f 2>/dev/null | \
 		${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index e0e1eecede17..a762f1b984a4 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,80 +1,81 @@
 PORTNAME=	cdo
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/27654/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 WWW=		https://code.mpimet.mpg.de/projects/cdo
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 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
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
 USES=		compiler:c++17-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
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 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/e2fsprogs-libuuid
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR
 .endif
 
 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}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.post.mk>
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index f53c5823ed0d..8c9f5456a1f0 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,154 +1,154 @@
 PORTNAME=	gnudatalanguage
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	Free IDL-compatible incremental compiler
 WWW=		https://github.com/gnudatalanguage/gdl
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libgeotiff.so:graphics/libgeotiff\
 		libexpat.so:textproc/expat2	\
 		libplplot.so:math/plplot	\
 		libtiff.so:graphics/tiff	\
 		libshp.so:devel/shapelib	\
 		libpng.so:graphics/png		\
 		libsz.so:science/libaec		\
 		libps.so:print/pslib		\
 		libgsl.so:math/gsl
 
 USE_GITHUB=	yes
 GH_PROJECT=	gdl
 GH_TAGNAME=	6546898e7f2d23ae1bf67ebe70dc0f38886e5de7
 
 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"	\
 		-DPYTHON:BOOL=NO
 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 GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4	\
 		MPI NETCDF PYTHON QHULL UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK 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
 
 GLPK_DESC=		Support GLPK for Simplex (Linear programming)
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CMAKE_ON=		-DGLPK=ON:BOOL=YES
 GLPK_CMAKE_OFF=		-DGLPK=OFF:BOOL=NO
 
 GRAPHICSMAGICK_DESC=		Support GraphicsMagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 # Temporary swith to ImageMagick
 #IMAGEMAGICK_DESC=	Support ImageMagick
 #IMAGEMAGICK_LIB_DEPENDS=libMagick++-7.so:graphics/ImageMagick7
 #IMAGEMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=NO -DMAGICK:BOOL=YES -DMAGICKDIR=${LOCALBASE}
 #IMAGEMAGICK_CMAKE_OFF=	-DMAGICK: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
 
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_CMAKE_ON=		-DMPI:BOOL=ON
 MPI_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:3.7+
 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 f019ecabdc66..da46d51bac6c 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,168 +1,168 @@
 PORTNAME=	paraview
 DISTVERSION=	${PARAVIEW_VER}.0
-PORTREVISION=	2
+PORTREVISION=	3
 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/
 
 LICENSE=	ParaView_License_1.2
 LICENSE_NAME=	ParaView_License
 LICENSE_FILE=	${WRKSRC}/License_v1.2.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to link: undefined reference to `sbrk'
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cli11>0:devel/cli11	\
 		utf8cpp>0:devel/utf8cpp	\
 		nlohmann-json>0:devel/nlohmann-json	\
 		${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 \
 		liblas.so:devel/liblas \
 		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 \
 		libpdal_base.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 \
 		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:c11 eigen:3 fortran gl gnome jpeg localbase	\
 		pkgconfig python qt:5 shebangfix sqlite tar:xz xorg
 USE_GL=		gl glew glu glut
 USE_GNOME=	libxml2
 USE_QT=		buildtools:build core gui help network opengl qmake:build sql svg	\
 		webengine widgets x11extras xmlpatterns
 USE_XORG=	ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xorgproto xrender	\
 		xxf86vm
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPARAVIEW_BUILD_SHARED_LIBS=ON \
 		-DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
 		-DPARAVIEW_USE_PYTHON:BOOL=ON \
 		-DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
 		-DPARAVIEW_ENABLE_LAS:BOOL=ON \
 		-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 \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DVTK_FORBID_DOWNLOADS:BOOL=ON
 .endif
 MAKE_ENV=	XDG_CONFIG_HOME=${WRKDIR}
 
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	VTK/Examples/SearchScript.sh	\
 		VTK/Utilities/Maintenance/*.sh	\
 		Clients/CommandLineExecutables/paraview-config.in
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPI OSMESA
 OPTIONS_SUB=	yes
 OSMESA_DESC=	Use Mesa for off-screen rendering
 
 # mpi4py and other programs must be compiled against the same MPI provider
 MPI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPI_USES=		mpi # mpich is set by default, use mpi:openmpi if needed
 MPI_CMAKE_ON=		-DPARAVIEW_USE_MPI:BOOL=ON
 MPI_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
 
 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 93a0ba330759..3877449e71aa 100644
--- a/science/rubygem-rgeo-proj4/Makefile
+++ b/science/rubygem-rgeo-proj4/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	rgeo-proj4
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 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>