diff --git a/dns/kadnode/Makefile b/dns/kadnode/Makefile
index 414f57e54a40..83ab7cb0b6a2 100644
--- a/dns/kadnode/Makefile
+++ b/dns/kadnode/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	kadnode
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 
 MAINTAINER=	moritzwarning@web.de
 COMMENT=	P2P name resolution daemon
 WWW=		https://github.com/mwarning/KadNode
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe gmake
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	mwarning
 GH_PROJECT=	KadNode
 USE_RC_SUBR=	kadnode
 
 MAKE_ENV=	FEATURES="${FEATURES}"
 SUB_FILES=	kadnode.conf
 
 OPTIONS_DEFINE=	AUTH CMD DEBUG DNS LPD NATPMP NSS UPNP
 OPTIONS_DEFAULT=	AUTH CMD LPD NSS
 OPTIONS_SUB=	yes
 
 AUTH_DESC=	Authorization support based on mbedtls
 CMD_DESC=	Command line control tool kadnode-ctl
 DEBUG_DESC=	Build with debug messages and symbols
 DNS_DESC=	Include local DNS interface
 LPD_DESC=	Local peer discovery
 NATPMP_DESC=	NAT-PMP support (remote port forwarding on the router)
 NSS_DESC=	Name Service Switch support to intercept host queries
 UPNP_DESC=	UPnP support (remote port forwarding on the router)
 
 AUTH_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 AUTH_VARS=		FEATURES+="bob tls"
 
 CMD_VARS=		FEATURES+="cmd"
 
 DEBUG_VARS=		FEATURES+="debug"
 
 DNS_VARS=		FEATURES+="dns"
 
 LPD_VARS=		FEATURES+="lpd"
 
 NATPMP_LIB_DEPENDS=	libnatpmp.so:net/libnatpmp
 NATPMP_VARS=		FEATURES+="natpmp"
 
 NSS_VARS=		FEATURES+="nss"
 
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_VARS=		FEATURES+="upnp"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/kadnode ${STAGEDIR}${PREFIX}/bin/
 	${RLN} ${STAGEDIR}${PREFIX}/bin/kadnode ${STAGEDIR}${PREFIX}/bin/kadnode-ctl
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/misc/peers.txt \
 		${STAGEDIR}${ETCDIR}/peers.txt.sample
 	${INSTALL_DATA} ${WRKDIR}/kadnode.conf \
 		${STAGEDIR}${ETCDIR}/kadnode.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/misc/manpage \
 		${STAGEDIR}${PREFIX}/share/man/man1/kadnode.1
 
 do-install-NSS-on:
 	${INSTALL_LIB} ${WRKSRC}/build/libnss_kadnode-2.0.so \
 		${STAGEDIR}${PREFIX}/lib/nss_kadnode.so.1
 	${RLN} ${STAGEDIR}${PREFIX}/lib/nss_kadnode.so.1 \
 		${STAGEDIR}${PREFIX}/lib/nss_kadnode.so
 
 .include <bsd.port.mk>
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 6e7d20648364..e80d346e8abb 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -1,117 +1,117 @@
 PORTNAME=	dolphin-emu
 PORTVERSION=	5.0.21264
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Gamecube and Wii Emulator
 WWW=		https://www.dolphin-emu.org
 
 LICENSE=	BSD3CLAUSE CC0-1.0 GPLv2+ MIT
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	libfmt>=10.1:devel/libfmt \
 		vulkan-headers>0:graphics/vulkan-headers
 # Notes on dependencies:
 # - alsa support has been disabled (not optimal)
 # - enet and soundtouch come from Externals/ as Dolphin's versions diverge
 #   (see comments in CMakeLists.txt)
 # Various problems that may be addressed in the future:
 # - freesurround comes from Externals/ as it is not available from ports yet
 # - cubeb comes from Externals/ as it is not available from ports yet
 # - gtest detection is missing (Externals/ version enforced by CMakeLists.txt)
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libavdevice.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libfmt.so:devel/libfmt \
 		libpugixml.so:textproc/pugixml \
 		libxxhash.so:devel/xxhash \
 		libzstd.so:archivers/zstd \
 		libminizip-ng.so:archivers/minizip-ng \
 		liblzo2.so:archivers/lzo2 \
 		liblz4.so:archivers/liblz4 \
 		libspng.so:graphics/libspng \
 		libspeexdsp.so:audio/speexdsp \
 		libpulse.so:audio/pulseaudio \
 		libjack.so:audio/jack \
 		libsndio.so:audio/sndio \
 		libsfml-system.so:devel/sfml \
 		libminiupnpc.so:net/miniupnpc \
 		libmbedtls.so:security/mbedtls \
 		libcurl.so:ftp/curl \
 		libhidapi.so:comms/hidapi \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		cmake compiler:c++17-lang desktop-file-utils elfctl gl iconv \
 		pkgconfig qmake qt:6 sdl xorg
 
 ELF_FEATURES=	+noaslr:Binaries/dolphin-emu*
 
 # See: https://fr.dolphin-emu.org/download/?ref=btn
 # for latest beta version and associated commit
 USE_GITHUB=	yes
 GH_PROJECT=	dolphin
 GH_TAGNAME=	1efda86
 .include "${.CURDIR}/Makefile.tuples"
 
 USE_GL=		egl gl
 USE_SDL=	sdl2
 USE_XORG=	ice sm x11 xext xi xrandr
 USE_QT=		base svg
 
 # XXX USE_MGBA crashes configure step
 CMAKE_ARGS+=	-DUSE_UPNP:BOOL=ON \
 		-DENABLE_QT:BOOL=ON \
 		-DENABLE_ALSA:BOOL=OFF \
 		-DENABLE_PULSEAUDIO:BOOL=ON \
 		-DUSE_DISCORD_PRESENCE:BOOL=OFF \
 		-DUSE_MGBA:BOOL=OFF \
 		-DENABLE_AUTOUPDATE:BOOL=OFF
 MAKE_ENV+=	DESTDIR="${STAGEDIR}"
 
 # XXX Fix build on archs where 'unsigned long' is 32bit
 CXXFLAGS+=	-DLZO_CFG_PREFER_TYPEOF_ACC_INT32E_T=LZO_TYPEOF_INT
 
 # Bypass git check (and set a dummy -unused- revision)
 CMAKE_ARGS+=	-DDOLPHIN_WC_BRANCH:STRING="stable" \
 		-DDOLPHIN_WC_REVISION:STRING="1"
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CMAKE_ON=	-DDISABLE_NLS:BOOL=OFF
 NLS_CMAKE_OFF=	-DDISABLE_NLS:BOOL=ON
 
 .include <bsd.port.pre.mk>
 
 # JIT-enabled binaries are amd64 and aarch64 only
 .if ${ARCH} != "amd64" && ${ARCH} != "aarch64"
 CMAKE_ARGS+=	-DENABLE_GENERIC:BOOL=ON
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE:Mclang}
 CMAKE_ARGS+=	-DENABLE_LLVM:BOOL=ON \
 		-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm
 LIB_DEPENDS+=	libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/}.so:devel/llvm${LLVM_DEFAULT}
 .else
 CMAKE_ARGS+=	-DENABLE_LLVM:BOOL=OFF
 .endif
 
 # For maintainer (do not forget to clean up Makefile.tuples afterwards to
 # remove useless submodules)
 Makefile.tuples::
 	@${ECHO_CMD} -n > ${.CURDIR}/Makefile.tuples
 	@${RM} -rf ${WRKDIR}/.maintainer.checkout
 	@${MKDIR} ${WRKDIR}/.maintainer.checkout && \
 		cd ${WRKDIR}/.maintainer.checkout && \
 		git clone https://github.com/${GH_ACCOUNT}/${GH_PROJECT} . && \
 		git checkout ${GH_TAGNAME} && \
 		git submodule init && \
 		git submodule update --recursive && \
 		${SH} ${FILESDIR}/gen_gh_tuple.sh > ${.CURDIR}/Makefile.tuples
 
 .include <bsd.port.post.mk>
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 44c9fcb9f8b9..1dfb83ec39ad 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.17.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
 DISTFILES=	${PORTNAME}.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
 WWW=		https://www.ppsspp.org/
 
 LICENSE=	GPLv2+
 
 # Bi-endian architectures default to big for some reason
 NOT_FOR_ARCHS=	mips mips64 powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \
 		https://github.com/hrydgard/ppsspp/issues/8823
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libsnappy.so:archivers/snappy \
 		libzstd.so:archivers/zstd \
 		libavcodec.so:multimedia/ffmpeg \
 		libminiupnpc.so:net/miniupnpc
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
 GH_TUPLE?=	hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \
 		google:cpu_features:v0.8.0-27-gfd4ffc1:cpu_features/ext/cpu_features \
 		rtissera:libchdr:26d27ca:libchdr/ext/libchdr \
 		unknownbrackets:ppsspp-debugger:9776332:debugger/assets/debugger \
 		KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \
 		Kingcom:armips:v0.11.0-195-ga8d71f0:armips/ext/armips \
 		Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \
 		RetroAchievements:rcheevos:v11.0.0-26-ge7989c3:rcheevos/ext/rcheevos \
 		Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig shared-mime-info
 EXCLUDE=	libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		glew opengl
 CMAKE_ON=	${FFMPEG LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
 CMAKE_OFF=	USE_DISCORD
 LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network
 SUB_FILES=	pkg-message
 PORTDATA=	assets
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME} %f" \
 		"Game;Emulator;" \
 		""
 
 OPTIONS_DEFINE=	VULKAN
 OPTIONS_DEFAULT=VULKAN
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	LIBRETRO QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_EXCLUDE} ${OPTIONS_SINGLE_GUI}
 
 LIBRETRO_DESC=	libretro core for games/retroarch
 LIBRETRO_CMAKE_BOOL=	LIBRETRO
 LIBRETRO_PLIST_FILES=	lib/libretro/${PORTNAME}_libretro.so
 LIBRETRO_VARS=	CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES=
 QT5_USES=	elfctl qt:5 sdl
 QT5_USE=	QT=qmake:build,buildtools:build,linguisttools:build,gui,multimedia,opengl,widgets
 QT5_USE+=	SDL=sdl2 # audio, joystick
 QT5_CMAKE_BOOL=	USING_QT_UI
 QT5_VARS=	EXENAME=PPSSPPQt ELF_FEATURES=+wxneeded:PPSSPPQt
 SDL_CATEGORIES=		wayland
 SDL_BUILD_DEPENDS=	png>=1.6:graphics/png
 SDL_LIB_DEPENDS=	libpng.so:graphics/png
 SDL_USES=	elfctl sdl
 SDL_USE=	SDL=sdl2
 SDL_VARS=	EXENAME=PPSSPPSDL ELF_FEATURES=+wxneeded:PPSSPPSDL
 VULKAN_DESC=		Vulkan renderer
 VULKAN_RUN_DEPENDS=	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \
 		${WRKSRC}/assets/gamecontrollerdb.txt
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/UI/NativeApp.cpp
 	@${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' \
 		${WRKSRC}/git-version.cmake
 
 do-install-QT5-on do-install-SDL-on:
 	${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-LIBRETRO-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/${LIBRETRO_PLIST_FILES:T} \
 		${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H}
 
 .include <bsd.port.mk>
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 5edf52eddf6e..4ee242afb793 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	0ad
 PORTVERSION=	0.0.26
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	games
 MASTER_SITES=	http://releases.wildfiregames.com/ \
 		SF/zero-ad/releases
 DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
 		${PORTNAME}-${PORTVERSION}-alpha-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
 
 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}-${PORTVERSION}-alpha
 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-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 			-e 's|%%CC%%|${CC}|' \
 		${WRKSRC}/build/premake/premake5.lua ${WRKSRC}/build/premake/extern_libs5.lua
 .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} -e '1055,1251s/-rdynamic/-lssp_nonshared &/' \
 			-e '1441s/"execinfo",/& "ssp_nonshared",/' \
 		${WRKSRC}/build/premake/premake5.lua
 .endif
 
 pre-build:
 	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --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 libmozjs78-ps-release.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/DDNet/Makefile b/games/DDNet/Makefile
