diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 0cce61e0127c..3280f8f0d4aa 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	ark
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	archivers kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Archiving tool for KDE
 
 LICENSE=	GPLv2+
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext libarchive kde:5 \
 		cpe qt:5 tar:xz
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons doctools i18n iconthemes \
 		itemmodels itemviews jobwidgets khtml kio parts pty service \
 		solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_QT=		concurrent core dbus gui network widgets xml \
 		buildtools_build qmake_build
 
 USE_LDCONFIG=	yes
 
 PATCH_STRIP=	-p1
 
 OPTIONS_DEFINE=	7ZIP RAR ZIP DOCS
 OPTIONS_DEFAULT=	7ZIP ZIP DOCS
 OPTIONS_DEFAULT_i386=	RAR
 OPTIONS_DEFAULT_amd64=	RAR
 OPTIONS_SUB=		YES
 
 # The 7ZIP and RAR options only need runtime dependencies;
 # the port builds identically with or without them.
 7ZIP_DESC=	Support for 7-Zip archives (runtime)
 7ZIP_RUN_DEPENDS=	7zz:archivers/7-zip
 
 RAR_DESC=	Support for RAR archives (runtime)
 RAR_RUN_DEPENDS=	unrar:archivers/unrar \
 			rar:archivers/rar
 
 ZIP_DESC=	Support for ZIP archives
 ZIP_LIB_DEPENDS=	libzip.so:archivers/libzip
 ZIP_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_LibZip
 
 # Override shared library version
 KDE_APPLICATIONS_SHLIB_VER=	${KDE_APPLICATIONS_VERSION}
 
 .include <bsd.port.mk>
diff --git a/archivers/libzippp/Makefile b/archivers/libzippp/Makefile
index f1a7d9c97bf8..0d5c40085f23 100644
--- a/archivers/libzippp/Makefile
+++ b/archivers/libzippp/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	libzippp
 DISTVERSIONPREFIX=	${PORTNAME}-v
 DISTVERSION=	5.1-1.8.0
+PORTREVISION=	1
 CATEGORIES=	archivers devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ wrapper for libzip
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 LIB_DEPENDS=	libzip.so:archivers/libzip
 
 USES=		cmake:testing
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ctabin
 
 CMAKE_ON=		BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	LIBZIPPP_BUILD_TESTS
 
 .include <bsd.port.mk>
