diff --git a/audio/faust/Makefile b/audio/faust/Makefile
index 38925bcadaa1..e13679fda2b3 100644
--- a/audio/faust/Makefile
+++ b/audio/faust/Makefile
@@ -1,74 +1,74 @@
 # Created by: Yuri Victorovich <yuri@FreeBSD.org>
 
 PORTNAME=	faust
 DISTVERSION=	2.37.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Functional programming language for realtime audio signal processing
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang cmake ncurses python pkgconfig shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grame-cncm
 GH_TUPLE=	\
 		grame-cncm:faustlibraries:9082369:grame_cncm_faustlibraries/libraries \
 		google:oboe:7146098:google_oboe/architecture/android/app/oboe \
 		google:oboe:7146098:google_oboe/architecture/smartKeyboard/android/app/oboe
 
 SHEBANG_FILES=	tools/faust2appls/* tools/benchmark/faustbench tools/sound2faust/sound2reader
 
 LLVM_VERSION=	13 # versions <11 lacked dump() function(s) that cause unresolved symbols in libfaust.so
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
 CMAKE_ON=	INCLUDE_DYNAMIC # only installs headers and not libs without INCLUDE_DYNAMIC or INCLUDE_STATIC: https://github.com/grame-cncm/faust/issues/553
 CMAKE_ARGS=	-C ${FILESDIR}/backends.cmake -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \
 
 CXXFLAGS+=	-I${WRKSRC}/compiler/generator/cpp # fatal error: 'cpp_code_container.hh' file not found WHEN INCLUDE_STATIC=TRUE
 CXXFLAGS+=	`llvm-config${LLVM_VERSION} --cflags` -DLLVM_${LLVM_VERSION}0 # for the llvm backend
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=		EXAMPLES HIGHLIGHT HTTPD_LIB
 OPTIONS_DEFAULT=	HIGHLIGHT HTTPD_LIB
 OPTIONS_SUB=		yes
 
 EXAMPLES_CMAKE_BOOL=	FREEBSD_INSTALL_EXAMPLES
 
 HIGHLIGHT_DESC=		Syntax highlighting in Kate, gedit, Highlight, vim
 HTTPD_LIB_DESC=		Build httpd support library
 
 HTTPD_CMAKE_BOOL=	INCLUDE_HTTP
 HTTPD_LIB_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 
 PORTEXAMPLES=		*
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/faust
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/faust # https://github.com/grame-cncm/faust/issues/135
 	@${FIND} ${STAGEDIR} -name android | ${XARGS} ${RM} -r
 
 post-install-HIGHLIGHT-on:
 	# 1) kate
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/apps/katepart/syntax
 	${INSTALL_DATA} ${WRKSRC}/syntax-highlighting/faust.xml ${STAGEDIR}${PREFIX}/share/apps/katepart/syntax/
 	# 2) gedit
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gtksourceview-2.0/language-specs ${STAGEDIR}${PREFIX}/share/gtksourceview-3.0/language-specs
 	${INSTALL_DATA} ${WRKSRC}/syntax-highlighting/faust.lang ${STAGEDIR}${PREFIX}/share/gtksourceview-2.0/language-specs/
 	${INSTALL_DATA} ${WRKSRC}/syntax-highlighting/faust.lang ${STAGEDIR}${PREFIX}/share/gtksourceview-3.0/language-specs/
 	# 4) Highlight
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/highlight/langDefs
 	${INSTALL_DATA} ${WRKSRC}/syntax-highlighting/dsp.lang ${STAGEDIR}${PREFIX}/share/highlight/langDefs/
 	# 5) VIM
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles/syntax
 	${INSTALL_DATA} ${WRKSRC}/syntax-highlighting/faust.vim ${STAGEDIR}${PREFIX}/share/vim/vimfiles/syntax/
 	# 6) EMACS TODO
 
 .include <bsd.port.mk>
diff --git a/audio/faustlive/Makefile b/audio/faustlive/Makefile
index b58001925eb3..09ef815ae729 100644
--- a/audio/faustlive/Makefile
+++ b/audio/faustlive/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	faustlive
 DISTVERSION=	2.5.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Standalone application that embeds Faust
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \
 		libasound.so:audio/alsa-lib \
 		libcurl.so:ftp/curl \
 		libfaust.so:audio/faust \
 		libjack.so:audio/jack \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libqrencode.so:graphics/libqrencode \
 		libsndfile.so:audio/libsndfile # audio/alsa-lib isn't really needed: https://github.com/grame-cncm/faustlive/issues/3
 
 USES=		compiler:c++11-lang gl pkgconfig qmake qt:5 shebangfix
 USE_QT=		core gui network widgets buildtools_build
 USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grame-cncm
 GH_TUPLE=	grame-cncm:faustlibraries:0dce1a5:grame_cncm_faustlibraries/Resources/Libs
 
 SHEBANG_GLOB=	build install makelibs
 
 LLVM_VERSION=	11 # llvm version should be the same as in audio/faust
 
 QMAKE_ARGS=	Build/FaustLive.pro
 
 CXXFLAGS+=	$$(llvm-config${LLVM_VERSION} --cflags)
 LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	llvm-config=llvm-config${LLVM_VERSION}
 
 PLIST_FILES=	bin/FaustLive \
 		share/applications/FaustLive.desktop \
 		share/icons/hicolor/32x32/apps/Faustlive.png \
 		share/icons/hicolor/scalable/apps/Faustlive.svg \
 		share/pixmaps/Faustlive.xpm
 
 OPTIONS_DEFINE=		PORTAUDIO
 
 PORTAUDIO_MAKE_ARGS=	PORTAUDIO=1
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_BROKEN=	PORTAUDIO support needs to be updated for qmake
 
 post-extract:
 	@${RM} ${WRKSRC}/version # mixup with STL header 'version'
 
 do-install: # workaround for https://github.com/grame-cncm/faustlive/issues/38
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_PROGRAM} ${WRKSRC}/Build/FaustLive/FaustLive ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Build/rsrc/FaustLive.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/Resources/Images/Faustlive.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
 	${INSTALL_DATA} ${WRKSRC}/Resources/Images/Faustlive.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/Resources/Images/Faustlive.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 909223512fdb..5ac892da2731 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -1,28 +1,28 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 
 PORTNAME=	gmpc-mserver
 PORTVERSION=	0.20.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lets you stream music files to your mpd that are not in your database
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:audio/libmpd \
 		libtag.so:audio/taglib \
 		libmicrohttpd.so:www/libmicrohttpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
 RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	glib20 gtk20 intltool libxml2
 USES=		gettext gmake gnome libtool pathfix pkgconfig
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/audio/inscore/Makefile b/audio/inscore/Makefile
index bb53b2a2fece..d0e752f85244 100644
--- a/audio/inscore/Makefile
+++ b/audio/inscore/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	inscore
 PORTVERSION=	1.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Environment for the design of interactive augmented music scores
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/src/license.txt
 
 LIB_DEPENDS=	libGUIDOEngine.so:audio/guidolib \
 		libguidoar.so:audio/guidoar \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		cmake gnome qt:5
 USE_QT=		core declarative gui network multimedia opengl printsupport sensors svg widgets websockets \
 		qmake_build buildtools_build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grame-cncm
 GH_TAGNAME=	v${PORTVERSION:S/.//}
 GH_TUPLE=	grame-cncm:guidolib:3cf3d88:guidolib/modules/guidolib # this uses some un-installed parts of the guidolib project, partucularly QGuidoPainter.h
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
 CMAKE_ARGS=	-DFREEBSD_EXAMPLESDIR=${EXAMPLESDIR} -DFREEBSD_DOCSDIR=${DOCSDIR}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/guido -I${LOCALBASE}/include/guidoar
 CXXFLAGS_powerpc64=	-DOSC_HOST_BIG_ENDIAN
 CXXFLAGS_powerpc=	-DOSC_HOST_BIG_ENDIAN
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	DOCS EXAMPLES
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 .include <bsd.port.mk>
diff --git a/devel/kiwix-lib/Makefile b/devel/kiwix-lib/Makefile
index d290b5085221..c6aea10616af 100644
--- a/devel/kiwix-lib/Makefile
+++ b/devel/kiwix-lib/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	kiwix-lib
 DISTVERSION=	9.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	me@int19h.org
 COMMENT=	Common code base for all Kiwix ports
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 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++11-lang meson pkgconfig python:3.6+ shebangfix
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	kiwix
 GH_TUPLE=	kiwix:${PORTNAME}:${PORTVERSION}:DEFAULT \
 		kainjow:Mustache:a7eebc9:mustache
 
 CPPFLAGS+=	-I${WRKSRC_mustache}
 CXXFLAGS+=	-I${WRKSRC_mustache}
 LDFLAGS+=	-lz
 SHEBANG_FILES=	scripts/kiwix-compile-resources
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index 66e5a68fecda..20a082400011 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	Drawpile
 DISTVERSION=	2.1.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collaborative drawing program
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libminiupnpc.so:net/miniupnpc \
 		libsodium.so:security/libsodium \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}
 USE_QT=		core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
 USE_KDE=	archive dnssd
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 26704ea50864..383c11ab470d 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,292 +1,292 @@
 PORTNAME=	kodi
 DISTVERSION=	19.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-${KODI_CODENAME}
 CATEGORIES=	multimedia java
 
 MAINTAINER=	yzrh@noema.org
 COMMENT=	Award winning media center application
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
 		rapidjson>0:devel/rapidjson \
 		swig>0:devel/swig
 LIB_DEPENDS=	libass.so:multimedia/libass \
 		libavcodec.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libcdio.so:sysutils/libcdio \
 		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
 		libdav1d.so:multimedia/dav1d \
 		libdvdnav.so:multimedia/libdvdnav \
 		libdvdread.so:multimedia/libdvdread \
 		libexpat.so:textproc/expat2 \
 		libfmt.so:devel/libfmt \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libfstrcmp.so:devel/fstrcmp \
 		libgif.so:graphics/giflib \
 		liblzo2.so:archivers/lzo2 \
 		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
 		libpostproc.so:multimedia/ffmpeg \
 		libspdlog.so:devel/spdlog \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cpe cmake compiler:c++14-lang gettext \
 		gnome iconv jpeg pkgconfig python:3.5+ sqlite ssl
 
 KODI_CODENAME=	Matrix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
 
 KODI_ARCH_aarch64=	aarch64
 KODI_ARCH_amd64=	x86_64
 KODI_ARCH_i386=		x86
 KODI_ARCH_armv7=	armv7
 KODI_ARCH_armv6=	armv6
 KODI_ARCH_powerpc64=	powerpc64
 KODI_ARCH_powerpc64le=	powerpc64le
 
 PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
 
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 USE_GNOME=	libxml2
 CMAKE_ARGS=	-DGIT_VERSION="${GH_TAGNAME}" \
 		-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
 		-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
 		-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
 OPTIONS_SUB=		yes
 # Broken: BLUETOOTH
 OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DBUS DVDCSS LCMS2 \
 			LIRC WEBSERVER NFS DVD SMB TEST UDEV UPNP \
 			VAAPI VDPAU XSLT DOCS
 OPTIONS_DEFAULT=	LIBBLURAY CEC DVDCSS LCMS2 WEBSERVER \
 			DVD UPNP VAAPI VDPAU XSLT WAYLAND X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
 OPTIONS_SINGLE=		RENDER
 OPTIONS_SINGLE_RENDER=	GL GLES
 OPTIONS_RADIO=		DATABASE
 OPTIONS_RADIO_DATABASE=	MARIADB MYSQL
 OPTIONS_GROUP=		SOUND FEATURE PLATFORM
 # Broken: ALSA
 OPTIONS_GROUP_SOUND=	PULSEAUDIO SNDIO
 OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
 OPTIONS_GROUP_PLATFORM=GBM WAYLAND X11
 OPTIONS_EXCLUDE_aarch64=FEATURE
 OPTIONS_EXCLUDE_armv7=	FEATURE
 OPTIONS_EXCLUDE_armv6=	FEATURE
 
 PLATFORM_DESC=	Kodi platform
 DATABASE_DESC=	Database
 FEATURE_DESC=	X86 CPU feature
 
 AIRPLAY_DESC=	AirPlay support
 BLUETOOTH_DESC=	Bluetooth support
 CEC_DESC=	CEC adapter support
 DVD_DESC=	DVD support
 UDEV_DESC=	Use libudev-devd
 XSLT_DESC=	Use libxslt
 
 RENDER_DESC=	Render system
 GL_DESC=	OpenGL
 GLES_DESC=	OpenGL ES
 
 GBM_DESC=	GBM support
 MARIADB_DESC=	MariaDB database support
 
 SSE2_DESC=	Use SSE2 optimized routines
 SSE3_DESC=	Use SSE3 optimized routines
 SSSE3_DESC=	Use SSSE3 optimized routines
 SSE4_1_DESC=	Use SSE4.1 optimized routines
 SSE4_2_DESC=	Use SSE4.2 optimized routines
 AVX_DESC=	Use AVX optimized routines
 AVX2_DESC=	Use AVX2 optimized routines
 
 AIRPLAY_LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
 			libshairplay.so:audio/shairplay
 AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
 			ENABLE_AIRTUNES
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 BLUETOOTH_CMAKE_BOOL=	ENABLE_BLUETOOTH
 BLUETOOTH_CMAKE_ON=	-DBLUETOOTH_INCLUDE_DIR="${LOCALBASE}/include"
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CMAKE_BOOL=		ENABLE_CEC
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS
 
 DVDCSS_LIB_DEPENDS=	libdvdcss.so:multimedia/libdvdcss
 DVDCSS_CMAKE_BOOL=	ENABLE_DVDCSS
 DVDCSS_CMAKE_ON=	-DDVDCSS_LIBRARY="${LOCALBASE}/lib/libdvdcss.so"
 
 LCMS2_LIB_DEPENDS=	liblcms2.so.2:graphics/lcms2
 LCMS2_CMAKE_BOOL=	ENABLE_LCMS2
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_BOOL=	ENABLE_LIRCCLIENT
 
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 DVD_CMAKE_BOOL=		ENABLE_OPTICAL
 
 SMB_USES=		samba:lib
 SMB_CMAKE_BOOL=		ENABLE_SMBCLIENT
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_CMAKE_BOOL=	ENABLE_TESTING
 
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CMAKE_BOOL=	ENABLE_UDEV
 
 UPNP_CMAKE_BOOL=	ENABLE_UPNP
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 
 XSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 GL_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gl"
 
 GLES_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gles"
 
 MARIADB_USES=		mysql:105m
 MARIADB_CMAKE_BOOL=	ENABLE_MARIADBCLIENT
 MARIADB_CMAKE_ON=	-DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include"
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSEAUDIO
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ENABLE_SNDIO
 
 SSE_VARS=		CPU_FEATURE+=SSE
 SSE2_VARS=		CPU_FEATURE+=SSE2
 SSE3_VARS=		CPU_FEATURE+=SSE3
 SSSE3_VARS=		CPU_FEATURE+=SSSE3
 SSE4_1_VARS=		CPU_FEATURE+=SSE4.1
 SSE4_2_VARS=		CPU_FEATURE+=SSE4.2
 AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2
 
 GBM_IMPLIES=		UDEV
 GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
 GBM_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
 GBM_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput
 
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp
 
 X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gbm,gl,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland x11"
 .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland x11"
 .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm x11"
 .elif !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland"
 .elif empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="x11"
 .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland"
 .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm"
 .endif
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODICOMBINED="" \
 		KODIGBM="@comment " \
 		KODIWAYLAND="@comment " \
 		KODIX11="@comment "
 .else
 PLIST_SUB+=	KODICOMBINED="@comment "
 
 .if !empty(PORT_OPTIONS:MGBM)
 PLIST_SUB+=	KODIGBM=""
 .else
 PLIST_SUB+=	KODIGBM="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MWAYLAND)
 PLIST_SUB+=	KODIWAYLAND=""
 .else
 PLIST_SUB+=	KODIWAYLAND="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODIX11=""
 .else
 PLIST_SUB+=	KODIX11="@comment "
 .endif
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|KODI_DEPENDSBUILD|true|' \
 		${WRKSRC}/cmake/modules/FindLibDvd.cmake
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
 	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} TexturePacker JsonSchemaBuilder
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 1d75ed1154d7..75aeff3b296f 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -1,114 +1,114 @@
 # Created by: Angel Carpintero <ack@telefonica.net>
 
 # PORTNAME block
 PORTNAME=	motion
 PORTVERSION=	4.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	multimedia
 
 # Maintainer block
 MAINTAINER=	ports@blievers.net
 COMMENT=	Motion detection application
 
 # License block
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 # Dependencies
 LIB_DEPENDS=	libwebp.so:graphics/webp \
 		libmicrohttpd.so:www/libmicrohttpd
 
 # USES block
 USES=		autoreconf cpe gmake jpeg localbase pkgconfig gettext
 CPE_VENDOR=	${PORTNAME}_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Motion-Project
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-linuxthreads \
 		--without-jpeg-mmx
 
 # Standard bsd.port.mk variables
 SUB_FILES=	pkg-message
 
 # Packaging list block
 PLIST_FILES=	bin/motion \
 		man/man1/motion.1.gz \
 		"@sample ${ETCDIR}/motion.conf.sample" \
 		"@dir ${ETCDIR}/conf.d"
 PORTDOCS=	*
 
 PORTEXAMPLES=	camera1-dist.conf camera2-dist.conf \
 		camera3-dist.conf camera4-dist.conf
 
 # Options definitions
 OPTIONS_DEFINE=		DOCS EXAMPLES FFMPEG MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	WEBCAMD FFMPEG
 OPTIONS_RADIO=		VIDEO
 OPTIONS_RADIO_VIDEO=	BKTR PWCBSD WEBCAMD
 
 BKTR_DESC=		BKTR based TV capture cards
 
 PWCBSD_DESC=		PWCBSD based Webcams
 
 VIDEO_DESC=		Video capture driver (Netcam support only if none selected)
 WEBCAMD_DESC=		Webcams using webcamd
 
 BKTR_CONFIGURE_WITH=	bktr
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-ffmpeg=${LOCALBASE}
 FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
 			--with-mysql-include=${LOCALBASE}/include/mysql
 MYSQL_CONFIGURE_OFF=	--without-mysql
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql-lib=${LOCALBASE}/lib \
 			--with-pgsql-include=${LOCALBASE}/include
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 
 PWCBSD_BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
 PWCBSD_RUN_DEPENDS=	pwcbsd>0:multimedia/pwcbsd
 PWCBSD_CONFIGURE_WITH=	pwcbsd
 
 SQLITE3_USES=		sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 WEBCAMD_BUILD_DEPENDS=	v4l_compat>=1.0.20060801:multimedia/v4l_compat
 #  note: all configure --with-pwcbsd does is not shut off v4l support
 WEBCAMD_CONFIGURE_WITH=	pwcbsd
 
 .include <bsd.port.pre.mk>
 
 .if ${JPEG_PORT} == "graphics/jpeg-turbo"
 CONFIGURE_ARGS+=	--with-jpeg-turbo=${LOCALBASE}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure.ac
 # Fix pidfile path
 	@${REINPLACE_CMD} -e \
 		's|/run/motion|/run|' ${WRKSRC}/data/motion-dist.conf.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/motion ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 	${INSTALL_DATA} ${WRKSRC}/data/motion-dist.conf \
 		${STAGEDIR}${ETCDIR}/motion.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/data/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile
index 7a5d2efc22fd..67a1f3322d9a 100644
--- a/multimedia/musikcube/Makefile
+++ b/multimedia/musikcube/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	musikcube
 DISTVERSION=	0.96.10
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Terminal-based music player, audio engine, metadata indexer, server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libfaad.so:audio/faad \
 		libFLAC.so:audio/flac \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libopenmpt.so:audio/libopenmpt \
 		libsndio.so:audio/sndio \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 
 USES=		cmake:noninja compiler:c++14-lang pkgconfig ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clangen
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses
 CMAKE_ARGS=	-DNCURSES_DISABLE_LIB_SUFFIXES=false
 CMAKE_ON=	FREEBSD_USE_BASE_NCURSES
 .else
 USES+=		ncurses:port
 CFLAGS+=	-I${LOCALBASE}/include/ncurses
 CMAKE_ARGS=	-DNCURSES_DISABLE_LIB_SUFFIXES=true
 CMAKE_OFF=	FREEBSD_USE_BASE_NCURSES
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 8ecbc8110868..b41f9b389654 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -1,366 +1,366 @@
 # Created by: Matt Peterson <matt@peterson.org>
 
 PORTNAME=	collectd
 PORTVERSION=	5.12.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf cpe gmake libtool pkgconfig shebangfix tar:bzip2
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
 OPTIONS_GROUP_OUTPUT=	INFLUXDB KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
 			RIEMANN RRDTOOL TSDB
 OPTIONS_GROUP_INPUT=	CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
 			MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
 			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS SIGROK \
 			SLURM SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
 
 OPTIONS_DEFAULT=	GCRYPT LOGGING PING
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CHRONY_DESC=		Enable chronyd plugin
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
 CURL_JSON_DESC=		Enable curl_json plugin (implies curl and json)
 CURL_XML_DESC=		Enable ascent, bind, curl_xml plugins (implies curl and xml)
 DBI_DESC=		Enable dbi plugin
 GCRYPT_DESC=		Build with libgcrypt
 INFLUXDB_DESC=		Enable write_influxdb_udp plugin
 IPMI_DESC=		Enable OpenIPMI plugin
 JSON_DESC=		Enable JSON plugins
 KAFKA_DESC=		Enable write_kafka plugin
 LOGGING_DESC=		Enable debug logging
 LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
 MONGODB_DESC=		Enable write_mongodb plugin (BROKEN)
 MQTT_DESC=		Enable MQTT broker metrics
 MYSQL_DESC=		Enable mysql-based plugins
 NOTIFYDESKTOP_DESC=	Enable desktop notifications
 NOTIFYEMAIL_DESC=	Enable notifications via email
 NUTUPS_DESC=		Enable nut (ups) plugin
 OLSRD_DESC=		Enable olsrd plugin
 ONEWIRE_DESC=		Eanble onewire plugin (via owfs)
 OPENLDAP_DESC=		Enable OpenLDAP plugin
 PERL_DESC=		Enable libperl plugin and binding
 PGSQL_DESC=		Enable postgresql-based plugins
 PINBA_DESC=		Enable pinba plugin (via protobuf-c)
 PING_DESC=		Enable ping plugin
 PROMETHEUS_DESC=	Enable write prometheus plugin
 PYTHON_DESC=		Enable python-based plugins
 RABBITMQ_DESC=		Enable rabbitmq-based plugins
 REDIS_DESC=		Enable redis-based plugins
 RIEMANN_DESC=		Enable write_riemann plugin (via riemann-c-client)
 RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
 SIGROK_DESC=		Enable sigrok plugin
 SLURM_DESC=		Enable slurm plugin
 SNMP_DESC=		Enable SNMP plugin
 STATSD_DESC=		Enable statsd plugin
 TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
 TSDB_DESC=		Enable write_tsdb plugin
 VARNISH_DESC=		Enable varnish 4.x cache statistics
 VIRT_DESC=		Enable libvirt plugin (requires XML)
 XML_DESC=		Enable XML plugins
 ZOOKEEPER_DESC=		Enable zookeeper plugin
 
 OPTIONS_SUB=	yes
 
 USE_RC_SUBR=	collectd collectdmon
 
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 # NOTE: Plugins without dependencies are defined further down.
 CONFIGURE_ARGS=	--disable-all-plugins \
 		--disable-amqp \
 		--disable-ceph \
 		--disable-cgroups \
 		--disable-fhcount \
 		--disable-lvm \
 		--disable-static \
 		--disable-turbostat \
 		--enable-disk \
 		--localstatedir=/var \
 		--without-libaquaero5 \
 		--without-libganglia \
 		--without-libiptc \
 		--without-libldap \
 		--without-liblvm2app \
 		--without-libmnl \
 		--without-libnetapp \
 		--without-libowcapi \
 		--without-libsensors \
 		--without-mic \
 		--without-oracle
 
 CGI_RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI \
 			p5-HTML-Parser>=0:www/p5-HTML-Parser \
 			p5-URI>=0:net/p5-URI
 CGI_IMPLIES=		RRDTOOL
 
 CHRONY_CONFIGURE_ENABLE=	chrony
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	apache curl nginx write_http
 CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 
 CURL_JSON_IMPLIES=		CURL JSON
 CURL_JSON_CONFIGURE_ENABLE=	curl_json
 
 CURL_XML_IMPLIES=		CURL XML
 CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml
 
 JAVA_USE=		java
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_CONFIGURE_WITH=	java=${LOCALBASE} libjvm
 
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_ENABLE=	dbi
 DBI_CFLAGS=		-Wno-deprecated-declarations
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}
 GCRYPT_LIBS=		-lgcrypt
 
 INFLUXDB_CONFIGURE_ENABLE=	write_influxdb_udp
 
 IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 IPMI_CONFIGURE_ENABLE=	ipmi
 
 JSON_LIB_DEPENDS=	libyajl.so:devel/yajl
 JSON_CONFIGURE_WITH=	libyajl=${LOCALBASE}
 
 KAFKA_LIB_DEPENDS=	librdkafka.so:net/librdkafka
 KAFKA_CONFIGURE_ENABLE=	write_kafka
 
 LOGGING_CONFIGURE_ENABLE=	debug
 
 LOGSTASH_CONFIGURE_ENABLE=	log_logstash
 LOGSTASH_IMPLIES=		JSON
 
 MEMCACHEC_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHEC_CONFIGURE_ENABLE=	memcachec
 MEMCACHEC_CONFIGURE_WITH=	libmemcached=${LOCALBASE}
 
 MODBUS_LIB_DEPENDS=		libmodbus.so:comms/libmodbus
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
 
 MONGODB_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson \
 				libmongoc-1.0.so:devel/mongo-c-driver
 MONGODB_CONFIGURE_ENABLE=	write_mongodb
 MONGODB_CONFIGURE_WITH=		libmongoc=${LOCALBASE}
 MONGODB_BROKEN=			fails to configure with write_mongodb option
 
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
 MQTT_CONFIGURE_ENABLE=	mqtt
 MQTT_CONFIGURE_WITH=	libmosquitto=${LOCALBASE}
 
 MYSQL_USES=		mysql ssl
 MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_CONFIGURE_WITH=	libmysql=${LOCALBASE}
 
 NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
 NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
 NOTIFYDESKTOP_USE=		GNOME=gdkpixbuf2
 NOTIFYDESKTOP_USES=		gettext-runtime gnome
 
 NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
 NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}
 
 NUTUPS_LIB_DEPENDS=		libupsclient.so:sysutils/nut
 NUTUPS_CONFIGURE_ENABLE=	nut
 NUTUPS_CONFIGURE_WITH=		upsclient=${LOCALBASE}
 
 OLSRD_CONFIGURE_ENABLE=	olsrd
 
 ONEWIRE_LIB_DEPENDS=		libow.so:comms/owfs
 ONEWIRE_CONFIGURE_ENABLE=	onewire
 ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
 
 OPENLDAP_USE=			OPENLDAP=yes
 OPENLDAP_CONFIGURE_ENABLE=	openldap
 OPENLDAP_CONFIGURE_WITH=	libldap=${LOCALBASE}
 
 PERL_USES=		perl5
 PERL_CONFIGURE_ENABLE=	perl
 PERL_CONFIGURE_WITH=	libperl perl-bindings perl=${PERL}
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	postgresql
 PGSQL_CONFIGURE_WITH=	libpq postgresql=${LOCALBASE}
 
 PINBA_LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
 PINBA_CONFIGURE_ENABLE=	pinba
 
 PING_LIB_DEPENDS=	liboping.so:net/liboping
 PING_CONFIGURE_ENABLE=	ping
 PING_CONFIGURE_WITH=	liboping=${LOCALBASE}
 
 PROMETHEUS_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd \
 				libprotobuf-c.so:devel/protobuf-c \
 				libprotoc.so:devel/protobuf
 PROMETHEUS_CONFIGURE_ENABLE=	write_prometheus
 
 PYTHON_USES=			python
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}
 PYTHON_CONFIGURE_ENV=		PYTHON_CONFIG=${PYTHON_CMD}-config
 
 RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
 RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
 
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 REDIS_CONFIGURE_ENABLE=	redis write_redis
 REDIS_CONFIGURE_WITH=	libhiredis=${LOCALBASE}
 
 RIEMANN_LIB_DEPENDS=		libltdl.so:devel/libltdl \
 				libriemann-client.so:net-mgmt/riemann-c-client
 RIEMANN_CONFIGURE_ENABLE=	write_riemann
 
 RRDTOOL_LIB_DEPENDS=		librrd.so:databases/rrdtool
 RRDTOOL_CONFIGURE_ENABLE=	rrdcached rrdtool
 RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}
 
 SIGROK_USE=			GNOME=glib20
 SIGROK_CFLAGS=			`pkg-config --cflags glib-2.0`
 SIGROK_LIB_DEPENDS=		libsigrok.so:devel/libsigrok
 SIGROK_CONFIGURE_ENABLE=	sigrok
 SIGROK_CONFIGURE_WITH=		libsigrok=${LOCALBASE}
 SIGROK_USES=			gettext-runtime
 SIGROK_BROKEN=			fails to configure with sigrok option
 
 SLURM_LIB_DEPENDS=		libslurm.so:sysutils/slurm-wlm
 SLURM_CONFIGURE_ENABLE=		slurm
 SLURM_CONFIGURE_WITH=		libslurm=${LOCALBASE}
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_CONFIGURE_WITH=	libnetsnmp
 
 STATSD_CONFIGURE_ENABLE=	statsd
 
 TOKYOTYRANT_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet \
 				libtokyotyrant.so:databases/tokyotyrant
 TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
 TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
 
 TSDB_CONFIGURE_ENABLE=	write_tsdb
 
 VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish4
 VARNISH_CONFIGURE_ENABLE=	varnish
 
 VIRT_IMPLIES=		XML
 VIRT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error \
 			libvirt.so:devel/libvirt
 VIRT_CONFIGURE_ENABLE=	virt
 VIRT_CONFIGURE_WITH=	virt=${LOCALBASE}
 
 XML_CFLAGS=		`pkg-config --cflags libxml-2.0`
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 XML_CONFIGURE_WITH=	libxml2
 
 ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:devel/libzookeeper
 ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
 ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}
 
 # NOTE: Plugins without external dependencies
 CONFIGURE_ARGS+=	--enable-aggregation \
 			--enable-apcups \
 			--enable-contextswitch \
 			--enable-cpu \
 			--enable-csv \
 			--enable-df \
 			--enable-dns \
 			--enable-email \
 			--enable-exec \
 			--enable-filecount \
 			--enable-interface \
 			--enable-ipstats \
 			--enable-load \
 			--enable-logfile \
 			--enable-logparser \
 			--enable-match_empty_counter \
 			--enable-match_hashed \
 			--enable-match_regex \
 			--enable-match_timediff \
 			--enable-match_value \
 			--enable-mbmon \
 			--enable-memcached \
 			--enable-memory \
 			--enable-network \
 			--enable-ntpd \
 			--enable-openvpn \
 			--enable-pf \
 			--enable-powerdns \
 			--enable-processes \
 			--enable-statsd \
 			--enable-swap \
 			--enable-syslog \
 			--enable-table \
 			--enable-tail \
 			--enable-tail_csv \
 			--enable-target_notification \
 			--enable-target_replace \
 			--enable-target_scale \
 			--enable-target_set \
 			--enable-target_v5upgrade \
 			--enable-tcpconns \
 			--enable-teamspeak2 \
 			--enable-ted \
 			--enable-threshold \
 			--enable-unixsock \
 			--enable-uptime \
 			--enable-users \
 			--enable-uuid \
 			--enable-write_graphite \
 			--enable-write_log \
 			--enable-zfs_arc
 INSTALL_TARGET=		install-strip
 SHEBANG_FILES=		contrib/collection.cgi
 
 post-patch:
 	@${REINPLACE_CMD} 's/-Werror//' \
 		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} \
 		-e 's;@prefix@/var/;/var/;' \
 		-e 's;/var/lib/;/var/db/;' \
 		-e 's;@localstatedir@/lib/;/var/db/;' \
 		${WRKSRC}/src/collectd.conf.in \
 		${WRKSRC}/src/collectd.conf.5 \
 		${WRKSRC}/src/collectd.conf.pod
 	@${REINPLACE_CMD} \
 		-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \
 		${WRKSRC}/contrib/collection.cgi
 	@${REINPLACE_CMD} \
 		-e 's;/opt/collectd/var/lib;/var/db;' \
 		-e 's;/opt/collectd/lib;${PREFIX}/lib;' \
 		${WRKSRC}/contrib/collection.conf
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/collectd
 
 post-install-CGI-on:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/
 	${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \
 		${STAGEDIR}${WWWDIR}/collection.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 3cc28f122ad5..20797b836c3a 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -1,75 +1,75 @@
 # Created by: glocke@bsdstammtisch.at
 
 PORTNAME=	retroshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4
-PORTREVISION=	8
+PORTREVISION=	9
 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
 
 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/xmrig/Makefile b/net-p2p/xmrig/Makefile
index 600fb1ddf586..6f1300954468 100644
--- a/net-p2p/xmrig/Makefile
+++ b/net-p2p/xmrig/Makefile
@@ -1,49 +1,49 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	xmrig
 PORTVERSION=	6.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	High performance Monero (XMR) CPU miner
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	fails to compile: g++9: error: unrecognized command line option '-maes'; did you mean '-mads'?
 BROKEN_riscv64=	fails to compile: /nxb-bin/usr/lib/clang/11.0.0/include/cpuid.h:11:2: error: this header is for x86 only
 
 USES=		cmake compiler:c++11-lang ssl
 USE_GITHUB=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME} \
 		USERS=${USERS}
 USERS=		xmrig
 
 OPTIONS_DEFINE=		HWLOC MICROHTTPD STATIC
 OPTIONS_DEFAULT=	HWLOC MICROHTTPD
 HWLOC_DESC=		Portable hardware locality
 MICROHTTPD_DESC=	Build with libmicrohttpd support
 
 HWLOC_LIB_DEPENDS+=		libhwloc.so.15:devel/hwloc2
 HWLOC_CMAKE_OFF=		-DWITH_HWLOC=OFF
 MICROHTTPD_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd \
 				libuv.so:devel/libuv
 MICROHTTPD_CMAKE_OFF=		-DWITH_HTTPD=OFF
 
 STATIC_PREVENTS=	HWLOC MICROHTTPD
 STATIC_PREVENTS_MSG=	hwloc and libmicrohttpd support cannot be built static
 
 STATIC_BUILD_DEPENDS+=	${LOCALBASE}/lib/libuv.a:devel/libuv
 STATIC_CMAKE_ON=	-DBUILD_STATIC=ON
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/config.json ${STAGEDIR}${ETCDIR}/config.json.sample
 
 .include <bsd.port.mk>
diff --git a/net/libnpupnp/Makefile b/net/libnpupnp/Makefile
index ea527cdf11eb..522492c72460 100644
--- a/net/libnpupnp/Makefile
+++ b/net/libnpupnp/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	libnpupnp
 DISTVERSION=	4.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://www.lesbonscomptes.com/upmpdcli/downloads/
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		autoreconf compiler:c++11-lang libtool localbase pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/net/opensips31/Makefile b/net/opensips31/Makefile
index 41814b9df590..12bea7b07436 100644
--- a/net/opensips31/Makefile
+++ b/net/opensips31/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	opensips31
 DISTVERSION=	3.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://opensips.org/pub/opensips/${DISTVERSION}/
 DISTNAME=	opensips-${DISTVERSION}
 
 MAINTAINER=	bambyster@gmail.com
 COMMENT=	Open SIP Server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gm4:devel/m4
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libjson-c.so:devel/json-c \
 		libjwt.so:www/libjwt \
 		libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		gettext-runtime gmake gnome localbase:ldflags ncurses perl5 \
 		pkgconfig shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_GLOB=	*.pl *.sh
 
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		opensips
 GROUPS=		opensips
 
 CFLAGS+=	-pthread
 CXXFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 
 MAKE_ENV+=	BASEDIR=${STAGEDIR} \
 		INSTALL_BIN="${INSTALL_PROGRAM}" \
 		INSTALL_CFG="${INSTALL_DATA}" \
 		INSTALL_DOC="${INSTALL_DATA}" \
 		INSTALL_MODULES="${INSTALL_PROGRAM}" \
 		JSON_BUILDER="pkgconf json-c" \
 		NICER=0
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES HTTP LDAP MEMCACHED MYSQL PGSQL \
 			PYTHON RABBITMQ RADIUS REDIS SQLITE TESTS TLS UNIXODBC
 OPTIONS_DEFAULT=	HTTP LDAP MEMCACHED PGSQL PYTHON RABBITMQ RADIUS REDIS TLS
 OPTIONS_SUB=		yes
 
 HTTP_DESC=		Enable HTTP transport via libmicrohttpd
 MEMCACHED_DESC=		Build with memcached support
 RABBITMQ_DESC=		RabbitMQ/AMQP support
 TESTS_DESC=		Install smoke tests
 
 HTTP_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 HTTP_VARS=		EXTRA_MODULES+=httpd
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_VARS=		EXTRA_MODULES+="ldap h350"
 
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 MEMCACHED_VARS=		EXTRA_MODULES+=cachedb_memcached
 
 MYSQL_USES=		mysql:client
 MYSQL_VARS=		EXTRA_MODULES+=db_mysql
 
 PGSQL_BUILD_DEPENDS=	p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
 PGSQL_USES=		pgsql
 WANT_PGSQL=		client
 PGSQL_VARS=		EXTRA_MODULES+=db_postgres
 
 PYTHON_USES=		python
 PYTHON_MAKE_ENV=	PYTHON=${PYTHON_CMD}
 PYTHON_VARS=		EXTRA_MODULES+=python
 
 RABBITMQ_LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c-devel
 RABBITMQ_VARS=		EXTRA_MODULES+="event_rabbitmq rabbitmq rabbitmq_consumer"
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 RADIUS_VARS=		EXTRA_MODULES+=aaa_radius
 
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 REDIS_VARS=		EXTRA_MODULES+=cachedb_redis
 
 SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 SQLITE_VARS=		EXTRA_MODULES+=db_sqlite
 
 TLS_VARS=		EXTRA_MODULES+="proto_tls proto_wss tls_mgm"
 
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_VARS=		EXTRA_MODULES+=db_unixodbc
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@(${CP} files/Makefile.conf ${WRKSRC})
 .for i in ${EXTRA_MODULES}
 	@${REINPLACE_CMD} -e "s/\(^include_modules=.*\)/\1 ${i}/" ${WRKSRC}/Makefile.conf
 .endfor
 
 do-configure-DEBUG-off:
 	@${REINPLACE_CMD} -e "s/^#DEFS+= -DNO_DEBUG/DEFS+= -DNO_DEBUG/" ${WRKSRC}/Makefile.conf
 
 do-install-TESTS-on:
 	${CP} -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/${PORTNAME}
 
 do-install-EXAMPLES-on:
 	${CP} -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}
 
 post-install-RADIUS-on:
 	${MV} ${STAGEDIR}${ETCDIR}/dictionary.opensips ${STAGEDIR}${ETCDIR}/dictionary.opensips.sample
 
 .include <bsd.port.mk>
diff --git a/security/greenbone-security-assistant/Makefile b/security/greenbone-security-assistant/Makefile
index 0880c6ade86e..dfe5c764529b 100644
--- a/security/greenbone-security-assistant/Makefile
+++ b/security/greenbone-security-assistant/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	greenbone-security-assistant
 DISTVERSIONPREFIX=	v
 DISTVERSION=	21.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	LOCAL/acm/gsa/:yarn_cache
 DISTFILES=	${PORTNAME}-cache${EXTRACT_SUFX}:yarn_cache
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Libraries module for the GVM solution
 
 LICENSE=	AGPLv3+
 
 BUILD_DEPENDS=	yarn:www/yarn
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgnutls.so:security/gnutls \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libmicrohttpd.so:www/libmicrohttpd
 RUN_DEPENDS=	doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR}
 
 USES=		cmake gettext-runtime gnome nodejs:build pkgconfig python
 USE_GNOME=	glib20 libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	gsa
 
 CMAKE_ARGS+=	-DINSTALLER_ARGS="--offline"
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	gsad
 
 LDFLAGS+=	-lm
 
 ETCDIR=		${PREFIX}/etc/gvm
 
 post-extract:
 	@${MV} ${WRKSRC}/gsad/src/gsad_log_conf.cmake_in ${WRKSRC}/gsad/src/gsad_log.conf.sample
 
 post-patch:
 	${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> \
 		${WRKSRC}/.yarnrc
 	${REINPLACE_CMD} -e 's|$${GVM_LOG_DIR}|/var/log/gvm|g' ${WRKSRC}/gsad/src/gsad_log.conf.sample
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/gvm
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/gsad/src/gsad_log.conf.sample ${STAGEDIR}${ETCDIR}
 
 	@${ECHO_CMD} "@sample etc/gvm/gsad_log.conf.sample" >> ${TMPPLIST}
 	@${ECHO_CMD} "sbin/gsad" >> ${TMPPLIST} >> ${TMPPLIST}
 	@${ECHO_CMD} "share/gvm/gsad/web/index.html" >> ${TMPPLIST}
 	@${ECHO_CMD} "share/gvm/gsad/web/robots.txt" >> ${TMPPLIST}
 	@cd ${WRKSRC}/gsa/build && \
 		${FIND} -s img locales static -not -type d \
 			-exec ${ECHO_CMD} "share/gvm/gsad/web/{}" \; >> ${TMPPLIST}
 	@${ECHO_CMD} "share/man/man8/gsad.8.gz" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gvm" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/janus/Makefile b/www/janus/Makefile
index 7248286084f2..838b9be451a1 100644
--- a/www/janus/Makefile
+++ b/www/janus/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	janus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	WebRTC gateway
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gengetopt>0:devel/gengetopt
 LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libcurl.so:ftp/curl \
 		libjansson.so:devel/jansson \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libnice.so:net-im/libnice \
 		libogg.so:audio/libogg \
 		libopus.so:audio/opus \
 		libsofia-sip-ua.so:net/sofia-sip \
 		libsrtp2.so:net/libsrtp2 \
 		libusrsctp.so:net/libusrsctp \
 		libwebsockets.so:net/libwebsockets
 
 USES=			autoreconf cpe gmake gnome libtool localbase pkgconfig \
 			ssl
 USE_GNOME=		glib20
 USE_GITHUB=		yes
 GH_ACCOUNT=		meetecho
 GH_PROJECT=		janus-gateway
 CPE_VENDOR=		meetecho
 USE_RC_SUBR=		janus
 CONFIGURE_ARGS+=	--disable-mqtt \
 			--disable-rabbitmq \
 			--enable-data-channels \
 			--enable-json-logger
 INSTALL_TARGET=		install-strip
 CFLAGS+=		-I${OPENSSLINC} -I${LOCALBASE}/include/nice
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl -L${LOCALBASE} -lnice
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
 SUB_FILES=		pkg-message
 
 OPTIONS_SUB=				yes
 OPTIONS_DEFINE=				JAVASCRIPT LUA NANOMSG POSTPROCESSING \
 					RABBITMQ
 JAVASCRIPT_DESC=			JavaScript scripting language support
 #MQTT_DESC=	MQTT integration
 NANOMSG_DESC=				Nanomsg integration
 RABBITMQ_DESC=				RabbitMQ integration
 POSTPROCESSING_DESC=			Post processing integration
 JAVASCRIPT_LIB_DEPENDS=			libduktape.so:lang/duktape-lib
 NANOMSG_LIB_DEPENDS=			libnanomsg.so:net/nanomsg
 RABBITMQ_LIB_DEPENDS=			librabbitmq.so:net/rabbitmq-c
 JAVASCRIPT_CONFIGURE_ENABLE=		plugin-duktape
 NANOMSG_CONFIGURE_ENABLE=		nanomsg
 RABBITMQ_CONFIGURE_ENABLE=		rabbitmq
 LUA_CONFIGURE_ENABLE=			plugin-lua
 LUA_USES=				lua
 LUA_CONFIGURE_ENV=			LUA_CFLAGS="-I${LUA_INCDIR}" \
 					LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 POSTPROCESSING_CONFIGURE_ENABLE=	post-processing
 POSTPROCESSING_LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg
 
 .include <bsd.port.mk>
diff --git a/www/kiwix-tools/Makefile b/www/kiwix-tools/Makefile
index c581c97d6ba1..a85db9df6aae 100644
--- a/www/kiwix-tools/Makefile
+++ b/www/kiwix-tools/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	kiwix-tools
 DISTVERSION=	3.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	me@int19h.org
 COMMENT=	Command-line Kiwix tools
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libkiwix.so:devel/kiwix-lib \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libctpp2.so:textproc/ctpp2 \
 		libzim.so:devel/libzim
 
 USES=		compiler:c++11-lang meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	kiwix
 USE_RC_SUBR=	kiwix_serve
 
 CXXFLAGS_gcc=	-Wno-error=maybe-uninitialized
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/kiwix
 	${INSTALL_DATA} files/library.xml ${STAGEDIR}${PREFIX}/share/kiwix
 
 .include <bsd.port.mk>
diff --git a/www/wget2/Makefile b/www/wget2/Makefile
index b7bccf9bdc77..7c101c7368ec 100644
--- a/www/wget2/Makefile
+++ b/www/wget2/Makefile
@@ -1,102 +1,102 @@
 PORTNAME=	wget2
 DISTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	GNU/wget
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	File and recursive website downloader
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LESSER
 
 USES=		autoreconf charsetfix cpe iconv libtool:build localbase pkgconfig tar:lz
 CPE_VENDOR=	gnu
 CPE_PRODUCT=	wget
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-lzip  # not in ports yet
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	IDN MANPAGES DOXYGEN NLS PSL NGHTTP2 BROTLI ZSTD GPGME TEST HSTS
 OPTIONS_RADIO=	SSL PCRE
 OPTIONS_RADIO_SSL=GNUTLS OPENSSL # WOLFSSL
 OPTIONS_RADIO_PCRE=PCRE1 PCRE2
 OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS PSL NGHTTP2 BROTLI ZSTD GPGME TEST HSTS
 OPTIONS_SUB=	yes
 
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_CONFIGURE_WITH=	libidn2
 
 MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
 PCRE_DESC=		Support Perl regular expressions in addition to POSIX
 
 PCRE1_DESC=		Support PCRE style regular expressions
 PCRE1_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE1_CONFIGURE_WITH=	libpcre
 
 PCRE2_DESC=		Support PCRE2 style regular expressions
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE2_CONFIGURE_WITH=	libpcre2
 
 PSL_CONFIGURE_WITH=	libpsl
 PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 
 HSTS_DESC=		Support HSTS preload lists
 HSTS_CONFIGURE_WITH=	libhsts
 HSTS_LIB_DEPENDS=	libhsts.so:www/libhsts
 
 NGHTTP2_DESC=		Support HTTP/2.0 through libnghttp2
 NGHTTP2_CONFIGURE_WITH=	libnghttp2
 NGHTTP2_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
 BROTLI_CONFIGURE_WITH=	brotlidec
 BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
 
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 GPGME_DESC=		Support signature verification with gpgme
 GPGME_CONFIGURE_WITH=	gpgme
 GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 TEST_TEST_TARGET=	check
 TEST_CONFIGURE_WITH=	libmicrohttpd
 TEST_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 TEST_TEST_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
 			p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=openssl --with-openssl
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 .elif ${PORT_OPTIONS:MWOLFSSL}
 BROKEN=		does not build: use of undeclared identifier WOLFSSL_ALPN_CONTINUE_ON_MISMATCH
 LIB_DEPENDS+=	libwolfssl.so:security/wolfssl
 CONFIGURE_ARGS+=--with-ssl=wolfssl
 .else
 CONFIGURE_ARGS+=--with-ssl=none
 .endif
 
 post-patch-MANPAGES-off:
 	@${REINPLACE_CMD} -e '/AC_CHECK_PROGS/ s|pandoc|&-not-found|' ${WRKSRC}/configure.ac
 
 post-patch-DOXYGEN-off:
 	@${REINPLACE_CMD} -e '/AC_CHECK_PROGS/ s|doxygen|&-not-found|' ${WRKSRC}/configure.ac
 
 .include <bsd.port.mk>