index 24ccc3455b42..233cf93faf06 100644
--- a/games/DDNet/Makefile
+++ b/games/DDNet/Makefile
@@ -1,112 +1,113 @@
 PORTNAME=	DDNet
 PORTVERSION=	18.3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://ddnet.tw/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	DDraceNetwork, a cooperative racing mod of Teeworlds
 WWW=		https://ddnet.tw/ \
 		https://github.com/ddnet/ddnet
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cargo cmake compiler:c++17-lang pkgconfig python sqlite:3 ssl tar:xz
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}"
 CMAKE_OFF=	AUTOUPDATE DOWNLOAD_GTEST PREFER_BUNDLED_LIBS
 
 CXXFLAGS+=	-DBINARY_DIR="\\\"${PREFIX}/bin\\\""
 
 CARGO_INSTALL=	no
 CARGO_TEST=	no
 CARGO_TARGET_DIR=${BUILD_WRKSRC}
 CARGO_ENV+=	DDNET_TEST_NO_LINK=1
 CARGO_CRATES=	cc-1.0.73 \
 		cxx-1.0.71 \
 		cxxbridge-flags-1.0.71 \
 		cxxbridge-macro-1.0.71 \
 		link-cplusplus-1.0.6 \
 		proc-macro2-1.0.40 \
 		quote-1.0.20 \
 		syn-1.0.98 \
 		unicode-ident-1.0.1
 
 PORTDATA=	*
 DATADIR=	${PREFIX}/share/ddnet
 
 TEST_ENV=	${MAKE_ENV} GTEST_FILTER=-Io.CurrentExe:Jobs.LookupHost:Io.CurrentExe:Jobs.LookupHostWebsocket
 
 OPTIONS_DEFINE=		TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP VULKAN
 OPTIONS_MULTI=		COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT SERVER
 OPTIONS_DEFAULT=	CLIENT SERVER VIDEORECORDER UPNP VULKAN
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build game client
 CLIENT_CMAKE_BOOL=	CLIENT
 CLIENT_USES=		gettext gl sdl xorg desktop-file-utils
 CLIENT_USE=		GL=gl,glew SDL=sdl2
 CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libwavpack.so:audio/wavpack \
 			libopusfile.so:audio/opusfile \
 			libopus.so:audio/opus \
 			libogg.so:audio/libogg \
 			libnotify.so:devel/libnotify \
 			libcurl.so:ftp/curl
 
 SERVER_DESC=		Build game server
 SERVER_CMAKE_BOOL=	SERVER
 # does not build without these libs, but does not need them in
 # runtime either
 SERVER_BUILD_DEPENDS=	glew>=0:graphics/glew \
 			wavpack>=0:audio/wavpack
 
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_TEST_TARGET=	run_tests  # tests are broken
 
 WEBSOCKETS_DESC=	Enable WebSocket support for server
 WEBSOCKETS_CMAKE_BOOL=	WEBSOCKETS
 WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 
 MYSQL_DESC=		Enable MySQL/MariaDB support for server
 MYSQL_CMAKE_BOOL=	MYSQL
 MYSQL_USES=		mysql
 MYSQL_LIB_DEPENDS=	libmysqlcppconn.so:databases/mysql-connector-c++
 
 VIDEORECORDER_DESC=	Video recording support using FFmpeg to the client
 VIDEORECORDER_CMAKE_BOOL=VIDEORECORDER
 VIDEORECORDER_LIB_DEPENDS=libavcodec.so:multimedia/ffmpeg
 
 UPNP_DESC=		UPnP support for the server
 UPNP_CMAKE_BOOL=	UPNP
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_IMPLIES=		SERVER
 
 VULKAN_DESC=		Enable the vulkan backend
 VULKAN_CMAKE_BOOL=	VULKAN
 VULKAN_IMPLIES=		CLIENT
 VULKAN_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 			${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 post-extract:
 # json-parser and md5 are left intact
 .for dep in glew pnglite wavpack zlib
 	@${RM} -r ${WRKSRC}/src/engine/external/${dep}
 .endfor
 
 post-build:
 	@${ECHO_MSG} "===> Returning from cargo build to cmake build"
 	@${FIND} ${BUILD_WRKSRC} -name libddnet_engine_shared.a -exec ${CP} -p {} ${BUILD_WRKSRC}/release/ \;
 	@cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt
 
 post-patch-TEST-off:
 	@${REINPLACE_CMD} -e '/find_package.*GTest/ d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index 608b8ad3d993..7341d763f55a 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	megaglest
 PORTVERSION=	3.13.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 
 MAINTAINER=	monwarez@mailoo.org
 COMMENT=	Open source 3D real-time strategy game
 WWW=		https://megaglest.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/docs/gnu_gpl_3.0.txt
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libftgl.so:graphics/ftgl \
 		libircclient.so:irc/libircclient \
 		libvorbis.so:audio/libvorbis \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libminiupnpc.so:net/miniupnpc
 BUILD_DEPENDS=	${LOCALBASE}/include/miniupnpc/miniupnpc.h:net/miniupnpc
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:games/megaglest-data
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MegaGlest
 GH_PROJECT=	megaglest-source
 
 SUB_FILES=	pkg-message
 
 USES=		cmake:insource compiler:c++11-lib display:build dos2unix jpeg lua \
 		openal:al,alut pkgconfig ssl localbase:ldflags sdl gl xorg
 USE_GL=		glew gl glu
 USE_SDL=	sdl2
 USE_XORG=	sm ice x11 xext
 USE_CXXSTD=	c++11
 
 LDFLAGS+=	-lssl -lcrypto
 LDFLAGS_i386=	-Wl,-znotext
 
 OPTIONS_DEFINE=	EDITOR DOCS VIEWER
 OPTIONS_SUB=	yes
 EDITOR_DESC=	Install MegaGlest Editor
 VIEWER_DESC=	Install Megaglest G3D viewer
 
 EDITOR_CMAKE_BOOL=	BUILD_MEGAGLEST_MAP_EDITOR
 EDITOR_USE=		WX=3.0
 
 VIEWER_CMAKE_BOOL=	BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS \
 			BUILD_MEGAGLEST_MODEL_VIEWER
 VIEWER_USE=		WX=3.0
 
 .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-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local/include/lua51,${LUA_INCDIR},g ; \
 		s,/usr/local/lib/lua51,${LUA_LIBDIR},g ; \
 		s,lua5.2,lua-${LUA_VER},g' \
 		${WRKSRC}/mk/cmake/Modules/FindLUA.cmake
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/mk/shared/megaglest.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 .for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-install-EDITOR-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor
 	${INSTALL_DATA} ${WRKSRC}/mk/shared/editor.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
 
 do-install-VIEWER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer
 	${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.post.mk>
diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
index 400eb9628af3..1ba4b2897144 100644
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	openclonk
 DISTVERSION=	8.1
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	http://www.openclonk.org/builds/release/${DISTVERSION}/
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Multiplayer action game involving small and nimble humanoids
 WWW=		https://www.openclonk.org/
 
 LICENSE=	ISCL CC0-1.0
 LICENSE_COMB=	multi
 LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
 
 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 size
 BROKEN_powerpc64=	fails to compile: C4Texture.cpp:260:13: error: 'stoul' is not a member of 'std'
 
 LIB_DEPENDS=	libalut.so:audio/freealut \
 		libfreetype.so:print/freetype2 \
 		libminiupnpc.so:net/miniupnpc \
 		libogg.so:audio/libogg \
 		libpng.so:graphics/png \
 		libtinyxml.so:textproc/tinyxml \
 		libvorbis.so:audio/libvorbis
 
 WRKSRC=		${WRKDIR}/openclonk-release-${PORTVERSION}-src
 
 # make install has parallel issues with ninja
 USES=		cmake:noninja compiler:c++14-lang desktop-file-utils gl gnome jpeg openal \
 		pkgconfig sdl tar:bzip2 xorg
 USE_GL=		gl glew glu
 USE_SDL=	sdl2
 USE_XORG=	x11 xpm
 CMAKE_ARGS=	-DAudio_TK:STRING="OpenAL"
 CFLAGS_powerpc64le=	-DNO_WARN_X86_INTRINSICS
 LDFLAGS_i386=	-Wl,-znotext
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == "clang"
 LDFLAGS_i386+=  -Wl,--no-check-dynamic-relocations
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \
 		-e 's|share/games|share|' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index f98323f2a724..147896fb5370 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	simutrans
 DISTVERSION=	124-1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/simutrans/simutrans/${DISTVERSION}
 DISTNAME=	simutrans-src-${DISTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Transportation simulator
 WWW=		https://www.simutrans.com/
 
 LICENSE=	ART10 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_ART10=	${WRKSRC}/simutrans/license.txt
 LICENSE_FILE_MIT=	${WRKSRC}/simutrans/license_squirrel.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++14-lang pkgconfig sdl zip
 USE_SDL=	sdl2
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_CCache \
 		CMAKE_DISABLE_FIND_PACKAGE_Git \
 		CMAKE_DISABLE_FIND_PACKAGE_Subversion
 CMAKE_ARGS=	-DSIMUTRANS_USE_REVISION=1
 
 NO_WRKSUBDIR=	yes
 
 PORTDATA=	*
 PORTDOCS=	change_request.txt \
 		history.txt \
 		problem_report.txt \
 		readme.txt \
 		thanks.txt
 
 DESKTOP_ENTRIES=Simutrans "" simutrans simutrans "Game;Simulation;" false
 
 OPTIONS_DEFINE=	DOCS UPNP FLUIDSYNTH
 OPTIONS_MULTI=	PAKS
 OPTIONS_MULTI_PAKS=	PAK64 PAK128 PAK128_GERMAN
 OPTIONS_DEFAULT=PAK128 UPNP FLUIDSYNTH
 
 PAKS_DESC=			Graphics sets
 PAK64_DESC=			Enable low resolution graphics set
 PAK64_RUN_DEPENDS=		simutrans-pak64>=0:games/simutrans-pak64
 PAK128_DESC=			Enable high resolution graphics set
 PAK128_RUN_DEPENDS=		simutrans-pak128>=0:games/simutrans-pak128
 PAK128_GERMAN_DESC=		Enable german graphics set
 PAK128_GERMAN_RUN_DEPENDS=	simutrans-pak128.german>=0:games/simutrans-pak128.german
 
 UPNP_DESC=			Use MiniUPNP for easier server setup
 UPNP_LIB_DEPENDS=		libminiupnpc.so:net/miniupnpc
 UPNP_CMAKE_BOOL=		SIMUTRANS_USE_UPNP
 
 FLUIDSYNTH_DESC=		Enable FluidSynth for MIDI playback
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_BOOL=		SIMUTRANS_USE_FLUIDSYNTH_MIDI
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/simutrans && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index f8e3dea7d777..6d5be55761f0 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	warzone2100
 PORTVERSION=	4.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_src
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Innovative 3D real-time strategy game
 WWW=		https://wz2100.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	7zz:archivers/7-zip \
 		a2x:textproc/asciidoc
 LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libpng.so:graphics/png \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libtheora.so:multimedia/libtheora \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsodium.so:security/libsodium \
 		libcurl.so:ftp/curl \
 		libminiupnpc.so:net/miniupnpc \
 		libopusfile.so:audio/opusfile \
 		libopus.so:audio/opus
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 USES=		cmake bison compiler:c++11-lib gl openal:al pkgconfig \
 		sdl sqlite tar:xz
 USE_GL=		gl
 USE_SDL=	sdl2
 CMAKE_ARGS=	-DWZ_DISTRIBUTOR="FreeBSD ports" \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE \
 	       	-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \
 		-DWZ_ENABLE_WARNINGS_AS_ERRORS=FALSE \
 		-DFETCHCONTENT_FULLY_DISCONNECTED=TRUE \
 		-DWZ_FORCE_MINIMAL_OPUSFILE=FALSE \
 		-DWZ_DOWNLOAD_PREBUILT_PACKAGES=FALSE \
 		-DFMT_INSTALL=FALSE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	VULKAN FRIBIDI DOCS NLS
 OPTIONS_DEFAULT=VULKAN FRIBIDI
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CMAKE_BOOL=	ENABLE_NLS
 
 VULKAN_DESC=		Enable Vulkan backend
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers \
 			${LOCALBASE}/bin/glslc:graphics/shaderc
 VULKAN_CMAKE_BOOL=	WZ_ENABLE_BACKEND_VULKAN
 
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Fribidi=TRUE
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -iname "*cmake*" -exec \
 		${REINPLACE_CMD} -i '' -e '/find_package(Git/d' {} \;
 
 post-extract:
 .for bundled in miniupnp SQLiteCpp/sqlite3
 	@${RM} -rf ${WRKSRC}/3rdparty/${bundled}
 .endfor
 	@${RM} -rf ${WRKSRC}/lib/sound/3rdparty
 
 .include <bsd.port.mk>
diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index 2d2836aede8f..727ce77b5660 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	iroffer
 PORTVERSION=	3.33
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	https://iroffer.net/
 PKGNAMESUFFIX=	-dinoex${PKGNAMESUFFIX2}
 DISTNAME=	iroffer-dinoex-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
 WWW=		https://iroffer.net/
 
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-1* iroffer-lamm-1.*
 
 USES=		ssl
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	CC="${CC}" LDFLAGS="${LDFLAGS}" LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV=	LANG=en_EN.UTF-8
 MAKE_ENV=	LANG=en_EN.UTF-8
 ALL_TARGET=	all-lang doc
 USE_RC_SUBR=	iroffer
 
 IROFFER_DOCS=	README README.modDinoex LIESMICH.modDinoex \
 		LICENSE THANKS TODO \
 		help-admin-de.txt help-admin-en.txt \
 		help-admin-fr.txt help-admin-it.txt \
 		doc/iroffer.1.txt doc/iroffer.1.html doc/iroffer.1.ps \
 		doc/INSTALL-linux-de.html doc/INSTALL-linux-de.txt \
 		doc/INSTALL-linux-en.html doc/INSTALL-linux-en.txt \
 		doc/INSTALL-linux-fr.html doc/INSTALL-linux-fr.txt \
 		doc/INSTALL-linux-it.html doc/INSTALL-linux-it.txt \
 		doc/INSTALL-vhost-de.html doc/INSTALL-vhost-de.txt \
 		doc/INSTALL-vhost-en.html doc/INSTALL-vhost-en.txt \
 		doc/INSTALL-vhost-fr.html doc/INSTALL-vhost-fr.txt
 IROFFER_EXAMPLES=	iroffer.cron \
 		sample.config beispiel.config exemple.config \
 		header.html footer.html ruby-sample.rb
 IROFFER_HTDOCS=	iroffer-state.css robots.txt \
 		info.txt.rb list.json.rb md5.txt.rb sfv.txt.rb
 
 OPTIONS_DEFINE=	CURL RUBY UPNP GEOIP DOCS EXAMPLES
 OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ON=	-curl
 RUBY_USES=		ruby
 RUBY_LIB_DEPENDS=	libruby${RUBY_SHLIBVER}.so:${RUBY_PORT}
 RUBY_CONFIGURE_ON=	-ruby
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CONFIGURE_ON=	-upnp
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 GEOIP_CONFIGURE_ON=	-geoip
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MRUBY}
 # make stage-qa happy
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/iroffer.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/xdcc.7 ${STAGEDIR}${PREFIX}/share/man/man7/
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${IROFFER_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/htdocs
 .for i in ${IROFFER_HTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/htdocs/${i} ${STAGEDIR}${EXAMPLESDIR}/htdocs/
 .endfor
 .for i in ${IROFFER_EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 06f9ec08f2da..b0af06ec85e1 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -1,116 +1,117 @@
 PORTNAME=	bitcoin
 PORTVERSION=	27.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p finance
 MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
 		LOCAL/swills:icon
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bitcoin128.png:icon
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${_DISTFILES:N*.png}
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
 WWW=		https://www.bitcoin.org/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
 USES=		autoreconf compiler:c++20-lang cpe gmake libtool pkgconfig qt:5 shebangfix
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SLAVE_PORT?=	no
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 USES+=		desktop-file-utils
 USE_QT=		core gui network widgets \
 		buildtools:build linguisttools:build qmake:build
 
 BUILD_DEPENDS+=	protoc:devel/protobuf
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
 TESTS_USE=		QT=testlib
 TESTS_PLIST_FILES=	bin/test_bitcoin-qt \
 			bin/test_bitcoin
 .endif
 
 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ
 OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET ZMQ
 OPTIONS_SUB=		yes
 
 HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
 QRCODES_DESC=	Display QR Codes
 TESTS_DESC=	Build test binary and unit tests
 WALLET_DESC=	Wallet Management Support
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
 DBUS_CONFIGURE_WITH=	dbus
 DBUS_USE=		QT=dbus
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 
 HARDENING_CONFIGURE_ENABLE=	hardening
 
 TESTS_CONFIGURE_ENABLE=	tests bench
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes"
 TESTS_PLIST_FILES=	bin/test_bitcoin
 .endif
 TESTS_PLIST_FILES+=	bin/bench_bitcoin
 
 UPNP_CONFIGURE_WITH=	miniupnpc
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CPPFLAGS=		-I${LOCALBASE}/include
 UPNP_LIBS=		-L${LOCALBASE}/lib
 
 QRCODES_CONFIGURE_WITH=	qrencode
 QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 WALLET_CONFIGURE_OFF=	--disable-wallet
 WALLET_CONFIGURE_ON=	--enable-wallet \
 			--with-incompatible-bdb \
 			--with-sqlite=yes \
 			BDB_CFLAGS=-I${BDB_INCLUDE_DIR} \
 			BDB_LIBS="-L${BDB_LIB_DIR} \
 				-Wl,-rpath=${BDB_LIB_DIR} \
 				-l${BDB_LIB_CXX_NAME}"
 WALLET_USES=		bdb:5+ sqlite:3
 
 ZMQ_CONFIGURE_ENABLE=	zmq
 ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
 ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
 
 GH_ACCOUNT=	bitcoin
 
 CONFIGURE_ARGS?=	--without-libs \
 			--with-gui=qt5 \
 			--without-daemon \
 			--without-utils
 
 CONFIGURE_ENV=	OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=	V=1
 
 PLIST_FILES?=	bin/bitcoin-qt share/man/man1/bitcoin-qt.1.gz \
 		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
 
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
 post-install:
 	${INSTALL} ${FILESDIR}/bitcoin-qt.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL} ${DISTDIR}/${DIST_SUBDIR}/bitcoin128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .endif
 
 regression-test: build
 	# To use this sucessfully, remove --without-daemon and --without-utils
 	# from CONFIGURE_ARGS above.
 
 	@cd ${WRKSRC} && ${GMAKE} check
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index a7cf9fc7aa01..181df6310b01 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	eiskaltdcpp
 PORTVERSION=	2.2.10
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	27
+PORTREVISION?=	28
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX?=	-lib
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	EiskaltDC++ shared library and header files
 WWW=		https://github.com/eiskaltdcpp/eiskaltdcpp
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GENTOO_PATCHES_PREFIX=	${FILESDIR}/gentoo/${PORTNAME}-${PORTVERSION}
 EXTRA_PATCHES=	${GENTOO_PATCHES_PREFIX}-ipv6_upnp.patch:-p1 \
 		${GENTOO_PATCHES_PREFIX}-miniupnpc1.patch:-p1 \
 		${GENTOO_PATCHES_PREFIX}-miniupnpc2.patch:-p1 \
 		${GENTOO_PATCHES_PREFIX}-openssl-1.1.patch:-p1 \
 		${GENTOO_PATCHES_PREFIX}-tray-close.patch:-p1
 
 USE_GITHUB=	yes
 
 .if !defined (MASTERDIR)
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake gettext compiler:c++11-lib ssl
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	LUA PCRE IDN DHT MINIUPNP
 OPTIONS_DEFAULT=	IDN DHT
 DHT_DESC=	DHT support
 MINIUPNP_DESC=	UPnP support
 
 CMAKE_ARGS+=	-DBUILD_LIB:BOOL=ON
 CMAKE_ARGS+=	-DWITH_DEV_FILES:BOOL=ON
 CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK3:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_ASPELL:BOOL=OFF
 
 LUA_USES=	lua:51
 LUA_CMAKE_ON=	-DLUA_SCRIPT:BOOL=ON
 LUA_CMAKE_OFF=	-DLUA_SCRIPT:BOOL=OFF
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CMAKE_ON=	-DPERL_REGEX:BOOL=ON
 PCRE_CMAKE_OFF=	-DPERL_REGEX:BOOL=OFF
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CMAKE_ON=	-DUSE_IDNA:BOOL=ON
 IDN_CMAKE_OFF=	-DUSE_IDNA:BOOL=OFF
 
 DHT_CMAKE_ON=	-DWITH_DHT:BOOL=ON
 DHT_CMAKE_OFF=	-DWITH_DHT:BOOL=OFF
 
 #MINIUPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 MINIUPNP_CMAKE_ON=	-DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=ON
 MINIUPNP_CMAKE_OFF=	-DUSE_MINIUPNP:BOOL=OFF
 .endif
 
 USES+=		tar:xz
 PLIST=		${.CURDIR}/pkg-plist
 
 .if defined (MASTERDIR) && !defined (NO_BUILD)
 CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
 CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
 # these slave ports options have to be in sync with master library
 CMAKE_ARGS+=	-DUSE_IDNA:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^IDN ' | ${CUT} -f 2 -d ' '`
 CMAKE_ARGS+=	-DWITH_DHT:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^DHT ' | ${CUT} -f 2 -d ' '`
 CMAKE_ARGS+=	-DLUA_SCRIPT:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^LUA ' | ${CUT} -f 2 -d ' '`
 CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^MINIUPNP ' | ${CUT} -f 2 -d ' '`
 CMAKE_ARGS+=	-DLOCAL_MINIUPNP:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^MINIUPNP ' | ${CUT} -f 2 -d ' '`
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index 0094ee26f296..e5dbd8cc15a1 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -1,118 +1,118 @@
 PORTNAME=	litecoin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	hsw@bitmark.com
 COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
 WWW=		https://www.litecoin.org/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libevent.so:devel/libevent
 
 USES=		autoreconf compiler:c++11-lib cpe gmake libtool localbase pkgconfig qt:5 shebangfix ssl
 
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SLAVE_PORT?=	no
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 USES+=		desktop-file-utils
 USE_QT=		core gui network widgets \
 		buildtools:build linguisttools:build qmake:build
 
 BUILD_DEPENDS+=	protoc:devel/protobuf
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
 TESTS_USE=		QT=testlib
 TESTS_PLIST_FILES=	bin/test_litecoin-qt \
 			bin/test_litecoin
 .endif
 
 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET_BDBMODERN ZMQ
 OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ
 OPTIONS_SUB=		yes
 
 HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
 QRCODES_DESC=	Display QR Codes
 TESTS_DESC=	Build test binary and unit tests
 WALLET_BDBMODERN_DESC=	Wallet using modern BDB 18.x
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
 DBUS_CONFIGURE_WITH=	dbus
 DBUS_USE=		QT=dbus
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 
 HARDENING_CONFIGURE_ENABLE=	hardening
 
 TESTS_CONFIGURE_ENABLE=	tests bench
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes"
 TESTS_PLIST_FILES=	bin/test_litecoin
 .endif
 TESTS_PLIST_FILES+=	bin/bench_litecoin
 
 UPNP_CONFIGURE_WITH=	miniupnpc
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 
 QRCODES_CONFIGURE_WITH=	qrencode
 QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 ZMQ_CONFIGURE_ENABLE=	zmq
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 GH_ACCOUNT=	litecoin-project
 
 CONFIGURE_ARGS?=	--without-libs \
 			--with-gui=qt5 \
 			--without-daemon \
 			--without-utils
 
 CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
 		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=	V=1
 
 PLIST_FILES?=	bin/litecoin-qt share/man/man1/litecoin-qt.1.gz \
 		share/applications/litecoin-qt.desktop share/pixmaps/litecoin.png
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWALLET_BDBMODERN}
 CONFIGURE_ARGS+=	--enable-wallet --with-incompatible-bdb
 USES+=			bdb:18
 .else
 CONFIGURE_ARGS+=	--disable-wallet
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MWALLET_BDBMODERN}
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 LIBS+=		-L${BDB_LIB_DIR}
 .endif
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
 post-install:
 	${INSTALL} ${FILESDIR}/litecoin-qt.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/litecoin.png
 
 .endif
 
 regression-test: build
 	# To use this sucessfully, remove --without-daemon and --without-utils
 	# from CONFIGURE_ARGS above.
 
 	@cd ${WRKSRC} && ${GMAKE} check
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile
index 578472ccb2e0..b248ad6be563 100644
--- a/net-p2p/monero-cli/Makefile
+++ b/net-p2p/monero-cli/Makefile
@@ -1,108 +1,108 @@
 PORTNAME=	monero-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Private, secure, untraceable, decentralised digital currency (CLI)
 WWW=		https://getmonero.org/
 
 LICENSE=	BSD3CLAUSE
 
 BROKEN_SSL=	libressl
 BROKEN_aarch64=	fails to compile: uses unavailable HWCAP_AES and getauxval
 
 LIB_DEPENDS=	\
 		libboost_chrono.so:devel/boost-libs \
 		libboost_date_time.so:devel/boost-libs \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs \
 		libboost_regex.so:devel/boost-libs \
 		libboost_serialization.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		libminiupnpc.so:net/miniupnpc \
 		libnorm.so:net/norm \
 		libpgm.so:net/openpgm \
 		libsodium.so:security/libsodium \
 		libunbound.so:dns/unbound \
 		libzmq.so:net/libzmq4
 BUILD_DEPENDS=	${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \
 		${LOCALBASE}/include/zmq.hpp:net/cppzmq
 
 USES=		cmake compiler:c++11-lib pkgconfig readline ssl
 USE_GITHUB=	yes
 .if defined(PKGNAMESUFFIX)
 GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 .else
 GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
 .endif
 GH_TUPLE=	monero-project:monero:${GIT_COMMIT} \
 		monero-project:supercop:633500ad8c875999:ext1/external/supercop \
 		tevador:RandomX:85c527a62301b7b8be89d941:ext2/external/randomx \
 		trezor:trezor-common:bff7fdfe436c727982c:ext3/external/trezor-common
 
 CFLAGS+=	-D_WANT_SEMUN
 
 OPTIONS_DEFINE=		DOXYGEN NATIVE
 DOXYGEN_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen:devel/doxygen
 DOXYGEN_CMAKE_BOOL=	BUILD_DOCUMENTATION
 NATIVE_CMAKE_ON=	-DARCH=native
 NATIVE_CMAKE_OFF=	-DARCH=default
 
 .include <bsd.port.pre.mk>
 
 # On FreeBSD 12.x the default ld(1) is LLVM's ld which needs an explicit -m option
 # when linking without any input .o on the command line, like:
 # /usr/bin/ld -melf_amd64 -r -b binary -o blocksdat.o blocks.dat
 # See Bug 226996 - net-p2p/monero-cli: fails to link with lld as the system linker
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226996
 .if ${ARCH} == aarch64
 LD_EMULATION=	aarch64elf
 .elif ${ARCH} == amd64
 LD_EMULATION=	elf_amd64
 .elif ${ARCH} == i386
 LD_EMULATION=	elf_i386_fbsd
 .elif ${ARCH} == powerpc
 LD_EMULATION=	elf32ppc
 .elif ${ARCH} == powerpc64
 LD_EMULATION=	elf64ppc
 .elif ${ARCH} == powerpc64le
 LD_EMULATION=	elf64lppc
 .endif
 
 CMAKE_ARGS+=	-DLD_RAW_FLAGS:STRING=-m${LD_EMULATION}
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .else
 CMAKE_ARGS+=	-DSTACK_TRACE:BOOL=OFF
 .endif
 
 CMAKE_ARGS+=	-DMANUAL_SUBMODULES:BOOL=ON
 
 USE_RC_SUBR=	monerod
 
 USERS=		monero
 GROUPS=		monero
 
 PLIST_FILES=	\
 		bin/monero-blockchain-ancestry \
 		bin/monero-blockchain-depth \
 		bin/monero-blockchain-export \
 		bin/monero-blockchain-import \
 		bin/monero-blockchain-mark-spent-outputs \
 		bin/monero-blockchain-prune \
 		bin/monero-blockchain-prune-known-spent-data \
 		bin/monero-blockchain-stats \
 		bin/monero-blockchain-usage \
 		bin/monero-gen-ssl-cert \
 		bin/monero-gen-trusted-multisig \
 		bin/monero-wallet-cli \
 		bin/monero-wallet-rpc \
 		bin/monerod
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index 2967137c5740..0173e7138cb2 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -1,116 +1,116 @@
 PORTNAME=	namecoin
 DISTVERSION=	24.0
 DISTVERSIONPREFIX=	nc
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net-p2p dns
 
 MAINTAINER=	milios@ccsys.com
 COMMENT?=	Decentralized, open DNS and general purpose key/value store
 WWW=		https://namecoin.org/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
 USES=		autoreconf compiler:c++17-lang gmake libtool pkgconfig ssl
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	indolering:graphics
 GH_PROJECT=	namecoin-core namecoin-graphics:graphics
 GH_TAGNAME=	a13a73b:graphics
 
 SLAVE_PORT?=	no
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 USES+=		desktop-file-utils qt:5
 USE_QT=		core buildtools gui linguisttools:build network qmake:build xml widgets
 
 BUILD_DEPENDS+=	protoc:devel/protobuf \
 		svg2png:graphics/svg2png
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
 TESTS_USES=		qt:5
 TESTS_USE=		QT=testlib
 TESTS_PLIST_FILES=	bin/test_namecoin-qt \
 			bin/test_namecoin
 .endif
 
 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ
 OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET
 OPTIONS_SUB=		yes
 
 HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
 QRCODES_DESC=	Display QR Codes
 TESTS_DESC=	Build test binary and unit tests
 WALLET_DESC=	Wallet Management Support
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
 DBUS_CONFIGURE_WITH=	qtdbus
 DBUS_USES=		qt:5
 DBUS_USE=		QT=dbus
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 
 HARDENING_CONFIGURE_ENABLE=	hardening
 
 TESTS_CONFIGURE_ENABLE=	tests bench
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes"
 TESTS_PLIST_FILES=	bin/test_namecoin
 .endif
 TESTS_PLIST_FILES+=	bin/bench_namecoin
 
 UPNP_CONFIGURE_WITH=	miniupnpc
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_USES=		localbase
 
 QRCODES_CONFIGURE_WITH=	qrencode
 QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 WALLET_CONFIGURE_OFF=	--disable-wallet
 WALLET_CONFIGURE_ON=	--enable-wallet \
 			--with-sqlite=no \
 			--with-incompatible-bdb \
 			BDB_CFLAGS=-I${BDB_INCLUDE_DIR} \
 			BDB_LIBS="-L${BDB_LIB_DIR} \
 			-Wl,-rpath=${BDB_LIB_DIR} -l${BDB_LIB_CXX_NAME}"
 WALLET_USES=		bdb:5+
 
 ZMQ_CONFIGURE_ENABLE=	zmq
 ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
 ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
 
 CONFIGURE_ARGS?=	--without-libs \
 			--with-gui=qt5 \
 			--without-daemon \
 			--without-utils \
 			--disable-man
 
 CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
 		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=	V=1
 
 PLIST_FILES?=	bin/namecoin-qt share/applications/namecoin-qt.desktop \
 		share/pixmaps/namecoin128.png
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/namecoin-qt.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 	${LOCALBASE}/bin/svg2png -w128 -h128 ${WRKSRC_graphics}/svg/namecoin-logo.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/namecoin128.png
 
 .endif
 
 regression-test: build
 	# To use this sucessfully, remove --without-daemon and --without-utils
 	# from CONFIGURE_ARGS above.
 
 	@cd ${WRKSRC} && ${GMAKE} check
 
 .include <bsd.port.mk>
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 77661cf29b6b..409799722d84 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	retroshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	net-p2p
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	428b331d8efe.patch:-p1
 
 MAINTAINER=	peter@netkey.at
 COMMENT=	Private and secure decentralised communication platform
 WWW=		https://retroshare.github.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libgpgme.so:security/gpgme \
 		libcurl.so:ftp/curl \
 		libminiupnpc.so:net/miniupnpc
 
 USES=		compiler:features desktop-file-utils dos2unix \
 		gl gnome pkgconfig qmake qt:5 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	RetroShare
 GH_PROJECT=	RetroShare
 RS_REVISION=	0e6d27a
 USE_GNOME=	libxml2 libxslt
 USE_GL=		gl
 USE_QT=		core gui multimedia printsupport network widgets xml \
 		buildtools:build uitools:build
 DOS2UNIX_FILES=	retroshare-nogui/src/retroshare-nogui.pro \
 		retroshare-gui/src/gui/elastic/node.cpp
 
 OPTIONS_DEFINE=	VOIP WEBUI
 OPTIONS_SUB=	yes
 
 VOIP_DESC=		Build with VoIP plugin (requires OpenCV)
 VOIP_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libopencv_highgui.so:graphics/opencv \
 			libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 VOIP_BROKEN=	gui/QVideoDevice.cpp:1:10: fatal error: 'opencv/cv.h' file not found
 
 WEBUI_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBUI_QMAKE_OFF=	CONFIG+=no_libresapihttpserver
 WEBUI_BROKEN=	api/ApiServerMHD.cpp:376:5: error: no matching function for call to 'MHD_get_connection_values'
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare.pri
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/libretroshare/src/libretroshare.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/libretroshare/src/rsserver/rsaccounts.cc
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
 		${WRKSRC}/data/retroshare.desktop
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/data/retroshare.desktop
 	@${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER   0x${RS_REVISION}|' \
 		${WRKSRC}/libretroshare/src/retroshare/rsversion.h
 
 post-patch-VOIP-off:
 # VoIP plugin does not build against modern `graphics/opencv' port
 	@${REINPLACE_CMD} -e '/VOIP/d' ${WRKSRC}/plugins/plugins.pro
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/transmission-components/Makefile b/net-p2p/transmission-components/Makefile
index 5721bd03a91f..19907f9b7ea0 100644
--- a/net-p2p/transmission-components/Makefile
+++ b/net-p2p/transmission-components/Makefile
@@ -1,204 +1,204 @@
 PORTNAME=	transmission
 DISTVERSION=	4.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	mondo.debater_0q@icloud.com
 COMMENT=	Transmission BitTorrent client
 WWW=		https://www.transmissionbt.com
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fast_float/fast_float.h:math/fast_float \
 		${LOCALBASE}/include/fmt/format.h:devel/libfmt \
 		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson \
 		${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp
 
 LIB_DEPENDS=	libb64.so:converters/libb64 \
 		libcurl.so:ftp/curl \
 		libdeflate.so:archivers/libdeflate \
 		libdht.so:devel/jech-dht \
 		libevent.so:devel/libevent \
 		libminiupnpc.so:net/miniupnpc \
 		libnatpmp.so:net/libnatpmp \
 		libpsl.so:dns/libpsl \
 		libutp.so:net-p2p/libutp
 
 FLAVORS=			cli docs daemon gtk qt utils web
 FLAVOR?=			${FLAVORS:[1]}
 .for flavor in ${FLAVORS}
 ${flavor}_PKGNAMESUFFIX=	-${flavor}
 .endfor
 
 DESCR=		${PKGDIR}/pkg-descr.${FLAVOR}
 
 .if ${FLAVOR} == docs
 NO_BUILD=	yes
 LIB_DEPENDS=
 .endif
 
 gtk_LIB_DEPENDS=	libayatana-appindicator3.so:devel/libayatana-appindicator \
 			libharfbuzz.so:print/harfbuzz
 
 USES=		cmake cpe iconv localbase pkgconfig ssl tar:xz
 
 CPE_VENDOR=	transmissionbt
 CPE_PRODUCT=	transmission
 
 EXTRACT_AFTER_ARGS=	--exclude third-party/dht \
 			--exclude third-party/fast_float \
 			--exclude third-party/fmt \
 			--exclude third-party/libb64 \
 			--exclude third-party/libdeflate \
 			--exclude third-party/libevent \
 			--exclude third-party/libnatpmp \
 			--exclude third-party/libpsl \
 			--exclude third-party/libutp \
 			--exclude third-party/miniupnpc \
 			--exclude third-party/rapidjson \
 			--exclude third-party/utfcpp
 
 .if ${FLAVOR} == gtk
 USES+=		desktop-file-utils gettext-runtime gettext-tools gnome
 USE_GNOME=	gdkpixbuf2 glibmm gtkmm30
 .endif
 
 .if ${FLAVOR} == qt
 USES+=		desktop-file-utils qmake:no_env qt:5
 USE_QT=		core dbus gui network svg widgets buildtools:build \
 		linguisttools:build
 .endif
 
 .if ${FLAVOR} == daemon
 USE_RC_SUBR=	transmission
 .endif
 
 .if ${FLAVOR} == docs
 USES=		cpe tar:xz
 .endif
 
 .if ${FLAVOR} == web
 USES=		cpe tar:xz
 NO_ARCH=	yes
 NO_BUILD=	yes
 .endif
 
 CMAKE_ON=	USE_SYSTEM_B64 USE_SYSTEM_DEFLATE USE_SYSTEM_DHT \
 		USE_SYSTEM_EVENT2 USE_SYSTEM_MINIUPNPC USE_SYSTEM_NATPMP \
 		USE_SYSTEM_PSL USE_SYSTEM_UTP
 CMAKE_OFF=	ENABLE_MAC REBUILD_WEB WITH_SYSTEMD
 
 .if ${FLAVOR:Ndocs}
 USERS=		transmission
 GROUPS=		transmission
 .endif
 
 PLIST=		${PKGDIR}/pkg-plist.${FLAVOR}
 
 .if ${FLAVOR} == cli
 CMAKE_ON+=	ENABLE_CLI
 CMAKE_OFF+=	ENABLE_DAEMON ENABLE_GTK ENABLE_QT ENABLE_UTILS INSTALL_WEB
 .endif
 
 .if ${FLAVOR} == daemon
 CMAKE_ON+=	ENABLE_DAEMON
 CMAKE_OFF+=	ENABLE_CLI ENABLE_GTK ENABLE_QT ENABLE_UTILS INSTALL_WEB
 .endif
 
 .if ${FLAVOR} == gtk
 CMAKE_ARGS+=	-DUSE_GTK_VERSION=3
 CMAKE_ON+=	ENABLE_GTK GTK_IS_REQUIRED
 CMAKE_OFF+=	ENABLE_CLI ENABLE_DAEMON ENABLE_UTILS INSTALL_WEB
 .endif
 
 .if ${FLAVOR} == qt
 CMAKE_ARGS+=	-DUSE_QT_VERSION=5
 CMAKE_ON+=	ENABLE_QT QT_IS_REQUIRED
 CMAKE_OFF+=	ENABLE_CLI ENABLE_DAEMON ENABLE_UTILS INSTALL_WEB
 .endif
 
 .if ${FLAVOR} == utils
 CMAKE_ON+=	ENABLE_UTILS
 CMAKE_OFF+=	ENABLE_CLI ENABLE_DAEMON ENABLE_GTK ENABLE_QT ENABLE_TESTS \
 		ENABLE_WERROR INSTALL_WEB
 .endif
 
 OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
 
 .if ${FLAVOR:Mdocs}
 OPTIONS_DEFINE=
 .endif
 
 .if ${FLAVOR:Mweb}
 OPTIONS_DEFINE=
 .endif
 
 .if ${FLAVOR:Nweb} && ${FLAVOR:Ndocs}
 OPTIONS_DEFINE=		NLS TESTS
 OPTIONS_DEFAULT=	NLS
 .endif
 
 OPTIONS_SUB=	yes
 
 daemon_DESC=	Build daemon
 docs_DESC=	Install documentation
 gtk_DESC=	Build GTK+ client
 qt_DESC=	Build QT client
 TESTS_DESC=	Build & run unit tests
 utils_DESC=	Build utilities (create, edit, remote, show)
 cli_DESC=	Build command-line client (deprecated)
 web_DESC=	Install web interface
 
 NLS_USES=	gettext-runtime:lib
 NLS_CMAKE_BOOL=	ENABLE_NLS
 
 TESTS_CMAKE_BOOL=	ENABLE_TESTS
 
 UTILS_CMAKE_BOOL=	ENABLE_UTILS
 
 WEB_CMAKE_BOOL=	INSTALL_WEB
 
 .if ${FLAVOR} == docs
 pre-install:
 	@${ECHO_MSG} "Removing outdated release notes"
 	@${FIND} ${WRKSRC}/news \( -name 'news-[0-3]*' -o -name '*beta*' \) -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} ; ${CP} AUTHORS ${STAGEDIR}${DOCSDIR} ;\
 	       	${CP} COPYING ${STAGEDIR}${DOCSDIR} ;\
 	       	${CP} README.md ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/docs ; ${CP} rpc-spec.md ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/extras ; ${CP} send-email-when-torrent-done.sh ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/news
 	@cd ${WRKSRC}/news ; ${CP} -R . ${STAGEDIR}${DOCSDIR}/news
 .endif
 
 .if ${FLAVOR} == qt
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA}	${WRKSRC}/qt/icons/transmission.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/transmission-qt.svg
 .endif
 
 .if ${FLAVOR} == daemon
 post-install:
 	        ${MKDIR} ${STAGEDIR}${ETCDIR}/home
 .endif
 
 .if ${FLAVOR} == web
 do-install:
 		( cd ${WRKSRC}/web && ${COPYTREE_SHARE} public_html ${STAGEDIR}${DATADIR} )
 .endif
 
 post-install-TESTS-on:
 	@${ECHO_MSG} "Running tests..."
 	@cd ${BUILD_WRKSRC}/tests/libtransmission/ && \
 		eval ${BUILD_WRKSRC}/tests/libtransmission/libtransmission-test \
 		--gtest_filter="-DhtTest.usesBootstrapFile" \
 		#fails in poudriere due to lack of networking, passes otherwise
 		--gtest_brief=1 \
 
 .include <bsd.port.mk>
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 8bbb0261a7b6..b7b2e54ed994 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	dante
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	http://www.inet.no/dante/files/ \
 		ftp://ftp.inet.no/pub/socks/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Circuit-level firewall/proxy
 WWW=		https://www.inet.no/dante/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc \
 		libsasl2.so:security/cyrus-sasl2
 
 USES=		libtool localbase
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
 		--with-sockd-conf=${PREFIX}/etc/sockd.conf
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	sockd
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 .for x in s d
 	${INSTALL_DATA} ${WRKSRC}/example/sock${x}.conf \
 		${STAGEDIR}${PREFIX}/etc/sock${x}.conf.sample
 .endfor
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/sockd-basic.conf \
 		${WRKSRC}/example/sockd-chaining.conf \
 		${WRKSRC}/example/socks-simple-withoutnameserver.conf \
 		${WRKSRC}/example/socks-simple.conf ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 	${INSTALL_DATA} ${WRKSRC}/doc/README* \
 		${WRKSRC}/doc/rfc* \
 		${WRKSRC}/doc/SOCKS4*.protocol \
 		${WRKSRC}/UPGRADE ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/sockd-stat.awk \
 		${STAGEDIR}${DOCSDIR}/contrib
 
 .include <bsd.port.mk>
diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
index 4bea81666acf..7254104cb2e2 100644
--- a/net/miniupnpc/Makefile
+++ b/net/miniupnpc/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	miniupnpc
-PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTVERSION=	2.2.8
+PORTREVISION=	0
 CATEGORIES?=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/ \
 		https://miniupnp.tuxfamily.org/files/
 
 MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT?=	UPnP IGD client lightweight library
-WWW=		http://miniupnp.free.fr/
+WWW=		https://miniupnp.tuxfamily.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		cpe gmake
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	miniupnp_project
 
 CONFIGURE_SCRIPT=	updateminiupnpcstrings.sh
 MAKE_ENV+=	INSTALLPREFIX=${PREFIX} LIBDIR=lib
 MAKE_ARGS+=	MANPATH="${PREFIX}/share/man"
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 CFLAGS+=	-DDEBUG
 .endif
 
 .if ${SLAVE_PORT} == no
 USE_RC_SUBR=	miniupnpc
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \
 		${STAGEDIR}${PREFIX}/bin/upnp-listdevices \
-		${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.17
+		${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.18
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/miniupnpc/distinfo b/net/miniupnpc/distinfo
index abc25bba934e..d4e92bf0daee 100644
--- a/net/miniupnpc/distinfo
+++ b/net/miniupnpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704356995
-SHA256 (miniupnpc-2.2.6.tar.gz) = 37fcd91953508c3e62d6964bb8ffbc5d47f3e13481fa54e6214fcc68704c66f1
-SIZE (miniupnpc-2.2.6.tar.gz) = 103949
+TIMESTAMP = 1721042565
+SHA256 (miniupnpc-2.2.8.tar.gz) = 05b929679091b9921b6b6c1f25e39e4c8d1f4d46c8feb55a412aa697aee03a93
+SIZE (miniupnpc-2.2.8.tar.gz) = 104603
diff --git a/net/miniupnpc/files/patch-Makefile b/net/miniupnpc/files/patch-Makefile
index cc50c1a9cf71..59fe731fe048 100644
--- a/net/miniupnpc/files/patch-Makefile
+++ b/net/miniupnpc/files/patch-Makefile
@@ -1,28 +1,28 @@
---- Makefile.orig	2024-01-04 00:43:45 UTC
+--- Makefile.orig	2024-06-08 22:09:36 UTC
 +++ Makefile
-@@ -147,7 +147,6 @@ TESTIGDDESCPARSE += $(BUILD)/minissdpc.o
+@@ -147,7 +147,6 @@ endif
  LIBOBJS += $(BUILD)/minissdpc.o
  endif
  
 -LIBDIR ?= lib
  # install directories
  ifeq ($(strip $(PREFIX)),)
  INSTALLPREFIX ?= /usr
-@@ -155,7 +154,7 @@ else
+@@ -155,7 +154,7 @@ INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
  INSTALLPREFIX ?= $(PREFIX)
  endif
  INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
 -INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
 +INSTALLDIRLIB = $(INSTALLPREFIX)/lib
  INSTALLDIRBIN = $(INSTALLPREFIX)/bin
  INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
  PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
-@@ -242,7 +241,7 @@ distclean: clean
+@@ -245,7 +244,7 @@ updateversion:	include/miniupnpc.h
  
  updateversion:	include/miniupnpc.h
  	cp $< $<.bak
 -	sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < $<.bak > $<
 +	sed -E 's/(.*MINIUPNPC_API_VERSION[[:space:]]+)[0-9]+/\1$(APIVERSION)/' < $<.bak > $<
  
  install:	updateversion $(FILESTOINSTALL)
  	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
diff --git a/net/miniupnpc/pkg-plist b/net/miniupnpc/pkg-plist
index f1f6bc1fe734..ad20a4774c93 100644
--- a/net/miniupnpc/pkg-plist
+++ b/net/miniupnpc/pkg-plist
@@ -1,18 +1,18 @@
 bin/external-ip
 bin/upnp-listdevices
 bin/upnpc
 include/miniupnpc/igd_desc_parse.h
 include/miniupnpc/miniupnpc.h
 include/miniupnpc/miniupnpc_declspec.h
 include/miniupnpc/miniupnpctypes.h
 include/miniupnpc/miniwget.h
 include/miniupnpc/portlistingparse.h
 include/miniupnpc/upnpcommands.h
 include/miniupnpc/upnpdev.h
 include/miniupnpc/upnperrors.h
 include/miniupnpc/upnpreplyparse.h
 lib/libminiupnpc.a
 lib/libminiupnpc.so
-lib/libminiupnpc.so.17
+lib/libminiupnpc.so.18
 libdata/pkgconfig/miniupnpc.pc
 share/man/man3/miniupnpc.3.gz
diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index ca92f95b46fd..bf344d687a3e 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -1,75 +1,76 @@
 PORTNAME=	i2pd
 DISTVERSION=	2.52.0
+PORTREVISION=	1
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	C++ implementation of I2P client
 WWW=		https://i2pd.website/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>=1.72.0_5:devel/boost-libs
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		cmake:insource compiler:c++11-lib ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	PurpleI2P
 USE_RC_SUBR=	${PORTNAME}
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
 
 SUB_FILES=	i2pd.newsyslog.conf pkg-message
 SUB_LIST=	CERTSDIR=${_CERTSDIR} \
 		GROUP="${GROUPS}" \
 		USER="${USERS}" \
 		WRITEDATADIR=${_WRITEDATADIR}
 
 USERS=		_i2pd
 GROUPS=		_i2pd
 
 PLIST_SUB=	GROUP="${GROUPS}" \
 		USER="${USERS}"
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=		AESNI DOCS HARDENING UPNP
 OPTIONS_DEFAULT=	AESNI
 
 AESNI_DESC=	Use AES-NI instructions set
 HARDENING_DESC=	Use hardening compiler flags
 UPNP_DESC=	Include support for UPnP client
 
 AESNI_CMAKE_BOOL=	WITH_AESNI
 
 HARDENING_CMAKE_BOOL=	WITH_HARDENING
 
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CMAKE_BOOL=	WITH_UPNP
 
 _CERTSDIR=	${DATADIR}/certificates
 _WRITEDATADIR=	/var/db/${PORTNAME}
 
 post-patch: # fix config file
 	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/contrib/i2pd.conf
 	@${REINPLACE_CMD} -e 's|%%CERTSDIR%%|${_CERTSDIR}|g' ${WRKSRC}/contrib/i2pd.conf
 	@${REINPLACE_CMD} -e 's|/var/lib/${PORTNAME}|${_WRITEDATADIR}|g' ${WRKSRC}/contrib/i2pd.conf
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf.sample
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/i2pd.conf ${STAGEDIR}${ETCDIR}/i2pd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/contrib/tunnels.conf ${STAGEDIR}${ETCDIR}/tunnels.conf.sample
 	@(cd ${WRKSRC}/contrib/certificates && ${COPYTREE_SHARE} . ${STAGEDIR}${_CERTSDIR})
 	@${MKDIR} ${STAGEDIR}/var/run/i2pd
 	@${MKDIR} ${STAGEDIR}/var/log/i2pd
 	@${MKDIR} ${STAGEDIR}/var/db/i2pd
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/tunnels.d
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>