diff --git a/databases/postgresql-idn/Makefile b/databases/postgresql-idn/Makefile
index 0bee9a4b11cb..487c9c00a0b4 100644
--- a/databases/postgresql-idn/Makefile
+++ b/databases/postgresql-idn/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	idn
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PostgreSQL extension for libidn2
 WWW=		https://github.com/dyninc/postgresql-idn
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libidn2.so:dns/libidn2
 
 USES=		gmake pgsql
 WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	dyninc
 GH_PROJECT=	postgresql-idn
 GH_TAGNAME=	d4ffaec
 
 BUILD_WRKSRC=	${WRKSRC}/sources
 
 PLIST_FILES=	\
 		lib/postgresql/idn.so \
 		share/postgresql/extension/idn.control \
 		share/postgresql/extension/idn--0.2.sql
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CreateTemplateTupleDesc(3, false)|CreateTemplateTupleDesc(3)|g' \
 		${BUILD_WRKSRC}/idn.c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/extension
 	${INSTALL_LIB} ${BUILD_WRKSRC}/idn.so ${STAGEDIR}${PREFIX}/lib/postgresql/idn.so
 	${INSTALL_DATA} ${BUILD_WRKSRC}/idn--0.2.sql ${STAGEDIR}${PREFIX}/share/postgresql/extension
 	${INSTALL_DATA} ${BUILD_WRKSRC}/idn.control ${STAGEDIR}${PREFIX}/share/postgresql/extension
 
 .include <bsd.port.mk>
diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
index ea08480fdd29..79505c527835 100644
--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	getdns
 PORTVERSION=	1.5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	dns
 MASTER_SITES=	https://getdnsapi.net/dist/ \
 		ZI \
 		http://getdnsapi.net/dist/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Modern asynchronous DNS API
 WWW=		https://getdnsapi.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libidn.so:dns/libidn \
 		libldns.so:dns/ldns \
 		libunbound.so:dns/unbound
 
 USES=		compiler:c11 libtool pathfix ssl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-libidn=${LOCALBASE} --docdir=${DOCSDIR} \
 		--with-trust-anchor=${LOCALBASE}/etc/unbound/root.key
 SOMAJVER=	10
 SOVERSION=	${SOMAJVER}.1.${PORTVERSION:C/[0-9].[0-9].([0-9])/\1/1}
 MAKE_JOBS_UNSAFE=yes
 
 PLIST_SUB+=	SOVERSION="${SOVERSION}" SOMAJVER="${SOMAJVER}"
 SUB_FILES+=	pkg-message
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DOCS LIBEV LIBEVENT LIBUV STUBBY
 OPTIONS_DEFAULT=STUBBY
 
 LIBEV_DESC=	Build with libev extension
 LIBEVENT_DESC=	Build with libevent extension
 LIBUV_DESC=	Build with libuv extension
 STUBBY_DESC=	Build with Stubby DNS/TLS resolver
 
 LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LIBEV_CONFIGURE_WITH=	libev
 LIBEVENT_LIB_DEPENDS=	libevent_core.so:devel/libevent
 LIBEVENT_CONFIGURE_WITH=libevent
 LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
 LIBUV_CONFIGURE_WITH=	libuv
 STUBBY_LIB_DEPENDS=	libyaml.so:textproc/libyaml
 STUBBY_CONFIGURE_WITH=	stubby
 STUBBY_VARS=		USE_RC_SUBR="stubby"
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's,^(sharedoc = ).*,\1${WRKDIR}/doc,' \
 		-e '/echo .\*\*\*/d' ${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgetdns*.so.*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/getdns_*
 
 post-stage-STUBBY-on:
 	${MV} ${STAGEDIR}${PREFIX}/etc/stubby/stubby.yml \
 		${STAGEDIR}${PREFIX}/etc/stubby/stubby.yml.sample
 
 post-install-STUBBY-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/stubby
 
 .include <bsd.port.post.mk>
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index 79597e749bb5..28e4febde7d2 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	hesiod
 PORTVERSION=	3.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	dns
 MASTER_SITES=	https://BSDforge.com/projects/source/dns/hesiod/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Directory service built on DNS and BIND
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	IDN
 OPTIONS_DEFAULT=IDN
 
 USES=		cpe libtool pathfix
 CPE_VENDOR=	${PORTNAME}_project
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	libidn.so:dns/libidn
 .else
 CONFIGURE_ARGS+=--without-libidn
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index df203e3ef298..5eaf42f27196 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	libpsl
 PORTVERSION=	0.21.5
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library to handle the Public Suffix List
 WWW=		https://github.com/rockdaboot/libpsl
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list
 
 USES=		localbase:ldflags meson pkgconfig python:build shebangfix tar:lz
 
 MESON_ARGS=	--default-library=both \
 		-Dbuiltin=true \
 		-Ddocs=false \
 		-Dpsl_file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \
 		-Dpsl_testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt
 USE_LDCONFIG=	yes
 USE_LOCALE=	en_US.UTF-8
 
 SHEBANG_FILES=	src/psl-make-dafsa
 TEST_TARGET=	test
 
 OPTIONS_SINGLE=	IDNA
 OPTIONS_SINGLE_IDNA=	ICU IDN IDN2
 OPTIONS_DEFAULT=IDN2
 ICU_DESC=	Use devel/icu (IDNA2008 UTS\#46 library)
 IDN_DESC=	Use dns/libidn (IDNA2003 library)
 IDN2_DESC=	Use dns/libidn2 (IDNA2008 library)
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_MESON_ON=		-Druntime=libicu
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn \
 			libunistring.so:devel/libunistring
 IDN_MESON_ON=		-Druntime=libidn
 IDN_USES=		iconv
 IDN2_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
 			libunistring.so:devel/libunistring
 IDN2_MESON_ON=		-Druntime=libidn2
 IDN2_USES=		iconv
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/psl-make-dafsa ${STAGEDIR}${PREFIX}/share/man/man1/psl-make-dafsa.1
 
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile
index 2dceedb19d88..92c6e5d8fa1d 100644
--- a/dns/p5-Net-LibIDN/Makefile
+++ b/dns/p5-Net-LibIDN/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	Net-LibIDN
 PORTVERSION=	0.12
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	This module provides access to the libidn library
 WWW=		https://metacpan.org/release/Net-LibIDN
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	--with-libidn=${LOCALBASE}/lib \
 		--with-libidn-inc=${LOCALBASE}/include
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/LibIDN/LibIDN.so
 
 .include <bsd.port.mk>
diff --git a/dns/rubygem-idn-ruby/Makefile b/dns/rubygem-idn-ruby/Makefile
index 7140112dce0f..494fbf4462d7 100644
--- a/dns/rubygem-idn-ruby/Makefile
+++ b/dns/rubygem-idn-ruby/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	idn-ruby
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	dns rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	LibIDN Ruby Bindings
 WWW=		https://github.com/deepfryed/idn-ruby
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 092919e93cc0..75b841bc2650 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	filezilla
 PORTVERSION=	3.67.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/client/
 DISTNAME=	FileZilla_${PORTVERSION}_src
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Fast and reliable cross-platform FTP, FTPS, and SFTP client
 WWW=		https://filezilla-project.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libfilezilla.so:ftp/libfilezilla \
 		libharfbuzz.so:print/harfbuzz \
 		libidn.so:dns/libidn \
 		libnettle.so:security/nettle \
 		libpugixml.so:textproc/pugixml
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 TEST_DEPENDS=	cppunit-config:devel/cppunit
 TEST_TARGET=	check
 
 USES=		compiler:c++17-lang gmake gnome iconv:wchar_t libtool localbase \
 		pkgconfig sqlite tar:xz
 USE_GNOME=	cairo gtk30 gdkpixbuf2
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-fast-install
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_WX=		3.2
 WX_CONF_ARGS=	relative
 
 OPTIONS_DEFINE=		DBUS NLS
 OPTIONS_DEFAULT=	DBUS
 OPTIONS_SUB=		yes
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-runtime
 NLS_CONFIGURE_OFF=	--disable-locales
 
 .if !defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--disable-manualupdatecheck
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index f1c74fd5000a..1dec4cea14dc 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	podofo
 PORTVERSION=	0.10.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PDF manipulation library and tools
 WWW=		https://podofo.sourceforge.net/ \
 		https://github.com/podofo/podofo
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	fast_float>=0:math/fast_float \
 		date>=0:devel/date \
 		libfmt>=0:devel/libfmt \
 		utf8cpp>=4.0.3:devel/utf8cpp
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn
 
 USES=		cmake compiler:c++17-lang cpe gnome localbase:ldflags pkgconfig ssl
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${LOCALBASE}/include/fast_float
 CMAKE_ARGS=	-DFONTCONFIG_LIBRARIES=${LOCALBASE}/lib/libfontconfig.so \
 		-DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 		-DOPENSSL_LIBRARIES=${OPENSSLLIB}
 CMAKE_OFF=	PODOFO_BUILD_EXAMPLES PODOFO_BUILD_LIB_ONLY PODOFO_BUILD_STATIC PODOFO_BUILD_TEST PODOFO_BUILD_TOOLS
 CMAKE_TESTING_ON=	PODOFO_BUILD_TEST
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USE_GITHUB=	yes
 
 CPE_VENDOR=	podofo_project
 
 OPTIONS_DEFINE=	JPEG PNG TIFF
 OPTIONS_DEFAULT=JPEG PNG TIFF
 
 JPEG_CMAKE_BOOL=	WANT_LIBJPEG
 JPEG_USES=		jpeg
 PNG_CMAKE_BOOL=		WANT_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 TIFF_CMAKE_BOOL=	WANT_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} ${WRKSRC}/3rdparty/fast_float.h
 	@${RM} -r ${WRKSRC}/3rdparty/date/
 	@${RM} -r ${WRKSRC}/3rdparty/fmt/
 	@${RM} -r ${WRKSRC}/3rdparty/utf8cpp/
 
 .include <bsd.port.mk>
diff --git a/graphics/podofo09/Makefile b/graphics/podofo09/Makefile
index 88960f508743..d0a6870cdd1f 100644
--- a/graphics/podofo09/Makefile
+++ b/graphics/podofo09/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	podofo
 PORTVERSION=	0.9.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	09
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PDF manipulation library and tools
 WWW=		https://podofo.sourceforge.net/ \
 		https://github.com/podofo/podofo
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn
 
 USES=		cmake compiler:c++11-lang cpe dos2unix pkgconfig ssl
 
 CMAKE_ARGS=	-DFONTCONFIG_LIBRARIES=${LOCALBASE}/lib/libfontconfig.so \
 		-DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 		-DOPENSSL_LIBRARIES=${OPENSSLLIB}
 CMAKE_ON=	PODOFO_BUILD_SHARED PODOFO_BUILD_STATIC
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	podofo_project
 
 DOS2UNIX_FILES=	cmake/modules/FindFREETYPE.cmake
 
 OPTIONS_DEFINE=	IMPOSE JPEG PNG TIFF UNISTRING
 OPTIONS_DEFAULT=JPEG PNG TIFF UNISTRING
 IMPOSE_DESC=	Build impose tool (Lua required)
 UNISTRING_DESC=	Use libunistring for conversion
 
 IMPOSE_CMAKE_BOOL=	WANT_LUA
 IMPOSE_CXXFLAGS=	-I${LUA_INCDIR}
 IMPOSE_LDFLAGS=		-L${LUA_LIBDIR}
 IMPOSE_USES=		lua
 JPEG_CMAKE_BOOL=	WANT_LIBJPEG
 JPEG_USES=		jpeg
 PNG_CMAKE_BOOL=		WANT_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 TIFF_CMAKE_BOOL=	WANT_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 UNISTRING_CMAKE_BOOL=	WANT_UNISTRING
 UNISTRING_LIB_DEPENDS=	libunistring.so:devel/libunistring
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^#include/s|podofo/podofo.h|podofo09/podofo.h|' \
 		${WRKSRC}/examples/pdfcontentsgraph/PdfContentsGraph.h
 	@${REINPLACE_CMD} -e '/^#include/s|podofo/base|podofo09/base|' \
 		${WRKSRC}/src/podofo/doc/* \
 		${WRKSRC}/src/podofo/base/PdfExtension.h
 	@${RLN} ${WRKSRC}/src/podofo ${WRKSRC}/src/podofo09
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index 9bb60731c803..611cb2a00064 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	lynx
 DISTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/
 PKGNAMESUFFIX=	-current
 DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Console WWW client (browser) with multi-byte encoding support (development release)
 WWW=		https://lynx.invisible-island.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe ncurses shebangfix tar:bzip2
 
 VERSION=	2.9.0
 MINOR_VERSION=	dev.4
 
 CONFLICTS=	lynx-2.* lynx-current-2.* ja-lynx-2.*
 
 SHEBANG_FILES=	samples/mailto-form.pl
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--with-screen=ncursesw --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-ipv6 \
 		--enable-cjk --enable-internal-links \
 		--with-bzlib
 MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 CPE_VERSION=	${PORTVERSION:R}
 CPE_UPDATE=	${PORTVERSION:E:S/p/pre./:S/d/dev./}
 
 L_LIB=		${PREFIX}/etc
 L_HELP=		${PREFIX}/share/lynx_help
 
 OPTIONS_DEFINE=	COLOR_STYLE DEFAULT_COLORS DOCS JAPANESE_UTF8 IDN SSL EXPERIMENTAL_OPTS
 OPTIONS_DEFAULT=JAPANESE_UTF8 IDN SSL EXPERIMENTAL_OPTS
 OPTIONS_SUB=	yes
 
 COLOR_STYLE_DESC=		Optional color style support
 COLOR_STYLE_CONFIGURE_ENABLE=	color-style
 
 DEFAULT_COLORS_DESC=		Default-color background support (ncurses)
 DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
 
 EXPERIMENTAL_OPTS_DESC=		Use experimental options
 EXPERIMENTAL_OPTS_CONFIGURE_ON=	--enable-charset-choice --enable-nested-tables
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ENABLE=	idna
 
 JAPANESE_UTF8_DESC=		Experimental Japanese UTF-8 logic support
 JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
 JAPANESE_UTF8_USES=		iconv
 
 SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 SSL_USES=		ssl
 
 # Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak
 # parallel builds
 post-patch:
 	@${REINPLACE_CMD} -E 's|cd (.+) && (\$$\(MAKE_RECUR\))|\2 -C \1|' \
 		${WRKSRC}/${MAKEFILE}.in
 
 post-install-DOCS-on:
 .for doc in COPYHEADER COPYING
 	${RLN} ${STAGEDIR}${DOCSDIR}/${doc} ${STAGEDIR}${L_HELP}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 9accbff18bba..fdf1055b0c50 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	lynx
 DISTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/
 DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Console WWW client (browser) with multi-byte encoding support
 WWW=		https://lynx.invisible-island.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 VERSION=	2.8.9
 MINOR_VERSION=	rel.1
 
 CONFLICTS=	lynx-2.* lynx-current-2.* ja-lynx-current-2.*
 
 USES=		cpe ncurses shebangfix tar:bzip2
 SHEBANG_FILES=	samples/mailto-form.pl
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--with-screen=ncursesw --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-ipv6 \
 		--enable-cjk --enable-internal-links \
 		--with-bzlib
 MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 CPE_VERSION=	${PORTVERSION:R}
 CPE_UPDATE=	${PORTVERSION:E:S/r/rel./}
 
 L_LIB=		${PREFIX}/etc
 L_HELP=		${PREFIX}/share/lynx_help
 
 OPTIONS_DEFINE=	COLOR_STYLE DEFAULT_COLORS DOCS JAPANESE_UTF8 IDN SSL
 OPTIONS_DEFAULT=JAPANESE_UTF8
 OPTIONS_SUB=	yes
 
 COLOR_STYLE_DESC=		Optional color style support
 COLOR_STYLE_CONFIGURE_ENABLE=	color-style
 
 DEFAULT_COLORS_DESC=		Default-color background support (ncurses)
 DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ENABLE=	idna
 
 JAPANESE_UTF8_DESC=		Experimental Japanese UTF-8 logic support
 JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
 JAPANESE_UTF8_USES=		iconv
 
 SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 SSL_USES=		ssl
 
 # Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak
 # parallel builds
 post-patch:
 	@${REINPLACE_CMD} -E 's|cd (.+) && (\$$\(MAKE_RECUR\))|\2 -C \1|' \
 		${WRKSRC}/${MAKEFILE}.in
 
 post-install-DOCS-on:
 .for doc in COPYHEADER COPYING
 	${RLN} ${STAGEDIR}${DOCSDIR}/${doc} ${STAGEDIR}${L_HELP}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 1500725b0191..95c855d8e014 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -1,395 +1,395 @@
 PORTNAME=	courier
 PORTVERSION=	1.1.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	bsd@dino.sk
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 WWW=		https://www.Courier-MTA.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		wget:ftp/wget
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libpcre.so:devel/pcre \
 		libgdbm.so:databases/gdbm \
 		libcourier-unicode.so:devel/courier-unicode \
 		libpcre2-8.so:devel/pcre2
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool \
 		${LOCALBASE}/etc/mime.types:misc/mime-support \
 		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
 		ca_root_nss>=3.*:security/ca_root_nss \
 		${LOCALBASE}/bin/wget:ftp/wget
 CONFLICTS=	courier-imap-2.* couriermlm-0.* \
 		exim-4.* maildrop-1.* \
 		panda-imap-201* postfix-1.* postfix-2.* \
 		qmail-*-1.* qmail-1.* \
 		sendmail-*-8.* sendmail-8.* \
 		smail-3.* sqwebmail-3.* \
 		zmailer-2.*
 
 #
 # User-serviceable variables
 #
 # [ There's no need to add trailing ``/''s ]
 #
 # set IMAGEURL to where on the web server URL the images are found
 # set CACHEOWN to who you'd like to own the cache files
 # set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be
 #     recomended values are: /var/mail, ./Mailbox or ./Maildir
 #
 
 IMAGEURL?=	/webmail
 CACHEOWN?=	pop
 MAILDROPDEFAULT?=./Maildir
 
 # End of user-serviceable variables
 
 MAILOWN?=	courier
 MAILGRP?=	courier
 MAILUID?=	465
 MAILGID?=	465
 ETCDIR=		${PREFIX}/etc
 SYSCONFDIR=	${ETCDIR}/courier
 LIBEXECDIR=	${PREFIX}/libexec
 LOCALSTATEDIR=	/var/spool/courier
 CACHEDIR=	/var/spool/webmail
 CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
 USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl shebangfix
 USE_SUBMAKE=	yes
 USE_RC_SUBR=	courier
 SHEBANG_FILES=	courier/filters/perlfilter/perlfilter-ratelimit.pl \
 		courier/filters/perlfilter/perlfilter-wrapper.pl
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-root-check \
 		--with-db=gdbm \
 		--enable-syslog=1 --enable-use-flock \
 		--program-transform-name=s,^,, \
 		--enable-utf7-folder-encoding \
 		--enable-unicode \
 		--with-mailuser=${MAILOWN} \
 		--with-mailgroup=${MAILGRP} \
 		--with-mailuid=${MAILUID} \
 		--with-mailgid=${MAILGID} \
 		--with-etcdir=${ETCDIR} \
 		--sysconfdir=${SYSCONFDIR} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--localstatedir=${LOCALSTATEDIR} \
 		--enable-mimetypes=${MIMETYPES} \
 		--enable-imageurl=${IMAGEURL} \
 		--with-cachedir=${CACHEDIR} \
 		--with-cacheowner=${CACHEOWN} \
 		--with-calendardir=${CALENDIR} \
 		--with-mydatadir=${SYSCONFDIR} \
 		--with-transport='${WITH_TRANSPORT}' \
 		--with-default-maildrop=${MAILDROPDEFAULT} \
 		--with-paranoid-smtpext \
 		--enable-workarounds-for-imap-client-bugs \
 		--with-notice=unicode
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip install-perms
 
 PLIST_SUB+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
 		CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \
 		CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}" \
 		MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
 		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
 		SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}"
 
 SUB_LIST:=	${PLIST_SUB}
 SUB_FILES+=	pkg-message crontab sharedindexupdate
 
 OPTIONS_DEFINE=	LDAP PROCMAIL SENDFAX UUCP IPV6 DOCS CERTSDIR
 OPTIONS_GROUP=	WEBMAIL
 OPTIONS_GROUP_WEBMAIL=	GNUPG WEBMAILRSENT WEBMAILFLAGS WEBMAILXFACE
 OPTIONS_RADIO=	ALIASES SPELL
 OPTIONS_RADIO_ALIASES=	SYSTEMALIASES EMPTYALIASES
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_DEFAULT=WEBMAILRSENT SYSTEMALIASES
 
 LDAP_DESC=	LDAP-based mail aliasing support
 GNUPG_DESC=	GNU Privacy Guard support for WebMail
 ASPELL_DESC=	ASpell support for WebMail
 ISPELL_DESC=	ISpell support for WebMail
 PROCMAIL_DESC=	Procmail local delivery support
 SENDFAX_DESC=	mgetty+sendfax support
 UUCP_DESC=	UUCP support
 CERTSDIR_DESC=	separate .pem directory for certificates
 WEBMAILRSENT_DESC=	enable Autorename Sent folder
 WEBMAILFLAGS_DESC=	webmail show flags patch
 WEBMAILXFACE_DESC=	experimental webmail X-Face patch
 SYSTEMALIASES_DESC=	symlink system /etc/aliases
 EMPTYALIASES_DESC=	create empty aliases file
 RCCONF_DESC=	modify rc.conf to enable courier/disable sendmail
 MAILCONF_DESC=	modify mailer.conf to use courier instead of sendmail
 PERIODIC_DESC=	modify/create periodic.conf
 
 .include <bsd.port.options.mk>
 
 .include "${.CURDIR}/Makefile.doc"
 
 .if ${PORT_OPTIONS:MLDAP}
 USES+=	ldap
 WITH_AUTH_LDAP=	yes
 RUN_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
 CONFIGURE_ARGS+=--with-ldapaliasd
 PLIST_SUB+=	WITHLDAP=""
 SUB_LIST+=	WITHLDAP=""
 .else
 CONFIGURE_ARGS+=--without-ldapaliasd
 PLIST_SUB+=	WITHLDAP="@comment "
 SUB_LIST+=	WITHLDAP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSYSTEMALIASES}
 PLIST_SUB+=	WITHSYSTEMALIASES=""
 SUB_LIST+=	WITHSYSTEMALIASES=""
 .else
 PLIST_SUB+=	WITHSYSTEMALIASES="@comment "
 SUB_LIST+=	WITHSYSTEMALIASES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEMPTYALIASES}
 PLIST_SUB+=	WITHEMPTYALIASES=""
 SUB_LIST+=	WITHEMPTYALIASES=""
 .else
 PLIST_SUB+=	WITHEMPTYALIASES="@comment "
 SUB_LIST+=	WITHEMPTYALIASES="@comment "
 .endif
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MGNUPG}
 BUILD_DEPENDS+=	gpg:security/gnupg
 RUN_DEPENDS+=	gpg:security/gnupg
 .else
 # This is a hack! But works well (at least partially) for me...
 CONFIGURE_ENV+=	GPG="${WRKSRC}/fakegpg"
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
 BUILD_DEPENDS+=	aspell:textproc/aspell
 RUN_DEPENDS+=	aspell:textproc/aspell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell
 .elif ${PORT_OPTIONS:MISPELL}
 BUILD_DEPENDS+=	ispell:textproc/aspell-ispell
 RUN_DEPENDS+=	ispell:textproc/aspell-ispell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
 BUILD_DEPENDS+=	procmail:mail/procmail
 RUN_DEPENDS+=	procmail:mail/procmail
 .endif
 
 .if ${PORT_OPTIONS:MSENDFAX}
 USES+=		ghostscript
 SENDFAX_DEPENDS=sendfax:comms/mgetty+sendfax \
 		pnmscale:graphics/netpbm
 BUILD_DEPENDS+=	${SENDFAX_DEPENDS}
 RUN_DEPENDS+=	${SENDFAX_DEPENDS}
 WITH_TRANSPORT+=fax
 PLIST_SUB+=	WITHFAX=""
 SUB_LIST+=	WITHFAX=""
 .else
 PLIST_SUB+=	WITHFAX="@comment "
 SUB_LIST+=	WITHFAX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUUCP}
 .if !exists(/usr/bin/uux)
 BUILD_DEPENDS+=	uux:net/freebsd-uucp
 RUN_DEPENDS+=	uux:net/freebsd-uucp
 .endif
 WITH_TRANSPORT+=uucp
 PLIST_SUB+=	WITHUUCP=""
 .else
 PLIST_SUB+=	WITHUUCP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--with-ipv6
 .else
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILXFACE}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__msg2html.c
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILFLAGS}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__folder.c ${FILESDIR}/extra-patch-libs__sqwebmail__maildir.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__maildir.h ${FILESDIR}/extra-patch-libs__sqwebmail__images__sqwebmail.css
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILRSENT}
 CONFIGURE_ARGS+=--enable-autorenamesent
 .else
 CONFIGURE_ARGS+=--disable-autorenamesent
 .endif
 
 .if ${PORT_OPTIONS:MMAILCONF}
 SUB_LIST+=	MAILCONF="y"
 .else
 SUB_LIST+=	MAILCONF="n"
 .endif
 
 .if ${PORT_OPTIONS:MRCCONF}
 SUB_LIST+=	RCCONF="y"
 .else
 SUB_LIST+=	RCCONF="n"
 .endif
 
 .if ${PORT_OPTIONS:MPERIODIC}
 SUB_LIST+=	PERIODIC="y"
 .else
 SUB_LIST+=	PERIODIC="n"
 .endif
 
 .if ${PORT_OPTIONS:MCERTSDIR}
 CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}/.pem
 PLIST_SUB+=	WITHCERTSDIR=""
 SUB_LIST+=	CERTSDIR="${SYSCONFDIR}/.pem"
 .else
 CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}
 PLIST_SUB+=	WITHCERTSDIR="@comment "
 SUB_LIST+=	CERTSDIR="${SYSCONFDIR}"
 .endif
 
 _CNFFILES=	esmtpd.cnf \
 		imapd.cnf \
 		pop3d.cnf
 
 _DISTEXFILES=	courierd.dist \
 		esmtpd-msa.dist \
 		esmtpd-ssl.dist \
 		esmtpd.dist \
 		faxcoverpage.tr.dist \
 		faxnotifyrc.dist \
 		faxrc.dist \
 		imapd-ssl.dist \
 		imapd.dist \
 		ldapaddressbook.dist \
 		ldapaliasrc.dist \
 		pop3d-ssl.dist \
 		pop3d.dist \
 		sqwebmaild.dist \
 		webmlmrc.dist
 
 pre-everything::
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 
 pre-patch:
 	${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \
 		${WRKSRC}/webadmin/*.pl \
 		${WRKSRC}/webadmin/*.pl.in \
 		${WRKSRC}/courier/webadmin/*.pl \
 		${WRKSRC}/courier/webadmin/*.pl.in
 	${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \
 		${WRKSRC}/courier/module.*/courier.config
 	${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \
 		${WRKSRC}/*/*/mk*cert.*
 	${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*.dist.in \
 		${WRKSRC}/*/*/*.dist.in
 	${REINPLACE_CMD} -e 's|^\(TLS_DHPARAMS=\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*.dist.in \
 		${WRKSRC}/*/*/*.dist.in
 	${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*/*.cnf.openssl.in
 	${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/*/Makefile.in \
 		${WRKSRC}/*/*/Makefile.in \
 		${WRKSRC}/*/*/*/Makefile.in
 	${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \
 			-e 's|; ldapaliasd="yes"||' \
 		${WRKSRC}/configure \
 		${WRKSRC}/*/configure \
 		${WRKSRC}/*/*/configure \
 		${WRKSRC}/*/*/*/configure
 	${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root	wheel/g' \
 		${WRKSRC}/courier/perms.sh.in
 	${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \
 		${WRKSRC}/courier/module.esmtp/Makefile.in
 # Avoid conflict with C++20 <version> by adding .txt suffix
 	${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure
 	${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \
 		-i .c++20 '/^version.*cat/s,/version,&.txt,' {} +
 
 pre-configure:
 # This is a hack! But works well (at least partially) for me...
 	touch ${WRKSRC}/fakegpg
 	chmod +x ${WRKSRC}/fakegpg
 
 post-build:
 	${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \
 		    -e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \
 		    -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \
 		${WRKSRC}/*/*.authpam* \
 		${WRKSRC}/*/*/*.authpam*
 	${INSTALL} -lrs ${WRKSRC}/libs/gpglib/README.html	${WRKSRC}/libs/gpglib/README.gpglib.html
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS		${WRKSRC}/libs/imap/BUGS.imap
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS.html		${WRKSRC}/libs/imap/BUGS.imap.html
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/README.proxy	${WRKSRC}/libs/imap/README.imap.proxy
 	${INSTALL} -lrs ${WRKSRC}/libs/imap/README.proxy.html	${WRKSRC}/libs/imap/README.imap.proxy.html
 	${INSTALL} -lrs ${WRKSRC}/libs/maildrop/README.html	${WRKSRC}/libs/maildrop/README.maildrop.html
 	${INSTALL} -lrs ${WRKSRC}/libs/pcp/README.html		${WRKSRC}/libs/pcp/README.pcp.html
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS		${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS.html	${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail.html
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY	${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail
 	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY.html	${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail.html
 
 post-install:
 .for _cfgfile in ${_CNFFILES}
 	-${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.cnf/.cnf.sample/g}
 .endfor
 .for _cfgfile in ${_DISTEXFILES}
 	-${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.dist/.sample/g}
 .endfor
 	${INSTALL} -lrs ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase
 	${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${HTMLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
 .endfor
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
 .endif
 .if ${PORT_OPTIONS:MCERTSDIR}
 	${MKDIR} ${STAGEDIR}${SYSCONFDIR}/.pem
 .endif
 	${RM} -r ${STAGEDIR}${DATADIR}/htmldoc
 	${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin
 	${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier
 	${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp*
 
 .include <bsd.port.mk>
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index cdfef701e79c..3fc8b7e82928 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,653 +1,653 @@
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	mail
 MASTER_SITES=	EXIM:exim
 MASTER_SITE_SUBDIR=	/exim4/:exim \
 			/exim4/fixes/:exim \
 			/exim4/old/:exim
 DISTNAME=	${PORTNAME}-${EXIM_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:exim
 DIST_SUBDIR=	exim
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT?=	High performance MTA for Unix systems on the Internet
 WWW=		https://www.exim.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-File-FcntlLock>0:devel/p5-File-FcntlLock
 RUN_DEPENDS=	p5-File-FcntlLock>0:devel/p5-File-FcntlLock
 
 USES=		compiler cpe tar:bzip2 perl5
 USE_CSTD=	c99
 
 # Exim build system is job unsafe atm
 MAKE_JOBS_UNSAFE=	yes
 # One can tune the following "hidden" knobs:
 # - EXIM_USER: user exim is running as;
 # - EXIM_GROUP: ditto for the group;
 # - LOGDIR: where Exim logs will be put;
 # - LOG_FILE_PATH: path where '%s' will be substituted with
 #                  the target name (main, reject, etc);
 # - CONFIG_FILE_PATH: path to the default configuration file;
 # - ALT_CONFIG_PREFIX: path to the default prefix for all
 #                      configuration files, excluding the main one;
 #                      will be effective only when WITH_ALT_CONFIG_PREFIX
 #                      will be set via OPTIONS.
 
 .if make(makesum) && !defined(FETCH_ALL)
 .error "You forgot to define FETCH_ALL to create the sane distinfo"
 .endif
 
 .include "options"
 
 OPTIONS_SUB=	yes
 
 AUTH_SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 BDB_USES=	bdb
 DMARC_LIB_DEPENDS=	libopendmarc.so:mail/opendmarc
 EXIMON_USES=	xorg
 EXIMON_USE=	xorg=x11,xaw,xext,xmu,xt
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 ICONV_USES=	iconv:lib,build
 INTERNATIONAL_LIB_DEPENDS=	libidn.so:dns/libidn
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 MYSQL_USES=	mysql
 OPENLDAP_USES=	ldap
 PGSQL_LIB_DEPENDS=	libicudata.so:devel/icu
 PGSQL_USES=	pgsql pkgconfig
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
 SA_EXIM_RUN_DEPENDS=	${LOCALBASE}/bin/spamc:mail/spamassassin
 SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
 SQLITE_LIB_DEPENDS=	libicudata.so:devel/icu
 SQLITE_USES=	pkgconfig sqlite
 
 #DEBIAN_PATCHES_PREFIX=	${FILESDIR}/debian/75
 #EXTRA_PATCHES= \
 #		${DEBIAN_PATCHES_PREFIX}_01-Fix-exit-on-attempt-to-rewrite-a-malformed-address.-.patch:-p1 \
 #		${DEBIAN_PATCHES_PREFIX}_05-SPF-fix-memory-accounting-for-error-case.patch:-p1
 
 .include <bsd.port.options.mk>
 
 # OCSP is supported for openssl only
 .if ${PORT_OPTIONS:MOCSP}
 .if ! ${PORT_OPTIONS:MTLS}
 IGNORE=	you cannot enable OCSP stapling without TLS support
 .elif ${PORT_OPTIONS:MGNUTLS}
 IGNORE=	you cannot enable OCSP stapling with gnutls
 .endif
 .endif
 
 # DMARC implies SPF and DKIM
 .if ${PORT_OPTIONS:MDMARC}
 .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM}
 IGNORE=	you cannot enable DMARC without SPF and DKIM support
 .endif
 .endif
 
 # ARC implies SPF and DKIM
 .if ${PORT_OPTIONS:MARC}
 .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM}
 IGNORE=	you cannot enable ARC without SPF and DKIM support
 .endif
 .endif
 # DANE implies DNSSEC
 .if ${PORT_OPTIONS:MDANE}
 .if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS}
 IGNORE=	you cannot enable DANE without DNSSEC support or without TLS support
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL)
 MASTER_SITES+=	http://marc.merlins.org/linux/exim/files/:sa_exim \
 		SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim
 DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Local-sa-exim.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Local-sa-exim.conf
 .endif
 
 EXIM_VERSION=	4.97.1
 SA_EXIM_VERSION=4.2.1
 EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
 EXTRA_PATCHES+=	`${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h`
 
 .if !defined(EXIMON_ONLY)
 PLIST_SUB+=	EXIM=""
 .if defined(PKGNAMESUFFIX)
 CONFLICTS+=	${PKGNAMEPREFIX}${PORTNAME}-4.*
 .endif
 .for suffix in -ldap2 -mysql -postgresql -sa-exim -sqlite
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != ${suffix}
 CONFLICTS+=	${PKGNAMEPREFIX}${PORTNAME}${suffix}-4.*
 .endif
 .endfor
 .if ${PORT_OPTIONS:MEXIMON}
 CONFLICTS+=	${PKGNAMEPREFIX}${PORTNAME}-monitor-4.*
 .endif
 PKGMESSAGE=	${WRKDIR}/POST-INSTALL-NOTES
 .else # !EXIMON_ONLY
 PLIST_SUB+=	EXIM="@comment "
 PORT_OPTIONS+=	EXIMON
 PKGMESSAGE=	${WRKDIR}/pkg-message
 EXIM_INSTALL_ARG+=	"eximon" "eximon.bin"
 .endif # !EXIMON_ONLY
 
 PORTDOC_BASE=	ACKNOWLEDGMENTS NOTICE README.UPDATING
 PORTDOC_FILES=	ChangeLog Exim3.upgrade Exim4.upgrade NewStuff \
 		OptionLists.txt README README.SIEVE dbm.discuss.txt \
 		experimental-spec.txt filter.txt spec.txt
 
 PORT_EXAMPLES=	convert4r3 convert4r4 transport-filter.pl
 
 DAILY_SCRIPTS=	150.exim-tidydb 460.exim-mail-rejects
 
 MAKE_ENV+=	OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}" DUMMY_LDFLAGS="${DUMMY_LDFLAGS}" STRIP_COMMAND="${STRIP_CMD}"
 
 EXIM_USER?=	mailnull
 EXIM_GROUP?=	mail
 
 # Default user/group are system ones, so we don't want to check them
 .if ${EXIM_USER} != "mailnull"
 USERS=	${EXIM_USER}
 .endif
 .if ${EXIM_GROUP} != "mail"
 GROUPS=	${EXIM_GROUP}
 .endif
 
 LOGDIR?=		/var/log/exim
 LOG_FILE_PATH?=		${LOGDIR}/%slog
 CONFIG_FILE_PATH?=	${PREFIX}/etc/exim/configure
 ALT_CONFIG_PREFIX?=	${PREFIX}/etc/exim/
 
 EXIM_DYNAMIC_LDFLAGS=	-fPIC -rdynamic -Wl,--export-dynamic
 
 SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
 		-e 's,%%EXIM_USER%%,${EXIM_USER},g' \
 		-e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \
 		-e 's,%%LOGDIR%%,${LOGDIR},g'
 
 SEDLIST+=	-e 's,XX_CFLAGS_XX,${CFLAGS:S/,/\\,/g},' \
 		-e 's,XX_PREFIX_XX,${PREFIX:S/,/\\,/g},' \
 		-e 's,XX_LOCALBASE_XX,${LOCALBASE:S/,/\\,/g},' \
 		-e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH:S/,/\\,/g},' \
 		-e 's,XX_CONFIG_FILE_PATH_XX,${CONFIG_FILE_PATH:S/,/\\,/g},' \
 		-e 's,XX_ALT_CONFIG_PREFIX_XX,${ALT_CONFIG_PREFIX:S/,/\\,/g},' \
 		-e 's,XX_EXIM_USER_XX,${EXIM_USER:S/,/\\,/g},' \
 		-e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP:S/,/\\,/g},' \
 		-e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET:S/,/\\,/g},' \
 		-e 's,XX_DYNAMIC_LDFLAGS_XX,${EXIM_DYNAMIC_LDFLAGS:S/,/\\,/g},'
 
 PLIST_SUB+=	EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \
 		EXIM_USER=${EXIM_USER} \
 		EXIM_GROUP=${EXIM_GROUP} \
 		LOGDIR="${LOGDIR:S/^\///}"
 
 # Exim refuses to run local deliveries as root by default.  You can
 # add other users to this colon-separated list that cannot be
 # overridden at runtime below, but are advised not to remove "root".
 #WITH_FIXED_NEVER_USERS=	root:daemon:bin
 
 # When Exim is decoding MIME "words" in header lines it converts any foreign
 # character sets to the one that is set in the headers_charset option.
 # The default setting is defined by this setting:
 WITH_DEFAULT_CHARSET?=	ISO-8859-1
 
 # You should not need to fiddle with anything below this point.
 
 LIB_DEPENDS+=	libpcre2-posix.so:devel/pcre2
 
 .if ! ${PORT_OPTIONS:MDKIM}
 SEDLIST+=	-e 's,^\# (DISABLE_DKIM=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MLISTMATCH_RHS}
 SEDLIST+=	-e 's,^\# (EXPAND_LISTMATCH_RHS=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MDCC}
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DCC=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MPROXY}
 SEDLIST+=	-e 's,^\# (SUPPORT_PROXY=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MCERTNAMES}
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_CERTNAMES=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MDSN}
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DSN=),\1,'
 .endif
 
 .if !${PORT_OPTIONS:MDANE}
 SEDLIST+=	-e 's,^(SUPPORT_DANE=),\#\1,'
 .endif
 
 .if ${PORT_OPTIONS:MARC}
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_ARC=),\1,'
 .endif
 
 .if !${PORT_OPTIONS:MEVENT}
 SEDLIST+=	-e 's,^\# (DISABLE_EVENT=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MINTERNATIONAL}
 SEDLIST+=	-e 's,^\# (SUPPORT_I18N=),\1,' \
 		-e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn,'
 .else
 SEDLIST+=	-e 's,XX_IDN_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MSOCKS}
 SEDLIST+=	-e 's,^\# (SUPPORT_SOCKS=),\1,'
 .endif
 
 .if !${PORT_OPTIONS:MPRDR}
 SEDLIST+=	-e 's,^\# (DISABLE_PRDR=),\1,'
 .endif
 
 .if !${PORT_OPTIONS:MOCSP}
 SEDLIST+=	-e 's,^\# (DISABLE_OCSP=),\1,'
 .endif
 
 .if !${PORT_OPTIONS:MDNSSEC}
 SEDLIST+=	-e 's,^\# (DISABLE_DNSSEC=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MDMARC}
 SEDLIST+=	-e 's,XX_DMARC_LIBS_XX,-L${LOCALBASE}/lib -lopendmarc,' \
 		-e 's,^\# (SUPPORT_DMARC=),\1,'
 .else
 SEDLIST+=	-e 's,XX_DMARC_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MWISHLIST}
 EXTRA_PATCHES+=	`${FIND} ${PATCHDIR} -name 'wishlist-*.patch'`
 .endif
 
 .if ${PORT_OPTIONS:MFIXED_NEVER_USERS}
 SEDLIST+=	-e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS:S/,/\\,/g},'
 .endif
 
 .if ${PORT_OPTIONS:MEXIMON}
 SEDLIST+=	-e 's,^\# (EXIM_MONITOR=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MTLS}
 .if ! ${PORT_OPTIONS:MGNUTLS}
 USES+=		ssl
 SEDLIST+=	-e 's,^\# (USE_OPENSSL=),\1,'
 SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,'
 BROKEN_SSL=	openssl31
 BROKEN_SSL_REASON=	error: token is not a valid binary operator in a preprocessor subexpression
 .else
 SEDLIST+=	-e 's,^\# (USE_GNUTLS=),\1,'
 SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lgnutls[[:space:]]),\1,'
 .endif
 .else # TLS support
 SEDLIST+=	-e 's,^\# (DISABLE_TLS=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MEMBEDDED_PERL}
 SEDLIST+=	-e 's,^\# (EXIM_PERL=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \
 		-e 's,^\# (USE_TCP_WRAPPERS=),\1,'
 .else
 SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
 SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \
 		-e 's,^\# (HAVE_ICONV=),\1,'
 .else
 SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MOPENLDAP}
 LDAP_LIB_TYPE=	OPENLDAP2
 SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \
 		-e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include,' \
 		-e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE:S/,/\\,/g},' \
 		-e 's,^\# (LOOKUP_LDAP=),\1,'
 .else
 SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 		-e 's,^(LDAP_LIB_TYPE=),\# \1,'
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=	2 3 6 18
 DB_LIBS=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 DB_INCLUDES=	-I${BDB_INCLUDE_DIR}
 .else
 DB_LIBS=
 DB_INCLUDES=
 SEDLIST+=	-e 's,^(DBMLIB=),\# \1,'
 .endif
 SEDLIST+=	-e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
 		-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
 
 .if ${PORT_OPTIONS:MLMDB}
 _LMDB_LIBS=	-L${LOCALBASE}/lib -llmdb
 _LMDB_INCLUDES=	-I${LOCALBASE}/include
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_LMDB=),\1,'
 .else
 _LMDB_LIBS=
 _LMDB_INCLUDES=
 .endif
 SEDLIST+=	-e 's,XX_LMDB_LIBS_XX,${_LMDB_LIBS:S/,/\\,/g},' \
 		-e 's,XX_LMDB_INCLUDES_XX,${_LMDB_INCLUDES:S/,/\\,/g},'
 
 .if ${PORT_OPTIONS:MMYSQL}
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -l${_MYSQL_SHLIB:S/lib//},' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \
 		-e 's,^\# (LOOKUP_MYSQL=),\1,'
 .else
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MSASLAUTHD}
 SASLAUTHD_SOCKET?=	/var/run/saslauthd/mux
 SEDLIST+=	-e 's,^\# (CYRUS_SASLAUTHD_SOCKET=).*,\1${SASLAUTHD_SOCKET:S/,/\\,/g},'
 .endif
 
 .if ${PORT_OPTIONS:MPAM}
 SEDLIST+=	-e 's,XX_PAM_LIBS_XX,-lpam,' \
 		-e 's,^\# (SUPPORT_PAM=),\1,'
 .else
 SEDLIST+=	-e 's,XX_PAM_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_CRAM_MD5}
 SEDLIST+=	-e 's,^\# (AUTH_CRAM_MD5=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_PLAINTEXT}
 SEDLIST+=	-e 's,^\# (AUTH_PLAINTEXT=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_DOVECOT}
 SEDLIST+=	-e 's,^\# (AUTH_DOVECOT=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_SPA}
 SEDLIST+=	-e 's,^\# (AUTH_SPA=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_SASL}
 SEDLIST+=	-e 's,^\# (AUTH_CYRUS_SASL=),\1,' \
 		-e 's,^\# (AUTH_LIBS=.*-lsasl2),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_TLS}
 SEDLIST+=	-e 's,^\# (AUTH_TLS=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_RADIUS}
 WITH_RADIUS_TYPE?=	RADLIB
 .if ${WITH_RADIUS_TYPE:tl} == radlib
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-lradius,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,'
 .elif ${WITH_RADIUS_TYPE:tl} == radiusclient
 LIB_DEPENDS+=	libfreeradius-client.so:net/freeradius-client
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lfreeradius-client,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE:S/,/\\,/g}/etc/radiusclient/radiusclient.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,'
 .else
 IGNORE=		the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT
 .endif
 .else
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lpq,' \
 		-e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/pgsql,' \
 		-e 's,^\# (LOOKUP_PGSQL=),\1,'
 .else
 SEDLIST+=	-e 's,XX_PGSQL_[^ ]*_XX,,'
 .endif
 
 .if ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL} && !defined(LDAP_LIB_TYPE) && \
     ! ${PORT_OPTIONS:MBDB} && ! ${PORT_OPTIONS:MLMDB}
 SEDLIST+=	-e 's,^(LOOKUP_LIBS=),\# \1,' \
 		-e 's,^(LOOKUP_INCLUDE=),\# \1,'
 .endif
 
 .if ! ${PORT_OPTIONS:MDNSDB}
 SEDLIST+=	-e 's,^(LOOKUP_DNSDB=),\# \1,'
 .endif
 
 .if ${PORT_OPTIONS:MMAILDIR}
 SEDLIST+=	-e 's,^\# (SUPPORT_MAILDIR=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MMAILSTORE}
 SEDLIST+=	-e 's,^\# (SUPPORT_MAILSTORE=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MMBX}
 SEDLIST+=	-e 's,^\# (SUPPORT_MBX=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MCDB}
 SEDLIST+=	-e 's,^\# (LOOKUP_CDB=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MDSEARCH}
 SEDLIST+=	-e 's,^\# (LOOKUP_DSEARCH=),\1,'
 .endif
 
 .if ! ${PORT_OPTIONS:MLSEARCH}
 SEDLIST+=	-e 's,^(LOOKUP_LSEARCH=),\# \1,'
 .endif
 
 .if ${PORT_OPTIONS:MNIS}
 SEDLIST+=	-e 's,^\# (LOOKUP_NIS=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MPASSWD}
 SEDLIST+=	-e 's,^\# (LOOKUP_PASSWD=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,`pkg-config --static --libs sqlite3`,' \
 		-e 's,XX_SQLITE_FLAGS_XX,`pkg-config --cflags sqlite3`,' \
 		-e 's,^\# (LOOKUP_SQLITE=),\1,'
 .else
 SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,,' \
 		-e 's,XX_SQLITE_FLAGS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MREDIS}
 SEDLIST+=	-e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \
 		-e 's,^\# (LOOKUP_REDIS=),\1,' \
 		-e 's,^\# (REDIS=),\1,'
 .else
 SEDLIST+=	-e 's,XX_REDIS_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MLMTP}
 SEDLIST+=	-e 's,^\# (TRANSPORT_LMTP=),\1,'
 .endif
 
 .if ! ${PORT_OPTIONS:MALT_CONFIG_PREFIX}
 SEDLIST+=	-e 's,^(ALT_CONFIG_PREFIX=),\# \1,'
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
 SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,-DSPF,' \
 		-e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \
 		-e 's,^\# (SUPPORT_SPF=),\1,'
 .else
 SEDLIST+=	-e 's,XX_SPF_FLAGS_XX,,' \
 		-e 's,XX_SPF_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MSRS}
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DSUPPORT_SRS,' \
 		-e 's,XX_SRS_LIBS_XX,,'
 .elif ${PORT_OPTIONS:MOLD_SRS}
 LIB_DEPENDS+=	libsrs_alt.so:mail/libsrs_alt
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS_ALT,' \
 		-e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,'
 .else
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,,' \
 		-e 's,XX_SRS_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
 SEDLIST+=	-e 's,^\# (USE_READLINE=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MCONTENT_SCAN}
 SEDLIST+=	-e 's,^\# (WITH_CONTENT_SCAN=),\1,'
 .endif
 
 .if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON}
 USE_RC_SUBR=	exim
 PLIST_SUB+=	EXIMDAEMON=""
 SUB_LIST+=	LOGDIR="${LOGDIR}"
 .else
 PLIST_SUB+=	EXIMDAEMON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 SEDLIST+=	-e 's,^\# (HAVE_IPV6=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MDISABLE_D_OPT}
 SEDLIST+=	-e 's,^\# (DISABLE_D_OPTION=),\1,'
 .else
 .if defined(WHITELIST_D_MACROS)
 SEDLIST+=	-e 's,^\# (WHITELIST_D_MACROS=).*$$,\1${WHITELIST_D_MACROS:S/,/\\,/g},'
 .endif
 .endif
 
 .if defined(TRUSTED_CONFIG_LIST)
 SEDLIST+=	-e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g},'
 .endif
 
 .if ${PORT_OPTIONS:MQUEUEFILE}
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_QUEUEFILE=),\1,'
 .endif
 
 MAKE_ENV+=	INSTALL_ARG="${EXIM_INSTALL_ARG}"
 DUMMY_LDFLAGS!=	${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g'
 
 pre-everything::
 	@${ECHO} 'Exim now drops privileges when alternate configuration'
 	@${ECHO} 'files are used.  You can set make variable TRUSTED_CONFIG_LIST'
 	@${ECHO} 'to specify the list of configuration files for which'
 	@${ECHO} 'root privileges will be retained.'
 	@${ECHO} ''
 	@${ECHO} 'You can whitelist some macros using the make variable'
 	@${ECHO} 'WHITELIST_D_MACROS.  This is useful if you are running'
 	@${ECHO} 'with DISABLE_D_OPT set, but macros whitelisting will be'
 	@${ECHO} 'removed in some future Exim release, so it is better'
 	@${ECHO} 'to use TRUSTED_CONFIG_LIST to set the list of trusted'
 	@${ECHO} 'configuration files.'
 .if empty(.MAKEFLAGS:M-s) && ${PORT_OPTIONS:MWISHLIST}
 	@${ECHO} ''
 	@${ECHO} 'Included extra patches:'
 	@${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \
 	    -exec ${SED} -ne 's,^# , ,p' {} \;
 	@${ECHO} ''
 .endif
 
 post-extract:
 .if ${PORT_OPTIONS:MSA_EXIM}
 	@cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
 	@@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local
 	@@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf ${WRKSRC}/Local
 .endif
 
 do-configure:
 	@${MKDIR} ${WRKSRC}/Local
 	@${SED} -E ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
 .if ${PORT_OPTIONS:MEXIMON}
 	@${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
 .endif
 	@${REINPLACE_CMD} -E ${SEDLIST} ${WRKSRC}/src/configure.default
 	@${REINPLACE_CMD} -e 's!$$(LDFLAGS)!$$(DUMMY_LDFLAGS) -L$${LOCALBASE}/lib!' ${WRKSRC}/OS/Makefile-Base
 	@${REINPLACE_CMD} -e 's/"(Exim $$version_number)\\n\\t"/"(Exim $$version_number (${OPSYS}))\\n\\t"/' \
 		${WRKSRC}/src/globals.c
 	@${REINPLACE_CMD} -e 's/Exim version %s \(#%s \)\{0,1\}/&(${OPSYS} ${OSREL}) /' ${WRKSRC}/src/exim.c
 	@${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c
 	@${REINPLACE_CMD} -E -e 's/^(PERL_COMMAND=).*/\1${PERL:S,/,\/,g}/' \
 		-e 's/^(CC=).*/\1${CC:S,/,\/,g}/' ${WRKSRC}/OS/Makefile-Default
 .if ${PORT_OPTIONS:MSA_EXIM}
 	@${REINPLACE_CMD} -E -e 's/^\# (HAVE_LOCAL_SCAN=).*/\1yes/' \
 		${WRKSRC}/OS/Makefile-Default
 	@${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \
 		${WRKSRC}/OS/Makefile-Default
 	@{ \
 	    ${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \
 	    ${ECHO_CMD} "#define SPAMC_LOCATION		\"${LOCALBASE}/bin/spamc\""; \
 	    ${ECHO_CMD} "#define SPAMASSASSIN_CONF	\"${PREFIX}/etc/exim/sa-exim.conf\""; \
 	} > ${WRKSRC}/Local/sa-exim.h
 	@${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \
 	    ${WRKSRC}/Local/sa-exim.conf
 .endif
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure)
 
 post-build:
 .for script in ${DAILY_SCRIPTS}
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh > ${WRKDIR}/${script}.sh
 .endfor
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > \
 		${WRKDIR}/POST-INSTALL-NOTES
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES.clamd > ${WRKDIR}/POST-INSTALL-NOTES.clamd
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
 	@[ ! -f ${PKGDIR}/pkg-message ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message
 
 .if !defined(EXIMON_ONLY)
 post-install:
 .if ${PORT_OPTIONS:MDAEMON}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 .for script in ${DAILY_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script}
 .endfor
 .endif
 	@${MKDIR} -m 750 ${STAGEDIR}${LOGDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${PREFIX}/share/man/man8
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${STAGEDIR}${DOCSDIR}
 .for docfile in ${PORTDOC_BASE}
 	${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for docfile in ${PORTDOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for example in ${PORT_EXAMPLES}
 	${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .endif
 .if ${PORT_OPTIONS:MSA_EXIM}
 	${INSTALL_DATA} ${WRKSRC}/Local/sa-exim.conf \
 		${STAGEDIR}${PREFIX}/etc/exim/sa-exim.conf.sample
 .endif
 
 .endif # ! defined(EXIMON_ONLY)
 
 .include <bsd.port.pre.mk>
 
 # If using clang, avoid too many warnings due to Exim code style
 .if ${CHOSEN_COMPILER_TYPE} == "clang"
 EXIM_WARN_FLAGS?=	-Wno-logical-op-parentheses -Wno-macro-redefined -Wno-parentheses -Wno-dangling-else
 .endif
 CFLAGS+=	${EXIM_WARN_FLAGS}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 2f96031d4d36..1db327256e7c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,408 +1,408 @@
 PORTNAME=	vlc
 DISTVERSION=	3.0.20
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		https://mirror.init7.net/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://mirror.clarkson.edu/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://ftp.kaist.ac.kr/vlc/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Qt based multimedia player and streaming server
 WWW=		https://www.videolan.org
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libdvbpsi.so:multimedia/libdvbpsi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn \
 		libmatroska.so:multimedia/libmatroska \
 		libgpg-error.so:security/libgpg-error \
 		libebml.so:textproc/libebml
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		ffmpeg>=3.4.1,1:multimedia/ffmpeg \
 		yasm:devel/yasm
 RUN_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg
 
 USES=		compiler:c++17-lang cpe desktop-file-utils elfctl gettext-tools \
 		gmake gnome iconv:wchar_t libtool localbase pathfix pkgconfig \
 		tar:xz
 
 CPE_VENDOR=	videolan
 ELF_FEATURES=	+noaslr:bin/.libs/vlc # See PR 270038
 
 # VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag
 # to the compiler. Until the port is updated, we explicitly pass -std=c++11 to
 # the compiler because Qt 5.7+ requires C++11 support, and FreeBSD 10's clang
 # does not default to C++11 mode.
 # USE_CXXSTD=	c++11
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CONFIGURE_ARGS=	--enable-avcodec --enable-avformat --enable-dvbpsi \
 		--enable-fontconfig --enable-freetype --enable-libgcrypt \
 		--enable-libxml2 --enable-oss --enable-postproc \
 		--enable-swscale --enable-vlc \
 		--disable-alsa --disable-archive --disable-chromaprint --disable-crystalhd \
 		--disable-dc1394 --disable-decklink --disable-dsm \
 		--disable-dv1394 --disable-fdkaac --disable-gst-decode \
 		--disable-gles2 --disable-kai --disable-kate --disable-kva --disable-mpg123 \
 		--disable-vnc --disable-opencv --disable-projectm --disable-schroedinger \
 		--disable-secret --disable-soxr --disable-telx \
 		--disable-tiger --disable-tremor --disable-udev \
 		--disable-update-check --disable-vsxu \
 		--disable-wasapi --disable-x26410b \
 		--with-kde-solid=${PREFIX}/share/solid/actions \
 		ac_cv_search_pthread_rwlock_init=-pthread \
 		BUILDCC="${CC}"
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 CFLAGS_i386=	-fomit-frame-pointer
 
 OPTIONS_DEFINE=	A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \
 		DEBUG DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \
 		GOOM HARFBUZZ JACK JPEG LIBBLURAY LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \
 		LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \
 		NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
 		QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY \
 		SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
 		TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI
 OPTIONS_DEFINE_powerpc=	ALTIVEC
 OPTIONS_DEFINE_powerpc64=	ALTIVEC
 OPTIONS_DEFAULT=ASS AVAHI DAV1D DBUS DVDREAD DVDNAV GNUTLS HARFBUZZ JPEG \
 		LIVEMEDIA LUA OGG OPTIMIZED_CFLAGS \
 		OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \
 		UPNP V4L VAAPI VCD VDPAU VORBIS WAYLAND X11
 OPTIONS_DEFAULT_powerpc=	ALTIVEC
 OPTIONS_DEFAULT_powerpc64=	ALTIVEC
 OPTIONS_EXCLUDE=LIBPLACEBO # https://code.videolan.org/videolan/vlc/-/commit/8e22c39ea3c3
 OPTIONS_EXCLUDE+=	VAAPI # Not compatible until VLC 4
 OPTIONS_SUB=	yes
 
 AOM_DESC=	AV1 video encoding/decoding via libaom
 ASS_DESC=	ASS/SSA subtitle rendering
 CHROMECAST_DESC=Streaming to Chromecast devices
 DAV1D_DESC=	AV1 video decoding via libdav1d
 DVDREAD_DESC=	DVD Playback support
 DVDNAV_DESC=	DVD menu navigation
 FLUID_DESC=	Fluidsynth MIDI support
 FREERDP_DESC=	RDP support
 GME_DESC=	Game Music Emu (libgme) support
 GOOM_DESC=	Goom visualisation plugin
 HARFBUZZ_DESC=	OpenType text shaping engine
 LIBPLACEBO_DESC=HDR tonemapping support through libplacebo
 LIBSSH2_DESC=	SCP/SFTP support via libssh2
 MFX_DESC=	Intel MediaSDK (aka Quick Sync Video)
 OGGSPOTS_DESC=	Experimental OggSpots codec
 REALRTSP_DESC=	Real RTSP access module
 RUNROOT_DESC=	Enable running as root
 SIDPLAY_DESC=	C64 sid demux support
 SKINS_DESC=	Build skins2 interface module (implies QT5)
 STREAM_DESC=	stream output
 TAGLIB_DESC=	ID3 tag and Ogg comment support
 VCD_DESC=	Audio/Video CD support
 ZVBI_DESC=	VBI decoding support
 
 A52_CONFIGURE_ENABLE=	a52
 A52_CONFIGURE_ON=	--with-a52=${LOCALBASE}
 A52_LIB_DEPENDS=	liba52.so:audio/liba52
 
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_ENABLE=	aa
 
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 ALTIVEC_CONFIGURE_ENABLE=	altivec
 ALTIVEC_CFLAGS=		-maltivec
 
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CONFIGURE_ENABLE=	aom
 
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	caca
 
 CHROMECAST_LIB_DEPENDS=	libprotobuf-lite.so:devel/protobuf
 CHROMECAST_CONFIGURE_ENABLE=	chromecast
 CHROMECAST_USE=		cxxstd=c++17
 
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CONFIGURE_ENABLE=	dav1d
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 
 DCA_LIB_DEPENDS=	libdca.so:multimedia/libdca
 DCA_CONFIGURE_ENABLE=	dca
 
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ENABLE=	dvdread
 
 DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_ENABLE=dvdnav
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CONFIGURE_ENABLE=	faad
 FAAD_CONFIGURE_ENV=	CPPFLAGS_faad="-I${LOCALBASE}/include" \
 			LIBS_faad="-L${LOCALBASE}/lib"
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENABLE=	flac
 
 FLUID_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUID_CONFIGURE_ENABLE=	fluidsynth
 
 FREERDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
 FREERDP_CONFIGURE_ENABLE=	freerdp
 FREERDP_CONFIGURE_ENV=	FREERDP_CFLAGS="-I${LOCALBASE}/include/freerdp2 \
 					-I${LOCALBASE}/include/winpr2" \
 			FREERDP_LIBS="-L${LOCALBASE}/lib"
 
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
 
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	gme
 GME_CONFIGURE_ENV=	LIBS_gme="-L${LOCALBASE}/lib -lgme"
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=gnutls
 
 GOOM_LIB_DEPENDS=	libgoom2.so:graphics/goom
 GOOM_CONFIGURE_ENABLE=	goom
 
 HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	bluray
 
 LIBPLACEBO_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo
 LIBPLACEBO_CONFIGURE_ENABLE=	libplacebo
 
 LIBRSVG2_USE=			GNOME=librsvg2,cairo
 LIBRSVG2_CONFIGURE_ENABLE=	svg
 
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 LIBSSH2_CONFIGURE_ENABLE=	sftp
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENABLE=	lirc
 LIRC_CONFIGURE_ENV=	LIBS_lirc="-L${LOCALBASE}/lib -llirc_client"
 
 LIVEMEDIA_USES=		ssl
 LIVEMEDIA_LIB_DEPENDS=	libliveMedia.so:net/liveMedia
 LIVEMEDIA_CONFIGURE_ENABLE=	live555
 LIVEMEDIA_CONFIGURE_ENV=	\
 	LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \
 			-I${LOCALBASE}/include/UsageEnvironment \
 			-I${LOCALBASE}/include/groupsock \
 			-I${LOCALBASE}/include/BasicUsageEnvironment" \
 	LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \
 			-lgroupsock -lBasicUsageEnvironment \
 			-lUsageEnvironment \
 			-L${OPENSSLLIB} -lssl -lcrypto"
 
 LUA_USES=		lua
 LUA_CONFIGURE_ENABLE=	lua
 LUA_CONFIGURE_ON=	LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \
 			LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_ENABLE=	mad
 MAD_CONFIGURE_ON=	--with-mad=${LOCALBASE}
 
 MFX_LIB_DEPENDS=	libmfx.so:multimedia/intel-media-sdk
 MFX_CONFIGURE_ENABLE=	mfx
 
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	mod
 
 MPEG2_LIB_DEPENDS=	libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENABLE=	libmpeg2
 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CONFIGURE_ENABLE=	mtp
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
 MUSEPACK_CONFIGURE_ENABLE=	mpc
 MUSEPACK_CONFIGURE_ENV=		LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec"
 
 NCURSES_USES=			ncurses
 NCURSES_CONFIGURE_ENV=		NCURSES_CFLAGS="-I${NCURSESINC}" \
 				NCURSES_LIBS="-L${NCURSESLIB} -lncursesw"
 NCURSES_CONFIGURE_ENABLE=	ncurses
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CONFIGURE_ENABLE=	nfs
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_USE=		GNOME=gtk30,cairo
 NOTIFY_CONFIGURE_ENABLE=notify
 
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CONFIGURE_ENABLE=	ogg
 
 OGGSPOTS_CONFIGURE_ENABLE=	oggspots
 OGGSPOTS_IMPLIES=	OGG
 
 OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=	opus
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 QT5_USES=	qt:5
 QT5_USE=	QT=gui,core,svg,widgets,x11extras,buildtools:build
 QT5_CONFIGURE_ENABLE=	qt
 QT5_IMPLIES=	X11
 
 REALRTSP_CONFIGURE_ENABLE=	realrtsp
 
 RUNROOT_CONFIGURE_ENABLE=	run-as-root
 
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=	samplerate
 
 SDL_USES=		sdl
 SDL_USE=		SDL=image
 SDL_CONFIGURE_ENABLE=	sdl-image
 
 SIDPLAY_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
 SIDPLAY_CONFIGURE_ENABLE=	sid
 CONFIGURE_ARGS+=	--disable-sid
 
 SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_CONFIGURE_ENABLE=	shout
 
 SKINS_USE=		XORG=xext,xinerama,xpm
 SKINS_USES=		xorg
 SKINS_CONFIGURE_ENABLE=	skins2
 SKINS_IMPLIES=		QT5
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
 SMB_USES=		samba:lib
 SMB_CONFIGURE_ENABLE=	smbclient
 
 STREAM_CONFIGURE_ENABLE=sout
 
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 SPEEX_CONFIGURE_ENABLE=	speex
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CONFIGURE_ENABLE=taglib
 
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=theora
 
 TWOLAME_LIB_DEPENDS=		libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ENABLE=	twolame
 
 UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_ENABLE=	upnp
 
 V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	v4l2
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	libva
 
 VCD_LIB_DEPENDS=	libcddb.so:audio/libcddb
 VCD_CONFIGURE_ENABLE=	vcd libcddb
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 VDPAU_IMPLIES=		X11
 
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	vpx
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
 
 X11_USE=		GL=gl XORG=xcb,xorgproto,sm,ice,x11
 X11_USES=		gl xorg
 X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 X11_CONFIGURE_ENABLE=	xcb xvideo
 X11_CONFIGURE_WITH=	x
 
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	x264
 
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CONFIGURE_ENABLE=	x265
 
 ZVBI_LIB_DEPENDS=	libzvbi.so:devel/libzvbi
 ZVBI_CONFIGURE_ENABLE=	zvbi
 
 PORTDATA=	*
 PORTDOCS=	*
 
 WITH_CDROM_DEVICE?=/dev/cd0
 WITH_DVD_DEVICE?=/dev/cd0
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug --disable-optimizations
 CFLAGS+=-g -O0
 CXXFLAGS+=-g -O0
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '\|LIBS|s|-lrt||' \
 		-e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \
 		-e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \
 		${WRKSRC}/src/libvlc-module.c
 	@${RM} -r ${WRKSRC}/modules/access/v4l2/linux
 # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c
 	@${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \
 		-type f -o -type l >> ${TMPPLIST})
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so
 	# plugin cache becomes stale after strip. Regenerate it:
 	${WRKSRC}/bin/vlc-cache-gen ${STAGEDIR}${PREFIX}/lib/vlc/plugins
 
 .include <bsd.port.mk>
diff --git a/net-im/biboumi/Makefile b/net-im/biboumi/Makefile
index a75a22b09c61..f9005d8c9421 100644
--- a/net-im/biboumi/Makefile
+++ b/net-im/biboumi/Makefile
@@ -1,93 +1,93 @@
 PORTNAME=	biboumi
 DISTVERSION=	9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	https://git.louiz.org/biboumi/snapshot/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	samir@noir.im
 COMMENT=	XMPP gateway to IRC
 WWW=		https://biboumi.louiz.org/
 
 LICENSE=	ZLIB
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake iconv localbase:ldflags pkgconfig python:build tar:xz
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	catchorg:Catch2:v2.2.1:catch/external/src/catch
 
 CMAKE_ARGS=	-DWITHOUT_SYSTEMD=1
 
 OPTIONS_DEFINE=		DOCS LIBIDN PGSQL SQLITE3 TLS UDNS
 OPTIONS_DEFAULT=	LIBIDN PGSQL SQLITE3 TLS UDNS
 
 LIBIDN_DESC=		Stringprep functionality, to provide JIDs for IRC users
 PGSQL_DESC=		Store users' options and messages in PostgreSQL
 SQLITE3_DESC=		Store users' options and messages in SQLite
 TLS_DESC=		Support TLS connections to IRC servers
 UDNS_DESC=		Asynchronously resolve domain names, for better performances
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme
 DOCS_PORTDOCS=		*
 
 LIBIDN_LIB_DEPENDS=	libidn.so:dns/libidn
 LIBIDN_CMAKE_ON=	-DWITH_LIBIDN=1
 LIBIDN_CMAKE_OFF=	-DWITHOUT_LIBIDN=1
 
 PGSQL_USES=		pgsql
 PGSQL_CMAKE_ON=		-DWITH_POSTGRESQL=1
 PGSQL_CMAKE_OFF=	-DWITHOUT_POSTGRESQL=1
 
 SQLITE3_USES=		sqlite:3
 SQLITE3_CMAKE_ON=	-DWITH_SQLITE3=1
 SQLITE3_CMAKE_OFF=	-DWITHOUT_SQLITE3=1
 
 TLS_LIB_DEPENDS=	libbotan-2.so:security/botan2
 TLS_LIB_DEPENDS_OFF=	libgcrypt.so:security/libgcrypt
 TLS_RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 TLS_CMAKE_ON=		-DWITH_BOTAN=1
 TLS_CMAKE_OFF=		-DWITHOUT_BOTAN=1
 
 UDNS_LIB_DEPENDS=	libudns.so:dns/udns
 UDNS_CMAKE_ON=		-DWITH_UDNS=1
 UDNS_CMAKE_OFF=		-DWITHOUT_UDNS=1
 
 USERS=		biboumi
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	biboumi
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 PLIST_SUB=	${SUB_LIST}
 SUB_FILES=	pkg-message
 
 post-patch:
 	${REINPLACE_CMD} -e 's,GIT_REPOSITORY.*Catch.git",SOURCE_DIR "${WRKSRC}/external/src/catch",' ${WRKSRC}/CMakeLists.txt
 
 post-build:
 	cd ${WRKSRC}/doc && ${MAKE} man
 
 post-build-DOCS-on:
 	cd ${WRKSRC}/doc && ${MAKE} html
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/biboumi ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/biboumi
 	${INSTALL_DATA} ${WRKSRC}/conf/biboumi.cfg ${STAGEDIR}${ETCDIR}/biboumi.cfg.sample
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/biboumi
 	${MKDIR} ${STAGEDIR}/var/run/biboumi
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/*policy.txt ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/_build/man/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name .buildinfo")
 
 .include <bsd.port.mk>
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 49b8a9ec3146..6b453c3ff16d 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	gloox
 DISTVERSION=	1.0.24
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://camaya.net/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber/XMPP client library
 WWW=		https://camaya.net/gloox
 
 LICENSE=	GPLv3 # with OpenSSL exception
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libgnutls.so:security/gnutls
 
 USES=		libtool localbase pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 PORTSCOUT=	skipv:1.0.x
 
 OPTIONS_DEFINE=		MDNSRESPONDER TEST
 
 MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 MDNSRESPONDER_CONFIGURE_ENABLE=	mdns
 TEST_CONFIGURE_WITH=	tests
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's| -ansi|| ; \
 		 s|\(enable_mdns=\)yes|\1$$enableval|' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's| -pedantic|| ; \
 		 s| -pipe||'
 
 .include <bsd.port.mk>
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index 5b19eb49c312..b8bfc4f5e429 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	kopete
 PORTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multi-protocol instant messenger
 WWW=		https://apps.kde.org/kopete/
 
 BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libjasper.so:graphics/jasper \
 		libotr.so:security/libotr \
 		libv4l2.so:multimedia/libv4l
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gnome jpeg kde:5 \
 		qca qt:5 shebangfix tar:xz xorg
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons dnssd emoticons guiaddons i18n \
 		iconthemes itemviews jobwidgets js kcmutils kdelibs4support \
 		khtml kio notifications notifyconfig parts phonon service solid sonnet \
 		syntaxhighlighting texteditor textwidgets unitconversion wallet widgetsaddons \
 		windowsystem xmlgui \
 		ecm:build
 # KDE PIM components
 USE_KDE+=	contacts identitymanagement libkleo pimtextedit
 USE_QT=		concurrent core dbus gui network printsupport sql widgets xml \
 		buildtools:build qmake:build testlib:build
 USE_XORG=	x11
 
 SHEBANG_FILES=	protocols/winpopup/winpopup-install \
 		protocols/winpopup/winpopup-send \
 		kopete/kconf_update/*.pl
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index b502a1ec1d0e..c63a308ecf40 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -1,306 +1,307 @@
 PORTNAME?=	libpurple
 PORTVERSION=	2.14.12
+PORTREVISION=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
 
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 WWW=		https://www.pidgin.im/
 
 LICENSE=	GPLv3
 
 USES+=		cpe gettext gmake gnome libtool localbase pathfix pkgconfig \
 		tar:bzip2
 USE_GNOME?=	gnomeprefix intltool glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
 		--disable-consoleui \
 		--with-dynamic-prpls=${PRPL_MODULES:S/,$//} \
 		--enable-static \
 		--disable-nm \
 		--with-system-ssl-certs=/usr/share/certs/trusted \
 		--disable-schemas-install
 INSTALL_TARGET=	install-strip
 
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
 # set these macros themselves.
 USES+=		iconv shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	libpurple/purple-remote \
 		libpurple/purple-url-handler
 
 .if defined(PACKAGE_BUILDING)
 WITH_GNOME=	yes
 .endif
 
 .endif
 
 PRPL_MODULES=
 
 CPE_VENDOR=	pidgin
 
 OPTIONS_DEFINE=	DBUS SASL GSTREAMER VV IDN PERL TCLTK
 OPTIONS_GROUP=		PROTOCOLS
 OPTIONS_RADIO=	TLS
 OPTIONS_RADIO_TLS=	NSS GNUTLS
 OPTIONS_GROUP_PROTOCOLS=BONJOUR GG SAMETIME SILC IRC JABBER \
 			NOVELL QQ SIMPLE ZEPHYR
 OPTIONS_DEFAULT=	BONJOUR DBUS NSS GSTREAMER VV IDN GG IRC JABBER \
 			NOVELL QQ SASL SIMPLE ZEPHYR
 BONJOUR_DESC=	mDNS support and Bonjour protocol
 GNUTLS_DESC=	Use GNUTLS for encryption support
 NSS_DESC=	Use Mozilla NSS for encryption support
 SASL_DESC=	Cyrus SASL support (for jabberd)
 GSTREAMER_DESC=	Use GStreamer for playing sounds
 VV_DESC=	Video and voice support
 SAMETIME_DESC=	The Lotus Sametime chat protocol
 SILC_DESC=	The Secure Internet Live Conferencing protocol
 GG_DESC=	The Gadu-Gadu chat protocol
 IRC_DESC=	The Internet Relay Chat protocol
 JABBER_DESC=	The Jabber/XMPP/Google Talk protocol
 NOVELL_DESC=	The Novell GroupWise chat protocol
 QQ_DESC=	The Tencent QQ chat protocol
 SIMPLE_DESC=	The SIMPLE chat protocol
 ZEPHYR_DESC=	The Zephyr chat protocol
 
 PLIST_SUB+=	SHLIB_VERSION=${PORTVERSION:R:E}.${PORTVERSION:E}
 .if defined(WITH_GTKUI)
 OPTIONS_DEFINE+=	GTKSPELL CAP
 OPTIONS_DEFAULT+=	GTKSPELL CAP
 GTKSPELL_DESC=	Spell checking support
 CAP_DESC=	Contact Availability Prediction plugin
 PLIST_SUB+=	GTKUI=""
 .else
 PLIST_SUB+=	GTKUI="@comment not installed: "
 .endif
 
 .if defined(WITH_CONSOLEUI)
 USES+=		ncurses
 CONFIGURE_ARGS+=--with-ncurses-headers=${NCURSESINC}
 PLIST_SUB+=	CONSOLEUI=""
 .else
 PLIST_SUB+=	CONSOLEUI="@comment not installed: "
 .endif
 
 CONFIGURE_ARGS+=--disable-doxygen
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .if ${PORT_OPTIONS:MTCLTK}
 USES+=			tk
 CFLAGS+=		-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR}
 CONFIGURE_ARGS+=	--with-tclconfig=${TCL_LIBDIR} \
 			--with-tkconfig=${TK_LIBDIR}
 PLIST_SUB+=		TCL:=""
 .else
 CONFIGURE_ARGS+=	--disable-tcl
 PLIST_SUB+=		TCL:="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=			perl5
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=		PERL:=""
 .if !defined(PIDGIN_SLAVE) || defined(WITH_GTKUI)
 PLIST_SUB+=		PERLMAN:=""
 .else
 PLIST_SUB+=		PERLMAN:="@comment not installed: "
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=		PERL:="@comment not installed: " \
 			PERLMAN:="@comment not installed: "
 .endif
 
 .if defined(WITH_GTKUI)
 USE_GNOME+=		evolutiondataserver3
 PLIST_SUB+=		EVO=""
 CONFIGURE_ARGS+=	--enable-gevolution
 .else
 CONFIGURE_ARGS+=	--disable-gevolution
 PLIST_SUB+=		EVO="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
 USES+=		gstreamer
 USE_GSTREAMER+=core good
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
 .endif
 
 .if ${PORT_OPTIONS:MVV} && ${PORT_OPTIONS:MGSTREAMER}
 LIB_DEPENDS+=	libfarstream-0.2.so:net-im/farstream
 USE_GSTREAMER+=v4l2
 PLIST_SUB+=	VV=""
 .else
 CONFIGURE_ARGS+=--disable-vv
 PLIST_SUB+=	VV="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	libidn.so:dns/libidn
 .else
 CONFIGURE_ARGS+=--disable-idn
 .endif
 
 .if ${PORT_OPTIONS:MCAP}
 LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=--enable-cap
 PLIST_SUB+=	CAP=""
 .else
 CONFIGURE_ARGS+=--disable-cap
 PLIST_SUB+=	CAP="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=		libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls=yes
 PLIST_SUB+=		GNUTLS=""
 .else
 CONFIGURE_ARGS+=	--enable-gnutls=no
 PLIST_SUB+=		GNUTLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNSS}
 LIB_DEPENDS+=		libnss3.so:security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
 			--with-nspr-includes=${LOCALBASE}/include/nspr \
 			--with-nspr-libs=${LOCALBASE}/lib \
 			--with-nss-includes=${LOCALBASE}/include/nss \
 			--with-nss-libs=${LOCALBASE}/lib
 PLIST_SUB+=		NSS=""
 .else
 CONFIGURE_ARGS+=	--enable-nss=no
 PLIST_SUB+=		NSS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .else
 CONFIGURE_ARGS+=	--disable-cyrus-sasl
 .endif
 
 .if ${PORT_OPTIONS:MBONJOUR}
 LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 PLIST_SUB+=	BONJOUR=""
 PRPL_MODULES:=	bonjour,${PRPL_MODULES}
 .else
 CONFIGURE_ARGS+=--disable-avahi
 PLIST_SUB+=	BONJOUR="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
 LIB_DEPENDS+=		libgtkspell.so:textproc/gtkspell
 .else
 CONFIGURE_ARGS+=	--disable-gtkspell
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 USES+=			python
 LIB_DEPENDS+=		libdbus-glib-1.so:devel/dbus-glib
 .if !defined(PIDGIN_SLAVE)
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 .endif
 CONFIGURE_ARGS+=	--enable-dbus --with-python3=${PYTHON_CMD}
 PLIST_SUB+=		DBUS=""
 .else
 CONFIGURE_ARGS+=	--disable-dbus
 PLIST_SUB+=		DBUS="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MSAMETIME}
 LIB_DEPENDS+=	libmeanwhile.so:net-im/meanwhile
 PLIST_SUB+=	SAMETIME=""
 PRPL_MODULES:=	sametime,${PRPL_MODULES}
 .else
 PLIST_SUB+=	SAMETIME="@comment not installed: "
 CONFIGURE_ARGS+=--disable-meanwhile
 .endif
 
 .if ${PORT_OPTIONS:MSILC}
 LIB_DEPENDS+=		libsilcclient.so:devel/silc-toolkit
 CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc \
 			--with-silc-libs=${LOCALBASE}/lib
 PLIST_SUB+=		SILC=""
 PRPL_MODULES:=		silc,${PRPL_MODULES}
 .else
 PLIST_SUB+=		SILC="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGG}
 PLIST_SUB+=		GG=""
 PRPL_MODULES:=		gg,${PRPL_MODULES}
 .else
 PLIST_SUB+=		GG="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MIRC}
 PLIST_SUB+=		IRC=""
 PRPL_MODULES:=		irc,${PRPL_MODULES}
 .else
 PLIST_SUB+=		IRC="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MJABBER}
 PLIST_SUB+=		JABBER=""
 PRPL_MODULES:=		jabber,${PRPL_MODULES}
 .else
 PLIST_SUB+=		JABBER="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MNOVELL}
 PLIST_SUB+=		NOVELL=""
 PRPL_MODULES:=		novell,${PRPL_MODULES}
 .else
 PLIST_SUB+=		NOVELL="@comment not installed: "
 .endif
 
 #.if ${PORT_OPTIONS:MQQ}
 #PLIST_SUB+=		QQ=""
 #PRPL_MODULES:=		qq,${PRPL_MODULES}
 #.else
 #PLIST_SUB+=		QQ="@comment not installed: "
 #.endif
 
 .if ${PORT_OPTIONS:MSIMPLE}
 PLIST_SUB+=		SIMPLE=""
 PRPL_MODULES:=		simple,${PRPL_MODULES}
 .else
 PLIST_SUB+=		SIMPLE="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MZEPHYR}
 PLIST_SUB+=		ZEPHYR=""
 PRPL_MODULES:=		zephyr,${PRPL_MODULES}
 .else
 PLIST_SUB+=		ZEPHYR="@comment not installed: "
 .endif
 
 pre-everything::
 .if ! ${PORT_OPTIONS:MGNUTLS} && ! ${PORT_OPTIONS:MNSS}
 	@${ECHO_MSG} "WARNING: In order to use MSN, you must enable the GNUTLS and/or NSS options."
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|-lpthread $$LIBDL|-lpthread ${ICONV_LIB}|' \
 		${WRKSRC}/configure
 .if defined(PIDGIN_SLAVE)
 	@${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|'
 .endif
 
 .if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL}
 post-install:
 	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
 		${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index c54acf7d335a..7e3dbe98cb6f 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	loudmouth
 DISTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://mcabber.com/files/loudmouth/ \
 		http://www.lilotux.net/~mikael/mcabber/files/loudmouth/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight Jabber client library
 WWW=		https://mcabber.com/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		gettext gmake gnome libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-rebuilds \
 		--disable-gtk-doc \
 		--with-compile-warnings=no \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 
 OPTIONS_DEFAULT=	GNUTLS
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
 
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-ssl=openssl
 OPENSSL_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MGNUTLS) && empty(PORT_OPTIONS:MOPENSSL)
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index 1f125ec2eed8..2905b9d1cb8c 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.2.8
+PORTREVISION=	1
 CATEGORIES=	net-im www
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Social-compatible microblogging server
 WWW=		https://github.com/tootsuite/mastodon
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 RUN_DEPENDS=	autoconf>=2.71:devel/autoconf \
 		curl>0:ftp/curl \
 		ffmpeg>0:multimedia/ffmpeg \
 		git>=0:devel/git \
 		gmake>0:devel/gmake \
 		gnupg>0:security/gnupg \
 		redis>0:databases/redis \
 		rubygem-bundler>=0:sysutils/rubygem-bundler \
 		sudo>0:security/sudo \
 		wget>0:ftp/wget \
 		yarn>:www/yarn
 
 USES=		magick:7,run pgsql
 USE_GITHUB=	yes
 USE_RC_SUBR=	mastodon_sidekiq mastodon_streaming mastodon_web
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 RM_MASTODONFILES=	.dockerignore dist/mastodon-web.service \
 			dist/mastodon-sidekiq.service \
 			dist/mastodon-streaming.service \
 			docker-compose.yml \
 			Dockerfile \
 			Vagrantfile
 RM_MASTODONDIRS=	.circleci .devcontainer .github
 
 post-extract:
 .for _F in ${RM_MASTODONFILES}
 	@${RM} ${WRKSRC}/${_F}
 .endfor
 .for _D in ${RM_MASTODONDIRS}
 	@${RM} -r ${WRKSRC}/${_D}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'\
 		${WRKSRC}/dist/nginx.conf
 
 do-install:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
 	${FIND} ${WRKSRC} -name '*.gitignore' -delete
 	${MV} ${WRKSRC}/dist/nginx.conf ${WRKSRC}/dist/nginx.conf.sample
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 
 post-install:
 	@${ECHO_CMD} "@owner mastodon" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group mastodon" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 420e47e8e93a..28b2b88aef12 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	mcabber
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small Jabber console client
 WWW=		https://www.lilotux.net/~mikael/mcabber/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # it picks libcharset from converters/libiconv installed by glib,
 # so provide an explicit dependency
 LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth \
 		libcharset.so:converters/libiconv
 
 USES=		cpe gettext gnome iconv:wchar_t libtool localbase ncurses pathfix \
 		pkgconfig tar:bzip2
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-hgcset
 INSTALL_TARGET=	install-strip
 
 PORTDATA=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES GPGME OTR IDN
 OPTIONS_DEFAULT=	IDN
 OPTIONS_RADIO=		SPELL
 OPTIONS_RADIO_SPELL=	ASPELL ENCHANT
 OPTIONS_SUB=		yes
 
 ENCHANT_DESC=		Spell checking support via Enchant
 GPGME_DESC=		OpenPGP support via GPGME
 OTR_DESC=		Off-the-record messaging support
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ENABLE=aspell
 
 ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 ENCHANT_CONFIGURE_ENABLE=enchant
 
 GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_ENABLE=	gpgme
 
 OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libotr.so.5:security/libotr
 OTR_CONFIGURE_ENABLE=	otr
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_OFF=	--without-libidn
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$"$${libdir}|"$${libdir}|' \
 		 -e 's|-O2 $$CFLAGS|$$CFLAGS|' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mcabber.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/mcabberrc.example \
 		${STAGEDIR}${EXAMPLESDIR}/mcabberrc
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 4a556644ccbb..710531b77088 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	psi
 PORTVERSION=	1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Qt-based Jabber (XMPP) client
 WWW=		https://psi-im.org/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		cmake compiler:c++11-lang desktop-file-utils minizip pkgconfig \
 		qca qt:5 tar:xz xorg
 USE_QT=		concurrent core dbus gui multimedia network svg widgets \
 		x11extras xml buildtools:build qmake:build imageformats:run
 USE_XORG=	ice sm x11 xcb xext xscrnsaver
 
 CMAKE_ARGS=	-DIDN_LIBRARY:FILEPATH="${LOCALBASE}/lib/libidn.so" \
 		-DIDN_INCLUDE_DIR:PATH="${LOCALBASE}/include"
 
 OPTIONS_DEFINE=	WEBENGINE
 OPTIONS_RADIO=	SPELLCHECK
 OPTIONS_RADIO_SPELLCHECK=	HUNSPELL ENCHANT
 SPELLCHECK_DESC=	Spell checker backend
 OPTIONS_DEFAULT=	HUNSPELL
 OPTIONS_SUB=	yes
 
 WEBENGINE_DESC=		Use QtWebEngine for chatlogs
 WEBENGINE_USE=		QT=declarative,location,printsupport,webchannel,webengine
 WEBENGINE_CMAKE_BOOL=	ENABLE_WEBKIT
 
 HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CMAKE_BOOL=	USE_HUNSPELL
 
 ENCHANT_DESC=		Spell checking support via Enchant
 ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 ENCHANT_CMAKE_BOOL=	USE_ENCHANT
 
 post-patch:
 # Replace original Hunspell implementation with better alternative
 	@${CP} ${FILESDIR}/hunspellchecker.* \
 		${WRKSRC}/src/libpsi/tools/spellchecker
 # Avoid conflict with C++20 <version> by adding .txt suffix
 	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
 	@${REINPLACE_CMD} -i .c++20 's,SOURCE_DIR}/version,&.txt,' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/net-im/py-slixmpp/Makefile b/net-im/py-slixmpp/Makefile
index f7eb518bf9cf..2ec4024a2a27 100644
--- a/net-im/py-slixmpp/Makefile
+++ b/net-im/py-slixmpp/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	slixmpp
 DISTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	net-im python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Elegant Python library for XMPP (aka Jabber, Google Talk, etc.)
 WWW=		https://lab.louiz.org/poezio/slixmpp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libidn.so:dns/libidn
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiodns>=1.0:dns/py-aiodns@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR}
 TEST_DEPENDS=	gpg:security/gnupg
 
 USES=		cpe pkgconfig python
 CPE_VENDOR=	${PORTNAME}_project
 USE_PYTHON=	distutils autoplist cython
 
 NO_ARCH=	yes
 
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index f69b6691b810..a7cf9fc7aa01 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?=	26
+PORTREVISION?=	27
 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/echoping/Makefile b/net/echoping/Makefile
index dbab683361db..bc54aefbc1bd 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	echoping
 PORTVERSION=	6.0.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ping-like program that uses TCP and/or HTTP
 WWW=		https://framagit.org/bortzmeyer/echoping
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libidn.so:dns/libidn
 
 USES=		autoreconf cpe libtool pkgconfig ssl
 
 CPE_VENDOR=	echoping_project
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-http --enable-icp --enable-smtp --with-ssl \
 		--enable-ttcp --enable-tos --with-libidn=${LOCALBASE} \
 		--enable-plugin="${PING_PLUGINS}"
 INSTALL_TARGET=	install-strip
 
 PING_PLUGINS=	dns random whois
 
 USE_GITLAB=	yes
 GL_SITE=	https://framagit.org
 GL_ACCOUNT=	bortzmeyer
 GL_TAGNAME=	ccf3c95d9249d3065db3853486f41c852d20101e
 WRKSRC_SUBDIR=	SRC
 
 OPTIONS_DEFINE=	LDAP PGSQL
 OPTIONS_DEFAULT=LDAP
 OPTIONS_SUB=	yes
 
 LDAP_USES=	ldap
 LDAP_VARS=	PING_PLUGINS+=ldap
 
 PGSQL_USES=	pgsql
 PGSQL_VARS=	PING_PLUGINS+=postgresql
 
 pre-configure:
 	${FIND} ${WRKSRC} -name configure.ac -execdir ${SH} -c '\
 	  ${CAT} ${WRKSRC}/configure-common.ac > configure.ac.tmp && \
 	  ${SED} '/configure-common\.ac/d' configure.ac >> configure.ac.tmp && \
 	  ${MV} configure.ac.tmp configure.ac' \;
 	${REINPLACE_CMD} '/^echoping_LDADD =/s/$$/ -lm/' ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/net/freediameter/Makefile b/net/freediameter/Makefile
index 3096b086c9fb..1dc3027986b7 100644
--- a/net/freediameter/Makefile
+++ b/net/freediameter/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	freediameter
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.freediameter.net/hg/freeDiameter/archive/
 DISTNAME=	${PORTNAME:S/d/D/}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source Diameter protocol implementation
 WWW=		http://www.freediameter.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
 		libidn.so:dns/libidn
 
 USES=		bison cmake cpe tar:bzip2
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON
 CMAKE_ARGS+=	-DDISABLE_SCTP:BOOL=ON
 TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index d0625af68d23..fd83e50caa7c 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -1,319 +1,319 @@
 PORTNAME=	freeradius
 DISTVERSION=	3.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \
 		https://freeradius.org/ftp/pub/radius/%SUBDIR%/ \
 		ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ZI
 MASTER_SITE_SUBDIR=	. old
 PKGNAMESUFFIX=	3
 DISTNAME=	freeradius-server-${DISTVERSION}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Free RADIUS server implementation
 WWW=		https://www.freeradius.org/
 
 LICENSE=	GPLv2
 
 BROKEN_SSL=			libressl libressl-devel
 BROKEN_SSL_REASON_libressl=	LibreSSL is no longer supported
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
 LIB_DEPENDS=	libgdbm.so:databases/gdbm \
 		libtalloc.so:devel/talloc
 
 FLAVORS=	default ldap mysql pgsql sqlite3
 FLAVOR?=	${FLAVORS:[1]}
 ldap_PKGNAMESUFFIX=	3-ldap
 mysql_PKGNAMESUFFIX=	3-mysql
 pgsql_PKGNAMESUFFIX=	3-pgsql
 sqlite3_PKGNAMESUFFIX=	3-sqlite3
 
 LOGDIR?=	/var/log
 KRB5_CONFIG?=	/usr/bin/krb5-config --libs
 
 CONFLICTS_INSTALL=	freeradius-* # bin/dhcpclient
 
 USES=		cpe gmake readline shebangfix ssl tar:bzip2
 USE_RC_SUBR=	radiusd
 
 SHEBANG_FILES=	src/modules/rlm_counter/rad_counter scripts/sql/radsqlrelay \
 		scripts/sql/rlm_sqlippool_tool
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS+=--without-rlm_python
 # Prevent /root/.rnd leftover
 MAKE_ARGS+=	HOME=/dev/null
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g}
 
 # Default requirements for rc script
 _REQUIRE=	NETWORKING SERVERS
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	USER LDAP MYSQL PGSQL UNIXODBC FIREBIRD REDIS \
 		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
 		FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \
 		WINBIND EXAMPLES JSON
 OPTIONS_DEFAULT=USER PERL HEIMDAL UDPFROMTO
 OPTIONS_SINGLE=	KRB
 OPTIONS_SINGLE_KRB=	NOKRB HEIMDAL HEIMDAL_PORT MITKRB_PORT
 
 .if ${FLAVOR} == ldap
 OPTIONS_DEFAULT+=	LDAP
 .endif
 .if ${FLAVOR} == mysql
 OPTIONS_DEFAULT+=	MYSQL
 .endif
 .if ${FLAVOR} == pgsql
 OPTIONS_DEFAULT+=	PGSQL
 .endif
 .if ${FLAVOR} == sqlite3
 OPTIONS_DEFAULT+=	SQLITE3
 .endif
 
 USER_DESC=		Run as user freeradius, group freeradius
 KRB_DESC=		${KERBEROS_DESC}
 NOKRB_DESC=		Without Kerberos support
 HEIMDAL_DESC=		With Heimdal Kerberos support
 HEIMDAL_PORT_DESC=	With Heimdal Kerberos from ports
 MITKRB_PORT_DESC=	With MIT Kerberos from ports
 UNIXODBC_DESC=		With unixODBC database support
 UNBOUND_DESC=		With unbound DNS support
 FIREBIRD_DESC=		With Firebird database support (EXPERIMENTAL)
 EXPERIMENTAL_DESC=	Build experimental modules
 UDPFROMTO_DESC=		Compile in UDPFROMTO support
 DEVELOPER_DESC=		Enable developer options
 EDIR_DESC=		Enable eDirectory support (implies LDAP)
 REST_DESC=		Enable RESTful API support
 WINBIND_DESC=		Enable native winbind support in rlm_mschap
 JSON_DESC=		With JSON support
 
 EDIR_CONFIGURE_WITH=		edir
 EDIR_IMPLIES=			LDAP
 FREETDS_CONFIGURE_WITH=		rlm_freetds
 FREETDS_CONFIGURE_OFF=		--without-freetds
 FREETDS_LIB_DEPENDS=		libct.so:databases/freetds
 HEIMDAL_CONFIGURE_ON=		--with-rlm-krb5-dir=/
 HEIMDAL_PORT_LIB_DEPENDS=	libkrb5.so:security/heimdal
 HEIMDAL_PORT_CONFIGURE_ON=	--with-rlm-krb5-dir=${LOCALBASE}
 HEIMDAL_CONFLICTS_BUILD=	krb5-[0-9].*
 IDN_CONFIGURE_WITH=		rlm_idn
 IDN_LIB_DEPENDS=		libidn.so:dns/libidn
 FIREBIRD_CONFIGURE_WITH=	rlm_sql_firebird
 FIREBIRD_USES=			firebird
 LDAP_CONFIGURE_WITH=		rlm_ldap
 LDAP_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 LDAP_USES=			ldap
 LDAP_VARS=			_REQUIRE+=slapd
 MITKRB_PORT_CONFIGURE_ON=	--with-rlm-krb5-dir=${LOCALBASE}
 MITKRB_PORT_LIB_DEPENDS=	libkrb5support.so:security/krb5
 MITKRB_CONFLICTS_BUILD=		heimdal-[0-9].*
 MYSQL_CONFIGURE_WITH=		rlm_sql_mysql
 MYSQL_USES=			mysql
 MYSQL_VARS=			_REQUIRE+=mysql
 NOKRB_CONFIGURE_ON=		--without-rlm_krb5
 NOKRB_PLIST_SUB=		RLMKRB5="@comment "
 NOKRB_PLIST_SUB_OFF=		RLMKRB5=""
 PCRE_CONFIGURE_WITH=		pcre
 PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
 PERL_CONFIGURE_WITH=		rlm_perl
 PERL_CONFIGURE_OFF=		--without-perl
 PERL_USES=			perl5
 PGSQL_USES=			pgsql
 PGSQL_VARS=			_REQUIRE+=postgresql
 PGSQL_CONFIGURE_WITH=		rlm_sql_postgresql
 PYTHON_CONFIGURE_WITH=		rlm_python3
 PYTHON_CONFIGURE_ON=		--with-rlm-python3-lib-dir=${PYTHON_LIBDIR} \
 				--with-rlm-python3-config-bin=${PYTHON_CMD}-config \
 				--with-rlm-python3-include-dir=${PYTHON_INCLUDEDIR}
 PYTHON_USES=			python gettext-runtime
 PYTHON_VARS=			SHEBANG_FILES+=src/modules/rlm_python3/*.py
 REDIS_CONFIGURE_WITH=		rlm_redis rlm_rediswho
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REST_CONFIGURE_WITH=		rlm_rest
 REST_CONFIGURE_ON=		--with-libcurl=${LOCALBASE} \
 				--with-jsonc-lib-dir=${LOCALBASE}/lib \
 				--with-jsonc-include-dir=${LOCALBASE}/include
 REST_LIB_DEPENDS=		libcurl.so:ftp/curl \
 				libjson-c.so:devel/json-c
 RUBY_CONFIGURE_WITH=		rlm_ruby
 RUBY_USES=			ruby
 RUBY_IGNORE=			with ruby support leaks memory, breaks signal handling.  Please disable RUBY support
 SQLITE3_CONFIGURE_WITH=		rlm_sql_sqlite
 SQLITE3_LIB_DEPENDS=		libsqlite3.so:databases/sqlite3
 UDPFROMTO_CONFIGURE_OFF=	--without-udpfromto
 UNBOUND_CONFIGURE_WITH=		rlm_unbound
 UNBOUND_LIB_DEPENDS=		libunbound.so:dns/unbound
 UNIXODBC_CONFIGURE_WITH=	rlm_sql_unixodbc
 UNIXODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 WINBIND_USES=			samba:build,lib
 WINBIND_CONFIGURE_ON=		--with-winbind-include-dir=${LOCALBASE}/include/samba4 \
 				--with-winbind-lib-dir=${LOCALBASE}/lib/samba4
 JSON_CONFIGURE_WITH=		rlm_json
 JSON_CONFIGURE_ON=		--with-jsonc-lib-dir=${LOCALBASE}/lib \
 				--with-jsonc-include-dir=${LOCALBASE}/include
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUSER}
 SUB_LIST+=	RUN_AS_USER="yes"
 .else
 SUB_LIST+=	RUN_AS_USER="no"
 .endif
 
 # User and group to use if USER option is chosen
 RADIUS_USER=	freeradius
 RADIUS_GROUP=	freeradius
 
 USERS=		${RADIUS_USER}
 GROUPS=		${RADIUS_GROUP}
 
 # Firebird module is still experimental
 .if ${PORT_OPTIONS:MFIREBIRD} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # python3 module is still experimental
 .if ${PORT_OPTIONS:MPYTHON} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # rlm_ruby module is still experimental
 .if ${PORT_OPTIONS:MRUBY} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # redis module is still experimental
 .if ${PORT_OPTIONS:MREDIS} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # rest module is still experimental
 .if ${PORT_OPTIONS:MREST} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # freetds module is still experimental
 .if ${PORT_OPTIONS:MFREETDS} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # idn module is still experimental
 .if ${PORT_OPTIONS:MIDN} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 # json module is still experimental
 .if ${PORT_OPTIONS:MJSON} && empty(PORT_OPTIONS:MEXPERIMENTAL)
 EXPM=		yes
 .endif
 
 .if ${PORT_OPTIONS:MEXPERIMENTAL} || defined(EXPM)
 CONFIGURE_ARGS+=--with-experimental-modules
 PLIST_SUB+=	EXPM=""
 .else
 CONFIGURE_ARGS+=--without-experimental-modules
 PLIST_SUB+=	EXPM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEVELOPER}
 CONFIGURE_ARGS+=--enable-developer
 # Turn off compiler optimisations
 CFLAGS!=	${ECHO} ${CFLAGS} | ${SED} -Ee 's:-O[0-9]?[[:space:]]*::g'
 .else
 CONFIGURE_ARGS+=--quiet
 .endif
 
 .include <bsd.port.pre.mk>
 
 # if we're installing, place sample configs into ${EXAMPLESDIR}
 MAKE_ARGS+=	raddbdir="${EXAMPLESDIR}/raddb" R=${STAGEDIR}
 
 FREERADIUS_LIBDIR=	lib/freeradius-${PORTVERSION}
 PLIST_SUB+=	LIBDIR="${FREERADIUS_LIBDIR}"
 USE_LDCONFIG=	${PREFIX}/${FREERADIUS_LIBDIR}
 
 .if empty(PORT_OPTIONS:MDOCS)
 CONFIGURE_ARGS+=--without-docdir
 PLIST_SUB+=	PORTDOCS="@comment "
 SUB_LIST+=	PORTDOCS="@comment "
 .else
 CONFIGURE_ARGS+=--with-docdir=${DOCSDIR}
 PLIST_SUB+=	PORTDOCS=""
 SUB_LIST+=	PORTDOCS=""
 .endif
 
 # This conditionality avoids -L/usr/lib in the radiusd build step when
 # building with base system OpenSSL
 .if ${OPENSSLLIB} != "/usr/lib"
 CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
 .endif
 CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--with-openssl-includes=${OPENSSLINC} \
 		--prefix=${PREFIX} --libdir=${PREFIX}/${FREERADIUS_LIBDIR} \
 		--localstatedir=/var \
 		--without-rlm_eap_ikev2 \
 		--without-rlm_eap_tnc \
 		--without-rlm_eap2 \
 		--without-rlm_opendirectory \
 		--without-rlm_sql_db2 \
 		--without-rlm_sql_iodbc \
 		--without-rlm_sql_sybase \
 		--without-rlm_yubikey \
 		--without-rlm_sql_oracle \
 		--without-rlm_securid \
 		--without-rlm_cache_memcached \
 		--with-vmps \
 		--with-collectdclient-lib-dir=/dev/null \
 		--disable-openssl-version-check
 
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=--with-pic
 .endif
 
 SUB_FILES+=	pkg-install pkg-message
 SUB_LIST+=	RADIUS_USER="${RADIUS_USER}" \
 		RADIUS_GROUP="${RADIUS_GROUP}" \
 		RADDB_WORK="${WRKSRC}/raddb" \
 		RADDB="${PREFIX}/etc/raddb" \
 		LOGDIR="${LOGDIR}" \
 		LIBDIR="${PREFIX}/${FREERADIUS_LIBDIR}"
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
 # never try to find execinfo.h (needed until we can enable/disable backtrace
 	@${REINPLACE_CMD} -e '/#include <execinfo.h>/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -Ee "s:tests/all.mk ::" ${WRKSRC}/src/all.mk
 	@${CP} ${WRKSRC}/m4/ax_with_prog.m4 ${WRKSRC}
 # Patch raddb/certs/Makefile for the full path to the openssl binary (using
 # ports OpenSSL if installed)
 	@${REINPLACE_CMD} -E \
 		-e "s:^([[:space:]])+openssl:\1${OPENSSLBASE}/bin/openssl:g" \
 		${WRKSRC}/raddb/certs/Makefile
 	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \
 		${WRKSRC}/scripts/all.mk
 
 # If we're using Heimdal from base, alter the LIBS variable
 .if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
 	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
 	@${REINPLACE_CMD} -e 's|-lkrb5|$$(${KRB5_CONFIG})|g' \
 		${WRKSRC}/src/modules/rlm_krb5/configure
 .endif
 .if empty(PORT_OPTIONS:MRUBY)
 	@${RM} -r ${WRKSRC}/src/modules/rlm_ruby/
 .endif
 
 post-build:
 	@${FIND} ${WRKSRC}/build/lib -type f -name '*.so' -exec ${STRIP_CMD} {} \;
 	@${FIND} ${WRKSRC}/build/bin -type f -exec ${STRIP_CMD} {} \;
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/radiusd ${STAGEDIR}/var/log/radacct
 
 .include <bsd.port.post.mk>
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index c173b3173706..5b4522c3dd6f 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	jwhois
 PORTVERSION=	4.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	GNU \
 		https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/j/:srpm
 DISTFILES=	${DISTNAME}.tar.gz jwhois-4.0-73.fc38.src.rpm:srpm
 
 MAINTAINER=	terry-freebsd@glaver.org
 COMMENT=	Improved WHOIS client capable of selecting server to query
 WWW=		https://www.gnu.org/software/jwhois/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	lynx:www/lynx
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		gettext gmake iconv
 CPPFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/jwhois
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_OFF=	--disable-nls \
 			--without-libiconv-prefix
 
 INSTALL_TARGET=	install-strip
 
 INFO=		jwhois
 
 .include <bsd.port.pre.mk>
 
 JWHOIS_CONF_SRC=	${WRKDIR}/jwhois.conf
 
 pre-patch:
 .for p in jwhois-4.0-connect.patch jwhois-4.0-ipv6match.patch jwhois-4.0-fclose.patch \
 		jwhois-4.0-select.patch jwhois-4.0-multi-homed.patch jwhois-4.0-libidn2.patch \
 		jwhois-4.0-idna.patch jwhois-4.0-idnfail.patch jwhois-4.0-ipv4_ipv6.patch \
 		jwhois-configure-c99.patch jwhois-c99.patch
 	(cd ${WRKSRC} && ${PATCH} -p1 <  ${WRKDIR}/${p})
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} 's|browser-pathname = "/usr/bin|browser-pathname = "${LOCALBASE}/bin|' \
 		${WRKDIR}/jwhois.conf
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/var/jwhois
 	${INSTALL_DATA} ${JWHOIS_CONF_SRC} ${STAGEDIR}${PREFIX}/etc/jwhois.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/print/ghostscript10/Makefile b/print/ghostscript10/Makefile
index 03f08fcf70f7..abee29d9a344 100644
--- a/print/ghostscript10/Makefile
+++ b/print/ghostscript10/Makefile
@@ -1,122 +1,122 @@
 PORTNAME=	ghostscript
 DISTVERSION=	10.03.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${DISTVERSION:S/.//g}/
 PKGNAMESUFFIX=	${GS_MAJOR_VERSION}
 
 PATCH_SITES=	https://github.com/ArtifexSoftware/ghostpdl/commit/
 PATCHFILES=	90cabe08422afdd16bac5dd9217602679d943045.patch:-p1
 
 MAINTAINER=	michael.osipov@siemens.com
 COMMENT=	PostScript and PDF interpreter
 WWW=	https://ghostscript.com/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn \
 		libjbig2dec.so:graphics/jbig2dec \
 		liblcms2.so:graphics/lcms2 \
 		libopenjp2.so:graphics/openjpeg \
 		libpaper.so:print/libpaper \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS=	poppler-data>=0.4.9:graphics/poppler-data \
 		urw-base35-fonts>=20200910:x11-fonts/urw-base35-fonts
 
 USES=		cpe gmake iconv jpeg localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
 CPE_VENDOR=	artifex
 
 EXTRACT_AFTER_ARGS=	--exclude cups/libs \
 			--exclude expat \
 			--exclude freetype \
 			--exclude ijs \
 			--exclude jbig2dec \
 			--exclude jpeg \
 			--exclude lcms2mt \
 			--exclude leptonica \
 			--exclude libpng \
 			--exclude openjpeg \
 			--exclude tesseract \
 			--exclude tiff \
 			--exclude zlib
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 
 DATADIR=	${PREFIX}/share/${PORTNAME}/${DISTVERSION}
 
 GS_MAJOR_VERSION=	${DISTVERSION:R:R}
 GS_MINOR_VERSION=	${DISTVERSION:R:E}
 PLIST_SUB=	GS_MAJOR_VERSION=${GS_MAJOR_VERSION} \
 			GS_MINOR_VERSION=${GS_MINOR_VERSION}
 
 CONFIGURE_ARGS+=	--disable-compile-inits \
 			--disable-dbus \
 			--disable-gtk \
 			--disable-dynamic \
 			--enable-contrib \
 			--enable-fontconfig \
 			--enable-freetype \
 			--enable-openjpeg \
 			--with-fontpath=${LOCALBASE}/share/fonts \
 			--with-jbig2dec \
 			--with-libiconv=maybe \
 			--with-libidn \
 			--with-libpaper \
 			--with-system-libtiff
 
 OPTIONS_DEFINE=	CUPS IJS TESSERACT X11
 OPTIONS_DEFAULT=	CUPS X11
 
 IJS_DESC=	Support libijs based Ghostscript devices
 TESSERACT_DESC=	Enable Tesseract OCR engine
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=	cups
 
 IJS_LIB_DEPENDS=	libijs.so:print/libijs
 IJS_CONFIGURE_WITH=	ijs
 
 TESSERACT_USES=	libarchive
 TESSERACT_CONFIGURE_WITH=	tesseract
 TESSERACT_LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libleptonica.so:graphics/leptonica \
 		libtesseract.so:graphics/tesseract
 
 X11_CONFIGURE_WITH=	x
 X11_USES=	xorg
 X11_USE=	xorg=ice,sm,x11,xext,xt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/man/gs.1
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gs
 	${RM} ${STAGEDIR}${PREFIX}/bin/gsx
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs \
 		${STAGEDIR}${PREFIX}/lib/libgs.so.${GS_MAJOR_VERSION}.${GS_MINOR_VERSION}
 	${RM} ${STAGEDIR}${PREFIX}/bin/lprsetup.sh
 	${RM} ${STAGEDIR}${PREFIX}/bin/unix-lpr.sh
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/color/icc
 	${MV} ${STAGEDIR}${DATADIR}/iccprofiles \
 		${STAGEDIR}${PREFIX}/share/color/icc/ghostscript
 	${RLN} ${STAGEDIR}${PREFIX}/share/color/icc/ghostscript \
 		${STAGEDIR}${DATADIR}/iccprofiles
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/cmap
 	${MV} ${STAGEDIR}${DATADIR}/Resource/CMap/Identity* \
 		${STAGEDIR}${PREFIX}/share/cmap
 	${RM} -r ${STAGEDIR}${DATADIR}/Resource/CMap
 	${RLN} ${STAGEDIR}${PREFIX}/share/cmap \
 		${STAGEDIR}${DATADIR}/Resource/CMap
 
 .include <bsd.port.mk>
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 272f9365fd6f..7d8674bc0d40 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	hydra
 DISTVERSIONPREFIX=v
 DISTVERSION=	9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Brute force attack utility working on multiple network services
 WWW=		https://github.com/vanhauser-thc/thc-hydra
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libpcre.so:devel/pcre \
 		libsasl2.so:security/cyrus-sasl2
 
 USES=		gmake localbase ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vanhauser-thc
 GH_PROJECT=	thc-hydra
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLINC} \
 		--with-ssl-lib=${OPENSSLLIB}
 PLIST_FILES=	bin/hydra bin/pw-inspector bin/dpl4hydra.sh bin/hydra-wizard.sh \
 		share/man/man1/hydra.1.gz share/man/man1/pw-inspector.1.gz
 
 OPTIONS_DEFINE=	FIREBIRD SSH SUBVERSION X11
 OPTIONS_DEFAULT=SSH
 OPTIONS_EXCLUDE=NLS DOCS
 FIREBIRD_USES=	firebird
 .if ${WITH_SUBVERSION_VER:U} == LTS
 SUBVERSION_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion-lts
 .else
 SUBVERSION_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 .endif
 SSH_LIB_DEPENDS=	libssh.so.4:security/libssh
 X11_USES=		gettext gnome pkgconfig
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 X11_USE=		gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
 X11_PLIST_FILES=	bin/xhydra share/man/man1/xhydra.1.gz
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT:Mlibressl*}
 IGNORE=	detected LibreSSL (missing RSA_get0_key and others)
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|CC=gcc||; s|-O3|${CFLAGS}|;' \
 		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.unix
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydra ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/dpl4hydra.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/hydra-wizard.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/hydra.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/pw-inspector.1 ${STAGEDIR}${PREFIX}/share/man/man1
 post-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xhydra.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/security/libgsasl/Makefile b/security/libgsasl/Makefile
index c670d69d958b..c0c440120397 100644
--- a/security/libgsasl/Makefile
+++ b/security/libgsasl/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	gsasl
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	lib
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GNU SASL library
 WWW=		https://www.gnu.org/software/gsasl/
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
 		libidn.so:dns/libidn \
 		libntlm.so:security/libntlm
 
 USES=		charsetfix libtool pathfix pkgconfig ssl
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_DEFAULT=GSSAPI_BASE
 OPTIONS_SINGLE=	GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SUB=	yes
 
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi-impl=heimdal ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_HEIMDAL_CONFIGURE_WITH=	--with-gssapi-impl=heimdal ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_CONFIGURE_ON=--with-gssapi-impl=mit ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CONFIGURE_ON=	--disable-gssapi
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/lib/gl/.libs/liblgl.a ${STAGEDIR}${PREFIX}/lib
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/reference
 	${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* ${STAGEDIR}${DOCSDIR}/reference
 
 .include <bsd.port.mk>
diff --git a/textproc/html-xml-utils/Makefile b/textproc/html-xml-utils/Makefile
index 389085ddcde6..23535d3481af 100644
--- a/textproc/html-xml-utils/Makefile
+++ b/textproc/html-xml-utils/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	html-xml-utils
 PORTVERSION=	8.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	https://www.w3.org/Tools/HTML-XML-utils/
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	Utilities for manipulating HTML and XML files
 WWW=		https://www.w3.org/Status.html#HTML-XML-utils
 
 LICENSE=	W3C
 LICENSE_GROUPS=	FSF GPL OSI
 LICENSE_NAME=	W3C Software Notice and License (2002-12-31)
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		gmake iconv localbase shebangfix
 
 SHEBANG_FILES=	${WRKSRC}/hxcite-mkbib
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	LDFLAGS=${ICONV_LIB}
 
 OPTIONS_DEFINE=		CURL IDN IDN2 DOCS
 OPTIONS_SUB=		yes
 
 IDN2_DESC=		Use dns/libidn2 (IDNA2008 library)
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 IDN2_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN2_CONFIGURE_WITH=	libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_WITH=	libidn=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 8833e79f4901..a224f15cf2f3 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	lynx
 PORTVERSION=	2.9.0d12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/ \
 		ftp://ftp.invisible-island.net/lynx/tarballs/
 PKGNAMESUFFIX=	-current
 DISTNAME=	${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./}
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Console-based web browser (current/development version)
 WWW=		https://lynx.invisible-island.net/current/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 CONFLICTS_INSTALL=	lynx-2.8* ja-lynx
 
 USES=		cpe iconv ncurses shebangfix tar:bzip2
 WRKSRC=		${WRKDIR}/${DISTNAME}
 CPE_VERSION=	${PORTVERSION:C/[pd].+//}
 CPE_UPDATE=	${PORTVERSION:E:C/[0-9]+//:S/p/pre./:S/d/dev./}
 SHEBANG_FILES=	samples/mailto-form.pl
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--libdir="${PREFIX}/etc" \
 		--with-bzlib --with-zlib \
 		--with-mime-libdir=${PREFIX}/etc \
 		--with-screen=${NCURSES_IMPL} \
 		--enable-default-colors \
 		--enable-gzip-help \
 		--enable-ipv6 \
 		--enable-nested-tables \
 		--enable-nsl-fork \
 		${ICONV_CONFIGURE_ARGS}
 
 MAKE_FLAGS=	helpdir="${PREFIX}/share/lynx_help" docdir="${DOCSDIR}"
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 
 DOCSDIR=	${PREFIX}/share/doc/lynx
 
 OPTIONS_DEFINE=	DOCS GNUTLS IDN NLS
 OPTIONS_DEFAULT=IDN
 OPTIONS_SUB=	yes
 
 GNUTLS_CONFIGURE_ON=	--with-gnutls --without-ssl
 GNUTLS_CONFIGURE_OFF=	--with-ssl=${OPENSSLBASE} --without-gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES_OFF=	ssl
 
 IDN_CONFIGURE_ENABLE=	idna
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 5ddf23ecd2eb..b9a07252a75b 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	lynx
 PORTVERSION=	2.8.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/ \
 		http://bitrote.org/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}rel.${PORTVERSION:E}
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Non-graphical, text-based World-Wide Web client
 WWW=		https://lynx.invisible-island.net/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 CONFLICTS=	lynx-2.8.[8-9]d*
 
 USES=		cpe ncurses shebangfix tar:bzip2
 SHEBANG_FILES=	samples/mailto-form.pl
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--with-zlib --libdir="${PREFIX}/etc" \
 		--enable-nsl-fork --enable-persistent-cookies \
 		--enable-nested-tables --enable-gzip-help \
 		--with-screen=ncursesw
 CPE_VERSION=	${PORTVERSION:R}
 CPE_UPDATE=	rel.${PORTVERSION:E}
 
 MAKEFILE=	makefile
 L_HELP=		${PREFIX}/share/lynx_help
 SUB_FILES=	pkg-message
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DEFAULT_COLORS IPV6 NLS SSL DOCS EXTERNALS
 OPTIONS_DEFAULT=	SSL EXTERNALS
 DEFAULT_COLORS_DESC=	Colors support
 EXTERNALS_DESC=	External application support
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 DEFAULT_COLORS_CONFIGURE_ENABLE=	default-colors
 
 DOCS_CONFIGURE_ENABLE=	local-docs
 DOCS_INSTALL_TARGET=	install-full
 DOCS_MAKE_ARGS=		helpdir=${L_HELP} docdir=${DOCSDIR}
 
 EXTERNALS_CONFIGURE_ENABLE=externs
 
 SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 SSL_USES=		ssl
 
 post-install-DOCS-on:
 # Fix some stage symlinks
 .for doc in COPYHEADER COPYING COPYHEADER.asc COPYING.asc
 	(cd ${STAGEDIR}${L_HELP} && ${LN} -sf ../doc/lynx/${doc} .)
 .endfor
 
 .include <bsd.port.mk>