diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index a2a1b639ac4f..994a60f924d8 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	unar
 PORTVERSION=	1.10.1
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://wakaba.c3.cx/releases/TheUnarchiver/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Unarchiver for a vast variety of file formats
 WWW=		https://unarchiver.c3.cx/commandline
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 # XXX: USES=gnustep overrides MAKEFILE we set below, so depend explicitly
 LIB_DEPENDS=	libgnustep-base.so:lang/gnustep-base \
 		libicuuc.so:devel/icu \
 		libwavpack.so:audio/wavpack
 
 USES=		gmake zip
 
 MAKEFILE=	Makefile.freebsd
 WRKSRC=		${WRKDIR}/The\ Unarchiver
 BUILD_WRKSRC=	${WRKSRC}/XADMaster
 
 PLIST_FILES=	bin/lsar bin/unar share/man/man1/lsar.1.gz share/man/man1/unar.1.gz
 PORTDOCS=	README.md
 PORTEXAMPLES=	lsar.bash_completion unar.bash_completion
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/XADMaster/??ar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Extra/??ar.bash_completion \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/zim-tools/Makefile b/archivers/zim-tools/Makefile
index fa4f735ec98c..124ed9e1b3a3 100644
--- a/archivers/zim-tools/Makefile
+++ b/archivers/zim-tools/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	zim-tools
 DISTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://download.openzim.org/release/zim-tools/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Tools for handling ZIM files
 WWW=		https://github.com/openzim/zim-tools
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
 		googletest>0:devel/googletest
 LIB_DEPENDS=	libdocopt.so:devel/docopt.cpp \
 		libgumbo.so:devel/gumbo \
 		libicui18n.so:devel/icu \
 		libzim.so:devel/libzim
 
 USES=		compiler:c++17-lang meson pkgconfig tar:xz
 
 CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
 CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION} DISTMAJ=${DISTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/audio/fooyin/Makefile b/audio/fooyin/Makefile
index a04b51087e0b..a79d46e7cc77 100644
--- a/audio/fooyin/Makefile
+++ b/audio/fooyin/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	fooyin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	audio multimedia
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	foobar2000 inspired audio player
 WWW=		https://github.com/fooyin/fooyin
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=  armv7 i386 powerpc
 NOT_FOR_ARCHS_REASON=	Fails to build on 32-bit platforms with various errors
 
 LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libgme.so:audio/libgme \
 		libicui18n.so:devel/icu \
 		libkdsingleapplication-qt6.so:devel/kdsingleapplication \
 		libtag.so:audio/taglib \
 		libvgm-player.so:audio/libvgm
 
 USES=		cmake compiler:c++20-lang desktop-file-utils gl libarchive \
 		pkgconfig qt:6 sdl
 USE_GL=		opengl
 USE_QT=		base sqldriver-sqlite svg tools:build
 USE_SDL=	sdl2
 
 USE_GITHUB=	yes
 
 CMAKE_OFF=	BUILD_ALSA \
 		BUILD_CCACHE \
 		CMAKE_CXX_EXTENSIONS
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_ALSA \
 		CMAKE_DISABLE_FIND_PACKAGE_Ebur128 \
 		CMAKE_DISABLE_FIND_PACKAGE_OpenMpt \
 		CMAKE_DISABLE_FIND_PACKAGE_PipeWire \
 		CMAKE_DISABLE_FIND_PACKAGE_SndFile
 
 .include <bsd.port.mk>
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 70dd05f513e8..18b187151282 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,249 +1,249 @@
 PORTNAME=	musicpd
 PORTVERSION=	0.23.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Remote-controllable music daemon
 WWW=		https://www.musicpd.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libicudata.so:devel/icu
 
 USES=		compiler:c++17-lang localbase:ldflags meson pkgconfig \
 		python:build tar:xz
 
 USE_RC_SUBR=	${PORTNAME}
 MESON_ARGS=	--auto-features=disabled \
 		-Dbzip2=enabled \
 		-Dhttpd=true \
 		-Dicu=enabled \
 		-Dmpcdec=disabled \
 		-Doss=enabled \
 		-Dpipe=true \
 		-Dsyslog=enabled \
 		-Dzlib=enabled
 
 PORTDOCS=	AUTHORS README.md NEWS
 
 SUB_FILES=	pkg-message
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	DOCS ID3TAG IPV6 ISO9660 MANPAGES SQLITE3 \
 		PROXYDB VORBISENC ZZIP
 
 OPTIONS_RADIO=	RESAMPLER ZEROCONF
 
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 OPTIONS_RADIO_RESAMPLER=	SAMPLERATE SOXR
 
 OPTIONS_MULTI=	DOCUMENTATION FILE_FORMAT
 OPTIONS_MULTI_FILE_FORMAT=	\
 			ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \
 			GME MAD MIKMOD MODPLUG MPG123 \
 			OPUS SIDPLAY SNDFILE TWOLAME \
 			VORBIS WAVPACK WILDMIDI
 
 OPTIONS_GROUP=	ACCESS PLAYBACK
 
 OPTIONS_GROUP_ACCESS=	CDPARANOIA CURL LAME NFS PLAYLISTS QOBUZ \
 			SMB SOUNDCLOUD UPNP YAJL
 
 OPTIONS_GROUP_PLAYBACK=	AO JACK OPENAL OPENMPT PIPEWIRE PULSEAUDIO \
 			SHOUTCAST SNDIO
 
 ADPLUG_DESC=	AdPlug support
 FAAD_DESC=	AAC/MP4 decoding via libfaad
 GME_DESC=	GME support (video game music files)
 ISO9660_DESC=	Direct support for ISO 9660 images
 PROXYDB_DESC=	Proxy database support via libmpdclient
 LAME_DESC=	Support for MP3 Icecast Streams
 OPENMPT_DESC=	Support for OpenMPT playback
 PLAYLISTS_DESC=	Enable extra playlist support (wma, RSS)
 QOBUZ_DESC=	Streaming service support: Qobuz
 SIDPLAY_DESC=	Sidplay support (C64 mono and stereo files)
 SMB_DESC=	SMB network support (currently strongly discouraged)
 SOUNDCLOUD_DESC=Streaming service support: SoundCloud
 TWOLAME_DESC=	TwoLAME support (mp2)
 VORBISENC_DESC=	Ogg Vorbis encoder
 WILDMIDI_DESC=	WildMIDI support (MIDI files)
 YAJL_DESC=	JSON support via libyajl
 ZZIP_DESC=	Support for zzip archives
 
 OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME MANPAGES OPUS \
 		PLAYLISTS PROXYDB SNDFILE VORBIS VORBISENC \
 		WAVPACK
 
 MANPAGES_MESON_ENABLED=	documentation
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
 
 # Decoder plugins
 ADPLUG_MESON_ENABLED=	adplug
 ADPLUG_LIB_DEPENDS=	libadplug.so:audio/libadplug
 AUDIOFILE_MESON_ENABLED=audiofile
 AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 FAAD_MESON_ENABLED=	faad
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FFMPEG_MESON_ENABLED=	ffmpeg
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FLAC_MESON_ENABLED=	flac
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLUIDSYNTH_MESON_ENABLED=	fluidsynth
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 GME_MESON_ENABLED=	gme
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 MAD_MESON_ENABLED=	mad
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MIKMOD_MESON_ENABLED=	mikmod
 MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MODPLUG_MESON_ENABLED=	modplug
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MPG123_MESON_ENABLED=	mpg123
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 NFS_MESON_ENABLED=	nfs
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 OPENMPT_MESON_ENABLED=	openmpt
 OPENMPT_LIB_DEPENDS=	libopenmpt.so:audio/libopenmpt
 OPUS_MESON_ENABLED=	opus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
 			libogg.so:audio/libogg
 PLAYLISTS_MESON_ENABLED=expat
 PLAYLISTS_LIB_DEPENDS=	libexpat.so:textproc/expat2
 SIDPLAY_MESON_ENABLED=	sidplay
 SIDPLAY_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SIDPLAY_CXXFLAGS=	-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 SNDFILE_MESON_ENABLED=	sndfile
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 VORBIS_MESON_ENABLED=	vorbis
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 WAVPACK_MESON_ENABLED=	wavpack
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WILDMIDI_MESON_ENABLED=	wildmidi
 WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
 
 # Encoder plugins
 VORBISENC_IMPLIES=	VORBIS
 VORBISENC_MESON_ENABLED=	vorbisenc
 VORBISENC_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 LAME_MESON_ENABLED=	lame
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 TWOLAME_MESON_ENABLED=	twolame
 TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 
 # Filter plugins
 SAMPLERATE_MESON_ENABLED=	libsamplerate
 SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SOXR_MESON_ENABLED=	soxr
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 
 # Output plugins
 AO_MESON_ENABLED=	ao
 AO_LIB_DEPENDS=		libao.so:audio/libao
 JACK_MESON_ENABLED=	jack
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CXXFLAGS=		-Wno-register
 OPENAL_MESON_ENABLED=	openal
 OPENAL_USES=		openal
 PIPEWIRE_MESON_ENABLED=	pipewire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PULSEAUDIO_MESON_ENABLED=	pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 SHOUTCAST_MESON_ENABLED=shout
 SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_IMPLIES=	VORBIS
 SNDIO_MESON_ENABLED=	sndio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 
 # Input plugins
 CDPARANOIA_MESON_ENABLED=	cdio_paranoia
 CDPARANOIA_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CURL_MESON_ENABLED=	curl webdav
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_IMPLIES=		PLAYLISTS
 SMB_MESON_ENABLED=	smbclient
 SMB_USES=		samba:lib
 
 # Archive plugins
 ZZIP_MESON_ENABLED=	zzip
 ZZIP_LIB_DEPENDS=	libzzip.so:devel/zziplib
 ISO9660_MESON_ENABLED=	iso9660
 ISO9660_LIB_DEPENDS=	libiso9660.so:sysutils/libcdio
 
 # Database plugins
 SQLITE3_MESON_ENABLED=	sqlite
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PROXYDB_MESON_ENABLED=	libmpdclient
 PROXYDB_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
 # Tag plugins
 ID3TAG_MESON_ENABLED=	id3tag
 ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
 
 # Network support
 IPV6_MESON_ENABLED=	ipv6
 
 # Commercial service support
 QOBUZ_MESON_ENABLED=	qobuz
 QOBUZ_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 QOBUZ_IMPLIES=		CURL YAJL
 SOUNDCLOUD_MESON_ENABLED=	soundcloud
 SOUNDCLOUD_IMPLIES=	CURL YAJL
 
 # Misc library support
 AVAHI_MESON_ON=		-Dzeroconf=avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 MDNSRESPONDER_MESON_ON=		-Dzeroconf=bonjour
 MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 UPNP_MESON_ON=		-Dupnp=npupnp
 UPNP_LIB_DEPENDS=	libnpupnp.so:net/libnpupnp
 YAJL_MESON_ENABLED=	yajl
 YAJL_LIB_DEPENDS=	libyajl.so:devel/yajl
 
 MPDUSER?=	mpd
 MPDGROUP?=	mpd
 
 USERS=	${MPDUSER}
 GROUPS=	${MPDGROUP}
 
 post-patch:
 # Make musicpd run as ${MPDUSER} by default
 	@${REINPLACE_CMD} -e 's|%%MPDUSER%%|${MPDUSER}|' \
 		${WRKSRC}/doc/mpdconf.example
 # Fix man pages for executable names
 	@${REINPLACE_CMD} \
 		-e 's#^``mpd#``${PORTNAME}#' \
 		-e 's#:: mpd#:: ${PORTNAME}#' \
 		-e 's#mpd(1)#${PORTNAME}(1)#' \
 		-e 's#mpd.conf(5)#${PORTNAME}.conf(5)#' \
 		${WRKSRC}/doc/mpd.1.rst ${WRKSRC}/doc/mpd.conf.5.rst
 	@${REINPLACE_CMD} \
 		-e "s#'mpd'#'${PORTNAME}'#" \
 		-e "s#'mpd.conf'#'${PORTNAME}.conf'#" \
 		-e "s#'mpd.conf doc#'${PORTNAME}.conf doc#" \
 		${WRKSRC}/doc/conf.py
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 do-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.conf.5 \
 		${STAGEDIR}${PREFIX}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 9cba6b93e9c3..22837723c1b8 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	ncmpcpp
 DISTVERSION=	0.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	yamagi@yamagi.org
 COMMENT=	Ncurses mpd client, clone of ncmpc with some new features
 WWW=		https://github.com/ncmpcpp/ncmpcpp
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
 		libicuuc.so:devel/icu \
 		libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl
 
 USES=		autoreconf compiler:c++17-lang iconv libtool ncurses \
 		pkgconfig readline
 
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/ncmpcpp \
 		share/man/man1/ncmpcpp.1.gz
 PORTDOCS=	AUTHORS CHANGELOG.md COPYING bindings config
 
 OPTIONS_DEFINE=		CLOCK DOCS LTO OPTIMIZED_CFLAGS OUTPUTS TAGLIB \
 			VISUALIZER
 OPTIONS_DEFAULT=	CLOCK LTO OPTIMIZED_CFLAGS OUTPUTS TAGLIB VISUALIZER
 
 CLOCK_DESC=		clock-screen support
 OUTPUTS_DESC=		Enable outputs screen
 TAGLIB_DESC=		taglib support
 VISUALIZER_DESC=	Enable music visualizer screen
 
 CLOCK_CONFIGURE_ENABLE=		clock
 
 LTO_CONFIGURE_WITH=		lto
 
 OPTIMIZED_CFLAGS_CXXFLAGS=	-ftree-vectorize -ffast-math
 
 OUTPUTS_CONFIGURE_ENABLE=	outputs
 
 TAGLIB_LIB_DEPENDS=		libtag.so:audio/taglib
 TAGLIB_CONFIGURE_WITH=		taglib
 
 VISUALIZER_LIB_DEPENDS=		libfftw3.so:math/fftw3
 VISUALIZER_CONFIGURE_ENABLE=	visualizer
 VISUALIZER_CONFIGURE_WITH=	fftw
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS}_${OSREL:R} == FreeBSD_13
 CONFIGURE_ENV=	ncursesw_CFLAGS="-L${NCURSESLIB}" ncursesw_LIBS="-lncursesw"
 .endif
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
index b5e8ed868aaf..5795a5945395 100644
--- a/audio/strawberry/Makefile
+++ b/audio/strawberry/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	strawberry
 DISTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Music player and collection organizer
 WWW=		https://www.strawberrymusicplayer.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libtag.so:audio/taglib
 TEST_DEPENDS=	googletest>=0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang desktop-file-utils \
 		gl gnome gstreamer pkgconfig qt:6 sqlite tar:xz xorg
 USE_GL=		opengl
 USE_GNOME=	glib20
 USE_GSTREAMER=	faac faad flac lame libav mpg123 opus taglib vorbis
 USE_QT=		base sqldriver-sqlite:run
 USE_XORG=	ice sm x11 xcb xext
 
 CMAKE_OFF=		ENABLE_UDISKS2
 CMAKE_TESTING_SETENV=	yes
 CMAKE_TESTING_TARGET=	strawberry_tests
 
 OPTIONS_DEFINE=		CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS
 OPTIONS_DEFAULT=	ALSA EBUR128 MOODBAR MUSICBRAINZ
 OPTIONS_MULTI=		SOUND
 OPTIONS_MULTI_SOUND=	ALSA PULSEAUDIO
 OPTIONS_SUB=		yes
 
 EBUR128_DESC=		EBU R 128 loudness normalization
 IPOD_DESC=		iPod Classic support
 MOODBAR_DESC=		Moodbar support
 MUSICBRAINZ_DESC=	Tagging/fingerprinting from MusicBrainz
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 CDIO_USE=		GSTREAMER=cdparanoia
 CDIO_CMAKE_BOOL=	ENABLE_AUDIOCD
 
 EBUR128_USES=		ebur128
 EBUR128_CMAKE_BOOL=	ENABLE_EBUR128
 
 IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod \
 			libimobiledevice-1.0.so:comms/libimobiledevice \
 			libplist-2.0.so:devel/libplist
 IPOD_USE=		GNOME=gdkpixbuf2
 IPOD_CMAKE_BOOL=	ENABLE_GPOD
 
 MOODBAR_LIB_DEPENDS=	libfftw3.so:math/fftw3
 MOODBAR_CMAKE_BOOL=	ENABLE_MOODBAR
 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_BOOL=		ENABLE_MTP
 
 MUSICBRAINZ_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 MUSICBRAINZ_CMAKE_BOOL=		ENABLE_MUSICBRAINZ \
 				ENABLE_SONGFINGERPRINTING
 
 NLS_USE=		QT=tools:build
 NLS_CMAKE_BOOL=		ENABLE_TRANSLATIONS
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSE
 
 .include <bsd.port.mk>
diff --git a/chinese/fcitx5-mcbopomofo/Makefile b/chinese/fcitx5-mcbopomofo/Makefile
index 56f7004e1d6d..341b27dba327 100644
--- a/chinese/fcitx5-mcbopomofo/Makefile
+++ b/chinese/fcitx5-mcbopomofo/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	fcitx5-mcbopomofo
 DISTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	McBopomofo for Fcitx5
 WWW=		https://github.com/openvanilla/fcitx5-mcbopomofo
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libFcitx5Core.so:textproc/fcitx5 \
 		libfmt.so:devel/libfmt \
 		libicuuc.so:devel/icu \
 		libjson-c.so:devel/json-c
 
 USES=		cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openvanilla
 
 USE_KDE=	ecm
 
 CMAKE_OFF=	ENABLE_TEST
 
 .include <bsd.port.mk>
diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile
index 21f0ff18dc53..e9316457136f 100644
--- a/databases/couchdb3/Makefile
+++ b/databases/couchdb3/Makefile
@@ -1,130 +1,131 @@
 PORTNAME=	couchdb3
 DISTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	JSON document database with HTTP API and scalable cluster mesh sync
 WWW=		https://couchdb.apache.org/
 
 LICENSE=	APACHE20 BSD3CLAUSE ISCL OFL11 WTFPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	erlang-runtime${_ERLVER}>=${_ERLVER}.0:lang/erlang-runtime${_ERLVER} \
 		rebar:devel/rebar
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libmozjs-91.so:lang/spidermonkey91
 
 USES=		compiler:c++17-lang cpe gmake libtool ncurses
 CPE_VENDOR=	apache
 CPE_PRODUCT=	couchdb
 USE_RC_SUBR=	${PORTNAME}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--skip-deps \
 		--user ${USERS} \
 		--rebar ${LOCALBASE}/bin/rebar \
 		--spidermonkey-version 91
 
 MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang${_ERLVER}/bin:${PATH}
 ALL_TARGET=	release
 
 CONFLICTS=	couchdb[24]*
 
 SUB_FILES=	pkg-message
 SUB_LIST=	APPDIR=${_APPDIR} \
 		ERL_PATH=${LOCALBASE}/lib/erlang${_ERLVER}/bin/erl \
 		PORTNAME=${PORTNAME} \
 		RELDIR=${_RELDIR} \
 		WWWDIR=${WWWDIR}
 
 USERS=		couchdb
 GROUPS=		couchdb
 
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 _APPDIR=	${LOCALBASE}/libexec/${PORTNAME}
 _DBDIR?=	/var/db/${PORTNAME}
 _ERLVER?=	26
 _LOGDIR?=	/var/log/${PORTNAME}
 _LOGFILE?=	${_LOGDIR}/couch.log
 _RELDIR=	${_APPDIR}/releases/${DISTVERSION}
 _RUNDIR=	/var/run/${PORTNAME}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${ARCH} == i386
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_jiffy_c__src_double-conversion_strtod.cc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's,%%COUCHDB_USER%%,${USERS},g' \
 	    -e 's,%%LOG_FILE%%,${_LOGFILE},g' \
 	    -e 's,%%APPDIR%%,${_APPDIR},g' \
 	    -e 's,%%DATADIR%%,${_DATADIR},g' \
 	    -e 's,%%DBDIR%%,${_DBDIR},g' \
 	    -e 's,%%ERLVER%%,${_ERLVER},g' \
 	    -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 	    -e 's,%%PORTNAME%%,${PORTNAME},g' \
 	    -e 's,%%WWWDIR%%,${WWWDIR},g' \
 	    ${WRKSRC}/configure
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238514
 .if ${OPSYS} == FreeBSD && ${ARCH} == i386
 	@${REINPLACE_CMD} \
 	    -e 's,$$FLTO_FLAG ,,g' \
 	    ${WRKSRC}/src/jiffy/rebar.config
 .endif
 
 pre-install:
 # prune build artefacts and surplus headers
 	${FIND} -E ${WRKSRC} -type f \
 		-regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete
 
 do-install:
 # relocate user-modifiable runtime configs to match hier(7)
 	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \
 		${STAGEDIR}${ETCDIR}/local.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \
 		${STAGEDIR}${ETCDIR}/vm.args.sample
 	${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 	${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/
 # remove runtime dirs and files that were moved to match hier(7)
 	${RM} -rv \
 		${WRKSRC}/rel/couchdb/erts-*/include \
 		${WRKSRC}/rel/couchdb/erts-*/src \
 		${WRKSRC}/rel/couchdb/etc/*.d \
 		${WRKSRC}/rel/couchdb/etc/local.ini \
 		${WRKSRC}/rel/couchdb/etc/vm.args \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch_js/1.8.5 \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch_js/60 \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch_js/68 \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch_js/86 \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/priv/couchjs \
 		${WRKSRC}/rel/couchdb/releases/*/vm.args \
 		${WRKSRC}/rel/couchdb/share/docs \
 		${WRKSRC}/rel/couchdb/share/www \
 		${WRKSRC}/rel/couchdb/var
 	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${_APPDIR})
 	${INSTALL_PROGRAM} ${WRKSRC}/rel/couchdb/bin/couchjs ${STAGEDIR}${_APPDIR}/bin/
 # fauxton UI is a required component
 	(cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 post-install:
 	@${FIND} -E ${STAGEDIR} -type f \
 		\( -name couchjs* -o -name *.so \) \
 		-exec ${STRIP_CMD} {} +
 	@${MKDIR} \
 		${STAGEDIR}${_DBDIR} \
 		${STAGEDIR}${_LOGDIR} \
 		${STAGEDIR}${_RUNDIR}
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs)
 
 .include <bsd.port.mk>
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index ba50c6c2b7b5..afd0c31274f5 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	evolution-data-server
 DISTVERSION=	3.44.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Data backends for the Evolution integrated mail/PIM suite
 WWW=		https://wiki.gnome.org/Apps/Evolution
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libfribidi.so:converters/fribidi \
 		libgcr-base-3.so:security/gcr3 \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgdata.so:devel/libgdata \
 		libharfbuzz.so:print/harfbuzz \
 		libical.so:devel/libical \
 		libnss3.so:security/nss \
 		libicudata.so:devel/icu \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libp11-kit.so:security/p11-kit \
 		libnspr4.so:devel/nspr \
 		libsecret-1.so:security/libsecret \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcanberra.so:audio/libcanberra
 
 PORTSCOUT=	limitw:1,even
 
 USES=		bdb:5 cmake compiler:c++17-lang cpe gettext gnome gperf \
 		iconv:wchar_t localbase pathfix pkgconfig python:build \
 		sqlite tar:xz xorg
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
 
 CMAKE_OFF=	CMAKE_CXX_EXTENSIONS
 CMAKE_ARGS=	-DENABLE_INTROSPECTION=ON \
 		-DENABLE_UOA=OFF \
 		-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
 		-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5"
 
 GLIB_SCHEMAS=	org.gnome.evolution-data-server.addressbook.gschema.xml \
 		org.gnome.evolution-data-server.calendar.gschema.xml \
 		org.gnome.evolution-data-server.gschema.xml \
 		org.gnome.Evolution.DefaultSources.gschema.xml \
 		org.gnome.evolution.eds-shell.gschema.xml \
 		org.gnome.evolution.shell.network-config.gschema.xml
 
 PLIST_SUB=	EVO_VERSION="1.2"
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	WEATHER KERBEROS LDAP VAPI
 OPTIONS_DEFAULT=WEATHER KERBEROS LDAP VAPI
 
 KERBEROS_CMAKE_ON=	-DWITH_KRB5=/usr
 KERBEROS_CMAKE_OFF=	-DWITH_KRB5=OFF
 KERBEROS_USES=		ssl
 
 LDAP_CMAKE_ON=		-DWITH_OPENLDAP=${LOCALBASE}
 LDAP_CMAKE_OFF=		-DWITH_OPENLDAP=OFF
 LDAP_USES=		ldap
 
 VAPI_USES=		vala:build
 VAPI_CMAKE_BOOL=	ENABLE_VALA_BINDINGS
 
 WEATHER_DESC=	Weather calendar backend
 WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
 WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
 
 .include <bsd.port.options.mk>
 
 post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile
index acb752aba5db..30162982344c 100644
--- a/databases/firebird40-server/Makefile
+++ b/databases/firebird40-server/Makefile
@@ -1,204 +1,205 @@
 PORTNAME=	firebird
 PORTVERSION=	4.0.5
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
 DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.3140-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Firebird-4 relational database (server)
 WWW=		https://www.firebirdsql.org/
 
 LICENSE=	IDPL IPL
 LICENSE_COMB=	multi
 LICENSE_NAME_IDPL=	Initial Developer's Public License
 LICENSE_NAME_IPL=	InterBase Public License
 LICENSE_FILE_IDPL=	${WRKSRC}/builds/install/misc/IDPLicense.txt
 LICENSE_FILE_IPL=	${WRKSRC}/builds/install/misc/IPLicense.txt
 LICENSE_PERMS_IDPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libtommath.so:math/libtommath \
 		libtomcrypt.so:security/libtomcrypt
 
 CONFLICTS_INSTALL=	firebird30
 
 USES=		cpe gmake pkgconfig localbase:ldflags libedit tar:xz
 USE_CXXSTD=	c++17
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 CPE_VENDOR=	firebirdsql
 
 CONFIGURE_ARGS=	--prefix=${LOCALSTATEDIR} \
 		--exec-prefix=${PREFIX} \
 		--with-fbbin=${PREFIX}/bin \
 		--with-fblib=${PREFIX}/lib \
 		--with-fbconf=${PREFIX}/${CONFDIR} \
 		--with-fbglock=${LOCALSTATEDIR} \
 		--with-fbhelp=${LOCALSTATEDIR}/help \
 		--with-fbintl=${LIBEXECDIR}/intl \
 		--with-fblog=${LOCALSTATEDIR} \
 		--with-fbmsg=${DATADIR} \
 		--with-fbplugins=${LIBEXECDIR}/plugins \
 		--with-fbtzdata=${LIBEXECDIR}/tzdata \
 		--with-fbsbin=${PREFIX}/sbin \
 		--with-fbsecure-db=${LOCALSTATEDIR} \
 		--with-fbsample-db=${EXAMPLESDIR}
 
 CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread" \
 		ac_cv_header_atomic_ops_h="no" \
 		ac_cv_lib_atomic_ops_main="no"
 
 LOCALSTATEDIR=	/var/db/firebird
 CONFDIR=	etc/firebird
 LIBEXECDIR=	${PREFIX}/libexec/firebird
 PLIST_SUB=	FIREBIRD_VERSION=${PORTVERSION} \
 		LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}"
 
 # Don't use ld for linking, use gcc
 LD=	${CC}
 
 # Don't strip binary files
 STRIP=
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64le
 
 INSTALL_FB=	${INSTALL} ${COPY}
 
 .if !defined(CLIENT_ONLY)
 # Server part stuff
 USES+=		firebird:4.0
 
 CONFIGURE_ARGS+=--without-editline
 
 USE_RC_SUBR=	firebird
 SUB_FILES=	pkg-message
 
 UTIL_SBIN=	fbguard firebird
 UTIL_BIN=	fb_lock_print fbsplit fbstat fbsvcmgr fbtracemgr gbak gfix gsec \
 		nbackup
 UDR_SO=		libudf_compat.so
 UDR_SQL=	udf_compat.sql
 PLUGIN_SO=	libChaCha.so libEngine13.so libfbtrace.so libLegacy_Auth.so \
 		libLegacy_UserManager.so libSrp.so libudr_engine.so
 TZDATA_FILES=	ids.dat timezoneTypes.res windowsZones.res zoneinfo64.res \
 		metaZones.res
 
 PKGINSTALL?=	${PKGDIR}/pkg-install-server
 .else
 # Client part stuff
 USES+=		libedit
 
 CONFIGURE_ARGS+=	--with-system-editline
 CONFIGURE_ENV+=	ac_cv_lib_edit_readline="yes"
 
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql-fb qli
 CLIENT_HEADER=	extlib/ib_util.h include/ibase.h include/iberror.h yvalve/perf.h
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_PORTDOCS=	*
 
 FB_DOCS_FILES=	README.* Firebird* ambiguity.txt \
 		ods11-index-structure.html
 FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 
 MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-DAMD64
 .endif
 
 .if !defined(CLIENT_ONLY)
 USERS=	${PORTNAME}
 GROUPS=	${USERS}
 
 MAKE_ENV+=	IsServer=Y
 .endif
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/builds/install/misc/firebird.conf
 
 pre-build:
 .if !defined(CLIENT_ONLY)
 	@${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 	${MAKE} -C ${WRKSRC}/extern/btyacc
 
 do-install:
 .if !defined(CLIENT_ONLY)
 	${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/Release/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/Release/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/databases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/databases.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/replication.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/replication.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/plugins.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/plugins.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/plugins/udr_engine.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/udr_engine.conf.sample
 
 	${MKDIR} ${STAGEDIR}${LIBEXECDIR}/plugins/udr ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \
 		${STAGEDIR}${LIBEXECDIR}/tzdata ${STAGEDIR}${EXAMPLESDIR}
 
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/lib/libib_util.so ${STAGEDIR}${PREFIX}/lib
 
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/intl/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf
 	${INSTALL_FB} -m 0555 ${UDR_SO:S!^!${WRKSRC}/gen/Release/firebird/plugins/udr/!} ${STAGEDIR}${LIBEXECDIR}/plugins/udr
 	${INSTALL_FB} -m 0444 ${UDR_SQL:S!^!${WRKSRC}/gen/Release/firebird/plugins/udr/!} ${STAGEDIR}${LIBEXECDIR}/plugins/udr
 	${INSTALL_FB} -m 0555 ${PLUGIN_SO:S!^!${WRKSRC}/gen/Release/firebird/plugins/!} ${STAGEDIR}${LIBEXECDIR}/plugins
 	${INSTALL_FB} -m 0444 ${TZDATA_FILES:S!^!${WRKSRC}/gen/Release/firebird/tzdata/!} ${STAGEDIR}${LIBEXECDIR}/tzdata
 
 	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/Release/firebird/security4.fdb ${STAGEDIR}${LOCALSTATEDIR}/security4.fdb.sample
 	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/Release/firebird/examples/empbuild/employee.fdb ${STAGEDIR}${EXAMPLESDIR}/employee.fdb
 	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/Release/firebird/examples/empbuild/employe2.sql ${STAGEDIR}${EXAMPLESDIR}/employe2.sql
 
 	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/Release/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help
 
 	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/Release/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/libfbintl.so
 .else
 # defined CLIENT_ONLY
 	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/Release/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin
 
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/Release/firebird/firebird.conf > ${WRKDIR}/firebird.conf
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR}
 	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/lib/libfbclient.so.${PORTVERSION} \
 		${STAGEDIR}${PREFIX}/lib
 
 	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.4
 	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/firebird
 	${INSTALL_DATA} ${CLIENT_HEADER:S!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/include
 
 	@cd ${WRKSRC}/src/include/firebird && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/include/firebird/{}" \;
 
 	@cd ${WRKSRC}/src/include/firebird && \
 		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/include/firebird/{}" \;
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/*.msg ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!}
 	${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR}
 	${LN} -sf README.user ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions
 	${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license
 	${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v3.0/* ${STAGEDIR}${DOCSDIR}/upgrade
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 73461d8a9350..2ce508089edd 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	kbibtex
 DISTVERSION=	0.10.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}
 
 PATCH_SITES=	https://github.com/KDE/kbibtex/commit/
 PATCHFILES=	4d9ce600fdd1deb035a26e4f7922d35b2f41beaf.patch:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bibliography editor for KDE
 WWW=		https://userbase.kde.org/KBibTeX
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gettext-tools \
 		kde:5 pkgconfig qt:5 shared-mime-info tar:xz xorg
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons crash i18n iconthemes itemviews jobwidgets kio \
 		parts service solid sonnet syntaxhighlighting texteditor \
 		textwidgets wallet widgetsaddons windowsystem xmlgui \
 		doctools:build ecm:build
 USE_QT=		concurrent core dbus gui location network networkauth \
 		widgets xml xmlpatterns \
 		buildtools:build qmake:build
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	CMAKE_CXX_EXTENSIONS
 CMAKE_ARGS=	-DKDE_INSTALL_MANDIR:PATH=${PREFIX}/share/man
 
 OPTIONS_DEFINE=			WEBENGINE
 OPTIONS_DEFAULT_aarch64=	WEBENGINE
 OPTIONS_DEFAULT_amd64=		WEBENGINE
 OPTIONS_DEFAULT_i386=		WEBENGINE
 
 WEBENGINE_DESC=			Webpage rendering support
 WEBENGINE_USE=			QT=declarative,printsupport,webchannel,webengine
 WEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets
 
 .include <bsd.port.mk>
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index ca37a81ad27f..6b2615682be2 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	kdb
 DISTVERSION=	3.2.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=	KDE/${PORTNAME}
 
 PATCH_SITES=	https://invent.kde.org/libraries/kdb/-/commit/
 PATCHFILES=	b36d74f13a1421437a725fb74502c993c359392a.diff:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Database connectivity and creation framework
 WWW=		https://community.kde.org/KDb
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		cmake compiler:c++17-lang kde:5 python qt:5 tar:xz
 USE_KDE=	coreaddons i18n \
 		ecm:build
 USE_QT=		core gui network widgets xml \
 		buildtools:build qmake:build
 
 OPTIONS_DEFINE=		SQLITE MYSQL PGSQL
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 OPTIONS_SUB=		yes
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_MySQL
 
 PGSQL_USES=		pgsql
 PGSQL_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL
 
 SQLITE_USES=		sqlite
 SQLITE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Sqlite
 
 .include <bsd.port.mk>
diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
index 9c0d9a312634..f71f16c3d04b 100644
--- a/databases/mongodb60/Makefile
+++ b/databases/mongodb60/Makefile
@@ -1,162 +1,162 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	6.0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases net
 MASTER_SITES=	https://hg.mozilla.org/mozilla-central/raw-rev/:patches
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 DISTFILES=	223087fdc29f18678f6174e9807b8780e439acf6:patches # https://bugzilla.mozilla.org/1894423
 EXTRACT_ONLY=	${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}_GH0.tar.gz \
 		${GH_ACCOUNT}-forks-spidermonkey-${MOZJS_TAG}_GH0.tar.gz
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	MongoDB Community Edition (6.0.x Branch)
 WWW=		https://www.mongodb.com/docs/v6.0/
 
 LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 # build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 BUILD_DEPENDS+=	autoconf2.13:devel/autoconf2.13 \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++17-lang cpe python:build scons shebangfix ssl
 # gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 USES+=		gmake pkgconfig
 
 # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 MOZJS_TAG=	82aac6af18abcd5bf188afbc821779ccb0ca0902
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb mongodb-forks:mozjs
 GH_PROJECT=	mongo spidermonkey:mozjs
 GH_TAGNAME=	${MOZJS_TAG}:mozjs
 USE_RC_SUBR=	mongod
 
 SHEBANG_FILES=	buildscripts/scons.py
 python_OLD_CMD=	@python_interpreter@
 
 MAKE_ARGS=	--cxx-std=17 \
 		--disable-warnings-as-errors \
 		--libc++ \
 		--runtime-hardening=on \
 		--ssl \
 		--use-system-icu \
 		--use-system-libunwind \
 		--use-system-pcre \
 		--use-system-snappy \
 		--use-system-stemmer \
 		--use-system-yaml \
 		--use-system-zlib \
 		--use-system-zstd \
 		-j${MAKE_JOBS_NUMBER} \
 		AR=llvm-ar \
 		MONGO_VERSION=${DISTVERSION} \
 		VERBOSE=on
 
 CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
 
 CONFLICTS_INSTALL=	mongodb[0-9][0-9]
 
 EXTRACT_AFTER_ARGS=	--exclude src/third_party/icu4c-* \
 			--exclude src/third_party/pcre-* \
 			--exclude src/third_party/snappy-* \
 			--exclude src/third_party/libstemmer_c \
 			--exclude src/third_party/unwind \
 			--exclude src/third_party/yaml-cpp \
 			--exclude src/third_party/zlib-* \
 			--exclude src/third_party/zstandard \
 			--no-same-owner --no-same-permissions
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=		LTO NOAVX SASL
 OPTIONS_DEFAULT=	NOAVX SASL
 
 NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
 
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	install-core
 
 # This ports is only following the Major Release.
 # https://docs.mongodb.com/manual/reference/versioning/
 PORTSCOUT=	limit:^6\.0\.
 
 CPE_PRODUCT=	mongodb
 
 .if ${ARCH} == amd64
 MOZJS_ARCH=	x86_64
 .elif ${ARCH} == powerpc64le
 MOZJS_ARCH=	ppc64le
 .elif ${ARCH} == aarch64
 MOZJS_ARCH=	${ARCH}
 .endif
 
 post-patch:
 # fix build with python-3.11
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/util.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
 	${PATCH} -d ${WRKSRC}/src/third_party/mozjs/extract --quiet -p1 -V none < ${DISTDIR}/223087fdc29f18678f6174e9807b8780e439acf6
 
 pre-configure:
 	# Verify we downloaded the proper mozjs git tag.
 	${SH} -c "test \"X`grep -E '^LIB_GIT_REVISION=' ${WRKSRC}/src/third_party/mozjs/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\""
 
 do-configure:
 # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release
 	cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13
 	cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd
 
 do-build:
 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
 
 do-install:
 .for f in mongod mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
 	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/debian/mongod.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/debian/mongos.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/debian/mongodb-parameters.5 ${STAGEDIR}${PREFIX}/share/man/man5/
 	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
 
 do-test:
 	${SH} ${FILESDIR}/make.test.sh "${STAGEDIR}${PREFIX}/bin"
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 57ea54fb66e6..55f14dfbbcad 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
 
 LICENSE+=	LGPL21
 
 MASTERDIR=	${.CURDIR}/../mysql80-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${MASTERDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql8[1-9]-client \
 			mysql[0-79][0-9]-client \
 			mariadb[0-9][0-9]-client \
 			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
 MMAN1=		comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
 		mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
 		mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
 
 CLIENT_ONLY=	yes
 
 OPTIONS_GROUP+=	PLUGINS
 PLUGINS_DESC=	Default Client Plugins
 OPTIONS_GROUP_PLUGINS=	SASLCLIENT
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASLCLIENT_USES=		ldap
 
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r
 post-install:
 #	@${RM} ${STAGEDIR}${PREFIX}/lib/mysql/private/libprotobuf-lite.so.3.19.4
 #	@${RM} ${STAGEDIR}${PREFIX}/lib/mysql/private/libprotobuf.so.3.19.4
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
 	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
 	@${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index a70463c7dcc8..d4881b365a1a 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -1,213 +1,213 @@
 PORTNAME?=		mysql
 PORTVERSION=		8.0.39
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
 DISTNAME=		${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=		joneum@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
 WWW=		https://www.mysql.com/
 
 LICENSE=		GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql80-client
 USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
 		ncurses perl5 pkgconfig shebangfix ssl
 
 CPE_VENDOR=	oracle
 
 USE_CXXSTD=	c++17
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libfido2.so:security/libfido2 \
 		libhidapi.so:comms/hidapi \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
 BUILD_DEPENDS=	liblz4>0:archivers/liblz4 \
 		${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_armv7=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_i386=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="${INFO_PATH}" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
 		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_SYSTEM_LIBS=1 \
 		-DWITH_EDITLINE=system \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
 		-DWITH_ICU=system \
 		-DWITH_CURL=system \
 		-DWITH_ZSTD=bundled \
 		-DWITH_PROTOBUF=bundled \
 		-DWITH_SSL=system \
 		-DWITH_AUTHENTICATION_FIDO=1 \
 		-DBUILD_BUNDLED_ZLIB=0 \
 		-DBUILD_BUNDLED_LZ4=0
 
 # The Mroonga, RocksDB, and TokuDB storage engines are disabled.
 # Mroonga is only buildable on little endian archs.
 # RocksDB is only buildable on little endian archs and requires POSIX timers.
 # TokuDB is only buildable on 64-bit little endian archs.
 CMAKE_ARGS+=	-DWITHOUT_MROONGA_STORAGE_ENGINE=1 \
 		-DWITHOUT_ROCKSDB_STORAGE_ENGINE=1 \
 		-DWITHOUT_TOKUDB_STORAGE_ENGINE=1
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 IGNORE=		You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
 
 CONFLICTS_INSTALL=	mysql*-server \
 			mysqlwsrep*-server \
 			mariadb*-server \
 			percona*-server
 
 USE_RC_SUBR=	mysql-server
 
 SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 MMAN1=		ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 		myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
 		mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1
 MMAN8=		mysqld.8
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 CMAKE_ARGS+=	-DWITHOUT_CLIENTLIBS="ON"
 # Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules
 CMAKE_ARGS+=   -DWITH_UNIT_TESTS="OFF"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
 OPTIONS_SUB=		YES
 STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
 ARCHIVE_DESC=		Compile "Archive Storage" statically in server
 BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
 EXAMPLE_DESC=		Compile "Example Storage" statically in server
 FEDERATED_DESC=		Compile "Federated Storage" statically in server
 INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
 PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
 PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
 
 ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
 BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
 FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
 INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
 OPTIONS_GROUP+=		FEATURES
 OPTIONS_GROUP_FEATURES=	PERFSCHM
 FEATURES_DESC=		Default features knobs
 PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
 OPTIONS_DEFAULT+=	PERFSCHM
 
 PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.options.mk>
 
 # Since 8.0.20 release innodb engine uses new memory alligned allocator
 # which is broken on i386 due to different size of types and caused a
 # 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
 .if ${ARCH} == i386
 #CMAKE_ARGS+=	-DDISABLE_PSI_MEMORY=1
 SSP_UNSAFE=	yes
 .endif
 
 .if ${ARCH} == powerpc
 LDFLAGS+=	-latomic
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c++17-lang
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 # XXX MBi alignment issue
 .if ${ARCH} == i386
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp
 .endif
 
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql84-client/Makefile b/databases/mysql84-client/Makefile
index 97e03aed58b9..bfb4f1e7263d 100644
--- a/databases/mysql84-client/Makefile
+++ b/databases/mysql84-client/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	mysql
+PORTREVISION=	1
 PKGNAMESUFFIX=	84-client
 
 COMMENT=	Multithreaded SQL database (client)
 
 LICENSE+=	LGPL21
 
 # MySQL8.2+ supports only 64-bit platforms
 # Review list after 13.x EoL
 NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
 
 MASTERDIR=	${.CURDIR}/../mysql84-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${MASTERDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql8[1-9]-client \
 			mysql[0-79][0-9]-client \
 			mariadb[0-9][0-9]-client \
 			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
 MMAN1=		comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
 		mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
 		mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
 
 CLIENT_ONLY=	yes
 
 OPTIONS_GROUP+=	PLUGINS
 PLUGINS_DESC=	Default Client Plugins
 OPTIONS_GROUP_PLUGINS=	SASLCLIENT
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASLCLIENT_USES=		ldap
 
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
 	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
 	@${LN} -s libmysqlclient.so.24 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.24
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile
index eae373857f5b..ce48cb0c0a53 100644
--- a/databases/mysql84-server/Makefile
+++ b/databases/mysql84-server/Makefile
@@ -1,181 +1,182 @@
 PORTNAME?=		mysql
 PORTVERSION=		8.4.3
+PORTREVISION=	1
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.4
 PKGNAMESUFFIX?=		84-server
 
 MAINTAINER=		joneum@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
 WWW=		https://www.mysql.com/
 
 LICENSE=		GPLv2
 
 # MySQL8.2+ supports only 64-bit platforms
 # Review list after 13.x EoL
 NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
 
 USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
 		ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql84-client
 
 CPE_VENDOR=	oracle
 
 USE_CXXSTD=	c++20
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libhidapi.so:comms/hidapi \
 		libfido2.so:security/libfido2 \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
 BUILD_DEPENDS=	liblz4>0:archivers/liblz4 \
 		${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="${INFO_PATH}" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
 		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_SYSTEM_LIBS=1 \
 		-DWITH_EDITLINE=system \
 		-DWITH_LZ4=system \
 		-DWITH_ICU=system \
 		-DWITH_CURL=system \
 		-DWITH_ZSTD=bundled \
 		-DWITH_PROTOBUF=bundled \
 		-DWITH_SSL=system \
 		-DWITH_ZLIB=system \
 		-DWITH_LZ4=system
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 IGNORE=		you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again
 .endif
 
 SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:84
 
 CONFLICTS_INSTALL=	mysql*-server \
 			mysqlwsrep*-server \
 			mariadb*-server \
 			percona*-server
 
 USE_RC_SUBR=	mysql-server
 
 SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 MMAN1=		ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 		myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
 		mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1
 MMAN8=		mysqld.8
 
 CMAKE_ARGS+=	-DWITHOUT_CLIENTLIBS="ON"
 # Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules
 CMAKE_ARGS+=	-DWITH_UNIT_TESTS="OFF"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
 OPTIONS_SUB=		YES
 STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
 ARCHIVE_DESC=		Compile "Archive Storage" statically in server
 BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
 EXAMPLE_DESC=		Compile "Example Storage" statically in server
 FEDERATED_DESC=		Compile "Federated Storage" statically in server
 INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
 PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
 PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
 
 ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
 BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
 FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
 INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
 OPTIONS_GROUP+=		FEATURES
 OPTIONS_GROUP_FEATURES=	PERFSCHM
 FEATURES_DESC=		Default features knobs
 PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
 OPTIONS_DEFAULT+=	PERFSCHM
 
 PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 # todo, likely broken, see
 # https://dev.mysql.com/doc/refman/8.4/en/source-configuration-options.html
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.options.mk>
 
 CXXFLAGS+=	-malign-double
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql91-client/Makefile b/databases/mysql91-client/Makefile
index 864f8159fed0..d026a60ea41f 100644
--- a/databases/mysql91-client/Makefile
+++ b/databases/mysql91-client/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	91-client
 
 COMMENT=	Multithreaded SQL database (client)
 
 LICENSE+=	LGPL21
 
 # MySQL8.2+ supports only 64-bit platforms
 # Review list after 13.x EoL
 NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
 
 MASTERDIR=	${.CURDIR}/../mysql91-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${MASTERDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql8[1-9]-client \
 			mysql[0-79][0-9]-client \
 			mariadb[0-9][0-9]-client \
 			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
 MMAN1=		comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
 		mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
 		mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
 
 CLIENT_ONLY=	yes
 
 OPTIONS_GROUP+=	PLUGINS
 PLUGINS_DESC=	Default Client Plugins
 OPTIONS_GROUP_PLUGINS=	SASLCLIENT
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASLCLIENT_USES=		ldap
 
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
 	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
 	@${LN} -s libmysqlclient.so.24 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.24
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql91-server/Makefile b/databases/mysql91-server/Makefile
index 1222312f18cc..9ca0758a5ea4 100644
--- a/databases/mysql91-server/Makefile
+++ b/databases/mysql91-server/Makefile
@@ -1,182 +1,182 @@
 PORTNAME?=		mysql
 PORTVERSION=		9.1.0
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-9.1
 PKGNAMESUFFIX?=		91-server
 
 MAINTAINER=		joneum@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
 WWW=		https://www.mysql.com/
 
 LICENSE=		GPLv2
 
 # MySQL8.2+ supports only 64-bit platforms
 # Review list after 13.x EoL
 NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
 
 USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
 		ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql91-client
 
 CPE_VENDOR=	oracle
 
 USE_CXXSTD=	c++20
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libhidapi.so:comms/hidapi \
 		libfido2.so:security/libfido2 \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
 BUILD_DEPENDS=	liblz4>0:archivers/liblz4 \
 		${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="${INFO_PATH}" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
 		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_SYSTEM_LIBS=1 \
 		-DWITH_EDITLINE=system \
 		-DWITH_LZ4=system \
 		-DWITH_ICU=system \
 		-DWITH_CURL=system \
 		-DWITH_ZSTD=bundled \
 		-DWITH_PROTOBUF=bundled \
 		-DWITH_SSL=system \
 		-DWITH_ZLIB=system \
 		-DWITH_LZ4=system
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 IGNORE=		you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again
 .endif
 
 SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:91
 
 CONFLICTS_INSTALL=	mysql*-server \
 			mysqlwsrep*-server \
 			mariadb*-server \
 			percona*-server
 
 USE_RC_SUBR=	mysql-server
 
 SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 MMAN1=		ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 		myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
 		mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1
 MMAN8=		mysqld.8
 
 CMAKE_ARGS+=	-DWITHOUT_CLIENTLIBS="ON"
 # Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules
 CMAKE_ARGS+=	-DWITH_UNIT_TESTS="OFF"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
 OPTIONS_SUB=		YES
 STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
 ARCHIVE_DESC=		Compile "Archive Storage" statically in server
 BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
 EXAMPLE_DESC=		Compile "Example Storage" statically in server
 FEDERATED_DESC=		Compile "Federated Storage" statically in server
 INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
 PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
 PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
 
 ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
 BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
 FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
 INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
 OPTIONS_GROUP+=		FEATURES
 OPTIONS_GROUP_FEATURES=	PERFSCHM
 FEATURES_DESC=		Default features knobs
 PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
 OPTIONS_DEFAULT+=	PERFSCHM
 
 PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 # todo, likely broken, see
 # https://dev.mysql.com/doc/refman/8.4/en/source-configuration-options.html
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.options.mk>
 
 CXXFLAGS+=	-malign-double
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 329da9b96264..c1419cb0a806 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,24 +1,24 @@
 DISTVERSION?=	13.19
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 3f503eaef227..4cd71dcee6a3 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,24 +1,24 @@
 DISTVERSION?=	14.16
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index 8a241425839a..073ad7eea660 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,24 +1,24 @@
 DISTVERSION?=	15.11
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 .include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index c64f66d9fe06..8f20adf5a53a 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,242 +1,242 @@
 PORTNAME?=	postgresql
 DISTVERSION?=	16.7
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
 WWW=		https://www.postgresql.org/
 
 LICENSE=	PostgreSQL
 
 CONFLICTS+=	${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
 OPTIONS_SUB=	yes
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
 USES+=		tar:bzip2 cpe
 .if !defined(NO_BUILD)
 USES+=		gmake
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 .endif
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_LIBS="-lpthread" \
 		LDFLAGS_SL="${LDFLAGS_SL}"
 LDFLAGS+=	-lpthread
 MAKE_ENV=	MAKELEVEL=0
 
 PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 BUILD_DIRS?=	src/port ${INSTALL_DIRS}
 INSTALL_TARGET?=install-strip
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 COMPONENT=	-server
 USE_RC_SUBR=	postgresql
 USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 USERS=		${PG_USER}
 GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
 MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 
 .if defined(SERVER_ONLY)
 OPTIONS_DEFINE=	DTRACE LDAP TZDATA XML DOCS
 OPTIONS_DEFAULT+=XML
 LDAP_DESC=	Build with LDAP authentication support
 TZDATA_DESC=	Use internal timezone database
 XML_DESC=	Build with XML data type
 
 DTRACE_CONFIGURE_ENABLE=dtrace
 DTRACE_LDFLAGS=		-lelf
 DTRACE_INSTALL_TARGET=	install
 
 .  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14
 OPTIONS_DEFINE+=	LZ4
 OPTIONS_DEFAULT+=	LZ4
 LZ4_DESC=		Build with LZ4 compression support
 LZ4_CONFIGURE_WITH=	lz4
 LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
 .  endif
 
 .  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
 OPTIONS_DEFINE+=	ZSTD
 OPTIONS_DEFAULT+=	ZSTD
 ZSTD_DESC=		Build with ZSTD compression support
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS+=	libzstd.so:archivers/zstd
 .  endif
 
 OPTIONS_DEFINE+=	LLVM
 OPTIONS_DEFAULT+=	LLVM
 LLVM_DESC=		Build with support for JIT-compiling expressions
 LLVM_CONFIGURE_WITH=	llvm
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
 			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
 LLVM_USES=		llvm:min=11,lib
 
 CONFIGURE_ARGS+=	--with-icu
 LIB_DEPENDS+=		libicudata.so:devel/icu
 USES+=			pkgconfig
 .else
 CONFIGURE_ARGS+=	--without-icu
 .endif
 
 
 .if !defined(SLAVE_ONLY)
 OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS SSL
 NLS_DESC=		Use internationalized messages
 PAM_DESC=		Build with PAM Support
 GSSAPI_DESC=		Build with GSSAPI from base (security/krb5)
 OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
 SSL_DESC=		Build with OpenSSL support
 
 OPTIONS_DEFAULT+=	SSL
 
 GSSAPI_USES=		gssapi:mit
 GSSAPI_CONFIGURE_WITH=	gssapi
 .endif # !SLAVE_ONLY
 
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
 
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USES=		ldap
 
 OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 PLIST_SUB+=		PG_VERSION=${PORTVERSION:R} \
 			PG_USER=${PG_USER} \
 			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
 			PG_GROUP=${PG_GROUP} \
 			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
 SUB_LIST+=		PG_VERSION=${PORTVERSION:R} \
 			PG_GROUP=${PG_GROUP} \
 			PG_USER=${PG_USER} \
 			PG_UID=${PG_UID}
 
 .include <bsd.port.options.mk>
 
 # i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2
 # For such ancient CPUs, gcc must be used to build PostgreSQL.
 # https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org
 .if ${ARCH} == "i386"
 CFLAGS+=	-msse2
 .endif
 
 .if !defined(SLAVE_ONLY)
 PATCH_DIST_STRIP=-p1
 .endif # !SLAVE_ONLY
 
 # For testing files in FILESDIR
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLLVM}
 INSTALL_DIRS+=		src/backend/jit/llvm
 .endif
 
 .if defined(SERVER_ONLY)
 pre-build:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD) && !target(do-build)
 
 do-build:
 	@ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
 SUB_FILES+=	pkg-message${COMPONENT}
 PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
 .  endif
 .  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
 SUB_FILES+=	pkg-install${COMPONENT}
 .  endif
 
 post-patch:
 .  if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT)
 	@${REINPLACE_CMD} \
 		-e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \
 		${WRKSRC}/src/interfaces/libpq/Makefile
 .  endif
 
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
 			${STAGEDIR}${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index 52e6f130b2be..e118b6c3b5f5 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,245 +1,245 @@
 PORTNAME?=	postgresql
 DISTVERSION?=	17.3
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 #DISTFILES+=	${PORTNAME}-${DISTVERSION}-docs.tar.bz:docs
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
 WWW=		https://www.postgresql.org/
 
 LICENSE=	PostgreSQL
 
 CONFLICTS+=	${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
 OPTIONS_SUB=	yes
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
 USES+=		bison perl5 tar:bzip2 cpe
 USE_PERL5=	build
 .if !defined(NO_BUILD)
 USES+=		gmake
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 .endif
 
 PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_LIBS="-lpthread" \
 		LDFLAGS_SL="${LDFLAGS_SL}"
 LDFLAGS+=	-lpthread
 MAKE_ENV=	MAKELEVEL=0
 
 PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
 		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
 BUILD_DIRS?=	src/port ${INSTALL_DIRS}
 INSTALL_TARGET?=install-strip
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 COMPONENT=	-server
 USE_RC_SUBR=	postgresql
 USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 USERS=		${PG_USER}
 GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
 MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 
 .if defined(SERVER_ONLY)
 OPTIONS_DEFINE=	DTRACE LDAP TZDATA XML DOCS
 OPTIONS_DEFAULT+=XML
 LDAP_DESC=	Build with LDAP authentication support
 TZDATA_DESC=	Use internal timezone database
 XML_DESC=	Build with XML data type
 
 DTRACE_CONFIGURE_ENABLE=dtrace
 DTRACE_LDFLAGS=		-lelf
 DTRACE_INSTALL_TARGET=	install
 
 .  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14
 OPTIONS_DEFINE+=	LZ4
 OPTIONS_DEFAULT+=	LZ4
 LZ4_DESC=		Build with LZ4 compression support
 LZ4_CONFIGURE_WITH=	lz4
 LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
 .  endif
 
 .  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
 OPTIONS_DEFINE+=	ZSTD
 OPTIONS_DEFAULT+=	ZSTD
 ZSTD_DESC=		Build with ZSTD compression support
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS+=	libzstd.so:archivers/zstd
 .  endif
 
 OPTIONS_DEFINE+=	LLVM
 OPTIONS_DEFAULT+=	LLVM
 LLVM_DESC=		Build with support for JIT-compiling expressions
 LLVM_CONFIGURE_WITH=	llvm
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
 			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
 LLVM_USES=		llvm:min=11,lib
 
 CONFIGURE_ARGS+=	--with-icu
 LIB_DEPENDS+=		libicudata.so:devel/icu
 USES+=			pkgconfig
 .else
 CONFIGURE_ARGS+=	--without-icu
 .endif
 
 
 .if !defined(SLAVE_ONLY)
 OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS SSL
 NLS_DESC=		Use internationalized messages
 PAM_DESC=		Build with PAM Support
 GSSAPI_DESC=		Build with GSSAPI from base (security/krb5)
 OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
 SSL_DESC=		Build with OpenSSL support
 
 OPTIONS_DEFAULT+=	SSL
 
 GSSAPI_USES=		gssapi:mit
 GSSAPI_CONFIGURE_WITH=	gssapi
 
 PATCH_DIST_STRIP=-p1
 .endif # !SLAVE_ONLY
 
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
 
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USES=		ldap
 
 OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 PLIST_SUB+=		PG_VERSION=${PORTVERSION:R} \
 			PG_USER=${PG_USER} \
 			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
 			PG_GROUP=${PG_GROUP} \
 			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
 SUB_LIST+=		PG_VERSION=${PORTVERSION:R} \
 			PG_GROUP=${PG_GROUP} \
 			PG_USER=${PG_USER} \
 			PG_UID=${PG_UID}
 
 .include <bsd.port.options.mk>
 
 # i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2
 # For such ancient CPUs, gcc must be used to build PostgreSQL.
 # https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org
 .if ${ARCH} == "i386"
 CFLAGS+=	-msse2
 .endif
 
 # For testing files in FILESDIR
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLLVM}
 INSTALL_DIRS+=		src/backend/jit/llvm
 .endif
 
 .if defined(SERVER_ONLY)
 pre-build:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD) && !target(do-build)
 
 do-build:
 	@ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
 	done
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/doc && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} man
 .  endif
 .  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
 SUB_FILES+=	pkg-message${COMPONENT}
 PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
 .  endif
 .  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
 SUB_FILES+=	pkg-install${COMPONENT}
 .  endif
 
 post-patch:
 .  if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT)
 	@${REINPLACE_CMD} \
 		-e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \
 		${WRKSRC}/src/interfaces/libpq/Makefile
 .  endif
 
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
 			${STAGEDIR}${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
 	@ cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index b51e7618d3ab..03ef9aeaedca 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,299 +1,300 @@
 PORTNAME=	sqlite3
 DISTVERSION=	3.46.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.sqlite.org/${_YEAR}/ https://www2.sqlite.org/${_YEAR}/ https://www3.sqlite.org/${_YEAR}/
 .if defined(TEA)
 PKGNAMEPREFIX=	tcl-
 .endif
 DISTNAME=	sqlite-src-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
 
 MAINTAINER=	pavelivolkov@gmail.com
 COMMENT=	SQL database engine in a C library
 .if ${FLAVOR:U} == icu
 COMMENT+=	(ICU flavor)
 .endif
 .if ${FLAVOR:U} == tcl
 COMMENT+=	(TCL flavor)
 .endif
 .if defined(TEA)
 COMMENT=	SQLite extension for Tcl using the Tcl Extension Architecture (TEA)
 .endif
 WWW=		https://www.sqlite.org/
 
 LICENSE=	PD
 
 .if !defined(TEA)
 FLAVORS=	default icu tcl
 FLAVOR?=	${FLAVORS:[1]}
 icu_PKGNAMESUFFIX=	-${FLAVOR}	# databases/p5-DBD-SQLite with ICU support
 tcl_PKGNAMESUFFIX=	-${FLAVOR}	# lang/tcl* support
 .endif
 
 USES=	libtool pathfix zip
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET+=	sqldiff
 .if defined(TEA)
 INSTALL_TARGET=	tcl_install
 .endif
 TEST_TARGET=	test
 
 # The default numeric file permissions for newly created database files under unix.
 # If not specified, the default is 0644 which means that the files is globally
 # readable but only writable by the creator.
 .ifdef DEFAULT_FILE_PERMISSIONS
 CPPFLAGS+=	-DSQLITE_DEFAULT_FILE_PERMISSIONS=${DEFAULT_FILE_PERMISSIONS}
 .endif
 
 CONFLICTS_INSTALL=	sqlite3 sqlite3-icu sqlite3-tcl tcl-sqlite3 # include/sqlite3.h share/examples/sqlite3/example.tcl
 
 SUB_FILES=	example.tcl
 SUB_LIST=	TCLSH_CMD="${TCLSH}"
 
 .if defined(TEA)
 USES+=	sqlite
 DESCR=	${MASTERDIR}/pkg-descr-tea
 SUB_LIST+=	TEA="" NO_TEA="@comment "
 PLIST_SUB+=	TEA="" NO_TEA="@comment "
 .else
 SUB_LIST+=	TEA="@comment " NO_TEA=""
 PLIST_SUB+=	TEA="@comment " NO_TEA=""
 .endif
 
 PLIST_SUB+=	TCLVER=tcl${TCL_VER} TCLSUF=tcl${TCL_VER:S/.//g}
 
 # Compilation Options For SQLite https://www.sqlite.org/compile.html
 OPTIONS_DEFINE=		EXAMPLES STRIP TCL THREADS
 .if !defined(TEA)
 OPTIONS_DEFINE+=	ARMOR DBPAGE DBSTAT DIRECT_READ DQS EXTENSION FTS3_TOKEN \
 			FTS4 FTS5 LIKENOTBLOB MEMMAN METADATA NORMALIZE NULL_TRIM RBU SECURE_DELETE \
 			SORT_REF STATIC STMT TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \
 			UPDATE_LIMIT URI URI_AUTHORITY
 .endif
 OPTIONS_DEFAULT=	DBPAGE DBSTAT DIRECT_READ EXTENSION FTS3_TOKEN FTS4 FTS5 LIBEDIT METADATA \
 			RTREE SECURE_DELETE STRIP THREADS TS1 UNICODE61 UNLOCK_NOTIFY URI
 # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
 # RTREE used by graphics/mapnik, databases/spatialite
 # FTS3_TOKEN used by audio/clementine-player, mail/thunderbird, www/seamonkey
 # FTS5 used by sysutils/tracker
 # JSON1 used by net-im/py-matrix-synapse (since SQLite 3.38.0 included by default)
 # DBPAGE used by audio/audacity (since 3.0.0)
 # DQS used by multimedia/emby-server, multimedia/tautulli, net/vnstat, www/qutebrowser
 #
 .if !defined(TEA)
 OPTIONS_GROUP=		OPT_EXT OPT_FUNC RTREEG UNICODE
 .endif
 OPTIONS_GROUP_OPT_EXT=	SESSION
 OPTIONS_GROUP_OPT_FUNC=	OFFSET SOUNDEX
 OPTIONS_GROUP_RTREEG=	GEOPOLY RTREE RTREE_INT
 OPTIONS_GROUP_UNICODE=	ICU UNICODE61
 .if !defined(TEA)
 OPTIONS_RADIO=		STAT RL
 .endif
 OPTIONS_RADIO_RL=	LIBEDIT READLINE
 OPTIONS_RADIO_STAT=	STAT3 STAT4
 .if !defined(TEA)
 OPTIONS_SINGLE=		RAMT
 .endif
 OPTIONS_SINGLE_RAMT=	TS0 TS1 TS2 TS3
 .if ${FLAVOR:U} == icu
 OPTIONS_EXCLUDE=	UNICODE61
 OPTIONS_SLAVE=		ICU
 .endif
 .if ${FLAVOR:U} == tcl || defined(TEA)
 OPTIONS_SLAVE=		TCL
 .endif
 OPTIONS_SUB=		yes
 
 ARMOR_DESC=		Detect misuse of the API # https://www.sqlite.org/compile.html#enable_api_armor
 DBPAGE_DESC=		Enable DBPAGE Virtual Table # https://sqlite.org/compile.html#enable_dbpage_vtab
 DBSTAT_DESC=		Enable DBSTAT Virtual Table # https://www.sqlite.org/dbstat.html
 DIRECT_READ_DESC=	File is read directly from disk # https://sqlite.org/compile.html#direct_overflow_read
 DQS_DESC=		Double-quoted String Literals # https://www.sqlite.org/compile.html#dqs
 EXTENSION_DESC=		Allow loadable extensions
 FTS3_TOKEN_DESC=	Enable two-args version fts3_tokenizer # https://www.sqlite.org/compile.html#enable_fts3_tokenizer, https://www.sqlite.org/fts3.html#f3tknzr
 FTS4_DESC=		Enable FTS3/4 (Full Text Search) module # https://www.sqlite.org/fts3.html, https://www.sqlite.org/compile.html#enable_fts3_parenthesis
 FTS5_DESC=		Enable version 5 full-text search engine # https://www.sqlite.org/fts5.html
 GEOPOLY_DESC=		Uses the GeoJSON notation (RFC-7946) # https://www.sqlite.org/geopoly.html
 LIKENOTBLOB_DESC=	LIKE does not match blobs # https://sqlite.org/compile.html#like_doesnt_match_blobs
 MEMMAN_DESC=		Allow it to release unused memory
 METADATA_DESC=		Enable column metadata
 NORMALIZE_DESC=		Enable normalized sql function
 NULL_TRIM_DESC=		Omits NULL columns at the ends of rows # https://sqlite.org/compile.html#enable_null_trim
 OFFSET_DESC=		Enable sqlite_offset() returning records file offset # http://www.sqlite.org/compile.html#enable_offset_sql_func
 OPT_EXT_DESC=		Optional extensions
 OPT_FUNC_DESC=		Optional functions
 RAMT_DESC=		Where to store temporary file # https://www.sqlite.org/tempfiles.html#tempstore
 RBU_DESC=		Enable the resumable bulk update # https://www.sqlite.org/rbu.html
 RL_DESC=		Command line editing library
 RTREEG_DESC=		Index type for range queries # https://www.sqlite.org/rtree.html
 RTREE_DESC=		Enable R*Tree module
 RTREE_INT_DESC=		Store 32-bit sig int (no float) coordinates
 SECURE_DELETE_DESC=	Overwrite deleted information with zeros
 SESSION_DESC=		Enable the session extension # https://www.sqlite.org/sessionintro.html
 SORT_REF_DESC=		To use references in the sorter # https://www.sqlite.org/compile.html#enable_sorter_references
 SOUNDEX_DESC=		Enable the soundex() SQL function
 STAT3_DESC=		Collect histogram data from leftmost column
 STAT4_DESC=		Collect histogram data from all columns
 STAT_DESC=		Which query planner to use, stability or ... # https://www.sqlite.org/queryplanner-ng.html#qpstab
 STMT_DESC=		Prepared statement scan status # https://www.sqlite.org/c3ref/stmt_scanstatus.html
 TCL_DESC=		Enable tcl extension and sqlite_analyzer
 TRUSTED_SCHEMA_DESC=	SQL functions & virtual tables are considered unsafe # https://www.sqlite.org/compile.html#trusted_schema
 TS0_DESC=		Always use temporary file
 TS1_DESC=		File by default, change allowed PRAGMA
 TS2_DESC=		Memory by default, change allowed PRAGMA
 TS3_DESC=		Always use memory
 UNICODE61_DESC=		Unicode Version 6.1 tokenizer # https://www.sqlite.org/fts3.html#tokenizer
 UNKNOWN_SQL_DESC=	Suppress unknown function errors # http://sqlite.org/compile.html#enable_unknown_sql_function
 UNLOCK_NOTIFY_DESC=	Enable notification on unlocking
 UPDATE_LIMIT_DESC=	UPDATE/DELETE is extended with ORDER BY and LIMIT # https://www.sqlite.org/compile.html#enable_update_delete_limit
 URI_AUTHORITY_DESC=	Allow convert URL into a UNC
 URI_DESC=		Enable use the URI filename
 
 ARMOR_CPPFLAGS=	-DSQLITE_ENABLE_API_ARMOR=1
 DBPAGE_CPPFLAGS=	-DSQLITE_ENABLE_DBPAGE_VTAB=1
 DBSTAT_CPPFLAGS=	-DSQLITE_ENABLE_DBSTAT_VTAB=1
 DIRECT_READ_CPPFLAGS_OFF=	-DSQLITE_DIRECT_OVERFLOW_READ=0
 DQS_CPPFLAGS=	-DSQLITE_DQS=3
 DQS_CPPFLAGS_OFF=	-DSQLITE_DQS=0
 EXTENSION_CONFIGURE_ENABLE=	load-extension
 FTS3_TOKEN_CPPFLAGS=	-DSQLITE_ENABLE_FTS3_TOKENIZER=1
 FTS4_CONFIGURE_ENABLE=	fts3 fts4
 FTS4_CPPFLAGS=	-DSQLITE_ENABLE_FTS3_PARENTHESIS=1
 FTS5_CONFIGURE_ENABLE=	fts5
 FTS5_LIBS=	-lm
 GEOPOLY_IMPLIES=	RTREE
 GEOPOLY_CONFIGURE_ENABLE=	geopoly
 ICU_BUILD_DEPENDS=	${LOCALBASE}/bin/icu-config:devel/icu
 ICU_LIB_DEPENDS=	libicudata.so:devel/icu
 ICU_CPPFLAGS=	`${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1
 ICU_LIBS=	`${LOCALBASE}/bin/icu-config --ldflags`
 LIBEDIT_USES=	libedit
 LIBEDIT_CONFIGURE_ENABLE=	editline
 LIKENOTBLOB_CPPFLAGS=	-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1
 MEMMAN_CPPFLAGS=	-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
 METADATA_CPPFLAGS=	-DSQLITE_ENABLE_COLUMN_METADATA=1
 NORMALIZE_CPPFLAGS=	-DSQLITE_ENABLE_NORMALIZE=1
 NULL_TRIM_CPPFLAGS=	-DSQLITE_ENABLE_NULL_TRIM=1
 OFFSET_CPPFLAGS=	-DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
 RBU_CPPFLAGS=	-DSQLITE_ENABLE_RBU=1
 READLINE_USES=	readline
 READLINE_CONFIGURE_ENABLE=	readline
 RTREE_CONFIGURE_ENABLE=	rtree
 RTREE_INT_CPPFLAGS=	-DSQLITE_RTREE_INT_ONLY=1
 SECURE_DELETE_CPPFLAGS=	-DSQLITE_SECURE_DELETE=1
 SESSION_CONFIGURE_ENABLE=	session
 SORT_REF_CPPFLAGS=	-DSQLITE_ENABLE_SORTER_REFERENCES=1
 SOUNDEX_CPPFLAGS=	-DSQLITE_SOUNDEX=1
 STAT3_CPPFLAGS=	-DSQLITE_ENABLE_STAT3=1
 STAT4_CPPFLAGS=	-DSQLITE_ENABLE_STAT4=1
 STATIC_CONFIGURE_ENABLE=	static
 STMT_CPPFLAGS=	-DSQLITE_ENABLE_STMT_SCANSTATUS=1
 TCL_USES=	tcl
 TCL_USES_OFF=	tcl:build
 TCL_CONFIGURE_ENABLE=	tcl
 TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
 TCL_CONFIGURE_ENV=	ac_cv_prog_TCLSH_CMD=${TCLSH}
 TCL_ALL_TARGET+=	sqlite3_analyzer
 THREADS_CONFIGURE_ENABLE=	threadsafe
 THREADS_LIBS=	-lpthread
 TRUSTED_SCHEMA_CPPFLAGS=	-DSQLITE_TRUSTED_SCHEMA=0
 TS0_CONFIGURE_ON=	--enable-tempstore=never
 TS1_CONFIGURE_ON=	--enable-tempstore=no
 TS2_CONFIGURE_ON=	--enable-tempstore=yes
 TS3_CONFIGURE_ON=	--enable-tempstore=always
 UNICODE61_CPPFLAGS_OFF=	-DSQLITE_DISABLE_FTS3_UNICODE=1
 UNKNOWN_SQL_CPPFLAGS=	-DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1
 UNLOCK_NOTIFY_CPPFLAGS=	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
 UPDATE_LIMIT_CONFIGURE_ENABLE=	update-limit
 URI_CPPFLAGS=	-DSQLITE_USE_URI=1
 URI_AUTHORITY_CPPFLAGS=	-DSQLITE_ALLOW_URI_AUTHORITY=1
 
 .include <bsd.port.options.mk>
 
 # _YEAR=	${%Y:L:gmtime} - do not work with the version from the previous year
 _YEAR=	2024
 
 # Recommended options
 # https://sqlite.org/compile.html#strict_subtype
 .if defined(SQLITE_STRICT_SUBTYPE)
 CPPFLAGS+=	-DSQLITE_STRICT_SUBTYPE=${SQLITE_STRICT_SUBTYPE}
 .else
 # This recommended option helps to identify problems in the implementation of application-defined SQL functions early in the development cycle.
 CPPFLAGS+=	-DSQLITE_STRICT_SUBTYPE=1
 .endif
 
 # Platform Configuration
 # -DHAVE_POSIX_FALLOCATE=1 not yet, chunksize.test ZFS failure chunksize-1.2 expected: [32768] got: [2048]
 CPPFLAGS+=	-DHAVE_FCHOWN=1 \
 		-DHAVE_FDATASYNC=1 \
 		-DHAVE_ISNAN=1 \
 		-DHAVE_GMTIME_R=1 \
 		-DHAVE_LOCALTIME_R=1 \
 		-DHAVE_LSTAT=1 \
 		-DHAVE_MALLOC_USABLE_SIZE=1 \
 		-DHAVE_PREAD=1 \
 		-DHAVE_PWRITE=1 \
 		-DHAVE_USLEEP=1 \
 		-DHAVE_STRCHRNUL=1 \
 		-DHAVE_STRERROR_R=1 \
 		-DHAVE_READLINK=1 \
 		-DSQLITE_OS_UNIX=1
 
 # For compare with checksum from of the site. Now, this is a NIST SHA3-256 hash. sha256 not suitable for compare.
 # But the creation of a new target does not justify the emergence of dependence on the perl5.
 # sha3sum maybe installed with p5-Digest-SHA3 port.
 # EXTRACT_DEPENDS=p5-Digest-SHA3:security/p5-Digest-SHA3; USES=perl5; USE_PERL5=extract;
 # @${PERL} -MDigest::SHA3 -le 'print Digest::SHA3->new(sha_256_hex)->add(<>)->hexdigest' < ${DISTDIR}/${ALLFILES}
 pre-extract:
 	@${WHICH} sha3sum > /dev/null && for entry in ${ALLFILES}; do ${ECHO_MSG} -n "=> "; sha3sum -a 256 --tag "${DISTDIR}/$${entry}"; done || ${TRUE}
 
 post-configure:
 	@${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}"
 	@${ECHO_MSG} "===> CFLAGS=${CFLAGS}"
 	@${ECHO_MSG} "===> CPPFLAGS=${CPPFLAGS}"
 	@${ECHO_MSG} "===> LDFLAGS=${LDFLAGS}"
 	@${ECHO_MSG} "===> LIBS=${LIBS}"
 	@${ECHO_MSG} "===> TCL_VER=${TCL_VER}"
 	@${ECHO_MSG} "===> TCLSH=${TCLSH}"
 	@${ECHO_MSG} "===> TCL_INCLUDEDIR=${TCL_INCLUDEDIR}"
 	@${ECHO_MSG} "===> TCL_LIBDIR=${TCL_LIBDIR}"
 
 post-install:
 .if !defined(TEA)
 	${INSTALL_MAN} "${WRKSRC}/${PORTNAME}.1" "${STAGEDIR}${PREFIX}/share/man/man1"
 	${RM} "${STAGEDIR}${PREFIX}/include/msvc.h"
 	${SETENV} LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so"
 	${INSTALL_PROGRAM} "${WRKSRC}/sqldiff" "${STAGEDIR}${PREFIX}/bin"
 .else
 	${RM} "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0.8.6" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a"
 .endif
 
 post-install-STRIP-on:
 .if !defined(TEA)
 	${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so"
 .endif
 .if ${PORT_OPTIONS:MTCL}
 	${STRIP_CMD} "${STAGEDIR}${PREFIX}/lib/tcl${TCL_VER}/${PORTNAME}/libtcl${PORTNAME}.so"
 .endif
 
 post-install-TCL-on:
 	${INSTALL_PROGRAM} "${WRKSRC}/${PORTNAME}_analyzer" "${STAGEDIR}${PREFIX}/bin"
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/mann
 	${INSTALL_MAN} "${WRKSRC}/autoconf/tea/doc/${PORTNAME}.n" "${STAGEDIR}${PREFIX}/share/man/mann/${PORTNAME}.tcl${TCL_VER:S/.//g}.n"
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
 	${INSTALL_SCRIPT} "${WRKDIR}/${SUB_FILES}" "${WRKSRC}/contrib/sqlitecon.tcl" "${STAGEDIR}${EXAMPLESDIR}"
 .endif
 
 pre-test:
 .if ! ${PORT_OPTIONS:MTCL}
 	@${ECHO_MSG} "===>  Option TCL must be On for test purposes" && ${FALSE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 58a046bd0063..063fd28a1198 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	tarantool
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.tarantool.org/tarantool/src/
 
 MAINTAINER=	balaev@tarantool.org
 COMMENT=	NoSQL database running in a Lua application server
 WWW=		https://tarantool.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=		armv6 i386 powerpc64
 NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		msgpuck>=2.0_6:devel/msgpuck \
 		curl>=8.4.0:ftp/curl
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicui18n.so:devel/icu \
 		libmsgpuck.so:devel/msgpuck \
 		libyaml.so:textproc/libyaml \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:noninja compiler:c++11-lang cpe gettext-runtime gmake iconv perl5 readline ssl
 USE_PERL5=	build
 
 CONFLICTS_INSTALL=	tarantool2
 
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
 		ENABLE_BUNDLED_LIBYAML \
 		ENABLE_BUNDLED_MSGPUCK \
 		ENABLE_BUNDLED_ZSTD
 CMAKE_ON=	ENABLE_DIST
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	tarantool
 
 USERS=		tarantool
 GROUPS=		tarantool
 
 PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 		TT_LOGDIR=${TT_LOGDIR}
 SUB_FILES=	pkg-message
 
 TT_DATADIR?=	/var/db/tarantool
 TT_LOGDIR?=	/var/log/tarantool
 TT_RUNDIR?=	/var/run/tarantool
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/
 	@${RMDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/databases/tarantool2/Makefile b/databases/tarantool2/Makefile
index 1ac3d1509c4a..53cece898f10 100644
--- a/databases/tarantool2/Makefile
+++ b/databases/tarantool2/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	tarantool
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.tarantool.org/tarantool/src/
 PKGNAMESUFFIX?=	2
 
 MAINTAINER=	balaev@tarantool.org
 COMMENT=	NoSQL database running in a Lua application server
 WWW=		https://tarantool.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		fails to compile
 BROKEN_aarch64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
 BROKEN_riscv64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
 EXPIRATION_DATE=2025-02-28
 NOT_FOR_ARCHS=		armv6 i386 powerpc64
 NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		msgpuck>=2.0_6:devel/msgpuck
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicui18n.so:devel/icu \
 		libmsgpuck.so:devel/msgpuck \
 		libyaml.so:textproc/libyaml \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:noninja compiler:c++11-lang cpe gettext-runtime gmake iconv perl5 readline ssl
 USE_PERL5=	build
 
 CONFLICTS_INSTALL=	tarantool
 
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
 		ENABLE_BUNDLED_LIBYAML \
 		ENABLE_BUNDLED_MSGPUCK \
 		ENABLE_BUNDLED_ZSTD
 CMAKE_ON=	ENABLE_DIST
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	tarantool
 
 USERS=		tarantool
 GROUPS=		tarantool
 
 PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 		TT_LOGDIR=${TT_LOGDIR}
 SUB_FILES=	pkg-message
 
 TT_DATADIR?=	/var/db/tarantool
 TT_LOGDIR?=	/var/log/tarantool
 TT_RUNDIR?=	/var/run/tarantool
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION
 	@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
 	@${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake
 	@${REINPLACE_CMD} -e 's|lib/msgpuck.h|msgpuck.h|' ${WRKSRC}/src/lib/core/decimal.c
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/
 
 .include <bsd.port.mk>
diff --git a/databases/xtrabackup80/Makefile b/databases/xtrabackup80/Makefile
index 554202a7d956..c6c51e90674d 100644
--- a/databases/xtrabackup80/Makefile
+++ b/databases/xtrabackup80/Makefile
@@ -1,117 +1,117 @@
 PORTNAME=	xtrabackup80
 PORTVERSION=	8.0.35
 DISTVERSIONSUFFIX=	-30
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.35-30/source/tarball/:percona \
 		SF/boost/boost/${BOOST_VERSION}:boost
 DISTFILES=	${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona \
 		boost_${BOOST_VERSION_UNDER}${EXTRACT_SUFX}:boost
 
 MAINTAINER=	eugene@zhegan.in
 COMMENT=	Open-source backup tool for InnoDB and XtraDB
 WWW=		https://docs.percona.com/percona-xtrabackup/8.0/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	qpress:archivers/qpress
 
 USES=		bison cmake compiler:c++14-lang cpe pkgconfig ssl
 CPE_VENDOR=	percona
 CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release \
 		-DWITHOUT_COMPONENT_KEYRING_KMIP:STRING=yes \
 		-DWITH_VERSION_CHECK=false
 
 CONFLICTS_INSTALL=	${PORTNAME:C/.$//}*
 
 # Bundle last supported Boost release
 BOOST_VERSION=	1.77.0
 BOOST_VERSION_UNDER=	${BOOST_VERSION:C/\./_/g}
 
 CMAKE_ARGS+=	-DWITH_BOOST=${WRKDIR}/boost_${BOOST_VERSION_UNDER}
 
 # Build fails without NDEBUG, so force it
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 DVERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
 PPORTNAME=	percona-xtrabackup
 WRKSRC=		${WRKDIR}/${PPORTNAME}-${DVERSION}
 
 .include <bsd.port.pre.mk>
 
 # Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator
 # which is broken on i386 with Clang due to different size of types
 # and causes a 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
 .if ${ARCH} == i386
 GCCVER=		13
 CC=		${PREFIX}/bin/gcc${GCCVER}
 CXX=		${PREFIX}/bin/g++${GCCVER}
 CPP=		${PREFIX}/bin/cpp${GCCVER}
 CXXFLAGS+=	--std=c++17 -march=i586
 LDFLAGS_i386=	-latomic -Wl,-rpath=${PREFIX}/lib/gcc${GCCVER} -Wl,-rpath=${PREFIX}/lib/private
 PLIST=		${PKGDIR}/pkg-plist.i386
 USE_LDCONFIG=	${PREFIX}/lib/private
 
 BUILD_DEPENDS+=	c++${GCCVER}:lang/gcc${GCCVER}
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libunwind.so:devel/libunwind
 
 RUN_DEPENDS+=	${PREFIX}/lib/gcc${GCCVER}/libatomic.so.1:lang/gcc${GCCVER}
 
 .for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
 CMAKE_ARGS+=	-DWITH_${component}:STRING=bundled
 .endfor
 .else
 BUILD_DEPENDS+=	protobuf>=3.0:devel/protobuf \
 		rapidjson>=1.1.0:devel/rapidjson \
 		libevent>=2.1:devel/libevent
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libicudata.so:devel/icu \
 		libprotobuf-lite.so:devel/protobuf \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 180
 CXXFLAGS+=	-Wno-enum-constexpr-conversion
 .endif
 
 .for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
 CMAKE_ARGS+=	-DWITH_${component}:STRING=system
 .endfor
 
 KEEP_EXTRA=	lz4 robin-hood-hashing zlib
 
 pre-configure:
 .for dir in ${KEEP_EXTRA}
 	@${MV} ${WRKSRC}/extra/${dir} ${WRKDIR}
 .endfor
 	@${RM} -r ${WRKSRC}/extra/*
 .for dir in ${KEEP_EXTRA}
 	@${MV} ${WRKDIR}/${dir} ${WRKSRC}/extra
 .endfor
 .endif
 
 post-patch:
 .for d in storage/innobase/xtrabackup/src sql/protobuf
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
 .endfor
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
 		${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
 .endif
 
 post-stage:
 	@${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
 
 .include <bsd.port.post.mk>
diff --git a/databases/xtrabackup84/Makefile b/databases/xtrabackup84/Makefile
index 5405ee63c7e3..b7a962125eec 100644
--- a/databases/xtrabackup84/Makefile
+++ b/databases/xtrabackup84/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	xtrabackup84
 PORTVERSION=	8.4.0
 DISTVERSIONSUFFIX=	-1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.percona.com/downloads/Percona-XtraBackup-innovative-release/Percona-XtraBackup-8.4.0-1/source/tarball/:percona
 DISTFILES=	${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Open-source backup tool for InnoDB and XtraDB
 WWW=		https://docs.percona.com/percona-xtrabackup/8.4/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # MySQL8.2+ supports only 64-bit platforms
 NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
 
 BUILD_DEPENDS=	protobuf>=3.0:devel/protobuf \
 		rapidjson>=1.1.0:devel/rapidjson \
 		libevent>=2.1:devel/libevent
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libicudata.so:devel/icu \
 		libprotobuf-lite.so:devel/protobuf \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	qpress:archivers/qpress
 
 USES=		bison cmake compiler:c++14-lang cpe pkgconfig ssl
 CPE_VENDOR=	percona
 CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release \
 		-DWITHOUT_COMPONENT_KEYRING_KMIP:STRING=yes \
 		-DWITH_VERSION_CHECK=false
 
 .for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
 CMAKE_ARGS+=	-DWITH_${component}:STRING=system
 .endfor
 
 CONFLICTS_INSTALL=	${PORTNAME:C/.$//}*
 
 # Build fails without NDEBUG, so force it
 CFLAGS+=	-DNDEBUG -fPIC
 CXXFLAGS+=	-DNDEBUG -fPIC
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 DVERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
 PPORTNAME=	percona-xtrabackup
 WRKSRC=		${WRKDIR}/${PPORTNAME}-${DVERSION}
 
 .include <bsd.port.pre.mk>
 
 KEEP_EXTRA=	lz4 zlib libbacktrace libcno boost unordered_dense
 
 post-patch:
 .for d in storage/innobase/xtrabackup/src sql/protobuf
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
 .endfor
 
 pre-configure:
 .for dir in ${KEEP_EXTRA}
 	@${MV} ${WRKSRC}/extra/${dir} ${WRKDIR}
 .endfor
 	@${RM} -r ${WRKSRC}/extra/*
 .for dir in ${KEEP_EXTRA}
 	@${MV} ${WRKDIR}/${dir} ${WRKSRC}/extra
 .endfor
 
 post-stage:
 	@${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 2b9b4fa73ea9..1cc46f203efe 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,153 +1,154 @@
 PORTNAME=	calibre
 PORTVERSION=	7.26.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://download.calibre-ebook.com/${PORTVERSION}/:DEFAULT \
 		https://raw.githubusercontent.com/rhasspy/piper/${PIPER_VOICES_HASH}/:piper
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT VOICES.md:piper
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:C/:.*//:S/VOICES.md//1}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 WWW=		https://calibre-ebook.com/
 
 LICENSE=	GPLv3
 
 EXTRACT_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 BUILD_DEPENDS=		${LOCALBASE}/bin/cmake:devel/cmake-core \
 			${NONEXISTENT}:misc/iso-codes:extract \
 			${PY_SETUPTOOLS} \
 			${PYTHON_PKGNAMEPREFIX}apsw>=3.43.0.0:databases/py-apsw@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xxhash>3.3.0:devel/py-xxhash@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 			liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
 			MathJax3>0:www/mathjax3
 LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg \
 			libfreetype.so:print/freetype2 \
 			libhunspell-1.7.so:textproc/hunspell \
 			libhyphen.so:textproc/hyphen \
 			libicudata.so:devel/icu \
 			libmtp.so:multimedia/libmtp \
 			libpodofo.so:graphics/podofo \
 			libstemmer.so:textproc/snowballstemmer \
 			libuchardet.so:textproc/uchardet \
 			libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}apsw>=3.43.0.0:databases/py-apsw@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}dnspython>=2.4.2:dns/py-dnspython@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.10:textproc/py-feedparser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}jeepney>=0.8.0:devel/py-jeepney@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}markdown>=3.4.4:textproc/py-markdown@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.7:devel/py-msgpack@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}netifaces>=0.11.0:net/py-netifaces@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=10.0.1:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.19.0:security/py-pycryptodome@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xxhash>=3.3.0:devel/py-xxhash@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 			liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
 			MathJax3>0:www/mathjax3 \
 			pdftohtml:graphics/poppler-utils \
 			xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gettext-runtime:build gl localbase:ldflags \
 		pkgconfig pyqt:6 python:3.11+ qt:6 shared-mime-info shebangfix sqlite ssl \
 		tar:xz xorg
 USE_GITHUB=	nodefault
 GH_TUPLE=	kovidgoyal:calibre-translations:d1f8b5c:translations \
 		LibreOffice:dictionaries:762abe7:hypenation
 PIPER_VOICES_HASH=	c0670df63daf07070c9be36b5c4bed270ad72383
 USE_GL=		opengl
 USE_PYQT=	pyqt6 pysip webengine qtbuilder:build sip:build
 USE_QT=		base
 USE_RC_SUBR=	calibre
 USE_XORG=	x11 xext xrender
 
 SHEBANG_GLOB=	*.py *.recipe *.sh
 python_OLD_CMD=	"/usr/bin/env  python" ${LOCALBASE}/bin/python3
 MAKE_ENV=	CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \
 		FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		FC_LIB_DIR="${LOCALBASE}/lib" \
 		OVERRIDE_CFLAGS="${CFLAGS}" \
 		OVERRIDE_LDFLAGS="${LDFLAGS}" \
 		PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \
 		PODOFO_LIB_DIR="${LOCALBASE}/lib" \
 		PYTHONDONTWRITEBYTECODE=true \
 		QMAKE=${QMAKE} \
 		SIP_BIN=${SIP} \
 		SIP_DIR=${PYQT_SIPDIR} \
 		WITH_USB=yes \
 		XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
 		XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
 		XDG_UTILS_INSTALL_MODE=system
 SUB_LIST=	PYTHON_VERSION=${PYTHON_VERSION}
 
 .include <bsd.port.pre.mk>
 
 ISOCODESWRKSRC!=	${BSDMAKE} -C ${.CURDIR}/../../misc/iso-codes -V WRKSRC
 
 post-extract:
 	@${CP} ${FILESDIR}/user-agent-data.json ${WRKSRC}/resources
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \
 			-e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
 		${WRKSRC}/setup/install.py \
 		${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \
 		${WRKSRC}/src/calibre/gui2/preferences/tweaks.py
 
 do-configure:
 	# do nothing
 
 do-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} bootstrap \
 		--system-liberation_fonts \
 		--path-to-liberation_fonts=${LOCALBASE}/share/fonts/Liberation \
 		--system-mathjax \
 		--path-to-mathjax=${LOCALBASE}/www/MathJax3 \
 		--path-to-hyphenation=${WRKSRC_hypenation} \
 		--path-to-translations=${WRKSRC_translations} \
 		--path-to-cacerts=${LOCALBASE}/share/certs/ca-root-nss.crt \
 		--path-to-isocodes=${ISOCODESWRKSRC} --isocodes-extracted \
 		--path-to-piper_voices=${DISTDIR}/${DIST_SUBDIR}/VOICES.md \
 	)
 	@${RMDIR} ${LOCALBASE}/libexec/qt6/locales 2>/dev/null || ${TRUE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor \
 		${STAGEDIR}${PREFIX}/share/applications \
 		${STAGEDIR}${PREFIX}/share/desktop-directories \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	# Create this file to avoid what looks like a bug in xdg-desktop-menu
 	@${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} install --prefix ${PREFIX} \
 		--staging-root ${STAGEDIR}${PREFIX})
 	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
 		${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
 
 update-recent-uas: patch
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} recent_uas)
 	${CP} ${BUILD_WRKSRC}/resources/user-agent-data.json ${FILESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/peaclock/Makefile b/deskutils/peaclock/Makefile
index ea9365337a90..ca8ad953a9c1 100644
--- a/deskutils/peaclock/Makefile
+++ b/deskutils/peaclock/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	peaclock
 DISTVERSION=	0.4.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Customizable clock, timer, and stopwatch for the terminal
 WWW=		https://github.com/octobanana/peaclock
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=		cmake compiler:c++17-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	octobanana
 
 CXXFLAGS+=	-Wno-narrowing # https://github.com/octobanana/peaclock/issues/18
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile
index 92bb495f47e3..cc0d793f16d5 100644
--- a/devel/R-cran-rJava/Makefile
+++ b/devel/R-cran-rJava/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	rJava
 DISTVERSION=	1.0-11
+PORTREVISION=	1
 CATEGORIES=	devel java
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	R to Java interface
 WWW=		https://cran.r-project.org/package=rJava
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libicuuc.so:devel/icu	\
 		libpcre2-8.so:devel/pcre2
 
 USES=		cran:compiles java
 
 JRE_LIBS=	${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc/ppc/}/server	# JDK8
 #JRE_LIBS=	${JAVA_HOME}/jre/lib/server	# JDK11
 LDFLAGS=	"-Wl,-rpath=${JRE_LIBS} "
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}	\
 		JAVA=${JAVA}	\
 		JAVAC=${JAVA_HOME}/bin/javac \
 		JAVAH=${JAVAH}	\
 		JAR=${JAR}	\
 		LD_LIBRARY_PATH="${JRE_LIBS}"	\
 		JAVA_LD_LIBRARY_PATH="${JRE_LIBS}"	\
 		JAVA_LIBS="-Wl,-rpath=${JRE_LIBS} -L${JRE_LIBS} -ljvm -lpthread"	\
 		JAVA_CPPFLAGS="-I${JAVA_HOME}/jre/../include -I${JAVA_HOME}/jre/../include/${OPSYS:tl}"
 
 #pre-configure:
 	# Just for debug purpose but this fails with new USES=java although build is OK
 #	${LOCALBASE}/bin/R CMD javareconf -e exit
 
 .include <bsd.port.mk>
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 4c6c173cabc9..1cfea056f116 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -1,100 +1,100 @@
 PORTNAME=	boost-libs
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 COMMENT=	Free portable C++ libraries (without Boost.Python)
 WWW=		https://www.boost.org/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 BROKEN_sparc64=	https://github.com/boostorg/context/commit/f2ef6326b6ed
 
 BUILD_DEPENDS+=	bjam:devel/boost-jam
 
 # Note about LLVM_FROM_PORTS option:
 # Build of this port fails with assertion failure of compiler due to
 # bug of LLVM/Clang in base system. The failure happens when all of
 # following conditions are satisfied.
 # * OSVERSION is included in either of following ranges.
 #   1. 1500000 <= OSVERSION < 1500017
 #   2. 1400000 <= OSVERSION < 1400509 (no longer relevant)
 #   3. 1300000 <= OSVERSION < 1303502 (no longer relevant)
 # * Base system is built with WITH_LLVM_ASSERTIONS variable set.
 # So if your base system fulfills them you need to use LLVM ports to
 # build this port.
 # By default WITH_LLVM_ASSERTIONS variable is set with -CURRENT but
 # not with -STABLE and -RELEASE. So whereas most -CURRENT users face
 # the build failure, few -STABLE and -RELEASE user faces it.
 # Therefore by default this port uses LLVM from ports only if base
 # system is -CURRENT and OSVERSION is included in above ranges. It
 # make it possible for most -STABLE and -RELEASE users to avoid to
 # build LLVM ports unnecessarily. But if someone uses -STABLE or
 # -RELEASE built with WITH_LLVM_ASSERTIONS set, then he can't build
 # this port successfully on such system. So provide LLVM_FROM_PORTS
 # option as a last resort for him.
 OPTIONS_DEFINE=		DEBUG LLVM_FROM_PORTS OPTIMIZED_CFLAGS
 OPTIONS_MULTI=		LOCALE
 OPTIONS_MULTI_LOCALE=	ICONV ICU
 OPTIONS_DEFAULT=	ICONV ICU
 ICONV_DESC=		Boost.Locale with iconv encoding support
 ICU_DESC=		Boost.Regex/Locale with ICU unicode support
 LLVM_FROM_PORTS_DESC=	Use LLVM from ports to build
 
 ICONV_USES=		iconv
 ICONV_MAKE_ARGS=	-sICONV_PATH=${ICONV_PREFIX}
 ICONV_MAKE_ARGS_OFF=	boost.locale.iconv=off
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_MAKE_ARGS=		-sICU_PATH=${LOCALBASE}
 ICU_MAKE_ARGS_OFF=	boost.locale.icu=off
 
 .include "${.CURDIR}/../boost-all/common.mk"
 
 .include "${.CURDIR}/../boost-all/compiled.mk"
 
 MAKE_ARGS+=	--without-python
 MAKE_ARGS+=	--without-mpi
 MAKE_ARGS+=	${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_gcc=	xdll-path=${_GCC_RUNTIME}
 ALL_TARGET=	stage
 
 .include <bsd.port.options.mk>
 
 # boost.stacktrace.from_exceptions is ready only for amd64 yet
 .if ${ARCH:Mamd64}
 PLIST_SUB+=	SFE=""
 .else
 MAKE_ARGS+=	boost.stacktrace.from_exception=off
 PLIST_SUB+=	SFE="@comment "
 .endif
 
 .if ${ARCH:Marmv?}
 pre-configure:
 	${REINPLACE_CMD} -e 's,@progbits,%progbits,' \
 		${WRKSRC}/boost/outcome/experimental/status-code/status_code.hpp \
 		${WRKSRC}/boost/outcome/outcome_gdb.h
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS:NDESTDIR=*:S,^--prefix=,&${STAGEDIR},} ${INSTALL_TARGET}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/cmake -type f -exec \
 		${REINPLACE_CMD} -i '' -e 's,${STAGEDIR},,' {} +
 # For some reasons BJAM forget about the links
 	@cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX}
 
 # display pkg-message
 post-install:
 	@${TOUCH} ${PKGMESSAGE}
 
 	@${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 	@${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index de1b4ce29a7d..7f0ac9a3d1f1 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	dee
 PORTVERSION=	1.2.7
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/151383425/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Model to synchronize multiple instances over DBus
 WWW=		https://launchpad.net/dee
 
 LICENSE=	GPLv3
 
 EXTRA_PATCHES=	${FILESDIR}/dee-1.2.7-deprecated-g_type_class_add_private.patch:-p1 \
 		${FILESDIR}/vapi-skip-properties.patch:-p1
 
 LIB_DEPENDS=	libicutu.so:devel/icu
 
 USES=		compiler:c11 gmake gnome libtool localbase pathfix pkgconfig \
 		python vala:build
 USE_GNOME=	glib20 introspection:build pygobject3
 
 CONFIGURE_ARGS=	--disable-gcov \
 		--disable-gtk-doc-html \
 		--disable-tests \
 		--enable-introspection=yes \
 		--without-html-dir
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	PYTHON="${PYTHON_CMD}"
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/electron31/Makefile b/devel/electron31/Makefile
index 97abdefc5f80..e5ab5af90c53 100644
--- a/devel/electron31/Makefile
+++ b/devel/electron31/Makefile
@@ -1,452 +1,453 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
+PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v31.4.0/:chromium \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
 		${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 WWW=		https://electronjs.org/
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 FETCH_DEPENDS=	yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 EXTRACT_DEPENDS=yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 PATCH_DEPENDS=	git:devel/git \
 		jq:textproc/jq
 BUILD_DEPENDS=	gperf:devel/gperf \
 		yasm:devel/yasm \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libasound.so:audio/alsa-lib \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libsndio.so:audio/sndio \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libva.so:multimedia/libva \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 
 USES=		bison compiler:c++17-lang cpe gettext-tools gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja nodejs:20,build \
 		pkgconfig python:build,test shebangfix tar:xz xorg
 
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 GH_TAGNAME=	${DISTVERSIONPREFIX}${ELECTRON_VER}
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		nodejs:nan:${NAN_VER}:nan \
 		Squirrel:Squirrel.Mac:${SQUIRREL_MAC_VER}:squirrel_mac \
 		ReactiveCocoa:ReactiveObjC:${REACTIVEOBJC_VER}:reactiveobjc \
 		Mantle:Mantle:${MANTLE_VER}:mantle \
 		EngFlow:reclient-configs:${ENGFLOW_RECLIENT_CONFIGS_VER}:reclient_configs
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 ALL_TARGET=	electron electron:node_headers
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=electron_dist_zip electron_chromedriver_zip \
 			electron_mksnapshot_zip
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 BUNDLE_LIBS=	yes
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_log_error_not_reached=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		chrome_pgo_phase=0 \
 		extra_cflags="${CFLAGS}" \
 		extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}" \
 		override_electron_version="${ELECTRON_VER}"
 
 # Audio backends
 GN_ARGS+=	use_alsa=true \
 		use_pulseaudio=true \
 		use_sndio=true
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO PIPEWIRE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DIST_DESC=		Build distribution zip files
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 PIPEWIRE_DESC=		Screen capture via PipeWire
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_FILE=testing.gn \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_FILE=release.gn \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DIST_IMPLIES=		DRIVER
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=			126.0.6478.234
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			20.18.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
 SQUIRREL_MAC_VER=		0e5d146ba13101a1302d59ea6e6e0b3cace4ae38
 # See ${WRKSRC}/electron/DEPS for REACTIVEOBJC_VER
 REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 # See ${WRKSRC}/electron/DEPS for ENGFLOW_RECLIENT_CONFIGS_VER
 ENGFLOW_RECLIENT_CONFIGS_VER=	955335c30a752e9ef7bff375baab5e0819b6c00d
 
 YARN_TIMESTAMP=	61171200
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 .if ${COMPILER_VERSION} < 180
 LLVM_DEFAULT=		18
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 .else
 BINARY_ALIAS+=		ar=/usr/bin/llvm-ar \
 			nm=/usr/bin/llvm-nm
 .endif
 CFLAGS+=		-Wno-error=implicit-function-declaration
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	AARCH64="" \
 		AMD64="@comment " \
 		I386="@comment " \
 		NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == "amd64"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="" \
 		I386="@comment " \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="@comment " \
 		I386="" \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 # rust
 RUSTC_VERSION!=	rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build electron, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:mode=\([0-9]\)7[0-9][0-9]:mode=\1755:' \
 			-e 's:mode=\([0-9]\)6[0-9][0-9]:mode=\1644:' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-fetch:
 	@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
 			${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
 	fi
 
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
 		${WRKSRC}/third_party/nan
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
 		${WRKSRC}/third_party/squirrel.mac
 	${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
 		${WRKSRC}/third_party/engflow-reclient-configs
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
 # Install node modules for electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
 	${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent \
 		libpng libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src/pulse/version.h
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}'
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 ${STAGEDIR}${DATADIR}/libvulkan.so
 .for f in LICENSE LICENSES.chromium.html snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
 		${STAGEDIR}${DATADIR}/chromedriver
 
 do-test:
 # Note 1: "npm install" will run before actual tests are executed
 # Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron32/Makefile b/devel/electron32/Makefile
index 3e6d104f7971..d2e6e1a78a54 100644
--- a/devel/electron32/Makefile
+++ b/devel/electron32/Makefile
@@ -1,454 +1,455 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER}
+PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v32.2.1/:chromium \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
 		${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 WWW=		https://electronjs.org/
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 FETCH_DEPENDS=	yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 EXTRACT_DEPENDS=yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 PATCH_DEPENDS=	git:devel/git \
 		jq:textproc/jq
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libva.so:multimedia/libva \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 
 USES=		bison compiler:c++17-lang cpe gettext-tools gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja nodejs:20,build \
 		pkgconfig python:build,test shebangfix tar:xz xorg
 
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		nodejs:nan:${NAN_VER}:nan \
 		Squirrel:Squirrel.Mac:${SQUIRREL_MAC_VER}:squirrel_mac \
 		ReactiveCocoa:ReactiveObjC:${REACTIVEOBJC_VER}:reactiveobjc \
 		Mantle:Mantle:${MANTLE_VER}:mantle \
 		EngFlow:reclient-configs:${ENGFLOW_RECLIENT_CONFIGS_VER}:reclient_configs
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 ALL_TARGET=	electron electron:node_headers
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=electron_dist_zip electron_chromedriver_zip \
 			electron_mksnapshot_zip
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 BUNDLE_LIBS=	yes
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_log_error_not_reached=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		chrome_pgo_phase=0 \
 		extra_cflags="${CFLAGS}" \
 		extra_cxxflags="${CXXFLAGS} ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}" \
 		override_electron_version="${ELECTRON_VER}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO PIPEWIRE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE ALSA PULSEAUDIO SNDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DIST_DESC=		Build distribution zip files
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 PIPEWIRE_DESC=		Screen capture via PipeWire
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_FILE=testing.gn \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_FILE=release.gn \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DIST_IMPLIES=		DRIVER
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=			128.0.6613.186
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			20.18.1
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
 SQUIRREL_MAC_VER=		0e5d146ba13101a1302d59ea6e6e0b3cace4ae38
 # See ${WRKSRC}/electron/DEPS for REACTIVEOBJC_VER
 REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 # See ${WRKSRC}/electron/DEPS for ENGFLOW_RECLIENT_CONFIGS_VER
 ENGFLOW_RECLIENT_CONFIGS_VER=	955335c30a752e9ef7bff375baab5e0819b6c00d
 
 YARN_TIMESTAMP=	61171200
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 LLVM_DEFAULT=		19
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 CFLAGS+=		-Wno-error=implicit-function-declaration
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	AARCH64="" \
 		AMD64="@comment " \
 		I386="@comment " \
 		NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == "amd64"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="" \
 		I386="@comment " \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="@comment " \
 		I386="" \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 # rust
 RUSTC_VERSION!=	rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build electron, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:mode=\([0-9]\)7[0-9][0-9]:mode=\1755:' \
 			-e 's:mode=\([0-9]\)6[0-9][0-9]:mode=\1644:' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-fetch:
 	@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
 			${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
 	fi
 
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
 		${WRKSRC}/third_party/nan
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
 		${WRKSRC}/third_party/squirrel.mac
 	${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
 		${WRKSRC}/third_party/engflow-reclient-configs
 # Install node modules for electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
 	${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent \
 		libpng libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/rust/rust_bindgen.gni
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}'
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 ${STAGEDIR}${DATADIR}/libvulkan.so
 .for f in LICENSE LICENSES.chromium.html snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
 		${STAGEDIR}${DATADIR}/chromedriver
 
 do-test:
 # Note 1: "npm install" will run before actual tests are executed
 # Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron33/Makefile b/devel/electron33/Makefile
index 977dea048603..b7508f009164 100644
--- a/devel/electron33/Makefile
+++ b/devel/electron33/Makefile
@@ -1,454 +1,455 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER}
+PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v33.3.2/:chromium \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
 		${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 WWW=		https://electronjs.org/
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 FETCH_DEPENDS=	yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 EXTRACT_DEPENDS=yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
 PATCH_DEPENDS=	git:devel/git \
 		jq:textproc/jq
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libva.so:multimedia/libva \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 
 USES=		bison compiler:c++17-lang cpe gettext-tools gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja nodejs:20,build \
 		pkgconfig python:build,test shebangfix tar:xz xorg
 
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		nodejs:nan:${NAN_VER}:nan \
 		Squirrel:Squirrel.Mac:${SQUIRREL_MAC_VER}:squirrel_mac \
 		ReactiveCocoa:ReactiveObjC:${REACTIVEOBJC_VER}:reactiveobjc \
 		Mantle:Mantle:${MANTLE_VER}:mantle \
 		EngFlow:reclient-configs:${ENGFLOW_RECLIENT_CONFIGS_VER}:reclient_configs
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 ALL_TARGET=	electron electron:node_headers
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=electron_dist_zip electron_chromedriver_zip \
 			electron_mksnapshot_zip
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 BUNDLE_LIBS=	yes
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_log_error_not_reached=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		chrome_pgo_phase=0 \
 		extra_cflags="${CFLAGS}" \
 		extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}" \
 		override_electron_version="${ELECTRON_VER}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO PIPEWIRE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE ALSA PULSEAUDIO SNDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DIST_DESC=		Build distribution zip files
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 PIPEWIRE_DESC=		Screen capture via PipeWire
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_FILE=testing.gn \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_FILE=release.gn \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DIST_IMPLIES=		DRIVER
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=			130.0.6723.191
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			20.18.1
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
 SQUIRREL_MAC_VER=		0e5d146ba13101a1302d59ea6e6e0b3cace4ae38
 # See ${WRKSRC}/electron/DEPS for REACTIVEOBJC_VER
 REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 # See ${WRKSRC}/electron/DEPS for ENGFLOW_RECLIENT_CONFIGS_VER
 ENGFLOW_RECLIENT_CONFIGS_VER=	955335c30a752e9ef7bff375baab5e0819b6c00d
 
 YARN_TIMESTAMP=	61171200
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 LLVM_DEFAULT=		19
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 CFLAGS+=		-Wno-error=implicit-function-declaration
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	AARCH64="" \
 		AMD64="@comment " \
 		I386="@comment " \
 		NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == "amd64"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="" \
 		I386="@comment " \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="@comment " \
 		I386="" \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 # rust
 RUSTC_VERSION!=	rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build electron, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:mode=\([0-9]\)7[0-9][0-9]:mode=\1755:' \
 			-e 's:mode=\([0-9]\)6[0-9][0-9]:mode=\1644:' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-fetch:
 	@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
 			${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
 	fi
 
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
 		${WRKSRC}/third_party/nan
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
 		${WRKSRC}/third_party/squirrel.mac
 	${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
 		${WRKSRC}/third_party/engflow-reclient-configs
 # Install node modules for electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
 	${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent \
 		libpng libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/rust/rust_bindgen.gni
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}'
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 ${STAGEDIR}${DATADIR}/libvulkan.so
 .for f in LICENSE LICENSES.chromium.html snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
 		${STAGEDIR}${DATADIR}/chromedriver
 
 do-test:
 # Note 1: "npm install" will run before actual tests are executed
 # Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/fbthrift/Makefile b/devel/fbthrift/Makefile
index d1a65fdd8994..3b5bd295ba92 100644
--- a/devel/fbthrift/Makefile
+++ b/devel/fbthrift/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	fbthrift
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Facebook's branch of Apache Thrift, including a new C++ server
 WWW=		https://github.com/facebook/fbthrift
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	compilation fails, see https://github.com/facebook/fbthrift/issues/623
 BROKEN_armv7=	compilation fails, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283484
 
 BUILD_DEPENDS=	range-v3>0:devel/range-v3
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libmvfst_state_machine.so:net/mvfst \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libxxhash.so:devel/xxhash \
 		libzstd.so:archivers/zstd
 
 USES=		bison cmake:testing compiler:c++17-lang ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	enable_tests
 
 CXXFLAGS+=	-fPIC # https://github.com/facebook/fbthrift/issues/399
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 post-install: # https://github.com/facebook/fbthrift/issues/393
 	@${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 
 do-test: # no 'test' target, contrary to what the documentation says, see https://github.com/facebook/fbthrift/issues/533
 	@cd ${TEST_WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.mk>
diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index 9db083e934c4..e7601e6e6dd8 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library developed and used at Facebook
 WWW=		https://github.com/facebook/folly
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_13=	compilation fails: use of undeclared identifier 'clearenv'
 BROKEN_i386=	error: use of undeclared identifier 'DCHECK': https://github.com/facebook/folly/issues/1168
 BROKEN_powerpc=		compilation fails: Big endian requires a redesigned table (assert in folly/detail/base64_detail/Base64SWAR.cpp:107)
 BROKEN_powerpc64=	compilation fails: Big endian requires a redesigned table (assert in folly/detail/base64_detail/Base64SWAR.cpp:107)
 
 BUILD_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 BUILD_DEPENDS+=	fast_float>0:math/fast_float
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfmt.so:devel/libfmt \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake compiler:c++17-lang cpe localbase ssl
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	facebook
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	FREEBSD_BUILD_EXAMPLES FREEBSD_FOLLY_USE_SYMBOLIZER # enabling symbolizer causes undefined symbol _r_debug, see https://github.com/facebook/folly/issues/1373
 #CMAKE_OFF+=	FOLLY_USE_JEMALLOC # Build fails with FOLLY_USE_JEMALLOC=OFF, see https://github.com/facebook/folly/issues/1893
 
 CXXFLAGS+=	-fPIC
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 CXXFLAGS_powerpc64=	-DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0
 
 do-test: # tests fail to compile, see https://github.com/facebook/folly/issues/2246
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=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/devel/icu-le-hb/Makefile b/devel/icu-le-hb/Makefile
index d8a3b0616b02..e4f169d608cf 100644
--- a/devel/icu-le-hb/Makefile
+++ b/devel/icu-le-hb/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	icu-le-hb
 PORTVERSION=	1.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel print
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	ICU Layout Engine API on top of HarfBuzz shaping library
 WWW=		https://www.freedesktop.org/wiki/Software/HarfBuzz/
 
 LICENSE=	ICU
 LICENSE_NAME=	ICU license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	behdad
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig
 USE_CXXSTD=	gnu++11
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 62deaae36da5..461720359c9e 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	libical
 DISTVERSION=	3.0.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libical/libical/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Implementation of the IETF Calendaring and Scheduling protocols
 WWW=		https://github.com/libical/libical
 
 LICENSE=	LGPL21 MPL20
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		cmake:testing compiler:c++11-lib cpe gnome pathfix perl5 \
 		pkgconfig
 CPE_VENDOR=	libical_project
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 DOCSDIR=	${PREFIX}/share/gtk-doc/html/libical-glib
 
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 CMAKE_TESTING_ON=	LIBICAL_BUILD_TESTING
 
 CMAKE_OFF=	LIBICAL_BUILD_TESTING
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB \
 		CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 
 OPTIONS_DEFINE=		DOCS GLIB INTROSPECTION VAPI
 OPTIONS_DEFAULT=	GLIB INTROSPECTION VAPI
 OPTIONS_SUB=		yes
 
 GLIB_DESC=		Build GLib bindings
 INTROSPECTION_DESC=	Build GObject Introspection
 
 DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
 DOCS_CMAKE_BOOL=	ICAL_BUILD_DOCS
 
 GLIB_USE=		GNOME=glib20,libxml2
 GLIB_CMAKE_BOOL=	ICAL_GLIB
 
 INTROSPECTION_USE=		gnome=introspection:build
 INTROSPECTION_CMAKE_BOOL=	GOBJECT_INTROSPECTION
 
 VAPI_USES=		vala:build
 VAPI_CMAKE_BOOL=	ICAL_GLIB_VAPI
 VAPI_IMPLIES=		INTROSPECTION
 
 .include <bsd.port.mk>
diff --git a/devel/libkiwix/Makefile b/devel/libkiwix/Makefile
index 466a94bd8d5a..cbcdcc08bdfb 100644
--- a/devel/libkiwix/Makefile
+++ b/devel/libkiwix/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	libkiwix
 DISTVERSION=	14.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://download.kiwix.org/release/libkiwix/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Software library to read and write ZIM files
 WWW=		https://github.com/kiwix/libkiwix
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # 'googletest' dependency is only necessary for Meson's 'test' target, but it
 # must be present as soon as configure time.
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
 		googletest>0:devel/googletest
 
 LIB_DEPENDS=	libzim.so:devel/libzim \
 		libpugixml.so:textproc/pugixml \
 		libaria2.so:www/aria2 \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libctpp2.so:textproc/ctpp2 \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		compiler:c++17-lang meson pkgconfig python shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	libkiwix13
 
 SHEBANG_FILES=	scripts/format_code.sh
 SHEBANG_REGEX=	./scripts/kiwix.*[^.].
 
 CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
 CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/libkiwix13/Makefile b/devel/libkiwix13/Makefile
index 0bd6d334a848..2a4186939d7a 100644
--- a/devel/libkiwix13/Makefile
+++ b/devel/libkiwix13/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	libkiwix
 DISTVERSION=	13.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	13
 MASTER_SITES=	https://download.kiwix.org/release/libkiwix/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Software library to read and write ZIM files, version 13
 WWW=		https://github.com/kiwix/libkiwix
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # 'googletest' dependency is only necessary for Meson's 'test' target, but it
 # must be present as soon as configure time.
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
 		googletest>0:devel/googletest
 
 LIB_DEPENDS=	libzim.so:devel/libzim \
 		libpugixml.so:textproc/pugixml \
 		libaria2.so:www/aria2 \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libctpp2.so:textproc/ctpp2 \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		compiler:c++17-lang meson pkgconfig python shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	libkiwix
 
 SHEBANG_FILES=	scripts/format_code.sh
 SHEBANG_REGEX=	./scripts/kiwix.*[^.].
 
 CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
 CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile
index fcf8d016185c..7d8be86c768f 100644
--- a/devel/libphonenumber/Makefile
+++ b/devel/libphonenumber/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	libphonenumber
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.13.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library for parsing, formatting, and validating phone numbers
 WWW=		https://github.com/google/libphonenumber
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	googletest>0:devel/googletest
 LIB_DEPENDS=	libabsl_strings.so:devel/abseil \
 		libboost_atomic.so:devel/boost-libs \
 		libicui18n.so:devel/icu \
 		libprotobuf.so:devel/protobuf
 
 USES=		cmake:noninja compiler:c++17-lang pkgconfig
 # Workaround CMAKE_ARGS+=-DABSL_PROPAGATE_CXX_STD:BOOL=ON not being set in the
 # devel/abseil Makefile. As of version 8.13.21, libphonenumber no longer sets
 # the C++ dialect and expects to inherit it from abseil.
 USE_CXXSTD=	c++17
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 CMAKE_ON=	USE_STD_MAP
 CMAKE_OFF=	REGENERATE_METADATA \
 		BUILD_TESTING
 
 WRKSRC_SUBDIR=	cpp
 
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB=	SHLIB_FULL=${PORTVERSION:R} SHLIB_SHORT=${PORTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
index 706590c9823a..073c4522d801 100644
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	libzim
 DISTVERSION=	9.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://download.openzim.org/release/libzim/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Reference implementation of the ZIM specification
 WWW=		https://wiki.openzim.org/wiki/Libzim
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # 'googletest' dependency is only necessary for Meson's 'test' target, but it
 # must be present as soon as configure time.
 BUILD_DEPENDS=	googletest>0:devel/googletest
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libzstd.so:archivers/zstd
 
 # Python is necessary for the build against Xapian and for Meson's 'test' target
 # as well, for which it must be present as soon as configure time.
 USES=		compiler:c++17-lang meson pkgconfig python:build tar:xz
 USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD:T} python3-config=${PYTHON_CMD:T}-config
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION} DISTMAJ=${DISTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index b8e616f0e255..ae6edd357d76 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	objecthash
 PORTVERSION=	20160802
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-language way to cryptographically hash JSON objects
 WWW=		https://github.com/benlaurie/objecthash
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libjson-c.so:devel/json-c
 
 USES=		pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	benlaurie
 GH_TAGNAME=	770874c
 
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	libobjecthash.so
 
 PLIST_FILES=	include/objecthash.h lib/libobjecthash.so
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/libobjecthash.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/objecthash.h ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 056dad71e57c..152bb856ffba 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	pyicu
 PORTVERSION=	2.13.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyICU-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python extension wrapping the ICU C++ API
 WWW=		https://gitlab.pyicu.org/main/pyicu
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libicudata.so:devel/icu
 
 USES=		compiler:c++17-lang pkgconfig python
 USE_PYTHON=	autoplist concurrent pep517
 
 WRKSRC=		${WRKDIR}/pyicu-${PORTVERSION}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index 3df6cee5c082..0fc8843d5980 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	core
 PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
 LIB_DEPENDS=	libdouble-conversion.so:devel/double-conversion \
 		libicui18n.so:devel/icu \
 		libpcre2-posix.so:devel/pcre2 \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++11-lang gnome perl5 qmake:no_env qt-dist:5,base
 USE_GNOME=	glib20
 USE_PERL5=	extract
 USE_QT=		qmake:build buildtools:build
 HAS_CONFIGURE=	yes
 # Disable (almost) everything to install minimal qconfig.h.
 # -no-feature-* adds QT_NO_* (for features which have no switch or
 # that need to be detected).
 CONFIGURE_ARGS=	-no-accessibility -no-gif -no-libpng -no-libjpeg \
 		-no-openssl -no-gui -no-widgets -no-cups \
 		-no-iconv -no-dbus -no-opengl \
 		-no-egl -no-evdev \
 		-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
 		-no-libudev -no-xcb -no-xcb-xlib \
 		-no-xkbcommon -no-libinput
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=	${WRKSRC}/src/corelib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 QT_BINARIES=	yes
 QT_DEFINES=	GLIB
 QT_CONFIG=	glib icu
 
 MORE_WRKSRCS=	src/tools/bootstrap src/corelib src/tools/qlalr
 
 post-configure:
 .for d in ${MORE_WRKSRCS}
 	${MKDIR} ${WRKSRC}/${d}
 	cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d}
 .endfor
 
 pre-build:
 .for d in ${MORE_WRKSRCS}
 	${MKDIR} ${WRKSRC}/${d}
 	cd ${WRKSRC}/${d} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 .endfor
 
 post-install:
 # Allow qconfig.h to be customized by single ports.
 	${AWK} 'BEGIN{print "#include <QtCore/qconfig-modules.h>"}{print}' \
 		${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h
 # Manually install qlalr
 	cd ${WRKSRC}/src/tools/qlalr && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} ${INSTALL_TARGET}
 # Cleanup qconfig.h and remove stray '#define QT_NO_FOO'
 	${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h
 	${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h
 
 .include <bsd.port.mk>
diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile
index 1523282d4425..5c8a04339f9f 100644
--- a/devel/qt6-5compat/Makefile
+++ b/devel/qt6-5compat/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	5compat
 DISTVERSION=	${QT6_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 6 module that contains unsupported Qt 5 APIs
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		cmake compiler:c++17-lang gl \
 		qt-dist:6
 USE_GL=		opengl
 USE_QT=		base declarative shadertools
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 .include <bsd.port.mk>
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index eed4343c3c3a..7341cc7be5e6 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -1,121 +1,121 @@
 PORTNAME=	base
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
 PATCH_SITES=	https://invent.kde.org/qt/qt/qtbase/-/commit/
 PATCHFILES+=	12d4bf1ab52748cb84894f50d437064b439e0b7d.patch:-p1
 PATCHFILES+=	2ef615228bba9a8eb282437bfb7472f925610e89.patch:-p1
 PATCHFILES+=	a43c7e58046604796aa69974ea1c5d3e2648c755.patch:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt base (core, gui, widgets, network,...)
 
 BUILD_DEPENDS=	xml:textproc/xmlstarlet \
 		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libatk-1.0.so:accessibility/at-spi2-core \
 		libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libb2.so:devel/libb2 \
 		libbrotlidec.so:archivers/brotli \
 		libdbus-1.so:devel/dbus \
 		libdouble-conversion.so:devel/double-conversion \
 		libdrm.so:graphics/libdrm \
 		libevdev.so:devel/libevdev \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicui18n.so:devel/icu \
 		libinput.so:x11/libinput \
 		libintl.so:devel/gettext-runtime \
 		libjpeg.so:graphics/jpeg-turbo \
 		libmtdev.so:devel/libmtdev \
 		libpcre2-16.so:devel/pcre2 \
 		libpng16.so:graphics/png \
 		libudev.so:devel/libudev-devd \
 		libvulkan.so:graphics/vulkan-loader \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \
 		qt-dist:6 shebangfix ssl
 USE_GL=		egl opengl
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 pango
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 USE_LOCALE=	C.UTF-8
 
 SHEBANG_FILES=	${WRKSRC}/libexec/qt-android-runner.py \
 		${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \
 		${WRKSRC}/mkspecs/features/uikit/devices.py \
 		${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \
 		${WRKSRC}/util/testrunner/qt-testrunner.py \
 		${WRKSRC}/util/testrunner/sanitizer-testrunner.py
 
 CMAKE_ARGS=	-DOPENSSL_ROOT_DIR="${OPENSSLBASE}"
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_LTTngUST \
 		QT_AVOID_CMAKE_ARCHIVING_API \
 		QT_FIND_ALL_PACKAGES_ALWAYS \
 		QT_FEATURE_openssl_linked
 CMAKE_OFF=	QT_FEATURE_eglfs \
 		QT_FEATURE_gssapi
 # sql drivers are handled in the databases/qt6-base_sqldriver port
 CMAKE_OFF+=	FEATURE_sql_mysql \
 		FEATURE_sql_odbc \
 		FEATURE_sql_psql \
 		FEATURE_sql_sqlite
 
 # zstd from base fails to compress files during the build (error 11: unsupported argument)
 BINARY_ALIAS=	zstd=${LOCALBASE}/bin/zstd
 
 OPTIONS_DEFINE=		CUPS X11
 OPTIONS_DEFAULT=	CUPS X11
 OPTIONS_SUB=		yes
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	FEATURE_cups
 
 X11_LIB_DEPENDS=	libxcb-cursor.so:x11/xcb-util-cursor \
 			libxcb-icccm.so:x11/xcb-util-wm \
 			libxcb-image.so:x11/xcb-util-image \
 			libxcb-keysyms.so:x11/xcb-util-keysyms \
 			libxcb-render-util.so:x11/xcb-util-renderutil
 X11_USES=		xorg
 X11_USE=		XORG=ice,pixman,sm,x11,xau,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xi,xinerama,xrandr,xrender
 X11_CMAKE_BOOL=		FEATURE_xcb \
 			FEATURE_xlib
 
 .include <bsd.port.pre.mk>
 
 # LibreSSL does not currently support BIO_ADDR in DTLSv1_listen()
 .if ${SSL_DEFAULT:Mlibressl*}
 CMAKE_OFF+=	QT_FEATURE_dtls
 PLIST_SUB+=	DTLS="@comment "
 .else
 PLIST_SUB+=	DTLS=""
 .endif
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
 BUILD_DEPENDS+=	as:devel/binutils
 CMAKE_ARGS+=	-DCMAKE_ASM_FLAGS=-no-integrated-as
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \
 		${WRKSRC}/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
 
 # TODO: do this cleaner -- somewhere cmake/qmake still creates empty directories
 # for the cmake files in INSTALL_PREFIX/lib/cmake
 post-install:
 	${RM} -vr ${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}/cmake
 	# Install symlinks for user-facing tools
 	${REINPLACE_CMD} -e "s#^#${STAGEDIR}#" -e "s# # ${STAGEDIR}#" \
 		${WRKDIR}/.build/user_facing_tool_links.txt
 	while read t; do \
 		${RLN} $$t; \
 	done <${WRKDIR}/.build/user_facing_tool_links.txt
 
 .include <bsd.port.post.mk>
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 5e4a3caeb2a4..b4fb8e846356 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	tclxml
 PORTVERSION=	3.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel tcl
 MASTER_SITES=	LOCAL/bf SF/tclxml/TclXML/${PORTVERSION}
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	API for parsing XML documents using Tcl
 WWW=		https://tclxml.sourceforge.net/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu libxslt.so:textproc/libxslt
 RUN_DEPENDS?=	dtplite:devel/tcllib
 
 USES=		gnome tar:xz tcl:tea
 
 TCL_PKG=	Tclxml${PORTVERSION}
 USE_GNOME=	libxml2
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
 CONFIGURE_ARGS+=XML_CONFIG="${XML_CONFIG}"
 
 MAKE_ENV+=	TCLLIBPATH=${STAGEDIR}/${PREFIX}/lib
 
 TEST_TARGET=	test
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 PORTDOCS=	README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \
 		tcldom.html tcldom.xml tclxml.css tclxml.html tclxml.xml \
 		tclxslt.html tclxslt.xml transform.tcl txt.xsl
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^TCLSH_ENV[[:blank:]]*=/,/[^\]$$/d' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/g' \
 		${WRKSRC}/configure
 
 post-install:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} doc)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/ticcutils/Makefile b/devel/ticcutils/Makefile
index a3c3982f9d95..2c0978a21bb4 100644
--- a/devel/ticcutils/Makefile
+++ b/devel/ticcutils/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	ticcutils
 DISTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	devel textproc
 MASTER_SITES=	https://github.com/LanguageMachines/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Generic utility library shared by the Tilburg University software
 WWW=		https://github.com/LanguageMachines/ticcutils
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=		compiler:c++17-lang gmake gnome libtool localbase:ldflags \
 		pathfix pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 USE_CXXSTD=	c++17
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--disable-static
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check # 1 test fails, see https://github.com/LanguageMachines/ticcutils/issues/26
 TEST_ENV=	LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3||g' \
 		${PATCH_WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index 5eaf42f27196..f6e78854cf4c 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	libpsl
 PORTVERSION=	0.21.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library to handle the Public Suffix List
 WWW=		https://github.com/rockdaboot/libpsl
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 
 USES=		localbase:ldflags meson pkgconfig python:build shebangfix tar:lz
 
 MESON_ARGS=	--default-library=both \
 		-Dbuiltin=true \
 		-Ddocs=false \
 		-Dpsl_file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \
 		-Dpsl_testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt
 USE_LDCONFIG=	yes
 USE_LOCALE=	en_US.UTF-8
 
 SHEBANG_FILES=	src/psl-make-dafsa
 TEST_TARGET=	test
 
 OPTIONS_SINGLE=	IDNA
 OPTIONS_SINGLE_IDNA=	ICU IDN IDN2
 OPTIONS_DEFAULT=IDN2
 ICU_DESC=	Use devel/icu (IDNA2008 UTS\#46 library)
 IDN_DESC=	Use dns/libidn (IDNA2003 library)
 IDN2_DESC=	Use dns/libidn2 (IDNA2008 library)
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_MESON_ON=		-Druntime=libicu
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn \
 			libunistring.so:devel/libunistring
 IDN_MESON_ON=		-Druntime=libidn
 IDN_USES=		iconv
 IDN2_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
 			libunistring.so:devel/libunistring
 IDN2_MESON_ON=		-Druntime=libidn2
 IDN2_USES=		iconv
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/psl-make-dafsa ${STAGEDIR}${PREFIX}/share/man/man1/psl-make-dafsa.1
 
 .include <bsd.port.mk>
diff --git a/editors/gnome-text-editor/Makefile b/editors/gnome-text-editor/Makefile
index 9c92cd9bdfe8..88cb5efe2a77 100644
--- a/editors/gnome-text-editor/Makefile
+++ b/editors/gnome-text-editor/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	gnome-text-editor
 PORTVERSION=	42.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Small but powerful text editor for the GNOME Desktop Environment
 WWW=		https://gitlab.gnome.org/GNOME/gnome-text-editor
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool>0:textproc/itstool
 LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libicudata.so:devel/icu \
 		libpcre.so:devel/pcre
 
 USES=		compiler:c11 desktop-file-utils gettext gnome localbase meson \
 		pkgconfig tar:xz
 USE_CSTD=	c11
 USE_GNOME=	cairo gtk40 gtksourceview5 libadwaita
 GLIB_SCHEMAS=	org.gnome.TextEditor.gschema.xml
 
 PORTSCOUT=	limitw:1,even
 
 .include <bsd.port.mk>
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 180b4b1acd22..27d46383f552 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,435 +1,435 @@
-PORTREVISION=	1
+PORTREVISION=	2
 
 .include "${.CURDIR}/Makefile.common"
 
 MASTER_SITES=	https://download.documentfoundation.org/libreoffice/src/${LOVERSION}/ \
 		https://dev-www.libreoffice.org/src/:src \
 		https://dev-www.libreoffice.org/extern/:ext
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${DISTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	libreoffice
 EXTRACT_ONLY:=	${DISTFILES}
 
 COMMENT=	Full integrated office productivity suite
 WWW?=		https://www.libreoffice.org/
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		zip:archivers/zip \
 		pigz:archivers/pigz \
 		${LOCALBASE}/include/sqlext.h:databases/unixODBC \
 		cppunit-config:devel/cppunit \
 		dmake:devel/dmake \
 		gperf>=3.1:devel/gperf \
 		${LOCALBASE}/include/libcuckoo/cuckoohash_map.hh:devel/libcuckoo \
 		mdds>=2.1:devel/mdds \
 		gpatch:devel/patch \
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
 		vigra-config:graphics/vigra \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		bash:shells/bash \
 		gsed:textproc/gsed \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		coreutils>=8.23:sysutils/coreutils \
 		flex>=0.26:textproc/flex
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_date_time.so:devel/boost-libs \
 		libbox2d.so:misc/box2d \
 		libicutu.so:devel/icu \
 		liblangtag.so:devel/liblangtag \
 		libltdl.so:devel/libltdl \
 		liborcus-0.18.so:devel/liborcus \
 		libplds4.so:devel/nspr \
 		libcurl.so:ftp/curl \
 		libgraphite2.so:graphics/graphite2 \
 		liblcms2.so:graphics/lcms2 \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libepoxy.so:graphics/libepoxy \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libzmf-0.0.so:graphics/libzmf \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		liblpsolve55.so:math/lp_solve \
 		libcmis-0.6.so:net/libcmis \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libmspub-0.1.so:print/libmspub01 \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libassuan.so:security/libassuan \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
 		libargon2.so:security/libargon2 \
 		libgpg-error.so:security/libgpg-error \
 		libnss3.so:security/nss \
 		libxmlsec1-nss.so:security/xmlsec1 \
 		libclucene-core.so:textproc/clucene \
 		libexpat.so:textproc/expat2 \
 		libhunspell-1.7.so:textproc/hunspell \
 		libhyphen.so:textproc/hyphen \
 		libabw-0.1.so:textproc/libabw \
 		libe-book-0.1.so:textproc/libe-book \
 		libepubgen-0.1.so:textproc/libepubgen \
 		libexttextcat-2.0.so:textproc/libexttextcat \
 		libmwaw-0.3.so:textproc/libmwaw03 \
 		libnumbertext-1.0.so:textproc/libnumbertext \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		libqxp-0.0.so:textproc/libqxp \
 		librevenge-0.0.so:textproc/librevenge \
 		libstaroffice-0.0.so:textproc/libstaroffice \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwps-0.4.so:textproc/libwps \
 		libmythes-1.2.so:textproc/mythes \
 		libraptor2.so:textproc/raptor2 \
 		librdf.so:textproc/redland \
 		libZXing.so:textproc/zxing-cpp \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libserf-1.so:www/serf
 LIB_DEPENDS+=	${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/twemoji-color-font-ttf/TwitterColorEmoji-SVGinOT.ttf:x11-fonts/twemoji-color-font-ttf \
 		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \
 		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
 		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
 
 DISTFILES+=	f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:ext
 DISTFILES+=	dtoa-20180411.tgz:src
 DISTFILES+=	dragonbox-1.1.3.tar.gz:src
 DISTFILES+=	frozen-1.2.0.tar.gz:src
 DISTFILES+=	skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz:src
 DISTFILES+=	zxcvbn-c-2.5.tar.gz:src
 
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
 
 .if defined(PRERELEASE)
 MASTER_SITES+=	https://dev-builds.libreoffice.org/pre-releases/src/
 .endif
 
 CONFLICTS_INSTALL=	libreoffice6
 
 INSTALL_TARGET=	distro-pack-install
 
 SHEBANG_GLOB=	*.py
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		autoreconf:build bison compiler:c++20-lang cpe desktop-file-utils \
 		gettext gl gmake gnome jpeg ldap localbase:ldflags perl5 pkgconfig \
 		python shebangfix shared-mime-info ssl tar:xz xorg
 USE_GL=		gl glew glu
 USE_GNOME=	cairo glib20 libxml2 libxslt
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xaw xcb xext xinerama xrandr xrender
 
 USES+=		elfctl
 ELF_FEATURES=	+wxneeded:instdir/program/soffice.bin
 
 OPTIONS_DEFINE=	COINMP CUPS DOCS GNOME GTK3 GTK4 JAVA LTO MMEDIA PDFIUM PGSQL MARIADB SDK TEST WEBDAV
 OPTIONS_RADIO=	QT KDE
 OPTIONS_RADIO_QT=	QT5 QT6
 OPTIONS_RADIO_KDE=	KF5 KF6
 OPTIONS_DEFAULT=	CUPS DOCS JAVA MMEDIA PDFIUM QT5
 #OPTIONS_EXCLUDE=	GTK4
 
 COINMP_DESC=	Enable CoinMP (deprecated) math solver
 GTK4_DESC=	GTK+ 4 GUI toolkit support (experimental, broken)
 JAVA_DESC=	Add Java support (XML filters, macros, DB connections)
 KF5_DESC=	KF5/Qt5 GUI toolkit support (implies QT5)
 KF6_DESC=	KF6/Qt6 GUI toolkit support (implies QT6)
 MMEDIA_DESC=	Enable multimedia backend for Impress
 PDFIUM_DESC=	Enable PDFium secure engine
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
 MARIADB_DESC=	Build with MariaDB/MySQL-SDBC driver
 QT_DESC=	Select Qt GUI engine version
 KDE_DESC=	Select KDE GUI engine version
 QT5_DESC=	Qt5 GUI toolkit support (default visual style)
 QT6_DESC=	Qt6 GUI toolkit support (experimental visual style)
 SDK_DESC=	Build with SDK
 TEST_DESC=	Run all regression tests
 WEBDAV_DESC=	Enable WebDAV protocol
 
 COINMP_CONFIGURE_ENABLE=	coinmp
 COINMP_CONFIGURE_ON=	--with-system-coinmp
 COINMP_LIB_DEPENDS=	libCoinMP.so:math/coinmp
 
 CUPS_CONFIGURE_ENABLE=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 DOCS_CONFIGURE_ON=	--with-help=html
 
 GNOME_CONFIGURE_ENABLE=	dbus dconf
 GNOME_IMPLIES=	GTK3
 GNOME_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=	GNOME=dconf
 
 GTK3_CONFIGURE_ENABLE=	gtk3
 GTK3_USE=	GNOME=gtk30
 
 GTK4_CONFIGURE_ENABLE=	gtk4
 GTK4_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 			libgraphene-1.0.so:graphics/graphene \
 			libharfbuzz.so:print/harfbuzz \
 			libvulkan.so:graphics/vulkan-loader
 GTK4_USE=	GNOME=gtk40
 
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant \
 			${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \
 			${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \
 			${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 			${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \
 			${JAVAJARDIR}/junit.jar:java/junit
 JAVA_CATEGORIES=	java
 JAVA_CONFIGURE_ON=	--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \
 			--with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \
 			--with-commons-lang-jar=${JAVAJARDIR}/commons-lang3.jar \
 			--with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \
 			--with-jdk-home="${JAVA_HOME}" \
 			--with-junit=${JAVAJARDIR}/junit.jar \
 			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar \
 			--with-system-jars \
 			--without-system-beanshell \
 			--without-system-java-websocket \
 			--without-system-jfreereport \
 			--without-system-rhino
 JAVA_CONFIGURE_WITH=	java
 # XXX jni.h from GNU classpath causes ABI conflicts.
 JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
 JAVA_DISTFILES=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
 		35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \
 		39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \
 		3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \
 		8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \
 		8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \
 		97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \
 		a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \
 		ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \
 		ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \
 		d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
 		db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src \
 		Java-WebSocket-1.6.0.tar.gz:src \
 		bsh-2.1.1-src.zip:src \
 		rhino-1.7.15.zip:src
 JAVA_USES=	java
 JAVA_VARS=	JAVA_VERSION=17+
 
 KF5_CONFIGURE_ENABLE=	kf5
 KF5_USE=	kde=config,coreaddons,i18n,kio,windowsystem
 KF5_USES=	kde:5
 KF5_IMPLIES=	QT5
 KF5_PREVENTS=	KF6
 KF5_PREVENTS_MSG=	KF5 cannot coexist with KF6
 
 KF6_CONFIGURE_ENABLE=	kf6
 KF6_USE=	kde=config,coreaddons,i18n,kio,windowsystem
 KF6_USES=	kde:6
 KF6_IMPLIES=	QT6
 KF6_PREVENTS=	KF5
 KF6_PREVENTS_MSG=	KF6 cannot coexist with KF5
 
 LTO_CONFIGURE_ENABLE=	lto
 
 MMEDIA_USES=		gstreamer
 MMEDIA_CONFIGURE_ENABLE=	gstreamer-1-0
 
 PDFIUM_CONFIGURE_ENABLE=	pdfium
 PDFIUM_DISTFILES=	pdfium-6764.tar.bz2:src
 PDFIUM_LIB_DEPENDS=	libabsl_strings.so:devel/abseil \
 			libopenjp2.so:graphics/openjpeg
 
 PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 PGSQL_USES=	pgsql
 
 MARIADB_CONFIGURE_ENABLE=	mariadb-sdbc
 MARIADB_USES=	mysql:client
 
 QT5_CONFIGURE_ENABLE=	qt5
 QT5_PREVENTS=	KF6
 QT5_PREVENTS_MSG=	KF6 support require Qt6 engine
 QT5_USE=	qt=buildtools:build,core,gui,network,qmake:build,widgets,x11extras
 QT5_USES=	qt:5
 
 QT6_CONFIGURE_ENABLE=	qt6
 QT6_CONFIGURE_ENV=	QMAKE6=${QMAKE} MOC6=${MOC} PATH="${QT_TOOLDIR}:${PATH}"
 QT6_PREVENTS=	KF5
 QT6_PREVENTS_MSG=	KF5 support require Qt5 engine
 QT6_USE=	qt=base,declarative,multimedia,tools:build
 QT6_USES=	qt:6
 
 SDK_BUILD_DEPENDS=	doxygen:devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_OFF=	--without-doxygen
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
 SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
 
 TEST_ALL_TARGET=	build
 TEST_ALL_TARGET_OFF=	build
 TEST_CONFIGURE_ENABLE=	cve-tests
 
 WEBDAV_CONFIGURE_ON=	--with-webdav=neon
 WEBDAV_CONFIGURE_OFF=	--with-webdav=no
 WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-firebird-sdbc \
 		--disable-mergelibs \
 		--disable-online-update \
 		--enable-cairo-canvas \
 		--enable-python=system \
 		--enable-release-build \
 		--enable-extension-integration \
 		--disable-mpl-subset \
 		--exec-prefix=${PREFIX} \
 		--with-boost=${LOCALBASE} \
 		--with-build-version="FreeBSD ports ${PKGVERSION}" \
 		--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 		--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 		--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 		--with-external-thes-dir=${LOCALBASE}/share/mythes \
 		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
 		--with-os-version=${OSVERSION} \
 		--with-parallelism=${MAKE_JOBS_NUMBER} \
 		--with-system-abseil \
 		--with-system-argon2 \
 		--with-system-cppunit \
 		--with-system-cuckoo \
 		--with-system-curl \
 		--with-system-dicts \
 		--with-system-dragonbox=no \
 		--with-system-frozen=no \
 		--with-system-gpgmepp \
 		--with-system-libfixmath=no \
 		--with-system-libs \
 		--with-system-libtiff \
 		--with-system-libxml \
 		--with-system-mdds \
 		--with-system-nss \
 		--with-system-openjpeg \
 		--with-system-orcus \
 		--with-system-zlib \
 		--with-system-zxcvbn=no \
 		--with-system-zxing \
 		--with-tls=nss \
 		--with-vendor="FreeBSD ports" \
 		--without-fonts \
 		--without-myspell-dicts
 
 CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
 		FLEX=${LOCALBASE}/bin/flex \
 		CONFIG_SHELL=${LOCALBASE}/bin/bash \
 		GNUTAR="${TAR}" \
 		GPERF=${LOCALBASE}/bin/gperf \
 		ICU_CFLAGS="`icu-config --cflags`" \
 		ICU_LIBS="`icu-config --ldflags`" \
 		PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 		PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \
 		ZXING_CFLAGS="-I${LOCALBASE}/include/ZXing \
 		CPLUS_INCLUDE_PATH="-I${LOCALBASE}/include \
 		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 
 CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
 MAKE_SHELL=		${LOCALBASE}/bin/bash
 
 MAKE_ARGS+=	TMPDIR=${WRKDIR}
 MAKE_ENV+=	CXXFLAGS_WARN="${CXXFLAGS_WARN}"
 MAKE_ENV+=	GNUSED=${LOCALBASE}/bin/gsed
 MAKE_ENV+=	DISPLAY=
 MAKE_ENV+=	verbose=1
 
 BINARY_ALIAS=	sed=gsed
 
 PIE_UNSAFE=	yes
 #MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( \
     (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
 BROKEN=	please update FreeBSD base system first to fix an ABI incompatibility
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-skia
 .endif
 
 .if ${PORT_OPTIONS:MGTK3} && ${PORT_OPTIONS:MKF5}
 CONFIGURE_ARGS+=	--enable-gtk3-kde5
 .endif
 
 .if ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130
 LLVM_DEFAULT=	13
 CPP=	${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CXX=	${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LLD_UNSAFE=	yes
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-c++11-narrowing \
 		-Wno-unused-parameter -Wno-unused-local-typedefs
 .else
 CXXFLAGS_WARN=	-Wshadow -Woverloaded-virtual
 .endif
 
 LDFLAGS+=	-Wl,--undefined-version
 
 post-patch:
 .if ${COMPILER_FEATURES:Mlibstdc++}
 	${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk
 .endif
 	${CP} ${FILESDIR}/powerpc64le-skia.patch.0 ${WRKSRC}/external/skia/
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/autogen.lastrun
 
 post-configure:
 	@${TOUCH} ${WRKSRC}/src.downloaded
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s lib/libreoffice -type d -empty \
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s bin lib -not -type d >> ${TMPPLIST}
 .for subdir in applications bash-completion icons man metainfo mime
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
 .endfor
 
 post-install-SDK-on:
 .for subdir in share share/doc
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s ${subdir}/libreoffice -type d -empty \
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 .endfor
 .for subdir in include share share/doc
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 21bf1f4393ea..e022cd5582c1 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	poedit
 DISTVERSION=	3.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/vslavik/${PORTNAME}/releases/download/v${DISTVERSION}-oss/
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Gettext catalogs (.po files) editor
 WWW=		https://www.poedit.net/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	zip:archivers/zip
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libenchant-2.so:textproc/enchant2 \
 		libgtkspell3-3.so:textproc/gtkspell3 \
 		libharfbuzz.so:print/harfbuzz \
 		libicui18n.so:devel/icu \
 		liblucene++.so:textproc/luceneplusplus
 
 USES=				desktop-file-utils gettext-tools:build,run \
 				gmake gnome pkgconfig
 USE_GNOME=			cairo gdkpixbuf2 glib20 gtk30 pango
 USE_WX=				3.2
 WX_CONF_ARGS=			absolute
 GNU_CONFIGURE=			yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 8f9beb6f9db9..6ecda8502e88 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,322 +1,322 @@
 PORTNAME=	vscode
 DISTVERSION=	1.96.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules
 DISTFILES=	vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \
 		vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:node_modules
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Visual Studio Code - Open Source ("Code - OSS")
 WWW=		https://code.visualstudio.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64
 
 EXTRACT_DEPENDS=jq:textproc/jq \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION}
 BUILD_DEPENDS=	zip:archivers/zip \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		jq:textproc/jq \
 		rg:textproc/ripgrep \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libasound.so:audio/alsa-lib \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libsndio.so:audio/sndio \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libinotify.so:devel/libinotify \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libpcre2-8.so:devel/pcre2 \
 		libre2.so:devel/re2 \
 		liblcms2.so:graphics/lcms2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libvpx.so:multimedia/libvpx \
 		libopenh264.so:multimedia/openh264 \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libkrb5.so.3:security/krb5 \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		bash:shells/bash
 TEST_DEPENDS=	electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		bash:shells/bash
 
 USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 		localbase:ldflags nodejs:20,build pkgconfig python:build \
 		shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
 SOURCE_COMMIT_HASH=	cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xtst
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 
 SHEBANG_REGEX=	./(extensions|node_modules|resources|scripts|src)/.*\.sh$$
 PATHFIX_FILES=	src/vs/workbench/contrib/debug/node/terminals.ts
 
 DATADIR=	${PREFIX}/share/code-oss
 TMPDIR=		${WRKDIR}
 BUNDLE_LIBS=	yes
 
 MAKE_ENV+=	BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH}
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 # Don't download browser binaries on playwright node_modules installation
 MAKE_ENV+=	PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \
 		PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 NODEJS_DIR=	${.CURDIR:H:H}/www/node20
 .include "${NODEJS_DIR}/Makefile.version"
 ELECTRON_DIR=	${.CURDIR:H:H}/devel/electron32
 .include "${ELECTRON_DIR}/Makefile.version"
 
 ELECTRON_DOWNLOAD_URL=	https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
 ELECTRON_DOWNLOAD_URL_HASH!=	/sbin/sha256 -q -s ${ELECTRON_DOWNLOAD_URL}
 ELECTRON_ARCH=		${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/}
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be"
 	@${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}."
 	@${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following"
 	@${ECHO_MSG} "line to poudriere.conf:"
 	@${ECHO_MSG} "MAX_FILES_${PORTNAME}=8192"
 	@${ECHO_MSG} ""
 
 post-extract:
 	@${CP} ${WRKSRC}/build/.moduleignore.linux \
 		${WRKSRC}/build/.moduleignore.freebsd
 	@${ECHO_MSG} "===>  Installing node modules in ${WRKSRC}"
 	@${TAR} -xzf ${WRKDIR}/vscode-.-node-modules${EXTRACT_SUFX} -C ${WRKSRC}
 	@for dir in `node -p "JSON.stringify(require('${WRKSRC}/build/npm/dirs').dirs)" | jq -r '.[]'`; do \
 		if [ -f ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} ]; then \
 			${ECHO_MSG} "===>  Installing node modules in ${WRKSRC}/$${dir}"; \
 			${TAR} -xzf ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} -C ${WRKSRC}/$${dir}; \
 		fi; \
 	done
 
 post-patch:
 	@${REINPLACE_CMD} -E 's|^(target=").*(")$$|\1${ELECTRON_VER}\2|' \
 		${WRKSRC}/.npmrc
 	@${REINPLACE_CMD} -E 's|^(target=").*(")$$|\1${NODEJS_PORTVERSION}\2|' \
 		${WRKSRC}/remote/.npmrc
 	@(cd ${WRKSRC} && \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	@(cd ${WRKSRC} && \
 		${FIND} ${PATHFIX_FILES} -type f \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	@${REINPLACE_CMD} -e 's/@@NAME_LONG@@/Code - OSS/; \
 			s/@@NAME_SHORT@@/Code - OSS/; \
 			s/@@PRODNAME@@/Code - OSS/; \
 			s/@@NAME@@/code-oss/g; \
 			s|@@EXEC@@|${PREFIX}/bin/code-oss|; \
 			s/@@ICON@@/com.visualstudio.code.oss/; \
 			s/@@URLPROTOCOL@@/code-oss/; \
 			s/@@LICENSE@@/MIT/; \
 			s/@@APPNAME@@/code-oss/g; \
 			s|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/resources/completions/bash/code \
 		${WRKSRC}/resources/completions/zsh/_code \
 		${WRKSRC}/resources/linux/bin/code.sh \
 		${WRKSRC}/resources/linux/code.appdata.xml \
 		${WRKSRC}/resources/linux/code.desktop \
 		${WRKSRC}/resources/linux/code-url-handler.desktop
 	@(cd ${WRKDIR}/builtInExtensions && \
 		${FIND} . -type f -name '*.sh' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" \
 					-e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} ';')
 
 pre-build:
 # rebuild native node modules in top directory
 	@for subdir in `${FIND} ${WRKSRC}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';'`; do \
 		${ECHO_MSG} "===>   Rebuilding native modules in $${subdir}"; \
 		cd $${subdir} && \
 		${SETENV} ${MAKE_ENV} \
 			npm_config_runtime=electron \
 			npm_config_target=${ELECTRON_VER} \
 			npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 			node-gyp --userconfig=${WRKSRC}/.npmrc rebuild; \
 	done
 # rebuild native node modules in subdirectories
 	@for dir in `node -p "JSON.stringify(require('${WRKSRC}/build/npm/dirs').dirs)" | jq -r '.[]'`; do \
 		for subdir in `${FIND} ${WRKSRC}/$${dir}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';' 2> /dev/null`; do \
 			${ECHO_MSG} "===>   Rebuilding native modules in $${subdir}"; \
 			if [ "`${ECHO_CMD} $${subdir} | ${GREP} /build/`" ]; then \
 				cd $${subdir} && \
 				${SETENV} ${MAKE_ENV} \
 					npm_config_runtime=node \
 					npm_config_target=${NODEJS_PORTVERSION} \
 					npm_config_nodedir=${LOCALBASE} \
 					node-gyp --userconfig=${WRKSRC}/build/.npmrc rebuild; \
 			elif [ "`${ECHO_CMD} $${subdir} | ${GREP} /remote/`" ]; then \
 				cd $${subdir} && \
 				${SETENV} ${MAKE_ENV} \
 					npm_config_runtime=node \
 					npm_config_target=${NODEJS_PORTVERSION} \
 					npm_config_nodedir=${LOCALBASE} \
 					node-gyp --userconfig=${WRKSRC}/remote/.npmrc rebuild; \
 			else \
 				cd $${subdir} && \
 				${SETENV} ${MAKE_ENV} \
 					npm_config_runtime=electron \
 					npm_config_target=${ELECTRON_VER} \
 					npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 					node-gyp --userconfig=${WRKSRC}/.npmrc rebuild; \
 			fi; \
 		done; \
 	done
 # copy rg binary file to @vscode/ripgrep node module directory
 	@${MKDIR} ${WRKSRC}/node_modules/@vscode/ripgrep/bin
 	@${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/@vscode/ripgrep/bin
 	@${MKDIR} ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin
 	@${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin
 
 do-build:
 # setup download cache for gulp-atom-electron
 	@${MKDIR} ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}
 	@cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		zip -q -r ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}/electron-v${ELECTRON_VER}-linux-${ELECTRON_ARCH}.zip .
 	@cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' > SHASUMS256.txt
 # add newline character at the end of the file if not already
 	@${AWK} '1' ${WRKSRC}/build/checksums/electron.txt > \
 		${WRKSRC}/build/checksums/electron.txt.new
 	@${MV} -f ${WRKSRC}/build/checksums/electron.txt.new \
 		${WRKSRC}/build/checksums/electron.txt
 	@cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt
 # remove backup files so that they are not included in the package
 	@${FIND} ${WRKSRC} -type f \( -name '*.orig' -o -name '*~' \) -delete
 # build and package vscode
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npx tsc -p build/tsconfig.build.json
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm_config_runtime=electron \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 		npm --userconfig=${WRKSRC}/.npmrc run gulp vscode-linux-${ELECTRON_ARCH}-min
 # move marketplace extensions
 	@${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH}/resources/app/extensions
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/code-oss
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/zsh/_code \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_code-oss
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/appdata/code-oss.appdata.xml
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 .for f in code.desktop code-url-handler.desktop
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/${f} \
 		${STAGEDIR}${PREFIX}/share/applications/${f:S/code/code-oss/}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -cf - -C ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} . | \
 		${TAR} -xf - -C ${STAGEDIR}${DATADIR}
 	@${FIND} ${STAGEDIR}${DATADIR}/resources/app -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD}
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	@${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	@${RM} -r ${STAGEDIR}${DATADIR}/gen
 	@${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	@${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 pre-test:
 # setup electron dependency for unit tests
 	@${MKDIR} ${WRKSRC}/.build/electron
 	@${TAR} -cf - -C ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} . | \
 		${TAR} -xf - -C ${WRKSRC}/.build/electron
 	@cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss
 
 do-test:
 # Note: Xvfb or something similar is necessary for headless testing
 # unit tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./scripts/test.sh || ${TRUE}
 # UI smoke tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} yarn smoketest
 
 build-remote-extension-host: configure pre-build
 # setup download cache for node
 	@${MKDIR} ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-${ELECTRON_ARCH}
 	@${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-${ELECTRON_ARCH}
 # build vscode remote extension host
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm_config_runtime=node \
 		npm_config_target=${NODEJS_PORTVERSION} \
 		npm_config_nodedir=${LOCALBASE} \
 		npm --userconfig=${WRKSRC}/remote/.npmrc run gulp vscode-reh-linux-${ELECTRON_ARCH}-min
 	@${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	${TAR} -cf - -C ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} . | \
 		${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	@${FIND} ${WRKDIR}/vscode-reh -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD}
 	${TAR} -czf ${WRKDIR}/vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz -C ${WRKDIR}/vscode-reh .
 	# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run gulp vscode-reh-web-linux-${ELECTRON_ARCH}-min
 
 ### targets for port maintainer(s)
 make-node-modules-archive: extract
 	@${ECHO_MSG} "===>  Fetching and installing node modules in ${WRKSRC}"
 	@cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} npm install --ignore-scripts --no-progress --no-audit --no-fund && \
 	${TAR} -czf ${WRKDIR}/vscode-.-node-modules${EXTRACT_SUFX} node_modules
 	@for dir in `node -p "JSON.stringify(require('${WRKSRC}/build/npm/dirs').dirs)" | jq -r '.[]'`; do \
 		cd ${WRKSRC}/$${dir} && \
 		${ECHO_MSG} "===>  Fetching and installing node modules in ${WRKSRC}/$${dir}" && \
 		${SETENV} ${MAKE_ENV} npm install --ignore-scripts --no-progress --no-audit --no-fund && \
 		if [ -d node_modules ]; then \
 			${TAR} -czf ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} node_modules; \
 		fi; \
 	done
 	@cd ${WRKDIR} && \
 	${TAR} -czf vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX} vscode-*-node-modules.tar.gz
 
 make-marketplace-exts-archive: extract
 	@${RM} -r ${WRKSRC}/.build/builtInExtensions
 	@cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} npm run download-builtin-extensions
 	@${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/.build builtInExtensions
 
 .include <bsd.port.mk>
diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile
index 2cd27fef5fc5..b8eaf08991f9 100644
--- a/emulators/es-de/Makefile
+++ b/emulators/es-de/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	es-de
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
 COMMENT=	Frontend for browsing and launching games
 WWW=		https://es-de.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${_BR_DEPENDS} \
 		${LOCALBASE}/include/CImg.h:graphics/cimg \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson \
 		${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libcurl.so:ftp/curl \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu \
 		libpoppler.so:graphics/poppler \
 		libpugixml.so:textproc/pugixml \
 		librlottie.so:graphics/rlottie
 RUN_DEPENDS=	${_BR_DEPENDS}
 
 USES=		cmake compiler:c++17-lang gl pkgconfig sdl
 USE_GITLAB=	yes
 GL_PROJECT=	emulationstation-de
 USE_GL=		opengl
 USE_SDL=	sdl2
 
 CMAKE_ARGS=	-DUTF8CPP_INCLUDE_DIR=${LOCALBASE}/include/utf8cpp
 CMAKE_ON=	VIDEO_HW_DECODING
 
 OPTIONS_DEFINE=		DEINIT DOCS NLS
 OPTIONS_DEFAULT=	DEINIT
 OPTIONS_SUB=		yes
 
 DEINIT_DESC=	Deinit frontend on emulator launch
 
 DEINIT_CMAKE_BOOL=	DEINIT_ON_LAUNCH
 
 NLS_USES=		gettext
 NLS_CMAKE_BOOL=		COMPILE_LOCALIZATIONS
 
 _BR_DEPENDS=	dejavu>0:x11-fonts/dejavu \
 		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
 		freefont-ttf>0:x11-fonts/freefont-ttf \
 		noto-emoji>0:x11-fonts/noto-emoji \
 		ubuntu-font>0:x11-fonts/ubuntu-font
 
 post-install:
 	${LN} -sf ${LOCALBASE}/share/fonts/Droid/DroidSansFallbackFull.ttf \
 		${STAGEDIR}${DATADIR}/resources/fonts
 	${LN} -sf ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${STAGEDIR}${DATADIR}/resources/fonts
 	${LN} -sf ${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf \
 		${STAGEDIR}${DATADIR}/resources/fonts
 	${LN} -sf ${LOCALBASE}/share/fonts/noto/NotoColorEmoji.ttf ${STAGEDIR}${DATADIR}/resources/fonts/NotoEmoji.ttf
 	${LN} -sf ${LOCALBASE}/share/fonts/ubuntu-font/Ubuntu-C.ttf ${STAGEDIR}${DATADIR}/resources/fonts
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/filesystems/darling-dmg/Makefile b/filesystems/darling-dmg/Makefile
index a965a7139c5c..d7b877d5b0d9 100644
--- a/filesystems/darling-dmg/Makefile
+++ b/filesystems/darling-dmg/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	darling-dmg
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	FUSE module for .dmg files (containing an HFS+ filesystem)
 WWW=		https://github.com/darlinghq/darling-dmg
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libxml2>0:textproc/libxml2
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		cmake fuse ssl
 USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	darlinghq
 GH_PROJECT=	darling-dmg
 GH_TAGNAME=	a36bf0c
 
 PLIST_FILES=	bin/darling-dmg \
 		lib/libdmg.so
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/filesystems/ltfs/Makefile b/filesystems/ltfs/Makefile
index 2ccec33484c7..28baf75674b1 100644
--- a/filesystems/ltfs/Makefile
+++ b/filesystems/ltfs/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	ltfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.7
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-10514
 CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Reference implementation of LTFS for stand-alone tape drive
 WWW=		https://github.com/LinearTapeFileSystem/ltfs
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		autoreconf compiler:c11 fuse gnome libtool:build pkgconfig \
 		python shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LinearTapeFileSystem
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	src/utils/ltfs_ordered_copy
 
 GNU_CONFIGURE=			yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CONFIGURE_ARGS+=	--enable-icu-6x
 
 #INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DEBUG SNMP
 OPTIONS_SUB=	yes
 
 DEBUG_DESC=	Build without optimization and extended debug flags
 SNMP_DESC=	SNMP trap support
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 DEBUG_CONFIGURE_OFF=	--enable-fast
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_USES=		perl5
 SNMP_CONFIGURE_ENABLE=	snmp
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/ltfs
 	@${RMDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 8b538c3ffc71..ad1bc823cc76 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,101 +1,101 @@
 PORTNAME=	gnucash
 PORTVERSION=	5.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
 PATCH_SITES=	https://github.com/Gnucash/gnucash/commit/
 PATCHFILES=	579eed1facc0f7834ea70b1a342ebca0f125d788.patch:-p1
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Quicken-like money and finance manager
 WWW=		https://www.gnucash.org/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	googletest>0:devel/googletest \
 		swig:devel/swig
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libharfbuzz.so:print/harfbuzz \
 		libicudata.so:devel/icu \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	p5-Finance-Quote>=0:finance/p5-Finance-Quote \
 		p5-JSON-Parse>=0:devel/p5-JSON-Parse \
 		p5-libwww>=0:www/p5-libwww \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
 
 USES=		cmake:insource compiler:c++17-lang cpe desktop-file-utils \
 		gettext-tools gnome guile:2.2,3.0,alias,conflicts localbase \
 		perl5 pkgconfig shebangfix tar:bzip2 xorg
 USE_XORG=	x11
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool libxml2 libxslt
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCOMPILE_GSCHEMAS=OFF \
 		-DENABLE_BINRELOC=OFF \
 		-DGNC_SHELL=/bin/sh
 SHEBANG_FILES=	common/gnc-test-env.pl
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 GLIB_SCHEMAS=	org.gnucash.GnuCash.deprecated.gschema.xml \
 		org.gnucash.GnuCash.dialogs.business.gschema.xml \
 		org.gnucash.GnuCash.dialogs.checkprinting.gschema.xml \
 		org.gnucash.GnuCash.dialogs.commodities.gschema.xml \
 		org.gnucash.GnuCash.dialogs.export.csv.gschema.xml \
 		org.gnucash.GnuCash.dialogs.gschema.xml \
 		org.gnucash.GnuCash.dialogs.import.csv.gschema.xml \
 		org.gnucash.GnuCash.dialogs.import.generic.gschema.xml \
 		org.gnucash.GnuCash.dialogs.import.qif.gschema.xml \
 		org.gnucash.GnuCash.dialogs.reconcile.gschema.xml \
 		org.gnucash.GnuCash.dialogs.sxs.gschema.xml \
 		org.gnucash.GnuCash.dialogs.totd.gschema.xml \
 		org.gnucash.GnuCash.general.finance-quote.gschema.xml \
 		org.gnucash.GnuCash.gschema.xml \
 		org.gnucash.GnuCash.history.gschema.xml \
 		org.gnucash.GnuCash.warnings.gschema.xml \
 		org.gnucash.GnuCash.window.pages.account.tree.gschema.xml \
 		org.gnucash.GnuCash.window.pages.gschema.xml
 
 OPTIONS_DEFINE=		AQBANKING DATABASE DOCS NLS OFX PYTHON
 OPTIONS_DEFAULT=	AQBANKING OFX PYTHON
 OPTIONS_SUB=		yes
 
 AQBANKING_DESC=	AqBanking support (HBCI/OpenHBCI)
 DATABASE_DESC=	Enable SQL database backends
 OFX_DESC=	OFX support
 
 AQBANKING_CMAKE_BOOL=	WITH_AQBANKING
 AQBANKING_LIB_DEPENDS=	libaqbanking.so:finance/aqbanking \
 			libgwengui-gtk3.so:devel/gwenhywfar-gtk3 \
 			libgwenhywfar.so:devel/gwenhywfar
 AQBANKING_VARS=		GLIB_SCHEMAS+="org.gnucash.GnuCash.dialogs.flicker.gschema.xml \
 			org.gnucash.GnuCash.dialogs.import.hbci.gschema.xml"
 
 DATABASE_CMAKE_BOOL=	WITH_SQL
 DATABASE_BUILD_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 DATABASE_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DATABASE_RUN_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 
 NLS_CMAKE_BOOL_OFF=	DISABLE_NLS
 NLS_USES=		gettext-runtime
 
 OFX_CMAKE_BOOL=		WITH_OFX
 OFX_LIB_DEPENDS=	libofx.so:finance/libofx
 OFX_VARS=		GLIB_SCHEMAS+=org.gnucash.GnuCash.dialogs.import.ofx.gschema.xml
 
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 PYTHON_USES=		python
 
 post-install-PYTHON-on:
 	@(cd ${STAGEDIR}${PREFIX} \
 		&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME})
 	@(cd ${STAGEDIR}${PREFIX} \
 		&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME})
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so
 
 .include <bsd.port.mk>
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 9dea4a8f3233..a2512606a473 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	0ad
 DISTVERSION=	0.27.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	https://releases.wildfiregames.com/
 DISTFILES=	${PORTNAME}-${DISTVERSION}-unix-build.tar.xz \
 		${PORTNAME}-${DISTVERSION}-unix-data.tar.xz
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Real-time strategy (RTS) game of ancient warfare
 WWW=		https://play0ad.com/
 
 BROKEN_aarch64=		fails to compile: no member named verifyHeapAccessDisassembly
 BROKEN_armv6=		fails to link: fatal error: conftest: Unknown error: -1
 BROKEN_armv7=		fails to link: fatal error: conftest: Unknown error: -1
 BROKEN_powerpc64=	fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no member named 'xt_tp'
 
 BUILD_DEPENDS=	${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		zip:archivers/zip \
 		cmake:devel/cmake-core
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libicui18n.so:devel/icu \
 		libpng16.so:graphics/png \
 		libvorbisfile.so:audio/libvorbis \
 		libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libgloox.so:net-im/gloox \
 		libminiupnpc.so:net/miniupnpc \
 		libenet.so:net/enet \
 		libsodium.so:security/libsodium \
 		libfmt.so:devel/libfmt \
 		libmozjs-115.so:lang/spidermonkey115
 
 USES=		compiler:c++11-lib desktop-file-utils dos2unix gmake gnome \
 		iconv openal:al perl5 pkgconfig python:3.9,build sdl tar:xz \
 		xorg
 USE_GNOME=	libxml2
 USE_GL=		gl
 USE_SDL=	sdl2
 USE_XORG=	x11 xcursor
 USE_PERL5=	build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/build/workspaces/gcc
 MAKE_ARGS=	config=release verbose=1
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 CFLAGS_i386=	-msse2
 BUNDLE_LIBS=	yes
 DOS2UNIX_REGEX=	.*\.([ch]p{0,2}|make)
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 USE_WX=		3.0+
 WX_COMPS=	wx:lib
 MAKE_ENV+=	JOBS=${_MAKE_JOBS}
 
 PORTDATA=	*
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@(cd ${WRKSRC}/libraries/source/nvtt && ${TAR} xf nvtt-28209.tar.xz)
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 			-e 's|%%CC%%|${CC}|' \
 		${WRKSRC}/build/premake/extern_libs5.lua
 .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} -e '1130,1530s/-rdynamic/-lssp_nonshared &/' \
 			-e '1112,1502s/"execinfo",/& "ssp_nonshared",/' \
 		${WRKSRC}/build/premake/premake5.lua
 .endif
 
 pre-build:
 	(cd ${WRKSRC}/libraries && ${SETENV} ${MAKE_ENV} ./build-source-libs.sh --with-system-mozjs -j ${_MAKE_JOBS})
 	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-mozjs --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad
 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	(cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
 	${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/binaries/data && ${COPYTREE_SHARE} "config l10n tests tools" ${STAGEDIR}${DATADIR})
 	${MKDIR} ${STAGEDIR}${DATADIR}/mods/public ${STAGEDIR}${DATADIR}/mods/mod
 	${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${STAGEDIR}${DATADIR}/mods/public --no-same-permissions
 	${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${STAGEDIR}${DATADIR}/mods/mod --no-same-permissions
 
 .include <bsd.port.post.mk>
diff --git a/games/an/Makefile b/games/an/Makefile
index 08f80ed684c3..c20a3719b176 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	an
 PORTVERSION=	1.2
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	games
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast anagram generator
 WWW=		https://packages.debian.org/unstable/games/an
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		gmake tar:xz
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man6/${PORTNAME}.6.gz
 
 .include <bsd.port.mk>
diff --git a/games/easyrpg-player/Makefile b/games/easyrpg-player/Makefile
index 8edb26c9a06a..1f9af9729ec8 100644
--- a/games/easyrpg-player/Makefile
+++ b/games/easyrpg-player/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	easyrpg-player
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	RPG Maker 2000/2003 and EasyRPG games interpreter
 WWW=		https://easyrpg.org/ \
 		https://github.com/EasyRPG/Player
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcf.so:games/liblcf \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libspeexdsp.so:audio/speexdsp \
 		libmpg123.so:audio/mpg123 \
 		libsndfile.so:audio/libsndfile \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libopusfile.so:audio/opusfile \
 		libopus.so:audio/opus \
 		libWildMidi.so:audio/wildmidi \
 		libxmp.so:audio/libxmp \
 		libfmt.so:devel/libfmt \
 		libasound.so:audio/alsa-lib \
 		libfluidsynth.so:audio/fluidsynth
 # these come from liblcf
 LIB_DEPENDS+=	libicui18n.so:devel/icu \
 		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EasyRPG
 GH_PROJECT=	Player
 
 USES=		cmake:insource compiler:c++14-lang localbase:ldflags pkgconfig \
 		sdl xorg
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git
 USE_XORG=	pixman
 USE_SDL=	sdl2
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
 
 post-patch-MANPAGES-off:
 	@${REINPLACE_CMD} -e '/find_program.*asciidoctor/ d' ${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/games/exult/Makefile b/games/exult/Makefile
index 5705ed816ed2..4cf40b8e12b3 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	exult
 DISTVERSION?=	1.10.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	games
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Engine for Ultima VII (BG, FOV, SI, SS)
 WWW=		http://exult.info
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:audio/libogg \
 		libpng16.so:graphics/png \
 		libvorbis.so:audio/libvorbis
 BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
 
 USES=		autoreconf compiler:c++17-lang gmake libtool localbase \
 		pkgconfig sdl xorg
 USE_GNOME=	cairo gdkpixbuf2
 USE_SDL=	sdl2
 USE_XORG=	x11 xext
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--enable-shared \
 		--with-icondir=${PREFIX}/share/pixmaps
 
 CONFLICTS_INSTALL=	exult-devel
 SUB_FILES=		pkg-message
 PLIST?=			${.CURDIR}/pkg-plist
 PORTDOCS=	*
 
 .if !defined(MASTERDIR)
 MASTER_SITES=	http://prdownloads.sourceforge.net/exult/
 .else
 USE_GITHUB=	yes
 .endif
 
 OPTIONS_DEFINE=		ALSA DEBUG DOCS FLUIDSYNTH GIMP STUDIO
 OPTIONS_DEFAULT=	STUDIO
 OPTIONS_SUB=		yes
 
 GIMP_DESC=	GIMP plugin support
 STUDIO_DESC=	Install Exult Studio
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 DEBUG_CONFIGURE_ON=	--with-debug=full \
 			--with-optimization=none
 DEBUG_CONFIGURE_OFF=	--with-debug=no
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ENABLE=	fluidsynth
 
 GIMP_LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libgegl-0.4.so:graphics/gegl \
 			libgegl-npd-0.4.so:graphics/gegl \
 			libgimp-2.0.so:graphics/gimp-app \
 			libharfbuzz.so:print/harfbuzz \
 			libjson-glib-1.0.so:devel/json-glib
 GIMP_USES=		gnome
 GIMP_USE=		GNOME=gtk20,pango
 
 GIMP_CONFIGURE_ENABLE=	gimp-plugin
 
 STUDIO_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz \
 			libicuuc.so:devel/icu
 STUDIO_USES=			gnome
 STUDIO_USE=			GNOME=gtk30
 STUDIO_CONFIGURE_ENABLE=	exult-studio exult-studio-support
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in FAQ NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/freeciv-nox11/Makefile b/games/freeciv-nox11/Makefile
index 378921c18ef9..426104bc205a 100644
--- a/games/freeciv-nox11/Makefile
+++ b/games/freeciv-nox11/Makefile
@@ -1,7 +1,8 @@
+PORTREVISION=	1
 PKGNAMESUFFIX=	-nox11
 
 MASTERDIR=	${.CURDIR}/../freeciv
 
 OPTIONS_EXCLUDE=	${OPTIONS_MULTI_UI}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 1648dba646b6..f4ef901df0be 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,113 +1,114 @@
 PORTNAME=	freeciv
 PORTVERSION=	3.1.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
 		http://files.freeciv.org/stable/
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 WWW=		https://www.freeciv.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libltdl.so:devel/libltdl
 
 USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gmake \
 		iconv:wchar_t libtool lua:53 pkgconfig readline shebangfix ssl tar:xz
 SHEBANG_FILES=	bootstrap/*.sh data/flags/convert* scripts/mapimg2anim \
 		scripts/setup_auth_server.sh translations/*.sh
 
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--disable-static \
 		--enable-aimodules \
 		--enable-client=${_FREECIV_CLIENT:ts,} \
 		--enable-fcdb=${_FREECIV_DB:ts,} \
 		--enable-fcmp=${_FREECIV_MP:U:S/^/cli /:ts,} \
 		--enable-mapimg=no \
 		--enable-shared
 
 LDFLAGS+=	-Wl,--as-needed ${ICONV_LIB}
 
 PORTDATA=	*
 
 OPTIONS_DEFINE=		DOCS IPV6  NLS
 OPTIONS_DEFAULT=	QT5 SQLITE3
 OPTIONS_MULTI=		DB UI
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
 OPTIONS_MULTI_UI=	GTK3 GTK4 QT5 SDL
 OPTIONS_SUB=		yes
 
 DB_DESC=	Database support
 UI_DESC=	GUI clients
 
 GTK3_USES=	gnome sdl
 GTK3_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk30,pango \
 		SDL=mixer2
 GTK3_VARS=	_FREECIV_CLIENT+=gtk3 \
 		_FREECIV_CLIENT+=gtk3.22 \
 		_FREECIV_MP+=gtk3
 
 GTK4_IMPLIES=	GTK3
 GTK4_USES=	gnome sdl
 GTK4_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk40,pango \
 		SDL=mixer2
 GTK4_VARS=	_FREECIV_CLIENT+=gtk4 \
 		_FREECIV_MP+=gtk4
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql-prefix=${LOCALBASE}
 MYSQL_VARS=		_FREECIV_DB+=mysql
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres-prefix=${LOCALBASE}
 PGSQL_VARS=		_FREECIV_DB+=postgres
 
 QT5_USES=		qt:5 sdl
 QT5_USE=		QT=core,gui,widgets,buildtools:build \
 			SDL=mixer2
 QT5_CONFIGURE_ON=	--with-qt5=yes \
 			--with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
 			--with-qt5-libs=${LOCALBASE}/${QT_LIBDIR_REL}
 QT5_CONFIGURE_ENABLE=	ruledit
 QT5_VARS=		_FREECIV_CLIENT+=qt \
 			_FREECIV_MP+=qt
 
 SDL_USES=	sdl
 SDL_USE=	SDL=gfx2,image2,mixer2,ttf2
 SDL_VARS=	_FREECIV_CLIENT+=sdl2
 
 SQLITE3_USES=	sqlite
 SQLITE3_VARS=	_FREECIV_DB+=sqlite3
 
 # Save OPTIONS_MULTI_UI value for later before the framework
 # does things with it.
 _FREECIV_CLIENTS:=	${OPTIONS_MULTI_UI}
 
 .include <bsd.port.pre.mk>
 
 .if ${_FREECIV_CLIENT:Uno} == no
 CONFLICTS=	freeciv
 PLIST_SUB+=	${_FREECIV_CLIENTS:S/$/="@comment "/} \
 		CLIENT="@comment "
 .else
 CONFLICTS=	freeciv-nox11
 PLIST_SUB+=	CLIENT=""
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreeciv*.so
 
 .include <bsd.port.post.mk>
diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
index 1ee02133065c..05fe1ec22c60 100644
--- a/games/liblcf/Makefile
+++ b/games/liblcf/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	liblcf
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Library to handle RPG Maker 2000/2003 and EasyRPG projects
 WWW=		https://easyrpg.org/ \
 		https://github.com/EasyRPG/liblcf
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libexpat.so:textproc/expat2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EasyRPG
 
 USES=		cmake compiler:c++14-lang pkgconfig shared-mime-info
 USE_LDCONFIG=	yes
 CMAKE_OFF=	LIBLCF_UPDATE_MIMEDB
 
 PORTDOCS=	AUTHORS.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 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/games/libretro-play/Makefile b/games/libretro-play/Makefile
index c39d89e913d5..eef6dd875733 100644
--- a/games/libretro-play/Makefile
+++ b/games/libretro-play/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	play
 PORTVERSION=	0.48
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 PKGNAMEPREFIX=	libretro-
 
 MAINTAINER=	rozhuk.im@gmail.com
 COMMENT=	Play! - PlayStation 2 Emulator
 WWW=		https://purei.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BROKEN_aarch64=	linker error: uunable to find library -lGLESv2
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		cmake ssl gl compiler:c++17-lang
 USE_GL=		egl gl glew glu
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++17
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jpd002 \
 		jpd002:codegen \
 		jpd002:libchdr \
 		jpd002:framework \
 		jpd002:dependencies \
 		gulrak:ghc_filesystem
 GH_PROJECT=	Play- \
 		Play--CodeGen:codegen \
 		libchdr:libchdr \
 		Play--Framework:framework \
 		Play-Dependencies:dependencies \
 		filesystem:ghc_filesystem
 GH_TAGNAME=	448bac159733c6799a451ac75a18ce04aff5e223:codegen \
 		532a3f60f75eec3454ff4e52cad8862afc40e65f:libchdr \
 		faa4c23a2e96ba42b6ff1438bf33f111295c55cf:framework \
 		636810ead6f1a3c8ee8006a3b9a698a81a0efbf6:dependencies \
 		2a8b380f8d4e77b389c42a194ab9c70d8e3a0f1e:ghc_filesystem
 GH_SUBDIR=	deps/CodeGen:codegen \
 		deps/libchdr:libchdr \
 		deps/Framework:framework \
 		deps/Dependencies:dependencies \
 		deps/Dependencies/ghc_filesystem:ghc_filesystem
 
 PLIST_FILES=	lib/libretro/play_libretro.so
 
 CMAKE_ON=	BUILD_LIBRETRO_CORE
 CMAKE_OFF=	BUILD_AOT_CACHE \
 		BUILD_PLAY \
 		BUILD_PSFPLAYER \
 		BUILD_TESTS \
 		USE_AOT_CACHE \
 		ENABLE_AMAZON_S3
 CMAKE_ARGS=	-DGIT_TAG=${GH_TAGNAME_DEFAULT} \
 		-DGIT_DESCRIBE_RESULT=0 \
 		-DOpenGL_GL_PREFERENCE="GLVND"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|execute_process(COMMAND git.*||g' \
 		${WRKSRC}/CMakeLists.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKDIR}/.build/Source/ui_libretro/play_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
 
 .include <bsd.port.mk>
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 209f9efe315a..975bd5612dd6 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	openmw
 DISTVERSIONPREFIX=	openmw-
 DISTVERSION=	0.48.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Unofficial open source engine reimplementation of the game Morrowind
 WWW=		https://openmw.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_15_aarch64=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276702
 BROKEN_FreeBSD_15_amd64=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276702
 
 LIB_DEPENDS=	libavcodec.so.60:multimedia/ffmpeg \
 		libboost_thread.so:devel/boost-libs \
 		libMyGUIEngine.so:x11-toolkits/mygui \
 		libBulletCollision.so:devel/bullet@double \
 		libosg.so:graphics/osg \
 		libRecast.so:graphics/recastnavigation \
 		libunshield.so:archivers/unshield \
 		liblz4.so:archivers/liblz4 \
 		libicui18n.so:devel/icu \
 		libyaml-cpp.so:devel/yaml-cpp
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gl luajit openal \
 		pkgconfig qt:5 sdl sqlite xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenMW
 USE_GL=		gl
 USE_QT=		core gui network opengl printsupport widgets buildtools:build \
 		qmake:build
 USE_SDL=	sdl2
 
 CMAKE_ARGS=	-DDESIRED_QT_VERSION=5 \
 		-DOPENMW_USE_SYSTEM_BULLET=ON \
 		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON \
 		-DGLOBAL_DATA_PATH="${PREFIX}/share" \
 		-DMORROWIND_DATA_FILES="${DATADIR}/data" \
 		-DOPENMW_RESOURCE_FILES="${DATADIR}/resources"
 
 # passed from openal to prevent linker errors
 LDFLAGS+=	-Wl,--as-needed
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_CMAKE_BOOL=	BUILD_DOCS
 DOCS_BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 DOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		python:build
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 # The following is actually meant for lld 15.0 and later, but the ports
 # framework does not support LINKER_TYPE and LINKER_VERSION yet.
 .if ${COMPILER_TYPE} == "clang"
 # Turn off checking of dynamic relocations, to avoid lld diagnostics about
 # possibly incorrect addend values.
 LDFLAGS_i386+=	-Wl,--no-check-dynamic-relocations
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.post.mk>
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index 82b6149125fb..dd9a59b0fca9 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	openrct2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.19.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.14/:sequence \
 		https://github.com/OpenRCT2/objects/releases/download/v1.5.1/:object \
 		https://github.com/OpenRCT2/OpenMusic/releases/download/v1.6/:openmsx \
 		https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/:opensfx
 DISTFILES=	title-sequences.zip:sequence \
 		objects.zip:object\
 		openmusic.zip:openmsx \
 		opensound.zip:opensfx
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open source re-implementation of RollerCoaster Tycoon 2
 WWW=		https://openrct2.io/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/licence.txt
 
 NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe
 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 \
 		libogg.so:audio/libogg
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gl \
 		localbase:ldflags pkgconfig sdl shared-mime-info ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenRCT2
 GH_PROJECT=	OpenRCT2
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_SDL=	sdl2
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${MKDIR} ${WRKSRC}/data/sequence
 	${MKDIR} ${WRKSRC}/data/object
 	${MKDIR} ${WRKSRC}/data/assetpack
 	${CP} ${WRKDIR}/*.parkseq ${WRKSRC}/data/sequence/
 	${CP} -r ${WRKDIR}/official ${WRKDIR}/rct1 ${WRKDIR}/rct2 \
 		${WRKDIR}/rct2tt ${WRKDIR}/rct2ww ${WRKDIR}/object/official \
 		${WRKSRC}/data/object/
 	${CP} -r ${WRKDIR}/assetpack ${WRKSRC}/data/
 
 .include <bsd.port.mk>
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index b65d48686a67..8b9f68d28199 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	openttd
 DISTVERSION=	14.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://cdn.openttd.org/openttd-releases/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 PATCH_SITES=	https://github.com/OpenTTD/OpenTTD/commit/
 PATCHFILES=	db36e61807955c896267d6585de0577efd30465d.patch:-p1 \
 		14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e.patch:-p1
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Open source clone of Microprose Transport Tycoon Deluxe
 WWW=		https://www.openttd.org/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		liblzo2.so:archivers/lzo2 \
 		libpng.so:graphics/png
 
 USES=		cmake compiler:c++17-lang cpe pkgconfig tar:xz
 CMAKE_ARGS=	-DCMAKE_INSTALL_BINDIR:PATH=bin \
 		-DCMAKE_INSTALL_DATADIR:PATH=share
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS FLUIDSYNTH SAVE_PASSWORDS SDL1 SERVER
 SERVER_PREVENTS=	FLUIDSYNTH
 
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 
 SAVE_PASSWORDS_DESC=	Save passwords between server restarts
 SAVE_PASSWORDS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-save-passwords
 
 SDL1_DESC=	Use SDL v1.2 instead of v2 for GUI
 SDL1_VARS=	_SDL_VERSION=sdl
 SDL1_CMAKE_OFF=	-DWITH_SDL2:BOOL=ON
 SDL1_VARS_OFF=	_SDL_VERSION=sdl2
 
 SERVER_DESC=		Build dedicated server only (no GUI)
 SERVER_USES_OFF=	sdl
 SERVER_USE_OFF=		SDL=${_SDL_VERSION}
 SERVER_CMAKE_ON=	-DOPTION_DEDICATED:BOOL=ON
 SERVER_LIB_DEPENDS_OFF=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz \
 			libicui18n.so:devel/icu
 SERVER_VARS=		USE_RC_SUBR=${PORTNAME}
 
 post-install-SERVER-on:
 	@${REINPLACE_CMD} -E '/\.desktop|icons|pixmaps/d' ${TMPPLIST}
 
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.mk>
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 52f83d6a8e38..e2c504162552 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,137 +1,137 @@
 PORTNAME=	wesnoth
 PORTVERSION=	1.18.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
 		http://files.wesnoth.org/ \
 		http://ports.toco-domains.de/
 
 PATCH_SITES+=	https://github.com/wesnoth/wesnoth/commit/
 PATCHFILES+=	e8271cd1387e05eca3342da3584a64adb1aae7d8.patch:-p1
 PATCHFILES+=	37ee134d7a17f509982f6ba4fda60a6b1e9acc72.patch:-p1
 
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Fantasy turn-based strategy game
 WWW=		https://www.wesnoth.org/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libvorbisfile.so:audio/libvorbis \
 		libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libicudata.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz
 
 USES=		cmake compiler:c++17-lang cpe desktop-file-utils \
 		gnome lua:54 pkgconfig python:run \
 		readline shebangfix ssl sdl tar:bzip2 xorg
 USE_SDL=	image2 mixer2 ttf2
 USE_GNOME=	cairo pango
 USE_XORG=	ice sm x11 xext
 
 LDFLAGS+=	-lboost_system -lpthread
 
 PORTSCOUT=	limitw:1,even
 
 SHEBANG_FILES=	data/tools/about_cfg_to_wiki \
 		data/tools/addon_manager/__init__.py \
 		data/tools/addon_manager/html.py \
 		data/tools/check_mixed_indent \
 		data/tools/expand-terrain-macros.py \
 		data/tools/extractbindings data/tools/imgcheck \
 		data/tools/GUI.pyw \
 		data/tools/hexometer.py \
 		data/tools/steam-changelog \
 		data/tools/TeamColorizer \
 		data/tools/trackviewer.pyw \
 		data/tools/terrain2wiki.py \
 		data/tools/tmx_trackplacer \
 		data/tools/unit_tree/__init__.py \
 		data/tools/unit_tree/animations.py \
 		data/tools/unit_tree/helpers.py \
 		data/tools/unit_tree/html_output.py \
 		data/tools/unit_tree/overview.py \
 		data/tools/unit_tree/team_colorizer.py \
 		data/tools/unit_tree/update-wmlunits \
 		data/tools/unit_tree/wiki_output.py \
 		data/tools/wesnoth/campaignserver_client.py \
 		data/tools/wesnoth/libgithub.py \
 		data/tools/wesnoth/trackplacer3/cfgfileformat.py \
 		data/tools/wesnoth/trackplacer3/datatypes.py \
 		data/tools/wesnoth/trackplacer3/tmxfileformat.py \
 		data/tools/wesnoth/version.py \
 		data/tools/wesnoth/wescamp.py \
 		data/tools/wesnoth/wmldata.py \
 		data/tools/wesnoth/wmliterator3.py \
 		data/tools/wesnoth/wmlparser.py \
 		data/tools/wesnoth/wmlparser3.py \
 		data/tools/wesnoth/wmltools3.py \
 		data/tools/wesnoth_addon_manager \
 		data/tools/wmlflip \
 		data/tools/wmlindent \
 		data/tools/wmllint \
 		data/tools/wmllint-1.4 \
 		data/tools/wmlunits \
 		data/tools/wmlscope \
 		data/tools/wmlxgettext \
 		po/FINDCPP \
 		po/FINDPY \
 		run_boost_tests \
 		run_wml_tests \
 		update_copyrights \
 		utils/ai_test/ai_test.py \
 		utils/compare_images.py \
 		utils/dockerbuilds/mingw/get_dlls.py \
 		utils/git_export_campaign \
 		utils/optiwebp.py \
 		utils/po_stat.py \
 		utils/pofix.py \
 		utils/unused_functions.py \
 		utils/update_appdata \
 		utils/update_copyright.py \
 		utils/woptipng.py
 
 CPE_VENDOR=	${PORTNAME}
 CPE_PRODUCT=	battle_for_wesnoth
 CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man \
 		-DENABLE_STRICT_COMPILATION=off
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	CAMPAIGN DOCS FRIBIDI NLS \
 		NOTIFY SERVER TEST
 OPTIONS_DEFAULT=	CAMPAIGN FRIBIDI NOTIFY SERVER
 OPTIONS_SUB=	yes
 
 CAMPAIGN_DESC=	Campaign server
 CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on
 DOCS_CMAKE_OFF=	-DDOCDIR=none
 FRIBIDI_DESC=	Bidirectional support
 FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi
 FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off
 NLS_USES=	gettext
 NLS_CMAKE_ON=	-DLOCALEDIR=${PREFIX}/share/locale
 NLS_CMAKE_OFF=	-DENABLE_NLS=off
 NOTIFY_DESC=	Desktop notifications
 NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus
 NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off
 SERVER_DESC=	Server
 SERVER_CMAKE_OFF=-DENABLE_SERVER=off
 TEST_CMAKE_ON=	-DENABLE_TESTS=on
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,def = NULL,def = 0," \
 		${WRKSRC}/src/utils/config_filters.hpp
 
 #post-install:
 #	${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 3ab38924db85..76cecb852eb1 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	widelands
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Realtime strategy game inspired by Settlers II
 WWW=		https://wl.widelands.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libboost_system.so:devel/boost-libs \
 		libminizip.so:archivers/minizip
 BUILD_DEPENDS=	${PREFIX}/include/asio.hpp:net/asio
 
 USES=		cmake compiler:c++11-lib cpe gettext gl pkgconfig \
 		python:build sdl
 USE_GITHUB=	yes
 USE_GL=		gl glew
 USE_SDL=	sdl2 mixer2 image2 ttf2
 CMAKE_ARGS=	-DWL_INSTALL_BINDIR=bin \
 		-DWL_INSTALL_BASEDIR="${PREFIX}" \
 		-DWL_INSTALL_DATADIR="${DATADIR}" \
 		-DWL_INSTALL_DOCDIR="${DOCSDIR}" \
 		-DWL_VERSION="${DISTVERSION}" \
 		-DWL_OPTIMIZE_FLAGS="" \
 		-Wno-dev
 CMAKE_BUILD_TYPE=None
 
 PORTSCOUT=	limit:^[0-9]+\.
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS LTO NLS TEST
 OPTIONS_DEFAULT=LTO
 OPTIONS_EXCLUDE_riscv64=	LTO
 
 LTO_CMAKE_ON=	-DUSE_FLTO_IF_AVAILABLE:STRING="yes"
 NLS_CMAKE_BOOL=	OPTION_BUILD_TRANSLATIONS
 TEST_CMAKE_BOOL=OPTION_BUILD_TESTS
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/third_party/minizip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/*.cmake
 
 .include <bsd.port.mk>
diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 3415871f79fc..ad598af56563 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	cfdg
 DISTVERSION=	3.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.contextfreeart.org/download/ \
 		http://glyphic.s3.amazonaws.com/cfa/download/
 DISTNAME=	ContextFreeSource${DISTVERSION}
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Context Free Design Grammar compiler
 WWW=		https://www.contextfreeart.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpng.so:graphics/png
 
 USES=		bison gmake tar:xz
 MAKE_ARGS=	prefix=${PREFIX} \
 		DESTDIR=${STAGEDIR}
 TEST_TARGET=	check
 CXXFLAGS+=	-Wno-register
 
 # graphics/agg cannot be unbundled: version in ports too outdated
 # furthermore, its header files conflict with the headers bundled by cfdg
 CONFLICTS_BUILD=	agg
 
 WRKSRC=		${WRKDIR}/context-free${DISTVERSION}
 PLIST_FILES=	bin/cfdg \
 		share/man/man1/cfdg.1.gz
 
 PORTEXAMPLES=	*.cfdg
 
 OPTIONS_DEFINE=	EXAMPLES FFMPEG
 OPTIONS_DEFAULT=	FFMPEG
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 			libx264.so:multimedia/libx264
 FFMPEG_MAKE_ARGS=	WANT_FFMPEG=yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/Makefile
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/input/*.cfdg ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 6f030d6c903d..08f5bd1c2405 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,132 +1,132 @@
 PORTNAME=	darktable
 PORTVERSION=	4.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
 MAINTAINER=	dumbbell@FreeBSD.org
 COMMENT=	Virtual lighttable and darkroom for photographers
 WWW=		https://www.darktable.org/
 
 LICENSE=	GPLv3
 
 ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	uses 64-bit address space
 
 BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		po4a-translate:textproc/po4a \
 		xsltproc:textproc/libxslt \
 		bash:shells/bash
 LIB_DEPENDS=	libavif.so:graphics/libavif \
 		libcolord-gtk.so:graphics/colord-gtk \
 		libcolord.so:graphics/colord \
 		libcurl.so:ftp/curl \
 		libexiv2.so:graphics/exiv2 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libharfbuzz.so:print/harfbuzz \
 		libheif.so:graphics/libheif \
 		libicui18n.so:devel/icu \
 		libImath.so:math/Imath \
 		libjasper.so:graphics/jasper \
 		libjson-glib-1.0.so:devel/json-glib \
 		libjxl_threads.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		libOpenEXR.so:graphics/openexr \
 		libopenjp2.so:graphics/openjpeg \
 		libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map \
 		libpng.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gl gnome jpeg \
 		llvm:15,build lua:54 perl5 pkgconfig sdl shebangfix sqlite \
 		tar:xz xorg
 USE_GCC=	12
 USE_GL=		gl
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 USE_SDL=	sdl2
 USE_XORG=	ice sm x11 xext xrandr
 
 SHEBANG_FILES=	tools/*.sh
 
 CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1 -DUSE_PORTMIDI:BOOL=OFF
 
 CMAKE_BOOL+=	BUILD_CMSTEST USE_AVIF USE_CAMERA_SUPPORT USE_HEIF \
 		USE_ISOBMFF USE_KWALLET USE_LUA USE_MAP USE_OPENEXR \
 		USE_OPENJPEG USE_WEBP RAWSPEED_ENABLE_LTO
 
 CFLAGS+=	-fopenmp -I${LOCALBASE}/include/Imath
 CXXFLAGS+=	-stdlib=libc++
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
 
 OPTIONS_DEFINE=		DOCS GMIC GRAPHMAGICK LIBSECRET NLS PRINT TOOLS
 OPTIONS_DEFAULT=	PRINT
 OPTIONS_SUB=		yes
 
 GMIC_DESC=		Support G'Mic-compressed LUT in lut3d
 LIBSECRET_DESC=		Support libsecret as password backend
 TOOLS_DESC=		Install additional scripts
 
 GMIC_LIB_DEPENDS=	libgmic.so:graphics/gmic
 GMIC_CMAKE_BOOL=	USE_GMIC
 
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHMAGICK_CMAKE_BOOL=	USE_GRAPHICSMAGICK
 
 LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 LIBSECRET_CMAKE_BOOL=	USE_LIBSECRET
 
 # FIXME: Even with NLS turned off, darktable(1) is still linked to
 # libintl.so.
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-runtime
 NLS_CMAKE_BOOL=		USE_NLS
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 
 PRINT_LIB_DEPENDS=	libcups.so:print/cups
 PRINT_CMAKE_BOOL=	BUILD_PRINT
 
 TOOLS_BUILD_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 TOOLS_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
 CMAKE_ARGS+=	-DUSE_OPENCL:BOOL=OFF
 CXXFLAGS+=	-DGDK_DISABLE_DEPRECATED
 PLIST_SUB+=	NO_OPENCL="@comment "
 .else
 PLIST_SUB+=	NO_OPENCL=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 # work around CMAKE/CCACHE flaw (cmake stomps over ccache)
 .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE)
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN}
 .endif
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 # darktable defines the __XOPEN_SOURCE preprocessor macro, which
 # restricts symbol visibility on FreeBSD and causes compilation failures
 # on, for instance, the cups_print module, because u_char remains
 # undefined. Remove _XOPEN_SOURCE maro definitions.
 post-patch:
 	${REINPLACE_CMD} '/add_definitions."-D_XOPEN_SOURCE=.*"/d' ${WRKSRC}/CMakeLists.txt
 
 post-install-TOOLS-off:
 	@${RM} -f ${STAGEDIR}${DATADIR}/tools/extract_wb_from_images.sh
 
 .include <bsd.port.post.mk>
diff --git a/graphics/dcmtk/Makefile b/graphics/dcmtk/Makefile
index 5eb4e1e8906d..5894e8794dd3 100644
--- a/graphics/dcmtk/Makefile
+++ b/graphics/dcmtk/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	dcmtk
 DISTVERSIONPREFIX=	${PORTNAME:tu}-
 DISTVERSION=	3.6.9
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DICOM ToolKit, libraries and applications for DICOM/MEDICOM standard
 WWW=		https://dcmtk.org/en/ \
 		https://github.com/DCMTK/dcmtk
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++11-lang cmake cpe gnome jpeg pathfix ssl
 CPE_VENDOR=	offis
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	DCMTK_WITH_DOXYGEN
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 ETCDIR=		${PREFIX}/etc/${PORTNAME}-${PORTVERSION}
 DATADIR=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 TEST_TARGET=	test test-exhaustive
 
 PORTSCOUT=	limit:^.*[0-9].*$$ # prevent tags like latest
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} == 140
 LLVM_VER=	15
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CC=		${LOCALBASE}/bin/clang${LLVM_VER}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_VER}
 .endif
 
 # tests as of 3.6.9: 100% tests passed, 0 tests failed out of 366
 
 .include <bsd.port.post.mk>
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 02c0ebf56c73..76cd39ee0025 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	dia
 PORTVERSION=	0.97.3
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Diagram creation program, similar to Visio
 WWW=		https://wiki.gnome.org/Apps/Dia
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libicudata.so:devel/icu
 
 USES=		cpe desktop-file-utils gettext gmake gnome libtool \
 		localbase:ldflags pathfix pkgconfig tar:xz
 CPE_VENDOR=	gnome
 USE_GNOME=	gtk20 gnomeprefix libxslt libartlgpl2 intlhack
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-gnome
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 
 INSTALL_TARGET=	install-strip
 
 LDFLAGS+=	`pkg-config --libs gmodule-2.0`
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 .include <bsd.port.options.mk>
 
 #.if ${ARCH} == "i386"
 #LIB_DEPENDS+=		libEMF.so:graphics/libemf
 #CONFIGURE_ARGS+=	--enable-libemf
 #PLIST_SUB+=		WMF=""
 #.else
 CONFIGURE_ARGS+=	--disable-libemf
 PLIST_SUB+=		WMF="@comment "
 #.endif
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/lib/intl.c
 	@${REINPLACE_CMD} -e 's|glib/gstrfuncs.h>|glib.h>|g' \
 		-e 's|glib/gtestutils.h|glib.h|g' \
 		${WRKSRC}/objects/custom/shape_typeinfo.c \
 		${WRKSRC}/tests/test-objects.c \
 		${WRKSRC}/tests/test-boundingbox.c
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e \
 		's,\(^GTK_LIBS.*\),\1 -lpthread,'
 	@${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \
 		s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \
 		s|-lstdc++||g'  ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile
index c7ba5d919bb2..b3937572ede8 100644
--- a/graphics/imv/Makefile
+++ b/graphics/imv/Makefile
@@ -1,84 +1,85 @@
 PORTNAME=	imv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://git.sr.ht/~exec64/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple image viewer
 WWW=		https://sr.ht/~exec64/imv/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	a2x:textproc/asciidoc
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libinih.so:devel/inih \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		desktop-file-utils gl gnome meson pkgconfig
 USE_GL=		egl
 USE_GNOME=	cairo pango
 
 CONFLICTS_INSTALL=	renameutils
 
 OPTIONS_DEFINE=		FREEIMAGE HEIF JPEG NSGIF PNG SVG TEST TIFF
 OPTIONS_DEFAULT=	ALL FREEIMAGE HEIF JPEG PNG SVG TIFF
 OPTIONS_SINGLE=		WIN
 OPTIONS_SINGLE_WIN=	ALL WAYLAND X11
 OPTIONS_SUB=		yes
 
 ALL_DESC=	Both Wayland and X11 support
 FREEIMAGE_DESC=	FreeImage backend (support for many image formats)
 NSGIF_DESC=	NetSurf GIF backend (support for animated GIF)
 WIN_DESC=	Windowing system
 
 ALL_CATEGORIES=		wayland
 ALL_LIB_DEPENDS+=	libwayland-client.so:graphics/wayland
 ALL_USES=		xorg
 ALL_USE=		GL=glu \
 			XORG=x11,xcb
 ALL_MESON_ON=		-Dwindows=all
 
 FREEIMAGE_LIB_DEPENDS=		libfreeimage.so:graphics/freeimage
 FREEIMAGE_MESON_ENABLED=	freeimage
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_MESON_ENABLED=	libheif
 
 JPEG_LIB_DEPENDS=	libturbojpeg.so:graphics/libjpeg-turbo
 JPEG_MESON_ENABLED=	libjpeg
 
 NSGIF_BROKEN=		fails to build with libnsgif 1.0.0, see also https://lists.sr.ht/~exec64/imv-devel/%3CCAFDf7UKQCAO5VXqykRCnpHG6u0owdXRnk5kt0S3b-aTkpuF66Q%40mail.gmail.com%3E
 NSGIF_LIB_DEPENDS=	libnsgif.so:graphics/libnsgif
 NSGIF_MESON_ENABLED=	libnsgif
 
 PNG_LIB_DEPENDS=	libpng16.so:graphics/png
 PNG_MESON_ENABLED=	libpng
 
 SVG_USE=		GNOME=librsvg2
 SVG_MESON_ENABLED=	librsvg
 
 TEST_LIB_DEPENDS=	libcmocka.so:sysutils/cmocka
 TEST_MESON_ENABLED=	test
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_ENABLED=	libtiff
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-egl.so:graphics/wayland
 WAYLAND_MESON_ON=	-Dwindows=wayland
 
 X11_USES=	xorg
 X11_USE=	GL=glu \
 		XORG=x11,xcb
 X11_MESON_ON=	-Dwindows=x11
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
 		${WRKSRC}/src/imv.c \
 		${WRKSRC}/doc/imv.1.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index 3a6f2036ebdf..5f6b27d4da25 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	libcdr
 DISTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	LODEV
 PKGNAMESUFFIX=	01
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library and tools for parsing Corel Draw file format
 WWW=		https://wiki.documentfoundation.org/DLP/Libraries/libcdr
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.MPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		librevenge-0.0.so:textproc/librevenge \
 		liblcms2.so:graphics/lcms2
 
 USES=		compiler:c++11-lib libtool localbase:ldflags pathfix pkgconfig \
 		tar:xz
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	LIBVERSION=1.0.${PORTVERSION:E}
 
 CONFIGURE_ARGS=	--disable-tests --disable-werror --without-docs
 
 .include <bsd.port.mk>
diff --git a/graphics/libzmf/Makefile b/graphics/libzmf/Makefile
index 5081b357cd69..c1339dc496ed 100644
--- a/graphics/libzmf/Makefile
+++ b/graphics/libzmf/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	libzmf
 PORTVERSION=	0.0.2
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	graphics
 MASTER_SITES=	LODEV
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library that parses the file format of Zoner Callisto/Draw documents
 WWW=		https://wiki.documentfoundation.org/DLP/Libraries/libzmf
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libpng.so:graphics/png \
 		librevenge-0.0.so:textproc/librevenge
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		compiler:c++11-lang libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-tests --disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile
index 42527c44d114..8ffd0188e69a 100644
--- a/graphics/maim/Makefile
+++ b/graphics/maim/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	maim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Screenshot utility with performance improvements over scrot
 WWW=		https://github.com/naelstrof/maim
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpng.so:graphics/png \
 		libslopy.so:x11/slop \
 		libwebp.so:graphics/webp
 
 USES=		cmake compiler:c++17-lang gl jpeg xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	naelstrof
 USE_GL=		gl
 USE_XORG=	ice sm x11 xcomposite xext xfixes xrandr xrender
 
 CMAKE_ARGS=	-DSLOP_LIBRARIES=${LOCALBASE}/lib/libslopy.so
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 784ee7261c32..9029135f750c 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -1,140 +1,140 @@
 PORTNAME=	mapnik
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics geography
 
 MAINTAINER=	hummeltech@sherpaguru.com
 COMMENT=	Free Toolkit For Developing Mapping Applications
 WWW=		http://www.mapnik.org/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
 		protozero>0:devel/protozero
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
 		libboost_regex.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu
 RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mapnik
 GH_PROJECT=	mapnik
 GH_TUPLE=	mapbox:geometry.hpp:c83a2ab:geometry_hpp/deps/mapbox/geometry \
 		mapbox:polylabel:51f09d0:polylabel/deps/mapbox/polylabel \
 		mapbox:variant:a2a4858:variant/deps/mapbox/variant \
 		catchorg:Catch2:v2.13.10:catch2/test/catch2 \
 		mapnik:test-data:fd9ab43:test_data/test/data
 
 USES=		compiler:c++17-lang cmake:testing gnome pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DFONTS_INSTALL_DIR:PATH=share/fonts/dejavu
 CMAKE_ON=	USE_EXTERNAL_MAPBOX_PROTOZERO
 
 OPTIONS_DEFINE=		CAIRO DOCS JPEG PNG PROJ TIFF WEBP
 OPTIONS_DEFAULT=	CAIRO JPEG PNG PROJ TIFF WEBP \
 			GDAL OGR PGRASTER POSTGIS SQLITE3 \
 			TESTING \
 			GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER PGSQL2SQLITE SHAPEINDEX SVG2PNG
 OPTIONS_GROUP=		INPUT TESTS UTILS
 OPTIONS_GROUP_INPUT=	GDAL OGR PGRASTER POSTGIS SQLITE3
 OPTIONS_GROUP_TESTS=	BENCHMARK DEMO_CPP DEMO_VIEWER TESTING
 OPTIONS_GROUP_UTILS=	GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER OGRINDEX PGSQL2SQLITE SHAPEINDEX SVG2PNG
 OPTIONS_SUB=		yes
 
 JPEG_CMAKE_BOOL=	USE_JPEG
 JPEG_USES=		jpeg
 PNG_CMAKE_BOOL=		USE_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 TIFF_CMAKE_BOOL=	USE_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 WEBP_CMAKE_BOOL=	USE_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 CAIRO_DESC=		Enable cairo rendering
 PROJ_DESC=		Enable PROJ support
 
 INPUT_DESC=		Input plugins
 GDAL_DESC=		GDAL input plugin
 OGR_DESC=		OGR input plugin
 PGRASTER_DESC=		PGraster input plugin
 POSTGIS_DESC=		PostGIS input plugin
 SQLITE3_DESC=		SQLite input plugin
 
 TESTS_DESC=		Tests & Demos, etc.
 BENCHMARK_DESC=		Benchmark project
 DEMO_CPP_DESC=		Demo c++ application
 DEMO_VIEWER_DESC=	Demo viewer
 TESTING_DESC=		Tests
 
 UTILS_DESC=		Utilities
 GEOMETRY_TO_WKB_DESC=	geometry_to_wkb utility
 MAPNIK_INDEX_DESC=	mapnik_index utility
 MAPNIK_RENDER_DESC=	mapnik_render utility
 OGRINDEX_DESC=		ogrindex utility (currently doesn't build)
 PGSQL2SQLITE_DESC=	pgsql2sqlite utility
 SHAPEINDEX_DESC=	shapeindex utility
 SVG2PNG_DESC=		svg2png utility
 
 CAIRO_CMAKE_BOOL=	USE_CAIRO
 CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 PROJ_CMAKE_BOOL=	USE_PROJ
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 
 GDAL_CMAKE_BOOL=	USE_PLUGIN_INPUT_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 OGR_CMAKE_BOOL=		USE_PLUGIN_INPUT_OGR
 OGR_LIB_DEPENDS=	libgdal.so:graphics/gdal
 PGRASTER_CMAKE_BOOL=	USE_PLUGIN_INPUT_PGRASTER
 PGRASTER_USES=		pgsql
 POSTGIS_CMAKE_BOOL=	USE_PLUGIN_INPUT_POSTGIS
 POSTGIS_USES=		pgsql
 SQLITE3_CMAKE_BOOL=	USE_PLUGIN_INPUT_SQLITE
 SQLITE3_USES=		sqlite:3
 
 BENCHMARK_CMAKE_BOOL= 	BUILD_BENCHMARK
 DEMO_CPP_CMAKE_BOOL= 	BUILD_DEMO_CPP
 DEMO_VIEWER_CMAKE_BOOL=	BUILD_DEMO_VIEWER
 TESTING_CMAKE_BOOL=	BUILD_TESTING
 
 GEOMETRY_TO_WKB_CMAKE_BOOL= 	BUILD_UTILITY_GEOMETRY_TO_WKB
 MAPNIK_INDEX_CMAKE_BOOL= 	BUILD_UTILITY_MAPNIK_INDEX
 MAPNIK_RENDER_CMAKE_BOOL= 	BUILD_UTILITY_MAPNIK_RENDER
 OGRINDEX_CMAKE_BOOL= 		BUILD_UTILITY_OGRINDEX
 PGSQL2SQLITE_CMAKE_BOOL= 	BUILD_UTILITY_PGSQL2SQLITE
 SHAPEINDEX_CMAKE_BOOL= 		BUILD_UTILITY_SHAPEINDEX
 SVG2PNG_CMAKE_BOOL= 		BUILD_UTILITY_SVG2PNG
 
 pre-configure-SQLITE3-on:
 	@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \
 		${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#GIT_REPOSITORY https://github.com/catchorg/Catch2.git#SOURCE_DIR ${WRKSRC}/test/catch2)#g' \
 		-e 's#GIT_TAG        v2.13.7)##g' \
 		${WRKSRC}/test/CMakeLists.txt
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/fonts
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS.md CHANGELOG.md CODE_OF_CONDUCT.md INSTALL.md README.md ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
 	@cd ${WRKSRC} && ${INSTALL_DATA} docs/* ${STAGEDIR}${DOCSDIR}/docs
 
 .include <bsd.port.mk>
diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile
index fabce47c7c16..f0a87cf48eed 100644
--- a/graphics/openfx-arena/Makefile
+++ b/graphics/openfx-arena/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	openfx-arena
 PORTVERSION=	2.4.3
 DISTVERSIONPREFIX=	Natron-
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Extra OpenFX plugins for Natron
 WWW=		https://github.com/NatronGitHub/openfx-arena
 
 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=		compiler:c++20-lang 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/tesseract/Makefile b/graphics/tesseract/Makefile
index 6a0b4a9fc333..c178634c7ab4 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	tesseract
 PORTVERSION=	5.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Commercial quality open source OCR engine
 WWW=		https://github.com/tesseract-ocr/tesseract
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 LIB_DEPENDS=	liblept.so:graphics/leptonica \
 		libtiff.so:graphics/tiff \
 		libharfbuzz.so:print/harfbuzz \
 		libfreetype.so:print/freetype2 \
 		libcurl.so:ftp/curl
 
 RUN_DEPENDS=	tesseract-data>=0:graphics/tesseract-data
 
 USES=		autoreconf compiler:c++20-lang cpe gnome libarchive libtool \
 		localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 CPE_VENDOR=	tesseract_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}-ocr
 
 DATADIR=	${PREFIX}/share/tessdata
 PORTDATA=	*
 PORTDOCS=	AUTHORS ChangeLog README.md
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS TOOLS
 OPTIONS_DEFAULT=	TOOLS
 OPTIONS_SUB=	yes
 
 TOOLS_CONFIGURE_ENABLE=	training
 TOOLS_DESC=	Include training tools
 TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \
 		libfontconfig.so:x11-fonts/fontconfig
 TOOLS_USE=	GNOME=cairo,glib20,pango
 
 .if exists(/usr/include/omp.h)
 CMAKE_ON=	OPENMP_BUILD
 LDFLAGS+=	-lomp
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-TOOLS-on:
 	@cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install
 
 .include <bsd.port.mk>
diff --git a/irc/znc-push/Makefile b/irc/znc-push/Makefile
index 5cb8c58cf70a..e971560237da 100644
--- a/irc/znc-push/Makefile
+++ b/irc/znc-push/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	znc-push
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0-1
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g23d8467
 CATEGORIES=	irc
 
 MAINTAINER=	dor.bsd@xm0.uk
 COMMENT=	Push notification service module for ZNC
 WWW=		https://github.com/amyreese/znc-push
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	znc:irc/znc
 LIB_DEPENDS=	libicudata.so:devel/icu
 RUN_DEPENDS=	znc:irc/znc
 
 USES=		compiler:c++11-lang gmake localbase:ldflags pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	amyreese
 
 MAKE_ENV=	version=${PORTVERSION}
 
 # v2.0.0-{rc,dev} are ancient release candidates from 2014 for the seemingly
 # abandoned Python branch.
 PORTSCOUT=	skipv:v2.0.0-rc,v2.0.0-dev
 
 PLIST_FILES=	lib/znc/push.so
 PORTDOCS=	*.md
 
 OPTIONS_DEFINE=	CURL DOCS
 
 CURL_DESC=		Use curl for HTTP requests
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_MAKE_ENV=		curl=yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/znc
 	${INSTALL_PROGRAM} ${WRKSRC}/push.so ${STAGEDIR}${PREFIX}/lib/znc/push.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/znc/push.so
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${WRKSRC}/doc/*.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 49d8ec202535..16402933ebdb 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	znc
 DISTVERSION=	1.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc
 MASTER_SITES=	https://znc.in/releases/ \
 		https://znc.in/releases/archive/
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Advanced IRC bouncer
 WWW=		https://wiki.znc.in/ZNC
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	swig>=4.0.1:devel/swig
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		compiler:c++17-lang cpe cmake:run iconv pathfix \
 		perl5 pkgconfig:both python ssl
 USE_PERL5=	build
 USE_RC_SUBR=	znc
 
 USERS=		znc
 GROUPS=		znc
 
 PORTDOCS=	README.md
 SUB_FILES=	pkg-message
 
 CMAKE_ON=	WANT_ICU \
 		WANT_IPV6 \
 		WANT_OPENSSL \
 		WANT_PYTHON \
 		WANT_SWIG
 CMAKE_ARGS=	-DOPENSSL_ROOT_DIR=${OPENSSLBASE} \
 		-DWANT_PYTHON_VERSION:STRING=python-${PYTHON_VER}
 
 OPTIONS_DEFINE=		CYRUS DOCS NLS PERL TCL
 OPTIONS_DEFAULT=	PERL
 OPTIONS_SUB=		yes
 
 CYRUS_DESC=		Cyrus SASL module
 PERL_DESC=		Perl scripting module
 PYTHON_DESC=		Python scripting module
 TCL_DESC=		Tcl scripting module
 
 CYRUS_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 CYRUS_CMAKE_BOOL=	WANT_CYRUS
 
 NLS_LIB_DEPENDS=	libboost_locale.so:devel/boost-libs
 NLS_USES=		gettext
 NLS_CMAKE_BOOL=		WANT_I18N
 
 PERL_USE=		perl5=run
 PERL_CMAKE_BOOL=	WANT_PERL WANT_SWIG
 
 TCL_USES=		tcl
 TCL_CMAKE_BOOL=		WANT_TCL
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3|python${PYTHON_VER}|g' \
 		${WRKSRC}/znc-buildmod.cmake.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-NLS-off:
 	@${RM} -r ${STAGEDIR}${DATADIR}/translations
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
index 312e2b09901f..0e2f26067696 100644
--- a/java/openjfx14/Makefile
+++ b/java/openjfx14/Makefile
@@ -1,175 +1,175 @@
 PORTNAME=	openjfx
 DISTVERSION=	14.0.2.1+1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	java x11-toolkits devel
 MASTER_SITES=	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.7.1/:queries \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.7.1/:queryparser \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.7.1/:sandbox \
 		https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/:antlr
 PKGNAMESUFFIX=	14
 DISTFILES=	lucene-core-7.7.1.jar:core \
 		lucene-grouping-7.7.1.jar:grouping \
 		lucene-queries-7.7.1.jar:queries \
 		lucene-queryparser-7.7.1.jar:queryparser \
 		lucene-sandbox-7.7.1.jar:sandbox \
 		antlr4-4.7.2-complete.jar:antlr
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JavaFX SDK overlay for OpenJDK 11
 WWW=		https://openjdk.java.net/projects/openjfx/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		apache-ant>0:devel/apache-ant \
 		gradle62>=6.2:devel/gradle62 \
 		${JAVALIBDIR}/junit.jar:java/junit
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gettext-runtime gl gnome java jpeg localbase:ldflags ninja pkgconfig \
 		sqlite xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openjdk
 GH_PROJECT=	jfx
 USE_GL=		gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
 JAVA_VERSION=	11
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xtst xxf86vm
 
 CFLAGS+=	-Wno-unused-command-line-argument \
 		-Wno-int-conversion
 
 PLIST_SUB=	INSTALLDIR=${_INSTALLDIR}
 
 OPTIONS_DEFINE=	MEDIA SWT TEST WEBKIT
 OPTIONS_DEFAULT=	MEDIA WEBKIT
 OPTIONS_SUB=	yes
 
 MEDIA_DESC=	Media module
 SWT_DESC=	SWT support
 
 MEDIA_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4 \
 			libsndio.so:audio/sndio
 MEDIA_USES=	gmake
 MEDIA_VARS=	COMPILE_MEDIA=true
 
 SWT_BUILD_DEPENDS=	swt>0:x11-toolkits/swt
 SWT_RUN_DEPENDS=	swt>0:x11-toolkits/swt
 SWT_VARS=	COMPILE_SWT=true
 
 TEST_USES=	display:test
 TEST_VARS=	AWT_TEST=true FULL_TEST=true
 
 # Gradle calls CMake during the build
 WEBKIT_IMPLIES=	MEDIA
 WEBKIT_LIB_DEPENDS=	libicui18n.so:devel/icu
 WEBKIT_USES=	bison cmake:indirect gmake gperf perl5 python:build ruby:build
 WEBKIT_USE=	GNOME=libxslt,libxml2 \
 		PERL5=build \
 		XORG=xcomposite,xdamage,xfixes,xrender,xt
 WEBKIT_VARS=	COMPILE_WEBKIT=true
 
 # Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
 _GRADLE_ENV=	CC=${WRKDIR}/bin/ccwrapper \
 		CXX=${WRKDIR}/bin/cxxwrapper \
 		GRADLE_USER_HOME=${WRKDIR}/gradle-home \
 		JAVA_VERSION=${JAVA_VERSION}
 _GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle62 --no-daemon
 
 _INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 # Suppress errors with lld >= 17 due to undefined symbols.
 LDFLAGS+=	-Wl,--undefined-version
 
 post-extract:
 	${MKDIR} ${WRKDIR}/jars
 .for f in core grouping queries queryparser sandbox
 	${CP} ${DISTDIR}/lucene-${f}-7.7.1.jar ${WRKDIR}/jars
 .endfor
 	${CP} ${DISTDIR}/antlr4-4.7.2-complete.jar ${WRKDIR}/jars
 
 # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the
 # Linux versions.  Prepare the tree, so that we only see the changes
 # from Linux's Makefile in our own patches.
 pre-patch:
 	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/linux \
 		${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/bsd
 	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux \
 		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/bsd
 
 post-patch:
 	@${MKDIR} ${WRKDIR}/bin
 	@${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
 	@${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
 	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
 	@${REINPLACE_CMD} -e 's|gcc|${WRKDIR}/bin/ccwrapper|g' \
 			  -e 's|g\+\+|${WRKDIR}/bin/cxxwrapper|g' \
 		${WRKSRC}/buildSrc/bsd.gradle
 # Add a *BSD native audio sink to GStreamer-lite instead of using the
 # bundled ALSA sink.  Currently we add an sndio sink, but this is an extension
 # point for eventually adding an OSS backend (or others) as an option as well.
 # If you add a new one make sure it registers itself as "bsdaudiosink" as defined
 # in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
 	@${MKDIR} ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
 	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
 		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
 	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
 		${LN} -s gstsndio.c gstbsdaudio.c && \
 		${LN} -s sndiosink.c bsdaudiosink.c
 # Pull Java dependencies from LOCALBASE
 	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
 # Remove bundled libraries. We use the system's versions instead.
 	@cd ${WRKSRC}/modules/javafx.web/src/main/native/Source/ThirdParty && \
 		${RM} -r icu libxml libxslt sqlite
 	@${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu
 	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \
 		${RM} -r glib libffi
 # Environment variables gets lost so hardcode where we can find FFmpeg 4.x
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 
 do-configure:
 	@${MKDIR} ${WRKDIR}/gradle-home
 	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties
 	@${ECHO_CMD} "JFX_DEPS_URL = ${WRKDIR}/jars" > ${WRKSRC}/gradle.properties
 .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST
 	@${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties
 .endfor
 	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
 
 # the java doc are not installed on FreeBSD so exclude the javadoc task
 # as it'll fail otherwise
 do-build:
 	@cd ${WRKSRC} && ${_GRADLE_RUN} zips --exclude-task javadoc
 
 # it's not recommended to install openjfx inside openjdk directory
 do-install:
 	@${MKDIR} ${STAGEDIR}${_INSTALLDIR} \
 		${STAGEDIR}${_INSTALLDIR}/lib \
 		${STAGEDIR}${_INSTALLDIR}/jmods
 	${INSTALL_DATA} ${WRKSRC}/build/javafx-exports.zip ${STAGEDIR}${_INSTALLDIR}
 	(cd ${WRKSRC}/build/artifacts/javafx-sdk-14.0.2.1/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/lib)
 	@${MV} ${STAGEDIR}${_INSTALLDIR}/lib/src.zip ${STAGEDIR}${_INSTALLDIR}/lib/javafx-src.zip
 	(cd ${WRKSRC}/build/artifacts/javafx-jmods-14.0.2.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/jmods)
 	@${FIND} ${STAGEDIR}${_INSTALLDIR}/lib -name '*.so' -exec ${STRIP_CMD} \{\} \;
 
 do-test-TEST-on:
 	@cd ${WRKSRC} && ${_GRADLE_RUN} check test
 
 .include <bsd.port.mk>
diff --git a/lang/dotnet/Makefile b/lang/dotnet/Makefile
index 51e2f3725fd5..0e3ec4c3345f 100644
--- a/lang/dotnet/Makefile
+++ b/lang/dotnet/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	dotnet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${DOTNETVERSION}.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	https://github.com/dotnet/dotnet/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/release.json?dummy=/:dotnetmanifest \
 		https://github.com/sec/dotnet-core-freebsd-source-build/releases/download/9.0.0-rc.2-native/:bootstrap
 DISTFILES=	release.json-${PORTVERSION}:dotnetmanifest \
 		${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}:bootstrap \
 		${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX}:bootstrap
 DIST_SUBDIR=	dotnet
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Open-source developer platform and a cross-platform runtime for cloud, mobile, desktop, and IoT apps
 WWW=		https://dot.net
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake-core \
 		git:devel/git \
 		ggrep:textproc/gnugrep \
 		terminfo-db>0:misc/terminfo-db
 LIB_DEPENDS=	libbrotlienc.so:archivers/brotli \
 		libicuuc.so:devel/icu \
 		libinotify.so:devel/libinotify \
 		libunwind.so:devel/libunwind
 RUN_DEPENDS=	terminfo-db>0:misc/terminfo-db \
 		dotnet:lang/dotnet-runtime
 
 USES=		autoreconf:build gssapi:mit llvm:noexport pkgconfig \
 		python:build,3.9+ shebangfix ssl
 
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	src/diagnostics/src/Tools/dotnet-trace/*.sh
 
 BINARY_ALIAS=	grep=${LOCALBASE}/bin/ggrep
 DOTNET_ENV=	PYTHON=${PYTHON_CMD}
 
 BOOTSTRAP_DOTNETVERSION=			9.0
 BOOTSTRAP_SDKVERSION=				${BOOTSTRAP_DOTNETVERSION}.100
 BOOTSTRAP_SDKVERSIONSUFFIX=			-rc.2.24474.1
 BOOTSTRAP_SDKVERSIONBINSUFFIX=			-rc.2.24474.11
 BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME=	Private.SourceBuilt.Artifacts.${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONSUFFIX}.freebsd.13-${DOTNET_ARCH}
 BOOTSTRAP_SDK_DISTNAME=				dotnet-sdk-${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONBINSUFFIX}-freebsd-${DOTNET_ARCH}
 
 DOTNETVERSION=		9.0
 SDKVERSION=		${DOTNETVERSION}.102
 SDKVERSIONSUFFIX=	-rtm.24610.9
 SDK_DISTNAME=		dotnet-sdk-${SDKVERSION}-${SDK_RID}
 SDK_RID=		freebsd.${_OSVERSION_MAJOR}-${DOTNET_ARCH}
 DOTNET_ARCH=		${ARCH:S|amd64|x64|:C|aarch64|arm64|}
 
 PLIST_SUB=	DOTNET_ARCH=${DOTNET_ARCH} FULL_DOTNETVERSION=${PORTVERSION} \
 		DOTNETVERSION=${DOTNETVERSION} \
 		SDKVERSION=${SDKVERSION} SDKVERSIONSUFFIX=${SDKVERSIONSUFFIX} \
 		SDK_RID=${SDK_RID}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	VXSORT=
 .else
 PLIST_SUB+=	VXSORT="@comment "
 .endif
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/release.json-${PORTVERSION} ${WRKSRC}/release.json
 
 	@${MKDIR} ${WRKDIR}/packages
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} \
 		-C ${WRKDIR}/packages \
 		${EXTRACT_AFTER_ARGS}
 
 	@${MKDIR} ${WRKDIR}/bootstrap_sdk
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX} \
 		-C ${WRKDIR}/bootstrap_sdk \
 		${EXTRACT_AFTER_ARGS}
 
 	${ELFCTL} -e +noaslr ${WRKDIR}/bootstrap_sdk/dotnet
 
 post-patch:
 	${REINPLACE_CMD} -e 's|linux-${DOTNET_ARCH}|freebsd-${DOTNET_ARCH}|g' \
 		${WRKDIR}/bootstrap_sdk/sdk/${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONBINSUFFIX}/Microsoft.NETCoreSdk.BundledVersions.props
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${DOTNET_ENV} ./build.sh \
 		--release-manifest release.json \
 		--clean-while-building \
 		--with-sdk ${WRKDIR}/bootstrap_sdk \
 		--with-packages ${WRKDIR}/packages \
 		--source-build \
 		-- \
 		-maxcpucount:${MAKE_JOBS_NUMBER}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/artifacts/assets/Release/${SDK_DISTNAME}${EXTRACT_SUFX} -C ${STAGEDIR}${DATADIR} ${EXTRACT_AFTER_ARGS}
 	${FIND} ${WRKSRC}/artifacts/packages/Release -name "*freebsd*.nupkg" -exec \
 		${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/library-packs/ \;
 
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/sdk/${SDKVERSION}/AppHostTemplate/apphost
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/Microsoft.NETCore.App.Host.${SDK_RID}/${DISTVERSION}/runtimes/${SDK_RID}/native/apphost
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/Microsoft.NETCore.App.Host.${SDK_RID}/${DISTVERSION}/runtimes/${SDK_RID}/native/singlefilehost
 	${FIND} ${STAGEDIR}${DATADIR} -name "*.so" -exec ${STRIP_CMD} -s "{}" ";"
 
 	${RLN} ${STAGEDIR}${DATADIR}/dotnet ${STAGEDIR}${PREFIX}/bin/dotnet
 
 .include <bsd.port.post.mk>
diff --git a/lang/dotnet8/Makefile b/lang/dotnet8/Makefile
index 75f773013a1f..38b9f2478152 100644
--- a/lang/dotnet8/Makefile
+++ b/lang/dotnet8/Makefile
@@ -1,120 +1,120 @@
 PORTNAME=	dotnet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${DOTNETVERSION}.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang devel
 MASTER_SITES=	https://github.com/dotnet/dotnet/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/release.json?dummy=/:dotnetmanifest \
 		LOCAL/arrowd/dotnet/:bootstrap
 PKGNAMESUFFIX=	8
 DISTFILES=	release.json-${PORTVERSION}:dotnetmanifest \
 		${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}:bootstrap \
 		${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX}:bootstrap
 DIST_SUBDIR=	dotnet
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Open-source developer platform and a cross-platform runtime for cloud, mobile, desktop, and IoT apps
 WWW=		https://dot.net
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake-core \
 		git:devel/git \
 		ggrep:textproc/gnugrep \
 		terminfo-db>0:misc/terminfo-db
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libinotify.so:devel/libinotify \
 		libunwind.so:devel/libunwind
 RUN_DEPENDS=	terminfo-db>0:misc/terminfo-db \
 		dotnet:lang/dotnet-runtime
 
 USES=		autoreconf:build gssapi:mit llvm:noexport nodejs pkgconfig \
 		python:build,3.9+ shebangfix ssl
 
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	src/diagnostics/src/Tools/dotnet-trace/*.sh \
 		src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/updateAssemblyInfo.sh
 
 BINARY_ALIAS=	grep=${LOCALBASE}/bin/ggrep
 DOTNET_ENV=	PYTHON=${PYTHON_CMD}
 
 BOOTSTRAP_DOTNETVERSION=			8.0
 BOOTSTRAP_SDKVERSION=				${BOOTSTRAP_DOTNETVERSION}.100
 BOOTSTRAP_SDKVERSIONSUFFIX=			-rtm.23551.1
 BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME=	Private.SourceBuilt.Artifacts.${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONSUFFIX}.freebsd.13-${DOTNET_ARCH}
 BOOTSTRAP_SDK_DISTNAME=				dotnet-sdk-${BOOTSTRAP_SDKVERSION}-freebsd-${DOTNET_ARCH}
 
 DOTNETVERSION=			8.0
 SDKVERSION=			${DOTNETVERSION}.106
 SDKVERSIONSUFFIX=		-servicing.24272.10
 SOURCEBUILT_ARTIFACTS_DISTNAME=	Private.SourceBuilt.Artifacts.${SDKVERSION}${SDKVERSIONSUFFIX}.freebsd.13-${DOTNET_ARCH}
 SDK_DISTNAME=			dotnet-sdk-${SDKVERSION}-freebsd-${DOTNET_ARCH}
 DOTNET_ARCH=				${ARCH:S|amd64|x64|:C|aarch64|arm64|}
 
 PLIST_SUB=			DOTNET_ARCH=${DOTNET_ARCH} FULL_DOTNETVERSION=${PORTVERSION} \
 				DOTNETVERSION=${DOTNETVERSION} \
 				SDKVERSION=${SDKVERSION} SDKVERSIONSUFFIX=${SDKVERSIONSUFFIX} \
 				BOOTSTRAP_SDKVERSION=${BOOTSTRAP_SDKVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1400000
 LIB_DEPENDS+=	libcrypto.so.111:misc/compat13x
 .endif
 
 .if ${ARCH} == aarch64
 BROKEN=		"crossgen2" exited with code 139
 .endif
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/release.json-${PORTVERSION} ${WRKSRC}/release.json
 
 	@${MKDIR} ${WRKDIR}/packages
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} \
 		-C ${WRKDIR}/packages \
 		${EXTRACT_AFTER_ARGS}
 
 	@${MKDIR} ${WRKDIR}/bootstrap_sdk
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX} \
 		-C ${WRKDIR}/bootstrap_sdk \
 		${EXTRACT_AFTER_ARGS}
 
 	${ELFCTL} -e +noaslr ${WRKDIR}/bootstrap_sdk/dotnet
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${DOTNET_ENV} ./build.sh \
 		--release-manifest release.json \
 		--clean-while-building \
 		--with-sdk ${WRKDIR}/bootstrap_sdk \
 		--with-packages ${WRKDIR}/packages \
 		-- \
 		-maxcpucount:${MAKE_JOBS_NUMBER}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release/${SDK_DISTNAME}${EXTRACT_SUFX} -C ${STAGEDIR}${DATADIR} ${EXTRACT_AFTER_ARGS}
 	${RM} -r ${STAGEDIR}${DATADIR}/packs/NETStandard.Library.Ref
 
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/sdk/${SDKVERSION}/AppHostTemplate/apphost
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/Microsoft.NETCore.App.Host.freebsd-${DOTNET_ARCH}/${DISTVERSION}/runtimes/freebsd-${DOTNET_ARCH}/native/apphost
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/Microsoft.NETCore.App.Host.freebsd-${DOTNET_ARCH}/${DISTVERSION}/runtimes/freebsd-${DOTNET_ARCH}/native/singlefilehost
 	${FIND} ${STAGEDIR}${DATADIR} -name "*.so" -exec ${STRIP_CMD} -s "{}" ";"
 
 bootstrap-makesum:
 	cd ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release && sha256 ${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}
 	@${ECHO_CMD} -n "SIZE (${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}) = "
 	@${STAT} -f %z ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release/${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}
 
 	@cd ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release && sha256 ${SDK_DISTNAME}${EXTRACT_SUFX}
 	@${ECHO_CMD} -n "SIZE (${SDK_DISTNAME}${EXTRACT_SUFX}) = "
 	@${STAT} -f %z ${WRKSRC}/artifacts/${DOTNET_ARCH}/Release/${SDK_DISTNAME}${EXTRACT_SUFX}
 
 	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index f2af7921d30f..58357b2a5824 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	gnustep-base
 DISTVERSION=	1.29.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	https://github.com/gnustep/libs-base/releases/download/base-${DISTVERSION:S,.,_,g}/
 
 PATCH_SITES=	https://github.com/gnustep/libs-base/commit/
 PATCHFILES=	37913d006d96a6bdcb963f4ca4889888dcce6094.patch:-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep Foundation library
 WWW=		http://www.gnustep.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libcurl.so:ftp/curl \
 		libgcrypt.so:security/libgcrypt \
 		libgmp.so:math/gmp
 
 RUN_DEPENDS=	${LOCALBASE}/GNUstep/System/Library/Makefiles/GNUstep.sh:devel/gnustep-make
 
 USES=		pkgconfig iconv gnome gnustep
 USE_GNOME=	libxml2 libxslt
 USE_GNUSTEP=	build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 GNU_CONFIGURE=	yes
 
 ETCDIR=		${LOCALBASE}/etc
 
 STAGEHEADER=	${STAGEDIR}${PREFIX}/GNUstep/System/Library/Headers
 
 CONFIGURE_ARGS=	--disable-procfs \
 		--with-installation-domain=SYSTEM
 CONFIGURE_ENV=	OBJCFLAGS='-fobjc-runtime=gnustep-2.0 -fblocks' \
 		ac_cv_header_bfd_h=no ac_cv_lib_bfd_bfd_openr=no
 
 PLIST_SUB=	BASEVERSION=${DISTVERSION:R}
 
 OPTIONS_DEFINE=		ICU GNUTLS
 OPTIONS_RADIO=		ZEROCONF
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNS
 OPTIONS_DEFAULT=	ICU GNUTLS AVAHI
 OPTIONS_SUB=		yes
 
 ZEROCONF_DESC=		Zeroconf (Bonjour) support
 AVAHI_DESC=		Zeroconf via Avahi (preferred)
 MDNS_DESC=		Zeroconf via mDNSResponder
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CONFIGURE_OFF=	--disable-icu
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-tls
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 CONFIGURE_ARGS+=	--with-zeroconf-api=avahi
 .elif ${PORT_OPTIONS:MMDNS}
 LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 CONFIGURE_ARGS+=	--with-zeroconf-api=mdns
 .else
 CONFIGURE_ARGS+=	--disable-zeroconf
 .endif
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/| ; \
 		s|HAVE_TLS|HAVE_GNUTLS|" ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/gdomap_if ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/hermes/Makefile b/lang/hermes/Makefile
index df07d37648f3..d7317417a5bd 100644
--- a/lang/hermes/Makefile
+++ b/lang/hermes/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	hermes
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-javascript-engine
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	JavaScript engine
 WWW=		https://github.com/facebook/hermes
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 TEST_DEPENDS=	googletest>0:devel/googletest \
 		zip:archivers/zip
 
 USES=		cmake compiler:c++14-lang cpe ncurses python:build readline
 USE_LDCONFIG=	yes
 CPE_VENDOR=	facebook
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CMAKE_OFF=	HERMES_ENABLE_TEST_SUITE
 
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
 
 do-test: # 5 unexpected test failures
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHERMES_ENABLE_TEST_SUITE:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-hermes
 
 .include <bsd.port.mk>
diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index 86f730d539a2..e98968b4b910 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -1,621 +1,621 @@
 PORTNAME=	php81
 DISTVERSION=	8.1.31
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.1.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 DEPRECATED=	Upstream EOL reaches on 2025-12-31
 EXPIRATION_DATE=	2025-12-31
 
 USES+=		compiler:c11 cpe gnome localbase pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	81
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 # For now disable the exra patches for libxml2 until libxml2 is updated
 # Uncomment the following lines when libxml2 is updated
 #PATCH_SITES=	https://github.com/php/php-src/commit/
 #PATCHFILES=	0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch:-p1 \
 #			061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch:-p1
 
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 		--disable-all \
 		--program-prefix="" \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--with-layout=GNU \
 		--with-libxml \
 		--with-openssl \
 		--with-password-argon2=${LOCALBASE}
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386+=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND PCRE PHPDBG ZTS
 OPTIONS_DEFAULT=	CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND PCRE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=	DTRACE
 OPTIONS_EXCLUDE_armv7=	DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=	DTRACE FPM
 OPTIONS_EXCLUDE_mips64=	DTRACE FPM
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PCRE_DESC=	Use system pcre instead of bundled one
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=	--disable-cgi
 CGI_VARS=		PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=	--disable-cli
 CLI_VARS=		PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=	--enable-debug
 DTRACE_CONFIGURE_ON=	--enable-dtrace
 EMBED_CONFIGURE_ON=	--enable-embed
 EMBED_VARS=		PHP_SAPI+=embed
 FPM_CONFIGURE_ON=	--enable-fpm \
 			--with-fpm-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php_fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 PCRE_BUILD_DEPENDS=	re2c>0:devel/re2c
 PCRE_CONFIGURE_ON=	--with-external-pcre=${LOCALBASE}
 PCRE_PLIST_SUB=	BUNDLED_PCRE="@comment "
 PCRE_PLIST_SUB_OFF=	BUNDLED_PCRE=""
 PHPDBG_CONFIGURE_ON=	--enable-phpdbg
 PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .if defined(PKGNAMEPREFIX)
 USES+=			apache
 PLIST=			${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=		${PKGDIR}/pkg-message.mod
 MODULENAME=		libphp
 SHORTMODNAME=		php
 WARNING=		"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 WARNING+=	"!!! Consider switching to php-fpm and mod_proxy_fcgi as per Apache httpd recommendations !!!"
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=${PHP_VER}" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	81
 IGNORE_WITH_PHP=	82 83 84
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=	libenchant-2.so:textproc/enchant2
 CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
 USES+=		pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=		30
 LIB_DEPENDS+=	libc-client.so.2010:mail/panda-cclient
 
 CONFIGURE_ARGS+=	--with-imap-ssl=${OPENSSLBASE} \
 			--with-imap=${LOCALBASE}
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 MYSQLND_CONFIGURE_ON=	--with-mysqli=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-mysqli=${LOCALBASE}/bin/mysql_config
 MYSQLND_USES_OFF=	mysql
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=	--enable-odbc --with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=	--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=	--with-pspell=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-libedit
 USES+=		libedit
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy5.so:www/tidy-html5
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=	--with-zip --with-zlib-dir=/usr
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache"
 CONFIGURE_ARGS+=--disable-opcache-jit
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index 80ce5b9c19e1..cfc5c35e4e2c 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -1,607 +1,607 @@
 PORTNAME=	php82
 DISTVERSION=	8.2.27
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.2.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 cpe gnome localbase pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	82
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 		--disable-all \
 		--program-prefix="" \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--with-layout=GNU \
 		--with-libxml \
 		--with-openssl \
 		--with-password-argon2=${LOCALBASE}
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386+=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND PCRE PHPDBG ZTS
 OPTIONS_DEFAULT=	CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND PCRE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=	DTRACE
 OPTIONS_EXCLUDE_armv7=	DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=	DTRACE FPM
 OPTIONS_EXCLUDE_mips64=	DTRACE FPM
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PCRE_DESC=	Use system pcre instead of bundled one
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=	--disable-cgi
 CGI_VARS=		PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=	--disable-cli
 CLI_VARS=		PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=	--enable-debug
 DTRACE_CONFIGURE_ON=	--enable-dtrace
 EMBED_CONFIGURE_ON=	--enable-embed
 EMBED_VARS=		PHP_SAPI+=embed
 FPM_CONFIGURE_ON=	--enable-fpm \
 			--with-fpm-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php_fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 PCRE_BUILD_DEPENDS=	re2c>0:devel/re2c
 PCRE_CONFIGURE_ON=	--with-external-pcre=${LOCALBASE}
 PCRE_PLIST_SUB=	BUNDLED_PCRE="@comment "
 PCRE_PLIST_SUB_OFF=	BUNDLED_PCRE=""
 PHPDBG_CONFIGURE_ON=	--enable-phpdbg
 PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .if defined(PKGNAMEPREFIX)
 USES+=			apache
 PLIST=			${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=		${PKGDIR}/pkg-message.mod
 MODULENAME=		libphp
 SHORTMODNAME=		php
 WARNING=		"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 WARNING+=	"!!! Consider switching to php-fpm and mod_proxy_fcgi as per Apache httpd recommendations !!!"
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=${PHP_VER}" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre random spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	82
 IGNORE_WITH_PHP=	81 83 84
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=	libenchant-2.so:textproc/enchant2
 CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
 USES+=		pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=		30
 LIB_DEPENDS+=	libc-client.so.2010:mail/panda-cclient
 
 CONFIGURE_ARGS+=	--with-imap-ssl=${OPENSSLBASE} \
 			--with-imap=${LOCALBASE}
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 CONFIGURE_ARGS+=	--with-mysqli
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=	--enable-odbc --with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=	--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=	--with-pspell=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-libedit
 USES+=		libedit
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 CONFIGURE_ENV+=	LOCAL_CREDS_PERSISTENT=yes
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy5.so:www/tidy-html5
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=	--with-zip --with-zlib-dir=/usr
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache"
 CONFIGURE_ARGS+=--disable-opcache-jit
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php83/Makefile b/lang/php83/Makefile
index 352023933f15..347d97c2cc20 100644
--- a/lang/php83/Makefile
+++ b/lang/php83/Makefile
@@ -1,626 +1,626 @@
 PORTNAME=	php83
 DISTVERSION=	8.3.17
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.3.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 cpe gnome localbase pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	83
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 		--disable-all \
 		--program-prefix="" \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--with-layout=GNU \
 		--with-libxml \
 		--with-openssl \
 		--with-password-argon2=${LOCALBASE}
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND NOASLR PCRE PHPDBG ZTS
 OPTIONS_DEFAULT=	CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND PCRE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=	DTRACE
 OPTIONS_EXCLUDE_armv7=	DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=	DTRACE FPM
 OPTIONS_EXCLUDE_mips64=	DTRACE FPM
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PCRE_DESC=	Use system pcre instead of bundled one
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=	--disable-cgi
 CGI_VARS=		PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=	--disable-cli
 CLI_VARS=		PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=	--enable-debug
 DTRACE_CONFIGURE_ON=	--enable-dtrace
 EMBED_CONFIGURE_ON=	--enable-embed
 EMBED_VARS=		PHP_SAPI+=embed
 FPM_CONFIGURE_ON=	--enable-fpm \
 			--with-fpm-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php_fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 NOASLR_USES=	elfctl
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 PCRE_BUILD_DEPENDS=	re2c>0:devel/re2c
 PCRE_CONFIGURE_ON=	--with-external-pcre=${LOCALBASE}
 PCRE_PLIST_SUB=	BUNDLED_PCRE="@comment "
 PCRE_PLIST_SUB_OFF=	BUNDLED_PCRE=""
 PHPDBG_CONFIGURE_ON=	--enable-phpdbg
 PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .if defined(PKGNAMEPREFIX)
 USES+=			apache
 PLIST=			${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=		${PKGDIR}/pkg-message.mod
 MODULENAME=		libphp
 SHORTMODNAME=		php
 WARNING=		"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 WARNING+=	"!!! Consider switching to php-fpm and mod_proxy_fcgi as per Apache httpd recommendations !!!"
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:NOASLR}
 .if ${PORT_OPTIONS:MCLI}
 ELF_FEATURES+=+noaslr:sapi/cli/php
 .endif
 .if ${PORT_OPTIONS:MCGI}
 ELF_FEATURES+=+noaslr:sapi/cgi/php-cgi
 .endif
 .if ${PORT_OPTIONS:MPHPDBG}
 ELF_FEATURES+=+noaslr:sapi/phpdbg/phpdbg
 .endif
 .if ${PORT_OPTIONS:MFPM}
 ELF_FEATURES+=+noaslr:sapi/fpm/php-fpm
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=${PHP_VER}" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre random spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	83
 IGNORE_WITH_PHP=	81 82 84
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=	libenchant-2.so:textproc/enchant2
 CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
 USES+=		pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=		30
 LIB_DEPENDS+=	libc-client.so.2010:mail/panda-cclient
 
 CONFIGURE_ARGS+=	--with-imap-ssl=${OPENSSLBASE} \
 			--with-imap=${LOCALBASE}
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 LIB_DEPENDS+=libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 CONFIGURE_ARGS+=	--with-mysqli
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+= --with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=	--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=	--with-pspell=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-libedit
 USES+=		libedit
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 CONFIGURE_ENV+=	LOCAL_CREDS_PERSISTENT=yes
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy5.so:www/tidy-html5
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=	--with-zip
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache"
 CONFIGURE_ARGS+=--disable-opcache-jit
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php84/Makefile b/lang/php84/Makefile
index f87b538be573..48efc225ab40 100644
--- a/lang/php84/Makefile
+++ b/lang/php84/Makefile
@@ -1,616 +1,616 @@
 PORTNAME=	php84
 DISTVERSION=	8.4.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.4.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 cpe gnome localbase pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	84
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 		--disable-all \
 		--program-prefix="" \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--with-layout=GNU \
 		--with-libxml \
 		--with-openssl \
 		--with-password-argon2=${LOCALBASE}
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND NOASLR PCRE PHPDBG ZTS
 OPTIONS_DEFAULT=	CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND PCRE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=	DTRACE
 OPTIONS_EXCLUDE_armv7=	DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=	DTRACE FPM
 OPTIONS_EXCLUDE_mips64=	DTRACE FPM
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PCRE_DESC=	Use system pcre instead of bundled one
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=	--disable-cgi
 CGI_VARS=		PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=	--disable-cli
 CLI_VARS=		PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=	--enable-debug
 DTRACE_CONFIGURE_ON=	--enable-dtrace
 EMBED_CONFIGURE_ON=	--enable-embed
 EMBED_VARS=		PHP_SAPI+=embed
 FPM_CONFIGURE_ON=	--enable-fpm \
 			--with-fpm-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php_fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 NOASLR_USES=	elfctl
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 PCRE_BUILD_DEPENDS=	re2c>0:devel/re2c
 PCRE_CONFIGURE_ON=	--with-external-pcre=${LOCALBASE}
 PCRE_PLIST_SUB=	BUNDLED_PCRE="@comment "
 PCRE_PLIST_SUB_OFF=	BUNDLED_PCRE=""
 PHPDBG_CONFIGURE_ON=	--enable-phpdbg
 PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .if defined(PKGNAMEPREFIX)
 USES+=			apache
 PLIST=			${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=		${PKGDIR}/pkg-message.mod
 MODULENAME=		libphp
 SHORTMODNAME=		php
 WARNING=		"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 WARNING+=	"!!! Consider switching to php-fpm and mod_proxy_fcgi as per Apache httpd recommendations !!!"
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:NOASLR}
 .if ${PORT_OPTIONS:MCLI}
 ELF_FEATURES+=+noaslr:sapi/cli/php
 .endif
 .if ${PORT_OPTIONS:MCGI}
 ELF_FEATURES+=+noaslr:sapi/cgi/php-cgi
 .endif
 .if ${PORT_OPTIONS:MPHPDBG}
 ELF_FEATURES+=+noaslr:sapi/phpdbg/phpdbg
 .endif
 .if ${PORT_OPTIONS:MFPM}
 ELF_FEATURES+=+noaslr:sapi/fpm/php-fpm
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=${PHP_VER}" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre random spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/Zend/zend_property_hooks.h ${STAGEDIR}${PREFIX}/include/php/Zend
 	${INSTALL_DATA} ${WRKSRC}/Zend/zend_lazy_objects.h ${STAGEDIR}${PREFIX}/include/php/Zend
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	84
 IGNORE_WITH_PHP=	81 82 83
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=	libenchant-2.so:textproc/enchant2
 CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
 USES+=		pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 LIB_DEPENDS+=libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 CONFIGURE_ARGS+=	--with-mysqli
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+= --with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 LIB_DEPENDS+=	libcapstone.so:devel/capstone
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=        --enable-opcache --with-capstone
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-libedit
 USES+=		libedit
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 CONFIGURE_ENV+=	LOCAL_CREDS_PERSISTENT=yes
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy5.so:www/tidy-html5
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=	--with-zip
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386) && ${PHP_MODNAME} == "opcache"
 post-configure:
 	@${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_fold_hash.h
 	@${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_emit.lo
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/session
 	@${CP} ${FILESDIR}/php_session.h ${WRKSRC}/ext/session
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile
index 7c81914bafc0..7e860c3844f8 100644
--- a/lang/spidermonkey102/Makefile
+++ b/lang/spidermonkey102/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	spidermonkey
 DISTVERSION=	102.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 PATCH_SITES=	https://hg.mozilla.org/mozilla-central/raw-rev/
 PATCHFILES+=	223087fdc29f18678f6174e9807b8780e439acf6:-p1 # https://bugzilla.mozilla.org/1894423
 PATCHFILES+=	68ff4d3f7338248b4d67cf03aade5a73f8d396b2:-p1 # https://bugzilla.mozilla.org/1849070
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Standalone JavaScript based from Mozilla 102-esr
 WWW=		https://spidermonkey.dev/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		autoconf2.13:devel/autoconf2.13 \
 		rust-cbindgen>=0.8.7:devel/rust-cbindgen
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libicudata.so:devel/icu \
 		libnspr4.so:devel/nspr
 
 USES=		compiler:c++17-lang gmake localbase pathfix pkgconfig \
 		python:build readline tar:xz
 USE_LDCONFIG=	yes
 SP_VER=		102
 HAS_CONFIGURE=	yes
 
 WRKSRC=			${WRKDIR}/firefox-${DISTVERSION}/
 PATCH_WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}/
 CONFIGURE_OUTSOURCE=	yes
 
 CONFIGURE_ARGS=	--enable-application=js \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-jemalloc \
 		--disable-tests \
 		--enable-optimize \
 		--enable-readline \
 		--enable-shared-js \
 		--prefix=${PREFIX:Q} \
 		--target=${CONFIGURE_TARGET} \
 		--with-intl-api \
 		--with-system-icu \
 		--with-system-nspr \
 		--with-system-zlib
 
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
 		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 USE_GCC=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
 	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} 's|"rU"|"r"|g' {} \;
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.*
 
 .include <bsd.port.post.mk>
diff --git a/lang/spidermonkey115/Makefile b/lang/spidermonkey115/Makefile
index f10003aa9b8b..9c5ab3068c9c 100644
--- a/lang/spidermonkey115/Makefile
+++ b/lang/spidermonkey115/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	spidermonkey
 DISTVERSION=	115.19.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
 		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	${SP_VER}
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 PATCH_SITES=	https://hg.mozilla.org/mozilla-central/raw-rev/
 PATCHFILES+=	223087fdc29f18678f6174e9807b8780e439acf6:-p1 # https://bugzilla.mozilla.org/1894423
 PATCHFILES+=	68ff4d3f7338248b4d67cf03aade5a73f8d396b2:-p1 # https://bugzilla.mozilla.org/1849070
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Standalone JavaScript based from Mozilla 115-esr
 WWW=		https://spidermonkey.dev/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gm4:devel/m4 \
 		${RUST_DEFAULT}>=1.81:lang/${RUST_DEFAULT} \
 		rust-cbindgen>=0.26.0:devel/rust-cbindgen
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libnspr4.so:devel/nspr
 
 USES=		compiler:c++17-lang gmake llvm:noexport localbase pathfix pkgconfig \
 		python:build tar:xz
 USE_LDCONFIG=	yes
 SP_VER=		115
 HAS_CONFIGURE=	yes
 
 WRKSRC=			${WRKDIR}/firefox-${DISTVERSION}/
 PATCH_WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}/
 CONFIGURE_OUTSOURCE=	yes
 
 CONFIGURE_ARGS=	--enable-application=js \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-jemalloc \
 		--disable-tests \
 		--enable-optimize \
 		--enable-readline \
 		--enable-shared-js \
 		--prefix=${PREFIX:Q} \
 		--target=${CONFIGURE_TARGET} \
 		--with-intl-api \
 		--with-system-icu \
 		--with-system-nspr \
 		--with-system-zlib
 
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ENV+=	LLVM_CONFIG=${LLVM_CONFIG} \
 		LLVM_OBJDUMP=llvm-objdump${LLVM_VERSION}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/llvm-objdump${LLVM_VERSION}:${LLVM_PORT}
 USE_GCC=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
 	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.*
 
 .include <bsd.port.post.mk>
diff --git a/lang/spidermonkey128/Makefile b/lang/spidermonkey128/Makefile
index 8074396e5762..b398cb706e07 100644
--- a/lang/spidermonkey128/Makefile
+++ b/lang/spidermonkey128/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	spidermonkey
 DISTVERSION=	128.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
 		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	${SP_VER}
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Standalone JavaScript based from Mozilla 128-esr
 WWW=		https://spidermonkey.dev/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gm4:devel/m4 \
 		${RUST_DEFAULT}>=1.81:lang/${RUST_DEFAULT} \
 		rust-cbindgen>=0.26.0:devel/rust-cbindgen
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libnspr4.so:devel/nspr
 
 USES=		compiler:c++17-lang gmake llvm:noexport localbase pathfix pkgconfig \
 		python:build tar:xz
 USE_LDCONFIG=	yes
 SP_VER=		128
 HAS_CONFIGURE=	yes
 
 WRKSRC=			${WRKDIR}/firefox-${DISTVERSION}/
 PATCH_WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}/
 CONFIGURE_OUTSOURCE=	yes
 
 CONFIGURE_ARGS=	--enable-application=js \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-jemalloc \
 		--disable-tests \
 		--enable-optimize \
 		--enable-readline \
 		--enable-shared-js \
 		--prefix=${PREFIX:Q} \
 		--target=${CONFIGURE_TARGET} \
 		--with-intl-api \
 		--with-system-icu \
 		--with-system-nspr \
 		--with-system-zlib
 
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ENV+=	LLVM_CONFIG=${LLVM_CONFIG} \
 		LLVM_OBJDUMP=llvm-objdump${LLVM_VERSION}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/llvm-objdump${LLVM_VERSION}:${LLVM_PORT}
 USE_GCC=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
 	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.*
 
 .include <bsd.port.post.mk>
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index 199a6a5354f5..ac79407c4d45 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	spidermonkey
 DISTVERSION=	78.15.0
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 PATCH_SITES=	https://hg.mozilla.org/mozilla-central/raw-rev/
 PATCHFILES+=	223087fdc29f18678f6174e9807b8780e439acf6:-p1 # https://bugzilla.mozilla.org/1894423
 PATCHFILES+=	68ff4d3f7338248b4d67cf03aade5a73f8d396b2:-p1 # https://bugzilla.mozilla.org/1849070
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Standalone JavaScript based from Mozilla 78-esr
 WWW=		https://spidermonkey.dev/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		autoconf2.13:devel/autoconf2.13 \
 		rust-cbindgen>=0.8.7:devel/rust-cbindgen
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libicudata.so:devel/icu \
 		libnspr4.so:devel/nspr
 
 USES=		compiler:c++17-lang gmake localbase pathfix pkgconfig python:build \
 		readline tar:xz
 USE_LDCONFIG=	yes
 SP_VER=		78
 HAS_CONFIGURE=	yes
 
 WRKSRC=			${WRKDIR}/firefox-${DISTVERSION}
 PATCH_WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}/
 CONFIGURE_OUTSOURCE=	yes
 
 CONFIGURE_ARGS=	--enable-application=js \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-gold \
 		--disable-jemalloc \
 		--disable-tests \
 		--enable-optimize \
 		--enable-readline \
 		--enable-shared-js \
 		--prefix=${PREFIX:Q} \
 		--target=${CONFIGURE_TARGET} \
 		--with-intl-api \
 		--with-system-icu \
 		--with-system-nspr \
 		--with-system-zlib
 
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
 		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 USE_GCC=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
 	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/build/pymake ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} "s|'rU'|'r'|g" {} \;
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.*
 
 .include <bsd.port.post.mk>
diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile
index d0ae1862ac87..e0937e054c1a 100644
--- a/lang/spidermonkey91/Makefile
+++ b/lang/spidermonkey91/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	spidermonkey
 DISTVERSION=	91.13.0
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 PATCH_SITES=	https://hg.mozilla.org/mozilla-central/raw-rev/
 PATCHFILES+=	223087fdc29f18678f6174e9807b8780e439acf6:-p1 # https://bugzilla.mozilla.org/1894423
 PATCHFILES+=	68ff4d3f7338248b4d67cf03aade5a73f8d396b2:-p1 # https://bugzilla.mozilla.org/1849070
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Standalone JavaScript based from Mozilla 91-esr
 WWW=		https://spidermonkey.dev/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		autoconf2.13:devel/autoconf2.13 \
 		rust-cbindgen>=0.8.7:devel/rust-cbindgen
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libicudata.so:devel/icu \
 		libnspr4.so:devel/nspr
 
 USES=		compiler:c++17-lang gmake localbase pathfix pkgconfig \
 		python:build readline tar:xz
 USE_LDCONFIG=	yes
 SP_VER=		91
 HAS_CONFIGURE=	yes
 
 WRKSRC=			${WRKDIR}/firefox-${DISTVERSION}/
 PATCH_WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}/
 CONFIGURE_OUTSOURCE=	yes
 
 CONFIGURE_ARGS=	--enable-application=js \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-gold \
 		--disable-jemalloc \
 		--disable-tests \
 		--enable-optimize \
 		--enable-readline \
 		--enable-shared-js \
 		--prefix=${PREFIX:Q} \
 		--target=${CONFIGURE_TARGET} \
 		--with-intl-api \
 		--with-system-icu \
 		--with-system-nspr \
 		--with-system-zlib
 
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 USES+=	llvm:max=15
 CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_VERSION} \
 		LLVM_OBJDUMP=llvm-objdump${LLVM_VERSION}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
 		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 USE_GCC=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
 	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} 's|"rU"|"r"|g' {} \;
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.*
 
 .include <bsd.port.post.mk>
diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile
index 5226d4a37619..5bd90d9ae1e6 100644
--- a/lang/urweb/Makefile
+++ b/lang/urweb/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	urweb
 PORTVERSION=	20200209
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang www
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Ultimate host for embedded domain-specific languages
 WWW=		http://www.impredicative.com/ur/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	mlton:lang/mlton
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libicudata.so:devel/icu
 
 USES=		autoreconf gmake libtool ssl tar:tgz
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 CONFIGURE_ENV=		CCARGS="-I${LOCALBASE}/include"
 
 CFLAGS+=	-pthread
 
 OPTIONS_DEFINE=		ELISP PGSQL SQLITE
 OPTIONS_DEFAULT=	ELISP PGSQL
 OPTIONS_EXCLUDE=	DOCS NLS
 OPTIONS_SUB=		yes
 
 ELISP_DESC=	Install contributed Emacs Lisp
 
 ELISP_CONFIGURE_ON=		with_emacs=yes
 ELISP_CONFIGURE_OFF=		with_emacs=no
 PGSQL_USES=			pgsql
 PGSQL_CONFIGURE_ENV_OFF=	PGHEADER="no"
 PGSQL_VARS=			WANT_PGSQL=server
 SQLITE_USES=			sqlite
 SQLITE_CONFIGURE_ENV_OFF=	SQHEADER="no"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|postgresql/libpq-fe.h|libpq-fe.h|g" \
 		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e "s|uw_Basis_int true|uw_Basis_int utrue|" \
 		-e "s|uw_Basis_int false|uw_Basis_int ufalse|" \
 		-e "s|uw_Basis_bool true|uw_Basis_bool utrue|" \
 		-e "s|uw_Basis_bool false|uw_Basis_bool ufalse|" \
 		-e "s|\&true|\&utrue|g" -e "s|\&false|\&ufalse|g" \
 		-e "s|abs(ret)|llabs(ret)|" \
 		${WRKSRC}/src/c/urweb.c
 
 .include <bsd.port.mk>
diff --git a/lang/v8-beta/Makefile b/lang/v8-beta/Makefile
index e0fbef20aac9..95b567da13ec 100644
--- a/lang/v8-beta/Makefile
+++ b/lang/v8-beta/Makefile
@@ -1,120 +1,120 @@
 # We follow the beta channel on https://omahaproxy.appspot.com/
 # https://chromium.googlesource.com/v8/v8/+/refs/heads/10.4-lkgr
 
 PORTNAME=	v8
 PORTVERSION=	10.4.132.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/sunpoet/v8/${PORTVERSION:R:R}:local
 PKGNAMESUFFIX=	-beta
 DISTFILES=	build-${BUILD_REV}.tar.gz:local \
 		buildtools-${BUILDTOOLS_REV}.tar.gz:local \
 		clang-${CLANG_REV}.tar.gz:local \
 		common-${COMMON_REV}.tar.gz:local \
 		googletest-${GOOGLETEST_REV}.tar.gz:local \
 		icu-${ICU_REV}.tar.gz:local \
 		zlib-${ZLIB_REV}.tar.gz:local
 DIST_SUBDIR=	v8/${PORTVERSION:R:R}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open source JavaScript engine by Google
 WWW=		https://v8.dev/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 BUILD_DEPENDS=	binutils>=0:devel/binutils \
 		gn:devel/gn \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR}
 LIB_DEPENDS=	libicudata.so:devel/icu
 
 USES=		compiler:c++17-lang cpe gnome ninja pkgconfig python:build tar:xz
 USE_GNOME=	glib20
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 MAKE_ARGS=	-C out/Release
 USE_LDCONFIG=	yes
 
 SUB_FILES=	v8.pc v8_libbase.pc v8_libplatform.pc
 
 USE_GITHUB=	yes
 
 CPE_VENDOR=	google
 
 CONFLICTS_INSTALL=	v8
 
 BUILD_REV=	a56852668f892151fc97343b57af15e82db2e798
 BUILDTOOLS_REV=	8b16338d17cd71b04a6ba28da7322ab6739892c2
 CLANG_REV=	4e79fda976d9c3f12c8bfbec297bd27dd70a1343
 COMMON_REV=	d115b033c4e53666b535cbd1985ffe60badad082
 GOOGLETEST_REV=	af29db7ec28d6df1c7f0f745186884091e602e07
 ICU_REV=	165825933050109d8331d0faa56cc9f52460fbbf
 ZLIB_REV=	64bbf988543996eb8df9a86877b32917187eba8f
 
 # Run "gn args --list out/Release" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}" \
 		is_clang=true \
 		is_component_build=true \
 		is_debug=false \
 		treat_warnings_as_errors=false \
 		use_aura=true \
 		use_lld=true \
 		use_custom_libcxx=false \
 		v8_use_external_startup_data=false
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/base/trace_event/common ${WRKSRC}/build ${WRKSRC}/buildtools ${WRKSRC}/third_party/googletest/src ${WRKSRC}/third_party/icu ${WRKSRC}/third_party/zlib ${WRKSRC}/tools/clang
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/build-${BUILD_REV}.tar.gz -C ${WRKSRC}/build
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/buildtools-${BUILDTOOLS_REV}.tar.gz -C ${WRKSRC}/buildtools
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/clang-${CLANG_REV}.tar.gz -C ${WRKSRC}/tools/clang
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/common-${COMMON_REV}.tar.gz -C ${WRKSRC}/base/trace_event/common
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/googletest-${GOOGLETEST_REV}.tar.gz -C ${WRKSRC}/third_party/googletest/src
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/icu-${ICU_REV}.tar.gz -C ${WRKSRC}/third_party/icu
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/zlib-${ZLIB_REV}.tar.gz -C ${WRKSRC}/third_party/zlib
 
 post-patch:
 	@${REINPLACE_CMD} -i '' 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/build/toolchain/gcc_toolchain.gni ${WRKSRC}/buildtools/third_party/libc++/BUILD.gn
 	# https://github.com/klzgrad/naiveproxy/blob/master/src/build/config/gclient_args.gni
 	@${ECHO_CMD} 'checkout_google_benchmark = false' > ${WRKSRC}/build/config/gclient_args.gni
 
 # Use ICU from ports and create needed directory
 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} ./build/linux/unbundle/replace_gn_files.py --system-libraries icu # || ${FALSE}
 	@${MKDIR} ${WRKSRC}/out/Release/gen/shim_headers/icui18n_shim/third_party/icu/source/i18n/unicode ${WRKSRC}/out/Release/gen/shim_headers/icuuc_shim/third_party/icu/source/common/unicode
 	@${MKDIR} ${WRKSRC}/out/Release/gen/include
 	@${CP} -R ${LOCALBASE}/include/unicode ${WRKSRC}/out/Release/gen/include/unicode
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} gn gen out/Release --args='${GN_ARGS}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/cppgc ${STAGEDIR}${PREFIX}/include/libplatform
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/d8 ${STAGEDIR}${PREFIX}/bin/d8
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/mkgrokdump ${STAGEDIR}${PREFIX}/bin/mkgrokdump
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/mksnapshot ${STAGEDIR}${PREFIX}/bin/mksnapshot
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/v8_shell ${STAGEDIR}${PREFIX}/bin/v8_shell
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libchrome_zlib.so ${STAGEDIR}${PREFIX}/lib/libchrome_zlib.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libcppgc.so ${STAGEDIR}${PREFIX}/lib/libcppgc.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libv8.so ${STAGEDIR}${PREFIX}/lib/libv8.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libv8_libbase.so ${STAGEDIR}${PREFIX}/lib/libv8_libbase.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libv8_libplatform.so ${STAGEDIR}${PREFIX}/lib/libv8_libplatform.so
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include/
 	cd ${WRKSRC}/include/cppgc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/cppgc '-name *\.h'
 	${INSTALL_DATA} ${WRKSRC}/include/libplatform/*.h ${STAGEDIR}${PREFIX}/include/libplatform/
 	${INSTALL_DATA} ${WRKDIR}/v8*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/v8_simple_* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index d58b89fdae38..ad51057f5346 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -1,119 +1,119 @@
 # We follow the stable channel on https://omahaproxy.appspot.com/
 # https://chromium.googlesource.com/v8/v8/+/refs/heads/10.4-lkgr
 
 PORTNAME=	v8
 PORTVERSION=	10.4.132.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/sunpoet/v8/${PORTVERSION:R:R}:local
 DISTFILES=	build-${BUILD_REV}.tar.gz:local \
 		buildtools-${BUILDTOOLS_REV}.tar.gz:local \
 		clang-${CLANG_REV}.tar.gz:local \
 		common-${COMMON_REV}.tar.gz:local \
 		googletest-${GOOGLETEST_REV}.tar.gz:local \
 		icu-${ICU_REV}.tar.gz:local \
 		zlib-${ZLIB_REV}.tar.gz:local
 DIST_SUBDIR=	v8/${PORTVERSION:R:R}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open source JavaScript engine by Google
 WWW=		https://v8.dev/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 BUILD_DEPENDS=	binutils>=0:devel/binutils \
 		gn:devel/gn \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR}
 LIB_DEPENDS=	libicudata.so:devel/icu
 
 USES=		compiler:c++17-lang cpe gnome ninja pkgconfig python:build tar:xz
 USE_GNOME=	glib20
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 MAKE_ARGS=	-C out/Release
 USE_LDCONFIG=	yes
 
 SUB_FILES=	v8.pc v8_libbase.pc v8_libplatform.pc
 
 USE_GITHUB=	yes
 
 CPE_VENDOR=	google
 
 CONFLICTS_INSTALL=	v8-beta
 
 BUILD_REV=	a56852668f892151fc97343b57af15e82db2e798
 BUILDTOOLS_REV=	8b16338d17cd71b04a6ba28da7322ab6739892c2
 CLANG_REV=	4e79fda976d9c3f12c8bfbec297bd27dd70a1343
 COMMON_REV=	d115b033c4e53666b535cbd1985ffe60badad082
 GOOGLETEST_REV=	af29db7ec28d6df1c7f0f745186884091e602e07
 ICU_REV=	165825933050109d8331d0faa56cc9f52460fbbf
 ZLIB_REV=	64bbf988543996eb8df9a86877b32917187eba8f
 
 # Run "gn args --list out/Release" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}" \
 		is_clang=true \
 		is_component_build=true \
 		is_debug=false \
 		treat_warnings_as_errors=false \
 		use_aura=true \
 		use_lld=true \
 		use_custom_libcxx=false \
 		v8_use_external_startup_data=false
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/base/trace_event/common ${WRKSRC}/build ${WRKSRC}/buildtools ${WRKSRC}/third_party/googletest/src ${WRKSRC}/third_party/icu ${WRKSRC}/third_party/zlib ${WRKSRC}/tools/clang
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/build-${BUILD_REV}.tar.gz -C ${WRKSRC}/build
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/buildtools-${BUILDTOOLS_REV}.tar.gz -C ${WRKSRC}/buildtools
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/clang-${CLANG_REV}.tar.gz -C ${WRKSRC}/tools/clang
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/common-${COMMON_REV}.tar.gz -C ${WRKSRC}/base/trace_event/common
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/googletest-${GOOGLETEST_REV}.tar.gz -C ${WRKSRC}/third_party/googletest/src
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/icu-${ICU_REV}.tar.gz -C ${WRKSRC}/third_party/icu
 	@${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/zlib-${ZLIB_REV}.tar.gz -C ${WRKSRC}/third_party/zlib
 
 post-patch:
 	@${REINPLACE_CMD} -i '' 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/build/toolchain/gcc_toolchain.gni ${WRKSRC}/buildtools/third_party/libc++/BUILD.gn
 	# https://github.com/klzgrad/naiveproxy/blob/master/src/build/config/gclient_args.gni
 	@${ECHO_CMD} 'checkout_google_benchmark = false' > ${WRKSRC}/build/config/gclient_args.gni
 
 # Use ICU from ports and create needed directory
 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} ./build/linux/unbundle/replace_gn_files.py --system-libraries icu # || ${FALSE}
 	@${MKDIR} ${WRKSRC}/out/Release/gen/shim_headers/icui18n_shim/third_party/icu/source/i18n/unicode ${WRKSRC}/out/Release/gen/shim_headers/icuuc_shim/third_party/icu/source/common/unicode
 	@${MKDIR} ${WRKSRC}/out/Release/gen/include
 	@${CP} -R ${LOCALBASE}/include/unicode ${WRKSRC}/out/Release/gen/include/unicode
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} gn gen out/Release --args='${GN_ARGS}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/cppgc ${STAGEDIR}${PREFIX}/include/libplatform
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/d8 ${STAGEDIR}${PREFIX}/bin/d8
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/mkgrokdump ${STAGEDIR}${PREFIX}/bin/mkgrokdump
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/mksnapshot ${STAGEDIR}${PREFIX}/bin/mksnapshot
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/v8_shell ${STAGEDIR}${PREFIX}/bin/v8_shell
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libchrome_zlib.so ${STAGEDIR}${PREFIX}/lib/libchrome_zlib.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libcppgc.so ${STAGEDIR}${PREFIX}/lib/libcppgc.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libv8.so ${STAGEDIR}${PREFIX}/lib/libv8.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libv8_libbase.so ${STAGEDIR}${PREFIX}/lib/libv8_libbase.so
 	${INSTALL_LIB} ${WRKSRC}/out/Release/libv8_libplatform.so ${STAGEDIR}${PREFIX}/lib/libv8_libplatform.so
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include/
 	cd ${WRKSRC}/include/cppgc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/cppgc '-name *\.h'
 	${INSTALL_DATA} ${WRKSRC}/include/libplatform/*.h ${STAGEDIR}${PREFIX}/include/libplatform/
 	${INSTALL_DATA} ${WRKDIR}/v8*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/Release/v8_simple_* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 2ab476bb0322..7ca153b3a69d 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,220 +1,220 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.0.18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	30
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
 WWW=		https://www.cyrusimap.org/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/imapopts.c: Error 1
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \
 			MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \
 			DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 HTTP_DESC=		Enable HTTP support
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 			libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LMDB_DESC=		Use LMDB backend
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_WITH=	lmdb
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb cyr_backup \
 		cyr_buildinfo cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \
 		cyr_synclog cyr_virusscan deliver fud idled imapd ipurge lmtpd \
 		master mbexamine mbpath mbtool notifyd pop3d quota reconstruct \
 		restore smmapd timsieved tls_prune unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/masssievec
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
index d3a63538dcf5..0eaf2efdfbbc 100644
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,273 +1,273 @@
 PORTNAME=	cyrus-imapd
 DISTVERSION=	3.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	310
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libical.so:devel/libical
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/cyr_cd.sh imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED JMAP LDAP \
 			MURDER MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT \
 			SRS XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED PCRE2 READLINE_GNU REPLICATION SQLITE \
 			SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLD2_DESC=		Use CLD2
 CLD2_CONFIGURE_WITH=	cld2
 CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
 HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli \
 			libwslay_shared.so:www/wslay \
 			libzstd.so:archivers/zstd
 HTTP_BUILD_DEPENDS=	xxd:sysutils/xxd
 HTTP_RUN_DEPENDS=	${HTTP_BUILD_DEPENDS}
 HTTP_CONFIGURE_ENV=	WSLAY_CFLAGS="-I${LOCALBASE}/include" \
 			WSLAY_LIBS="-L${LOCALBASE}/lib -lwslay_shared"
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 # XXX: HTTP requires JMAP
 HTTP_IMPLIES=		JMAP
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 JMAP_DESC=		Enable JMAP support
 JMAP_CONFIGURE_ENABLE=	jmap
 JMAP_IMPLIES=		HTTP XAPIAN
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
 		notifyd pop3d pop3proxyd promstatsd proxyd ptdump ptexpire \
 		ptloader quota reconstruct relocate_by_id restore sievec \
 		sieved smmapd timsieved tls_prune unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::Shell \
 		Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index 0cfdc64d8228..e0bbfccee465 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,243 +1,243 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.2.12
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	32
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
 WWW=		https://www.cyrusimap.org/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[013-] cyrus-imapd3[013-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/promdatagen snmp/snmpgen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SNMP SQLITE SQUAT \
 			SRS XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT SRS
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 HTTP_DESC=		Enable HTTP support
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 			libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_synclog cyr_userseen \
 		cyr_virusscan cyradm cyrdump deliver fud idled imapd ipurge \
 		lmtpd lmtpproxyd master mbexamine mbpath mbtool notifyd pop3d \
 		pop3proxyd promstatsd proxyd ptdump ptexpire ptloader quota \
 		reconstruct restore sievec sieved smmapd timsieved tls_prune \
 		unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index d5e61b5e960f..74368dfcd778 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,264 +1,264 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.4.9
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	34
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-35-] cyrus-imapd3[0-35-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU SQLITE SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 
 # OPTIONS_DEFINE+=	CLD2
 # OPTIONS_DEFAULT+=	CLD2
 # CLD2_DESC=		Use CLD2
 # CLD2_CONFIGURE_WITH=	cld2
 # CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 # 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 # CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 
 HTTP_DESC=		Enable HTTP support
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 			libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_synclog cyr_userseen \
 		cyr_virusscan cyradm cyrdump deliver fud idled imapd ipurge \
 		lmtpd lmtpproxyd master mbexamine mbpath mbtool notifyd pop3d \
 		pop3proxyd promstatsd proxyd ptdump ptexpire ptloader quota \
 		reconstruct restore sievec sieved smmapd timsieved tls_prune \
 		unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 9c65fb3e73a5..19a6b554453b 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -1,265 +1,265 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.6.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	36
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libical.so:devel/libical
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/cyr_cd.sh imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU SQLITE SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLD2_DESC=		Use CLD2
 CLD2_CONFIGURE_WITH=	cld2
 CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
 HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli \
 			libwslay_shared.so:www/wslay \
 			libzstd.so:archivers/zstd
 HTTP_CONFIGURE_ENV=	WSLAY_CFLAGS="-I${LOCALBASE}/include" \
 			WSLAY_LIBS="-L${LOCALBASE}/lib -lwslay_shared"
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
 		notifyd pop3d pop3proxyd promstatsd proxyd ptdump ptexpire \
 		ptloader quota reconstruct relocate_by_id restore sievec \
 		sieved smmapd timsieved tls_prune unexpunge
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::Shell \
 		Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile
index f534b3dcc2b5..46979e2c78b0 100644
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -1,267 +1,267 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.8.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols ${COMMENT_${FLAVOR}}
 WWW=		https://www.cyrusimap.org/
 COMMENT_http=	(with HTTP)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: lib/chartable.c: Error 1
 
 FLAVORS=	basic http
 http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	38
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libical.so:devel/libical
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
 USE_RC_SUBR=	imapd
 CYRUS_PREFIX=	${PREFIX}/cyrus
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 USES+=		shebangfix
 SHEBANG_FILES=	imap/cyr_cd.sh imap/promdatagen tools/config2header \
 		tools/masssievec tools/mkimap tools/translatesieve \
 		perl/sieve/scripts/*.pl
 
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT SRS \
 			XAPIAN DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU REPLICATION SQLITE \
 			SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
 .endif
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BACKUP_DESC=		Enable backup support (experimental)
 BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLD2_DESC=		Use CLD2
 CLD2_CONFIGURE_WITH=	cld2
 CLD2_CONFIGURE_ENV=	CLD2_CFLAGS="-I${LOCALBASE}/include" \
 			CLD2_LIBS="-L${LOCALBASE}/lib -lcld2"
 CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
 HTTP_DESC=		Enable HTTP support
 HTTP_IMPLIES=		SQLITE
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 			libshp.so:devel/shapelib \
 			libbrotlidec.so:archivers/brotli \
 			libwslay_shared.so:www/wslay \
 			libzstd.so:archivers/zstd
 HTTP_CONFIGURE_ENV=	WSLAY_CFLAGS="-I${LOCALBASE}/include" \
 			WSLAY_LIBS="-L${LOCALBASE}/lib -lwslay_shared"
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
 HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CONFIGURE_OFF=	--without-ldap
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
 PCRE2_DESC=		Use PCRE2 rather than PCRE
 PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
 PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_ON=	--disable-pcre
 PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 REPLICATION_DESC=	Enable replication
 REPLICATION_CONFIGURE_ENABLE=replication
 SRS_DESC=		Enable Sender Rewriting Scheme support
 SRS_CONFIGURE_ENABLE=	srs
 SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 SQLITE_BROKEN_OFF=	SQLITE is required
 SQUAT_DESC=		Enable Squat support
 SQUAT_CONFIGURE_OFF=	--disable-squat
 XAPIAN_DESC=		Enable Xapian support
 XAPIAN_CONFIGURE_ENABLE=xapian
 XAPIAN_LIB_DEPENDS=	libxapian.so:databases/xapian-core
 XAPIAN_BUILD_DEPENDS=	rsync:net/rsync
 XAPIAN_RUN_DEPENDS=	${XAPIAN_BUILD_DEPENDS}
 
 OPTIONS_RADIO=			GSSAPI READLINE
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 OPTIONS_DEFAULT+=		GSSAPI_BASE
 .endif
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 OPTIONS_RADIO_READLINE=		READLINE_GNU READLINE_PERL
 READLINE_GNU_DESC=		Use Term::Readline::GNU for cyradm
 READLINE_GNU_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_PERL_DESC=		Use Term::Readline::Perl for cyradm
 READLINE_PERL_RUN_DEPENDS=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
 CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
 		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
 		notifyd pop3d pop3proxyd promstatsd proxyd ptdump ptexpire \
 		ptloader quota reconstruct relocate_by_id restore sievec \
 		sieved smmapd timsieved tls_prune unexpunge
 
 CYRUS_PERL_MAN1=cyradm
 CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::Shell \
 		Cyrus::SIEVE::managesieve
 
 INSTALL_TARGET=	install-strip
 
 REINPLACE_ARGS=	-i ''
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
     !${PORT_OPTIONS:MGSSAPI_MIT}
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
 CYRUS_MAN8+=	ctl_zoneinfo httpd
 MAN_MAN1+=	dav_reconstruct
 .endif
 .if ${PORT_OPTIONS:MNNTP}
 CYRUS_MAN8+=	fetchnews nntpd
 .endif
 .if ${PORT_OPTIONS:MMURDER}
 CYRUS_MAN8+=	mupdate
 .endif
 .if ${PORT_OPTIONS:MREPLICATION}
 CYRUS_MAN8+=	sync_client sync_reset sync_server
 .endif
 .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN}
 CYRUS_MAN8+=	squatter
 PLIST_SUB+=	SQUATTER=""
 .else
 PLIST_SUB+=	SQUATTER="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 		${WRKSRC}/tools/mkimap
 .for f in masssievec translatesieve
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
 		-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
 	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
 		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
 		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .if !${PORT_OPTIONS:MHTTP}
 	${REINPLACE_CMD} -e 's/^\(  http\)/#\1/' \
 		${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 .endif
 .for f in mkimap masssievec translatesieve
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
 .for s in 1 3 5
 .  for m in ${MAN_MAN${s}}
 	@${ECHO_CMD} share/man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for s in 1 3
 .  for m in ${CYRUS_PERL_MAN${s}}
 	@${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
 .  endfor
 .endfor
 .for m in ${CYRUS_MAN8}
 	@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo )"
 	${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-fts-flatcurve/Makefile b/mail/dovecot-fts-flatcurve/Makefile
index fa52db9e38c0..938e0e796df3 100644
--- a/mail/dovecot-fts-flatcurve/Makefile
+++ b/mail/dovecot-fts-flatcurve/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	fts-flatcurve
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
 MAINTAINER=	martin@waschbuesch.de
 COMMENT=	Dovecot FTS plugin based on Xapian
 WWW=		https://github.com/slusarz/dovecot-fts-flatcurve
 
 LICENSE=	LGPL21
 
 FLAVORS=        default mysql pgsql
 FLAVOR?=        ${FLAVORS[1]}
 mysql_PKGNAMESUFFIX=    -mysql
 pgsql_PKGNAMESUFFIX=    -pgsql
 BUILD_DEPENDS=  dovecot>=2.3.17:mail/dovecot@default
 RUN_DEPENDS=    dovecot>=2.3.17:mail/dovecot@default
 .if ${FLAVOR:U} == mysql
 BUILD_DEPENDS=  dovecot-mysql>=2.3.17:mail/dovecot@mysql
 RUN_DEPENDS=    dovecot-mysql>=2.3.17:mail/dovecot@mysql
 .endif
 .if ${FLAVOR:U} == pgsql
 BUILD_DEPENDS=  dovecot-pgsql>=2.3.17:mail/dovecot@pgsql
 RUN_DEPENDS=    dovecot-pgsql>=2.3.17:mail/dovecot@pgsql
 .endif
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core
 
 USES=		autoreconf libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	slusarz
 GH_PROJECT=	dovecot-fts-flatcurve
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	include/dovecot-fts-flatcurve/fts-flatcurve-config.h \
 		lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.a \
 		lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.so \
 		lib/dovecot/lib21_fts_flatcurve_plugin.a \
 		lib/dovecot/lib21_fts_flatcurve_plugin.so
 
 post-install:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_flatcurve_plugin.so
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/doveadm/lib21_doveadm_fts_flatcurve_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index 40409fe7915e..2eca715e5e1c 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	fts-xapian
 DISTVERSION=	1.8.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/grosjo/fts-xapian/releases/download/${DISTVERSIONFULL}/
 PKGNAMEPREFIX=	dovecot-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Dovecot FTS plugin based on Xapian
 WWW=		https://github.com/grosjo/fts-xapian
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core
 RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 
 USES=		autoreconf compiler:c++11-lang libtool pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONFULL}
 
 PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
 		lib/dovecot/lib21_fts_xapian_plugin.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
 
 .include <bsd.port.mk>
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 79f1b8caaaa6..3b5241f82ec5 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	evolution-ews
 DISTVERSION=	3.44.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
 WWW=		https://wiki.gnome.org/Apps/Evolution
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libfribidi.so:converters/fribidi \
 		libicuuc.so:devel/icu \
 		libmspack.so:archivers/libmspack \
 		libsecret-1.so:security/libsecret \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libical.so:devel/libical \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 cmake gettext gnome localbase pathfix \
 		pkgconfig sqlite tar:xz
 USE_GNOME=	cairo gdkpixbuf2 evolutiondataserver3 intltool
 
 .include <bsd.port.mk>
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 15d04882c876..ce70e937c115 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,141 +1,141 @@
 PORTNAME=	evolution
 DISTVERSION=	3.44.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 WWW=		https://wiki.gnome.org/Apps/Evolution
 
 LICENSE=	GFDL GPLv2+ LGPL21+ MPL11 OPENLDAP
 LICENSE_COMB=	multi
 LICENSE_NAME_OPENLDAP=	OpenLDAP Public License
 LICENSE_FILE_OPENLDAP=	${WRKSRC}/COPYING.OPENLDAP
 LICENSE_PERMS_OPENLDAP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	highlight:textproc/highlight \
 		iso-codes>=0:misc/iso-codes \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libcryptui.so:security/libcryptui \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libenchant-2.so:textproc/enchant2 \
 		libenchant.so:textproc/enchant \
 		libfribidi.so:converters/fribidi \
 		libgcr-base-3.so:security/gcr3 \
 		libgnome-autoar-gtk-0.so:archivers/gnome-autoar \
 		libgspell-1.so:textproc/gspell \
 		libgtkspell3-3.so:textproc/gtkspell3 \
 		libical.so:devel/libical \
 		libicuuc.so:devel/icu \
 		libnotify.so:devel/libnotify \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libp11-kit.so:security/p11-kit \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	highlight:textproc/highlight \
 		iso-codes>=0:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
 USES=		cmake compiler:c11 cpe desktop-file-utils gettext gnome \
 		iconv:wchar_t libarchive localbase pathfix pkgconfig sqlite \
 		tar:xz xorg
 USE_GNOME=	cairo evolutiondataserver3 glib20 gnomedesktop3 intltool
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
 CMAKE_ARGS=	-DENABLE_TEXT_HIGHLIGHT=YES \
 		-DVERSION_COMMENT="FreeBSD GNOME Team" \
 		-DWITH_ENCHANT_VERSION=2
 
 GLIB_SCHEMAS=	org.gnome.evolution.addressbook.gschema.xml \
 		org.gnome.evolution.bogofilter.gschema.xml \
 		org.gnome.evolution.calendar.gschema.xml \
 		org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.importer.gschema.xml \
 		org.gnome.evolution.mail.gschema.xml \
 		org.gnome.evolution.plugin.attachment-reminder.gschema.xml \
 		org.gnome.evolution.plugin.autocontacts.gschema.xml \
 		org.gnome.evolution.plugin.email-custom-header.gschema.xml \
 		org.gnome.evolution.plugin.external-editor.gschema.xml \
 		org.gnome.evolution.plugin.face-picture.gschema.xml \
 		org.gnome.evolution.plugin.itip.gschema.xml \
 		org.gnome.evolution.plugin.mail-notification.gschema.xml \
 		org.gnome.evolution.plugin.prefer-plain.gschema.xml \
 		org.gnome.evolution.plugin.publish-calendar.gschema.xml \
 		org.gnome.evolution.plugin.sender-validator.gschema.xml \
 		org.gnome.evolution.plugin.templates.gschema.xml \
 		org.gnome.evolution.shell.gschema.xml \
 		org.gnome.evolution.spamassassin.gschema.xml \
 		org.gnome.evolution.text-highlight.gschema.xml
 
 EVO_VERSION=	3.24
 PLIST_SUB=	PORTVERSION=2.12 \
 		VERSION=${EVO_VERSION}
 
 OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		CANBERRA LDAP MAPS MARKDOWN PST WEATHER YTNEF
 OPTIONS_DEFAULT=	BOGOFILTER CANBERRA LDAP MARKDOWN WEATHER
 
 SPAM_DESC=		Spam filter support
 OPTIONS_GROUP=		SPAM
 OPTIONS_GROUP_SPAM=	BOGOFILTER SPAMASSASSIN
 
 LDAP_CMAKE_ON=	-DWITH_OPENLDAP=${LOCALBASE}
 LDAP_CMAKE_OFF=	-DWITH_OPENLDAP=OFF
 LDAP_USES=	ldap
 
 YTNEF_DESC=		Support MS Outlook TNEF format
 YTNEF_LIB_DEPENDS=	libytnef.so:converters/ytnef
 YTNEF_CMAKE_BOOL=	ENABLE_YTNEF
 
 WEATHER_DESC=		Weather calendar backend
 WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
 WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
 
 SPAMASSASSIN_DESC=		SpamAssassin spam filtering
 SPAMASSASSIN_CMAKE_ON=		-DWITH_SA_LEARN=${LOCALBASE}/bin/sa-learn \
 				-DWITH_SPAMASSASSIN=${LOCALBASE}/spamassassin
 SPAMASSASSIN_CMAKE_OFF=		-DWITH_SPAMASSASSIN=NO
 SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:mail/spamassassin
 SPAMASSASSIN_RUN_DEPENDS=	spamassassin:mail/spamassassin
 
 BOGOFILTER_DESC=		Bogofilter spam filtering
 BOGOFILTER_CMAKE_ON=		-DWITH_BOGOFILTER=${LOCALBASE}/bin/bogofilter
 BOGOFILTER_CMAKE_OFF=		-DWITH_BOGOFILTER=OFF
 BOGOFILTER_BUILD_DEPENDS=	bogofilter:mail/bogofilter
 BOGOFILTER_RUN_DEPENDS=		bogofilter:mail/bogofilter
 
 CANBERRA_DESC=		Canberra theme audio plugin
 CANBERRA_LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 			libcanberra.so:audio/libcanberra
 CANBERRA_CMAKE_BOOL=	ENABLE_CANBERRA
 
 PST_DESC=		Outlook .pst importer
 PST_CMAKE_BOOL=		ENABLE_PST_IMPORT
 PST_BUILD_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 PST_RUN_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 
 MAPS_DESC=		Contact maps
 MAPS_CMAKE_BOOL=	ENABLE_CONTACT_MAPS
 MAPS_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
 			libclutter-1.0.so:graphics/clutter \
 			libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 			libcogl.so:graphics/cogl \
 			libgeocode-glib.so:net/geocode-glib \
 			libjson-glib-1.0.so:devel/json-glib
 MAPS_USES=		gl xorg
 MAPS_USE=		GL=egl \
 			XORG=xcomposite,xdamage,xext,xfixes,xi,xrandr
 
 MARKDOWN_CMAKE_ON=	-DENABLE_MARKDOWN=ON
 MARKDOWN_CMAKE_OFF=	-DENABLE_MARKDOWN=OFF
 MARKDOWN_LIB_DEPENDS=	libcmark.so:textproc/cmark
 
 .include <bsd.port.mk>
diff --git a/mail/exim-postgresql/Makefile b/mail/exim-postgresql/Makefile
index 2fc66806b123..d5dc9ddb79cb 100644
--- a/mail/exim-postgresql/Makefile
+++ b/mail/exim-postgresql/Makefile
@@ -1,6 +1,7 @@
+PORTREVISION=	1
 PKGNAMESUFFIX=	-postgresql
 MASTERDIR=	${.CURDIR}/../exim
 
 OPTIONS_SLAVE=	PGSQL
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/exim-sqlite/Makefile b/mail/exim-sqlite/Makefile
index 18084aa5be02..9fb64ef307c9 100644
--- a/mail/exim-sqlite/Makefile
+++ b/mail/exim-sqlite/Makefile
@@ -1,6 +1,7 @@
+PORTREVISION=	1
 PKGNAMESUFFIX=	-sqlite
 MASTERDIR=	${.CURDIR}/../exim
 
 OPTIONS_SLAVE=	SQLITE
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 20fb4911e179..63d973456172 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	geary
 PORTVERSION=	40.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/geary/-/commit/
 PATCHFILES=	0f75e7a84a39492d0748cec2ba6028e08cae3644.diff:-p1 \
 		4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff:-p1 \
 		9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff:-p1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mail client for GNOME
 WWW=		https://wiki.gnome.org/Apps/Geary
 
 LICENSE=	BSD2CLAUSE CC-BY-3.0 LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		libcanberra.so:audio/libcanberra \
 		libenchant-2.so:textproc/enchant2 \
 		libfolks.so:net-im/folks \
 		libgcr-base-3.so:security/gcr3 \
 		libgee-0.8.so:devel/libgee \
 		libgmime-3.0.so:mail/gmime30 \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgspell-1.so:textproc/gspell \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libicuuc.so:devel/icu \
 		libjson-glib-1.0.so:devel/json-glib \
 		libnotify.so:devel/libnotify \
 		libpeas-gtk-1.0.so:devel/libpeas \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libytnef.so:converters/ytnef
 
 USES=		compiler:c11 cpe desktop-file-utils gettext gnome meson pkgconfig \
 		python:build shebangfix sqlite tar:xz vala:build
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gsound gtk30 libxml2
 GLIB_SCHEMAS=	org.gnome.Geary.gschema.xml
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	desktop/geary-attach
 
 MESON_ARGS=	-Dprofile=release -Dvaladoc=disabled
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 CFLAGS+=	-Wno-error=int-conversion
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 0e00c0e5112b..8c2f29001665 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,450 +1,450 @@
 PORTNAME=	postfix
 DISTVERSION=	3.10-20241027
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	6
 CATEGORIES=	mail
 MASTER_SITES=	https://postfix-mirror.horus-it.com/postfix-release/ \
 		http://ftp.porcupine.org/mirrors/postfix-release/ \
 		http://de.postfix.org/ftpmirror/ \
 		http://www.artfiles.org/postfix.org/postfix-release/ \
 		http://mirror.lhsolutions.nl/postfix-release/ \
 		ftp://postfix.mirrors.pair.com/
 MASTER_SITES:=	${MASTER_SITES:S|$|experimental/|}
 PKGNAMESUFFIX=	-current
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Experimental Postfix version ${COMMENT_${FLAVOR}}
 WWW=		https://www.postfix.org/
 
 LICENSE=	EPL IPL10
 LICENSE_COMB=	multi
 LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 FLAVORS=			default ldap mongo mysql pgsql sasl sqlite
 default_CONFLICTS_INSTALL=	postfix-current-base-ldap postfix-current-base-sasl \
 				postfix-current-ldap postfix-current-sasl \
 				postfix-current-mongo postfix-current-base-mongo \
 				postfix-current-mysql postfix-current-base-mysql \
 				postfix-current-pgsql postfix-current-base-pgsql \
 				postfix-current-sqlite postfix-current-base-sqlite
 ldap_PKGNAMESUFFIX=		-current-ldap
 ldap_CONFLICTS_INSTALL=		postfix-current postfix-current-base \
 				postfix-current-base-sasl postfix-current-sasl \
 				postfix-current-mongo postfix-current-base-mongo \
 				postfix-current-mysql postfix-current-base-mysql \
 				postfix-current-pgsql postfix-current-base-pgsql \
 				postfix-current-sqlite postfix-current-base-sqlite
 mongo_PKGNAMESUFFIX=		-current-mongo
 mongo_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
 				postfix-current-ldap postfix-current-base-ldap \
 				postfix-current-mysql postfix-current-base-mysql \
 				postfix-current-pgsql postfix-current-base-pgsql \
 				postfix-current-sasl postfix-current-base-sasl \
 				postfix-current-sqlite postfix-current-base-sqlite
 mysql_PKGNAMESUFFIX=		-current-mysql
 mysql_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
 				postfix-current-ldap postfix-current-base-ldap \
 				postfix-current-mongo postfix-current-base-mongo \
 				postfix-current-pgsql postfix-current-base-pgsql \
 				postfix-current-sasl postfix-current-base-sasl \
 				postfix-current-sqlite postfix-current-base-sqlite
 pgsql_PKGNAMESUFFIX=		-current-pgsql
 pgsql_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
 				postfix-current-ldap postfix-current-base-ldap \
 				postfix-current-mongo postfix-current-base-mongo \
 				postfix-current-mysql postfix-current-base-mysql \
 				postfix-current-sasl postfix-current-base-sasl \
 				postfix-current-sqlite postfix-current-base-sqlite
 sasl_PKGNAMESUFFIX=		-current-sasl
 sasl_CONFLICTS_INSTALL=		postfix-current postfix-current-base \
 				postfix-current-base-ldap postfix-current-ldap \
 				postfix-current-mongo postfix-current-base-mongo \
 				postfix-current-mysql postfix-current-base-mysql \
 				postfix-current-pgsql postfix-current-base-pgsql \
 				postfix-current-sqlite postfix-current-base-sqlite
 sqlite_PKGNAMESUFFIX=		-current-sqlite
 sqlite_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
 				postfix-current-ldap postfix-current-base-ldap \
 				postfix-current-mongo postfix-current-base-mongo \
 				postfix-current-mysql postfix-current-base-mysql \
 				postfix-current-pgsql postfix-current-base-pgsql \
 				postfix-current-sasl postfix-current-base-sasl
 
 COMMENT_ldap=	(with OpenLDAP support)
 COMMENT_sasl=	(with Cyrus SASL support)
 
 USES=		cpe shebangfix ssl
 USE_RC_SUBR=	postfix
 USE_SUBMAKE=	yes
 
 SHEBANG_FILES=	auxiliary/qshape/qshape.pl
 
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 CONFLICTS_INSTALL=	courier-0.* opensmtpd opensmtpd-devel \
 			postfix postfix-base postfix-ldap-sasl \
 			postfix-sasl postfix35 sendmail \
 			sendmail-devel
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
 
 OPTIONS_DEFINE=		BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LMDB MONGO \
 			MYSQL NIS PCRE2 PGSQL SASL SQLITE TEST TLS
 OPTIONS_DEFAULT?=	BLACKLISTD EAI PCRE2 TLS
 OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKMIT SASLKRB5
 .if ${FLAVOR:U} == ldap
 OPTIONS_SLAVE=		LDAP
 .elif ${FLAVOR:U} == sasl
 OPTIONS_SLAVE=		SASL
 .endif
 .if !empty(FLAVOR) && ${FLAVOR:U} != default
 OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
 .endif
 OPTIONS_SUB=		yes
 
 BLACKLISTD_DESC=	Enable blacklistd support
 CDB_DESC=		CDB maps lookups
 EAI_DESC=		Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=		Install into /usr and /etc/postfix
 LDAP_DESC=		LDAP maps (uses WITH_OPENLDAP_VER)
 LMDB_DESC=		LMDB maps
 PCRE2_DESC=		Use Perl Compatible Regular Expressions, version 2
 RG1_DESC=		Kerberos network authentication protocol type
 SASLKMIT_DESC=		If your SASL req. MIT Kerberos5, select this
 SASLKRB5_DESC=		If your SASL req. Kerberos5, select this
 SASL_DESC=		Cyrus SASL support (Dovecot SASL is always built in)
 TEST_DESC=		SMTP/LMTP test server and generator
 
 BDB_USES=			bdb
 BLACKLISTD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-blacklistd
 CDB_LIB_DEPENDS=		libcdb.so:databases/tinycdb
 EAI_LIB_DEPENDS=		libicuuc.so:devel/icu
 LDAP_USES=			ldap
 LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
 MONGO_LIB_DEPENDS=		libbson-1.0.so:devel/libbson \
 				libmongoc-1.0.so:devel/mongo-c-driver
 MYSQL_USES?=			mysql
 PCRE2_LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
 PGSQL_USES=			pgsql
 SASLKMIT_LIB_DEPENDS=		libkrb5.so:security/krb5
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 SQLITE_USES=			sqlite
 
 .include <bsd.port.options.mk>
 
 HTML1=		body_checks.5.html bounce.5.html postfix-power.png \
 		scache.8.html tlsmgr.8.html
 
 STRIP_LIBEXEC=	anvil bounce cleanup discard dnsblog error flush lmtp local \
 		master nqmgr oqmgr pickup pipe postlogd postscreen proxymap \
 		qmgr qmqpd scache showq smtp smtpd spawn tlsmgr tlsproxy \
 		trivial-rewrite verify virtual
 
 .if !defined(DEBUG)
 MAKEFILEFLAGS+=	DEBUG=
 .endif
 
 MAKEFILEFLAGS+=	pie=yes CC="${CC}" OPT="${CFLAGS}"
 
 .if ${SSL_DEFAULT} == libressl
 BROKEN=		error: OpenSSL-1.1.1 is the minimum supported version. LibreSSL is not supported
 .endif
 
 .if ${PORT_OPTIONS:MINST_BASE}
 .if ${FLAVOR:U} == ldap
 PKGNAMESUFFIX=	-current-base-ldap
 .elif ${FLAVOR:U} == sasl
 PKGNAMESUFFIX=	-current-base-sasl
 .else
 PKGNAMESUFFIX=	-current-base
 .endif
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
 .endif
 
 PLIST_SUB+=	PFETC=${ETCDIR}
 
 # check if mailwrapper supports $LOCALBASE
 .if ${OPSYS} == FreeBSD
 SUB_LIST+=	MC_PREFIX="${LOCALBASE}" \
 		USE_LOCALBASE_MAILER_CONF="yes"
 .else
 SUB_LIST+=	MC_PREFIX="" \
 		USE_LOCALBASE_MAILER_CONF="no"
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 READMEDIR=	${DOCSDIR}
 .else
 READMEDIR=	no
 .endif
 
 # dynamic direcory location
 DAEMONDIR=		${PREFIX}/libexec/postfix
 SHLIB_DIRECTORY=	${PREFIX}/lib/postfix
 # new proposed location is ETCDIR (see README_FILES/INSTALL)
 # keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR
 META_DIRECTORY=		${DAEMONDIR}
 
 SUB_LIST+=	DAEMONDIR="${DAEMONDIR}" \
 		META_DIRECTORY="${META_DIRECTORY}" \
 		READMEDIR="${READMEDIR}" \
 		REQUIRE="${_REQUIRE}"
 SUB_FILES+=	mailer.conf.postfix pkg-install pkg-message
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${PREFIX}/share/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 			-Wmissing-prototypes -Wformat -Wno-comment
 
 # Default requirement for postfix rc script
 _REQUIRE=	LOGIN cleanvar dovecot
 
 # always build with Dovecot SASL support, Cyrus is optional
 # see Postfix HISTORY 20051222
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH
 
 # Email Address Internationalization (EAI, RFC 6531..6533)
 .if ${PORT_OPTIONS:MEAI}
 POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
 .else
 POSTFIX_CCARGS+=	-DNO_EAI
 .endif
 
 .if ${PORT_OPTIONS:MPCRE2}
 DYN_EXT+=		pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE=2 -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre2-config --libs8`"
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
 POSTFIX_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .else
 POSTFIX_CCARGS+=	-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if ${PORT_OPTIONS:MSASLKRB5}
 POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 \
 			-lroken
 .endif
 
 .if ${PORT_OPTIONS:MSASLKMIT}
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 \
 			-lcrypto -lcrypt -lcom_err
 .endif
 
 .if ${PORT_OPTIONS:MTLS}
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 # XXX LDFLAGS possible breaks dynamic building
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .else
 POSTFIX_CCARGS+=	-DNO_TLS
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if ${PORT_OPTIONS:MBLACKLISTD}
 . if ${OPSYS} == FreeBSD
 POSTFIX_AUXLIBS+=	-lblacklist
 . else
 IGNORE=		blacklistd is only supported on FreeBSD
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MMONGO}
 DYN_EXT+=		mongodb
 POSTFIX_CCARGS+=	-DHAS_MONGODB -I${LOCALBASE}/include/libmongoc-1.0 \
 			-I${LOCALBASE}/include/libbson-1.0
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_MONGODB=-L${LOCALBASE}/lib -lmongoc-1.0 -lbson-1.0"
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 DYN_EXT+=		mysql
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_MYSQL=-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lm"
 _REQUIRE+=		mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 DYN_EXT+=		pgsql
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_PGSQL=-L${LOCALBASE}/lib -lpq"
 _REQUIRE+=		postgresql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 DYN_EXT+=		sqlite
 POSTFIX_CCARGS+=	-DHAS_SQLITE -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread"
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 DYN_EXT+=		ldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -llber"
 _REQUIRE+=		slapd
 .endif
 
 .if ${PORT_OPTIONS:MCDB}
 DYN_EXT+=		cdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_CDB=-L${LOCALBASE}/lib -lcdb"
 .endif
 
 .if ${PORT_OPTIONS:MNIS}
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 .endif
 
 .if ${PORT_OPTIONS:MLMDB}
 DYN_EXT+=		lmdb
 POSTFIX_CCARGS+=	-DHAS_LMDB -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb"
 .endif
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/share/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g; \
 		s!($$config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 post-patch:
 .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL library is compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO_CMD} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${REINPLACE_CMD} -i '' -E -e '${REINPLACE}'
 
 .for f in ${HTML1}
 	@${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \
 		>> ${WRKSRC}/conf/postfix-files
 .endfor
 	@${ECHO_CMD} '$$manpage_directory/man1/posttls-finger.1:f:root:-:644' \
 		>> ${WRKSRC}/conf/postfix-files
 	@${ECHO_CMD} '$$command_directory/posttls-finger:f:root:-:755' \
 		>> ${WRKSRC}/conf/postfix-files
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \
 	${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \
 	shared=yes shlib_directory=${SHLIB_DIRECTORY} \
 	dynamicmaps=yes \
 	${POSTFIX_DYN_AUXLIBS} \
 	AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO_CMD} "all: default" >> Makefile)
 
 pre-install-INST_BASE-on:
 	${MKDIR} ${STAGEDIR}/etc/rc.d
 
 do-install:
 	@(cd ${WRKSRC} && ${MAKE} non-interactive-package \
 		install_root=${STAGEDIR} tempdir=${WRKDIR} \
 		shlib_directory=${SHLIB_DIRECTORY} \
 		config_directory=${ETCDIR} \
 		command_directory=${PREFIX}/sbin \
 		daemon_directory=${DAEMONDIR} \
 		meta_directory=${META_DIRECTORY} \
 		html_directory=${READMEDIR} \
 		mailq_path=${PREFIX}/bin/mailq \
 		manpage_directory=${PREFIX}/share/man \
 		newaliases_path=${PREFIX}/bin/newaliases \
 		readme_directory=${READMEDIR} \
 		sendmail_path=${PREFIX}/sbin/sendmail )
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 # == do not overwrite existing config
 	${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR}
 .for SAMPLEFILE in access aliases canonical generic header_checks relocated transport virtual
 	${MV} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE}.sample
 .endfor
 
 # == chop dynamicmaps.cf entries into dedicated .cf files
 # for future sub-packages support
 .for f in ${DYN_EXT}
 # adjust dynamicmaps.cf
 	${GREP} -e "^#" -e "^${f}" ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf \
 		> ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf.d/${f}.cf && \
 		${SED} -i '' -e '/${f}/d' ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf
 
 # adjust / generate postfix-files for dynamic modules
 	${SED} -i '' -e '/postfix-${f}.so/d' ${STAGEDIR}${META_DIRECTORY}/postfix-files && \
 	${PRINTF} '# Do not edit this file.\
 		\n$$shlib_directory/postfix-${f}.so:f:root:-:755\
 		\n$$meta_directory/postfix-files.d/${f}-files:f:root:-:644\
 		\n$$meta_directory/dynamicmaps.cf.d/${f}.cf:f:root:-:644\n' \
 		> ${STAGEDIR}${META_DIRECTORY}/postfix-files.d/${f}-files
 .endfor
 
 # Fix compressed man pages and strip executables
 	${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${META_DIRECTORY}/postfix-files
 	-@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 	-@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so
 
 do-install-TEST-on:
 	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 5827f2993f10..5f1267f67f42 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,465 +1,465 @@
 PORTNAME=	postfix
 DISTVERSION=	3.9.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://postfix-mirror.horus-it.com/postfix-release/ \
 		http://ftp.porcupine.org/mirrors/postfix-release/ \
 		http://de.postfix.org/ftpmirror/ \
 		http://www.artfiles.org/postfix.org/postfix-release/ \
 		http://mirror.lhsolutions.nl/postfix-release/ \
 		ftp://postfix.mirrors.pair.com/
 MASTER_SITES:=	${MASTER_SITES:S|$|official/|}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail ${COMMENT_${FLAVOR}}
 WWW=		https://www.postfix.org/
 
 LICENSE=	EPL IPL10
 LICENSE_COMB=	multi
 LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 FLAVORS=			default ldap mongo mysql pgsql sasl sqlite
 default_CONFLICTS_INSTALL=	postfix-base-ldap postfix-base-sasl \
 				postfix-ldap postfix-sasl \
 				postfix-mongo postfix-base-mongo \
 				postfix-mysql postfix-base-mysql \
 				postfix-pgsql postfix-base-pgsql \
 				postfix-sqlite postfix-base-sqlite
 ldap_PKGNAMESUFFIX=		-ldap
 ldap_CONFLICTS_INSTALL=		postfix postfix-base \
 				postfix-base-sasl postfix-sasl \
 				postfix-mongo postfix-base-mongo \
 				postfix-mysql postfix-base-mysql \
 				postfix-pgsql postfix-base-pgsql \
 				postfix-sqlite postfix-base-sqlite
 mongo_PKGNAMESUFFIX=		-mongo
 mongo_CONFLICTS_INSTALL=	postfix postfix-base \
 				postfix-ldap postfix-base-ldap \
 				postfix-mysql postfix-base-mysql \
 				postfix-pgsql postfix-base-pgsql \
 				postfix-sasl postfix-base-sasl \
 				postfix-sqlite postfix-base-sqlite
 mysql_PKGNAMESUFFIX=		-mysql
 mysql_CONFLICTS_INSTALL=	postfix postfix-base \
 				postfix-ldap postfix-base-ldap \
 				postfix-mongo postfix-base-mongo \
 				postfix-pgsql postfix-base-pgsql \
 				postfix-sasl postfix-base-sasl \
 				postfix-sqlite postfix-base-sqlite
 pgsql_PKGNAMESUFFIX=		-pgsql
 pgsql_CONFLICTS_INSTALL=	postfix postfix-base \
 				postfix-ldap postfix-base-ldap \
 				postfix-mongo postfix-base-mongo \
 				postfix-mysql postfix-base-mysql \
 				postfix-sasl postfix-base-sasl \
 				postfix-sqlite postfix-base-sqlite
 sasl_PKGNAMESUFFIX=		-sasl
 sasl_CONFLICTS_INSTALL=		postfix postfix-base \
 				postfix-base-ldap postfix-ldap \
 				postfix-mongo postfix-base-mongo \
 				postfix-mysql postfix-base-mysql \
 				postfix-pgsql postfix-base-pgsql \
 				postfix-sqlite postfix-base-sqlite
 sqlite_PKGNAMESUFFIX=		-sqlite
 sqlite_CONFLICTS_INSTALL=	postfix postfix-base \
 				postfix-ldap postfix-base-ldap \
 				postfix-mongo postfix-base-mongo \
 				postfix-mysql postfix-base-mysql \
 				postfix-pgsql postfix-base-pgsql \
 				postfix-sasl postfix-base-sasl
 
 COMMENT_ldap=	(with OpenLDAP support)
 COMMENT_mysql=	(with MySQL support)
 COMMENT_pgsql=	(with PostgreSQL support)
 COMMENT_sasl=	(with Cyrus SASL support)
 COMMENT_sqlite=	(with SQLite support)
 
 USES=		cpe shebangfix ssl
 USE_RC_SUBR=	postfix
 USE_SUBMAKE=	yes
 
 SHEBANG_FILES=	auxiliary/qshape/qshape.pl
 
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 PORTSCOUT=	limit:^3\.9\.
 
 CONFLICTS_INSTALL=	courier-0.* opensmtpd opensmtpd-devel \
 			postfix postfix-base postfix-ldap-sasl \
 			postfix-sasl sendmail sendmail-devel
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
 
 OPTIONS_DEFINE=		BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LMDB MONGO \
 			MYSQL NIS PCRE2 PGSQL SASL SQLITE TEST TLS
 OPTIONS_DEFAULT?=	BLACKLISTD EAI PCRE2 TLS
 OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKMIT SASLKRB5
 .if ${FLAVOR:U} == ldap
 OPTIONS_SLAVE=		LDAP
 .elif ${FLAVOR:U} == mysql
 OPTIONS_SLAVE=		MYSQL
 .elif ${FLAVOR:U} == pgsql
 OPTIONS_SLAVE=		PGSQL
 .elif ${FLAVOR:U} == sasl
 OPTIONS_SLAVE=		SASL
 .elif ${FLAVOR:U} == sqlite
 OPTIONS_SLAVE=		SQLITE
 .endif
 .if !empty(FLAVOR) && ${FLAVOR:U} != default
 OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
 .endif
 OPTIONS_SUB=		yes
 
 BLACKLISTD_DESC=	Enable blacklistd support
 CDB_DESC=		CDB maps lookups
 EAI_DESC=		Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=		Install into /usr and /etc/postfix
 LDAP_DESC=		LDAP maps (uses WITH_OPENLDAP_VER)
 LMDB_DESC=		LMDB maps
 PCRE2_DESC=		Use Perl Compatible Regular Expressions, version 2
 RG1_DESC=		Kerberos network authentication protocol type
 SASLKMIT_DESC=		If your SASL req. MIT Kerberos5, select this
 SASLKRB5_DESC=		If your SASL req. Kerberos5, select this
 SASL_DESC=		Cyrus SASL support (Dovecot SASL is always built in)
 TEST_DESC=		SMTP/LMTP test server and generator
 
 BDB_USES=			bdb
 BLACKLISTD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-blacklistd
 CDB_LIB_DEPENDS=		libcdb.so:databases/tinycdb
 EAI_LIB_DEPENDS=		libicuuc.so:devel/icu
 LDAP_USES=			ldap
 LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
 MONGO_LIB_DEPENDS=		libbson-1.0.so:devel/libbson \
 				libmongoc-1.0.so:devel/mongo-c-driver
 MYSQL_USES?=			mysql
 PCRE2_LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
 PGSQL_USES=			pgsql
 SASLKMIT_LIB_DEPENDS=		libkrb5.so:security/krb5
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 SQLITE_USES=			sqlite
 
 .include <bsd.port.options.mk>
 
 HTML1=		body_checks.5.html bounce.5.html postfix-power.png \
 		scache.8.html tlsmgr.8.html
 
 STRIP_LIBEXEC=	anvil bounce cleanup discard dnsblog error flush lmtp local \
 		master nqmgr oqmgr pickup pipe postlogd postscreen proxymap \
 		qmgr qmqpd scache showq smtp smtpd spawn tlsmgr tlsproxy \
 		trivial-rewrite verify virtual
 
 .if !defined(DEBUG)
 MAKEFILEFLAGS+=	DEBUG=
 .endif
 
 MAKEFILEFLAGS+=	pie=yes CC="${CC}" OPT="${CFLAGS}"
 
 .if ${SSL_DEFAULT} == libressl
 BROKEN=		error: OpenSSL-1.1.1 is the minimum supported version. LibreSSL is not supported
 .endif
 
 .if ${PORT_OPTIONS:MINST_BASE}
 .if ${FLAVOR:U} == ldap
 PKGNAMESUFFIX=	-base-ldap
 .elif ${FLAVOR:U} == mysql
 PKGNAMESUFFIX=	-base-mysql
 .elif ${FLAVOR:U} == pgsql
 PKGNAMESUFFIX=	-base-pgsql
 .elif ${FLAVOR:U} == sasl
 PKGNAMESUFFIX=	-base-sasl
 .elif ${FLAVOR:U} == sqlite
 PKGNAMESUFFIX=	-base-sqlite
 .else
 PKGNAMESUFFIX=	-base
 .endif
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
 .endif
 
 PLIST_SUB+=	PFETC=${ETCDIR}
 
 # check if mailwrapper supports $LOCALBASE
 .if ${OPSYS} == FreeBSD
 SUB_LIST+=	MC_PREFIX="${LOCALBASE}" \
 		USE_LOCALBASE_MAILER_CONF="yes"
 .else
 SUB_LIST+=	MC_PREFIX="" \
 		USE_LOCALBASE_MAILER_CONF="no"
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 READMEDIR=	${DOCSDIR}
 .else
 READMEDIR=	no
 .endif
 
 # dynamic direcory location
 DAEMONDIR=		${PREFIX}/libexec/postfix
 SHLIB_DIRECTORY=	${PREFIX}/lib/postfix
 # new proposed location is ETCDIR (see README_FILES/INSTALL)
 # keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR
 META_DIRECTORY=		${DAEMONDIR}
 
 SUB_LIST+=	DAEMONDIR="${DAEMONDIR}" \
 		META_DIRECTORY="${META_DIRECTORY}" \
 		READMEDIR="${READMEDIR}" \
 		REQUIRE="${_REQUIRE}"
 SUB_FILES+=	mailer.conf.postfix pkg-install pkg-message
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${PREFIX}/share/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 			-Wmissing-prototypes -Wformat -Wno-comment
 
 # Default requirement for postfix rc script
 _REQUIRE=	LOGIN cleanvar dovecot
 
 # always build with Dovecot SASL support, Cyrus is optional
 # see Postfix HISTORY 20051222
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH
 
 # Email Address Internationalization (EAI, RFC 6531..6533)
 .if ${PORT_OPTIONS:MEAI}
 POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
 .else
 POSTFIX_CCARGS+=	-DNO_EAI
 .endif
 
 .if ${PORT_OPTIONS:MPCRE2}
 DYN_EXT+=		pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE=2 -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre2-config --libs8`"
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
 POSTFIX_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .else
 POSTFIX_CCARGS+=	-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if ${PORT_OPTIONS:MSASLKRB5}
 POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 \
 			-lroken
 .endif
 
 .if ${PORT_OPTIONS:MSASLKMIT}
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 \
 			-lcrypto -lcrypt -lcom_err
 .endif
 
 .if ${PORT_OPTIONS:MTLS}
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 # XXX LDFLAGS possible breaks dynamic building
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .else
 POSTFIX_CCARGS+=	-DNO_TLS
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if ${PORT_OPTIONS:MBLACKLISTD}
 . if ${OPSYS} == FreeBSD
 POSTFIX_AUXLIBS+=	-lblacklist
 . else
 IGNORE=		blacklistd is only supported on FreeBSD
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MMONGO}
 DYN_EXT+=		mongodb
 POSTFIX_CCARGS+=	-DHAS_MONGODB -I${LOCALBASE}/include/libmongoc-1.0 \
 			-I${LOCALBASE}/include/libbson-1.0
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_MONGODB=-L${LOCALBASE}/lib -lmongoc-1.0 -lbson-1.0"
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 DYN_EXT+=		mysql
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_MYSQL=-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lm"
 _REQUIRE+=		mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 DYN_EXT+=		pgsql
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_PGSQL=-L${LOCALBASE}/lib -lpq"
 _REQUIRE+=		postgresql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 DYN_EXT+=		sqlite
 POSTFIX_CCARGS+=	-DHAS_SQLITE -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread"
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 DYN_EXT+=		ldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -llber"
 _REQUIRE+=		slapd
 .endif
 
 .if ${PORT_OPTIONS:MCDB}
 DYN_EXT+=		cdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_CDB=-L${LOCALBASE}/lib -lcdb"
 .endif
 
 .if ${PORT_OPTIONS:MNIS}
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 .endif
 
 .if ${PORT_OPTIONS:MLMDB}
 DYN_EXT+=		lmdb
 POSTFIX_CCARGS+=	-DHAS_LMDB -I${LOCALBASE}/include
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb"
 .endif
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/share/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
 		s!($$config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 post-patch:
 .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL library is compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO_CMD} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${REINPLACE_CMD} -i '' -E -e '${REINPLACE}'
 
 .for f in ${HTML1}
 	@${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \
 		>> ${WRKSRC}/conf/postfix-files
 .endfor
 	@${ECHO_CMD} '$$manpage_directory/man1/posttls-finger.1:f:root:-:644' \
 		>> ${WRKSRC}/conf/postfix-files
 	@${ECHO_CMD} '$$command_directory/posttls-finger:f:root:-:755' \
 		>> ${WRKSRC}/conf/postfix-files
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \
 	${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \
 	shared=yes shlib_directory=${SHLIB_DIRECTORY} \
 	dynamicmaps=yes \
 	${POSTFIX_DYN_AUXLIBS} \
 	AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO_CMD} "all: default" >> Makefile)
 
 pre-install-INST_BASE-on:
 	${MKDIR} ${STAGEDIR}/etc/rc.d
 
 do-install:
 	@(cd ${WRKSRC} && ${MAKE} non-interactive-package \
 		install_root=${STAGEDIR} tempdir=${WRKDIR} \
 		shlib_directory=${SHLIB_DIRECTORY} \
 		config_directory=${ETCDIR} \
 		command_directory=${PREFIX}/sbin \
 		daemon_directory=${DAEMONDIR} \
 		meta_directory=${META_DIRECTORY} \
 		html_directory=${READMEDIR} \
 		mailq_path=${PREFIX}/bin/mailq \
 		manpage_directory=${PREFIX}/share/man \
 		newaliases_path=${PREFIX}/bin/newaliases \
 		readme_directory=${READMEDIR} \
 		sendmail_path=${PREFIX}/sbin/sendmail )
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 # == do not overwrite existing config
 	${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR}
 .for SAMPLEFILE in access aliases canonical generic header_checks relocated transport virtual
 	${MV} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE}.sample
 .endfor
 
 # == chop dynamicmaps.cf entries into dedicated .cf files
 # for future sub-packages support
 .for f in ${DYN_EXT}
 # adjust dynamicmaps.cf
 	${GREP} -e "^#" -e "^${f}" ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf \
 		> ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf.d/${f}.cf && \
 		${SED} -i '' -e '/${f}/d' ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf
 
 # adjust / generate postfix-files for dynamic modules
 	${SED} -i '' -e '/postfix-${f}.so/d' ${STAGEDIR}${META_DIRECTORY}/postfix-files && \
 	${PRINTF} '# Do not edit this file.\
 		\n$$shlib_directory/postfix-${f}.so:f:root:-:755\
 		\n$$meta_directory/postfix-files.d/${f}-files:f:root:-:644\
 		\n$$meta_directory/dynamicmaps.cf.d/${f}.cf:f:root:-:644\n' \
 		> ${STAGEDIR}${META_DIRECTORY}/postfix-files.d/${f}-files
 .endfor
 
 # Fix compressed man pages and strip executables
 	${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${META_DIRECTORY}/postfix-files
 	-@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 	-@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so
 
 do-install-TEST-on:
 	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 7ccbba3d97a1..0157fcb059e6 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,101 +1,102 @@
 PORTNAME=	rspamd
 PORTVERSION=	3.11.a1.20241020
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system dev version
 WWW=		https://rspamd.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	ragel:devel/ragel
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libpcre2-8.so:devel/pcre2 \
 		libsodium.so:security/libsodium
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
 USES=		cmake compiler:c++20-lang cpe gnome perl5 pkgconfig sqlite ssl
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_TAGNAME=	1ad4dba75
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_RC_SUBR=	rspamd
 
 CMAKE_ARGS+=	-DBUILD_PORT=yes \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DDBDIR=/var/db/rspamd \
 		-DDEBUG=ON \
 		-DGIT_ID=${GH_TAGNAME} \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DRUNDIR=/var/run/rspamd
 
 DEBUG_FLAGS=	-g -O0
 
 CONFLICTS_INSTALL=	rspamd
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 
 USERS=		rspamd
 GROUPS=		rspamd
 
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/}
 
 OPTIONS_DEFINE=	BLAS CGP GPERF LUAJIT
 OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT_amd64=	LUAJIT
 OPTIONS_DEFAULT_armv7=	LUAJIT
 OPTIONS_DEFAULT_i386=	LUAJIT
 OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 OPTIONS_DEFAULT_powerpc64le=	LUAJIT
 OPTIONS_SUB=	yes
 
 BLAS_DESC=	Use OpenBLAS to accelerate KANN
 CGP_DESC=	Install Communigate Pro(tm) helper
 GPERF_DESC=	Google perf-tools profiling
 HYPERSCAN_DESC=	Use hyperscan optimizations (amd64 only)
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 
 BLAS_LIB_DEPENDS=	libblis.so:math/blis \
 			liblapack.so:math/lapack
 BLAS_USES=		blaslapack:openblas
 BLAS_CMAKE_ON=		-DENABLE_BLAS=ON
 
 CGP_RUN_DEPENDS+=	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
 			p5-AnyEvent>=0:devel/p5-AnyEvent \
 			p5-EV>=0:devel/p5-EV \
 			p5-JSON-XS>=0:converters/p5-JSON-XS
 
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GPERF_CMAKE_ON=		-DENABLE_GPERF_TOOLS=ON
 
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
 HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 
 LUAJIT_USES=		luajit
 LUAJIT_USES_OFF=	lua:51+
 LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 post-install-CGP-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 4190c2a768e3..ada87612a07c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,95 +1,96 @@
 PORTNAME=	rspamd
 PORTVERSION=	3.11.0
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system
 WWW=		https://rspamd.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	ragel:devel/ragel
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libpcre2-8.so:devel/pcre2 \
 		libsodium.so:security/libsodium
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
 USES=		cmake compiler:c++20-lang cpe gnome perl5 pkgconfig sqlite ssl
 CPE_VENDOR=	rspamd_project
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_RC_SUBR=	rspamd
 
 CMAKE_ARGS+=	-DBUILD_PORT=yes \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DDBDIR=/var/db/rspamd \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DRUNDIR=/var/run/rspamd
 
 CONFLICTS_INSTALL=	rspamd-devel
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 
 USERS=		rspamd
 GROUPS=		rspamd
 
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	BLAS CGP GPERF LUAJIT
 OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT_amd64=	LUAJIT
 OPTIONS_DEFAULT_armv7=	LUAJIT
 OPTIONS_DEFAULT_i386=	LUAJIT
 OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 OPTIONS_DEFAULT_powerpc64le=	LUAJIT
 OPTIONS_SUB=	yes
 
 BLAS_DESC=	Use OpenBLAS to accelerate KANN
 CGP_DESC=	Install Communigate Pro(tm) helper
 GPERF_DESC=	Google perf-tools profiling
 HYPERSCAN_DESC=	Use hyperscan optimizations (amd64 only)
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 
 BLAS_LIB_DEPENDS=	libblis.so:math/blis \
 			liblapack.so:math/lapack
 BLAS_USES=		blaslapack:openblas
 BLAS_CMAKE_ON=		-DENABLE_BLAS=ON
 
 CGP_RUN_DEPENDS+=	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
 			p5-AnyEvent>=0:devel/p5-AnyEvent \
 			p5-EV>=0:devel/p5-EV \
 			p5-JSON-XS>=0:converters/p5-JSON-XS
 
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GPERF_CMAKE_ON=		-DENABLE_GPERF_TOOLS=ON
 
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
 HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 
 LUAJIT_USES=		luajit
 LUAJIT_USES_OFF=	lua:51+
 LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 post-install-CGP-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
 
 .include <bsd.port.mk>
diff --git a/math/R/Makefile b/math/R/Makefile
index c8f5e7a1d74c..f88c87019f2b 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,141 +1,142 @@
 PORTNAME=	R
 DISTVERSION=	4.4.2
+PORTREVISION=	1
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Language for statistical computing and graphics
 WWW=		https://www.R-project.org/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 BUILD_DEPENDS=	texi2any:print/texinfo
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libdeflate.so:archivers/libdeflate \
 		libpcre2-8.so:devel/pcre2
 # R packages may require GNU make or cmake to build
 RUN_DEPENDS=	cmake:devel/cmake-core \
 		gmake:devel/gmake
 
 # possible TODO
 # - Use --with-recommended-packages=no by default
 # - Add an option for recommended packages
 # - Create ports for each of the recommended packages
 # - Create a meta-port for the recommended packages
 
 USES=		compiler:c++11-lang cpe fortran gmake iconv libtool localbase \
 		pathfix perl5 readline
 CPE_VENDOR=	r-project
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java \
 		--enable-R-shlib \
 		--with-readline \
 		rdocdir=${DOCSDIR}
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	FULLVER=${DISTVERSION} \
 		MAJORVER=${_MAJORVER}
 
 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF X11
 OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP PNG \
 			RBLAS RPROF TCLTK TIFF X11
 OPTIONS_GROUP=		NEEDX11
 OPTIONS_GROUP_NEEDX11=	CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS NETLIB OPENBLAS RBLAS
 
 OPTIONS_SUB=	YES
 
 CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
 LETTER_DESC=		US letter paper
 MEMPROF_DESC=		Memory profiling via Rprofmem() and tracemem()
 NEEDX11_DESC=		Require X11
 NETLIB_DESC=		Netlib BLAS implementation
 PNG_DESC=		PNG graphics device
 RBLAS_DESC=		Use R-bundled BLAS implementation
 RPROF_DESC=		R profiling via Rprof()
 TEXDOCS_DESC=		Build/Install TeX-dependent documentation files
 X11_DESC=		X11 graphics device
 
 ATLAS_USES=			blaslapack:atlas
 ATLAS_CONFIGURE_ON=		--disable-BLAS-shlib
 CAIROPANGO_IMPLIES=		X11
 CAIROPANGO_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 CAIROPANGO_USES=		gettext gnome jpeg pkgconfig
 CAIROPANGO_USE=			GNOME=cairo,pango
 CAIROPANGO_CONFIGURE_WITH=	cairo
 GHOSTSCRIPT_IMPLIES=		X11
 GHOSTSCRIPT_USES=		ghostscript
 ICU_LIB_DEPENDS=		libicui18n.so:devel/icu
 ICU_CONFIGURE_WITH=		ICU
 INFO_INSTALL_TARGET=		install-info
 INFO_INFO=			R-admin R-data R-exts R-FAQ R-intro R-ints \
 				R-lang
 JPEG_IMPLIES=			X11
 JPEG_USES=			jpeg pkgconfig
 JPEG_CONFIGURE_WITH=		jpeglib
 JPEG_CONFIGURE_ENV=		r_cv_header_jpeglib_h=yes
 LDOUBLE_CONFIGURE_ENABLE=	long-double
 LETTER_CONFIGURE_ENV=		R_PAPERSIZE=letter
 MEMPROF_CONFIGURE_ENABLE=	memory-profiling
 NETLIB_USES=			blaslapack:netlib
 NETLIB_CONFIGURE_ON=		--disable-BLAS-shlib
 NLS_USES=			gettext
 NLS_CONFIGURE_OFF=		--disable-nls
 OPENBLAS_USES=			blaslapack:openblas
 OPENBLAS_CONFIGURE_ON=		--disable-BLAS-shlib
 OPENMP_CONFIGURE_ENABLE=	openmp
 PNG_IMPLIES=			X11
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
 PNG_CONFIGURE_WITH=		libpng
 RBLAS_CONFIGURE_ON=		--enable-BLAS-shlib \
 				--without-blas \
 				--without-lapack
 RBLAS_CONFIGURE_OFF=		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 				--with-lapack="${LAPACKLIB}"
 RBLAS_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \
 				${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in
 RPROF_CONFIGURE_ENABLE=		R-profiling
 TCLTK_IMPLIES=			X11
 TCLTK_USES=			tcl tk
 TCLTK_CONFIGURE_WITH=		tcl_config=${TCL_LIBDIR}/tclConfig.sh tcltk \
 				tk_config=${TK_LIBDIR}/tkConfig.sh
 TEXDOCS_USES=			tex
 TEXDOCS_USE=			TEX=dvipsk:build,kpathsea:build,pdftex:build
 .for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
 TEXDOCS_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
 .endfor
 TEXDOCS_INSTALL_TARGET=		install-pdf
 TIFF_IMPLIES=			X11
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=		libtiff
 X11_USES=			xorg
 X11_USE=			XORG=ice,sm,x11,xext,xmu,xscrnsaver,xt
 X11_CONFIGURE_WITH=		x
 
 _MAJORVER=	${DISTVERSION:R:R}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|%%FULLVER%%|${DISTVERSION}|" \
 		-e "s|%%MAJORVER%%|${_MAJORVER}|" \
 		${WRKSRC}/src/main/Makefile.in \
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in
 
 post-install-RBLAS-on:
 	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
 post-install-RBLAS-off:
 	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
 .include <bsd.port.mk>
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index 91b74f7fb8ba..b520629ba70e 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	libqalculate
 PORTVERSION=	5.5.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Multi-purpose desktop calculator (backend library)
 WWW=		https://qalculate.github.io/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libcurl.so:ftp/curl \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		compiler:c++14-lang gettext gmake gnome iconv libtool \
 		localbase ncurses pathfix pkgconfig readline
 USE_GNOME=	intltool libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile
index e01679b7a544..92ed47db8aae 100644
--- a/math/py-rpy2/Makefile
+++ b/math/py-rpy2/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	rpy2
 PORTVERSION=	3.5.17
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to the R Programming Language
 WWW=		https://rpy2.github.io/ \
 		https://github.com/rpy2/rpy2
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.15.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libR.so:math/R \
 		libicui18n.so:devel/icu \
 		libpcre2-8.so:devel/pcre2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.15.1:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=0:devel/py-tzlocal@${PY_FLAVOR}
 
 USES=		compiler:c11 fortran python readline
 USE_PYTHON=	autoplist concurrent pep517
 
 MAKE_ENV=	RPY2_CFFI_MODE=BOTH
 
 OPTIONS_DEFINE=	NUMPY PANDAS
 OPTIONS_DEFAULT=NUMPY PANDAS
 NUMPY__DESC=	Numpy support
 PANDAS_DESC=	Pandas support
 
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.26,1:math/py-numpy@${PY_FLAVOR}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.26,1:math/py-numpy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>=1.3.5,1:math/py-pandas@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.zoneinfo>=0:devel/py-backports.zoneinfo@${PY_FLAVOR}
 .endif
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>
diff --git a/math/timbl/Makefile b/math/timbl/Makefile
index c40f84844f9d..1951c62e8c3f 100644
--- a/math/timbl/Makefile
+++ b/math/timbl/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	timbl
 DISTVERSION=	6.10
+PORTREVISION=	1
 CATEGORIES=	math education
 MASTER_SITES=	https://github.com/LanguageMachines/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tilburg Memory Based Learner
 WWW=		https://ilk.uvt.nl/timbl/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libticcutils.so:devel/ticcutils
 
 USES=		compiler:c++14-lang gmake gnome libtool pathfix pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 TEST_TARGET=	check
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-static
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 -g||g' \
 		${PATCH_WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index cbd010bbe3c8..1d59be361cef 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	sword
 PORTVERSION=	1.8.1
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	misc
 MASTER_SITES=	http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for manipulating Bible texts
 WWW=		https://crosswire.org/sword/index.jsp
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cppunit-config:devel/cppunit
 
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-conf \
 		--with-zlib
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 
 SUB_FILES=	pkg-message
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		CLUCENE CURL
 OPTIONS_DEFAULT=	CLUCENE CURL
 CLUCENE_DESC=		Include indexing capability
 
 CLUCENE_LIB_DEPENDS=	libclucene-core.so:textproc/clucene \
 			libicudata.so:devel/icu
 CLUCENE_USES=		compiler:c++11-lib
 CLUCENE_CONFIGURE_WITH=	clucene=${LOCALBASE} icu
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 
 post-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install_config)
 	${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \
 		${STAGEDIR}${PREFIX}/etc/sword.conf.sample
 
 .include <bsd.port.mk>
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 7948884a5672..6d4426cbfe07 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	xiphos
 DISTVERSION=	4.2.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	misc gnome
 # Don't use USE_GITHUB: the sources downloaded by USE_GITHUB cannot be
 # built as they miss the file ${WRKSRC}/cmake/source_version.txt.
 # See also: https://github.com/crosswire/xiphos/issues/1037
 MASTER_SITES=	https://github.com/crosswire/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bible interface utilizing the sword framework
 WWW=		https://xiphos.org
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		desktop-file-validate:devel/desktop-file-utils \
 		itstool:textproc/itstool \
 		yelp-build:textproc/yelp-tools
 LIB_DEPENDS=	libbiblesync.so:misc/biblesync \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libenchant.so:textproc/enchant \
 		libicui18n.so:devel/icu \
 		libsoup-2.4.so:devel/libsoup \
 		libsword.so:misc/sword \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 
 # gettext is always needed, even if NLS is off
 USES=		cmake compiler:c11 gettext gnome minizip pkgconfig
 USE_GNOME=	cairo gtk30 gtkhtml4 intltool libgsf
 
 CMAKE_OFF=	EPUB
 CMAKE_ON=	GTKHTML
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	NLS
 
 .include <bsd.port.mk>
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index 7b1c7b00990b..24cd614c3b8c 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	subtitlecomposer
 DISTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Advanced FFmpeg-based subtitle editor
 WWW=		https://subtitlecomposer.kde.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libavcodec.so:multimedia/ffmpeg
 
 USES=		compiler:c++17-lang cmake desktop-file-utils gettext \
 		kde:6 openal pkgconfig qt:6 shared-mime-info ssl tar:xz
 USE_KDE=	codecs config configwidgets coreaddons i18n \
 		kio sonnet textwidgets widgetsaddons xmlgui \
 		doctools:build ecm:build
 USE_QT=		5compat base declarative \
 		tools:build
 USE_XORG=	x11
 
 # Requires PocketSphinx-5prealpha
 SPHINX_DESC=	Speech recognition via PocketSphinx
 SPHINX_LIB_DEPENDS=	libpocketsphinx.so:audio/pocketsphinx
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON
 
 post-patch:
 	${RM} ${WRKSRC}/cmake/FindICU.cmake
 
 .include <bsd.port.mk>
diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile
index cfeb71c370d7..5d1ad2157b09 100644
--- a/net-im/dino/Makefile
+++ b/net-im/dino/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	dino
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Modern XMPP Chat Client using GTK/Vala
 WWW=		https://dino.im
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libadwaita-1.so:x11-toolkits/libadwaita \
 		libassuan.so:security/libassuan \
 		libgcrypt.so:security/libgcrypt \
 		libgee-0.8.so:devel/libgee \
 		libgpg-error.so:security/libgpg-error \
 		libgraphene-1.0.so:graphics/graphene \
 		libgspell-1.so:textproc/gspell \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu \
 		libsoup-2.4.so:devel/libsoup \
 		libsqlite3.so:databases/sqlite3 \
 		libsrtp2.so:net/libsrtp2 \
 		libvulkan.so:graphics/vulkan-loader
 
 USES=		cmake cpe desktop-file-utils gettext-tools gnome localbase \
 		ninja pkgconfig vala:build
 
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=		CANBERRA GNUPG ICE OMEMO RTP UPLOAD
 OPTIONS_DEFAULT=	CANBERRA GNUPG ICE OMEMO RTP UPLOAD
 OPTIONS_SUB=		yes
 
 HAS_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 LDFLAGS+=	-Wl,--export-dynamic
 USE_LDCONFIG=	yes
 
 USE_GNOME=	cairo gdkpixbuf2 glib20 gnomeprefix gtk40 intlhack
 
 CANBERRA_DESC=	Notifications sounds support
 ICE_DESC=		ICE NAT traversal plugin
 OMEMO_DESC=		OMEMO plugin
 RTP_DESC=		RTP plugin
 UPLOAD_DESC=		HTTP file upload plugin
 ICE_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libnice.so:net-im/libnice
 ICE_VARS=		ENABLED_PLUGINS+=ice
 ICE_VARS_OFF=		DISABLED_PLUGINS+=ice
 RTP_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
 RTP_USES=		gstreamer
 RTP_USE=		GSTREAMER=gtk,opus,pulse,speex,srtp,v4l2,vpx,x264
 RTP_VARS=		ENABLED_PLUGINS+=rtp
 RTP_CMAKE_BOOL=		RTP_ENABLE_H264 RTP_ENABLE_VP9 RTP_ENABLE_H264 RTP_ENABLE_VAAPI
 RTP_VARS_OFF=		DISABLED_PLUGINS+=rtp
 OMEMO_GH_TUPLE=		signalapp:libsignal-protocol-c:v2.3.3:signalapp/plugins/signal-protocol/libsignal-protocol-c
 OMEMO_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 OMEMO_VARS=		ENABLED_PLUGINS+=omemo
 OMEMO_CMAKE_BOOL=	BUILD_LIBSIGNAL_IN_TREE
 OMEMO_VARS_OFF=		DISABLED_PLUGINS+=omemo
 UPLOAD_CMAKE_ON=	-DSOUP_VERSION:INT=2
 UPLOAD_VARS=		ENABLED_PLUGINS+=http-files
 UPLOAD_VARS_OFF=	DISABLED_PLUGINS+=http-files
 GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GNUPG_VARS=		ENABLED_PLUGINS+=openpgp
 GNUPG_VARS_OFF=		DISABLED_PLUGINS+=openpgp
 CANBERRA_VARS=		ENABLED_PLUGINS+=notification-sound
 CANBERRA_VARS_OFF=	DISABLED_PLUGINS+=notification-sound
 CANBERRA_LIB_DEPENDS=	libcanberra.so:audio/libcanberra
 
 CMAKE_ARGS+=	-DENABLED_PLUGINS="${ENABLED_PLUGINS:S/ /;/gW}"
 CMAKE_ARGS+=	-DDISABLED_PLUGINS="${DISABLED_PLUGINS:S/ /;/gW}"
 
 pre-configure:
 	@if [ -z "${PACKAGE_BUILDING}" ]; then if ! ${PKG_BIN} query \
 			'%o-%Ok-%Od' databases/sqlite3 | \
 			${GREP} -F -wq databases/sqlite3-UNICODE61-on; then \
 		${ECHO_MSG} "/!\ Please make sure databases/sqlite3 is built\
 			       with UNICODE61 option"; \
 	exit 1; \
 	fi; fi
 
 .include <bsd.port.mk>
diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile
index 769c7fcc018e..811b51dadce7 100644
--- a/net-im/prosody/Makefile
+++ b/net-im/prosody/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	prosody
 DISTVERSION=	0.12.5
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://prosody.im/downloads/source/
 
 MAINTAINER=	twm@pdp11.pw
 COMMENT=	Simple extensible XMPP server written in Lua
 WWW=		https://www.prosody.im/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu
 RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/luaevent/core.so:devel/lua-libevent@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lunbound.so:dns/luaunbound@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lxp.so:textproc/lua-luaexpat@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/socket/core.so:net/lua-luasocket@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/ssl.so:security/luasec@${LUA_FLAVOR}
 
 USES=		cpe gmake lua:54 shebangfix ssl
 SHEBANG_FILES=	prosody prosodyctl tools/migration/prosody-migrator.lua
 LUA_PREMK=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--datadir="/var/db/prosody" \
 		--lua-version="${LUA_VER}" \
 		--lua-suffix="${LUA_VER_STR}" \
 		--with-lua-include="${LUA_INCDIR}" \
 		--with-lua-lib="${LUA_LIBDIR}" \
 		--with-random=arc4random \
 		--c-compiler="${CC}" \
 		--cflags="${CFLAGS}" \
 		--add-cflags="-fPIC -I${LOCALBASE}/include -I${OPENSSLINC}" \
 		--linker="${CC}" \
 		--ldflags="${LDFLAGS}" \
 		--add-ldflags="-shared -L${LOCALBASE}/lib -L${OPENSSLLIB}" \
 		--no-example-certs
 
 MAKEFILE=	GNUmakefile
 USERS=		prosody
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	prosody
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD} PORTNAME="${PORTNAME}"
 PLIST_SUB=	PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
 
 post-install:
 	@${REINPLACE_CMD} -e "s|\"luarocks |\"luarocks${LUA_VER_STR} |" ${STAGEDIR}${PREFIX}/lib/prosody/util/prosodyctl.lua
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so
 	@${MKDIR} ${STAGEDIR}/var/run/prosody
 	@${RM} ${STAGEDIR}${ETCDIR}/certs/*
 
 .include <bsd.port.mk>
diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index 7794add53aad..102fe6b0f2cc 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,206 +1,207 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.40.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:npm \
 		https://build-artifacts.signal.org/desktop/:sqlcipher
 DISTFILES=	signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \
 		${SQLCIPHER}.tar.gz:sqlcipher
 # for online build
 #DISTFILES=	${SQLCIPHER}.tar.gz:sqlcipher
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Cross-platform centralized encrypted messaging service
 WWW=		https://signal.org/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 EXTRACT_DEPENDS=jq:textproc/jq \
 		npm:www/npm-node20
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcrypto.a:security/openssl \
 		${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \
 		${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \
 		${LOCALBASE}/lib/libsignal_sqlcipher_extension.a:devel/signal-sqlcipher-extension \
 		app-builder>0:devel/app-builder \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		esbuild:devel/esbuild \
 		jq:textproc/jq \
 		npm:www/npm-node20
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdrm.so:graphics/libdrm \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libexpat.so:textproc/expat2 \
 		libFLAC.so:audio/flac \
 		libffi.so:devel/libffi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libpng16.so:graphics/png \
 		libsnappy.so:archivers/snappy \
 		libsndio.so:audio/sndio \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 USES=		desktop-file-utils gettext-runtime gl gnome jpeg xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_PROJECT=	Signal-Desktop
 
 USE_GL=		gbm gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst
 
 PACKAGE_ENV=	SIGNAL_ENV=production \
 		npm_config_runtime=electron \
 		npm_config_target=${ELECTRON_VER_MAJOR} \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers
 MAKE_ENV+=	ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \
 		HOME=${WRKDIR} \
 		USE_SYSTEM_APP_BUILDER=true \
 		SOURCE_DATE_EPOCH=${_BUILD_DATE} \
 		PATH=${WRKSRC}/node_modules/.bin:${LOCALBASE}/bin:${PATH}
 
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 MAKE_ENV+=	ESBUILD_BINARY_PATH=${LOCALBASE}/bin/esbuild
 
 _BUILD_DATE=	$$(date +'%s')
 
 ELECTRON_VER_MAJOR=	32
 ESBUILD_VERSION=	0.24.0
 
 SQLCIPHER=	sqlcipher-v2-4.6.1-signal-patch2--0.2.1-9d2afebba9bfd8f18afd36a90a800df84fcf6975defacbfa1e1c5e1e8a6d05f1
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 APP_OUT_DIR=	linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked
 
 PLIST_SUB=	NODE_ARCH=${NODE_ARCH} \
 		SHARP_ARCH=${ARCH:S/aarch64/arm64v8/:S/amd64/x64/}
 
 NPM_TIMESTAMP=	1661146515
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
 .elif ${ARCH} == amd64
 PLIST_SUB+=	NOT_AARCH64=""
 .endif
 
 post-extract:
 	# Update node engine
 	${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp.1
 	${PREFIX}/bin/jq '.devDependencies.esbuild = "${ESBUILD_VERSION}"' ${WRKSRC}/package.json.tmp.1 > ${WRKSRC}/package.json.tmp.2
 	${PREFIX}/bin/jq '.devDependencies."electron-builder"= "24.13.3"' ${WRKSRC}/package.json.tmp.2 > ${WRKSRC}/package.json.tmp.3
 	${MV} ${WRKSRC}/package.json.tmp.3 ${WRKSRC}/package.json
 	# remove mock-server as it doesn't build and is useless
 	${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp
 	${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json
 	${RM} ${WRKSRC}/patches/app-builder-lib* ${WRKSRC}/patches/dmg-builder*
 	${CP} ${FILESDIR}/app-builder-lib+24.13.3.patch ${WRKSRC}/patches
 	${CP} ${FILESDIR}/dmg-builder+24.13.3.patch ${WRKSRC}/patches
 
 #	# for online build
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} npm install --ignore-optional --ignore-scripts || ${TRUE}
 
 	# for offline build
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm install --ignore-optional --ignore-scripts --offline || ${TRUE}
 
 do-build:
 # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron32/electron with WRITE priv
 # copy ${LOCALBASE}/share/electron32 in WRKDIR
 # it's needed for the do-install phase, it's here because of this issue
 # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though)
 	@${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	@${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	# Install libsignal_node.so and libringrtc.so binaries in node_modules
 	${MKDIR} ${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \
 		 ${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd
 	${CP} ${LOCALBASE}/lib/libsignal_node.so \
 		${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH}/@signalapp+libsignal-client.node
 	${CP} ${LOCALBASE}/lib/libringrtc.so \
 		${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node
 
 	${CP} ${DISTDIR}/${SQLCIPHER}.tar.gz \
 		${WRKSRC}/node_modules/@signalapp/better-sqlite3/deps/sqlcipher.tar.gz
 
 	cd ${WRKSRC} && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff
 
 	@${RM} -r ${WRKSRC}/node_modules/fs-xattr
 
 #	# online build
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers npm install --ignore-optional
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} npm run generate
 
 	# offline build
 	${ECHO_CMD} offline=true >> ${WRKSRC}/.npmrc
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers npm install --ignore-optional --offline
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} npm run generate --offline
 
 do-install:
 # taken from https://github.com/tagattie/FreeBSD-Electron/blob/master/Mk/Uses/electron.mk#L387
 # and editors/vscode
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} npm run build:electron -- \
 			--linux --dir --config.npmRebuild=false \
 			--config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${BUILD_WRKSRC}/dist/${APP_OUT_DIR} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/signal-logo-desktop-linux.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/signal-desktop.png
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/gen
 	${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/signal-desktop ${STAGEDIR}${PREFIX}/bin
 
 # This seems to be only required for Windows:
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/@nodert-win10-rs4
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/@signalapp/windows-dummy-keystroke
 
 create-caches-tarball:
 	# do some cleanup first
 	${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked
 
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/cardano-db-sync/Makefile b/net-p2p/cardano-db-sync/Makefile
index b349e2e5bab3..3c509bb64147 100644
--- a/net-p2p/cardano-db-sync/Makefile
+++ b/net-p2p/cardano-db-sync/Makefile
@@ -1,542 +1,543 @@
 PORTNAME=	cardano-db-sync
 PORTVERSION=	13.6.0.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p databases
 MASTER_SITES=	https://chap.intersectmbo.org/package/:chap
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	PostgreSQL-driven Cardano blockchain data tool
 WWW=		https://cardano.org/
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libsecp256k1.so:math/secp256k1 \
 		libblst.so:security/blst \
 		libicuuc.so:devel/icu
 RUN_DEPENDS=	cardano-node:net-p2p/cardano-node \
 		bash:shells/bash \
 		${LOCALBASE}/share/rc-subr-jail/rc.subr.jail:ports-mgmt/rc-subr-jail
 
 USES=		autoreconf:build cabal gmake libtool pkgconfig pgsql:14+
 
 WANT_PGSQL=	client server
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	IntersectMBO
 
 GH_TUPLE=	IntersectMBO:libsodium:${LIBSODIUM_HASH}:sodium	\
 		IntersectMBO:cardano-node:cdb45dd5aa9b4cf43ef6a6c8ecd5b6afbef953e4:cardano_node/dist-newstyle/src/cardano-n_-5bf92c55f9471797
 
 CARDANO_DB_SYNC_HASH=	5b131e97210cf603a3aca5ddca7d1420f9cabeec
 LIBSODIUM_HASH=		dbb48cce5429cb6585c9034f002568964f1ce567
 
 USE_RC_SUBR=		cardano_db_sync
 LIBS_PREFIX=		${WRKDIR}/libs_install
 BINARY_ALIAS=		git=true
 
 USE_CABAL=	Cabal-3.12.1.0 \
 		Cabal-syntax-3.12.1.0 \
 		Diff-0.5_1 \
 		FailT-0.1.2.0 \
 		Glob-0.10.2_3 \
 		HUnit-1.6.2.0 \
 		MemoTrie-0.6.11 \
 		MonadRandom-0.6_4 \
 		OneTuple-0.4.2 \
 		Only-0.1_2 \
 		QuickCheck-2.15.0.1 \
 		StateVar-1.2.2 \
 		Stream-0.4.7.2 \
 		Unique-0.4.7.9_1 \
 		Win32-network-0.2.0.0:chap \
 		adjunctions-4.4.2_2 \
 		aeson-2.2.3.0_2 \
 		aeson-pretty-0.8.10 \
 		alex-3.5.1.0 \
 		algebraic-graphs-0.7_3 \
 		ansi-terminal-1.1.1 \
 		ansi-terminal-types-1.1 \
 		ansi-wl-pprint-1.0.2 \
 		ap-normalize-0.1.0.1 \
 		appar-0.1.8 \
 		asn1-encoding-0.9.6_2 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
 		assoc-1.1.1 \
 		async-2.2.5_3 \
 		async-timer-0.1.4.1 \
 		atomic-primops-0.8.8 \
 		attoparsec-0.14.4_5 \
 		attoparsec-aeson-2.2.2.0 \
 		auto-update-0.2.1 \
 		barbies-2.1.1.0 \
 		base-compat-0.13.1 \
 		base-compat-batteries-0.13.1 \
 		base-deriving-via-0.1.0.2:chap \
 		base-orphans-0.9.2 \
 		base16-bytestring-1.0.2.0_1 \
 		base58-bytestring-0.1.0 \
 		base64-bytestring-1.2.1.0_1 \
 		base64-bytestring-type-1.0.1_21 \
 		basement-0.0.16 \
 		bech32-1.1.7 \
 		bifunctors-5.6.2 \
 		bimap-0.5.0 \
 		bin-0.1.4_1 \
 		binary-orphans-1.0.5 \
 		bitvec-1.1.5.0_1 \
 		blaze-builder-0.4.2.3 \
 		blaze-html-0.9.2.0_1 \
 		blaze-markup-0.8.3.0_2 \
 		boring-0.2.2 \
 		brick-2.4 \
 		bsb-http-chunked-0.0.0.4_4 \
 		byron-spec-chain-1.0.1.0:chap \
 		byron-spec-ledger-1.0.1.0:chap \
 		byteorder-1.0.4 \
 		bytestring-builder-0.10.8.2.0 \
 		bytestring-strict-builder-0.4.5.7 \
 		cabal-doctest-1.0.10 \
 		call-stack-0.4.0 \
 		canonical-json-0.6.0.1_1 \
 		capability-0.5.0.1_4 \
 		cardano-api-10.0.0.0:chap \
 		cardano-binary-1.7.1.0:chap \
 		cardano-cli-10.0.0.0:chap \
 		cardano-client-0.3.1.6:chap \
 		cardano-crypto-1.1.2:chap \
 		cardano-crypto-class-2.1.5.0:chap \
 		cardano-crypto-praos-2.1.2.0_2:chap \
 		cardano-crypto-test-1.5.0.2:chap \
 		cardano-crypto-tests-2.1.2.0_2:chap \
 		cardano-crypto-wrapper-1.5.1.3:chap \
 		cardano-data-1.2.3.1:chap \
 		cardano-git-rev-0.2.2.0:chap \
 		cardano-ledger-allegra-1.6.0.1:chap \
 		cardano-ledger-alonzo-1.11.0.0:chap \
 		cardano-ledger-alonzo-test-1.3.0.0:chap \
 		cardano-ledger-api-1.9.4.0:chap \
 		cardano-ledger-babbage-1.10.0.0:chap \
 		cardano-ledger-babbage-test-1.3.0.0:chap \
 		cardano-ledger-binary-1.4.0.0:chap \
 		cardano-ledger-byron-1.0.1.0:chap \
 		cardano-ledger-byron-test-1.5.1.1:chap \
 		cardano-ledger-conway-1.17.2.0:chap \
 		cardano-ledger-conway-test-1.3.0.0:chap \
 		cardano-ledger-core-1.15.0.0:chap \
 		cardano-ledger-mary-1.7.0.1:chap \
 		cardano-ledger-shelley-1.14.1.0:chap \
 		cardano-ledger-shelley-ma-test-1.2.2.4:chap \
 		cardano-ledger-shelley-test-1.5.0.0:chap \
 		cardano-ping-0.5.0.0:chap \
 		cardano-prelude-0.2.0.0:chap \
 		cardano-prelude-test-0.1.0.5:chap \
 		cardano-protocol-tpraos-1.2.0.1:chap \
 		cardano-slotting-0.2.0.0:chap \
 		cardano-strict-containers-0.1.3.0:chap \
 		case-insensitive-1.2.1.0 \
 		cassava-0.5.3.2 \
 		cborg-0.2.10.0_1 \
 		cereal-0.5.8.3 \
 		character-ps-0.1 \
 		charset-0.3.10_1 \
 		clock-0.8.4 \
 		cmdargs-0.10.22 \
 		code-page-0.2.1 \
 		colour-2.3.6 \
 		comonad-5.0.8_2 \
 		compact-0.2.0.0_3 \
 		composition-prelude-3.0.1.0 \
 		concurrent-output-1.10.21 \
 		conduit-1.3.6 \
 		conduit-extra-1.3.6 \
 		config-ini-0.2.7.0_1 \
 		constraints-0.14.2_1 \
 		constraints-extras-0.4.0.1 \
 		contra-tracer-0.1.0.2:chap \
 		contravariant-1.5.5 \
 		cookie-0.5.0 \
 		criterion-1.6.3.0_1 \
 		criterion-measurement-0.2.2.0 \
 		crypton-1.0.0 \
 		crypton-connection-0.4.1 \
 		crypton-x509-1.7.7 \
 		crypton-x509-store-1.6.9 \
 		crypton-x509-system-1.6.7 \
 		crypton-x509-validation-1.6.12 \
 		cryptonite-0.30 \
 		cuddle-0.3.2.1:chap \
 		data-clist-0.2_1 \
 		data-default-0.7.1.1 \
 		data-default-class-0.1.2.0 \
 		data-default-instances-containers-0.0.1 \
 		data-default-instances-dlist-0.0.1 \
 		data-default-instances-old-locale-0.0.1 \
 		data-fix-0.3.4 \
 		dec-0.0.6 \
 		deferred-folds-0.9.18.6 \
 		dense-linear-algebra-0.1.0.0 \
 		dependent-map-0.4.0.0_2 \
 		dependent-sum-0.7.2.0_2 \
 		deque-0.4.4.1 \
 		deriving-aeson-0.2.9_1 \
 		deriving-compat-0.6.6 \
 		dictionary-sharing-0.1.0.0_4 \
 		digest-0.0.2.1 \
 		directory-1.3.8.5 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0_2 \
 		dns-4.2.0 \
 		dom-lt-0.2.3_1 \
 		double-conversion-2.0.5.0 \
 		easy-file-0.2.5 \
 		either-5.0.2_2 \
 		ekg-0.4.1.0_1 \
 		ekg-core-0.1.1.7.0.0.0.0.1:chap \
 		ekg-forward-0.6:chap \
 		ekg-json-0.1.1.0_1 \
 		erf-2.0.0.0 \
 		errors-2.3.0_5 \
 		esqueleto-3.5.11.2 \
 		exceptions-0.10.8_1 \
 		extra-1.7.16_1 \
 		fast-logger-3.2.3 \
 		fgl-5.8.3.0 \
 		file-embed-0.0.16.0 \
 		filelock-0.1.1.7 \
 		filepath-1.4.300.2_1 \
 		fin-0.3.1_1 \
 		fingertree-0.1.5.0 \
 		flat-0.6 \
 		foldl-1.4.17 \
 		formatting-7.2.0 \
 		foundation-0.0.30 \
 		free-5.2_5 \
 		fs-api-0.3.0.0 \
 		fs-sim-0.3.0.0 \
 		generic-data-1.1.0.0_2 \
 		generic-lens-2.2.2.0_1 \
 		generic-lens-core-2.2.1.0_2 \
 		generic-optics-2.2.1.0_2 \
 		generic-random-1.5.0.1 \
 		generically-0.1.1_4 \
 		generics-sop-0.5.1.4_1 \
 		genvalidity-1.1.1.0 \
 		githash-0.1.7.0 \
 		graphviz-2999.20.2.0 \
 		groups-0.5.3 \
 		half-0.3.1_2 \
 		happy-2.0.2 \
 		happy-lib-2.0.2 \
 		hashable-1.4.7.0 \
 		haskell-lexer-1.1.1 \
 		haskell-src-exts-1.23.1 \
 		haskell-src-meta-0.8.14 \
 		heapwords-0.1.0.2:chap \
 		hedgehog-1.5 \
 		hedgehog-extras-0.6.5.0 \
 		hedgehog-quickcheck-0.1.1_8 \
 		here-1.2.14 \
 		hostname-1.0 \
 		hourglass-0.2.12_1 \
 		hsc2hs-0.68.10_3 \
 		hspec-2.11.9 \
 		hspec-core-2.11.9 \
 		hspec-discover-2.11.9 \
 		hspec-expectations-0.8.4_2 \
 		http-api-data-0.6.1_1 \
 		http-client-0.7.17 \
 		http-client-tls-0.3.6.3 \
 		http-conduit-2.3.9 \
 		http-date-0.0.11 \
 		http-media-0.8.1.1_2 \
 		http-semantics-0.2.1 \
 		http-types-0.12.4 \
 		http2-5.3.4 \
 		indexed-profunctors-0.1.1.1 \
 		indexed-traversable-0.1.4 \
 		indexed-traversable-instances-0.1.2 \
 		infinite-list-0.1.1 \
 		insert-ordered-containers-0.2.6 \
 		integer-conversion-0.1.1 \
 		integer-logarithms-1.0.3.1_6 \
 		invariant-0.6.3 \
 		io-classes-1.5.0.0_1 \
 		io-classes-mtl-0.1.2.0_1 \
 		io-sim-1.5.0.0 \
 		io-streams-1.5.2.2_5 \
 		io-streams-haproxy-1.0.1.0_9 \
 		iohk-monitoring-0.1.11.5:chap \
 		iproute-1.7.14 \
 		isomorphism-class-0.1.1 \
 		js-chart-2.9.4.1 \
 		kan-extensions-5.2.6 \
 		katip-0.8.8.2 \
 		lazy-search-0.1.3.0 \
 		lazysmallcheck-0.6 \
 		lens-5.3.2_2 \
 		libyaml-0.1.4 \
 		libyaml-clib-0.2.5 \
 		lift-type-0.1.2.0 \
 		lifted-async-0.10.2.6_1 \
 		lifted-base-0.2.3.12 \
 		list-t-1.0.5.7 \
 		lobemo-backend-aggregation-0.1.0.0:chap \
 		lobemo-backend-ekg-0.1.1.0:chap \
 		lobemo-backend-monitoring-0.1.0.0:chap \
 		lobemo-backend-trace-forwarder-0.1.0.0:chap \
 		logict-0.8.1.0_1 \
 		math-functions-0.3.4.4 \
 		measures-0.1.0.2:chap \
 		megaparsec-9.6.1 \
 		memory-0.18.0 \
 		microlens-0.4.13.1_1 \
 		microlens-aeson-2.5.2 \
 		microlens-mtl-0.2.0.3_1 \
 		microlens-th-0.4.3.15 \
 		microstache-1.0.3 \
 		mime-types-0.1.2.0 \
 		mmorph-1.2.0_3 \
 		monad-control-1.0.3.1 \
 		monad-logger-0.3.40 \
 		monad-loops-0.4.3 \
 		mono-traversable-1.0.20.0 \
 		monoidal-containers-0.6.5.0 \
 		monoidal-synchronisation-0.1.0.6:chap \
 		multiset-0.3.4.3_1 \
 		mutable-containers-0.3.4.1 \
 		mwc-random-0.15.1.0 \
 		network-3.1.4.0_1 \
 		network-byte-order-0.1.7 \
 		network-control-0.1.3 \
 		network-mux-0.4.5.3:chap \
 		network-uri-2.6.4.2_1 \
 		newtype-0.2.2.0_3 \
 		newtype-generics-0.6.2_4 \
 		non-integral-1.0.0.0_2:chap \
 		nonempty-vector-0.2.3_2 \
 		nothunks-0.2.1.1 \
 		old-locale-1.0.0.7_2 \
 		old-time-1.1.0.4 \
 		optics-core-0.4.1.1_1 \
 		optics-extra-0.4.2.1_4 \
 		optics-th-0.4.1_8 \
 		optparse-applicative-0.18.1.0 \
 		optparse-applicative-fork-0.18.1.0:chap \
 		ordered-containers-0.2.4 \
 		os-string-2.0.6_1 \
 		ouroboros-consensus-0.21.0.0:chap \
 		ouroboros-consensus-cardano-0.20.0.0:chap \
 		ouroboros-consensus-diffusion-0.18.0.0:chap \
 		ouroboros-consensus-protocol-0.9.0.2:chap \
 		ouroboros-network-0.17.1.2:chap \
 		ouroboros-network-api-0.10.0.0:chap \
 		ouroboros-network-framework-0.13.2.5:chap \
 		ouroboros-network-mock-0.1.1.2:chap \
 		ouroboros-network-protocols-0.11.0.0:chap \
 		ouroboros-network-testing-0.7.0.0:chap \
 		parallel-3.2.2.0_9 \
 		parser-combinators-1.3.0_1 \
 		parsers-0.12.11_3 \
 		partial-order-0.2.0.0 \
 		path-pieces-0.2.1_1 \
 		pem-0.2.4 \
 		persistent-2.14.6.3 \
 		persistent-documentation-0.1.0.5 \
 		persistent-postgresql-2.13.6.2_1 \
 		pipes-4.3.16_6 \
 		plutus-core-1.36.0.0:chap \
 		plutus-ledger-api-1.36.0.0:chap \
 		plutus-tx-1.36.0.0:chap \
 		polyparse-1.13_9 \
 		postgresql-libpq-0.11.0.0 \
 		postgresql-libpq-pkgconfig-0.11 \
 		postgresql-simple-0.7.0.0_3 \
 		pretty-show-1.10 \
 		pretty-simple-4.1.2.0 \
 		prettyprinter-1.7.1 \
 		prettyprinter-ansi-terminal-1.1.3 \
 		prettyprinter-compat-ansi-wl-pprint-1.0.2 \
 		prettyprinter-configurable-1.36.0.0:chap \
 		primitive-0.9.0.0_2 \
 		process-1.6.24.0 \
 		profunctors-5.6.2_3 \
 		prometheus-2.3.0 \
 		psqueues-0.2.8.0_1 \
 		quickcheck-instances-0.3.31_2 \
 		quickcheck-io-0.2.0 \
 		quickcheck-monoids-0.1.0.1:chap \
 		quickcheck-state-machine-0.10.1 \
 		quickcheck-transformer-0.3.1.2 \
 		quiet-0.2 \
 		ral-0.2.2_1 \
 		random-1.2.1.2 \
 		random-shuffle-0.0.4 \
 		readable-0.3.1_2 \
 		recursion-schemes-5.2.3 \
 		recv-0.1.0 \
 		reducers-3.12.4_7 \
 		reflection-2.1.8 \
 		regex-base-0.94.0.2_4 \
 		regex-posix-0.96.0.1_3 \
 		resource-pool-0.4.0.0 \
 		resourcet-1.3.0 \
 		safe-0.3.21_1 \
 		safe-exceptions-0.1.7.4_1 \
 		safe-wild-cards-1.0.0.2_1 \
 		scientific-0.3.8.0_1 \
 		selective-0.5 \
 		semialign-1.3.1_1 \
 		semigroupoids-6.0.1_1 \
 		semigroups-0.20 \
 		serialise-0.2.6.1_3 \
 		servant-0.20.2 \
 		servant-server-0.20.2 \
 		servant-swagger-1.2.1 \
 		set-algebra-1.1.0.3:chap \
 		show-combinators-0.2.0.0_2 \
 		si-timers-1.5.0.0 \
 		silently-1.2.5.3 \
 		simple-sendfile-0.2.32 \
 		singleton-bool-0.1.8 \
 		singletons-3.0.3 \
 		singletons-th-3.2 \
 		size-based-0.1.3.3 \
 		small-steps-1.1.0.1:chap \
 		snap-core-1.0.5.1_6 \
 		snap-server-1.1.2.1_5 \
 		socks-0.6.1 \
 		some-1.0.6_1 \
 		sop-core-0.5.0.2_4 \
 		sop-extras-0.2.1.0:chap \
 		split-0.2.5 \
 		splitmix-0.1.0.5_1 \
 		statistics-0.16.2.1 \
 		statistics-linreg-0.3 \
 		stm-2.5.3.1 \
 		stm-chans-3.0.0.9 \
 		streaming-0.2.4.0 \
 		streaming-binary-0.3.0.1 \
 		streaming-bytestring-0.3.3 \
 		streaming-commons-0.2.2.6_1 \
 		strict-0.5.1_1 \
 		strict-checked-vars-0.2.0.0_3:chap \
 		strict-list-0.1.7.5 \
 		strict-mvar-1.5.0.0 \
 		strict-sop-core-0.1.2.0:chap \
 		strict-stm-1.5.0.0 \
 		string-conv-0.2.0 \
 		string-conversions-0.4.0.1_1 \
 		swagger2-2.8.9 \
 		syb-0.7.2.4 \
 		tagged-0.8.8_1 \
 		tar-0.6.3.0_1 \
 		tasty-1.5_2 \
 		tasty-expected-failure-0.12.3 \
 		tasty-golden-2.3.5 \
 		tasty-hedgehog-1.4.0.2_5 \
 		tasty-hunit-0.10.2 \
 		tasty-quickcheck-0.11 \
 		tasty-rerun-1.1.19_3 \
 		tdigest-0.3.1 \
 		temporary-1.3 \
 		terminal-size-0.3.4_1 \
 		testing-type-modifiers-0.1.0.1 \
 		text-builder-0.6.7.2 \
 		text-builder-dev-0.3.5 \
 		text-icu-0.8.0.5 \
 		text-iso8601-0.1.1_1 \
 		text-short-0.1.6_2 \
 		text-zipper-0.13 \
 		tf-random-0.5 \
 		th-abstraction-0.6.0.0_2 \
 		th-compat-0.1.5_2 \
 		th-desugar-1.15_1 \
 		th-env-0.1.1 \
 		th-expand-syns-0.4.11.0_4 \
 		th-lift-0.8.4_3 \
 		th-lift-instances-0.1.20 \
 		th-orphans-0.13.14_4 \
 		th-reify-many-0.1.10 \
 		th-utilities-0.2.5.0 \
 		these-1.2.1_1 \
 		time-compat-1.9.7_2 \
 		time-manager-0.1.0 \
 		time-units-1.0.0 \
 		tls-2.1.0 \
 		tracer-transformers-0.1.0.4:chap \
 		transformers-base-0.4.6 \
 		transformers-compat-0.7.2 \
 		transformers-except-0.1.4_1 \
 		tree-diff-0.3.1_1 \
 		typed-process-0.2.12.0 \
 		typed-protocols-0.1.1.0_3:chap \
 		typed-protocols-cborg-0.1.0.4_2:chap \
 		typed-protocols-examples-0.2.0.2:chap \
 		unagi-chan-0.4.1.4 \
 		unbounded-delays-0.1.1.1 \
 		universe-base-1.1.4 \
 		unix-2.8.5.1 \
 		unix-bytestring-0.4.0.2 \
 		unix-compat-0.7.2 \
 		unix-time-0.4.15 \
 		unliftio-0.2.25.0 \
 		unliftio-core-0.2.1.0_4 \
 		unordered-containers-0.2.20_3 \
 		utf8-string-1.0.2 \
 		uuid-types-1.0.6_1 \
 		validation-1.1.3_1 \
 		validation-selective-0.2.0.0.0.0.0.0.1:chap \
 		validity-0.12.1.0 \
 		vault-0.3.1.5_8 \
 		vector-0.13.1.0_2 \
 		vector-algorithms-0.9.0.2_1 \
 		vector-binary-instances-0.2.5.2_5 \
 		vector-map-1.1.0.0:chap \
 		vector-stream-0.1.0.1_2 \
 		vector-th-unbox-0.2.2_6 \
 		void-0.7.3 \
 		vty-6.0_1 \
 		vty-crossplatform-0.2.0.0_1 \
 		vty-unix-0.1.0.0_1 \
 		wai-3.2.4 \
 		wai-app-static-3.1.9 \
 		wai-extra-3.1.15 \
 		wai-logger-2.4.1 \
 		warp-3.4.2 \
 		wherefrom-compat-0.1.1.1_1 \
 		wide-word-0.1.6.0_3 \
 		with-utf8-1.1.0.0_1 \
 		witherable-0.5_1 \
 		wl-pprint-annotated-0.1.0.1_3 \
 		wl-pprint-text-1.2.0.2_3 \
 		word-wrap-0.5 \
 		word8-0.1.3 \
 		yaml-0.11.11.2_2 \
 		zlib-0.7.1.0_1 \
 		zlib-bindings-0.1.1.5_2
 
 CABAL_PROJECT=		append
 CABAL_EXECUTABLES=	cardano-db-sync cardano-db-tool
 CABAL_REPOSITORIES=	chap
 
 WITH_LTO=		yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's/$$(gitRevFromGit)/"${CARDANO_DB_SYNC_HASH}"/' \
 			-e '/Cardano.Db.Git.RevFromGit/d' \
 			${WRKSRC}/cardano-db/src/Cardano/Db/Git/Version.hs
 
 pre-build:
 	@${MKDIR} ${PKGCONFIG_LINKDIR}
 
 	cd ${WRKSRC_sodium} && ./autogen.sh
 	cd ${WRKSRC_sodium} && ./configure --prefix=${LIBS_PREFIX} --with-pthreads --disable-shared
 	cd ${WRKSRC_sodium} && ${GMAKE} -j${MAKE_JOBS_NUMBER} && ${GMAKE} ${INSTALL_TARGET}
 	${MV} ${LIBS_PREFIX}/lib/pkgconfig/libsodium.pc ${PKGCONFIG_LINKDIR}
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/postgresql-setup.sh ${STAGEDIR}${PREFIX}/bin/cardano-db-sync-pgsql-setup
 	${MKDIR} ${STAGEDIR}${DATADIR}/schema
 	cd ${WRKSRC}/schema && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/schema
 
 .include <bsd.port.mk>
diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index 5c15734248b2..f7bd8e76fe9d 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	fb303
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Base Thrift service and a common set of functionality
 WWW=		https://github.com/facebook/fb303
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicuuc.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libmvfst_server.so:net/mvfst \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libthriftcpp2.so:devel/fbthrift \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CXXFLAGS+=	-fPIC
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	PYTHON_EXTENSIONS
 
 post-install:
 	@${RMDIR} \
 		${STAGEDIR}${PREFIX}/include/fb303/test
 
 .include <bsd.port.mk>
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index df17b55d0df4..c5c72868fb74 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -1,159 +1,159 @@
 PORTNAME=	freerdp
 DISTVERSION=	2.11.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 
 PATCH_SITES=	https://github.com/FreeRDP/FreeRDP/commit/
 PATCHFILES+=	61983cd6dcb86097d91b7ef405abc1266444a368.patch:-p1 # ffmpeg6 support: AVPicture
 								   # https://github.com/FreeRDP/FreeRDP/pull/8941
 PATCHFILES+=	78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch:-p1 # add additional neon check
 								   # https://github.com/FreeRDP/FreeRDP/issues/9746
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 WWW=		https://www.freerdp.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
 USES=		alias cmake compiler:c++11-lib cpe localbase pathfix pkgconfig ssl
 
 BROKEN_SSL=	libressl-devel
 BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
 
 USE_LDCONFIG=	yes
 
 PATCHVERSION=	${DISTVERSION}
 MAJORVERSION=	${DISTVERSION:R:R}
 
 CMAKE_ARGS+=	${CMAKE_ARGS_${ARCH}}
 CMAKE_ON=	WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB CHANNEL_URBDRC_CLIENT
 CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSSAPI WITH_GSTREAMER_0_10 WITH_IPP \
 		WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \
 		WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \
 		WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
 		WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
 
 PORTSCOUT=	limit:^2\.
 
 PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
 PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
 
 OPTIONS_DEFINE=		ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG GSM GSTREAMER \
 			ICU JPEG LAME MANPAGES OPENH264 PCSC \
 			PULSEAUDIO SOXR WAYLAND X11
 OPTIONS_DEFINE_aarch64=	NEON
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_armv6=	NEON
 OPTIONS_DEFINE_armv7=	NEON
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT=	CUPS GSTREAMER ICU MANPAGES SWSCALE WAYLAND X11
 OPTIONS_DEFAULT_aarch64=	NEON
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_DEFAULT_armv7=	NEON
 OPTIONS_RADIO=		SCALE
 OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
 OPTIONS_SUB=		yes
 
 BROKENFOCUS_DESC=	Work around focus bug in some WMs (PR \#254908)
 CAIRO_DESC=		Use CAIRO image library for screen resizing
 NEON_DESC=		Enable Media Processing Engine instructions
 OPENH264_DESC=		H.264 video codec support via OpenH264
 PCSC_DESC=		Smart card support (smart card device redirection)
 SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
 WAYLAND_DESC=		Build FreeRDP Wayland client
 X11_DESC=		Build FreeRDP X11 client
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
 BROKENFOCUS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-focusbug.diff
 
 CAIRO_USES=		gnome
 CAIRO_USE=		gnome=cairo
 CAIRO_CMAKE_BOOL=	WITH_CAIRO
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
 FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CMAKE_BOOL=	WITH_FAAC
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CMAKE_BOOL=	WITH_FAAD2
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG WITH_DSP_FFMPEG
 
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		WITH_GSM
 
 GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
 GSTREAMER_USES=		gettext gnome gstreamer xorg
 GSTREAMER_USE=		gnome=glib20 xorg=x11,xext,xorgproto,xrandr
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CMAKE_BOOL=		WITH_ICU
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG
 
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_BOOL=	WITH_LAME
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
 
 NEON_CMAKE_BOOL=	WITH_NEON
 
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CMAKE_BOOL=	WITH_OPENH264
 
 # LoadLibraryA("libpcsclite.so")
 PCSC_RUN_DEPENDS=	${LOCALBASE}/lib/libpcsclite.so:devel/pcsc-lite
 PCSC_CMAKE_BOOL=	WITH_PCSC
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	WITH_SOXR
 
 SSE_CMAKE_BOOL=		WITH_SSE2
 
 SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 SWSCALE_CMAKE_BOOL=	WITH_SWSCALE
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-cursor.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
 X11_USES=		xorg
 X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
 			-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
 			-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
 			-DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \
 			-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
 			-DWITH_XV:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/cmake/FindGSM.cmake \
 		${WRKSRC}/libfreerdp/codec/dsp.c
 
 pre-configure:
 	${CP} ${FILESDIR}/mntent.h ${WRKSRC}/rdtk/include
 	${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client
 
 .include <bsd.port.mk>
diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile
index 6018cd5c6864..97f71f1214bf 100644
--- a/net/freerdp3/Makefile
+++ b/net/freerdp3/Makefile
@@ -1,262 +1,262 @@
 PORTNAME=	freerdp
 DISTVERSION=	3.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 WWW=		https://www.freerdp.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
 USES=		alias cmake compiler:c++11-lib cpe desktop-file-utils \
 		localbase:ldflags pathfix pkgconfig ssl xorg
 
 BROKEN_SSL=	libressl-devel
 BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
 
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xext
 
 CMAKE_ON=	CHANNEL_SERIAL CHANNEL_URBDRC_CLIENT RDTK_FORCE_STATIC_BUILD \
 		UWAC_FORCE_STATIC_BUILD WITH_BINARY_VERSIONING WITH_CHANNELS \
 		WITH_CLIENT_SDL_VERSIONED WITH_FREERDP_DEPRECATED \
 		WITH_FREERDP_DEPRECATED_COMMANDLINE \
 		WITH_INSTALL_CLIENT_DESKTOP_FILES WITH_OPENSSL WITH_OSS \
 		WITH_WINPR_DEPRECATED WITH_ZLIB
 CMAKE_OFF=	CHANNEL_TSMF WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF \
 		WITH_GSTREAMER_0_10 WITH_GSTREAMER_1_0 WITH_IPP WITH_LIBSYSTEMD \
 		WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER WITH_SAMPLE \
 		WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY WITH_SANITIZE_THREAD \
 		WITH_SERVER WITH_SERVER_CHANNELS WITH_SERVER_INTERFACE \
 		WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
 
 PLIST_SUB+=	PATCHVERSION="${DISTVERSION}"
 PLIST_SUB+=	MAJORVERSION="${DISTVERSION:R:R}"
 
 OPTIONS_DEFINE=			ALSA BROKENFOCUS CUPS FAAC FAAD FDKAAC FFMPEG GSM ICU \
 				JPEG LAME MANPAGES OPENH264 OPUS PCSC PKCS11 \
 				PULSEAUDIO SDL2 SDL3 SOXR URIPARSER WAYLAND X11
 OPTIONS_DEFINE_aarch64=		SIMD
 OPTIONS_DEFINE_amd64=		SIMD
 OPTIONS_DEFINE_armv7=		SIMD
 OPTIONS_DEFINE_i386=		SIMD
 OPTIONS_DEFAULT=		AAD CUPS GSSAPI_HEIMDAL ICU JSON_C KEYBOARD_LAYOUT \
 				MANPAGES SDL2 SDL3 SWSCALE TIMEZONE_FILE WAYLAND WEBKIT X11
 OPTIONS_DEFAULT_aarch64=	SIMD
 OPTIONS_DEFAULT_amd64=		SIMD
 OPTIONS_DEFAULT_armv7=		SIMD
 OPTIONS_GROUP=			CLIPBOARD_IMAGE REQUIRE_JSON
 OPTIONS_GROUP_CLIPBOARD_IMAGE=	JPEG_CB PNG WEBP
 OPTIONS_GROUP_REQUIRE_JSON=	AAD KEYBOARD_LAYOUT TIMEZONE_FILE
 OPTIONS_RADIO=			GSSAPI JSON SCALE WEBVIEW
 OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_RADIO_JSON=		CJSON JSON_C
 OPTIONS_RADIO_SCALE=		CAIRO SWSCALE
 OPTIONS_RADIO_WEBVIEW=		WEBENGINE WEBKIT
 OPTIONS_SUB=			yes
 
 AAD_DESC=		Compile with support for Azure AD authentication (require SDL)
 BROKENFOCUS_DESC=	Work around focus bug in some WMs (PR \#254908)
 CAIRO_DESC=		Use CAIRO image library for screen resizing
 CJSON_DESC=		${JSON_DESC} via cJSON
 CLIPBOARD_IMAGE_DESC=	Add "to/from" BMP conversion support to clipboard (experimental)
 FDKAAC_DESC=		Support for FDK-AAC for sound and microphone redirection
 JPEG_CB_DESC=		${JPEG_DESC}
 KEYBOARD_LAYOUT_DESC=	Use keyboard definitions from JSON file
 OPENH264_DESC=		H.264 video codec support via OpenH264
 PCSC_DESC=		Smart card support (smart card device redirection)
 PKCS11_DESC=		Use security/pkcs11-helper
 REQUIRE_JSON_DESC=	Options that require JSON
 SDL2_DESC=		Build FreeRDP SDL 2 client
 SDL3_DESC=		Build FreeRDP SDL 3 client
 SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
 TIMEZONE_FILE_DESC=	Support timezones as JSON resources (if OFF, compiled in is used)
 URIPARSER_DESC=		Use uriparser RFC 3986 URI parsing library to handle URIs
 WAYLAND_DESC=		Build FreeRDP Wayland client
 WEBVIEW_DESC=		Build with WebView support for AAD login popup browser
 X11_DESC=		Build FreeRDP X11 client
 
 AAD_IMPLIES=		SDL3
 AAD_CMAKE_BOOL=		WITH_AAD
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
 BROKENFOCUS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-focusbug.diff
 
 CAIRO_USES=		gnome
 CAIRO_USE=		gnome=cairo
 CAIRO_CMAKE_BOOL=	WITH_CAIRO
 
 CJSON_LIB_DEPENDS=	libcjson.so:devel/libcjson \
 			libcjson_utils.so:devel/libcjson
 CJSON_CMAKE_BOOL=	WITH_CJSON_REQUIRED
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
 FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CMAKE_BOOL=	WITH_FAAC
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CMAKE_BOOL=	WITH_FAAD2
 
 FDKAAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
 FDKAAC_CMAKE_BOOL=	WITH_FDK_AAC
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG WITH_DSP_FFMPEG
 
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		WITH_GSM
 
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CMAKE_ON=		-DWITH_UNICODE_BUILTIN=OFF
 ICU_CMAKE_OFF=		-DWITH_UNICODE_BUILTIN=ON
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG
 
 JPEG_CB_USES=		jpeg
 JPEG_CB_CMAKE_BOOL=	WINPR_UTILS_IMAGE_JPEG
 
 JSON_C_LIB_DEPENDS=	libjson-c.so:devel/json-c
 JSON_C_CMAKE_BOOL=	WITH_JSONC_REQUIRED
 
 KEYBOARD_LAYOUT_CMAKE_BOOL=	WITH_KEYBOARD_LAYOUT_FROM_FILE
 
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_BOOL=	WITH_LAME
 
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
 
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CMAKE_BOOL=	WITH_OPENH264
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CMAKE_BOOL=	WITH_OPUS
 
 # LoadLibraryA("libpcsclite.so")
 PCSC_RUN_DEPENDS=	${LOCALBASE}/lib/libpcsclite.so:devel/pcsc-lite
 PCSC_CMAKE_BOOL=	WITH_PCSC
 
 PKCS11_BUILD_DEPENDS=	${LOCALBASE}/include/pkcs11-helper-1.0/pkcs11.h:security/pkcs11-helper
 PKCS11_CMAKE_BOOL=	WITH_PKCS11
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL=		WINPR_UTILS_IMAGE_PNG
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
 SDL2_USES=		sdl
 SDL2_USE=		sdl=sdl2,ttf2,image2
 SDL2_CMAKE_BOOL=	WITH_CLIENT_SDL2 WITH_SDL_IMAGE_DIALOGS
 
 SDL3_USES=		sdl
 SDL3_USE=		sdl=sdl3,ttf3,image3
 SDL3_CMAKE_BOOL=	WITH_CLIENT_SDL3 WITH_SDL_IMAGE_DIALOGS
 
 SIMD_CMAKE_BOOL=	WITH_SIMD
 
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	WITH_SOXR
 
 SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 SWSCALE_CMAKE_BOOL=	WITH_SWSCALE
 
 TIMEZONE_FILE_CMAKE_BOOL=	WITH_TIMEZONE_FROM_FILE
 TIMEZONE_FILE_CMAKE_ON=		-DWITH_TIMEZONE_COMPILED=OFF
 TIMEZONE_FILE_CMAKE_OFF=	-DWITH_TIMEZONE_COMPILED=ON
 
 URIPARSER_LIB_DEPENDS=	liburiparser.so:net/uriparser
 URIPARSER_CMAKE_BOOL=	WITH_URIPARSER
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 			wayland-scanner:graphics/wayland
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-cursor.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_RUN_DEPENDS=	wayland-scanner:graphics/wayland
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
 _WEBENGINE_USES=	qt:5
 WEBENGINE_USE_QT=	core declarative gui location network printsupport \
 			webchannel webengine widgets buildtools:build qmake:build
 WEBENGINE_CMAKE_BOOL=	WITH_WEBVIEW_QT
 WEBENGINE_CMAKE_ON=	-DWITH_WEBVIEW:BOOL=ON
 
 _WEBKIT_LIB_DEPENDS=	libsoup-3.0.so:devel/libsoup3 \
 			libharfbuzz.so:print/harfbuzz \
 			libwebkit2gtk-4.1.so:www/webkit2-gtk@41
 _WEBKIT_USES=		gettext gnome
 WEBKIT_USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
 WEBKIT_CMAKE_ON=	-DWITH_WEBVIEW:BOOL=ON
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_BOOL=	WINPR_UTILS_IMAGE_WEBP
 
 X11_USE=		xorg=xcursor,xfixes,xi,xinerama,xkbfile,xorgproto,xrandr,xrender,xv
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
 			-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
 			-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
 			-DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \
 			-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
 			-DWITH_XV:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAAD}
 .  if ${PORT_OPTIONS:MWEBENGINE}
 USES+=		${_WEBENGINE_USES}
 USE_QT+=	${WEBENGINE_USE_QT}
 .  elif ${PORT_OPTIONS:MWEBKIT}
 LIB_DEPENDS+=	${_WEBKIT_LIB_DEPENDS}
 USES+=		${_WEBKIT_USES}
 USE_GNOME+=	${WEBKIT_USE_GNOME}
 .  else
 CMAKE_OFF+=	WITH_WEBVIEW
 .  endif
 .else
 CMAKE_OFF+=	WITH_WEBVIEW
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI_HEIMDAL} || ${PORT_OPTIONS:MGSSAPI_MIT}
 CMAKE_ON+=	WITH_KRB5
 .else
 CMAKE_OFF+=	WITH_KRB5
 .endif
 
 .if ${PORT_OPTIONS:MCJSON} || ${PORT_OPTIONS:MJSON_C}
 CMAKE_ON+=	WITH_WINPR_JSON
 CMAKE_OFF+=	WITH_JSON_DISABLED
 PLIST_SUB+=	JSON=""
 .else
 CMAKE_ON+=	WITH_JSON_DISABLED
 CMAKE_OFF+=	WITH_AAD WITH_WINPR_JSON
 PLIST_SUB+=	JSON="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/cmake/FindGSM.cmake \
 		${WRKSRC}/libfreerdp/codec/dsp.c
 
 pre-configure:
 	${CP} ${FILESDIR}/mntent.h ${WRKSRC}/winpr/include
 	${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client
 
 .include <bsd.port.mk>
diff --git a/net/megacmd/Makefile b/net/megacmd/Makefile
index 285fbcb6f0ae..4457264e20e3 100644
--- a/net/megacmd/Makefile
+++ b/net/megacmd/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	megacmd
 DISTVERSION=	1.7.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	_Linux
 CATEGORIES=	net
 
 MAINTAINER=	kikadf.01@gmail.com
 COMMENT=	Command Line Interactive and Scriptable Application to access MEGA
 WWW=		https://mega.nz/cm
 
 LICENSE=	GPLv3 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libcares.so:dns/c-ares \
 		libcryptopp.so:security/cryptopp \
 		libcurl.so:ftp/curl \
 		libicudata.so:devel/icu \
 		libpcre.so:devel/pcre \
 		libsodium.so:security/libsodium \
 		libuv.so:devel/libuv
 
 USES=		autoreconf gmake libtool pathfix readline shebangfix sqlite:3 \
 		ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	meganz
 GH_PROJECT=	MEGAcmd sdk:sdk
 GH_SUBDIR=	sdk:sdk
 GH_TAGNAME=	v4.31.0b:sdk
 
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	src/client/mega-*
 bash_CMD=	${SH}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-examples \
 		--disable-java --disable-php --disable-python \
 		--disable-chat --without-freeimage \
 		--without-termcap --without-ffmpeg --without-libraw \
 		--without-libzen --without-libmediainfo \
 		--enable-gcc-hardening \
 		--with-cares=${LOCALBASE} --with-cryptopp=${LOCALBASE} \
 		--with-curl=${LOCALBASE} --with-sodium=${LOCALBASE} \
 		--with-sqlite=${LOCALBASE} --with-libuv=${LOCALBASE} \
 		--with-zlib --with-readline=${LOCALBASE}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == DragonFly
 BUILD_DEPENDS+=	cxxfs_gcc8>0:misc/cxxfs_gcc8
 SUB_FILES=	pkg-message
 CXXFLAGS+=	-isystem ${LOCALBASE}/cxxfs_gcc8
 LDFLAGS+=	-L${LOCALBASE}/cxxfs_gcc8
 .endif
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 .endif
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/net/mvfst/Makefile b/net/mvfst/Makefile
index 0b4e67ad98b0..d460483a437d 100644
--- a/net/mvfst/Makefile
+++ b/net/mvfst/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	mvfst
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of the QUIC transport protocol
 WWW=		https://github.com/facebook/mvfst
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libbzip2.so:misc/vxl \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:testing compiler:c++17-lang cpe ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CPE_VENDOR=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS
 CMAKE_TESTING_ON=	BUILD_TESTS # several tests fail, see https://github.com/facebookincubator/mvfst/issues/275
 
 CXXFLAGS+=	-fPIC
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 .include <bsd.port.mk>
diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index 6e212eb96d0f..afda0dcf21d9 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -1,450 +1,450 @@
 PORTNAME=		openldap
 DISTVERSION=		2.5.19
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
 			http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
 			http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
 			http://mirror.eu.oneandone.net/software/openldap/%SUBDIR%/ \
 			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
 			https://mirror-hk.koddos.net/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
 			https://mirror.koddos.net/OpenLDAP/%SUBDIR%/ \
 			https://mirror.lyrahosting.com/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 			http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
 .if defined(CLIENT_ONLY)
 PKGNAMESUFFIX=		25-client
 .else
 PKGNAMESUFFIX=		25-server
 .endif
 
 MAINTAINER=		delphij@FreeBSD.org
 WWW=		https://www.OpenLDAP.org/
 .if defined(CLIENT_ONLY)
 COMMENT=		Open source LDAP client implementation
 .else
 COMMENT=		Open source LDAP server implementation
 .endif
 
 LICENSE=		OPENLDAP
 LICENSE_NAME=		OpenLDAP Public License
 LICENSE_FILE=		${WRKSRC}/LICENSE
 LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # :keepla because port uses lt_dlopen
 USES=			cpe gmake libtool:keepla localbase ssl tar:tgz
 BUILD_DEPENDS+=		autoconf>0:devel/autoconf
 
 .if defined(CLIENT_ONLY)
 CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-client ${PORTNAME}-client
 .else
 CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
 .endif
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	0
 OPENLDAP_SHLIB_MINOR=	1.14
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 OPTIONS_DEFAULT+=	DEBUG
 
 FETCH_DESC=		Enable fetch(3) support
 FETCH_CONFIGURE_WITH=	fetch
 
 GSSAPI_DESC=		With GSSAPI support
 GSSAPI_RUN_DEPENDS=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
 
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	DOCS
 .else
 OPTIONS_GROUP=		BKNDS OVLYS
 BKNDS_DESC=		OpenLDAP backends
 BKNDS_DEFAULTS=		ASYNCMETA DNSSRV MDB PASSWD RELAY SOCK
 OPTIONS_GROUP_BKNDS+=	${BKNDS_DEFAULTS}
 OPTIONS_GROUP_BKNDS+=	PERL SQL
 
 OVLYS_DESC=		OpenLDAP overlays
 OPTIONS_GROUP_OVLYS+=	ACCESSLOG
 OPTIONS_GROUP_OVLYS+=	ADDPARTIAL
 OPTIONS_GROUP_OVLYS+=	ALLOP
 OPTIONS_GROUP_OVLYS+=	AUTOCA
 OPTIONS_GROUP_OVLYS+=	AUDITLOG
 OPTIONS_GROUP_OVLYS+=	AUTOGROUP
 OPTIONS_GROUP_OVLYS+=	CLOAK
 OPTIONS_GROUP_OVLYS+=	COLLECT
 OPTIONS_GROUP_OVLYS+=	CONSTRAINT
 OPTIONS_GROUP_OVLYS+=	DDS
 OPTIONS_GROUP_OVLYS+=	DENYOP
 OPTIONS_GROUP_OVLYS+=	DEREF
 OPTIONS_GROUP_OVLYS+=	DYNGROUP
 OPTIONS_GROUP_OVLYS+=	DYNLIST
 OPTIONS_GROUP_OVLYS+=	EMPTYDS
 OPTIONS_GROUP_OVLYS+=	HOMEDIR
 OPTIONS_GROUP_OVLYS+=	LASTBIND
 OPTIONS_GROUP_OVLYS+=	LASTMOD
 OPTIONS_GROUP_OVLYS+=	MEMBEROF
 OPTIONS_GROUP_OVLYS+=	NOPS
 OPTIONS_GROUP_OVLYS+=	OTP
 OPTIONS_GROUP_OVLYS+=	PROXYCACHE
 OPTIONS_GROUP_OVLYS+=	PPOLICY
 OPTIONS_GROUP_OVLYS+=	REFINT
 OPTIONS_GROUP_OVLYS+=	REMOTEAUTH
 OPTIONS_GROUP_OVLYS+=	RETCODE
 OPTIONS_GROUP_OVLYS+=	RWM
 OPTIONS_GROUP_OVLYS+=	SEQMOD
 OPTIONS_GROUP_OVLYS+=	SHA2
 OPTIONS_GROUP_OVLYS+=	SMBPWD
 OPTIONS_GROUP_OVLYS+=	SSSVLV
 OPTIONS_GROUP_OVLYS+=	SYNCPROV
 OPTIONS_GROUP_OVLYS+=	TRACE
 OPTIONS_GROUP_OVLYS+=	TRANSLUCENT
 OPTIONS_GROUP_OVLYS+=	UNIQUE
 OPTIONS_GROUP_OVLYS+=	VALSORT
 
 OPTIONS_DEFINE+=	DYNACL ACI
 OPTIONS_DEFINE+=	RLOOKUPS SLP SLAPI
 OPTIONS_DEFINE+=	PBKDF2
 OPTIONS_DEFINE+=	OUTLOOK
 OPTIONS_DEFINE+=	ARGON2
 OPTIONS_DEFINE+=	LLOADD
 
 OPTIONS_DEFAULT+=	${BKNDS_DEFAULTS}
 OPTIONS_DEFAULT+=	${OPTIONS_GROUP_OVLYS}
 OPTIONS_DEFAULT+=	ARGON2 LLOADD
 
 OPTIONS_SUB=		yes
 
 ACI_DESC=		Per-object ACI (experimental)
 ARGON2_DESC=		Argon2 password hashing module
 DYNACL_DESC=		Run-time loadable ACL (experimental)
 LLOADD_DESC=		Enable load balancer
 OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
 RLOOKUPS_DESC=		With reverse lookups of client hostnames
 SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
 SLP_DESC=		With SLPv2 (RFC 2608) support
 
 ASYNCMETA_DESC=		With asynchronous metadirectory backend
 DNSSRV_DESC=		With Dnssrv backend
 MDB_DESC=		With Memory-Mapped DB backend
 SQL_DESC=		With SQL backend
 PASSWD_DESC=		With Passwd backend
 PERL_DESC=		With Perl backend
 RELAY_DESC=		With Relay backend
 SOCK_DESC=		With Sock backend
 
 ACCESSLOG_DESC=		With In-Directory Access Logging overlay
 AUDITLOG_DESC=		With Audit Logging overlay
 AUTOCA_DESC=		With Automatic Certificate Authority overlay
 COLLECT_DESC=		With Collect overy Services overlay
 CONSTRAINT_DESC=	With Attribute Constraint overlay
 DDS_DESC=		With Dynamic Directory Services overlay
 DEREF_DESC=		With Dereference overlay
 DYNGROUP_DESC=		With Dynamic Group overlay
 DYNLIST_DESC=		With Dynamic List overlay
 HOMEDIR_DESC=		With Home Directory Management overlay
 MEMBEROF_DESC=		With Reverse Group Membership overlay
 NOPS_DESC=		With nops overlay
 OTP_DESC=		With OTP 2-factor authentication overlay
 PPOLICY_DESC=		With Password Policy overlay
 PROXYCACHE_DESC=	With Proxy Cache overlay
 REFINT_DESC=		With Referential Integrity overlay
 REMOTEAUTH_DESC=	With Deferred Authentication overlay
 RETCODE_DESC=		With Return Code testing overlay
 RWM_DESC=		With Rewrite/Remap overlay
 SEQMOD_DESC=		With Sequential Modify overlay
 SSSVLV_DESC=		With ServerSideSort/VLV overlay
 SYNCPROV_DESC=		With Syncrepl Provider overlay
 TRANSLUCENT_DESC=	With Translucent Proxy overlay
 UNIQUE_DESC=		With attribute Uniqueness overlay
 VALSORT_DESC=		With Value Sorting overlay
 
 ADDPARTIAL_DESC=	With addpartial overlay (experimental)
 ALLOP_DESC=		With allop overlay (experimental)
 AUTOGROUP_DESC=		With autogroup overlay (experimental)
 CLOAK_DESC=		With cloak overlay (experimental)
 DENYOP_DESC=		With denyop overlay (experimental)
 EMPTYDS_DESC=		With emptyds overlay (experimental)
 LASTBIND_DESC=		With lastbind overlay
 LASTMOD_DESC=		With lastmod overlay (experimental)
 TRACE_DESC=		With Trace overlay
 
 PBKDF2_DESC=		With PBKDF2 hash password support
 SHA2_DESC=		With SHA2 Password hashes overlay
 SMBPWD_DESC=		With Samba Password hashes overlay
 
 ACCESSLOG_CONFIGURE_ENABLE=	accesslog=mod
 ACI_CONFIGURE_ENABLE=		aci
 ARGON2_CONFIGURE_ENABLE=	argon2
 ARGON2_CONFIGURE_WITH=		argon2=libsodium
 ARGON2_LIB_DEPENDS=		libsodium.so:security/libsodium
 ASYNCMETA_CONFIGURE_ENABLE=	asyncmeta=mod
 AUDITLOG_CONFIGURE_ENABLE=	auditlog=mod
 AUTOCA_CONFIGURE_ENABLE=	autoca=mod
 COLLECT_CONFIGURE_ENABLE=	collect=mod
 CONSTRAINT_CONFIGURE_ENABLE=	constraint=mod
 DDS_CONFIGURE_ENABLE=		dds=mod
 DEBUG_CONFIGURE_ENABLE=		debug
 DEREF_CONFIGURE_ENABLE=		deref=mod
 DNSSRV_CONFIGURE_ENABLE=	dnssrv=mod
 DYNACL_CONFIGURE_ENABLE=	dynacl
 DYNGROUP_CONFIGURE_ENABLE=	dyngroup=mod
 DYNLIST_CONFIGURE_ENABLE=	dynlist=mod
 HOMEDIR_CONFIGURE_ENABLE=	homedir=mod
 LLOADD_CONFIGURE_ENABLE=	balancer=mod
 LLOADD_LIB_DEPENDS=		libevent.so:devel/libevent
 MDB_CONFIGURE_ENABLE=		mdb=yes
 MEMBEROF_CONFIGURE_ENABLE=	memberof=mod
 OTP_CONFIGURE_ENABLE=		otp=mod
 PASSWD_CONFIGURE_ENABLE=	passwd=mod
 PERL_CONFIGURE_ENABLE=		perl=mod
 PERL_CONFIGURE_ENV=		PERLBIN="${PERL}"
 PERL_USES=			perl5
 PPOLICY_CONFIGURE_ENABLE=	ppolicy=mod
 PROXYCACHE_CONFIGURE_ENABLE=	proxycache=mod
 REFINT_CONFIGURE_ENABLE=	refint=mod
 RELAY_CONFIGURE_ENABLE=		relay=yes
 REMOTEAUTH_CONFIGURE_ENABLE=	remoteauth=mod
 RETCODE_CONFIGURE_ENABLE=	retcode=mod
 RLOOKUPS_CONFIGURE_ENABLE=	rlookups
 RWM_CONFIGURE_ENABLE=		rwm=mod
 SEQMOD_CONFIGURE_ENABLE=	seqmod=mod
 SLAPI_CONFIGURE_ENABLE=		slapi
 SLAPI_USE=			LDCONFIG
 SLP_CONFIGURE_ENABLE=		slp
 SLP_LIB_DEPENDS=		libslp.so:net/openslp
 SOCK_CONFIGURE_ENABLE=		sock=mod
 SQL_CONFIGURE_ENABLE=		sql=mod
 SQL_LDFLAGS=			-L${LOCALBASE}/lib
 SQL_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 SSSVLV_CONFIGURE_ENABLE=	sssvlv=mod
 SYNCPROV_CONFIGURE_ENABLE=	syncprov=yes
 TRANSLUCENT_CONFIGURE_ENABLE=	translucent=mod
 UNIQUE_CONFIGURE_ENABLE=	unique=mod
 VALSORT_CONFIGURE_ENABLE=	valsort=mod
 
 # Force using caseIgnoreOrderingMatch on 'name' attribute.
 # This may be a violation of RFC 4519 2.18 definition.
 # See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html
 OUTLOOK_EXTRA_PATCHES=		${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c
 .endif
 
 CONFIGURE_SED=		-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 
 .include <bsd.port.options.mk>
 
 .if defined(CLIENT_ONLY)
 OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
 OPENLDAP_PKGFILESUFX=	.client
 
 PORTDOCS=		CHANGES drafts rfc
 
 CONFIGURE_ARGS+=	--disable-slapd \
 			--disable-monitor \
 			--disable-relay \
 			--disable-syncprov
 USE_LDCONFIG=		yes
 .else
 OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
 OPENLDAP_PKGFILESUFX=
 
 LIB_DEPENDS+=		libicudata.so:devel/icu \
 			libldap.so:net/openldap25-client \
 			libltdl.so:devel/libltdl
 
 SUB_LIST+=		RC_DIR=${PREFIX} \
 			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			DATABASEDIR=${DATABASEDIR}
 
 USERS=			ldap
 GROUPS=			ldap
 LDAP_USER?=		ldap
 LDAP_GROUP?=		ldap
 USE_LDCONFIG=		${PREFIX}/libexec/openldap
 SUB_FILES+=		pkg-deinstall
 USE_RC_SUBR=		slapd
 
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 SED_MODULES=		-e 's/\(moduleload[ 	]*back_[a-z]*\)\.la/\1/' \
 			-e 's/\# *\(modulepath\)/\1/'
 
 CONFIGURE_ARGS+=	--enable-modules \
 			--localstatedir=${LOCALSTATEDIR} \
 			--enable-crypt \
 			--enable-ldap=mod \
 			--enable-meta=mod \
 			--enable-null=mod
 .endif
 
 LDAP_RUN_DIR?=		/var/run/openldap
 LOCALSTATEDIR?=		/var/db
 DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
 BACKUPDIR?=		/var/backups/openldap
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
 PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
 
 SUB_FILES+=		pkg-message${OPENLDAP_PKGFILESUFX}
 PKGMESSAGE=		${WRKSRC}/pkg-message${OPENLDAP_PKGFILESUFX}
 
 SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			LDAP_USER=${LDAP_USER} \
 			LDAP_GROUP=${LDAP_GROUP} \
 			BACKUPDIR=${BACKUPDIR} \
 			DATABASEDIR=${DATABASEDIR} \
 			PORTNAME=${PORTNAME} \
 			PKGNAME=${PKGNAME} \
 			PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
 CONFIGURE_ARGS+=	--with-threads=posix \
 			--with-tls=openssl \
 			--enable-dynamic
 
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl --enable-spasswd
 MAKE_ENV+=		STRIP=${STRIP}
 
 CPPFLAGS+=		-I${LOCALBASE}/include
 LIBS+=			-L${LOCALBASE}/lib
 
 PLIST_SUB+=		${SUB_LIST}
 PLIST_SUB+=		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
 PLIST_SUB+=		SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
 PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
 
 .if ${PORT_OPTIONS:MFETCH} && (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base)
 BROKEN=	using OpenSSL from ports and OPTION FETCH together is not supported
 . endif
 
 .if ${PORT_OPTIONS:MADDPARTIAL}
 CONTRIB_MODULES+=	slapd-modules/addpartial
 CONTRIB_CLEANFILES+=	addpartial.a
 .endif
 .if ${PORT_OPTIONS:MALLOP}
 CONTRIB_MODULES+=	slapd-modules/allop
 CONTRIB_CLEANFILES+=	allop.a
 .endif
 .if ${PORT_OPTIONS:MAUTOGROUP}
 CONTRIB_MODULES+=	slapd-modules/autogroup
 CONTRIB_CLEANFILES+=	autogroup.a
 .endif
 .if ${PORT_OPTIONS:MCLOAK}
 CONTRIB_MODULES+=	slapd-modules/cloak
 CONTRIB_CLEANFILES+=	cloak.a
 .endif
 .if ${PORT_OPTIONS:MDENYOP}
 CONTRIB_MODULES+=	slapd-modules/denyop
 CONTRIB_CLEANFILES+=	denyop.a
 .endif
 .if ${PORT_OPTIONS:MEMPTYDS}
 CONTRIB_MODULES+=	slapd-modules/emptyds
 CONTRIB_CLEANFILES+=	emptyds.a
 .endif
 .if ${PORT_OPTIONS:MLASTBIND}
 CONTRIB_MODULES+=	slapd-modules/lastbind
 CONTRIB_CLEANFILES+=	lastbind.a
 .endif
 .if ${PORT_OPTIONS:MLASTMOD}
 CONTRIB_MODULES+=	slapd-modules/lastmod
 CONTRIB_CLEANFILES+=	lastmod.a
 .endif
 .if ${PORT_OPTIONS:MNOPS}
 CONTRIB_MODULES+=	slapd-modules/nops
 CONTRIB_CLEANFILES+=	nops.a
 .endif
 .if ${PORT_OPTIONS:MTRACE}
 CONTRIB_MODULES+=	slapd-modules/trace
 CONTRIB_CLEANFILES+=	trace.a
 .endif
 .if ${PORT_OPTIONS:MSHA2}
 CONTRIB_MODULES+=	slapd-modules/passwd/sha2
 CONTRIB_CLEANFILES+=	pw-sha2.a
 .endif
 .if ${PORT_OPTIONS:MPBKDF2}
 CONTRIB_MODULES+=	slapd-modules/passwd/pbkdf2
 CONTRIB_CLEANFILES+=	pw-pbkdf2.a
 .endif
 .if ${PORT_OPTIONS:MSMBPWD}
 CONTRIB_MODULES+=	slapd-modules/smbk5pwd
 CONTRIB_CLEANFILES+=	smbk5pwd.a
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
 		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
 	@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
 		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif
 	@${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
 		-e 's|^CC =.*|CC = ${CC}|g' \
 		${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \
 		${WRKSRC}/contrib/slapd-modules/*/*/Makefile
 .if defined(CONFIGURE_SED)
 	@${REINPLACE_CMD} -E ${CONFIGURE_SED} \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
 pre-configure:
 	@(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)
 
 .if !defined(CLIENT_ONLY)
 test: build
 	@(cd ${BUILD_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 
 post-build:
 .for module in ${CONTRIB_MODULES}
 	@(cd ${BUILD_WRKSRC}/contrib/${module} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" all)
 .endfor
 .endif
 
 pre-install:
 .if !defined(CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${DATABASEDIR}
 .endif
 
 post-install:
 .if defined(CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 	for dir in drafts rfc; do \
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
 	done
 	for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapvc ldapwhoami; do\
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
 	done
 	for library in lber ldap; do \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
 .else
 	${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
 .for module in ${CONTRIB_MODULES}
 	(cd ${WRKSRC}/contrib/${module} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" install)
 .endfor
 .for cleanfile in ${CONTRIB_CLEANFILES}
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/${cleanfile}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/slapd
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap
 .endif # defined(CLIENT_ONLY)
 
 post-install-SLAPI-on:
 	for library in slapi; do \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
 
 .include <bsd.port.mk>
diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
index 8b6150ad4479..fb0468a5cf52 100644
--- a/net/openldap26-server/Makefile
+++ b/net/openldap26-server/Makefile
@@ -1,457 +1,457 @@
 PORTNAME=		openldap
 DISTVERSION=		2.6.9
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
 			http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
 			http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
 			http://mirror.eu.oneandone.net/software/openldap/%SUBDIR%/ \
 			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
 			https://mirror-hk.koddos.net/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
 			https://mirror.koddos.net/OpenLDAP/%SUBDIR%/ \
 			https://mirror.lyrahosting.com/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 			http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
 .if defined(CLIENT_ONLY)
 PKGNAMESUFFIX=		26-client
 .else
 PKGNAMESUFFIX=		26-server
 .endif
 
 MAINTAINER=		delphij@FreeBSD.org
 WWW=		https://www.OpenLDAP.org/
 .if defined(CLIENT_ONLY)
 COMMENT=		Open source LDAP client implementation
 .else
 COMMENT=		Open source LDAP server implementation
 .endif
 
 LICENSE=		OPENLDAP
 LICENSE_NAME=		OpenLDAP Public License
 LICENSE_FILE=		${WRKSRC}/LICENSE
 LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # :keepla because port uses lt_dlopen
 USES=			cpe gmake libtool:keepla localbase ssl tar:tgz
 BUILD_DEPENDS+=		autoconf>0:devel/autoconf
 
 .if defined(CLIENT_ONLY)
 CONFLICTS_INSTALL=	${PORTNAME}2[0-57-9]-client ${PORTNAME}-client
 .else
 CONFLICTS_INSTALL=	${PORTNAME}2[0-57-9]-server ${PORTNAME}-server
 .endif
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	0.200
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 OPTIONS_DEFAULT+=	DEBUG
 
 FETCH_DESC=		Enable fetch(3) support
 GSSAPI_DESC=		With GSSAPI support
 
 FETCH_CONFIGURE_WITH=	fetch
 
 GSSAPI_RUN_DEPENDS=		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
 
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	DOCS
 .else
 OPTIONS_GROUP=		BKNDS OVLYS
 BKNDS_DESC=		OpenLDAP backends
 BKNDS_DEFAULTS=		ASYNCMETA DNSSRV MDB PASSWD RELAY SOCK
 OPTIONS_GROUP_BKNDS+=	${BKNDS_DEFAULTS}
 OPTIONS_GROUP_BKNDS+=	PERL SQL
 
 OVLYS_DESC=		OpenLDAP overlays
 OPTIONS_GROUP_OVLYS+=	ACCESSLOG
 OPTIONS_GROUP_OVLYS+=	ADDPARTIAL
 OPTIONS_GROUP_OVLYS+=	ALLOP
 OPTIONS_GROUP_OVLYS+=	AUTOCA
 OPTIONS_GROUP_OVLYS+=	AUDITLOG
 OPTIONS_GROUP_OVLYS+=	AUTOGROUP
 OPTIONS_GROUP_OVLYS+=	CLOAK
 OPTIONS_GROUP_OVLYS+=	COLLECT
 OPTIONS_GROUP_OVLYS+=	CONSTRAINT
 OPTIONS_GROUP_OVLYS+=	DDS
 OPTIONS_GROUP_OVLYS+=	DENYOP
 OPTIONS_GROUP_OVLYS+=	DEREF
 OPTIONS_GROUP_OVLYS+=	DYNGROUP
 OPTIONS_GROUP_OVLYS+=	DYNLIST
 OPTIONS_GROUP_OVLYS+=	EMPTYDS
 OPTIONS_GROUP_OVLYS+=	HOMEDIR
 OPTIONS_GROUP_OVLYS+=	LASTBIND
 OPTIONS_GROUP_OVLYS+=	LASTMOD
 OPTIONS_GROUP_OVLYS+=	MEMBEROF
 OPTIONS_GROUP_OVLYS+=	NOPS
 OPTIONS_GROUP_OVLYS+=	NESTGROUP
 OPTIONS_GROUP_OVLYS+=	OTP
 OPTIONS_GROUP_OVLYS+=	PROXYCACHE
 OPTIONS_GROUP_OVLYS+=	PPOLICY
 OPTIONS_GROUP_OVLYS+=	REFINT
 OPTIONS_GROUP_OVLYS+=	REMOTEAUTH
 OPTIONS_GROUP_OVLYS+=	RETCODE
 OPTIONS_GROUP_OVLYS+=	RWM
 OPTIONS_GROUP_OVLYS+=	SEQMOD
 OPTIONS_GROUP_OVLYS+=	SHA2
 OPTIONS_GROUP_OVLYS+=	SMBPWD
 OPTIONS_GROUP_OVLYS+=	SSSVLV
 OPTIONS_GROUP_OVLYS+=	SYNCPROV
 OPTIONS_GROUP_OVLYS+=	TRACE
 OPTIONS_GROUP_OVLYS+=	TRANSLUCENT
 OPTIONS_GROUP_OVLYS+=	UNIQUE
 OPTIONS_GROUP_OVLYS+=	VALSORT
 
 OPTIONS_DEFINE+=	DYNACL ACI
 OPTIONS_DEFINE+=	RLOOKUPS SLP SLAPI
 OPTIONS_DEFINE+=	PBKDF2
 OPTIONS_DEFINE+=	OUTLOOK
 OPTIONS_DEFINE+=	ARGON2
 OPTIONS_DEFINE+=	LLOADD
 
 OPTIONS_DEFAULT+=	${BKNDS_DEFAULTS}
 OPTIONS_DEFAULT+=	${OPTIONS_GROUP_OVLYS}
 OPTIONS_DEFAULT+=	ARGON2 LLOADD
 
 OPTIONS_SUB=		yes
 
 ACI_DESC=		Per-object ACI (experimental)
 ARGON2_DESC=		Argon2 password hashing module
 DYNACL_DESC=		Run-time loadable ACL (experimental)
 LLOADD_DESC=		Enable load balancer
 OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
 RLOOKUPS_DESC=		With reverse lookups of client hostnames
 SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
 SLP_DESC=		With SLPv2 (RFC 2608) support
 
 ASYNCMETA_DESC=		With asynchronous metadirectory backend
 DNSSRV_DESC=		With Dnssrv backend
 MDB_DESC=		With Memory-Mapped DB backend
 SQL_DESC=		With SQL backend
 PASSWD_DESC=		With Passwd backend
 PERL_DESC=		With Perl backend
 RELAY_DESC=		With Relay backend
 SOCK_DESC=		With Sock backend
 
 ACCESSLOG_DESC=		With In-Directory Access Logging overlay
 AUDITLOG_DESC=		With Audit Logging overlay
 AUTOCA_DESC=		With Automatic Certificate Authority overlay
 COLLECT_DESC=		With Collect overy Services overlay
 CONSTRAINT_DESC=	With Attribute Constraint overlay
 DDS_DESC=		With Dynamic Directory Services overlay
 DEREF_DESC=		With Dereference overlay
 DYNGROUP_DESC=		With Dynamic Group overlay
 DYNLIST_DESC=		With Dynamic List overlay
 HOMEDIR_DESC=		With Home Directory Management overlay
 MEMBEROF_DESC=		With Reverse Group Membership overlay
 NESTGROUP_DESC=		With nestgroup overlay
 NOPS_DESC=		With nops overlay
 OTP_DESC=		With OTP 2-factor authentication overlay
 PPOLICY_DESC=		With Password Policy overlay
 PROXYCACHE_DESC=	With Proxy Cache overlay
 REFINT_DESC=		With Referential Integrity overlay
 REMOTEAUTH_DESC=	With Deferred Authentication overlay
 RETCODE_DESC=		With Return Code testing overlay
 RWM_DESC=		With Rewrite/Remap overlay
 SEQMOD_DESC=		With Sequential Modify overlay
 SSSVLV_DESC=		With ServerSideSort/VLV overlay
 SYNCPROV_DESC=		With Syncrepl Provider overlay
 TRANSLUCENT_DESC=	With Translucent Proxy overlay
 UNIQUE_DESC=		With attribute Uniqueness overlay
 VALSORT_DESC=		With Value Sorting overlay
 
 ADDPARTIAL_DESC=	With addpartial overlay (experimental)
 ALLOP_DESC=		With allop overlay (experimental)
 AUTOGROUP_DESC=		With autogroup overlay (experimental)
 CLOAK_DESC=		With cloak overlay (experimental)
 DENYOP_DESC=		With denyop overlay (experimental)
 EMPTYDS_DESC=		With emptyds overlay (experimental)
 LASTBIND_DESC=		With lastbind overlay
 LASTMOD_DESC=		With lastmod overlay (experimental)
 TRACE_DESC=		With Trace overlay
 
 PBKDF2_DESC=		With PBKDF2 hash password support
 SHA2_DESC=		With SHA2 Password hashes overlay
 SMBPWD_DESC=		With Samba Password hashes overlay
 
 ACCESSLOG_CONFIGURE_ENABLE=	accesslog=mod
 ACI_CONFIGURE_ENABLE=		aci
 ARGON2_CONFIGURE_ENABLE=	argon2
 ARGON2_CONFIGURE_WITH=		argon2=libsodium
 ARGON2_LIB_DEPENDS=		libsodium.so:security/libsodium
 ASYNCMETA_CONFIGURE_ENABLE=	asyncmeta=mod
 AUDITLOG_CONFIGURE_ENABLE=	auditlog=mod
 AUTOCA_CONFIGURE_ENABLE=	autoca=mod
 COLLECT_CONFIGURE_ENABLE=	collect=mod
 CONSTRAINT_CONFIGURE_ENABLE=	constraint=mod
 DDS_CONFIGURE_ENABLE=		dds=mod
 DEBUG_CONFIGURE_ENABLE=		debug
 DEREF_CONFIGURE_ENABLE=		deref=mod
 DNSSRV_CONFIGURE_ENABLE=	dnssrv=mod
 DYNACL_CONFIGURE_ENABLE=	dynacl
 DYNGROUP_CONFIGURE_ENABLE=	dyngroup=mod
 DYNLIST_CONFIGURE_ENABLE=	dynlist=mod
 HOMEDIR_CONFIGURE_ENABLE=	homedir=mod
 LLOADD_CONFIGURE_ENABLE=	balancer=mod
 LLOADD_LIB_DEPENDS=		libevent.so:devel/libevent
 MDB_CONFIGURE_ENABLE=		mdb=yes
 MEMBEROF_CONFIGURE_ENABLE=	memberof=mod
 NESTGROUP_CONFIGURE_ENABLE=	nestgroup=mod
 OTP_CONFIGURE_ENABLE=		otp=mod
 PASSWD_CONFIGURE_ENABLE=	passwd=mod
 PERL_CONFIGURE_ENABLE=		perl=mod
 PERL_CONFIGURE_ENV=		PERLBIN="${PERL}"
 PERL_USES=			perl5
 PPOLICY_CONFIGURE_ENABLE=	ppolicy=mod
 PROXYCACHE_CONFIGURE_ENABLE=	proxycache=mod
 REFINT_CONFIGURE_ENABLE=	refint=mod
 RELAY_CONFIGURE_ENABLE=		relay=yes
 REMOTEAUTH_CONFIGURE_ENABLE=	remoteauth=mod
 RETCODE_CONFIGURE_ENABLE=	retcode=mod
 RLOOKUPS_CONFIGURE_ENABLE=	rlookups
 RWM_CONFIGURE_ENABLE=		rwm=mod
 SEQMOD_CONFIGURE_ENABLE=	seqmod=mod
 SLAPI_CONFIGURE_ENABLE=		slapi
 SLAPI_USE=			LDCONFIG
 SLP_CONFIGURE_ENABLE=		slp
 SLP_LIB_DEPENDS=		libslp.so:net/openslp
 SOCK_CONFIGURE_ENABLE=		sock=mod
 SQL_CONFIGURE_ENABLE=		sql=mod
 SQL_LDFLAGS=			-L${LOCALBASE}/lib
 SQL_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 SSSVLV_CONFIGURE_ENABLE=	sssvlv=mod
 SYNCPROV_CONFIGURE_ENABLE=	syncprov=yes
 TRANSLUCENT_CONFIGURE_ENABLE=	translucent=mod
 UNIQUE_CONFIGURE_ENABLE=	unique=mod
 VALSORT_CONFIGURE_ENABLE=	valsort=mod
 
 # Force using caseIgnoreOrderingMatch on 'name' attribute.
 # This may be a violation of RFC 4519 2.18 definition.
 # See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html
 OUTLOOK_EXTRA_PATCHES=		${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c
 .endif
 
 CONFIGURE_SED=		-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 
 .include <bsd.port.options.mk>
 
 .if defined(CLIENT_ONLY)
 OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
 OPENLDAP_PKGFILESUFX=	.client
 
 PORTDOCS=		CHANGES drafts rfc
 
 CONFIGURE_ARGS+=	--disable-slapd \
 			--disable-monitor \
 			--disable-relay \
 			--disable-syncprov
 USE_LDCONFIG=		yes
 .else
 OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
 OPENLDAP_PKGFILESUFX=
 
 LIB_DEPENDS+=		libicudata.so:devel/icu \
 			libldap.so:net/openldap26-client \
 			libltdl.so:devel/libltdl
 
 SUB_LIST+=		RC_DIR=${PREFIX} \
 			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			DATABASEDIR=${DATABASEDIR}
 
 USERS=			ldap
 GROUPS=			ldap
 LDAP_USER?=		ldap
 LDAP_GROUP?=		ldap
 USE_LDCONFIG=		${PREFIX}/libexec/openldap
 SUB_FILES+=		pkg-deinstall
 USE_RC_SUBR=		slapd
 
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 SED_MODULES=		-e 's/\(moduleload[ 	]*back_[a-z]*\)\.la/\1/' \
 			-e 's/\# *\(modulepath\)/\1/'
 
 CONFIGURE_ARGS+=	--enable-modules \
 			--localstatedir=${LOCALSTATEDIR} \
 			--enable-crypt \
 			--enable-ldap=mod \
 			--enable-meta=mod \
 			--enable-null=mod
 .endif
 
 LDAP_RUN_DIR?=		/var/run/openldap
 LOCALSTATEDIR?=		/var/db
 DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
 BACKUPDIR?=		/var/backups/openldap
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
 PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
 
 SUB_FILES+=		pkg-message${OPENLDAP_PKGFILESUFX}
 PKGMESSAGE=		${WRKSRC}/pkg-message${OPENLDAP_PKGFILESUFX}
 
 SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			LDAP_USER=${LDAP_USER} \
 			LDAP_GROUP=${LDAP_GROUP} \
 			BACKUPDIR=${BACKUPDIR} \
 			DATABASEDIR=${DATABASEDIR} \
 			PORTNAME=${PORTNAME} \
 			PKGNAME=${PKGNAME} \
 			PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
 CONFIGURE_ARGS+=	--with-threads=posix \
 			--with-tls=openssl \
 			--enable-dynamic
 
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl --enable-spasswd
 MAKE_ENV+=		STRIP=${STRIP}
 
 CPPFLAGS+=		-I${LOCALBASE}/include
 LIBS+=			-L${LOCALBASE}/lib
 
 PLIST_SUB+=		${SUB_LIST}
 PLIST_SUB+=		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
 PLIST_SUB+=		SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
 
 .if ${PORT_OPTIONS:MFETCH} && (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base)
 BROKEN=	using OpenSSL from ports and OPTION FETCH together is not supported
 . endif
 
 .if ${PORT_OPTIONS:MADDPARTIAL}
 CONTRIB_MODULES+=	slapd-modules/addpartial
 CONTRIB_CLEANFILES+=	addpartial.a
 .endif
 .if ${PORT_OPTIONS:MALLOP}
 CONTRIB_MODULES+=	slapd-modules/allop
 CONTRIB_CLEANFILES+=	allop.a
 .endif
 .if ${PORT_OPTIONS:MAUTOGROUP}
 CONTRIB_MODULES+=	slapd-modules/autogroup
 CONTRIB_CLEANFILES+=	autogroup.a
 .endif
 .if ${PORT_OPTIONS:MCLOAK}
 CONTRIB_MODULES+=	slapd-modules/cloak
 CONTRIB_CLEANFILES+=	cloak.a
 .endif
 .if ${PORT_OPTIONS:MDENYOP}
 CONTRIB_MODULES+=	slapd-modules/denyop
 CONTRIB_CLEANFILES+=	denyop.a
 .endif
 .if ${PORT_OPTIONS:MEMPTYDS}
 CONTRIB_MODULES+=	slapd-modules/emptyds
 CONTRIB_CLEANFILES+=	emptyds.a
 .endif
 .if ${PORT_OPTIONS:MLASTBIND}
 CONTRIB_MODULES+=	slapd-modules/lastbind
 CONTRIB_CLEANFILES+=	lastbind.a
 .endif
 .if ${PORT_OPTIONS:MLASTMOD}
 CONTRIB_MODULES+=	slapd-modules/lastmod
 CONTRIB_CLEANFILES+=	lastmod.a
 .endif
 .if ${PORT_OPTIONS:MNOPS}
 CONTRIB_MODULES+=	slapd-modules/nops
 CONTRIB_CLEANFILES+=	nops.a
 .endif
 .if ${PORT_OPTIONS:MTRACE}
 CONTRIB_MODULES+=	slapd-modules/trace
 CONTRIB_CLEANFILES+=	trace.a
 .endif
 .if ${PORT_OPTIONS:MSHA2}
 CONTRIB_MODULES+=	slapd-modules/passwd/sha2
 CONTRIB_CLEANFILES+=	pw-sha2.a
 .endif
 .if ${PORT_OPTIONS:MPBKDF2}
 CONTRIB_MODULES+=	slapd-modules/passwd/pbkdf2
 CONTRIB_CLEANFILES+=	pw-pbkdf2.a
 .endif
 .if ${PORT_OPTIONS:MSMBPWD}
 CONTRIB_MODULES+=	slapd-modules/smbk5pwd
 CONTRIB_CLEANFILES+=	smbk5pwd.a
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
 		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
 	@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
 		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif
 	@${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
 		-e 's|^CC =.*|CC = ${CC}|g' \
 		${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \
 		${WRKSRC}/contrib/slapd-modules/*/*/Makefile
 .if defined(CONFIGURE_SED)
 	@${REINPLACE_CMD} -E ${CONFIGURE_SED} \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 .if !${PORT_OPTIONS:MDEBUG}
 	@${REINPLACE_CMD} -E \
 		-e '/ldap_dump_(connection|requests_and_responses);/d' \
 		${WRKSRC}/libraries/libldap/ldap.map
 .endif
 
 pre-configure:
 	@(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)
 
 .if !defined(CLIENT_ONLY)
 test: build
 	@(cd ${BUILD_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 
 post-build:
 .for module in ${CONTRIB_MODULES}
 	@(cd ${BUILD_WRKSRC}/contrib/${module} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" all)
 .endfor
 .endif
 
 pre-install:
 .if !defined(CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${DATABASEDIR}
 .endif
 
 post-install:
 .if defined(CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 	for dir in drafts rfc; do \
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
 	done
 	for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapvc ldapwhoami; do\
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
 	done
 	for library in lber ldap; do \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
 .else
 	${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
 .for module in ${CONTRIB_MODULES}
 	(cd ${WRKSRC}/contrib/${module} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" install)
 .endfor
 .for cleanfile in ${CONTRIB_CLEANFILES}
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/${cleanfile}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/slapd
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap
 .endif # defined(CLIENT_ONLY)
 
 post-install-SLAPI-on:
 	for library in slapi; do \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
 
 .include <bsd.port.mk>
diff --git a/net/tinyfugue-devel/Makefile b/net/tinyfugue-devel/Makefile
index e74e9a4055d9..2b1c4f4c2b0b 100644
--- a/net/tinyfugue-devel/Makefile
+++ b/net/tinyfugue-devel/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	tinyfugue
 PORTVERSION=	5.1.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net games
 PKGNAMESUFFIX=	-devel${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Popular programmable MUD client, with macro support and more
 WWW=		https://github.com/ingwarsw/tinyfugue
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 #LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ingwarsw
 
 USES=		ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-manpage --enable-version --enable-symlink=no \
 		--exec-prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
 		--mandir=${PREFIX}/share/man \
 		--datadir=${PREFIX}/lib --with-inclibpfx=${LOCALBASE}
 LDFLAGS+=	-L${LOCALBASE}
 PLIST_SUB=	DISTNAME=tf-development
 
 OPTIONS_DEFINE=	ATCP GMCP WIDECHAR LUA PYTHON
 OPTIONS_DEFAULT=	ATCP GMCP WIDECHAR LUA
 
 ATCP_DESC=	telnet ATCP support
 ATCP_CONFIGURE_ENABLE=	atcp
 GMCP_DESC=	telnet GMCP support
 GMCP_CONFIGURE_ENABLE=	gmcp
 WIDECHAR_CONFIGURE_ENABLE=	widechar
 WIDECHAR_LIB_DEPENDS=	libicuuc.so:devel/icu
 LUA_USES=		lua
 LUA_CONFIGURE_ENABLE=	lua
 PYTHON_USES=		python gettext-runtime
 PYTHON_CONFIGURE_ENABLE=	python
 
 post-build:
 	${STRIP_CMD} ${WRKSRC}/src/tf
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/src/tf.1.nroffman \
 		${STAGEDIR}${PREFIX}/share/man/man1/tf-development.1
 
 .include <bsd.port.mk>
diff --git a/net/wangle/Makefile b/net/wangle/Makefile
index ba2264c6fa62..8a7ba7e7b677 100644
--- a/net/wangle/Makefile
+++ b/net/wangle/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	wangle
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for building services in a consistent/modular/composable way
 WWW=		https://github.com/facebook/wangle
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libunwind.so:devel/libunwind \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang cpe ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 USE_LDCONFIG=	yes
 CPE_VENDOR=	facebook
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 post-install: # https://github.com/facebook/wangle/issues/179
 	cd ${STAGEDIR}${PREFIX} && \
 		${RMDIR} \
 			include/wangle/service/test \
 			include/wangle/ssl/test/certs \
 			include/wangle/util/test
 
 .include <bsd.port.mk>
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index d1dd5a7b4744..20b15f03db8f 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	yaz
 DISTVERSION=	5.31.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	https://ftp.indexdata.dk/pub/yaz/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Z39.50/SR client and API library
 WWW=		https://www.indexdata.com/resources/software/yaz/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libgnutls.so:security/gnutls
 
 USES=		autoreconf gnome iconv libtool ncurses pathfix \
 		localbase:ldflags pkgconfig readline shebangfix tcl
 SHEBANG_FILES=	src/yaz-asncomp
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 
 LIBS+=		-lexecinfo
 
 PORTDOCS=	*
 
 CONFIGURE_ARGS=	--enable-shared \
 		--enable-tcpd \
 		--with-iconv=${ICONV_PREFIX} \
 		--with-icu \
 		--with-xml2 \
 		--with-xslt
 
 OPTIONS_DEFINE=	DOCS MEMCACHED REDIS
 
 MEMCACHED_DESC=		Memcached distributed cache system support
 
 MEMCACHED_CONFIGURE_WITH=	memcached
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 REDIS_CONFIGURE_WITH=	redis
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 post-configure:
 	@${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/share/man,' \
 		${WRKSRC}/doc/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 
 .include <bsd.port.mk>
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index 19c0810801c4..3e1e41177ea8 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	zebra-server
 PORTVERSION=	2.0.55
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
 DISTNAME=	idzebra-${PORTVERSION}
 
 MAINTAINER=	ben@gibbed.org
 COMMENT=	Z39.50/SR server software
 WWW=		https://www.indexdata.dk/zebra/
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libicui18n.so:devel/icu \
 		libyaz.so:net/yaz
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-yaz=${LOCALBASE}/bin \
 		--with-tclconfig=${TCL_LIBDIR} \
 		--with-iconv=${ICONV_PREFIX} --with-expat=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USES=		iconv libtool shebangfix tcl
 SHEBANG_FILES=	util/idzebra-abs2dom
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 9697a5802b14..70c123c9f55f 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,105 +1,106 @@
 PORTNAME=	tin
 DISTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	https://ftp.icm.edu.pl/pub/unix/news/tin/v${DISTVERSION:R}/ \
 		ftp://ftp.tin.org/pub/news/clients/tin/v${DISTVERSION:R}/
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
 WWW=		http://www.tin.org/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpcre2-8.so:devel/pcre2 \
 		libuu.so:converters/uulib
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 USES=		gmake iconv localbase:ldflags ncurses pkgconfig shebangfix \
 		tar:xz
 SHEBANG_FILES=	tools/*.pl
 
 GNU_CONFIGURE=	yes
 
 TIN_EDITOR?=	/usr/bin/ee
 TIN_SCREEN?=	ncursesw
 
 ALL_TARGET=	build
 
 CFLAGS+=	-DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\"
 MAKE_ARGS+=	MAKE=${MAKE_CMD}
 
 CONFIGURE_ARGS=		--with-editor=${TIN_EDITOR} \
 			--with-libdir=${PREFIX}/news/lib \
 			--with-spooldir=/var/news \
 			--with-screen=${TIN_SCREEN} \
 			--with-pcre2-config=${PREFIX}/bin/pcre2-config \
 			--with-nntp-default-server=news \
 			--enable-break-long-lines \
 			--with-mime-default-charset=US-ASCII \
 			--with-defaults-dir=${PREFIX}/etc \
 			--enable-ipv6 \
 			${ICONV_CONFIGURE_ARG}
 
 OPTIONS_DEFINE=		CANLOCK GNUPG ISPELL METAMAIL NLS NNTP_ONLY \
 			NNTPS SLRNFACE
 OPTIONS_DEFAULT=	GNUPG ISPELL METAMAIL NNTPS
 OPTIONS_SUB=		yes
 
 CANLOCK_DESC=		Enable Cancel-Lock key support via libcanlock
 METAMAIL_DESC=		Use metamail to handle MIME attachments
 NNTP_ONLY_DESC=		Only read news via NNTP (no spool dir support)
 NNTPS_DESC=		Enable NNTPS
 SLRNFACE_DESC=		Use slrnface to displace sender images
 
 CANLOCK_CONFIGURE_ENABLE=	cancel-locks
 
 ISPELL_RUN_DEPENDS=		ispell:textproc/aspell-ispell
 ISPELL_CONFIGURE_ON=		--with-ispell=${LOCALBASE}/bin/ispell
 
 GNUPG_RUN_DEPENDS=		gpg:security/gnupg
 GNUPG_CONFIGURE_ON=		--with-gpg=${LOCALBASE}/bin/gpg \
 				--without-pgp \
 				--without-pgpk
 GNUPG_CONFIGURE_OFF=		--disable-pgp-gpg
 
 METAMAIL_RUN_DEPENDS=		metamail:mail/metamail
 METAMAIL_CONFIGURE_ON=		--with-metamail=${LOCALBASE}/bin/metamail
 
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 
 NNTP_ONLY_CONFIGURE_ENABLE=	nntp-only
 
 NNTPS_USES=			ssl
 NNTPS_CONFIGURE_ON=		--with-nntps
 
 SLRNFACE_BUILD_DEPENDS=		slrnface:news/slrnface
 SLRNFACE_RUN_DEPENDS=		slrnface:news/slrnface
 SLRNFACE_CONFIGURE_WITH=	slrnface=slrnface
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's:5/(mmdf|mbox):5/tin_\1:g' \
 	    ${WRKSRC}/src/Makefile.in
 	${REINPLACE_CMD} -e 's:/var/spool/news:/var/news:g' \
 	    -e 's:/etc/nntpserver:${PREFIX}/etc/nntpserver:g' \
 	    -e 's:/usr/lib/news:${PREFIX}/news/lib:g' \
 	    -e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \
 	    -e 's:url_handler\.pl:tinurl_handler.pl:g' \
 	    ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.5
 	${REINPLACE_CMD} \
 	    -e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \
 	    ${WRKSRC}/src/mimetypes.c
 	${REINPLACE_CMD} \
 	    -e 's:url_handler\.pl:tinurl_handler.pl:g' \
 	    ${WRKSRC}/src/Makefile.in ${WRKSRC}/include/tin.h
 	${MV} ${WRKSRC}/tools/url_handler.pl \
 	    ${WRKSRC}/tools/tinurl_handler.pl
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults \
 	    ${STAGEDIR}${PREFIX}/etc/tin.defaults.sample
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tin
 	${RLN} tin ${STAGEDIR}${PREFIX}/bin/rtin
 
 .include <bsd.port.mk>
diff --git a/print/harfbuzz-icu/Makefile b/print/harfbuzz-icu/Makefile
index a651fa64d78b..f2dc8aadc1ad 100644
--- a/print/harfbuzz-icu/Makefile
+++ b/print/harfbuzz-icu/Makefile
@@ -1,10 +1,10 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-icu
 
 COMMENT=	Harfbuzz ICU support
 
 MASTERDIR=	${.CURDIR}/../../print/harfbuzz
 PLIST=		${.CURDIR}/pkg-plist
 HARFBUZZ_SLAVE=	icu
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index 06a94e986534..47ad435ce53e 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	libmspub
 DISTVERSION=	0.1.4
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	print graphics devel
 MASTER_SITES=	LODEV/${PORTNAME}
 PKGNAMESUFFIX=	01
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library and tools for parsing Microsoft Publisher file format
 WWW=		https://wiki.documentfoundation.org/DLP/Libraries/libmspub
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.MPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		librevenge-0.0.so:textproc/librevenge
 
 USES=		autoreconf compiler:c++11-lib libtool localbase pathfix \
 		pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-werror --without-docs
 
 .include <bsd.port.mk>
diff --git a/print/miktex/Makefile b/print/miktex/Makefile
index 8180be15d1d6..e554f7039254 100644
--- a/print/miktex/Makefile
+++ b/print/miktex/Makefile
@@ -1,102 +1,102 @@
 PORTNAME=	miktex
 DISTVERSION=	24.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	https://miktex.org/download/ctan/systems/win32/miktex/source/ \
 		https://ctan.org/tex-archive/systems/win32/miktex/tm/packages/:bootstrap
 DISTFILES=	miktex-zzdb1-2.9.tar.lzma:bootstrap \
 		miktex-zzdb3-2.9.tar.lzma:bootstrap \
 		miktex-config-2.9.tar.lzma:bootstrap \
 		miktex-dvips.tar.lzma:bootstrap \
 		miktex-fontconfig.tar.lzma:bootstrap \
 		miktex-misc.tar.lzma:bootstrap \
 		tetex.tar.lzma:bootstrap \
 		${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	miktex
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Implementation of TeX/LaTeX
 WWW=		https://miktex.org
 
 LICENSE=	MULTIPLE
 LICENSE_NAME=	Multiple
 LICENSE_TEXT=	This is a collection of many independent packages and does not have a single license
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 NOT_FOR_ARCHS=	aarch64 armv7
 NOT_FOR_ARCHS_REASON=	Programs/TeXAndFriends/Knuth/web/tangle.p:1: parse error before `û'
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_locale.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgd.so:graphics/gd \
 		libgmp.so:math/gmp \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libharfbuzz.so:print/harfbuzz \
 		libhunspell-1.7.so:textproc/hunspell \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libinotify.so:devel/libinotify \
 		liblog4cxx.so:devel/log4cxx \
 		libmpfi.so:math/mpfi \
 		libmpfr.so:math/mpfr \
 		libmspack.so:archivers/libmspack \
 		libpng.so:graphics/png \
 		libpopt.so:devel/popt \
 		libQt6Widgets.so:devel/qt6-base \
 		liburiparser.so:net/uriparser \
 		libzzip.so:devel/zziplib
 
 USES=		bison cmake:noninja gettext-tools gmake gnome jpeg \
 		localbase:ldflags pkgconfig ssl tar:xz xorg
 USE_GNOME=	cairo libxslt
 USE_LDCONFIG=	yes
 USE_XORG=	pixman
 
 CMAKE_ARGS=	-DMIKTEX_SYSTEM_ETC_FONTS_CONFD_DIR=${LOCALBASE}/etc/fonts/conf.d \
 		-DMIKTEX_SYSTEM_VAR_CACHE_DIR=${DATADIR}/cache \
 		-DMIKTEX_SYSTEM_VAR_LIB_DIR=${DATADIR}/lib
 CMAKE_ON=	WITH_MAN_PAGES
 
 MAKE_JOBS_UNSAFE=	yes
 
 LDFLAGS+=	-linotify
 
 OPTIONS_DEFINE=		UIQT
 OPTIONS_DEFAULT=	UIQT
 OPTIONS_SUB=		yes
 
 UIQT_DESC=	Build Qt components
 
 UIQT_USES=		desktop-file-utils gl qt:6
 UIQT_USE=		GL=gl,opengl \
 			qmake:build \
 			QT=5compat,declarative,tools
 UIQT_CMAKE_BOOL=	WITH_UI_QT
 
 post-extract:
 	${MKDIR} ${BUILD_WRKSRC}
 .for f in ${DISTFILES:M*bootstrap}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f:S/:bootstrap//} ${BUILD_WRKSRC}
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} 's|log4cxx/rollingfileappender.h|log4cxx/rolling/rollingfileappender.h|g' \
 		${WRKSRC}/Libraries/MiKTeX/App/app.cpp \
 		${WRKSRC}/Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \
 		${WRKSRC}/Programs/MiKTeX/Console/Qt/main.cpp \
 		${WRKSRC}/Programs/MiKTeX/PackageManager/mpm/mpm.cpp \
 		${WRKSRC}/Programs/MiKTeX/Yap/MFC/StdAfx.h \
 		${WRKSRC}/Programs/MiKTeX/initexmf/initexmf.cpp \
 		${WRKSRC}/Programs/MiKTeX/miktex/miktex.cpp
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/miktex-texmf/miktex/config/*.log
 
 .include <bsd.port.mk>
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 869730c83a2c..2a2479c1b896 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	scribus
 DISTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
 		http://www.scribus.net/downloads/${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Comprehensive desktop publishing program (development version)
 WWW=		https://www.scribus.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		librevenge-0.0.so:textproc/librevenge \
 		libcups.so:print/cups \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libmspub-0.1.so:print/libmspub01 \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libfreetype.so:print/freetype2 \
 		libtiff.so:graphics/tiff \
 		libpoppler.so:graphics/poppler \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libqxp-0.0.so:textproc/libqxp \
 		libzmf-0.0.so:graphics/libzmf
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gl gnome jpeg \
 		pkgconfig python qt:6 shared-mime-info tar:xz xorg
 USE_GL=		gl opengl
 USE_GNOME=	cairo libxml2
 USE_QT=		5compat base svg tools
 USE_XORG=	xcb
 
 CMAKE_ARGS=	-DWANT_CPP17=YES
 
 CONFLICTS_INSTALL=	scribus
 
 OPTIONS_DEFINE=	BOOST DOCS GRAPHICSMAGICK HUNSPELL OSG PDF
 OPTIONS_DEFAULT=BOOST GRAPHICSMAGICK HUNSPELL OSG PDF
 
 BOOST_DESC=	Enable support for Boost-based enhancement
 GRAPHICSMAGICK_DESC=	Use GraphicsMagick for image import support
 HUNSPELL_DESC=	Enable spellchecking via hunspell
 OSG_DESC=	Enable 3D rendering via osg
 PDF_DESC=	Enable PDF export via podofo
 
 BOOST_BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 BOOST_CMAKE_BOOL=	WITH_BOOST
 
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_BOOL=	WANT_GRAPHICSMAGICK
 
 HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CMAKE_BOOL=	WANT_HUNSPELL
 
 OSG_LIB_DEPENDS=	libosg.so:graphics/osg
 OSG_CMAKE_BOOL_OFF=	WANT_NOOSG
 
 PDF_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 PDF_CMAKE_BOOL=	WITH_PODOFO
 
 post-install:
 		${LN} -sf ../scribus/icons/1_5_1/scribus.png \
 			${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index e7f6e3983f25..154c4cca3bf4 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	scribus
 DISTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
 		http://www.scribus.net/downloads/${PORTVERSION}/
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Comprehensive desktop publishing program
 WWW=		https://www.scribus.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		librevenge-0.0.so:textproc/librevenge \
 		libcups.so:print/cups \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libmspub-0.1.so:print/libmspub01 \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libfreetype.so:print/freetype2 \
 		libtiff.so:graphics/tiff \
 		libpoppler.so:graphics/poppler \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libqxp-0.0.so:textproc/libqxp \
 		libzmf-0.0.so:graphics/libzmf
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gnome jpeg \
 		pkgconfig python qt:5 shared-mime-info tar:xz
 USE_QT=		buildtools:build core gui linguisttools:build network opengl \
 		printsupport qmake:build widgets xml
 USE_GNOME=	cairo libxml2
 
 CMAKE_ARGS=	-DWANT_CPP17=YES
 
 CONFLICTS_INSTALL=	scribus-devel
 
 OPTIONS_DEFINE=	BOOST DOCS GRAPHICSMAGICK HUNSPELL OSG PDF
 OPTIONS_DEFAULT=BOOST GRAPHICSMAGICK HUNSPELL OSG PDF
 
 BOOST_DESC=	Enable support for Boost-based enhancement
 GRAPHICSMAGICK_DESC=	Use GraphicsMagick for image import support
 HUNSPELL_DESC=	Enable spellchecking via hunspell
 OSG_DESC=	Enable 3D rendering via osg
 PDF_DESC=	Enable PDF export via podofo
 
 BOOST_BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 BOOST_CMAKE_BOOL=	WITH_BOOST
 
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_BOOL=	WANT_GRAPHICSMAGICK
 
 HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CMAKE_BOOL=	WANT_HUNSPELL
 
 OSG_LIB_DEPENDS=	libosg.so:graphics/osg
 OSG_CMAKE_BOOL_OFF=	WANT_NOOSG
 
 PDF_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 PDF_CMAKE_BOOL=	WITH_PODOFO
 
 post-install:
 		${LN} -sf ../scribus/icons/1_5_1/scribus.png \
 			${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 40f368c99d95..c88ab3d801be 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -1,117 +1,118 @@
 PORTNAME=	xetex
 DISTVERSION=	${TEXLIVE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX}
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX System with Unicode and Modern Font Technologies
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libicuio.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libTECkit.so:textproc/teckit
 
 USES=		compiler:c++17-lang localbase gnome perl5 pkgconfig \
 		python:build tar:xz tex xorg
 USE_CXXSTD=	c++17
 USE_GNOME=	cairo
 USE_PERL5=	build
 USE_TEX=	kpathsea web2c formats fmtutil dvipdfmx
 USE_XORG=	pixman
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=CC="${CC}" \
 		CXX="${CXX}" \
 		${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-xetex \
 		--with-system-freetype2 \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
 		--with-freetype2-libdir=${LOCALBASE}/lib \
 		--with-system-graphite2 \
 		--with-graphite2-includes=${LOCALBASE}/include/graphite2 \
 		--with-graphite2-libdir=${LOCALBASE}/lib \
 		--with-system-harfbuzz \
 		--with-system-teckit \
 		--with-teckit-includes=${LOCALBASE}/include/teckit \
 		--with-teckit-libdir=${LOCALBASE}/lib \
 		--with-system-zziplib \
 		--with-system-zlib
 .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu
 CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
 
 PIE_UNSAFE=		yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include/harfbuzz
 
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux \
 		libs/pplib \
 		libs/xpdf \
 		texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF= \
 	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/xelatex \
 	texmf-dist/doc/xetex \
 	texmf-dist/fonts/misc/xetex \
 	texmf-dist/source/xelatex \
 	texmf-dist/tex/xelatex \
 	texmf-dist/tex/xetex
 EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \
 		mflua mfluajit luahbtex luajithbtex ptex eptex uptex euptex \
 		otangle mp pmp upmp web2c web-progs tex synctex
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 TEX_FORMATS=	xetex
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 pre-configure:
 	for D in libs/xpdf libs/pplib; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		    ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
 			${CONFIGURE_ARGS}; \
 	done
 	cd ${WRKDIR}/${DISTNAME}/libs/pplib && \
 		${MAKE}
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 
 post-stage:
 	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/hanzibox/build.sh
 	${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/dkun-0.3.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/dkun-0.4.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/undk-0.6.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/unldk-0.2.py
 	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/xelatex/arabxetex/makemaps.pl
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 6c79fbe7e1dd..c11bc17d0228 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -1,167 +1,168 @@
 PORTNAME=	texlive
 DISTVERSION=	${TEXLIVE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMESUFFIX=	-base
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 DIST_SUBDIR=	TeX
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, base binaries
 WWW=		https://tug.org/texlive/
 
 LIB_DEPENDS=	libicuio.so:devel/icu \
 		libt1.so:devel/t1lib \
 		libTECkit.so:textproc/teckit \
 		libgd.so:graphics/gd \
 		libgraphite2.so:graphics/graphite2 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libzzip.so:devel/zziplib \
 		libpoppler.so:graphics/poppler \
 		libpotrace.so:graphics/libpotrace
 RUN_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
 		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
 		psbook:print/psutils
 
 USES=		compiler:c++11-lib cpe ghostscript gnome localbase pkgconfig perl5 \
 		python:run shebangfix tar:xz tex xorg
 CPE_VENDOR=	tug
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo
 USE_PERL5=	run
 USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
 USE_XORG=x11
 SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 	texk/texlive/linked_scripts/accfonts/vpl2ovp \
 	texk/texlive/linked_scripts/accfonts/vpl2vpl \
 	texk/texlive/linked_scripts/arara/arara.sh \
 	texk/texlive/linked_scripts/bibcop/bibcop.pl \
 	texk/texlive/linked_scripts/bibexport/bibexport.sh \
 	texk/texlive/linked_scripts/convbkmk/convbkmk.rb \
 	texk/texlive/linked_scripts/ctanupload/ctanupload.pl \
 	texk/texlive/linked_scripts/ebong/*.py \
 	texk/texlive/linked_scripts/dtxgen/dtxgen \
 	texk/texlive/linked_scripts/dviasm/*.py \
 	texk/texlive/linked_scripts/exceltex/exceltex \
 	texk/texlive/linked_scripts/findhyph/findhyph \
 	texk/texlive/linked_scripts/fragmaster/fragmaster.pl \
 	texk/texlive/linked_scripts/git-latexdiff/git-latexdiff \
 	texk/texlive/linked_scripts/installfont/installfont-tl \
 	texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \
 	texk/texlive/linked_scripts/latexpand/latexpand \
 	texk/texlive/linked_scripts/lilyglyphs/*.py \
 	texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \
 	texk/texlive/linked_scripts/mathspic/mathspic.pl \
 	texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \
 	texk/texlive/linked_scripts/multibibliography/multibibliography.pl \
 	texk/texlive/linked_scripts/optexcount/optexcount \
 	texk/texlive/linked_scripts/pygmentex/*.py \
 	texk/texlive/linked_scripts/pythontex/*.py \
 	texk/texlive/linked_scripts/rubik/rubikrotation.pl \
 	texk/texlive/linked_scripts/spix/spix.py \
 	texk/texlive/linked_scripts/splitindex/splitindex.pl \
 	texk/texlive/linked_scripts/svn-multi/svn-multi.pl \
 	texk/texlive/linked_scripts/texdirflatten/texdirflatten \
 	texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \
 	texk/texlive/linked_scripts/ulqda/ulqda.pl \
 	texk/texlive/linked_scripts/urlbst/urlbst \
 	texk/texlive/linked_scripts/yplan/yplan \
 	texk/texlive/linked_scripts/webquiz/webquiz.py \
 	texk/texlive/linked_scripts/petri-nets/pn2pdf \
 	texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl \
 	texk/texlive/linked_scripts/pdfxup/pdfxup \
 	texk/texlive/linked_scripts/tlcockpit/tlcockpit.sh \
 	texk/texlive/linked_scripts/ctan-o-mat/ctan-o-mat.pl \
 	texk/texlive/linked_scripts/pdftex-quiet/pdftex-quiet \
 	texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler \
 	texk/texlive/linked_scripts/latex-papersize/latex-papersize.py \
 	texk/texlive/linked_scripts/makedtx/makedtx.pl \
 	texk/texlive/linked_scripts/pdfbook2/pdfbook2
 
 # during build phase gnu configure is run a lot
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-native-texlive-build \
 		--disable-web-progs \
 		--disable-psutils \
 		--enable-shared \
 		--disable-t1utils \
 		--disable-dvipdfmx \
 		--disable-dvipdfm-x \
 		--disable-xdvipdfmx \
 		--enable-build-in-source-tree \
 		--datarootdir=${LOCALBASE}/share \
 		--with-system-freetype2 \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
 		--with-freetype2-libdir=${LOCALBASE}/lib \
 		--with-system-gd \
 		--with-system-cairo \
 		--with-system-harfbuzz \
 		--with-system-graphite2 \
 		--with-system-pixman \
 		--with-system-t1lib \
 		--without-system-xpdf \
 		--with-system-zziplib \
 		--with-system-zlib
 .for L in gmp icu kpathsea libgs libpng libpaper mpfr ptexenc potrace teckit
 CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
 MAKE_ENV=	CONFIG_SITE=${CONFIG_SITE}
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	detex dvi2tty ps2eps
 
 BINARY_ALIAS=	freetype-config=true
 EXTRACT_AFTER_ARGS=	${EXCLUDE_FILES:S,^,--exclude ,}
 
 INFO=	dvipng tlbuild
 PLIST_SUB=	INSTALL_DATA="${INSTALL_DATA}"
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=	TEX=xpdfopen:run
 
 EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
 		${DISTNAME}/texk/kpathsea \
 		${DISTNAME}/texk/ptexenc \
 		${DISTNAME}/texk/xdvik \
 		${DISTNAME}/texk/dvipdfm-x \
 		${DISTNAME}/texk/dvipsk \
 		${DISTNAME}/utils/t1utils \
 		${DISTNAME}/utils/xpdfopen \
 		${DISTNAME}/texk/texlive/linked_scripts/eolang/eolang.pl \
 		${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-clean.pl \
 		${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-clean.py \
 		${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-extract.py \
 		${DISTNAME}/texk/texlive/linked_scripts/runtexshebang/runtexshebang.lua
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \
 		${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro
 	${REINPLACE_CMD} -e 's|exec texconfig|exec ${PREFIX}/bin/texconfig|' \
 		${WRKSRC}/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh
 	${REINPLACE_CMD} -e 's|exec fmtutil|exec ${PREFIX}/bin/fmtutil|' \
 		${WRKSRC}/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
 	${REINPLACE_CMD} -e 's|exec updmap|exec ${PREFIX}/bin/updmap|' \
 		${WRKSRC}/texk/texlive/linked_scripts/texlive/updmap-sys.sh
 
 post-install-fmtutil:
 	for D in ${TEXHASHDIRS}; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/$$D; \
 	done
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c
 	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \
 	    ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF}
 
 post-install: post-install-fmtutil
 .ORDER: post-install-fmtutil do-texhash
 
 .include <bsd.port.mk>
diff --git a/science/afni/Makefile b/science/afni/Makefile
index d77183ca8f99..5837eb01573d 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -1,163 +1,164 @@
 PORTNAME=		afni
 DISTVERSIONPREFIX=	AFNI_
 DISTVERSION=		25.0.06
+PORTREVISION=	1
 CATEGORIES=		science biology graphics perl5 python
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Advanced Functional Neuro Imaging
 WWW=		https://afni.nimh.nih.gov/afni/
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	fails to build: statement requires expression of scalar type \
 		('va_list' (aka '__builtin_va_list') invalid)
 
 CRAN_DEPENDS=	R-cran-lme4>0:math/R-cran-lme4 \
 		R-cran-snow>0:science/R-cran-snow \
 		R-cran-psych>0:math/R-cran-psych
 BUILD_DEPENDS=	gm4:devel/m4 \
 		R:math/R \
 		${CRAN_DEPENDS}
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libXm.so:x11-toolkits/open-motif \
 		libf2c.so:lang/f2c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		libicudata.so:devel/icu \
 		libnetcdff.so:science/netcdf-fortran \
 		libnetpbm.so:graphics/netpbm \
 		libpcre2-8.so:devel/pcre2 \
 		libpng16.so:graphics/png
 
 # Remote execution of suma.  Also needed for glxinfo.
 RUN_DEPENDS=	endian:sysutils/endian \
 		ffmpeg:multimedia/ffmpeg \
 		qhull:math/qhull \
 		R:math/R \
 		${CRAN_DEPENDS}
 
 USES=		gettext gl gmake gnome iconv jpeg:run motif readline
 USES+=		perl5 python shebangfix tar:xz xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu
 USE_GNOME=	glib20 libxml2
 USE_XORG= 	ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xt
 
 SHEBANG_FILES=	scripts_install/* \
 		python_scripts/afnipy/*.py \
 		python_scripts/scripts/*.py \
 		jzosky/*.py \
 		jzosky/lib_RetroTS/*.py \
 		discoraj/ClusterExplorer/*.py \
 		pkundu/*.py \
 		pkundu/meica.libs/*.py \
 		pkundu/meica.libs/*/*.py \
 		pkundu/meica.libs/*/*/*.py
 
 MAKE_ENV=	CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	vastness suma
 
 CFLAGS+=	-fcommon -Wno-incompatible-function-pointer-types
 
 ###########################################################################
 # Install parameters
 
 SUB_FILES=	pkg-message afni.cshrc afni.profile
 
 INSTALL_WRKSRC=	${WRKSRC}/BSD
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DOCS
 
 INSTALL_TMP=	${INSTALL_WRKSRC}-temp
 PRESTAGE=	${WRKSRC}/prestage
 
 .include <bsd.port.options.mk>
 
 CONFLICTS=	im \
 		nifticlib \
 		open-usp-tukubai
 
 X11R6_FILES=	coxplot/Makefile \
 		coxplot/Makefile.f2c
 
 PKG_COMPRESSION_LEVEL= 	6
 
 post-extract:
 .for f in ${X11R6_FILES}
 	@${REINPLACE_CMD} \
 		-e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-E 's|AFNI_[0-9_]+|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@${RM} ${WRKSRC}/3DEdge/src/Makefile.orig
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|-lglib|-lglib-2.0|g" \
 		${WRKSRC}/SUMA/SUMA_Makefile
 	@${REINPLACE_CMD} \
 		-e 's|os\.path\.dirname(os\.path\.abspath(os\.path\.expanduser(sys\.argv\[0\])))|"${DATADIR}"|g' \
 		${WRKSRC}/pkundu/meica.py
 
 do-install:
 	# AFNI install just dumps everything into one flat directory
 	# ${WRKSRC}/BSD == ${INSTALL_WRKSRC}.
 	# Preserve ${INSTALL_WRKSRC} and make a sacrificial temp copy
 	# to be pruned and rearranged for easy staging
 	@${RM} -r ${INSTALL_TMP}
 	@${CP} -R ${INSTALL_WRKSRC} ${INSTALL_TMP}
 
 	# Clean up and organize files into ${PRESTAGE}, destroying
 	# ${INSTALL_TMP} in the process
 	@${RM} -rf ${PRESTAGE}
 	@${MKDIR} ${PRESTAGE}/bin \
 		${PRESTAGE}/scripts \
 		${PRESTAGE}/lib \
 		${PRESTAGE}/include \
 		${PRESTAGE}/trash \
 		${PRESTAGE}/doc \
 		${PRESTAGE}/share \
 		${PRESTAGE}/pylib
 	@${RM}	${INSTALL_TMP}/libf2c.a
 	@${MV}	${INSTALL_TMP}/meica.libs \
 		${INSTALL_TMP}/shiny \
 		${INSTALL_TMP}/lib_RetroTS \
 		${INSTALL_TMP}/funstuff \
 		${INSTALL_TMP}/AFNI.*rc \
 		${INSTALL_TMP}/afnigui* \
 		${PRESTAGE}/share
 	@${MV}	${INSTALL_TMP}/*.a \
 		${INSTALL_TMP}/*.so \
 		${PRESTAGE}/lib
 	@${MV}	${INSTALL_TMP}/*.h ${PRESTAGE}/include
 	@${MV}	${INSTALL_TMP}/afnipy ${PRESTAGE}/pylib
 	@${CP}	${WRKDIR}/afni-AFNI_${PORTVERSION}/doc/README/* ${PRESTAGE}/doc
 	@for binary in `${FILE} ${INSTALL_TMP}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${PRESTAGE}/bin ; \
 	done
 	@${MV}	${INSTALL_TMP}/* ${PRESTAGE}/scripts
 
 	# Install to STAGEDIR using proper ports tools
 	@${MKDIR} \
 		${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/lib/afni \
 		${STAGEDIR}${PREFIX}/include/afni \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${PREFIX}/etc/mri
 	${INSTALL_PROGRAM} ${PRESTAGE}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PRESTAGE}/scripts/* ${STAGEDIR}${PREFIX}/bin
 	(cd ${PRESTAGE}/pylib && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
 	${INSTALL_DATA} ${PRESTAGE}/lib/* ${STAGEDIR}${PREFIX}/lib/afni
 	${INSTALL_DATA} ${PRESTAGE}/include/* ${STAGEDIR}${PREFIX}/include/afni
 	(cd ${PRESTAGE}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/afni.cshrc ${WRKDIR}/afni.profile \
 		${STAGEDIR}${PREFIX}/etc/mri
 
 do-install-DOCS-on:
 	${INSTALL_DATA} ${PRESTAGE}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/dakota/Makefile b/science/dakota/Makefile
index c8247c3443da..53da678e0891 100644
--- a/science/dakota/Makefile
+++ b/science/dakota/Makefile
@@ -1,102 +1,102 @@
 PORTNAME=	dakota
 DISTVERSION=	6.17.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	https://dakota.sandia.gov/sites/default/files/distributions/public/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-release-public-src-cli
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interface between analysis codes & iterative systems analysis methods
 WWW=		https://dakota.sandia.gov/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		fails to build with boost-1.85+
 
 BUILD_DEPENDS=	nanoflann>0:math/nanoflann
 LIB_DEPENDS=	libblas.so:math/blas \
 		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libicui18n.so:devel/icu \
 		liblapack.so:math/lapack \
 		libnlopt.so:math/nlopt \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake compiler:c++11-lang fortran gettext-runtime jpeg motif perl5 pkgconfig python shebangfix xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xrender xt
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	stan-dev:math:v2.18.0:stanmath/stanmath
 
 SHEBANG_GLOB=	*.sh *.py
 SHEBANG_FILES=	interfaces/Python/mpitile \
 		scripts/pyprepro/dprepro \
 		scripts/pyprepro/pyprepro \
 		scripts/dprepro.perl \
 		test/dakota_test.perl
 
 CMAKE_ON=	HAVE_X_GRAPHICS # always enable graphics because w/out it a lot of unrelated files aren't installed due to bugs in the project
 CMAKE_ON+=	Boost_NO_BOOST_CMAKE \
 		DAKOTA_GIT_checkout
 #CMAKE_ON+=	HAVE_C3 # causes "duplicate include" error
 #CMAKE_ON+=	DAKOTA_DL_SOLVER # fails to compile: error: declaration of anonymous class must be a definition
 #CMAKE_ON+=	HAVE_NOWPAC # installs files into $PORTSDIR
 CMAKE_ON+=	HAVE_QUESO \
 		HAVE_MUQ MUQ_USE_PYTHON \
 		# enable some methods that aren't enabled by default, see the list @ src/DakotaIterator.cpp
 CMAKE_ON+=	DAKOTA_HAVE_GSL DAKOTA_HAVE_HDF5
 
 CMAKE_OFF=	DAKOTA_ENABLE_TESTS
 CMAKE_ARGS=	-DDakota_VERSION_SRC:STRING=${DISTVERSION} -DDakota_GIT_REVL:STRING=unknown -DDakota_RELEASE_DATE:${STRING}=20211115 \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DMUQ_STANMATH_DIR=${WRKSRC}/stanmath \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 
 CFLAGS+=	-DH5_USE_110_API=1
 FFLAGS+=	-fallow-argument-mismatch
 LDFLAGS+=	-lexecinfo
 
 CONFLICTS_BUILD=	dakota # self: picks up some bundled packages from the pre-installed dakota package and then fails to install them
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	@${ECHO} ${DISTVERSION} > ${WRKSRC}/VERSION # expected by the 'install' target
 
 pre-configure: # MUQ_STANMATH_DIR is lost otherwise
 	@${REINPLACE_CMD} 's|find_package(PkgConfig)|set(MUQ_STANMATH_DIR ${WRKSRC}/stanmath)|' ${WRKSRC}/packages/external/muq2/cmake/finds/FindSTANMATH.cmake
 
 post-install:
 	# remove eigen3 that Dakota installs
 	cd ${STAGEDIR}${PREFIX} && ${RM} -r include/eigen3 share/eigen3
 	# remove cblas.h that Dakota installs
 	${RM} ${STAGEDIR}${PREFIX}/include/cblas.h
 	# remove *.orig files
 	${RM} ${STAGEDIR}${PREFIX}/include/colin/AppResponse.h.orig
 	# install libraries that it fails to install
 .for l in libmuqSamplingAlgorithms.so libmuqModeling.so libmuqUtilities.so
 	${INSTALL_LIB} ${BUILD_WRKSRC}/packages/external/muq2/lib/${l} ${STAGEDIR}${PREFIX}/lib
 .endfor
 
 do-test: install # from Additional Test Suites @ https://dakota.sandia.gov/content/additional-test-suites (many tests are known to fail)
 	## minimal set of fast-running tests that should NOT FAIL (may DIFF, depending on platform / compiler)
 	cd ${WRKSRC}/test && ./dakota_test.perl
 	## test suite that should PASS on any supported platform (NO DIFF or FAIL)
 	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=AcceptanceTest
 	## run all Dakota tests active in this build (should PASS or DIFF)
 	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=dakota_
 	# Tests should be this way, but this fails:
 	#@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDAKOTA_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		(cd ${WRKSRC} && ctest -j 4 -L FastTest -LE Diff)
 
 .include <bsd.port.mk>
diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile
index 804a1961b55a..0543aa57b57e 100644
--- a/science/openmodelica/Makefile
+++ b/science/openmodelica/Makefile
@@ -1,113 +1,114 @@
 PORTNAME=	openmodelica
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.24.4
+PORTREVISION=	1
 CATEGORIES=	science cad java
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modelica-based modeling and simulation environment
 WWW=		https://openmodelica.org/ \
 		https://github.com/OpenModelica/OpenModelica
 
 LICENSE=	OSMC-PL
 LICENSE_NAME=	Public license for OpenModelica
 LICENSE_TEXT=	See https://github.com/OpenModelica/OpenModelica/blob/master/OSMC-License.txt
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 BROKEN=		fails to build with Boost>=1.87
 BROKEN_armv7=	link fails: ld: cannot find -lquadmath: No such file or directory
 BROKEN_i386=	compilation fails: /wrkdirs/usr/ports/science/openmodelica/work/OpenModelica-1.20.0/OMCompiler/3rdParty/libffi/src/x86/sysv.S:841:1: error: changed section flags for .eh_frame, expected: 0x2
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		autoconf>0:devel/autoconf \
 		automake:devel/automake \
 		gmake:devel/gmake \
 		libtool>0:devel/libtool \
 		${LOCALBASE}/include/readline/readline.h:devel/readline \
 		sundials>0:math/sundials
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libosg.so:graphics/osg \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 
 USES=		cmake compiler:c++14-lang iconv fortran gettext-runtime gl \
 		gnome blaslapack localbase:ldflags qt:5 readline pkgconfig \
 		python:build shebangfix java
 USE_QT=		concurrent core declarative gui location network opengl \
 		printsupport svg webchannel webengine widgets xml xmlpatterns \
 		buildtools:build qmake:build
 USE_GL=		gl opengl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/cpp ${PREFIX}/lib/omc/ffi # https://github.com/OpenModelica/OpenModelica/issues/9925
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenModelica
 GH_PROJECT=	OpenModelica
 
 SHEBANG_GLOB=	*.sh *.in *.ac
 
 GH_TUPLE=	\
 		OpenModelica:OMOptim:f1036f43db18c5015da259771004cfb80e08a110:OpenModelica_OMOptim/OMOptim \
 		OpenModelica:OMSimulator:46fa40f:OpenModelica_OMSimulator/OMSimulator \
 		OpenModelica:OMSimulator-3rdParty:5c10de1648d1134a577d9284b58580a72383d89f:OpenModelica_OMSimulator_3rdParty/OMSimulator/3rdParty \
 		OpenModelica:OMCompiler-3rdParty:520663f:OpenModelica_OMCompiler_3rdParty/OMCompiler/3rdParty \
 		OpenModelica:OMSens:093ad11:OpenModelica_OMSens/OMSens \
 		OpenModelica:OMSens_Qt:bab329a:OpenModelica_OMSens_Qt/OMSens_Qt \
 		OpenModelica:OpenModelica-common:08a01802db5ba5edb540383c46718b89ff229ef2:OpenModelica_OpenModelica_common/OMOptim/common \
 		OpenModelica:OpenModelica-common:08a01802db5ba5edb540383c46718b89ff229ef2:OpenModelica_OpenModelica_common/OMSens_Qt/common
 GH_TUPLE+=	OpenModelica:OMBootstrapping:c289e97c41d00939a4a69fe504961b47283a6d8e:bootstrapping/OMCompiler/Compiler/boot/bomc # downloaded by cmake
 
 # this should change make program everywhere, but it doesn't,
 # hence the patches in OMCompiler/Compiler/runtime/CMakeLists.txt, OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp
 CMAKE_ARGS=	-DCMAKE_MAKE_PROGRAM=gmake \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 
 CMAKE_ARGS+=	-DOM_USE_CCACHE:BOOL=${CCACHE_ENABLED:S/yes/ON/:S/no/OFF/} # if refuses to build w/out ccache by default
 CMAKE_ON=	OM_OMEDIT_ENABLE_QTWEBENGINE
 
 LDFLAGS+=	-lexecinfo -lintl -pthread
 
 BINARY_ALIAS=	make=${GMAKE}
 
 post-extract:
 	# remove stray *.orig files
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	# remove rtime that isn't used on FreeBSD
 	@${RM} -r ${WRKSRC}/OMSimulator/OMTLMSimulator/3rdParty/rtime
 	# prevent bootstrap file download
 	#${MKDIR} ${WRKSRC}/bomc
 	${TOUCH} ${WRKSRC}/OMCompiler/Compiler/boot/bomc/sources.tar.gz
 	# workaround for broken fetch
 	@${RLN} ${WRKSRC}/OMOptim/common ${WRKSRC}/OMSens_Qt/common
 
 post-patch:
 	# fix bash shebangs
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
 		${WRKSRC}/OMCompiler/Examples/GenerateDoc.mos \
 		${WRKSRC}/OMCompiler/3rdParty/tbb/build/generate_tbbvars.sh
 	# add path to libgfortran to link flags for OM internal builds
 	@${REINPLACE_CMD} \
 		-e 's|@RT_LDFLAGS_GENERATED_CODE_SIM@|& -L${LOCALBASE}/lib/gcc${FC:S/gfortran//}|' \
 		${WRKSRC}/OMCompiler/Compiler/Util/Autoconf.mo.in
 
 post-install:
 	# workaround for https://github.com/OpenModelica/OpenModelica/issues/9919
 	#cd ${STAGEDIR}${PREFIX} && ${CHMOD} +x \
 	#	bin/OMSimulator bin/OMSimulatorPython3 bin/StartTLMFmiWrapper
 	# remove unnecessary files
 	${RM} -r \
 		${STAGEDIR}${PREFIX}/share/zmq \
 		${STAGEDIR}${PREFIX}/doc \
 		${STAGEDIR}${PREFIX}/share/doc
 	# remove empty directories
 	${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 	# strip binaries
 	#cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
 		bin/OMSimulator bin/FMIWrapper \
 		lib/omc/OMSimulator/libomtlmsimulator.so lib/omc/OMSimulator/libOMSimulator.so \
 		lib/omc/libomtlmsimulator.so lib/omc/libOMSimulator.so
 
 .include <bsd.port.mk>
diff --git a/science/orthanc-dicomweb/Makefile b/science/orthanc-dicomweb/Makefile
index 35cbdb99aa3f..e134921637b1 100644
--- a/science/orthanc-dicomweb/Makefile
+++ b/science/orthanc-dicomweb/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	orthanc-dicomweb
 DISTVERSION=	1.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	science
 MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/:main \
 		https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
 		https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty \
 		https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/:thirdpartydicomweb
 DISTFILES=	OrthancDicomWeb-${PORTVERSION}.tar.gz:main
 EXTRADISTFILES=	Orthanc-1.11.0.tar.gz:framework \
 		e2fsprogs-1.44.5.tar.gz:thirdparty \
 		bootstrap-4.3.1.zip:thirdpartydicomweb \
 		vuejs-2.6.10.tar.gz:thirdpartydicomweb \
 		axios-0.19.0.tar.gz:thirdpartydicomweb \
 		Font-Awesome-4.7.0.tar.gz:thirdpartydicomweb \
 		bootstrap-vue-2.0.0-rc.24-dist.tar.gz:thirdpartydicomweb \
 		babel-polyfill-6.26.0.min.js.gz:thirdpartydicomweb
 DISTFILES+=	${EXTRADISTFILES}
 DIST_SUBDIR=	orthanc
 EXTRACT_ONLY=	OrthancDicomWeb-${PORTVERSION}.tar.gz
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Orthanc plugin to bring support of the DICOMweb standard into Orthanc
 WWW=		https://www.orthanc-server.com/static.php?page=dicomweb
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN=		fails to build with boost-1.86+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libgdcmCommon.so:devel/gdcm \
 		libicudata.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libopenjp2.so:graphics/openjpeg \
 		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	Orthanc:science/orthanc
 
 USES=		cmake localbase python:build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources \
 		-DORTHANC_FRAMEWORK_SOURCE=path
 CMAKE_OFF=	USE_SYSTEM_UUID
 
 CFLAGS+=	-DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 WRKSRC=		${WRKDIR}/OrthancDicomWeb-${PORTVERSION}
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
 .for f in ${EXTRADISTFILES:C/:[^:]*//}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/ThirdPartyDownloads
 .endfor
 	${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0.tar.gz
 
 do-test:
 	@cd ${BUILD_WRKSRC} && ./UnitTests
 
 .include <bsd.port.mk>
diff --git a/science/orthanc-webviewer/Makefile b/science/orthanc-webviewer/Makefile
index 15175330e99a..1d01a6028f8f 100644
--- a/science/orthanc-webviewer/Makefile
+++ b/science/orthanc-webviewer/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	orthanc-webviewer
 DISTVERSION=	2.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	science
 MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/plugin-webviewer/:main \
 		https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
 		http://orthanc.osimis.io/ThirdPartyDownloads/WebViewer/:thirdpartywebviewer \
 		http://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty
 DISTFILES=	OrthancWebViewer-${PORTVERSION}.tar.gz:main \
 		jsPanel-2.3.3-fixed.zip:thirdpartywebviewer \
 		cornerstone-0.11.0.zip:thirdpartywebviewer \
 		jquery-ui-1.11.3.zip:thirdpartywebviewer \
 		pako-0.2.5.zip:thirdpartywebviewer \
 		js-url-1.8.6.zip:thirdpartywebviewer \
 		Orthanc-1.11.0.tar.gz:framework \
 		e2fsprogs-1.44.5.tar.gz:thirdparty
 DIST_SUBDIR=	orthanc
 EXTRACT_ONLY=	OrthancWebViewer-${PORTVERSION}.tar.gz
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Orthanc plugin to extend Orthanc with a Web viewer of medical images
 WWW=		https://www.orthanc-server.com/static.php?page=web-viewer
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN=		fails to build with boost-1.86+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libgdcmCommon.so:devel/gdcm \
 		libicudata.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libopenjp2.so:graphics/openjpeg \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	Orthanc:science/orthanc
 
 USES=		cmake localbase python:build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources \
 		-DORTHANC_FRAMEWORK_SOURCE=path
 CMAKE_OFF=	USE_SYSTEM_UUID
 
 CFLAGS+=	-I${LOCALBASE}/include -DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 WRKSRC=		${WRKDIR}/OrthancWebViewer-${PORTVERSION}
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/jsPanel-2.3.3-fixed.zip ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/cornerstone-0.11.0.zip ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/jquery-ui-1.11.3.zip ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/pako-0.2.5.zip ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/js-url-1.8.6.zip ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.11.0.tar.gz ${WRKSRC}/ThirdPartyDownloads
 	${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0.tar.gz
 
 post-build:
 	@cd ${BUILD_WRKSRC} && ./UnitTests
 
 .include <bsd.port.mk>
diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
index c3689d6ebf19..b0cd900fab01 100644
--- a/science/orthanc/Makefile
+++ b/science/orthanc/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	orthanc
 DISTVERSION=	1.12.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	https://orthanc.uclouvain.be/downloads/sources/orthanc/
 DISTNAME=	Orthanc-${PORTVERSION}
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Lightweight DICOM server for healthcare and medical research
 WWW=		https://www.orthanc-server.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN=		fails to build with boost-1.86+
 
 BUILD_DEPENDS=	protoc:devel/protobuf
 
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libcivetweb.so:www/civetweb \
 		libcurl.so:ftp/curl \
 		libdcmtkcharls.so:graphics/dcmtk \
 		libgtest.so:devel/googletest \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpng16.so:graphics/png \
 		libprotobuf.so:devel/protobuf \
 		libpugixml.so:textproc/pugixml \
 		libtiff.so:graphics/tiff \
 		libuuid.so:misc/e2fsprogs-libuuid \
 
 USES=		cmake gnome iconv jpeg lua python:build sqlite ssl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	orthanc
 
 CMAKE_ON=	USE_SYSTEM_BOOST USE_SYSTEM_CIVETWEB USE_SYSTEM_DCMTK \
 		USE_SYSTEM_GOOGLE_TEST USE_SYSTEM_JSONCPP USE_SYSTEM_LIBICONV \
 		USE_SYSTEM_LIBJPEG USE_SYSTEM_LIBPNG USE_SYSTEM_LUA \
 		USE_SYSTEM_OPENSSL USE_SYSTEM_PUGIXML USE_SYSTEM_SQLITE \
 		USE_SYSTEM_UUID USE_SYSTEM_ZLIB
 CMAKE_OFF=	BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
 CMAKE_SOURCE_PATH=	${WRKSRC}/OrthancServer
 
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 WRKSRC=		${WRKDIR}/Orthanc-${PORTVERSION}
 
 USERS=		orthanc
 GROUPS=		orthanc
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
 	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${CMAKE_SOURCE_PATH}/Resources/Configuration.json
 	${CP} ${CMAKE_SOURCE_PATH}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample
 
 .include <bsd.port.mk>
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index c3f96b10456f..67c97af80faf 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,176 +1,176 @@
 PORTNAME=	paraview
 DISTVERSION=	${PARAVIEW_VER}.1
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v${PARAVIEW_VER}/
 DISTNAME=	ParaView-v${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Powerful scientific data visualization application
 WWW=		https://www.paraview.org/
 
 # See https://www.paraview.org/license/
 LICENSE=	BSD3CLAUSE
 
 BROKEN=		fails to build with Boost>=1.87
 BROKEN_i386=	no matching member function for call to 'getArrayType'
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cli11>0:devel/cli11	\
 		utf8cpp>0:devel/utf8cpp	\
 		fast_float>0:math/fast_float \
 		nlohmann-json>0:devel/nlohmann-json	\
 		vulkan-headers>0:graphics/vulkan-headers	\
 		${LOCALBASE}/include/exprtk.hpp:math/exprtk	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2 \
 		libjbig.so:graphics/jbigkit \
 		liborc-0.4.so:devel/orc \
 		libpcre.so:devel/pcre \
 		libicuuc.so:devel/icu \
 		libffi.so:devel/libffi \
 		libtbb.so:devel/onetbb \
 		libogg.so:audio/libogg \
 		libgl2ps.so:print/gl2ps \
 		libOT.so:math/openturns \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libhpdf.so:print/libharu \
 		libproj.so:graphics/proj \
 		libpdalcpp.so:math/pdal \
 		libdrm.so:graphics/libdrm \
 		libcgns.so:science/cgnslib \
 		liblz4.so:archivers/liblz4 \
 		libverdict.so:math/verdict \
 		libnetcdf.so:science/netcdf \
 		libjsoncpp.so:devel/jsoncpp \
 		libprotobuf.so:devel/protobuf \
 		libpugixml.so:textproc/pugixml \
 		libavutil.so:multimedia/ffmpeg \
 		libcgraph.so:graphics/graphviz \
 		libxkbcommon.so:x11/libxkbcommon \
 		libtheora.so:multimedia/libtheora \
 		libgeotiff.so:graphics/libgeotiff \
 		libboost_thread.so:devel/boost-libs \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	${PYNUMPY}	\
 		bash:shells/bash	\
 		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		alias cmake compiler:c11 desktop-file-utils eigen:3 fortran gl gnome	\
 		jpeg localbase pkgconfig python qt:6 shebangfix sqlite tar:xz xorg
 USE_GL=		gl glew glu glut
 USE_GNOME=	libxml2
 USE_QT=		5compat base svg tools webengine
 #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
 
 CFLAGS+=	-I${WRKSRC}/Clients/ParaView/Documentation
 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=OFF \
 		-DPARAVIEW_ENABLE_WEB:BOOL=ON \
 		-DPARAVIEW_ENABLE_GDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_PDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_MOTIONFX:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF2:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF3:BOOL=ON \
 		-DPARAVIEW_USE_QT:BOOL=ON \
 		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION:BOOL=OFF \
 		-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DVTK_FORBID_DOWNLOADS:BOOL=ON
 .endif
 MAKE_ENV=	XDG_CONFIG_HOME=${WRKDIR}
 USE_CXXSTD=	c++17
 
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	VTK/Examples/SearchScript.sh	\
 		VTK/Utilities/Maintenance/*.sh	\
 		Clients/CommandLineExecutables/paraview-config.in
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPICH OSMESA
 OPTIONS_SUB=	yes
 OSMESA_DESC=	Use Mesa for off-screen rendering
 
 # mpi4py and other programs must be compiled against the same MPI provider
 MPICH_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=0:net/py-mpi4py-mpich@${PY_FLAVOR}
 MPICH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=0:net/py-mpi4py-mpich@${PY_FLAVOR}
 MPICH_USES=		mpi # mpich is set by default, use mpi:openmpi if needed
 MPICH_CMAKE_ON=		-DPARAVIEW_USE_MPI:BOOL=ON
 MPICH_CMAKE_OFF=		-DPARAVIEW_USE_MPI:BOOL=OFF
 
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 OSMESA_USES_OFF=	desktop-file-utils
 OSMESA_CMAKE_BOOL=	VTK_OPENGL_HAS_OSMESA
 OSMESA_CMAKE_ON=	-DVTK_USE_X:BOOL="OFF" \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
 OSMESA_CMAKE_OFF=	-DVTK_USE_X:BOOL="ON"
 
 EXAMPLES_CMAKE_BOOL=	PARAVIEW_ENABLE_EXAMPLES
 PORTEXAMPLES=		*
 
 #TEST_CMAKE_ON=		-DPARAVIEW_BUILD_TESTING=WANT	\
 			-DPARAVIEW_BUILD_VTK_TESTING=WANT
 
 # Error with ADIOS2
 #LIB_DEPENDS+=	libadios2_c.so:misc/adios2
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_ADIOS2:BOOL=ON
 # Missing GenericIO for CosmoTools
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=ON
 # Errors with VisItBridge / VisItLib
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
 # MomentInvariants needs to download a module
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_MOMENTINVARIANTS:BOOL=ON
 # No package for graphics/ospray
 #LIB_DEPENDS+=	libospray.so:graphics/ospray
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_RAYTRACING
 
 PLIST_SUB+=	VERMAJORMINOR=${PARAVIEW_VER}
 
 VTK9_CONFLICTS=	vtk.py vtkmodules/__init__.py vtkmodules/all.py	\
 		vtkmodules/gtk vtkmodules/numpy_interface	\
 		vtkmodules/qt vtkmodules/test vtkmodules/tk	\
 		vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py	\
 		vtkmodules/web/errors.py
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py
 
 post-install:
 	# vtk9 is not a real run dependency, but it installs several common files
 .for py in ${VTK9_CONFLICTS}
 	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/${py}
 .endfor
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <./Makefile.version>
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index e09adc0a010f..82697c9ea1df 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -1,233 +1,233 @@
 PORTNAME=	tensorflow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	amzo1337@gmail.com
 COMMENT=	Computation using data flow graphs for scalable machine learning
 WWW=		https://www.tensorflow.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=	variable has incomplete type 'StateSaver'
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}grpcio-tools>=1.22.0:devel/py-grpcio-tools@${PY_FLAVOR} \
 		bash:shells/bash \
 		cython:lang/cython \
 		swig:devel/swig \
 		bazel:devel/bazel5 \
 		git:devel/git
 LIB_DEPENDS=	libnsync.so:devel/nsync \
 		libgpr.so:devel/grpc \
 		libpng.so:graphics/png \
 		libsnappy.so:archivers/snappy \
 		liblmdb.so:databases/lmdb \
 		libsqlite3.so:databases/sqlite3 \
 		libicuio.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpcre.so:devel/pcre \
 		libnsync.so:devel/nsync \
 		libprotobuf.so:devel/protobuf \
 		libprotobuf-c.so:devel/protobuf-c \
 		libre2.so:devel/re2 \
 		libgif.so:graphics/giflib \
 		libcurl.so:ftp/curl \
 		libflatbuffers.so:devel/flatbuffers \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	pybind11>=2.6.2:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}absl-py>=1.0.0:devel/py-absl-py \
 		${PYTHON_PKGNAMEPREFIX}astunparse>=1.6.3:devel/py-astunparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.9.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flatbuffers>=2.0:devel/py-flatbuffers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gast>=0.5.3:devel/py-gast@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-pasta>=0.1.7:devel/py-google-pasta@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.1:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.22.0:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keras-preprocessing>=1.1.1:math/py-keras-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=1.14.1:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opt-einsum>=3.3.0:math/py-opt-einsum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		pybind11>=2.6.2:devel/pybind11
 
 USES=		jpeg llvm:16 python shebangfix ssl
 USE_CXXSTD=     c++17
 USE_GITHUB=	yes
 USE_PYTHON=	distutils
 
 SHEBANG_GLOB=	*.py
 
 BAZEL_BOOT=	--output_user_root=${WRKDIR}/bazel_out
 
 PLIST_SUB=	TF_PORT_VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=			CPU_OPTS XLA
 OPTIONS_RADIO=			PARALLEL_JOBS
 OPTIONS_RADIO_PARALLEL_JOBS=	JOBS_1 JOBS_HALF JOBS_ALL
 PARALLEL_JOBS_DESC=		How many jobs to run during build?
 OPTIONS_DEFAULT=		JOBS_HALF
 
 JOBS_1_DESC=			Run one job
 JOBS_1_VARS=			TF_JOBS_NUMBER=1
 JOBS_HALF_DESC=			Run half jobs
 JOBS_HALF_VARS=			TF_JOBS_NUMBER="`expr \( ${MAKE_JOBS_NUMBER} + 1 \) / 2`"
 JOBS_ALL_DESC=			Run all jobs
 JOBS_ALL_VARS=			TF_JOBS_NUMBER=${MAKE_JOBS_NUMBER}
 
 CPU_OPTS_DESC=			Enable optimisations using features available on your CPU
 CPU_OPTS_VARS=			CPU_TARGET=native BAZEL_COPT="-c opt --copt=-march=native --copt=-mfpmath=sse"
 CPU_OPTS_VARS_OFF=		CPU_TARGET=x86-64
 
 XLA_DESC=			Accelerated Linear Algebra
 XLA_VARS=			XLA_OPT="1"
 XLA_VARS_OFF=			XLA_OPT="0"
 
 .include "Makefile.MASTER_SITES"
 
 post-patch:
 	# Set up a local repository with our pre-downloaded packages
 	# This prevents bazel downloading the files without modifying
 	# the bzl files.
 	@${MKDIR} ${WRKDIR}/bazel-cache
 	@${MKDIR} ${WRKDIR}/bazel-dist
 	@${MKDIR} ${WRKDIR}/.bin
 
 .for file in ${DISTFILES:C/\:(.*)//}
 	@${ECHO} "Moving ${file} to ${WRKDIR}/bazel-dist"
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKDIR}/bazel-dist
 .endfor
 
 	@${CP} ${PATCHDIR}/bazelrc ${WRKDIR}/bazelrc
 	@${CP} -R ${PATCHDIR}/bazel/* \
 		${WRKSRC}/third_party/
 
 	@${LN} -s ${PYTHON_CMD} ${WRKDIR}/.bin/python3
 
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} "s#--batch#${BAZEL_BOOT}\', \'--batch#" \
 		configure.py
 
 	${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_VERSION}#" ${WRKSRC}/configure \
 		${WRKSRC}/third_party/freebsd_python_fix.patch \
 		${WRKSRC}/tensorflow/compiler/mlir/quantization/tensorflow/BUILD
 
 	@${REINPLACE_CMD} "s#%%BAZEL_DIR%%#${WRKDIR}#" ${WRKDIR}/bazelrc
 	@${REINPLACE_CMD} "s#%%BAZEL_DIST%%#${WRKDIR}#" ${WRKDIR}/bazelrc
 	@${REINPLACE_CMD} "s#%%MLIR_LLVM_PATCH%%#/${WRKSRC}/bazel/bazel_llvm-raw_utils_bazel_configure.bzl#" \
 		${WRKSRC}/tensorflow/compiler/mlir/hlo/WORKSPACE
 
 	# use system pybind11, but use sed to fix includes, too many to maintain with patches
 	@${FIND} ${WRKSRC} -type f -name '*.cc' | ${XARGS} ${REINPLACE_CMD} "s#include\/pybind11#pybind11#"
 
 
 	# copy the toolchain over
 	@${CP} -R ${PATCHDIR}/freebsd \
 		${WRKSRC}/
 
 	@${REINPLACE_CMD} "s#%%PATH%%#${PATH}#" ${WRKDIR}/bazelrc
 
 	@${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_CMD}#" ${WRKSRC}/.bazelrc
 
 	@${REINPLACE_CMD} \
 		-e "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		-e "s#%%LLVM_PREFIX%%#${LLVM_PREFIX}#g" \
 		-e "s#%%LLVM_VERSION%%#${LLVM_VERSION}#g" \
 		${WRKDIR}/bazelrc \
 		${WRKSRC}/third_party/absl/system.absl.strings.BUILD \
 		${WRKSRC}/freebsd/cc_toolchain_config.bzl \
 		${WRKSRC}/.bazelrc \
 		${WRKSRC}/tensorflow/tools/proto_text/BUILD \
 		${WRKSRC}/tensorflow/BUILD \
 		${WRKSRC}/tensorflow/core/BUILD \
 		${WRKSRC}/third_party/systemlibs/protobuf.BUILD
 
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} \
 		PYTHON_BIN_PATH=${PYTHON_CMD} \
 		PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \
 		KERAS_HOME="${WRKDIR}/.keras" \
 		TF_NEED_OPENCL_SYCL=0 \
 		TF_ENABLE_XLA=${XLA_OPT} \
 		TF_NEED_OPENCL=0 \
 		TF_NEED_MPI=0 \
 		TF_NEED_TENSORRT=0 \
 		TF_NEED_NGRAPH=0 \
 		TF_NEED_IGNITE=0 \
 		TF_NEED_ROCM=0 \
 		TF_NEED_CUDA=0 \
 		TF_SET_ANDROID_WORKSPACE=0 \
 		TF_DOWNLOAD_CLANG=0 \
 		TF_NEED_NCCL=0 \
 		TF_IGNORE_MAX_BAZEL_VERSION=1 \
 		CC_OPT_FLAGS="-march=${CPU_TARGET} -I${LOCALBASE}/include" \
 		PREFIX="${LOCALBASE}" \
 		TF_SYSTEM_LIBS="absl_py astor_archive astunparse_archive boringssl com_github_googlecloudplatform_google_cloud_cpp com_github_grpc_grpc \
 				com_google_absl com_google_protobuf curl cython dill_archive double_conversion functools32_archive gast_archive \
 				gif hwloc icu jsoncpp_git libjpeg_turbo lmdb nasm nsync opt_einsum_archive org_sqlite pasta png pybind11 six_archive snappy \
 				tblib_archive termcolor_archive typing_extensions_archive wrapt zlib" \
 		./configure
 
 do-build:
 	@cd ${WRKSRC} && \
 		bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build --jobs ${TF_JOBS_NUMBER} ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \
 		--host_linkopt="-L${LOCALBASE}/lib -lexecinfo" --linkopt="-L${LOCALBASE}/lib -lexecinfo" --copt="-I${LOCALBASE}/include" \
 		--verbose_failures -s \
 		--distdir=${WRKDIR}/bazel-dist \
 		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so \
 		//tensorflow:libtensorflow_cc.so \
 		//tensorflow:install_headers \
 		//tensorflow/tools/pip_package:build_pip_package
 
 
 	@cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} \
 		bazel-bin/tensorflow/tools/pip_package/build_pip_package \
 		${WRKDIR}/whl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}
 	@${MKDIR} ${STAGEDIR}/${LOCALBASE}/include/tensorflow
 
 	@${UNZIP_NATIVE_CMD} -d ${STAGEDIR}/${PYTHON_SITELIBDIR} ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl
 
 	# put headers in the right folder
 	${CP} -R ${WRKSRC}/bazel-bin/tensorflow/include/tensorflow \
 		${STAGEDIR}/${LOCALBASE}/include/
 
 	# pc files and libraries
 	${INSTALL_DATA} ${PATCHDIR}/tensorflow.pc ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/
 	${INSTALL_DATA} ${PATCHDIR}/tensorflow_cc.pc ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/
 
 	@${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow.pc \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow_cc.pc
 
 	@${REINPLACE_CMD} "s#%%VERSION%%#${PORTVERSION}#" \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow.pc
 
 	#cleanup
 	${RM} ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/*.bak
 
 	# install the libraries and strip
 	@${FIND} ${WRKSRC}/bazel-bin/tensorflow/ -depth 1 -name "*.so*" | ${XARGS} -I{} \
 		${INSTALL_LIB} {} ${STAGEDIR}/${LOCALBASE}/lib/
 
 	@${FIND} ${STAGEDIR}/${LOCALBASE}/lib -name "*.so*" | ${XARGS} ${STRIP_CMD}
 
 post-install: # autoplist: thousands of files, all under ${PYTHON_SITELIBDIR}
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${PYTHON_SITELIBDIR:C|^${LOCALBASE}/||} -type f -or -type l | grep -v "egg-info/" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/bitwarden-cli/Makefile b/security/bitwarden-cli/Makefile
index c9d819c90cba..da1f30c1f2b3 100644
--- a/security/bitwarden-cli/Makefile
+++ b/security/bitwarden-cli/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	bitwarden-cli
 DISTVERSIONPREFIX=	cli-v
 DISTVERSION=	2024.12.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://nodejs.org/dist/v${PKG_NODE_VER}/:node
 DISTFILES=	node-v${PKG_NODE_VER}${EXTRACT_SUFX}:node \
 		${PREFETCH_FILE}:prefetch
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Bitwarden client command-line interface
 WWW=		https://bitwarden.com
 
 LICENSE=	BITWARDEN GPLv3
 LICENSE_COMB=	multi
 LICENSE_NAME_BITWARDEN=	BITWARDEN LICENSE AGREEMENT
 LICENSE_FILE_BITWARDEN=	${WRKSRC}/LICENSE_BITWARDEN.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE_GPL.txt
 LICENSE_PERMS_BITWARDEN=none
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 FETCH_DEPENDS=	npm:www/npm${NODEJS_SUFFIX}
 BUILD_DEPENDS=	npm:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libicui18n.so:devel/icu \
 		libuv.so:devel/libuv \
 		libcares.so:dns/c-ares \
 		libnghttp2.so:www/libnghttp2
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		ca_root_nss>0:security/ca_root_nss
 TEST_DEPENDS=	npm:www/npm${NODEJS_SUFFIX}
 
 USES=		gmake localbase:ldflags nodejs:20,build pkgconfig \
 		python:build ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwarden
 GH_PROJECT=	clients
 
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 BUILD_WRKSRC=	${WRKSRC}/apps/cli
 
 PLIST_FILES=	bin/bw \
 		share/zsh/site-functions/_bw
 
 PORTDOCS=	CONTRIBUTING.md README.md SECURITY.md
 
 OPTIONS_DEFINE=	DOCS
 
 PREFETCH_FILE=	${PORTNAME}-${DISTVERSION}-node-modules${EXTRACT_SUFX}
 PREFETCH_TIMESTAMP=	61171200
 PKG_NODE_VER=	20.18.0
 PKG_FETCH_VER=	3.5
 PKG_NODE_CONFIGURE_ARGS=--openssl-use-def-ca-store \
 			--shared-brotli \
 			--shared-cares \
 			--shared-libuv \
 			--shared-nghttp2 \
 			--shared-openssl \
 			--shared-zlib \
 			--with-intl=system-icu
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/}
 
 pre-fetch:
 	if [ ! -f ${DISTDIR}/${PREFETCH_FILE} ]; then \
 		${MKDIR} ${WRKDIR}/node-modules-cache; \
 		${CP} -R ${FILESDIR}/packagejsons/* ${WRKDIR}/node-modules-cache; \
 		cd ${WRKDIR}/node-modules-cache && \
 		${SETENV} HOME=${WRKDIR} \
 			npm ci --ignore-scripts --no-progress --no-audit --no-fund; \
 		${FIND} ${WRKDIR}/node-modules-cache -depth 1 -print | \
 			${GREP} -v node_modules | ${XARGS} ${RM} -r; \
 		${FIND} ${WRKDIR}/node-modules-cache -type d -exec ${CHMOD} 755 {} ';'; \
 		cd ${WRKDIR}/node-modules-cache && \
 		${MTREE_CMD} -cbnSp node_modules | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${PREFETCH_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./node_modules:' > node-modules-cache.mtree; \
 		${TAR} -cz --options 'gzip:!timestamp' \
 			-f ${DISTDIR}/${PREFETCH_FILE} \
 			@node-modules-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-extract:
 	${MV} ${WRKDIR}/node_modules ${WRKSRC}
 
 post-patch:
 	# apply FreeBSD patches for node
 	for p in ${PATCHDIR}/node/patch-*;do \
 		${PATCH} -s -p0 -d ${WRKDIR}/node-v${PKG_NODE_VER} < $${p}; \
 	done
 	# apply node patch from pkg-fetch
 	${PATCH} -s -p1 -d ${WRKDIR}/node-v${PKG_NODE_VER} < \
 		${WRKSRC}/node_modules/@yao-pkg/pkg-fetch/patches/node.v${PKG_NODE_VER}.cpp.patch
 
 pre-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run postinstall
 	# build patched node for pkg
 	cd ${WRKDIR}/node-v${PKG_NODE_VER} && \
 		${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} ./configure ${PKG_NODE_CONFIGURE_ARGS} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j ${MAKE_JOBS_NUMBER}
 	${MKDIR} ${WRKDIR}/.pkg-cache/v${PKG_FETCH_VER}
 	${MV} ${WRKDIR}/node-v${PKG_NODE_VER}/out/Release/node \
 		${WRKDIR}/.pkg-cache/v${PKG_FETCH_VER}/built-v${PKG_NODE_VER}-freebsd-${NODE_ARCH}
 	${STRIP_CMD} ${WRKDIR}/.pkg-cache/v${PKG_FETCH_VER}/built-v${PKG_NODE_VER}-freebsd-${NODE_ARCH}
 	# rebuild node modules against patched node
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
 		npm rebuild --nodedir=${WRKDIR}/node-v${PKG_NODE_VER} --verbose
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm run build:bit:prod
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npx pkg . --targets node${NODEJS_VERSION}-freebsd-${NODE_ARCH} --output ./dist/bw
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		./dist/bw completion --shell zsh > _bw
 
 do-install:
 	# don't strip executable since it causes error
 	${INSTALL_KLD} ${BUILD_WRKSRC}/dist/bw ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${BUILD_WRKSRC}/_bw \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bw
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${TEST_ENV} npm run test
 
 .include <bsd.port.mk>
diff --git a/security/fizz/Makefile b/security/fizz/Makefile
index d5b770c75da1..bcb56bc2500a 100644
--- a/security/fizz/Makefile
+++ b/security/fizz/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	fizz
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++14 implementation of the TLS-1.3 standard
 WWW=		https://github.com/facebookincubator/fizz
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:testing compiler:c++14-lang ssl cpe
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebookincubator
 
 CPE_VENDOR=	facebook
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS BUILD_EXAMPLES
 CMAKE_TESTING_ON=	BUILD_TESTS
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 post-install: # https://github.com/facebookincubator/fizz/issues/55
 	cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/fizz/tool/test include/fizz/util/test
 
 .include <bsd.port.mk>
diff --git a/sysutils/calamares/Makefile b/sysutils/calamares/Makefile
index 2209439f969a..bd01739c4435 100644
--- a/sysutils/calamares/Makefile
+++ b/sysutils/calamares/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	calamares
 DISTVERSION=	3.2.61
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/calamares/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Distro- and desktop-independent installer
 WWW=		https://calamares.io/
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libpwquality.so:security/libpwquality \
 		libboost_python${PYTHON_SUFFIX}.so:devel/boost-python-libs
 
 USES=		cmake compiler:c++17-lang cpe gettext kde:5 python qt:5
 USE_KDE=	coreaddons dbusaddons \
 		ecm:build
 USE_QT=		concurrent core dbus declarative gui network quickcontrols2 \
 		svg widgets xml \
 		buildtools:build qmake:build
 
 CMAKE_OFF=	INSTALL_POLKIT
 
 .include <bsd.port.mk>
diff --git a/sysutils/fsearch/Makefile b/sysutils/fsearch/Makefile
index 08b509a6f7f9..d67ef6e467fa 100644
--- a/sysutils/fsearch/Makefile
+++ b/sysutils/fsearch/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	fsearch
 PORTVERSION=	0.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Fast file search utility for Unix-like systems
 WWW=		https://cboxdoerfer.github.io/fsearch/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpcre2-8.so:devel/pcre2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cboxdoerfer
 
 USES=		meson gettext-tools gnome pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 
 post-patch:
 	@${PRINTF} '\n%s\n%s;\n' int \
 		'strverscmp(const char *, const char *)' \
 		>> ${WRKSRC}/src/fsearch_string_utils.h
 	@${REINPLACE_CMD} -e 's,time_t,int64_t,g' \
 		${WRKSRC}/src/fsearch_time_utils.h \
 		${WRKSRC}/src/tests/test_time_utils.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker-miners/Makefile b/sysutils/tracker-miners/Makefile
index ee39f294ad74..8ff0553db1f6 100644
--- a/sysutils/tracker-miners/Makefile
+++ b/sysutils/tracker-miners/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	tracker-miners
 PORTVERSION=	2.3.5
-PORTREVISION=	46
+PORTREVISION=	47
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Miners for tracker2
 WWW=		https://wiki.gnome.org/Projects/Tracker
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libupower-glib.so:sysutils/upower \
 		libexempi.so:textproc/exempi \
 		libcue.so:textproc/libcue \
 		libiptcdata.so:graphics/libiptcdata \
 		libFLAC.so:audio/flac \
 		libtotem-plparser.so:multimedia/totem-pl-parser \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libgif.so:graphics/giflib \
 		libvorbisfile.so:audio/libvorbis \
 		libgxps.so:graphics/libgxps \
 		libexif.so:graphics/libexif \
 		libgexiv2.so:graphics/gexiv2 \
 		libtracker-miner-2.0.so:sysutils/tracker
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gnome jpeg localbase:ldflags meson \
 		pathfix pkgconfig python:build sqlite tar:xz vala:build
 USE_GNOME=	cairo intltool libgsf libxml2
 
 MESON_ARGS=	-Dsystemd_user_services=no \
 		-Diso=disabled \
 		-Dcharset_detection=icu \
 #		-Dbattery_detection=hal
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=		GSTREAMER RSS
 OPTIONS_DEFAULT=	GSTREAMER RSS
 
 GSTREAMER_USES=		gstreamer
 GSTREAMER_MESON_ON=	-Dgeneric_media_extractor=gstreamer
 GSTREAMER_MESON_OFF=	-Dgeneric_media_extractor=none
 
 RSS_DESC=		Tracker RSS miner
 RSS_MESON_TRUE=		miner_rss
 RSS_LIB_DEPENDS=	libgrss.so:net/libgrss
 
 PLIST_SUB=	LIBVER=0.2.0
 
 GLIB_SCHEMAS=	org.freedesktop.Tracker.Extract.gschema.xml \
 		org.freedesktop.Tracker.Miner.Files.gschema.xml \
 		org.freedesktop.Tracker.Writeback.gschema.xml \
 		org.freedesktop.TrackerMiners.enums.xml
 
 #post-install:
 #	${RM} -rf ${STAGEDIR}/${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index cff109fa22e8..9d62f0c457a9 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	tracker
 PORTVERSION=	2.3.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/tracker/-/commit/
 PATCHFILES=	27d09d510c056bcda3389ed5573463272162d510.diff:-p1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Object database, tag/metadata database, search tool and indexer
 WWW=		https://wiki.gnome.org/Projects/Tracker
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libsoup-2.4.so:devel/libsoup \
 		libdbus-1.so:devel/dbus \
 		libjson-glib-1.0.so:devel/json-glib \
 		libicutu.so:devel/icu
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
 		pkgconfig python:build sqlite tar:xz vala:build
 USE_GNOME=	glib20 introspection:build libxml2
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Ddocs=false \
 		-Dman=true \
 		-Dnetwork_manager=disabled \
 		-Dstemmer=disabled \
 		-Dbash_completion=${PREFIX}/etc/bash_completion.d \
 		-Dsystemd_user_services=no
 GLIB_SCHEMAS=	org.freedesktop.Tracker.DB.gschema.xml \
 		org.freedesktop.Tracker.FTS.gschema.xml \
 		org.freedesktop.Tracker.Store.gschema.xml \
 		org.freedesktop.Tracker.enums.xml \
 		org.freedesktop.Tracker.gschema.xml
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 CFLAGS+=	-Wno-int-conversion
 
 PLIST_SUB=	LIBVER=0.304.0
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker3/Makefile b/sysutils/tracker3/Makefile
index 30880aa231f8..f6a7de02e23e 100644
--- a/sysutils/tracker3/Makefile
+++ b/sysutils/tracker3/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	tracker
 PORTVERSION=	3.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Object database, tag/metadata database, search tool and indexer
 WWW=		https://wiki.gnome.org/Projects/Tracker
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libicutu.so:devel/icu \
 		libjson-glib-1.0.so:devel/json-glib \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
 		pkgconfig python:build sqlite tar:xz vala:build
 USE_GNOME=	glib20 libxml2 introspection:build pygobject3
 USE_LDCONFIG=	yes
 
 MESON_ARGS=	-Dbash_completion=true \
 		-Dbash_completion_dir=${PREFIX}/etc/bash_completion.d \
 		-Ddocs=false \
 		-Dstemmer=disabled \
 		-Dsystemd_user_services=false
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		DOCS MAN
 OPTIONS_SUB=		yes
 
 OPTIONS_MULTI=		SOUP
 OPTIONS_MULTI_SOUP=	SOUP2 SOUP3
 
 OPTIONS_DEFAULT=	SOUP2
 
 SOUP2_DESC=		libsoup 2 backend (from devel/libsoup)
 SOUP3_DESC=		libsoup 3 backend (from devel/libsoup3)
 
 DOCS_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
 DOCS_MESON_TRUE=	docs
 MAN_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 MAN_MESON_TRUE=		man
 MAN_DESC=		Install manual pages
 
 SOUP2_LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 SOUP3_LIB_DEPENDS=	libsoup-3.0.so:devel/libsoup3
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOUP2} && ${PORT_OPTIONS:MSOUP3}
 MESON_ARGS+=		-Dsoup=soup2,soup3
 .elif ${PORT_OPTIONS:MSOUP2}
 MESON_ARGS+=		-Dsoup=soup2
 .else # SOUP3
 MESON_ARGS+=		-Dsoup=soup3
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/etc/asciidoc|${PYTHONPREFIX_SITELIBDIR}/asciidoc/resources|' \
 		${WRKSRC}/docs/manpages/meson.build
 
 .include <bsd.port.post.mk>
diff --git a/textproc/R-cran-stringi/Makefile b/textproc/R-cran-stringi/Makefile
index 18a60207ec96..aad93ce68c60 100644
--- a/textproc/R-cran-stringi/Makefile
+++ b/textproc/R-cran-stringi/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	stringi
 DISTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Character String Processing Facilities
 WWW=		http://www.gagolewski.com/software/stringi/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=		compiler:c++17-lang cran:auto-plist,compiles pkgconfig:build
 
 .include <bsd.port.mk>
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 45fafb66be34..3ffeb4f634a7 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	apertium
 PORTVERSION=	3.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Toolbox to build shallow-transfer machine translation systems
 WWW=		https://www.apertium.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		utf8cpp>=4.0.0:devel/utf8cpp
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		liblttoolbox.so:textproc/lttoolbox
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake gnome libtool localbase:ldflags pathfix \
 		pkgconfig python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	apertium:contrib
 GH_PROJECT=	apertium-get:contrib
 GH_SUBDIR=	apertium/apertium-get:contrib
 GH_TAGNAME=	74d7d35:contrib
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	apertium/apertium-get/apertium-get.sh scripts/apertium-editdist \
 		scripts/apertium-filter-dix.in scripts/apertium-filter-rules.in \
 		scripts/apertium-filter-xml scripts/apertium-genvdix \
 		scripts/apertium-genvldix scripts/apertium-genvrdix \
 		scripts/apertium-metalrx scripts/apertium-metalrx-to-lrx.in \
 		scripts/apertium-translate-to-default-equivalent.in
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 CFLAGS+=	-I${LOCALBASE}/include/utf8cpp
 
 .include <bsd.port.mk>
diff --git a/textproc/cg3/Makefile b/textproc/cg3/Makefile
index 0bb4039c35a3..9faf9e151420 100644
--- a/textproc/cg3/Makefile
+++ b/textproc/cg3/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	cg3
 DISTVERSION=	1.3.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/GrammarSoft/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tools for the Constraint Grammar formalism
 WWW=		https://visl.sdu.dk/constraint_grammar.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libicuuc.so:devel/icu
 
 USES=		cmake pathfix perl5 shebangfix tar:bz2
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	scripts/cg-sort scripts/cg-strictify scripts/cg-untrace \
 		scripts/cg3-autobin.pl.in
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/D_POSIX_C_SOURCE/d' \
 		${WRKSRC}/CMakeLists.txt
 
 post-patch-OPTIMIZED_CFLAGS-off:
 	@${REINPLACE_CMD} -e 's| -O3||g' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index da500ab51171..75527c6f4507 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	dwdiff
 PORTVERSION=	2.1.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	https://os.ghalkes.nl/dist/ \
 		http://fossies.org/unix/privat/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Delimited word diff program
 WWW=		https://os.ghalkes.nl/dwdiff.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:bz2
 
 OPTIONS_DEFINE=	UNICODE NLS DOCS
 OPTIONS_DEFAULT=UNICODE
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_WITH=	gettext
 NLS_USES=	gettext localbase:ldflags
 NLS_CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -lintl"
 
 UNICODE_CONFIGURE_WITH=	unicode
 UNICODE_LIB_DEPENDS=	libicudata.so:devel/icu
 UNICODE_USES=	localbase:ldflags pkgconfig
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-verbose-compile
 MAKE_ARGS+=	prefix=${PREFIX:Q} mandir="${PREFIX}/share/man" docdir=${DOCSDIR:Q}
 
 .include <bsd.port.mk>
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 0e062a4edc46..457ea3d8c958 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	gitlab-elasticsearch-indexer
 PORTVERSION=	5.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Elasticsearch indexer for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	git>=2.38.1:devel/git
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu
 #RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
 USES=		gmake go:modules,no_targets,1.22 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GO_MOD_DIST=	gitlab
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-elasticsearch-indexer
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 # add a git tag, as that is required by the build script
 pre-build:
 	cd ${WRKSRC} && \
 		git init && \
 		git config user.email "${MAINTAINER}" && \
 		git config user.name "Matthias Fechner" && \
 		git add . && \
 		git commit -m "tag" && \
 		git tag v${PORTVERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/gspell/Makefile b/textproc/gspell/Makefile
index f65bd49a2cd8..bf366472652e 100644
--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	gspell
 PORTVERSION=	1.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Spell checking for GTK
 WWW=		https://gitlab.gnome.org/GNOME/gspell
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libfribidi.so:converters/fribidi \
 		libicudata.so:devel/icu
 
 USES=		gmake gnome iconv libtool pathfix pkgconfig tar:xz vala:build
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 libxml2 pango \
 		introspection:build
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index 68866a8e40a7..98479558b731 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	libe-book
 DISTVERSION=	0.1.3
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	textproc
 MASTER_SITES=	SF/libebook/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library for import of reflowable e-book formats
 WWW=		https://sourceforge.net/projects/libebook/
 
 LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string/classification.hpp:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		liblangtag.so:devel/liblangtag \
 		librevenge-0.0.so:textproc/librevenge
 
 USES=		autoreconf compiler:c++11-lib gmake gnome gperf libtool \
 		localbase pathfix pkgconfig tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	*
 
 CPPFLAGS+=	-DBOOST_ERROR_CODE_HEADER_ONLY
 
 CONFIGURE_ARGS=	--disable-werror --disable-tests
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_OFF=	--without-docs
 
 .include <bsd.port.mk>
diff --git a/textproc/libfolia/Makefile b/textproc/libfolia/Makefile
index 76c597e33792..350f374ad3ee 100644
--- a/textproc/libfolia/Makefile
+++ b/textproc/libfolia/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	libfolia
 DISTVERSION=	2.21
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/LanguageMachines/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for FoLiA, a format for annotated language resources
 WWW=		https://proycon.github.io/folia/ \
 		https://github.com/proycon/folia
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libticcutils.so:devel/ticcutils
 
 USES=		autoreconf compiler:c++17-lang gmake gnome libtool \
 		pathfix pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/textproc/libqxp/Makefile b/textproc/libqxp/Makefile
index 05469100d631..7de2e11a7e37 100644
--- a/textproc/libqxp/Makefile
+++ b/textproc/libqxp/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	libqxp
 DISTVERSION=	0.0.0
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	textproc
 MASTER_SITES=	https://dev-www.libreoffice.org/src/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for parsing QuarkXPress documents
 WWW=		https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 
 LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs
 LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge \
 		libicui18n.so:devel/icu
 
 USES=		autoreconf compiler:c++11-lang libtool localbase pathfix \
 		pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 PORTDOCS=	*
 
 CONFIGURE_ARGS=	--disable-werror
 
 OPTIONS_DEFINE=	DOCS DOXYGEN TEST
 OPTIONS_SUB=	yes
 
 TEST_LIB_DEPENDS=	libcppunit.so:devel/cppunit
 TEST_CONFIGURE_ENABLE=	tests
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=	--without-docs
 DOXYGEN_IMPLIES=	DOCS
 
 .include <bsd.port.mk>
diff --git a/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index 9751b39daf30..62910bdae2e4 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	libvisio
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	LODEV/${PORTNAME}
 PKGNAMESUFFIX=	01
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library and tools for parsing the visio file format structure
 WWW=		https://wiki.documentfoundation.org/DLP/Libraries/libvisio
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.MPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		librevenge-0.0.so:textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-tests --disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lib gmake gnome gperf libtool pathfix perl5 \
 		pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_GNOME=	libxml2
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	LIBVERSION=1.0.${PORTVERSION:E}
 
 .include <bsd.port.mk>
diff --git a/textproc/lttoolbox/Makefile b/textproc/lttoolbox/Makefile
index c97b720746fd..927a1d29c40a 100644
--- a/textproc/lttoolbox/Makefile
+++ b/textproc/lttoolbox/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	lttoolbox
 DISTVERSION=	3.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/apertium/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for lexical, morphological analysis and generation of words
 WWW=		https://wiki.apertium.org/wiki/Lttoolbox
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	utf8cpp>=4.0.3:devel/utf8cpp
 LIB_DEPENDS=	libicuio.so:devel/icu
 
 USES=		autoreconf compiler:c++14-lang gnome libtool pathfix pkgconfig \
 		tar:bz2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 INSTALL_TARGET=	install-strip
 
 CFLAGS+=	-I${LOCALBASE}/include/utf8cpp
 LDFLAGS+=	-lpthread
 
 .include <bsd.port.mk>
diff --git a/textproc/lua-icu-utils/Makefile b/textproc/lua-icu-utils/Makefile
index 8d3fa4ec4911..577edde0fe0c 100644
--- a/textproc/lua-icu-utils/Makefile
+++ b/textproc/lua-icu-utils/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	icu-utils
 DISTVERSION=	0.0-20220329
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Lua interface to selected ICU utilities
 WWW=		https://github.com/adam-stanek/lua_icu_utils
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=		gmake lua:module
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	adam-stanek
 GH_PROJECT=	lua_icu_utils
 GH_TAGNAME=	431dda1de
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include
 LDFLAGS+=	-shared -L${LOCALBASE}/lib
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LUA_INCDIR="${LUA_INCDIR}"
 
 PLIST_FILES=	${LUA_MODLIBDIR}/icu_utils.so
 PORTDOCS=	README.md
 
 DOCSDIR=	${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/icu_utils.so ${STAGEDIR}${LUA_MODLIBDIR}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile
index 17029a5bbd7a..eb5d8a9e6a93 100644
--- a/textproc/nuspell/Makefile
+++ b/textproc/nuspell/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	nuspell
 PORTVERSION=	5.1.6
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast and safe spellchecking C++ library
 WWW=		https://nuspell.github.io/ \
 		https://github.com/nuspell/nuspell
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 TEST_DEPENDS=	catch2>=3.1.1:devel/catch2
 
 USES=		cmake:testing compiler:c++17-lang
 
 CMAKE_OFF=	BUILD_TESTING
 CMAKE_ON=	BUILD_SHARED_LIBS BUILD_TOOLS
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_EXCLUDE_i386=	MANPAGES # https://github.com/haskell-foundation/foundation/issues/565
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
 MANPAGES_CMAKE_BOOL=	BUILD_DOCS
 
 post-extract:
 	@${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/nuspell/finder.cxx
 
 .include <bsd.port.mk>
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 2f07a42000d1..4b045be2cbdb 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	raptor2
 DISTVERSION=	2.0.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	https://download.librdf.org/source/
 
 PATCH_SITES=	https://github.com/dajobe/raptor/commit/
 PATCHFILES=	4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 WWW=		https://librdf.org/raptor/
 
 # Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
 # of its licenses is "GPLv2 or newer", which includes GPLv3.
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libyajl.so:devel/yajl
 
 CONFLICTS=	raptor-1.4.1[0-9]* raptor-1.4.21
 
 USES=		gnome libtool:keepla localbase pathfix pkgconfig
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-charlock_holmes/Makefile b/textproc/rubygem-charlock_holmes/Makefile
index a12c9e2018df..857b6fbdfcd2 100644
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	charlock_holmes
 PORTVERSION=	0.7.9
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Provide binary and text detection as well as text transcoding using libicu
 WWW=		https://github.com/brianmario/charlock_holmes
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=		gem
 
 CONFIGURE_ARGS=	--with-icu-include=${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/textproc/ucto/Makefile b/textproc/ucto/Makefile
index 74fe712d5560..77c5e7076688 100644
--- a/textproc/ucto/Makefile
+++ b/textproc/ucto/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	ucto
 DISTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/LanguageMachines/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Advanced rule-based (regular-expression) and unicode-aware tokenizer
 WWW=		https://languagemachines.github.io/ucto/ \
 		https://github.com/LanguageMachines/ucto
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	uctodata>0:textproc/uctodata
 LIB_DEPENDS=	libexttextcat-2.0.so:textproc/libexttextcat \
 		libfolia.so:textproc/libfolia \
 		libicuio.so:devel/icu \
 		libticcutils.so:devel/ticcutils
 RUN_DEPENDS=	uctodata>0:textproc/uctodata
 
 USES=		compiler:c++11-lang gmake gnome libedit libtool \
 		pathfix pkgconfig readline
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 TEST_TARGET=	check
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-static
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-g -O3||g' \
 		${PATCH_WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 6e84caf3202c..77d86ebbcdfe 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -1,112 +1,112 @@
 PORTNAME=	zorba
 PORTVERSION=	2.7.0
-PORTREVISION=	41
+PORTREVISION=	42
 CATEGORIES=	textproc java
 MASTER_SITES=	https://launchpadlibrarian.net/119058962/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose C++ XQuery processor
 WWW=		http://www.zorba.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 DEPRECATED=	Unmaintained, outdated and fails to build with ICU 76.1
 EXPIRATION_DATE=2025-02-28
 
 LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3 \
 		libicudata.so:devel/icu \
 		libcurl.so:ftp/curl \
 		libtidy5.so:www/tidy-html5 \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	fop:textproc/fop
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS DOXYGEN
 OPTIONS_SUB=	yes
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_BUILD_DEPENDS+=	doxygen:devel/doxygen
 JAVA_CATEGORIES=	java
 JAVA_USES=		java
 JAVA_CMAKE_BOOL=	WITH_JAVA
 JAVA_CMAKE_ON=	-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
 JAVA_CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 JAVA_VARS=		WITH_SWIG=yes
 PHP_CMAKE_BOOL=		WITH_PHP5
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 RUBY_CMAKE_BOOL=	WITH_RUBY
 
 # Both install include/xqc.h
 CONFLICTS=	xqilla
 CONFLICTS_BUILD=	bison
 
 USES=		cmake compiler:c++11-lib gnome libedit
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 CXXFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 CXXFLAGS+=	-I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		-DLOCALBASE:STRING=${LOCALBASE}
 
 MAKE_JOBS_UNSAFE=	yes # due to consistent failures in bison-generated code compilation
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB+=	FULLVERSION=${PORTVERSION} \
 		MIDVERSION=${PORTVERSION:R} \
 		MINVERSION=${PORTVERSION:R:R}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPHP}
 USE_PHP=	tokenizer
 USES+=		php:build
 WITH_SWIG=	yes
 CMAKE_ARGS+=	-DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}"
 PLIST_SUB+=	PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}"
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 WITH_SWIG=	yes
 CMAKE_ARGS+=	-DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
 BROKEN=		Does not stage
 .endif
 
 .if ${PORT_OPTIONS:MRUBY}
 USES+=	ruby
 WITH_SWIG=	yes
 .endif
 
 .if defined(WITH_SWIG)
 BUILD_DEPENDS+=	swig:devel/swig
 .endif
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/cmake_modules/FindPHP5.cmake
 
 post-patch-DOCS-on:
 	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(doc)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install:
 	${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
 
 post-install-DOCS-on:
 .if !${PORT_OPTIONS:MDOXYGEN}
 	cd ${STAGEDIR}${DOCSDIR} && ${RMDIR} c/html code/html code cxx/html zorba/html zorba/xqdoc zorba
 .endif
 
 test:	build
 	cd ${BUILD_WRKSRC} && ${MAKE} test
 
 .include <bsd.port.mk>
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 041d1d8dbf52..6daf3267689b 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,382 +1,383 @@
 PORTNAME=	chromium
 PORTVERSION=	132.0.6834.159
+PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		https://nerd.hu/distfiles/:external \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio
 
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Google web browser based on WebKit
 WWW=		https://www.chromium.org/Home
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 		bindgen:devel/rust-bindgen-cli \
 		gperf:devel/gperf \
 		flock:sysutils/flock \
 		node:www/node \
 		rustc:lang/rust \
 		xcb-proto>0:x11/xcb-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/va/va.h:multimedia/libva \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets
 
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libspeechd.so:accessibility/speech-dispatcher \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libcairo.so:graphics/cairo \
 		libdrm.so:graphics/libdrm \
 		libexif.so:graphics/libexif \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic
 
 USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
 		python:build qt:5 shebangfix tar:xz xorg
 
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_GL=		gbm gl
 USE_GNOME=	atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
 USE_QT=		buildtools:build
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper #buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} \
 		moc=${PREFIX}/bin/moc-qt5
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
 #
 # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		enable_widevine=true \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 # FreeBSD Chromium Api Key
 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 # Note: these are for FreeBSD use ONLY. For your own distribution,
 # please get your own set of keys.
 GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8"
 
 SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 
 PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 WIDEVINE_DESC=		Depend on foreign-cdm to enable playback of DRM content
 WIDEVINE_RUN_DEPENDS=	foreign-cdm>0:www/foreign-cdm
 
 .include "Makefile.tests"
 TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
 TEST_ALL_TARGET=	${TEST_TARGETS}
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk> # for COMPILER_VERSION
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 LLVM_DEFAULT=		19
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 
 # - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
 # - map ffmpeg target to ${ARCH}
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == amd64
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == i386
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 # rust
 RUSTC_VERSION!=	rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig harfbuzz-ng libdrm libevent libpng \
 		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/rust/rust_bindgen.gni \
 		${WRKSRC}/build/rust/rust_bindgen_generator.gni
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
 		${STAGEDIR}${PREFIX}/share/man/man1/chrome.1
 	@${SED} -i "" -e 's,\@\@PACKAGE\@\@,chromium,g;s,\@\@MENUNAME\@\@,Chromium Web Browser,g' \
 		${STAGEDIR}${PREFIX}/share/man/man1/chrome.1
 	${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png
 .for s in 22 24 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
 .for d in protoc mksnapshot
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 .for d in snapshot_blob.bin v8_context_snapshot.bin
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
 
 	# ANGLE, EGL, Vk
 .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \
 		${STAGEDIR}${DATADIR}/libvulkan.so
 .if ${BUILDTYPE} == Debug
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR}
 .endif
 
 	# SwiftShader
 .if ${ARCH} != aarch64
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/vk_swiftshader_icd.json ${STAGEDIR}${DATADIR}
 .endif
 
 post-install-DEBUG-on:
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
 		${STAGEDIR}${DATADIR}
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
 		${STAGEDIR}${PREFIX}/bin/chromedriver
 
 do-test-TEST-on:
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
 		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/www/envoy/Makefile b/www/envoy/Makefile
index 6a78b68526e9..a3abb5ca0c27 100644
--- a/www/envoy/Makefile
+++ b/www/envoy/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	envoy
 PORTVERSION=	1.26.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	https://storage.googleapis.com/quiche-envoy-integration/:gurl
 DISTFILES=	dd4080fec0b443296c0ed0036e1e776df8813aa7${EXTRACT_SUFX}:gurl
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Edge and service proxy for cloud-native applications
 WWW=		https://www.envoyproxy.io/
 
 LICENSE=	APACHE20
 
 BROKEN_SSL=	base openssl libressl libressl-devel
 BROKEN_SSL_REASON=	requires BoringSSL
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/grpc:patch \
 		${NONEXISTENT}:devel/protobuf:patch \
 		${LOCALBASE}/include/flatbuffers/reflection.h:devel/flatbuffers \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \
 		${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog \
 		${LOCALBASE}/include/tclap/CmdLine.h:devel/tclap12
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libcircllhist.so:devel/libcircllhist \
 		libcurl.so:ftp/curl \
 		libevent.so:devel/libevent-devel \
 		libfmt.so:devel/libfmt \
 		libgpr.so:devel/grpc \
 		libicuuc.so:devel/icu \
 		libnghttp2.so:www/libnghttp2 \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2 \
 		libxxhash.so:devel/xxhash \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++17-lang cpe gmake python:build shebangfix ssl
 CPE_VENDOR=	${PORTNAME}proxy
 SHEBANG_FILES=	examples/*/verify.sh examples/grpc-bridge/client/client.py \
 		examples/shared/postgres/docker-healthcheck.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}proxy bufbuild:pgv cncf:xds googleapis:gapis \
 		census-instrumentation:ocp prometheus:pcm google:quiche \
 		open-telemetry:otp google:cel
 GH_PROJECT=	protoc-gen-validate:pgv xds:xds googleapis:gapis \
 		opencensus-proto:ocp client_model:pcm quiche:quiche \
 		opentelemetry-proto:otp cel-cpp:cel
 GH_TAGNAME=	v0.10.1:pgv 46e39c7:xds 114a745:gapis v0.4.1:ocp 147c58e:pcm \
 		37de4f7:quiche v0.19.0:otp 11f9d66:cel
 
 _GRPC_WRKSRC=		${MAKE} -C ${PORTSDIR}/devel/grpc -V WRKSRC
 _PROTOBUF_WRKSRC=	${MAKE} -C ${PORTSDIR}/devel/protobuf -V WRKSRC
 
 PLIST_FILES=	bin/envoy
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-extract:
 	${LN} -s \
 		 ../../client_model-147c58e/io \
 		 ../../googleapis-114a745/google \
 		 ../../opencensus-proto-0.4.1/src/opencensus \
 		 ../../opentelemetry-proto-0.19.0/opentelemetry \
 		 ../../protoc-gen-validate-0.10.1/validate \
 		 ../../xds-46e39c7/udpa ../../xds-46e39c7/xds \
 		 ${_GRPC_WRKSRC:sh}/src ${WRKSRC}/api
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,__APPLE__,__${OPSYS}__,' \
 		${WRKSRC}/source/common/network/address_impl.cc
 	@${REINPLACE_CMD} -e 's,O_SYMLINK,O_NOFOLLOW,' \
 		${WRKSRC}/source/common/filesystem/kqueue/watcher_impl.cc
 	@${REINPLACE_CMD} -e '/opentracing::v/s,v2,v3,' \
 		${WRKSRC}/source/extensions/tracers/common/ot/opentracing_driver_impl.cc
 	@${REINPLACE_CMD} -e '23s,^,#include "absl/status/status.h",' \
 		${WRKDIR}/cel-cpp-11f9d66/eval/public/ast_traverse.cc
 	@${REINPLACE_CMD} -e '/^#include "eval\/testutil\/test_message/d' \
 		${WRKDIR}/cel-cpp-11f9d66/eval/public/structs/cel_proto_wrap_util.cc
 
 do-configure:
 	${ECHO_CMD} '#define BUILD_VERSION_NUMBER "${PORTVERSION}"' \
 		> ${WRKSRC}/source/common/version/version_number.h
 	cd ${WRKSRC} && PYTHONPATH=. ${PYTHON_CMD} \
 		tools/api_versioning/generate_api_version_header.py \
 		API_VERSION.txt > \
 		${WRKSRC}/source/common/version/api_version_number.h
 	${LN} -s kqueue/watcher_impl.h posix/filesystem_impl.h \
 		posix/directory_iterator_impl.h \
 		${WRKSRC}/source/common/filesystem
 	${LN} -s posix/os_sys_calls_impl.h ${WRKSRC}/source/common/api
 	${LN} -s posix/signal_impl.h ${WRKSRC}/source/common/event
 	${LN} -s posix/thread_impl.h ${WRKSRC}/source/common/common
 	${LN} -s standard/logger_impl.h ${WRKSRC}/source/common/common
 	${LN} -s ../../quiche-37de4f7/quiche ${WRKSRC}/source
 	${LN} -s source/common/quic/platform ${WRKSRC}/quiche_platform_impl
 	${LN} -s ${_PROTOBUF_WRKSRC:sh}/src/google ${WRKDIR}
 
 do-build:
 	${MAKE_CMD} -C ${WRKSRC} -f ${FILESDIR}/makefile-genproto
 	${MAKE_CMD} ${_MAKE_JOBS} -C ${WRKSRC}/source \
 		-f ${FILESDIR}/makefile-main all
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/source/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -a ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 1f2623fcf0d1..ea2c81cff638 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	epiphany
 PORTVERSION=	42.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extremely lightweight and simple web browser for GNOME
 WWW=		https://www.gnome.org/projects/epiphany/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		iso-codes>=0:misc/iso-codes \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libgcr-base-3.so:security/gcr3 \
 		libgmp.so:math/gmp \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libicuuc.so:devel/icu \
 		libjson-glib-1.0.so:devel/json-glib \
 		libnettle.so:security/nettle \
 		libnotify.so:devel/libnotify \
 		libnss3.so:security/nss \
 		libp11-kit.so:security/p11-kit \
 		libsecret-1.so:security/libsecret \
 		libsoup-3.0.so:devel/libsoup3 \
 		libstartup-notification-1.so:x11/startup-notification \
 		libwebkit2gtk-4.1.so:www/webkit2-gtk@41
 RUN_DEPENDS=	gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
 		gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		iso-codes>=0:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome \
 		libarchive localbase:ldflags meson pkgconfig python \
 		shebangfix sqlite tar:xz xorg
 
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3 intlhack libwnck3 libxml2 libxslt
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Db_lundef=false \
 		-Dunit_tests=disabled
 GLIB_SCHEMAS=	org.gnome.Epiphany.enums.xml \
 		org.gnome.epiphany.gschema.xml
 SHEBANG_FILES=	post_install.py
 
 PLIST_SUB+=	EPHY_VERSION=${PORTVERSION:R}
 
 .include <bsd.port.mk>
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 86ced1348738..7cb3f3cf1901 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	firefox
 DISTVERSION=	128.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.101:security/nss \
 		icu>=73.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding \
 		--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f800754e7706..5d290d200092 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	firefox
 DISTVERSION=	135.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.107:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.1.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.44:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.15.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 USE_MOZILLA=	-sqlite
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 
 USES=		tar:xz
 # helpful when testing beta
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding \
 		--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 0e45c2ee58aa..fe1408ddbb53 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,357 +1,357 @@
 PORTNAME=	iridium
 PORTVERSION=	2024.11.131.1
-PORTREVISION=	1
+PORTREVISION=	2
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://downloads.iridiumbrowser.de/source/ \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	-browser
 
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio
 
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Iridium browser
 WWW=		https://iridiumbrowser.de/
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 		bindgen:devel/rust-bindgen-cli \
 		gperf:devel/gperf \
 		flock:sysutils/flock \
 		node:www/node \
 		rustc:lang/rust \
 		xcb-proto>0:x11/xcb-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/va/va.h:multimedia/libva \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets
 
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libspeechd.so:accessibility/speech-dispatcher \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libcairo.so:graphics/cairo \
 		libdrm.so:graphics/libdrm \
 		libexif.so:graphics/libexif \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic
 
 USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
 		python:build qt:5 shebangfix tar:xz xorg
 
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_GL=		gbm gl
 USE_GNOME=	atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
 USE_QT=		buildtools:build
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} \
 		moc=${PREFIX}/bin/moc-qt5
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
 #
 # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		chrome_pgo_phase=0 \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_log_error_not_reached=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 SUB_FILES=	iridium-browser.desktop iridium
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG KERBEROS LTO PIPEWIRE
 OPTIONS_DEFAULT=	CODECS CUPS KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 
 PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk> # for COMPILER_VERSION
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 LLVM_DEFAULT=		18
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 
 # - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
 # - map ffmpeg target to ${ARCH}
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == amd64
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == i386
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 # rust
 RUSTC_VERSION!=	rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Iridium, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig harfbuzz-ng icu libdrm libevent libpng \
 		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Iridium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/rust/rust_bindgen.gni
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
 		${STAGEDIR}${PREFIX}/share/man/man1/iridium.1
 	@${SED} -i "" -e 's,\@\@PACKAGE\@\@,chromium,g;s,\@\@MENUNAME\@\@,Iridium Web Browser,g' \
 		${STAGEDIR}${PREFIX}/share/man/man1/iridium.1
 	${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png
 .for s in 22 24 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/iridium.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
 .for d in protoc mksnapshot
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 .for d in snapshot_blob.bin v8_context_snapshot.bin
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}/iridium
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/iridium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin
 
 	# ANGLE, EGL, Vk
 .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \
 		${STAGEDIR}${DATADIR}/libvulkan.so
 .if ${BUILDTYPE} == Debug
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR}
 .endif
 
 	# SwiftShader
 .if ${ARCH} != aarch64
 	@${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/vk_swiftshader_icd.json ${STAGEDIR}${DATADIR}
 .endif
 
 post-install-DEBUG-on:
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
 		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index 950659eb28ac..1657cdae6b94 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,100 +1,101 @@
 PORTNAME=	librewolf
 DISTVERSION=	135.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-1.source
 CATEGORIES=	www wayland
 MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}-1/
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Custom version of Firefox, focused on privacy, security and freedom
 WWW=		https://librewolf.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	error: could not compile `gkrust` (lib)
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.107:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.1.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.44:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.15.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 
 USE_GECKO=	gecko
 USE_MOZILLA=	-sqlite
 
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	MOZ_REQUIRE_SIGNING=""
 #CFLAGS_powerpc64=	-DHWY_COMPILE_ONLY_SCALAR
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-1
 
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
 		MOZ_APP_NAME="${MOZILLA}"
 
 MOZ_OPTIONS=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
 		--disable-default-browser-agent \
 		--disable-tests \
 		--disable-updater \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
 		--with-app-name=${MOZILLA} \
 		--with-branding=browser/branding/${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
 		--enable-bootstrap \
 		--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		-e 's|firefox|${MOZILLA}|' \
 		-e 's|Firefox|${MOZILLA_CAP}|' \
 		<${.CURDIR}/../firefox/files/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 	@${RM} ${WRKSRC}/mozconfig
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
index daea704a7ee4..3fe7db52c18d 100644
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -1,263 +1,263 @@
 PORTNAME=	onlyoffice-documentserver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.2.0.143
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES+=	LOCAL/mikael/v8/:source1 \
 		LOCAL/mikael/onlyoffice/:source2 \
 		https://nodejs.org/dist/v${NODE_VERSION_PKGFETCH}/:source3 \
 		SF/optipng/OptiPNG/optipng-0.7.7/:source4
 DISTFILES+=	v8-8.9.255.25_all.tar.gz:source1 \
 		node-v${NODE_VERSION_PKGFETCH}.tar.gz:source3 \
 		optipng-0.7.7.tar.gz:source4 \
 		${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz:source2
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Secure office and productivity apps
 WWW=		https://www.onlyoffice.com/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=	fails to build
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		boost-libs>0:devel/boost-libs \
 		glib>=2.54:devel/glib20 \
 		gn:devel/gn \
 		java:java/openjdk11 \
 		ninja:devel/ninja \
 		npm:www/npm-node18 \
 		${LOCALBASE}/lib/libcrypto.a:security/openssl
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libharfbuzz.so:print/harfbuzz \
 		libiconv.so:converters/libiconv \
 		libicutu.so:devel/icu
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR} \
 		gsed:textproc/gsed \
 		nginx:www/nginx \
 		pwgen:sysutils/pwgen \
 		rabbitmq>0:net/rabbitmq \
 		webfonts>=0:x11-fonts/webfonts
 
 USES=		autoreconf:build dos2unix fakeroot gmake gnome iconv localbase nodejs:18,build pkgconfig \
 		python:3.9+,build qt:5 trigger
 USE_QT=		qmake:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	ONLYOFFICE
 GH_PROJECT=	DocumentServer
 GH_TAGNAME=	v${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
 GH_TUPLE=	ONLYOFFICE:core:v${DISTVERSION}:core/core \
 		ONLYOFFICE:core-fonts:v${DISTVERSION}:corefonts/core-fonts \
 		ONLYOFFICE:dictionaries:v${DISTVERSION}:dictionaries/dictionaries \
 		ONLYOFFICE:document-server-integration:v${DISTVERSION}:dsi/document-server-integration \
 		ONLYOFFICE:document-templates:v${DISTVERSION}:dt/document-templates \
 		ONLYOFFICE:sdkjs:v${DISTVERSION}:sdkjs/sdkjs \
 		ONLYOFFICE:server:v${DISTVERSION}:server/server \
 		ONLYOFFICE:web-apps:v${DISTVERSION}:webapps/web-apps \
 		ONLYOFFICE:build_tools:v${DISTVERSION}:buildtools/build_tools \
 		ONLYOFFICE:DocumentBuilder:626d1e44db3d06ceb8298215a67ef0475912d89a:document_builder/DocumentBuilder \
 		ONLYOFFICE:onlyoffice.github.io:b26d001664d771df4f663d2d3ba7dd4a188b6cab:sdkjs_plugins_v1/onlyoffice.github.io \
 		ONLYOFFICE:document-server-package:v${DISTVERSION}:dsp/document-server-package \
 		jasenhuang:katana-parser:be6df45:jasenhuang_katana/core/Common/3dParty/html/katana-parser \
 		google:gumbo-parser:aa91b27:google_gumbo/core/Common/3dParty/html/gumbo-parser \
 		hunspell:hyphen:73dd296:hunspell_hyphen/core/Common/3dParty/hyphen/hyphen
 
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL
 OPTIONS_DEFAULT=	PGSQL
 
 MYSQL_USES+=	mysql:client
 PGSQL_USES+=	pgsql
 PGSQL_VARS=	WANT_PGSQL=client
 
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		strip=true
 USE_LDCONFIG=	yes
 
 WWWDIR=		${PREFIX}/www/onlyoffice
 ETCDIR=		${PREFIX}/etc/onlyoffice
 
 DS_USERNAME=	onlyoffice
 DS_GROUPNAME=	onlyoffice
 
 USERS=		${DS_USERNAME}
 GROUPS=		${DS_GROUPNAME}
 
 PLIST_SUB=	DS_GROUPNAME=${DS_GROUPNAME} \
 		DS_USERNAME=${DS_USERNAME}
 SUB_FILES=	pkg-message \
 		onlyoffice.newsyslog.sample
 SUB_LIST=	DS_GROUPNAME=${DS_GROUPNAME} \
 		DS_USERNAME=${DS_USERNAME} \
 		ETCDIR=${ETCDIR} \
 		PREFIX=${PREFIX} \
 		WWWDIR=${WWWDIR}
 
 # node version used with "npm install @yao-pkg/pkg@5.11.1"
 # keep in sync with patch-build__tools_scripts_build__server.py and patch-document-server-package_Makefile
 NODE_VERSION_PKGFETCH=	18.18.2
 
 MAKE_ENV=	BUILD_NUMBER="36" \
 		PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \
 		PRODUCT_VERSION=${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} \
 		BUILD_NUMBER=${DISTVERSION:C/^[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+)/\1/}
 
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 DOS2UNIX_FILES=	document-server-package/common/documentserver/nginx/includes/http-common.conf.m4
 
 CONFLICTS_BUILD=devel/googletest
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == aarch64
 BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=	cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 		cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 		c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 		ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 		nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 		ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 .endif
 
 post-extract:
 	@${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8_89
 
 	@${MKDIR} ${WRKDIR}/.pkg-cache/node
 	@${CP} ${DISTDIR}/node-v${NODE_VERSION_PKGFETCH}.tar.gz ${WRKDIR}/.pkg-cache/node
 
 	@${MKDIR} ${WRKSRC}/sdkjs-plugins/v1
 	@${CP} ${WRKSRC}/onlyoffice.github.io/sdkjs-plugins/v1/* ${WRKSRC}/sdkjs-plugins/v1
 
 	@${MV} ${WRKSRC}/server/Common/config/production-linux.json ${WRKSRC}/server/Common/config/production-freebsd.json
 	@${MV} ${WRKSRC}/server/Common/config/development-linux.json ${WRKSRC}/server/Common/config/development-freebsd.json
 
 	# linux has moved to systemd init files, continue to using supervisord for now
 	${MKDIR} ${WRKSRC}/document-server-package/common/documentserver/supervisor
 .for i in ds-converter.conf ds-docservice.conf ds-metrics.conf ds.conf
 	${CP} ${FILESDIR}/${i} \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/build_tools/tools/freebsd/automate.py \
 		${WRKSRC}/core/Common/3dParty/boost/boost.pri \
 		${WRKSRC}/core/Common/3dParty/icu/icu.pri \
 		${WRKSRC}/core/Common/3dParty/openssl/openssl.pri \
 		${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/core/Common/3dParty/v8_89/v8/buildtools/third_party/libc++/BUILD.gn \
 		${WRKSRC}/core/DesktopEditor/fontengine/ApplicationFonts.cpp \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-generate-allfonts.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-jwt-status.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-pluginsmanager.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-static-gzip.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4 \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-converter.conf \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-docservice.conf \
 		${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-metrics.conf
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%CXX%%|${CXX}|' \
 		${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/core/Common/base.pri
 	@${REINPLACE_CMD} 's|%%WRKDIR%%|${WRKDIR}|' \
 		${WRKSRC}/document-server-package/Makefile
 	@${REINPLACE_CMD} 's|%%WRKSRC%%|${WRKSRC}|' \
 		${WRKSRC}/build_tools/scripts/build_js.py \
 		${WRKSRC}/build_tools/scripts/build_server.py \
 		${WRKSRC}/document-server-package/Makefile
 	@${REINPLACE_CMD} -e 's|/var/lib|/var/db|' -e 's|/var/www|${LOCALBASE}/www|' \
 			  -e 's|/usr/share|${LOCALBASE}/share|' -e 's|/etc|${LOCALBASE}/etc|' \
 		${WRKSRC}/server/Common/config/production-freebsd.json \
 		${WRKSRC}/server/Common/config/development-freebsd.json
 	@${REINPLACE_CMD} 's|%%DISTDIR%%|${DISTDIR}|' \
 		${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%ETCDIR%%|${ETCDIR}|' \
 		${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4 \
 		${WRKSRC}/document-server-package/Makefile
 	@${RM} ${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch.orig
 
 	@${FIND} ${WRKSRC}/server -type f -name npm-shrinkwrap.json -delete
 
 	@${ECHO} "# Generated from 'DEPS'" > ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni
 	@${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni
 
 do-build:
 	${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKDIR}/.bin/npm
 
 	@cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install patch-package
 	@cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install optipng-bin@5.1.0
 	@cd ${WRKSRC}/web-apps/build ; node_modules/.bin/patch-package
 	@cd ${WRKSRC}/web-apps/build/node_modules/optipng-bin ; ${SETENV} ${MAKE_ENV} npm run postinstall optipng-bin
 
 	@cd ${WRKSRC}/server ; ${SETENV} ${MAKE_ENV} npm install grunt-cli
 	@cd ${WRKSRC}/server ; ${SETENV} ${MAKE_ENV} npm install grunt
 	@cd ${WRKSRC}/sdkjs  ; ${SETENV} ${MAKE_ENV} npm install grunt-cli
 	@cd ${WRKSRC}/sdkjs  ; ${SETENV} ${MAKE_ENV} npm install grunt
 
 	@${MKDIR} ${WRKSRC}/yao-pkg
 	@${CP} ${FILESDIR}/package* ${WRKSRC}/yao-pkg
 	@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @yao-pkg/pkg@5.11.1
 
 	@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_lib-es5_build.js || ${TRUE}
 	@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_patches_node.v${NODE_VERSION_PKGFETCH}.cpp.patch || ${TRUE}
 
 	cd ${WRKSRC}/build_tools/tools/freebsd ; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} automate.py
 	cd ${WRKSRC}/document-server-package ; ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd
 
 do-install:
 # install the project
 # do not strip docservice, converter, metrics and json
 	cd ${WRKSRC}/document-server-package/common/documentserver/home && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/documentserver
 	${INSTALL_SCRIPT} ${WRKSRC}/document-server-package/common/documentserver/bin/*.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/all* ${STAGEDIR}${WWWDIR}/documentserver/server/tools
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/x2t ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/docbuilder ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/pluginsmanager ${STAGEDIR}${WWWDIR}/documentserver/server/tools
 	${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/home/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm
 	${INSTALL_LIB} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/*.so ${STAGEDIR}${PREFIX}/lib
 	${RM} ${STAGEDIR}${PREFIX}/bin/documentserver-letsencrypt.sh
 
 # install conf
 	${MKDIR} ${STAGEDIR}${ETCDIR}/documentserver/supervisor \
 		 ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes \
 		 ${STAGEDIR}${ETCDIR}/documentserver/logrotate
 	${RM} ${WRKSRC}/document-server-package/common/documentserver/config/*-mac.json ${WRKSRC}/document-server-package/common/documentserver/config/*-windows.json
 	cd ${WRKSRC}/document-server-package/common/documentserver/supervisor && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/supervisor "-name *\.conf"
 	cd ${WRKSRC}/document-server-package/common/documentserver/logrotate && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/logrotate "-name *\.conf"
 	@${CP} ${WRKSRC}/document-server-package/common/documentserver/nginx/ds-ssl.conf.tmpl ${WRKSRC}/document-server-package/common/documentserver/nginx/ds-ssl.conf
 .for f in ds.conf ds-ssl.conf includes/http-common.conf includes/ds-common.conf includes/ds-docservice.conf includes/ds-letsencrypt.conf includes/ds-mime.types.conf
 	${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/nginx/${f} ${STAGEDIR}${ETCDIR}/documentserver/nginx/${f}.sample
 .endfor
 	cd ${WRKSRC}/document-server-package/common/documentserver/nginx/includes && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes "-name *\.conf"
 	cd ${WRKSRC}/document-server-package/common/documentserver/config && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver
 	${INSTALL_DATA} ${FILESDIR}/local.json.sample ${STAGEDIR}${ETCDIR}/documentserver
 	${MKDIR} ${STAGEDIR}/${ETCDIR}/documentserver/newsyslog.conf.d
 	${INSTALL_DATA} ${WRKDIR}/onlyoffice.newsyslog.sample ${STAGEDIR}/${ETCDIR}/documentserver/newsyslog.conf.d
 
 # create missing dir
 	${MKDIR} ${STAGEDIR}/var/log/onlyoffice/documentserver/docservice \
 		 ${STAGEDIR}/var/log/onlyoffice/documentserver/converter \
 		 ${STAGEDIR}/var/log/onlyoffice/documentserver/metrics \
 		 ${STAGEDIR}/var/db/onlyoffice/documentserver/App_Data/cache/files \
 		 ${STAGEDIR}/var/db/onlyoffice/documentserver/App_Data/docbuilder \
 		 ${STAGEDIR}${WWWDIR}/Data \
 		 ${STAGEDIR}${WWWDIR}/documentserver/fonts
 
 # Remove bak file
 	${RM} ${STAGEDIR}${WWWDIR}/documentserver/server/Common/config/*.bak
 	${RM} ${STAGEDIR}${WWWDIR}/documentserver/dictionaries/sl_SI/hyph_sl_SI.dic.bak
 
 create-caches-tarball:
 	# do some cleanup first
 	${RM} -r  ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp ${WRKDIR}/.cache/node-gyp
 #	${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
 	${FIND} ${WRKDIR}/.pkg-cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
 
 	cd ${WRKDIR} && \
 		${TAR} czf ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz .npm .pkg-cache
 
 .include <bsd.port.post.mk>
diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile
index e2dcd2ff4b6b..8ddc039f6444 100644
--- a/www/pecl-http/Makefile
+++ b/www/pecl-http/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	http
 PORTVERSION=	4.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 DISTNAME=	pecl_${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Extended HTTP Support
 WWW=		https://pecl.php.net/package/pecl_http
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2@${PHP_FLAVOR} \
 		re2c:devel/re2c \
 		bash>0:shells/bash
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libicudata.so:devel/icu
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2@${PHP_FLAVOR}
 
 USES=		php:build,pecl
 USE_PHP=	iconv:build zlib:build
 
 CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
 
 .include <bsd.port.mk>
diff --git a/www/proxygen/Makefile b/www/proxygen/Makefile
index 188146c8ce1f..001279a322e6 100644
--- a/www/proxygen/Makefile
+++ b/www/proxygen/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	proxygen
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2025.02.10.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of C++ HTTP libraries including easy way to use HTTP server
 WWW=		https://github.com/facebook/proxygen
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	compilation fails, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283484
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gperf>0:devel/gperf
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libmvfst_server.so:net/mvfst \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++14-lang cpe perl5 python:build ssl
 CPE_VENDOR=	facebook
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-fPIC
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 LDFLAGS+=	-lexecinfo
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .include <bsd.port.mk>
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index 243961a0207c..31453d469bde 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,173 +1,174 @@
 PORTNAME=	tor-browser
 DISTVERSION=	14.0.6
+PORTREVISION=	1
 CATEGORIES=	www net security wayland
 MASTER_SITES=	TOR \
 		LOCAL/vvd \
 		LOCAL/vvd:source1 \
 		https://build-sources.tbb.torproject.org/:source1 \
 		LOCAL/jsm:source2 \
 		LOCAL/vvd:source2 \
 		LOCAL/vvd:source3 \
 		https://secure.informaction.com/%SUBDIR%/:source3
 MASTER_SITE_SUBDIR=	torbrowser/${DISTVERSION}/:DEFAULT \
 			download/releases/:source3
 DISTNAME=	src-firefox-tor-browser-128.7.0esr-14.0-1-build3
 NOSCRIPT=	noscript-12.1.1.xpi
 DISTFILES=	${DISTNAME}.tar.xz \
 		manual_215922.zip:source1 \
 		fonts-3--4348e1.tar.zst:source2 \
 		${NOSCRIPT}:source3
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Tor Browser for FreeBSD
 WWW=		https://www.torproject.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.101:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm
 RUN_DEPENDS=	tor:security/tor \
 		obfs4proxy:security/obfs4proxy-tor \
 		snowflake-client:security/snowflake-tor
 
 USES=		compiler:c++11-lib libtool localbase:ldflags perl5 pkgconfig \
 		python:3.8+ shebangfix tar:xz
 USE_GECKO=	gecko
 USE_GITHUB=	nodefault
 TAG_L10N=	f75c1e6a305e68161037337767ece88e9de940b9
 GH_TUPLE=	mozilla-l10n:firefox-l10n:${TAG_L10N}:ffl10n
 USE_GITLAB=	nodefault
 GL_SITE=	https://gitlab.torproject.org/
 GL_ACCOUNT=	tpo
 GL_PROJECT=	translation:basebrowser translation:torbrowser
 TAG_BASE=	93eddbd3888852c09e130d536fb3c9bd7e4e6f57
 TAG_TOR=	dd30508387040bf0a1217a1eb9edb80ac21926f2
 GL_TAGNAME=	${TAG_BASE}:basebrowser ${TAG_TOR}:torbrowser
 USE_MOZILLA=	-sqlite
 
 LOCALES=	ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko \
 		lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN \
 		zh-TW
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 		MOZ_CHROME_MULTILOCALE="${LOCALES}"
 
 MAKE_ENV+=	LOCALES="${LOCALES}"
 
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 SSP_UNSAFE=		yes
 
 BUNDLE_LIBS=	yes
 SUB_FILES=	fonts.conf tor-browser.desktop torrc-defaults
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="Tor Browser" \
 		MOZ_APP_NAME="tor-browser" \
 		MOZ_CHROME_MULTILOCALE="${LOCALES}"
 
 MOZ_OPTIONS=	--with-base-browser-version=${DISTVERSION} \
 		--enable-official-branding \
 		--enable-optimize \
 		--enable-bundled-fonts \
 		--disable-tests \
 		--disable-debug \
 		--disable-crashreporter \
 		--disable-webrtc \
 		--disable-parental-controls \
 		--enable-proxy-bypass-protection \
 		--disable-system-policies \
 		--disable-backgroundtasks \
 		--with-distribution-id=org.torproject \
 		--with-branding=browser/branding/tb-release
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZILLA_PLIST_DIRS=	bin lib share/applications share/pixmaps \
 			share/tor-browser
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 post-patch:
 	@${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' \
 		"${WRKSRC}/browser/app/profile/000-tor-browser.js"
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 	${MKDIR} ${WRKSRC}/tmp-manual
 	${UNZIP_NATIVE_CMD} -d ${WRKSRC}/tmp-manual ${DISTDIR}/manual_215922.zip
 pre-configure:
 	@${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig
 	${PYTHON_CMD} ${FILESDIR}/packagemanual.py ${WRKSRC}/tmp-manual/public \
 		${WRKSRC}/browser/base/content/manual
 post-configure:
 	${MKDIR} ${WRKDIR}/.mozbuild/l10n-central
 	${CP} -r ${WRKDIR}/firefox-l10n-${TAG_L10N}/* \
 		${WRKDIR}/.mozbuild/l10n-central
 
 .for i in ${LOCALES}
 	${CP} ${WRKDIR}/translation-${TAG_BASE}/${i}/base-browser.ftl \
 		${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/
 	${CP} ${WRKDIR}/translation-${TAG_BASE}/${i}/newIdentity.properties \
 		${WRKDIR}/.mozbuild/l10n-central/${i}/browser/chrome/browser/
 	${CP} ${WRKDIR}/translation-${TAG_BASE}/${i}/securityLevel.properties \
 		${WRKDIR}/.mozbuild/l10n-central/${i}/browser/chrome/browser/
 	${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/tor-browser.ftl \
 		${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/
 	${MKDIR} ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/
 .for j in aboutTBUpdate.dtd brand.dtd brand.properties onionLocation.properties \
 	settings.properties torConnect.properties torbutton.dtd \
 	torbutton.properties torlauncher.properties
 	${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/${j} \
 		${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/
 .endfor
 	${CP} -r ${WRKDIR}/translation-${TAG_TOR}/${i}/branding \
 		${WRKSRC}/toolkit/torbutton/chrome/locale/${i}
 .endfor
 
 post-build:
 	MOZBUILD_STATE_PATH=${WRKDIR}/.mozbuild AB_CD="multi" MOZ_AUTOMATION="1" \
 		PATH="`find ${WRKRDIR}/.mozbuild/srcdirs -name build -type d -print`/bin:${PATH}" \
 		${WRKSRC}/mach package-multi-locale --locales ${LOCALES}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/torrc-defaults \
 		${STAGEDIR}${DATADIR}/torrc-defaults
 	${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/tor-browser.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts
 	${INSTALL_DATA} ${WRKDIR}/fonts.conf \
 		${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig/fonts.conf
 	(cd ${WRKDIR}/fonts && \
 		${COPYTREE_SHARE} "*.otf *.ttf" ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts)
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions
 	${INSTALL_DATA} ${DISTDIR}/${NOSCRIPT} \
 		"${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
 
 .include <bsd.port.mk>
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 2b1948b244e5..a16f896fb95f 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,410 +1,411 @@
 PORTNAME=	ungoogled-chromium
 PORTVERSION=	132.0.6834.159
+PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/:goo \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 DISTFILES=	chromium-${DISTVERSION}${EXTRACT_SUFX}:goo \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ungoogled-software
 GH_TAGNAME=	${UGVERSION}
 
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Google web browser based on WebKit sans integration with Google
 WWW=		https://github.com/ungoogled-software/ungoogled-chromium
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 PATCH_DEPENDS=	gpatch:devel/patch \
 		${PYTHON_VERSION}:lang/python${PYTHON_SUFFIX}
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 		bindgen:devel/rust-bindgen-cli \
 		gperf:devel/gperf \
 		flock:sysutils/flock \
 		node:www/node \
 		rustc:lang/rust \
 		xcb-proto>0:x11/xcb-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/va/va.h:multimedia/libva \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets
 
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libspeechd.so:accessibility/speech-dispatcher \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libcairo.so:graphics/cairo \
 		libdrm.so:graphics/libdrm \
 		libexif.so:graphics/libexif \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic
 
 USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
 		iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
 		python:build qt:5 shebangfix tar:xz xorg
 
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_GL=		gbm gl
 USE_GNOME=	atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
 USE_QT=		buildtools:build
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} \
 		moc=${PREFIX}/bin/moc-qt5
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
 #
 # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	enable_widevine=true \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		optimize_webui=true \
 		toolkit_views=true \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}"
 
 # sync with flags.gni
 GN_ARGS+=	build_with_tflite_lib=false \
 		chrome_pgo_phase=0 \
 		clang_use_chrome_plugins=false \
 		disable_fieldtrial_testing_config=true \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=false \
 		enable_mdns=false \
 		enable_nacl=false \
 		enable_reading_list=false \
 		enable_remoting=false \
 		enable_reporting=false \
 		enable_service_discovery=false \
 		exclude_unwind_tables=true \
 		google_api_key="" \
 		google_default_client_id="" \
 		google_default_client_secret="" \
 		safe_browsing_mode=0 \
 		treat_warnings_as_errors=false \
 		use_official_google_api_keys=false \
 		use_unofficial_version_number=false
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 SUB_FILES=	ungoogled-chromium.desktop ungoogled-chromium
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 
 PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 WIDEVINE_DESC=		Depend on foreign-cdm to enable playback of DRM content
 WIDEVINE_RUN_DEPENDS=	foreign-cdm>0:www/foreign-cdm
 
 .include "Makefile.tests"
 TEST_DISTFILES=		chromium-${DISTVERSION}-testdata${EXTRACT_SUFX}
 TEST_ALL_TARGET=	${TEST_TARGETS}
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk> # for COMPILER_VERSION
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 LLVM_DEFAULT=		19
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 
 # - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
 # - map ffmpeg target to ${ARCH}
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == amd64
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == i386
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/chromium-${DISTVERSION}
 
 # rust
 RUSTC_VERSION!= rustc -V 2>/dev/null || true
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}" \
 		rustc_version="${RUSTC_VERSION}"
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Ungoogled Chromium, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-patch:
 	cd ${WRKDIR}/ungoogled-chromium-${UGVERSION} && ${PYTHON_CMD} \
 		utils/prune_binaries.py ${WRKSRC} pruning.list
 	cd ${WRKDIR}/ungoogled-chromium-${UGVERSION} && PATCH_BIN=gpatch \
 		${PYTHON_CMD} utils/patches.py apply ${WRKSRC} patches
 	cd ${WRKDIR}/ungoogled-chromium-${UGVERSION} && ${PYTHON_CMD} \
 		utils/domain_substitution.py apply -r domain_regex.list -f \
 		domain_substitution.list -c ${WRKSRC}/domsubcache.tar.gz ${WRKSRC}
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig harfbuzz-ng libdrm libevent libpng \
 		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/rust/rust_bindgen.gni \
 		${WRKSRC}/build/rust/rust_bindgen_generator.gni
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
 		${STAGEDIR}${PREFIX}/share/man/man1/ungoogled-chromium.1
 	@${SED} -i "" -e 's,\@\@PACKAGE\@\@,chromium,g;s,\@\@MENUNAME\@\@,Chromium Web Browser,g' \
 		${STAGEDIR}${PREFIX}/share/man/man1/ungoogled-chromium.1
 	${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png
 .for s in 22 24 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/ungoogled-chromium.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
 .for d in protoc mksnapshot
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 .for d in snapshot_blob.bin v8_context_snapshot.bin
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}/ungoogled-chromium
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/ungoogled-chromium.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/ungoogled-chromium ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
 
 	# ANGLE, EGL, Vk
 .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \
 		${STAGEDIR}${DATADIR}/libvulkan.so
 .if ${BUILDTYPE} == Debug
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR}
 .endif
 
 	# SwiftShader
 .if ${ARCH} != aarch64
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/vk_swiftshader_icd.json ${STAGEDIR}${DATADIR}
 .endif
 
 post-install-DEBUG-on:
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
 		${STAGEDIR}${DATADIR}
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin/ungoogled-chromedriver
 
 do-test-TEST-on:
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
 		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index f7d351269d78..3b3de2c24cd7 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,100 +1,101 @@
 PORTNAME=	waterfox
 DISTVERSION=	6.5.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Distilled fork of Firefox
 WWW=		https://www.waterfox.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.107:security/nss \
 		icu>=74.2:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.1.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.44:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 
 USE_GECKO=	gecko
 USE_GITHUB=	yes
 GH_ACCOUNT=	BrowserWorks
 GH_PROJECT=	Waterfox
 GH_TUPLE=	BrowserWorks:l10n:3046738:l10n/waterfox/browser/locales
 USE_MOZILLA=	-sqlite
 
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=		BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 			MOZ_REQUIRE_SIGNING=""
 
 CFLAGS_powerpc64=	-DHWY_COMPILE_ONLY_SCALAR
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 BINARY_ALIAS+=		python3=${PYTHON_CMD}
 
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
 		MOZ_APP_NAME="${MOZILLA}"
 
 MOZ_OPTIONS+=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
 		--disable-default-browser-agent \
 		--disable-tests \
 		--disable-updater \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
 		--with-app-name=${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
 		--enable-bootstrap \
 		--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e 's/firefox/${MOZILLA}/' \
 		-e 's/Firefox/${MOZILLA_CAP}/' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/webkit2-gtk/Makefile b/www/webkit2-gtk/Makefile
index e246fcc97cbe..209bfbdf99ed 100644
--- a/www/webkit2-gtk/Makefile
+++ b/www/webkit2-gtk/Makefile
@@ -1,139 +1,139 @@
 PORTNAME=	webkit
 DISTVERSION=	2.46.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk_${FLAVOR}
 DISTNAME=	${PORTNAME}gtk-${DISTVERSION}
 DIST_SUBDIR=	gnome
 
 PATCH_SITES=	https://github.com/WebKit/WebKit/commit/
 PATCHFILES=	aa29001ade54425699e1345ce41bbd227dba805c.patch:-p1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK 3 toolkit
 WWW=		https://webkitgtk.org/
 
 LICENSE=	GPLv2 BSD2CLAUSE
 LICENSE_COMB=	dual
 
 BROKEN_riscv64=	error: Unknown Architecture
 
 LIB_DEPENDS=	libavif.so:graphics/libavif \
 		libdrm.so:graphics/libdrm \
 		libenchant-2.so:textproc/enchant2 \
 		libepoxy.so:graphics/libepoxy \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgcrypt.so:security/libgcrypt \
 		libgraphene-1.0.so:graphics/graphene \
 		libgpg-error.so:security/libgpg-error \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libharfbuzz.so:print/harfbuzz \
 		libhyphen.so:textproc/hyphen \
 		libicudata.so:devel/icu \
 		libjxl.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libsecret-1.so:security/libsecret \
 		libsysinfo.so:devel/libsysinfo \
 		libtasn1.so:security/libtasn1 \
 		libwebp.so:graphics/webp \
 		libwoff2dec.so:devel/woff2
 
 PORTSCOUT=	limitw:1,even
 
 FLAVORS=	60 41 40
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		bison cmake compiler:c++23-lang cpe gettext gl gnome gperf \
 		jpeg localbase:ldflags perl5 pkgconfig python:build \
 		ruby:build sqlite tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 introspection:build libxml2 libxslt
 USE_GL=		egl gbm gl glesv2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_XORG=	x11
 
 CPE_VENDOR=	webkitgtk
 CPE_PRODUCT=	webkitgtk
 
 BINARY_ALIAS=		python=${PYTHON_CMD}
 CXXFLAGS+=		-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32 \
 			-I${LOCALBASE}/include -lsysinfo
 CMAKE_ARGS=		-DPORT=GTK
 CMAKE_OFF=		${CMAKE_OFF_${ARCH}:U} \
 			ENABLE_GAMEPAD \
 			ENABLE_JOURNALD_LOG \
 			USE_LIBBACKTRACE \
 			USE_SYSTEM_MALLOC \
 			USE_SYSPROF_CAPTURE \
 			USE_SYSTEM_SYSPROF_CAPTURE
 CMAKE_OFF_armv6=	ENABLE_JIT
 CMAKE_OFF_armv7=	ENABLE_JIT
 INSTALL_TARGET=		install
 
 .if ${FLAVOR:M60}
 USE_GNOME+=	gtk40
 
 PLIST=	${.CURDIR}/pkg-plist_${FLAVOR}
 API_VERSION=	6.0
 WEBKIT_LIBRARY_VERSION=	4 10 7
 JAVASCRIPTCORE_LIBRARY_VERSION=	1 3 14
 .else
 USE_GNOME+=	gtk30
 
 CMAKE_OFF+=	USE_GTK4
 .endif
 .if ${FLAVOR:M40}
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 
 CMAKE_ON+=	USE_SOUP2
 API_VERSION=	4.0
 WEBKIT_LIBRARY_VERSION=	37 71 7
 JAVASCRIPTCORE_LIBRARY_VERSION=	18 25 14
 .else
 LIB_DEPENDS+=	libsoup-3.0.so:devel/libsoup3
 .endif
 .if ${FLAVOR:M41}
 API_VERSION=	4.1
 WEBKIT_LIBRARY_VERSION=	0 16 7
 JAVASCRIPTCORE_LIBRARY_VERSION=	0 6 14
 .endif
 
 PLIST_SUB=	API_VERSION=${API_VERSION} \
 		WEBKIT_LIBRARY_VERSION=${WEBKIT_LIBRARY_VERSION:ts.} \
 		WEBKIT_LIBRARY_VERSION_MAJOR=${WEBKIT_LIBRARY_VERSION:[1]} \
 		JAVASCRIPTCORE_LIBRARY_VERSION=${JAVASCRIPTCORE_LIBRARY_VERSION:ts.} \
 		JAVASCRIPTCORE_LIBRARY_VERSION_MAJOR=${JAVASCRIPTCORE_LIBRARY_VERSION:[1]}
 
 OPTIONS_DEFINE=		DOCS GEOIP GSTREAMER WAYLAND
 OPTIONS_DEFAULT=	GEOIP GSTREAMER WAYLAND
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	ENABLE_DOCUMENTATION
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR}
 
 GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
 GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		GSTREAMER=bad,gl
 GSTREAMER_CMAKE_BOOL=	ENABLE_VIDEO ENABLE_WEB_AUDIO
 
 WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 
 .include <bsd.port.options.mk>
 
 .ifdef WITH_DEBUG
 DEBUG_FLAGS=	-g1 # resulting package otherwise is huge
 .endif
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver \
 		${STAGEDIR}${PREFIX}/bin/WebKitWebDriver-${API_VERSION}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index e336800152ba..d8b502a6edf5 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	gnustep-gui
 DISTVERSIONPREFIX=	gui-
 DISTVERSION=	0_31_1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnustep
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep GUI library
 WWW=		http://www.gnustep.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS+=	libtiff.so:graphics/tiff \
 		libpng.so:graphics/png \
 		libgif.so:graphics/giflib \
 		libicui18n.so:devel/icu \
 		libsndfile.so:audio/libsndfile \
 		libao.so:audio/libao \
 		libflite.so:audio/flite
 
 USES=		gnustep jpeg pkgconfig xorg
 USE_GNUSTEP=	base build
 USE_XORG=	x11 xt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnustep
 GH_PROJECT=	libs-gui
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib \
 			--with-tiff-include=${LOCALBASE}/include \
 			--with-jpeg-library=${LOCALBASE}/lib \
 			--with-jpeg-include=${LOCALBASE}/include \
 			--with-x \
 			--with-x-include=${LOCALBASE}/include \
 			--with-x-include=${LOCALBASE}/lib
 
 MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 
 OPTIONS_DEFINE=	DOCS CUPS ASPELL
 OPTIONS_DEFAULT=	CUPS
 OPTIONS_SUB=	yes
 
 DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
 			texi2pdf:print/texinfo
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS+=	libcups.so:print/cups
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ENABLE=	aspell
 
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 post-patch:
 	${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile
 
 pre-configure:
 .for file in config.guess config.sub install-sh
 	@${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}
 .endfor
 
 post-install-DOCS-off:
 	@${FIND} -d ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Documentation -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libspelling/Makefile b/x11-toolkits/libspelling/Makefile
index 3420edbaefe9..341a9e73f389 100644
--- a/x11-toolkits/libspelling/Makefile
+++ b/x11-toolkits/libspelling/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	libspelling
 DISTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Spellcheck library for GTK 4
 WWW=		https://gitlab.gnome.org/GNOME/libspelling
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gnome meson pkgconfig tar:xz vala:build
 USE_GNOME=	gtk40 gtksourceview5 introspection:build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS ENCHANT
 OPTIONS_DEFAULT=ENCHANT
 
 DOCS_BUILD_DEPENDS=	gi-docgen:textproc/py-gi-docgen
 DOCS_MESON_TRUE=	docs
 
 ENCHANT_LIB_DEPENDS=	libicuuc.so:devel/icu \
 			libenchant-2.so:textproc/enchant2
 ENCHANT_MESON_ENABLED=	enchant
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/plasma6-kdeplasma-addons/Makefile b/x11-toolkits/plasma6-kdeplasma-addons/Makefile
index 45daabea8ce8..9b0926d16c89 100644
--- a/x11-toolkits/plasma6-kdeplasma-addons/Makefile
+++ b/x11-toolkits/plasma6-kdeplasma-addons/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	kdeplasma-addons
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	All kind of add-ons to improve your Plasma experience
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		cmake gettext gl kde:6 qt:6 tar:xz xorg
 USE_GL=		gl opengl
 USE_KDE=	colorscheme completion config configwidgets coreaddons \
 		globalaccel holidays i18n jobwidgets kcmutils kdeclarative kio \
 		libplasma newstuff notifications package plasma5support runner \
 		service solid sonnet unitconversion widgetsaddons windowsystem \
 		xmlgui \
 		ecm:build \
 		kirigami-addons:run
 USE_QT=		5compat base declarative webchannel webengine
 USE_XORG= x11
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/tepl6/Makefile b/x11-toolkits/tepl6/Makefile
index 16746c9bcf21..3c392867e765 100644
--- a/x11-toolkits/tepl6/Makefile
+++ b/x11-toolkits/tepl6/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	tepl
 DISTVERSION=	6.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	6
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Text editor product line
 WWW=		https://wiki.gnome.org/Projects/Tepl
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt
 
 BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
 LIB_DEPENDS=	libamtk-5.so:x11-toolkits/amtk \
 		libicuuc.so:devel/icu \
 		libuchardet.so:textproc/uchardet
 
 USES=		compiler:c11 gettext gnome meson pkgconfig tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtksourceview4 libxml2
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index f616bbc5c4d6..bdc3b1f4ce51 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	vte
 PORTVERSION=	0.78.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome
 
 # https://gitlab.gnome.org/GNOME/vte/-issues/2823
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/vte/-/commit/
 PATCHFILES+=	f6095fca4d1b.patch:-p1 \
 		6c2761f51a04.patch:-p1 \
 		d09330585e64.patch:-p1 \
 		b262c4432b80.patch:-p1 \
 		ae2b83c6fc83.patch:-p1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal widget with improved accessibility and I18N support
 WWW=		https://wiki.gnome.org/Apps/Terminal/VTE
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/fast_float/fast_float.h:math/fast_float
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		liblz4.so:archivers/liblz4 \
 		libicuuc.so:devel/icu
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++17-lang gettext gnome localbase meson \
 		pkgconfig python tar:xz vala:build
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
 
 # Disable build time flooding.
 CFLAGS+=	-Wno-cast-function-type-strict
 MESON_ARGS=	-Da11y=true \
 		-Dgir=true \
 		-Dgtk3=true \
 		-Dicu=true \
 		-D_systemd=false \
 		-Dvapi=true
 
 # shlib version numbers come from gtk3/4 meson options, not from PYTHON_VER
 PLIST_SUB=	VERSION=2.91 VER3=3.91
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	FRIBIDI GNUTLS GTK4
 OPTIONS_DEFAULT=FRIBIDI GNUTLS GTK4
 OPTIONS_SUB=	yes
 
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_MESON_TRUE=	fribidi
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_MESON_TRUE=	gnutls
 
 GTK4_LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene
 GTK4_USE=		GNOME=gtk40
 GTK4_MESON_TRUE=	gtk4
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-console/Makefile b/x11/gnome-console/Makefile
index c6331e32f809..dfff420931be 100644
--- a/x11/gnome-console/Makefile
+++ b/x11/gnome-console/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	gnome-console
 PORTVERSION=	43.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Minimal terminal for GNOME
 WWW=		https://gitlab.gnome.org/GNOME/console
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool>0:textproc/itstool \
 		sassc>0:textproc/sassc
 LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libgtop-2.0.so:devel/libgtop \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libicudata.so:devel/icu \
 		libpcre2-8.so:devel/pcre2 \
 		libvte-2.91.so:x11-toolkits/vte3
 
 USES=		compiler:c11 desktop-file-utils gettext gnome localbase meson \
 		pkgconfig tar:xz
 USE_CSTD=	c11
 USE_GNOME=	gtk30 gtksourceview5 libadwaita
 MESON_ARGS=	${${PORTVERSION:R}<44:?-Dwerror=false:}
 GLIB_SCHEMAS=	org.gnome.Console.gschema.xml
 
 PORTSCOUT=	limitw:1,even
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index fdd1988b724f..9f58161c0056 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	gnome-shell
 PORTVERSION=	42.4
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 WWW=		https://live.gnome.org/GnomeShell
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion \
 		a2x:textproc/asciidoc \
 		docbook-xsl>=0:textproc/docbook-xsl \
 		gnome-control-center:sysutils/gnome-control-center \
 		sassc:textproc/sassc
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcanberra.so:audio/libcanberra \
 		libcroco-0.6.so:textproc/libcroco \
 		libdrm.so:graphics/libdrm \
 		libgcr-base-3.so:security/gcr3 \
 		libgjs.so:lang/gjs \
 		libgnome-autoar-0.so:archivers/gnome-autoar \
 		libgraphene-1.0.so:graphics/graphene \
 		libical.so:devel/libical \
 		libicuuc.so:devel/icu \
 		libjson-glib-1.0.so:devel/json-glib \
 		libmutter-10.so:x11-wm/mutter \
 		libp11-kit.so:security/p11-kit \
 		libpolkit-agent-1.so:sysutils/polkit \
 		libpulse.so:audio/pulseaudio \
 		libsecret-1.so:security/libsecret \
 		libsoup-3.0.so:devel/libsoup3 \
 		libstartup-notification-1.so:x11/startup-notification
 RUN_DEPENDS=	gdm:x11/gdm \
 		gkbd-keyboard-display:x11/libgnomekbd \
 		gnome-control-center:sysutils/gnome-control-center
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 cpe gettext gl gnome gstreamer libtool localbase \
 		meson pathfix perl5 pkgconfig python shebangfix tar:xz \
 		webplugin:native xorg
 USE_GNOME=	cairo evolutiondataserver3 gdkpixbuf2 gnomedesktop3 gtk40 \
 		introspection libxml2 libxslt:build
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr xtst
 USE_GL=		egl gbm
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	src/gnome-shell-extension-tool.in src/gnome-shell-perf-tool.in
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 WEBPLUGIN_NAME=	libgnome-shell-browser-plugin.so
 WEBPLUGIN_DIR=	${PREFIX}/lib/mozilla/plugins/
 WEBPLUGIN_FILES=	libgnome-shell-browser-plugin.so
 
 MESON_ARGS=	-Dnetworkmanager=false \
 		-Dsoup2=false \
 		-Dsystemd=false \
 		-Dtests=false
 CPE_VENDOR=	gnome
 
 GLIB_SCHEMAS=	00_org.gnome.shell.gschema.override \
 		org.gnome.shell.gschema.xml
 
 post-extract:
 	${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces
 
 post-patch:
 	${REINPLACE_CMD} -e "s,python3,${PYTHON_VERSION},g" \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile
index 1ff68c79befc..926306802e35 100644
--- a/x11/plasma6-plasma-desktop/Makefile
+++ b/x11/plasma6-plasma-desktop/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	plasma-desktop
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Plasma Desktop
 
 BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols \
 		xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
 		xf86-input-libinput>0:x11-drivers/xf86-input-libinput \
 		xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libicuuc.so:devel/icu \
 		liboauth2plugin.so:sysutils/signon-plugin-oauth2@qt6 \
 		libwayland-client.so:graphics/wayland \
 		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxkbfile.so:x11/libxkbfile
 RUN_DEPENDS=	noto-emoji>0:x11-fonts/noto-emoji \
 		xdg-user-dir:devel/xdg-user-dirs \
 		xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
 		xf86-input-libinput>0:x11-drivers/xf86-input-libinput \
 		xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
 
 USES=		cmake gettext gl kde:6 pkgconfig python qt:6 tar:xz xorg
 USE_GL=		gl opengl
 USE_KDE=	activities activities-stats attica auth baloo bookmarks \
 		codecs colorscheme completion config configwidgets coreaddons \
 		crash dbusaddons doctools filemetadata globalaccel guiaddons \
 		i18n iconthemes itemmodels itemviews jobwidgets kcmutils kio \
 		libksysguard libplasma newstuff notifications notifyconfig \
 		package plasma-workspace plasma5support runner service solid \
 		sonnet svg widgetsaddons windowsystem xmlgui \
 		ecm:build \
 		kirigami-addons:run kirigami2:run kpipewire:run \
 		qqc2-desktop-style:run
 USE_QT=		5compat base declarative svg
 USE_XORG=	x11 xcb xcursor xext xfixes xi xrender
 
 OPTIONS_DEFINE=	SDL
 OPTIONS_SUB=	yes
 
 SDL_DESC=	Enable gamecontroller System Settings module (requires SDL)
 SDL_USES=	sdl
 SDL_USE=	sdl=sdl2
 SDL_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_SDL2:BOOL=On
 
 .include <bsd.port.mk>
diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile
index dc0cf9e58b04..ce14a042d9a0 100644
--- a/x11/plasma6-plasma-workspace/Makefile
+++ b/x11/plasma6-plasma-workspace/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 #PATCH_SITES=	https://invent.kde.org/plasma/plasma-workspace/-/commit/
 
 COMMENT=	KDE Plasma Workspace
 MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libicui18n.so:devel/icu \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libqalculate.so:math/libqalculate \
 		libudev.so:devel/libudev-devd \
 		libwayland-client.so:graphics/wayland \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
 		libQCoro6Core.so:devel/qcoro@qt6
 
 RUN_DEPENDS=	${LOCALBASE}/bin/genv:sysutils/coreutils
 
 USES=		cmake desktop-file-utils gettext gl kde:6 pkgconfig python \
 		qt:6 shebangfix tar:xz xorg
 USE_GL=		gl opengl
 USE_KDE=	activities activities-stats archive attica auth baloo \
 		bookmarks colorscheme completion config configwidgets \
 		coreaddons crash dbusaddons doctools filemetadata globalaccel \
 		guiaddons holidays i18n iconthemes idletime itemmodels \
 		itemviews jobwidgets kcmutils kdeclarative kio kirigami-addons \
 		kirigami2 kpipewire kquickcharts kscreenlocker kwin \
 		layer-shell-qt libkexiv2 libkscreen libksysguard libplasma \
 		newstuff notifications notifyconfig package parts phonon \
 		plasma5support prison runner service solid sonnet \
 		statusnotifieritem svg syntaxhighlighting texteditor \
 		textwidgets unitconversion userfeedback wallet wayland \
 		widgetsaddons windowsystem xmlgui \
 		ecm:build plasma-wayland-protocols:build
 USE_QT=		5compat base declarative svg wayland
 USE_XORG=	ice sm x11 xau xcb xcursor xext xfixes xft xi xrender xtst
 SHEBANG_FILES=	components/calendar/kconf_update/migrate-calendar-to-plugin-id.py.in
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/startkde/startplasma.cpp
 
 .include <bsd.port.mk>
diff --git a/x11/slop/Makefile b/x11/slop/Makefile
index 37136c3032fa..9f5051e2d5b2 100644
--- a/x11/slop/Makefile
+++ b/x11/slop/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	slop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Make a screen selection and print the selection coordinates to stdout
 WWW=		https://github.com/naelstrof/slop
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
 USES=		cmake compiler:c++11-lang gl xorg
 USE_GL=		gl glu glew
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xext xrender
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	naelstrof
 
 PLIST_FILES=	bin/slop \
 		include/slop.hpp \
 		lib/libslopy.so \
 		lib/libslopy.so.${PORTVERSION} \
 		share/man/man1/slop.1.gz
 
 .include <bsd.port.mk>