diff --git a/archivers/php74-zip/Makefile b/archivers/php74-zip/Makefile
index 251a2fbca8e2..e4b9e8914ce2 100644
--- a/archivers/php74-zip/Makefile
+++ b/archivers/php74-zip/Makefile
@@ -1,9 +1,10 @@
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-zip
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/php80-zip/Makefile b/archivers/php80-zip/Makefile
index 91acb043f381..be485abbd922 100644
--- a/archivers/php80-zip/Makefile
+++ b/archivers/php80-zip/Makefile
@@ -1,9 +1,10 @@
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-zip
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/php81-zip/Makefile b/archivers/php81-zip/Makefile
index 448cb8fad537..b97385590535 100644
--- a/archivers/php81-zip/Makefile
+++ b/archivers/php81-zip/Makefile
@@ -1,7 +1,8 @@
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MASTERDIR=	${.CURDIR}/../../lang/php81
 
 PKGNAMESUFFIX=	-zip
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/php82-zip/Makefile b/archivers/php82-zip/Makefile
index 5d9133ebe88f..f4177271b5d3 100644
--- a/archivers/php82-zip/Makefile
+++ b/archivers/php82-zip/Makefile
@@ -1,7 +1,8 @@
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MASTERDIR=	${.CURDIR}/../../lang/php82
 
 PKGNAMESUFFIX=	-zip
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 00edbf02f923..e7838e90588c 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -1,231 +1,231 @@
 PORTNAME=	deadbeef
 PORTVERSION=	0.7.2
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Ultimate music player for Unix-like systems
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c11 desktop-file-utils gettext gmake gnome iconv \
 		libtool pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-alsa --disable-nullout --disable-static
 CPPFLAGS+=	-I../dumb/dumb-kode54/include -I../../plugins/libmp4ff \
 		-I../../plugins/gme/game-music-emu-0.6pre \
 		-I./sidplay-libs/libsidplay/include/sidplay \
 		-I${LOCALBASE}/include
 CFLAGS+=	-Wno-narrowing
 LDFLAGS_i386=	-Wl,-z,notext
 LIBS+=		-L${LOCALBASE}/lib -lexecinfo -lintl
 USE_GNOME=	intltool
 SHEBANG_FILES=	yasmwrapper.sh
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	PULSEAUDIO GUI VFS LASTFM ART SUPEREQ SID FFAP VTX \
 		HOTKEYS OGG FFMPEG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY \
 		MUSEPACK WILDMIDI TTA DCA AAC MMS SHN SHELLEXEC NLS M3U \
 		PSF ADPLUG DSP MONO2STEREO CONVERTER VFS_ZIP ALAC PLTBROWSER \
 		WMA SC68
 OPTIONS_DEFAULT=MAD GTK2 VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \
 		OGG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY MUSEPACK \
 		WILDMIDI TTA DCA AAC MMS SHN SHELLEXEC M3U PSF ADPLUG DSP \
 		MONO2STEREO CONVERTER VFS_ZIP HOTKEYS ALAC PLTBROWSER WMA SC68
 
 PULSEAUDIO_DESC=	PulseAudio output plugin (unsupported)
 GUI_DESC=		Standard GUI plugin
 VFS_DESC=		HTTP streaming VFS plugin
 LASTFM_DESC=		Last.fm/Libre.fm scrobbler plugin
 ART_DESC=		Cover artwork loader plugin
 SUPEREQ_DESC=		SuperEQ DSP plugin (equalizer)
 SID_DESC=		Commodore 64 SID music player plugin
 FFAP_DESC=		${APE_DESC}
 VTX_DESC=		VTX ZX-Spectrum music player plugin
 ADPLUG_DESC=		AdPlug audio format (OPL2/OPL3) support
 HOTKEYS_DESC=		Local and global hotkeys support
 GME_DESC=		Chiptune music support (based on GME)
 DUMB_DESC=		D.U.M.B. plugin for MOD, S3M, etc.
 NOTIFY_DESC=		OSD notification support in GTKUI plugin
 WILDMIDI_DESC=		WildMIDI synthesizer plugin
 SC68_DESC=		sc68 Atari ST And Amiga player
 SHN_DESC=		Shorten waveform encoder support
 SHELLEXEC_DESC=		Shell commands execution plugin
 M3U_DESC=		M3U and PLS playlist format support
 PSF_DESC=		AOSDK-based PSF(,QSF,SSF,DSF) plugin
 DSP_DESC=		High-quality sample rate conversion support
 MONO2STEREO_DESC=	Mono to stereo converter DSP plugin
 CONVERTER_DESC=		Plugin for converting files from/to any formats
 VFS_ZIP_DESC=		Play files directly from ZIP archives
 PLTBROWSER_DESC=	Playlist browser GUI plugin
 
 OPTIONS_SUB=		yes
 OPTIONS_RADIO+=		GUI
 OPTIONS_RADIO_GUI=	GTK2 GTK3
 GUI_IMPLIES=		CONVERTER
 
 OPTIONS_GROUP+=		MP3
 OPTIONS_GROUP_MP3=	MAD MPG123
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_OFF=	--disable-libmad
 
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CONFIGURE_OFF=	--disable-libmpg123
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 GTK2_USE=		gnome=gtk20,glib20
 GTK2_CONFIGURE_OFF=	--disable-gtk2
 GTK2_CONFIGURE_ON=	--enable-gtk2
 GTK2_VARS=		GTK_VER=2
 GTK2_IMPLIES=		GUI
 
 GTK3_USE=		gnome=gtk30
 GTK3_CONFIGURE_OFF=	--disable-gtk3
 GTK3_CONFIGURE_ON=	--enable-gtk3
 GTK3_VARS=		GTK_VER=3
 GTK3_IMPLIES=		GUI
 
 PLIST_SUB+=		GTK_VER=${GTK_VER}
 
 GUI_CONFIGURE_OFF=	--disable-gtk2 --disable-gtk3
 GUI_LIB_DEPENDS=	libjansson.so:devel/jansson
 
 VFS_LIB_DEPENDS=	libcurl.so:ftp/curl
 VFS_CONFIGURE_OFF=	--disable-vfs-curl
 
 LASTFM_LIB_DEPENDS=	libcurl.so:ftp/curl
 LASTFM_CONFIGURE_OFF=	--disable-lfm
 
 ART_LIB_DEPENDS=	libcurl.so:ftp/curl \
 			libImlib2.so:graphics/imlib2
 ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
 ART_IMPLIES=		VFS
 
 SUPEREQ_CONFIGURE_OFF=	--disable-supereq
 
 SID_CONFIGURE_OFF=	--disable-sid
 
 FFAP_BUILD_DEPENDS=	yasm:devel/yasm
 FFAP_CONFIGURE_OFF=	--disable-ffap
 
 VTX_CONFIGURE_OFF=	--disable-vtx
 
 ADPLUG_CONFIGURE_OFF=	--disable-adplug
 
 HOTKEYS_CONFIGURE_OFF=	--disable-hotkeys
 
 OGG_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 OGG_CONFIGURE_OFF=	--disable-vorbis
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_OFF=	--disable-flac
 
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_OFF=	--disable-sndfile
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--disable-wavpack
 
 CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
 			libcddb.so:audio/libcddb
 CDDA_CONFIGURE_OFF=	--disable-cdda
 
 GME_CONFIGURE_OFF=	--disable-gme
 
 DUMB_CONFIGURE_OFF=	--disable-dumb
 
 NOTIFY_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 NOTIFY_CONFIGURE_OFF=	--disable-notify
 
 MUSEPACK_CONFIGURE_OFF=	--disable-musepack
 
 WILDMIDI_RUN_DEPENDS=	${LOCALBASE}/share/freepats/crude.cfg:audio/freepats
 WILDMIDI_CONFIGURE_OFF=	--disable-wildmidi
 
 TTA_CONFIGURE_OFF=	--disable-tta
 
 DCA_CONFIGURE_OFF=	--disable-dca
 
 AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_CONFIGURE_OFF=	--disable-aac
 
 MMS_CONFIGURE_OFF=	--disable-mms
 
 SC68_CONFIGURE_ON=	--enable-sc68
 SC68_CONFIGURE_OFF=	--disable-sc68
 
 SHN_CONFIGURE_OFF=	--disable-shn
 
 SHELLEXEC_CONFIGURE_OFF=	--disable-shellexec
 
 NLS_CONFIGURE_OFF=	--disable-nls
 
 M3U_CONFIGURE_OFF=	--disable-m3u
 
 PSF_CONFIGURE_OFF=	--disable-psf
 
 DSP_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 DSP_CONFIGURE_OFF=	--disable-src
 
 MONO2STEREO_CONFIGURE_OFF=	--disable-mono2stereo
 
 CONVERTER_CONFIGURE_OFF=	--disable-converter
 
 VFS_ZIP_LIB_DEPENDS=	libzip.so:archivers/libzip
 VFS_ZIP_CONFIGURE_OFF=	--disable-vfs-zip
 
 ALAC_CONFIGURE_OFF=		--disable-alac
 
 PLTBROWSER_CONFIGURE_OFF=	--disable-pltbrowser
 
 WMA_CONFIGURE_OFF=		--disable-wma
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3}
 PORT_OPTIONS:=          ${PORT_OPTIONS:NGUI}
 .endif
 
 .if !${PORT_OPTIONS:MMAD} && !${PORT_OPTIONS:MMPG123}
 CONFIGURE_ARGS+=	--disable-mp3
 PLIST_SUB+=		MP3="@comment "
 .else
 PLIST_SUB+=		MP3=""
 .endif
 
 post-patch:
 # Do not link to libsupc++ which may be PIC-unsafe (breaks 64-bit arches)
 	@${REINPLACE_CMD} -e 's, -lsupc++,,' \
 		${WRKSRC}/plugins/adplug/Makefile.in \
 		${WRKSRC}/plugins/gme/Makefile.in \
 		${WRKSRC}/plugins/sid/Makefile.in \
 		${WRKSRC}/plugins/supereq/Makefile.in
 	@${REINPLACE_CMD} -e 's,/etc/timidity++/timidity-freepats.cfg:/etc/timidity/freepats.cfg:/etc/timidity/,${LOCALBASE}/share/,' \
 		${WRKSRC}/plugins/wildmidi/wildmidiplug.c
 # Clang accepts `-msse2' command line option even on !x86, need better check
 	@${REINPLACE_CMD} -e '25177s,^,#include <xmmintrin.h>,' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/chnresolv/s,const char,signed &,' \
 		${WRKSRC}/plugins/adplug/adplug/s3m.cpp \
 		${WRKSRC}/plugins/adplug/adplug/s3m.h
 	@${REINPLACE_CMD} -e "/sampleConvertTable/s,int8_t,u&, ; \
 		86,+1 { s,',,g; s,\\\\x,0x,g; }" \
 		${WRKSRC}/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp \
 		${WRKSRC}/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
 # Fix build with libzip-1.0
 	@${REINPLACE_CMD} 's,zip_file_t,zip_file_DB,g' \
 		${WRKSRC}/plugins/vfs_zip/vfs_zip.c
 
 .include <bsd.port.mk>
diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index fa990ba0be7c..83d098809e8e 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	EDA package for printed circuit board design
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_14=		fails to compile (error: no matching function for call to '__search') due to this clang regression: https://github.com/llvm/llvm-project/issues/55683
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \
 		cppzmq>0:net/cppzmq \
 		glm>0:math/glm
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libepoxy.so:graphics/libepoxy \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpng16.so:graphics/png \
 		libpodofo.so:graphics/podofo \
 		libTKSTEP.so:cad/opencascade \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libzip.so:archivers/libzip \
 		libzmq.so:net/libzmq4
 
 USES=		gmake gnome libarchive localbase pkgconfig python:build sqlite # compiler:c++17-lang
 USE_GNOME=	atkmm gdkpixbuf2 gtkmm30 librsvg2
 
 USE_GITHUB=	yes
 GH_PROJECT=	horizon
 
 MAKE_ARGS=	DEBUGFLAGS= OPTIMIZE=
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 LLVM_VER=	12 # workaround for bug#263870
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
 
 post-install: # https://github.com/horizon-eda/horizon/issues/558
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} horizon-eda horizon-imp
 
 .include <bsd.port.mk>
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index aab1acf32f27..dba5b787bbc0 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	openscad
 PORTVERSION=	2022.05.20
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	cc49ad8dac24.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 BROKEN=		fails to configure: The imported target "Qt5::Core" references the file "/usr/local/lib/qt5/bin/qmake" but this file does not exist.
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cgal>0:math/cgal
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 CONFLICTS=	openscad
 
 USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	cairo glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
 GH_ACCOUNT=	microsoft:mimalloc
 GH_PROJECT=	MCAD:mcad mimalloc:mimalloc
 GH_TAGNAME=	6aae7963498675dfb5bedaaef2cb8e56bdcddcab bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc
 GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc
 #QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
 
 #post-patch:
 #	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 #	@${REINPLACE_CMD} -e 's,share/man,man,' \
 #		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index ba0668119f95..b03bbec1bd06 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	openscad
 PORTVERSION=	2021.01.01
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	cc49ad8dac24.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cgal>0:math/cgal
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 USES=		bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
 GH_TAGNAME=	41f58fe57c03457a3a8b4dc541ef5654ec3e8c78
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
 CONFLICTS_INSTALL=	openscad-devel # bin/openscad
 
 post-patch:
 	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index 45460cd175fc..745e355e5d03 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	repsnapper
 DISTVERSION=	2.5a4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Controller and GCode generator for RepRap 3D printers
 
 LICENSE=	GPLv2 BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
 		libpolyclipping.so:graphics/polyclipping \
 		libzip.so:archivers/libzip
 
 USES=		compiler:c++11-lib autoreconf gettext gl gmake gnome libtool \
 		localbase perl5 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	timschmidt
 USE_GNOME=	gtkmm24 intltool libxml++26
 USE_GL=		gl
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/repsnapper/repsnapper.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/repsnapper/repsnapper.conf.sample
 
 .include <bsd.port.mk>
diff --git a/comms/libconcord/Makefile b/comms/libconcord/Makefile
index e497dc9bc717..dc50bdebb0a4 100644
--- a/comms/libconcord/Makefile
+++ b/comms/libconcord/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	libconcord
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	SF/concordance/concordance/${PORTVERSION}
 DISTNAME=	concordance-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Logitech Harmony configuration library
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libhidapi.so:comms/hidapi \
 		libzip.so:archivers/libzip
 
 USE_LDCONFIG=	yes
 USES=		tar:bzip2 libtool pkgconfig shared-mime-info
 WRKSRC_SUBDIR=	libconcord
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index a6484e87c7e1..5a160a139f44 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	kchmviewer
 DISTVERSIONPREFIX=	RELEASE_
 DISTVERSION=	8_0
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE viewer for CHM files
 
 LIB_DEPENDS=	libchm.so:misc/chmlib \
 		libzip.so:archivers/libzip
 
 USES=		compiler:c++11-lang dos2unix qmake:outsource qt:5 xorg
 USE_QT=		core dbus gui network printsupport webkit widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gyunaev
 
 DOS2UNIX_GLOB=	*.cpp *.h *.pro *.ui
 
 .include <bsd.port.mk>
diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile
index 43f4c4696d38..2a0730d16bfb 100644
--- a/devel/libsigrok/Makefile
+++ b/devel/libsigrok/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	libsigrok
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://sigrok.org/download/source/libsigrok/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Framework for hardware logic analyzers, core library
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	doxygen:devel/doxygen
 LIB_DEPENDS=	libftdi1.so:devel/libftdi1 \
 		libserialport.so:devel/libserialport \
 		libvisa.so:devel/librevisa \
 		libzip.so:archivers/libzip
 
 USES=		compiler:c11 gnome pathfix libtool pkgconfig
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	glibmm
 
 post-patch:
 # libusb can be disabled via src.conf(5), so detect via pkg-config
 	@${REINPLACE_CMD} -e 's/\(libusb-1\.0\) >= 1\.0\.[0-9]*/\1/' \
 		-e '/\*freebsd\*/,/;;/d' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/emulators/libretro-ppsspp/Makefile b/emulators/libretro-ppsspp/Makefile
index 59effea19ca9..f4ad77bc1aa2 100644
--- a/emulators/libretro-ppsspp/Makefile
+++ b/emulators/libretro-ppsspp/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	libretro-
 
 MASTERDIR=	${.CURDIR}/../ppsspp
 
 OPTIONS_SLAVE=	LIBRETRO
 OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile
index 2b5cf472f7e3..41539a191451 100644
--- a/emulators/ppsspp-qt5/Makefile
+++ b/emulators/ppsspp-qt5/Makefile
@@ -1,10 +1,10 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../ppsspp
 
 OPTIONS_SLAVE=	QT5
 # XXX No VULKAN per https://github.com/hrydgard/ppsspp/blob/v1.10/Qt/QtMain.cpp#L711-L712
 OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 03c99c661287..44076a00396a 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.13.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
 DISTFILES=	${PORTNAME}.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
 
 LICENSE=	GPLv2+
 
 # Bi-endian architectures default to big for some reason
 NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe sparc64
 NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \
 		https://github.com/hrydgard/ppsspp/issues/8823
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libsnappy.so:archivers/snappy \
 		libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
 GH_TUPLE?=	hrydgard:glslang:8.13.3743-339-gdc11adde:glslang/ext/glslang \
 		hrydgard:miniupnp:miniupnpd_2_1-502-g3a87be3:miniupnp/ext/miniupnp \
 		facebook:zstd:v1.5.0:zstd/ext/zstd \
 		unknownbrackets:ppsspp-debugger:9776332:debugger/assets/debugger \
 		KhronosGroup:SPIRV-Cross:2021-01-15:SPIRV/ext/SPIRV-Cross \
 		Kingcom:armips:v0.10.0-28-g7885552:armips/ext/armips
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig
 EXCLUDE=	libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		glew opengl
 CMAKE_ON=	USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP USE_SYSTEM_SNAPPY USE_WAYLAND_WSI
 CMAKE_OFF=	USE_DISCORD
 SUB_FILES=	pkg-message
 PORTDATA=	assets
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME} %f" \
 		"Game;Emulator;" \
 		""
 
 OPTIONS_DEFINE=	VULKAN
 OPTIONS_DEFAULT=VULKAN
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	LIBRETRO QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_EXCLUDE} ${OPTIONS_SINGLE_GUI}
 
 LIBRETRO_DESC=	libretro core for games/retroarch
 LIBRETRO_CMAKE_BOOL=	LIBRETRO
 LIBRETRO_PLIST_FILES=	lib/libretro/${PORTNAME}_libretro.so
 LIBRETRO_VARS=	CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES=
 QT5_USES=	qt:5 sdl
 QT5_USE=	QT=qmake_build,buildtools_build,linguisttools_build,gui,multimedia,opengl,widgets
 QT5_USE+=	SDL=sdl2 # audio, joystick
 QT5_CMAKE_BOOL=	USING_QT_UI
 QT5_VARS=	EXENAME=PPSSPPQt
 SDL_BUILD_DEPENDS=	png>=1.6:graphics/png
 SDL_LIB_DEPENDS=	libpng.so:graphics/png
 SDL_USES=	sdl
 SDL_USE=	SDL=sdl2
 SDL_VARS=	EXENAME=PPSSPPSDL
 VULKAN_DESC=		Vulkan renderer
 VULKAN_RUN_DEPENDS=	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \
 		${WRKSRC}/assets/gamecontrollerdb.txt
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/UI/NativeApp.cpp
 	@${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' \
 		${WRKSRC}/git-version.cmake
 
 do-install-QT5-on do-install-SDL-on:
 	${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-LIBRETRO-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/${LIBRETRO_PLIST_FILES:T} \
 		${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H}
 
 .include <bsd.port.mk>
diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile
index 731e512ee68b..f38e43a9e638 100644
--- a/games/freedink-engine/Makefile
+++ b/games/freedink-engine/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	freedink
 PORTVERSION=	108.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-engine
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dink Smallwood RPG and RPG Construction Set
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libcheck.so:devel/check
 
 USES=		gettext gmake pkgconfig sdl
 USE_SDL=	sdl gfx ttf image mixer
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --disable-upx
 
 OPTIONS_DEFINE=	EMBEDDED
 OPTIONS_DEFAULT=EMBEDDED
 
 EMBEDDED_DESC=			Embedded Resources
 EMBEDDED_CONFIGURE_ENABLE=	embedded-resources
 EMBEDDED_BUILD_DEPENDS=		zip:archivers/zip
 EMBEDDED_LIB_DEPENDS=		libzip.so:archivers/libzip
 EMBEDDED_RUN_DEPENDS=		zip:archivers/zip
 
 post-patch:
 	@${CHMOD} 0755 ${WRKSRC}/autotools/install-reloc
 
 .include <bsd.port.mk>
diff --git a/games/naev/Makefile b/games/naev/Makefile
index a65495f09bc6..7301a17246a5 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	naev
 PORTVERSION=	0.7.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	2D action/RPG space game
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_13=	ld: error: duplicate symbol: nglActiveTexture
 BROKEN_FreeBSD_14=	ld: error: duplicate symbol: nglActiveTexture
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libvorbisfile.so:audio/libvorbis \
 		libzip.so:archivers/libzip
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/${DISTNAME}-ndata.zip:games/naev-data
 
 USES=		autoreconf:build compiler:features gl gmake gnome pkgconfig sdl \
 		tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GL=		gl glu
 USE_GNOME=	libxml2
 
 CONFIGURE_ARGS=	--with-ndata-path="${DATADIR}/${DISTNAME}-ndata.zip" \
 		--enable-debug=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm
 
 PORTDATA=	*
 PORTDOCS=	*
 
 PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/appdata/${PORTNAME}.appdata.xml \
 		share/pixmaps/${PORTNAME}.png
 
 OPTIONS_DEFINE=	DOCS OPENAL SDL2 SDL_MIXER
 OPTIONS_DEFAULT=	LUA_JIT OPENAL SDL2 SDL_MIXER
 OPTIONS_DEFAULT_powerpc64=	LUA_SHARED
 OPTIONS_EXCLUDE_powerpc64=	LUA_JIT
 OPTIONS_SINGLE=		LUA
 OPTIONS_SINGLE_LUA=	LUA_INTERNAL LUA_SHARED LUA_JIT
 
 LUA_INTERNAL_DESC=	Use bundled Lua
 LUA_INTERNAL_CONFIGURE_ON=	--enable-lua=internal
 LUA_SHARED_DESC=	Use Lua from lang/lua51
 LUA_SHARED_CONFIGURE_ON=	--enable-lua=shared
 LUA_SHARED_USES=	lua:51
 LUA_JIT_DESC=		Use LuaJIT from lang/luajit
 LUA_JIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 OPENAL_USES=	openal
 OPENAL_CONFIGURE_WITH=	openal
 SDL_MIXER_DESC=	SDL_mixer sound backend
 SDL_MIXER_CONFIGURE_WITH=	sdlmixer
 SDL2_DESC=	Use SDL2 instead of SDL
 SDL2_CONFIGURE_WITH=	sdl2
 SDL2_USE=	SDL=sdl2
 SDL2_USE_OFF=	SDL=sdl
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == "gcc"
 USE_GCC=	yes
 .endif
 
 .if ${PORT_OPTIONS:MSDL_MIXER}
 .	if ${PORT_OPTIONS:MSDL2}
 USE_SDL+=	mixer2
 .	else
 USE_SDL+=	mixer
 .	endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index cd3f6667d998..827917145fd2 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	openrct2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open source re-implementation of RollerCoaster Tycoon 2
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/licence.txt
 
 NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe sparc64
 NOT_FOR_ARCHS_REASON=	Only for little-endian architectures
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libzip.so:archivers/libzip \
 		libFLAC.so:audio/flac \
 		libvorbisfile.so:audio/libvorbis \
 		libspeexdsp.so:audio/speexdsp \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libicuuc.so:devel/icu \
 		libbenchmark.so:devel/benchmark \
 		libduktape.so:lang/duktape-lib
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gnome gl iconv \
 		localbase:ldflags pkgconfig sdl shared-mime-info ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenRCT2
 GH_PROJECT=	OpenRCT2
 GH_TUPLE=	OpenRCT2:objects:v1.3.2:objects \
 		OpenRCT2:title-sequences:v0.4.0:title_sequences
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_SDL=	sdl2
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	DOWNLOAD_TITLE_SEQUENCES \
 		DOWNLOAD_OBJECTS
 
 PORTDATA=	*
 PORTDOCS=	changelog.txt contributors.md licence.txt openrct2.d.ts \
 		readme.txt scripting.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
 		${WRKSRC}/src/openrct2/config/Config.cpp
 
 post-install:
 	(cd ${WRKSRC_title_sequences}; \
 		${COPYTREE_SHARE}/title . ${STAGEDIR}${DATADIR}/title)
 	(cd ${WRKSRC_objects}; \
 		${COPYTREE_SHARE}/objects . ${STAGEDIR}${DATADIR}/object)
 
 .include <bsd.port.mk>
diff --git a/games/taisei/Makefile b/games/taisei/Makefile
index 32b0b06528ac..a769e0f61b92 100644
--- a/games/taisei/Makefile
+++ b/games/taisei/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	taisei
 PORTVERSION=	1.3.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open source Touhou clone
 
 LICENSE=	MIT CC0-1.0 PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libzip.so:archivers/libzip \
 		libwebp.so:graphics/webp \
 		libfreetype.so:print/freetype2 \
 		libopusfile.so:audio/opusfile \
 		libcglm.so:math/cglm
 BUILD_DEPENDS=	glslc:graphics/shaderc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	taisei-project
 GH_TUPLE=	taisei-project:SDL_GameControllerDB:74e31d7:gamecontrollerdb/external/gamecontrollerdb
 
 USES=		compiler:c11 desktop-file-utils meson pkgconfig \
 		python:3.6+,build sdl ssl shebangfix shared-mime-info
 SHEBANG_FILES=	scripts/*.py
 MESON_ARGS=	-Dversion_fallback=${PORTVERSION} -Db_lto=false
 MESON_ARGS+=	--wrap-mode=nofallback
 MESON_ARGS+=	-DOPENSSLLIB="${OPENSSLLIB}"
 USE_SDL=	sdl2 ttf2 mixer2
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=rst2html5.py:textproc/py-docutils
 DOCS_MESON_TRUE=docs
 
 post-install:
 	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 6f06faff17d3..03bb4aa15e94 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,346 +1,346 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	7.1.0-43
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
 		https://mirror.dogado.de/imagemagick/releases/ \
 		https://mirror.checkdomain.de/imagemagick/releases/ \
 		https://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ \
 		https://imagemagick.org/archive/releases/
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Image processing tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl	\
 		libzip.so:archivers/libzip
 
 TESTS_DEPENDS=	gsfonts>=0:print/gsfonts
 
 # bin/Magick++-config
 CONFLICTS_INSTALL=	ImageMagick6 ImageMagick6-nox11
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gettext-runtime gmake gnome libtool:keepla \
 		localbase pathfix perl5 pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps \
 		--without-flif \
 		--without-zstd
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 SAMPLE_FILES=	colors.xml delegates.xml log.xml mime.xml policy.xml \
 		quantization-table.xml thresholds.xml type-apple.xml \
 		type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
 		type-windows.xml type.xml
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \
 		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \
 		THREADS X11 16BIT_PIXEL HDRI HEIF RAW
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \
 		JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG RAQM SVG \
 		TIFF WEBP WMF THREADS X11 HDRI RAW
 
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
 FFMPEG_DESC=		VIDEO codec support as FFmpeg
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
 
 16BIT_PIXEL_DESC=	16bit pixel support
 16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8
 16BIT_PIXEL_VARS=	_QBIT=Q16
 16BIT_PIXEL_VARS_OFF=	_QBIT=Q8
 PLIST_SUB+=		QBIT=${_QBIT}
 
 # Produce BZip compressed MIFF images
 BZIP2_DESC=		bzip2 compressed MIFF images
 BZIP2_CONFIGURE_WITH=	bzlib
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 FONTCONFIG_CONFIGURE_WITH=	fontconfig
 FONTCONFIG_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig
 
 FREETYPE_CONFIGURE_WITH=	freetype
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 
 # FPX (FlashPIX) images
 FPX_CONFIGURE_WITH=	fpx
 FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
 
 GRAPHVIZ_CONFIGURE_WITH=	gvc
 GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CFLAGS=	-I${LOCALBASE}/include/graphviz
 GRAPHVIZ_LDFLAGS=	-L${LOCALBASE}/lib/graphviz
 
 HEIF_CONFIGURE_WITH=	heic
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 
 HDRI_DESC=		High dynamic range images support
 HDRI_CONFIGURE_ENABLE=	hdri
 HDRI_VARS=		_HDRI=HDRI
 HDRI_VARS_OFF=		_HDRI=""
 PLIST_SUB+=		HDRI=${_HDRI}
 
 # JBIG images (lossless compression for bi-level images)
 JBIG_CONFIGURE_WITH=	jbig
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 
 # JPEG2000 images (wavelet-based lossy compression)
 JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 JPEG2000_CONFIGURE_WITH=openjp2
 JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 JXL_CONFIGURE_WITH=	jxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 
 LCMS2_CONFIGURE_WITH=	lcms
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
 LQR_CONFIGURE_WITH=	lqr
 LQR_LIB_DEPENDS=	liblqr-1.so:graphics/liblqr-1
 LQR_USE=		gnome=glib20
 
 LZMA_CONFIGURE_WITH=	lzma
 
 # Loadable coders, smaller executable, but PerlMagick not really works
 # ('make test' there works)
 MODULES_DESC=		Modules support
 MODULES_CONFIGURE_WITH=	modules
 
 PANGO_CONFIGURE_WITH=	pango
 PANGO_USE=		gnome=pango
 PANGO_IMPLIES=		X11
 
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 RAQM_DESC=		Complex text layout support
 RAQM_CONFIGURE_WITH=	raqm
 RAQM_LIB_DEPENDS=	libraqm.so:print/libraqm
 
 # libraw is by default liked to lcms2, whichs also ends up in IM regardless
 # of the IM LCMS option.
 RAW_DESC=		RAW format support (implies the lcms2 option)
 RAW_CONFIGURE_WITH=	raw
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 RAW_IMPLIES=		LCMS2
 
 SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
 SVG_CONFIGURE_WITH=	rsvg
 SVG_USE=		gnome=cairo,gdkpixbuf2,librsvg2
 SVG_IMPLIES=		X11
 
 TIFF_CONFIGURE_WITH=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 X11_CONFIGURE_WITH=	x
 X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext,xt
 X11_VARS=		CONFLICTS_INSTALL+="ImageMagick7-nox11"
 X11_VARS_OFF=		CONFLICTS_INSTALL+="ImageMagick7" \
 			PKGNAMESUFFIX=7-nox11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
 _IMAGEMAGICK_THREADS=yes
 _IMAGEMAGICK_THREADS_MSG=with threads
 . if exists(${PERL})
 PERL_THREADED!=	${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD}
 . else
 # if ${PERL} doesn't exists, assume we dealing with threaded perl.
 PERL_THREADED=	yes
 . endif
 .else
 _IMAGEMAGICK_THREADS=no
 _IMAGEMAGICK_THREADS_MSG=without threads
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
 . if defined(PERL_THREADED)
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded
 _IMAGEMAGICK_THREADS=yes
 . else
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is non-threaded
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. ${_IMAGEMAGICK_THREADS_PERL_MSG}. Reinstall Perl with threads or undefine WITH_IMAGEMAGICK_PERL
 .  if ${_IMAGEMAGICK_THREADS} == "yes"
 IGNORE=${_IMAGEMAGICK_THREADS_IGNORE_MSG} or undefine WITH_THREADS
 .  endif
 _IMAGEMAGICK_THREADS=no
 . endif
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_LIBS="-lpthread"
 LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-threads
 _IMAGEMAGICK_THREADS=no
 .endif
 
 # OpenMP
 .if ${PORT_OPTIONS:MOPENMP}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 CONFIGURE_ARGS+=	--enable-openmp
 . endif
 .else
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 LIB_DEPENDS+=		libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
 CONFIGURE_ARGS+=	--without-openexr
 PLIST_SUB+=		OPENEXR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDJVU}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
 LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf
 . else
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
 .else
 CONFIGURE_ARGS+=	--without-wmf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MGSLIB}
 RUN_DEPENDS+=	gsfonts>=0:print/gsfonts
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 BUILD_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 RUN_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
 INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11,build
 . else
 USES+=		ghostscript:build
 . endif
 .endif
 
 post-patch:
 # strip library name of variable parts that can change due to
 # the HDRI and Q16 option
 	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
 		s|\.@MAGICK_ABI_SUFFIX@||g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
 		${WRKSRC}/PerlMagick/Makefile.PL.in \
 		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
 		${WRKSRC}/Magick++/bin/Magick++-config.in \
 		${WRKSRC}/Magick++/lib/Magick++.pc.in \
 		${WRKSRC}/MagickCore/MagickCore-config.in \
 		${WRKSRC}/MagickCore/MagickCore.pc.in \
 		${WRKSRC}/MagickCore/ImageMagick.pc.in \
 		${WRKSRC}/MagickWand/MagickWand-config.in \
 		${WRKSRC}/MagickWand/MagickWand.pc.in
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
 	@${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}.
 	@${ECHO_CMD} '###################################################################'
 .endif
 
 .if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11}
 	@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
 .endif
 
 post-install:
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i}.sample
 .endfor
 
 post-install-TESTS-on: test
 
 do-test:
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check
 
 .include <bsd.port.mk>
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index cd11a8ede0f8..7f89d7db6ca2 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	okular
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE universal document viewer
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	markdown:textproc/discount
 RUN_DEPENDS=	markdown:textproc/discount
 LIB_DEPENDS=	libchm.so:misc/chmlib \
 		libdjvulibre.so:graphics/djvulibre \
 		libepub.so:textproc/ebook-tools \
 		libfreetype.so:print/freetype2 \
 		libqmobipocket.so:graphics/kdegraphics-mobipocket \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libspectre.so:print/libspectre \
 		libtiff.so:graphics/tiff \
 		libzip.so:archivers/libzip
 
 USES=		cmake compiler:c++11-lib desktop-file-utils \
 		gettext jpeg kde:5 cpe pkgconfig qca qt:5 tar:xz
 USE_KDE=	activities archive auth bookmarks codecs completion config \
 		configwidgets coreaddons crash dbusaddons emoticons i18n \
 		iconthemes init itemmodels itemviews jobwidgets js \
 		kdelibs4support khtml kio libkexiv2 parts pty \
 		service solid sonnet textwidgets threadweaver wallet \
 		widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_QT=		concurrent core dbus declarative gui network phonon4 printsupport speech \
 		svg widgets xml \
 		buildtools_build qmake_build testlib_build
 
 OPTIONS_DEFINE=	DOCS PURPOSE
 OPTIONS_DEFAULT=	PURPOSE
 
 PURPOSE_DESC=	Enable 'Share' menu
 PURPOSE_USE=	KDE=purpose
 PURPOSE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose
 
 .include <bsd.port.mk>
diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile
index a1d27d47d088..726199ad195d 100644
--- a/graphics/openfx-arena/Makefile
+++ b/graphics/openfx-arena/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	openfx-arena
 PORTVERSION=	2.4.3
 DISTVERSIONPREFIX=	Natron-
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Extra OpenFX plugins for Natron
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 BUILD_DEPENDS=	opencl>=0:devel/opencl
 LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfribidi.so:converters/fribidi \
 		libcdr-0.1.so:graphics/libcdr01 \
 		librevenge-0.0.so:textproc/librevenge \
 		libpoppler-glib.so:graphics/poppler-glib \
 		liblcms2.so:graphics/lcms2 \
 		libzip.so:archivers/libzip \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libpcre.so:devel/pcre \
 		libffi.so:devel/libffi \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libharfbuzz.so:print/harfbuzz \
 		libgraphite2.so:graphics/graphite2 \
 		libicui18n.so:devel/icu \
 		liblqr-1.so:graphics/liblqr-1 \
 		libfftw3.so:math/fftw3 \
 		libltdl.so:devel/libltdl \
 		libpoppler.so:graphics/poppler \
 		libraqm.so:print/libraqm
 
 USES=		gl gmake gnome iconv magick:6 ssl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	NatronGitHub
 GH_TUPLE=	NatronGitHub:openfx-supportext:79d8c22:openfx_supportext/SupportExt \
 		NatronGitHub:openfx:d5db5d0:openfx/OpenFX \
 		NatronGitHub:openfx-io:c6ad47b:OpenFX_IO/OpenFX-IO \
 		lvandeve:lodepng:5601b82:dummy/lodepng \
 		NatronGitHub:SequenceParsing:3c93fcc:SequenceParsing/OpenFX-IO/IOSupport/SequenceParsing \
 		NatronGitHub:tinydir:64fb1d4:tinydir/OpenFX-IO/IOSupport/SequenceParsing/tinydir
 
 MAKE_ENV+=	CONFIG=release
 USE_GL=	gl
 USE_GNOME=	libxml2 pango cairo librsvg2
 USE_XORG+=	x11 xcb xau xdamage xfixes xft xxf86vm xrender xext xdmcp pixman sm ice xt
 MAKE_ENV+=	CONFIG=release
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/OpenFX-IO/openfx
 	${LN} -s ../OpenFX ${WRKSRC}/OpenFX-IO/openfx
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/OFX/Plugins|${PREFIX}/OFX/Plugins|g' \
 		${WRKSRC}/OpenFX/Examples/Makefile.master \
 		${WRKSRC}/OpenFX/Support/Plugins/Makefile.master \
 		${WRKSRC}/OpenFX/HostSupport/src/ofxhPluginCache.cpp
 	@${REINPLACE_CMD} -e 's|/Contents/$$(ARCH)|/Contents/FreeBSD-x86-64/|g' \
 		${WRKSRC}/OpenFX/Support/Plugins/Makefile.master
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/OFX/Plugins/Arena.ofx.bundle/Contents/FreeBSD-x86-64/Arena.ofx
 
 .include <bsd.port.mk>
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 70e8bccc17ea..65df2418f366 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	pstoedit
 PORTVERSION=	3.70
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PostScript to other vector graphic formats
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgd.so:graphics/gd	\
 		libzip.so:archivers/libzip
 
 USES=		ghostscript libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG="${STRIP}"
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-isystem ${LOCALBASE}/include/ming
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS EMF EXAMPLES MAGICK MING PLOTUTILS
 OPTIONS_DEFAULT=	EMF MAGICK MING PLOTUTILS
 OPTIONS_SUB=		yes
 
 EMF_DESC=		WMF/EMF support via libEMF
 EMF_LIB_DEPENDS=	libEMF.so:graphics/libemf
 EMF_CONFIGURE_ON=	--with-libemf-include=${LOCALBASE}/include/libEMF
 EMF_CONFIGURE_OFF=	--without-emf
 MAGICK_USES=		magick
 MAGICK_CONFIGURE_ON=	--with-magick
 MAGICK_CONFIGURE_OFF=	--without-magick
 MING_DESC=		Flash support via Ming
 MING_LIB_DEPENDS=	libming.so:graphics/ming
 MING_CONFIGURE_ON=	--with-swf
 MING_CONFIGURE_OFF=	--without-swf
 PLOTUTILS_DESC=		Plotting support via Plotutils
 PLOTUTILS_LIB_DEPENDS=	libplotter.so:graphics/plotutils
 PLOTUTILS_CONFIGURE_ON=	--with-libplot
 PLOTUTILS_CONFIGURE_OFF=	--without-libplot
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CXXFLAGS="-g"|CXXFLAGS="$$CXXFLAGS"|g ; \
 		 s|GraphicsMagick|Magick|g ; \
 		 s|=$$OLDCPPFLAGS|=$$CPPFLAGS|g ; \
 		 s|-lstdc++||g ; \
 		 s|-pedantic||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/src/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 881ca5890b7a..5df056c7d1cb 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,182 +1,182 @@
 PORTNAME=	qgis
 DISTVERSION=	3.22.9
-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
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.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 \
 		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>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.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.7+ 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 \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
 		-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 97f15013877e..c203faa8432f 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,178 +1,178 @@
 PORTNAME=	qgis
 DISTVERSION=	3.26.1
-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
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.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 \
 		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>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.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.7+ 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 \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
 		-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_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/graphics/xournalpp/Makefile b/graphics/xournalpp/Makefile
index 5eb58ba195e4..b79f128e35ac 100644
--- a/graphics/xournalpp/Makefile
+++ b/graphics/xournalpp/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	xournalpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Handwriting notetaking software with PDF annotation support
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	help2man:misc/help2man
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libportaudio.so:audio/portaudio \
 		libsndfile.so:audio/libsndfile \
 		libzip.so:archivers/libzip
 
 USES=		cmake compiler:c++11-lang gettext-tools gnome lua:53 pkgconfig xorg
 USE_GITHUB=	yes
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 librsvg2 libxml2 pango
 USE_XORG=	x11 xi
 USE_TEX=	latex:build
 
 LDFLAGS+=	-lexecinfo
 
 # CAVEAT: crashes when built with gcc: https://github.com/xournalpp/xournalpp/issues/851
 
 .include <bsd.port.mk>
diff --git a/math/sc-im/Makefile b/math/sc-im/Makefile
index 6ff7cab82e39..c5426908184b 100644
--- a/math/sc-im/Makefile
+++ b/math/sc-im/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=		sc-im
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.8.2
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		math
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Ncurses spreadsheet program for terminal
 
 LICENSE=	BSD4CLAUSE
 
 LIB_DEPENDS=	libxlsreader.so:math/libxls \
 		libxlsxwriter.so:math/libxlsxwriter \
 		libzip.so:archivers/libzip
 
 USES=		compiler:c11 gmake gnome lua:51 ncurses pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	andmarti1424
 USE_GNOME=	libxml2
 
 WRKSRC_SUBDIR=	src
 CFLAGS+=	-DXLSX_EXPORT -DXLS
 LIBS+=		-lxlsreader -lxlsxwriter
 MAKE_ENV+=	LDLIBS="${LIBS}"
 MAKE_ARGS+=	CC="${CC}" prefix="${PREFIX}" MANDIR="${MANPREFIX}/man/man1"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sc-im
 	${RM} ${STAGEDIR}${PREFIX}/bin/scopen
 
 .include <bsd.port.mk>
diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile
index 82086b24aeb1..326f96ccfbce 100644
--- a/misc/ignition-fuel-tools/Makefile
+++ b/misc/ignition-fuel-tools/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	ignition-fuel-tools
 DISTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Classes and tools for interacting with Ignition Fuel
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libignition-common3.so:devel/ignition-common \
 		libjsoncpp.so:devel/jsoncpp \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libyaml.so:textproc/libyaml \
 		libzip.so:archivers/libzip
 
 USES=		cmake compiler:c++17-lang pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 
 BB_ACCOUNT=	ignitionrobotics
 BB_PROJECT=	ign-fuel-tools
 BB_COMMIT=	0ffbf3a2c836
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB+=	FUEL_TOOLS_IGN_VER=fuel_tools${DISTVERSION:R:R}
 
 do-test: # 4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/print/simple-fb2-reader/Makefile b/print/simple-fb2-reader/Makefile
index f9df4a37250b..0ac9c28c1a50 100644
--- a/print/simple-fb2-reader/Makefile
+++ b/print/simple-fb2-reader/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	simple-fb2-reader
 PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Simple FB2 format book reader
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libzip.so:archivers/libzip
 
 USES=		cmake desktop-file-utils gettext-runtime gnome pkgconfig \
 		shared-mime-info sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cactus64k
 USE_GNOME=	cairo gdkpixbuf2 gtk30 libxml2
 
 .include <bsd.port.mk>
diff --git a/sysutils/fusefs-zip/Makefile b/sysutils/fusefs-zip/Makefile
index 3b4900a958f1..e57a9eaa0fa0 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/sysutils/fusefs-zip/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	fuse-zip
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://bitbucket.org/agalanin/fuse-zip/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FUSE filesystem to mount ZIP archives with write support
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libzip.so:archivers/libzip
 BUILD_DEPENDS=	libzip>=0.11.1:archivers/libzip
 
 USES=		gmake fuse pkgconfig
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTDOCS=	README.md changelog
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/ebook-tools/Makefile b/textproc/ebook-tools/Makefile
index a7e4bef5c955..e96d66ad0e5d 100644
--- a/textproc/ebook-tools/Makefile
+++ b/textproc/ebook-tools/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	ebook-tools
 PORTVERSION=	0.2.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc kde
 MASTER_SITES=	SF
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Accesses and converts various ebook file formats
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libzip.so:archivers/libzip
 
 USES=		cmake gnome
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 CONFLICTS_INSTALL=	ncbi-entrez-direct # bin/einfo
 
 .include <bsd.port.mk>
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index 90a41b06586d..06aadc827dbb 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=		sogo
 PORTVERSION=		5.7.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
 
 MAINTAINER=		acm@FreeBSD.org
 COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
 
 LIB_DEPENDS=		libmemcached.so:databases/libmemcached \
 			libcurl.so:ftp/curl \
 			libsodium.so:security/libsodium \
 			libzip.so:archivers/libzip \
 			libDOM.so:devel/sope \
 			libytnef.so:converters/ytnef
 
 RUN_DEPENDS=		zip:archivers/zip
 
 OPTIONS_DEFAULT=	MFA
 OPTIONS_DEFINE=		ACTIVESYNC MFA SAML2
 OPTIONS_SUB=		yes
 
 ACTIVESYNC_DESC=	Enable support for ActiveSync protocol
 MFA_DESC=		Enable support for multi-factor authentication
 SAML2_DESC=		Enable support for SAML2 authentication
 
 SAML2_USES=		python:build gnome
 SAML2_USE=		gnome=glib20
 
 ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 MFA_LIB_DEPENDS=	liboath.so:security/oath-toolkit
 SAML2_LIB_DEPENDS=	liblasso.so:security/lasso
 
 MFA_CONFIGURE_ON=	--enable-mfa
 SAML2_CONFIGURE_ON=	--enable-saml2
 
 USERS=			sogod
 GROUPS=			sogod
 USES=			cpe gettext-runtime gnustep objc pkgconfig shebangfix ssl
 CPE_VENDOR=		inverse
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}/sogo
 
 SHEBANG_LANG=		python
 SHEBANG_FILES=		${WRKSRC}/SoObjects/SOGo/gen-saml2-exceptions.py
 
 CONFLICTS?=		sogo[2-4]-activesync sogo[2-4]
 
 USE_RC_SUBR=		sogod
 
 SUB_FILES+=		pkg-message
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
 CONFIGURE_ARGS+=		--disable-debug --disable-strip
 
 post-patch:
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
 	@${REINPLACE_CMD} -e 's|/usr/lib/GNUstep/|${LOCALBASE}/GNUstep/Local/Library|g' ${WRKSRC}/Apache/SOGo.conf
 
 post-patch-ACTIVESYNC-on:
 	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
 
 do-configure:
 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/spool/sogo
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/Scripts/sogo.conf ${STAGEDIR}${ETCDIR}/sogo.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/Apache/SOGo.conf ${STAGEDIR}${ETCDIR}/SOGo-Apache.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/Apache/SOGo-apple-ab.conf ${STAGEDIR}${ETCDIR}/SOGo-apple-ab.Apache.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/expire-autoreply.creds.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${FILESDIR}/ealarms-notify.creds.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${FILESDIR}/cron-ealarms-notify.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/
 	${INSTALL_DATA} ${FILESDIR}/cron-expire-autoreply.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/
 
 .include <bsd.port.mk>
diff --git a/x11-fm/librfm/Makefile b/x11-fm/librfm/Makefile
index 894b4450a854..a3b457151f9d 100644
--- a/x11-fm/librfm/Makefile
+++ b/x11-fm/librfm/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	librfm
 PORTVERSION=	5.3.16.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/xffm/5.3.16.3
 DISTNAME=	${PORTNAME}5-${PORTVERSION}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Basic library used by some rfm applications
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libtubo.so:x11-fm/libtubo \
 		libdbh.so:databases/dbh \
 		libzip.so:archivers/libzip \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	NLS
 
 CONFIGURE_ARGS+=--with-pkglibdata
 USES=		autoreconf gettext gnome gmake libtool:keepla pkgconfig \
 		tar:bzip2 xorg
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool cairo libxml2 librsvg2
 USE_XORG+=	x11
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 WRKSRC=	${WRKDIR}/${PORTNAME}5-${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
 .include <bsd.port.mk>