diff --git a/archivers/par/Makefile b/archivers/par/Makefile
index 6d40718df221..f1862b479c48 100644
--- a/archivers/par/Makefile
+++ b/archivers/par/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	par
 PORTVERSION=	0.03.01
 CATEGORIES=	archivers games
 MASTER_SITES=	http://ibiblio.org/pub/linux/games/quake/
 PKGNAMEPREFIX=	quake-
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Archiver for Quake I and II packed data files
 
 LICENSE=	GPLv2
 
-CONFLICTS=	par_format # bin/par 
+CONFLICTS=	par_format # bin/par
 
 MAKEFILE=	Makefile.Linux
 MAKE_ARGS=	CC="${CC}"
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,-Wall.*-pipe,${CFLAGS}, ; \
 		s,"Linux,"${OPSYS},' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's,off_t,uint32_t,g' ${WRKSRC}/par.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
index 124b9f996084..460fdb9efecc 100644
--- a/astro/stellarsolver/Makefile
+++ b/astro/stellarsolver/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	stellarsolver
 DISTVERSION=	2.3
 CATEGORIES=	astro
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Astrometric Plate Solver built on Astrometry.net and SEP
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libgsl.so:math/gsl \
 		libwcs.so:astro/wcslib
 
-USES=		cmake desktop-file-utils iconv ninja qt:5 pkgconfig 
+USES=		cmake desktop-file-utils iconv ninja qt:5 pkgconfig
 USE_QT=		buildtools concurrent core gui qmake_build network widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	rlancaste
 
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DBUILD_BATCH_SOLVER=on
 
 .include <bsd.port.mk>
diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile
index 0201bc949ceb..9ed890a78b3b 100644
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	flite
 PORTVERSION=	3.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flite dialplan application for Asterisk
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libflite.so:audio/flite
 
 FLAVORS=			asterisk18 asterisk16
 FLAVOR?=			${FLAVORS:[1]}
 
 asterisk16_PKGNAMEPREFIX=	asterisk16-
 asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
 asterisk16_RUN_DEPENDS=		asterisk:net/asterisk16
 
-asterisk18_PKGNAMEPREFIX=       asterisk18- 
+asterisk18_PKGNAMEPREFIX=       asterisk18-
 asterisk18_BUILD_DEPENDS=       asterisk:net/asterisk18
 asterisk18_RUN_DEPENDS=         asterisk:net/asterisk18
 
 USES=		compiler:c11 gmake localbase
 INSTALL_TARGET=	install samples
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-Flite
 
 CONFLICTS_INSTALL=	asterisk[0-9][0-9]-flite # etc/asterisk/flite.conf.sample
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=	-fblocks
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ASTERISK_REGISTER_FILE/d' \
 		${WRKSRC}/app_flite.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_flite.so
 
 .include <bsd.port.post.mk>
diff --git a/audio/calf-lv2/Makefile b/audio/calf-lv2/Makefile
index 3393f43dc3a6..5d2fb45f4192 100644
--- a/audio/calf-lv2/Makefile
+++ b/audio/calf-lv2/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	calf
 DISTVERSION=	0.90.3.20210427
 CATEGORIES=	audio
 #MASTER_SITES=	http://calf-studio-gear.org/files/
 PKGNAMESUFFIX=	-lv2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Set of LV2 plugins
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	lv2>=1.14.0_1:audio/lv2
 LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjack.so:audio/jack \
 		libexpat.so:textproc/expat2
 
 USES=		autoreconf gmake gnome libtool localbase pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lv2 --disable-static
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	calf-studio-gear
 GH_TAGNAME=	648f05e85287cf08af198bdd9e52baba95b502ec # this revision has clang compilation issues fixed
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS LASH
 OPTIONS_DEFAULT=	LASH
 
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_DEFAULT_i386=	SSE
 
 LASH_LIB_DEPENDS=	liblash.so:audio/lash
 LASH_CONFIGURE_WITH=	lash
 
 SSE_CONFIGURE_ENABLE=	sse
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64le
 USES+=		compiler:gcc-c++11-lib
 .else
-USES+=		compiler:c++11-lang 
+USES+=		compiler:c++11-lang
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-finline-limit=80 -finline-functions -finline-functions-called-once
 .endif
 
 post-install: # fix absolute symbolic link to be relative
 	@${RM} ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2/calf.so
 	@${RLN} ${STAGEDIR}${PREFIX}/lib/calf/libcalf.so ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2/calf.so
 	@${RLN} ${STAGEDIR}${PREFIX}/lib/calf/libcalflv2gui.so ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2/calflv2gui.so
 
 .include <bsd.port.post.mk>
diff --git a/audio/py-speechrecognition/Makefile b/audio/py-speechrecognition/Makefile
index 9a3b36184eae..13b655a58380 100644
--- a/audio/py-speechrecognition/Makefile
+++ b/audio/py-speechrecognition/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	SpeechRecognition
 PORTVERSION=	3.8.1
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Library for performing speech recognition
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_GITHUB=	yes 
+USE_GITHUB=	yes
 GH_ACCOUNT=	Uberi
 GH_PROJECT=	speech_recognition
 
 RUN_DEPENDS=	flac:audio/flac \
 		${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
-post-extract:       
+post-extract:
 	@cd ${WRKSRC}/speech_recognition && ${RM} flac-*
 
 .include <bsd.port.mk>
diff --git a/base/binutils/Makefile b/base/binutils/Makefile
index ac70cf27fddd..819777ac6962 100644
--- a/base/binutils/Makefile
+++ b/base/binutils/Makefile
@@ -1,123 +1,123 @@
 PORTNAME=	binutils
 PORTVERSION=	2.33.1
 PORTEPOCH=	0
 PORTREVISION=	1
 CATEGORIES=	base
 MASTER_SITES=	SOURCEWARE/binutils/releases
 PKGNAMEPREFIX=	${OPSYS:tl}-
 VALID_CATEGORIES=	base
 
 COMMENT=	GNU binary tools for base
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
 
 TARGETARCH=	${ARCH:S/amd64/x86_64/}
 BUTARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
 
 USES=		bison:alias cpe gmake libtool tar:bzip2 compiler:env
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/share/info
 
 BUTARGET?=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
 PLIST_SUB=	BUTARGET=${BUTARGET}
 
 TEST_TARGET=	check
 
 PATCHDIR=	${.CURDIR}/../../devel/binutils/files
 
 CONFIGURE_ARGS+=	--disable-host-shared \
 			--disable-shared \
 			--disable-nls \
 			--with-system-zlib \
 			--with-sysroot="/" \
 			--enable-relro=no \
 			--enable-x86-relax-relocations=no \
 			--target=${BUTARGET}
 PREFIX=	/usr
 MAKE_ENV+=	ac_cv_func_sbrk=0
 MAKE_ARGS+=	LIBDL=""
 
 BUREMOVE=	addr2line \
 		ar \
 		c++filt \
 		dlltool \
 		elfedit \
 		gprof \
 		objcopy \
 		nlmconv \
 		nm \
 		ranlib \
 		readelf \
 		size \
 		strings \
 		strip \
 		windmc \
 		windres
 
-OPTIONS_DEFINE=	RELRO STATIC 
+OPTIONS_DEFINE=	RELRO STATIC
 RELRO_DESC=	enable -z relro in ELF linker by default
 
 RELRO_CONFIGURE_ON=	--enable-relro
 RELRO_CONFIGURE_OFF=	--enable-relro=no
 
 STATIC_LDFLAGS+=	-all-static
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 .if ${ARCH:Mmips*}
 PLIST_SUB+=	MIPS=""
 .else
 PLIST_SUB+=	MIPS="@comment "
 .endif
 .if ${ARCH:Mpowerpc*}
 PLIST_SUB+=	POWERPC=""
 .else
 PLIST_SUB+=	POWERPC="@comment "
 .endif
 .if ${ARCH:Msparc*}
 PLIST_SUB+=	SPARC=""
 .else
 PLIST_SUB+=	SPARC="@comment "
 .endif
 
 .if ${HOSTARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-freebsd${OSREL}
 .elif ${HOSTARCH} == "powerpcspe"
 CONFIGURE_TARGET=	powerpc-unknown-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${HOSTARCH}-unknown-freebsd${OSREL}
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s/-ldl//g" ${WRKSRC}/gold/testsuite/Makefile.in
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
 	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
 	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${tool} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${tool}.1 \
 	    ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/${tool}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains
 	${INSTALL_DATA} ${.CURDIR}/files/freebsd-binutils.mk ${STAGEDIR}${PREFIX}/share/toolchains/
 
 .include <bsd.port.post.mk>
diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
index 109f8ee76515..dc1872c2876f 100644
--- a/biology/ncbi-entrez-direct/Makefile
+++ b/biology/ncbi-entrez-direct/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	ncbi-entrez-direct
 DISTVERSION=	14.9.20210423
 PORTREVISION=	5
 CATEGORIES=	biology perl5
 MASTER_SITES=	ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect/versions/${PORTVERSION}/
 DISTFILES=	edirect.tar.gz
 DIST_SUBDIR=	edirect-${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Access to the NCBI's suite of interconnected databases
 
 LICENSE=	PD
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		curl:ftp/curl
 
 USES=		go:modules perl5 shebangfix
 USE_GITHUB=	nodefault
 
 CONFLICTS_INSTALL=	ebook-tools p5-XML-Compile # bin/einfo bin/xml2json
 
 # Dependency versions:
 #	make clean extract
 # 	cd ${WRKSRC}/cmd
 #	rm -r vendor
 #	../../../files/build-cmd
 # files/modules.txt: cd ${WRKSRC}/cmd && go mod vendor
 GHSD=		vendor/github.com
 GLSD=		vendor/golang.org
 GH_TUPLE=	fatih:color:v1.10.0:a/${GHSD}/fatih/color \
 		surgebase:porter2:56e4718818e8:b/${GHSD}/surgebase/porter2 \
 		gedex:inflector:16278e9db813:c/${GHSD}/gedex/inflector \
 		klauspost:cpuid:v1.3.1:d/${GHSD}/klauspost/cpuid \
 		pbnjay:memory:b12e5d931931:e/${GHSD}/pbnjay/memory \
 		mattn:go-colorable:v0.1.8:f/${GHSD}/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:g/${GHSD}/mattn/go-isatty \
 		fiam:gounidecode:8deddbd03fec:h/${GHSD}/fiam/gounidecode \
 		golang:text:v0.3.5:i/${GLSD}/x/text \
 		golang:sys:d5e6a3e2c0ae:j/${GLSD}/x/sys
 
 SHEBANG_FILES=	nquire edirect.pl word-at-a-time accn-at-a-time \
 		amino-acid-composition between-two-genes exclude-uid-lists \
 		filter-stop-words intersect-uid-lists phrase-search \
-		skip-if-file-exists theme-aliases test-edirect hgvs2spdi 
+		skip-if-file-exists theme-aliases test-edirect hgvs2spdi
 
 PSCRIPTS=	efetch efilter einfo elink epost esearch esummary nquire
 SCRIPTS=	accn-at-a-time amino-acid-composition archive-pubmed \
 		between-two-genes download-ncbi-data download-pubmed \
 		download-sequence efetch efilter einfo elink epost \
 		esample esearch esummary exclude-uid-lists expand-current \
 		fetch-pubmed filter-stop-words gbf2xml index-extras \
 		index-pubmed intersect-uid-lists join-into-groups-of \
 		nquire phrase-search pm-collect pm-index pm-invert pm-merge \
 		pm-prepare pm-promote pm-refresh pm-stash rchive \
 		reorder-columns run-ncbi-converter skip-if-file-exists \
 		ecommon.sh sort-uniq-count sort-uniq-count-rank stream-pubmed \
 		theme-aliases transmute word-at-a-time xml2tbl xtract xy-plot \
 		hlp-xtract.txt transmute xml2json xtract test-edirect \
 		align-columns hgvs2spdi sort-table print-columns
 
 post-extract:
 	@${MV} ${WRKDIR}/edirect/* ${WRKSRC}
 	@${RMDIR} ${WRKDIR}/edirect
 	@${MV} ${WRKSRC}/vendor ${WRKSRC}/cmd
 
 pre-configure:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|$$PATH:$$pth|$$PATH:${PREFIX}/bin|g' \
 		-e 's|"$$pth"|${PREFIX}/bin|g' \
 		${PSCRIPTS}
 
 do-build:
 	@${CP} ${FILESDIR}/modules.txt ${WRKSRC}/cmd/vendor
 	@${CP} -R ${WRKSRC}/eutils ${WRKSRC}/cmd/vendor
 	@cd ${WRKSRC}/cmd && ${SETENV} ${MAKE_ENV} ${FILESDIR}/build-cmd
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/edirect.pl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/cmd/*.FreeBSD ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/cad/fdm_materials/Makefile b/cad/fdm_materials/Makefile
index 84f0f66926bd..e2c410405a54 100644
--- a/cad/fdm_materials/Makefile
+++ b/cad/fdm_materials/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	fdm_materials
 PORTEPOCH=	1
 DISTVERSION=	4.7.1
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	FDM Material database for 3D printers
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake 
+USES=		cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 GH_TAGNAME=	c7331d5ea
 NO_ARCH=	yes
 STRIP=
 
 .include <bsd.port.mk>
diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile
index 3fdfeb2f5042..dfed8254fcd0 100644
--- a/cad/sumo/Makefile
+++ b/cad/sumo/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	sumo
 DISTVERSION=	1.2.0
 PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/
 DISTFILES=	${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX}
 
 MAINTAINER=	enriquefynn@gmail.com
 COMMENT=	Traffic simulation suite for road vehicles, public transportation, etc
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libFOX-1.6.so:x11-toolkits/fox16 \
 		libfreetype.so:print/freetype2 \
 		libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libxerces-c.so:textproc/xerces-c3
 
 USES=		compiler:c++11-lang cmake gl jpeg python shebangfix zip xorg
 SHEBANG_FILES=	tools/*.py tools/*/*.py \
 		tools/*/*/*.py tools/*/*/*/*.py \
 		tools/*/*/*/*/*/*.py \
 		tools/game/A10KW/build.sh \
 		tools/game/rebuild_networks.sh \
 		tools/build/rebuild_cscope.sh \
 		tools/build/dailyUpdateMakeGCC.sh
-		
+
 python_OLD_CMD+="/usr/bin/env python"
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xfixes xft xi xrandr xrender
 
 .include <bsd.port.mk>
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index d699323f37b9..f422bc188ffc 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	hamlib
 PORTVERSION=	4.4
 PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 
 LICENSE=	LGPL20
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \
 		readline shebangfix tcl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_PYTHON=	py3kplist
 
 # $TCL_INCLUDE_SPEC
 SHEBANG_FILES=	bindings/perltest.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl-binding \
 		--with-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-libusb \
 		--with-python-binding
 CONFIGURE_ENV=	LIBUSB_LIBS="-lusb"
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3-config|${PYTHON_CMD}-config|g' \
 		${WRKSRC}/macros/ax_python_devel.m4
 post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${WRKSRC}/bindings/Hamlib-pl.mk
- 
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hamlib/Hamlib.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
 		${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
 		${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
 		${WRKSRC}/README.betatester ${WRKSRC}/README.osx \
 		${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \
 		${WRKSRC}/README.multicast ${WRKSRC}/THANKS
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index dd415efb2584..2d7764cbb397 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	libzdb
 PORTVERSION=	3.2.2
 CATEGORIES=	databases
 MASTER_SITES=	https://www.tildeslash.com/libzdb/dist/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Thread-safe connection pool library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	fails to build
 BROKEN_powerpc=	fails to build
 
 USES=		compiler:c11 gmake libtool localbase pathfix
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		SSL
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE SSL
 
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USES=		mysql
 PGSQL_CONFIGURE_WITH=	postgresql=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
 SQLITE_CONFIGURE_WITH=	sqlite=${LOCALBASE}
 SQLITE_USES=		sqlite
 SSL_USES=		ssl
 
-.include <bsd.port.options.mk> 	 
+.include <bsd.port.options.mk>
 
 # See PR/237200 for details
-.if ${PORT_OPTIONS:MSSL} 	 
-.if ${SSL_DEFAULT} == base 	 
-CONFIGURE_ARGS+=        --enable-openssl 	 
-.else 	 
-CONFIGURE_ARGS+=        --enable-openssl=${OPENSSLBASE} 	 
-.endif 	 
+.if ${PORT_OPTIONS:MSSL}
+.if ${SSL_DEFAULT} == base
+CONFIGURE_ARGS+=        --enable-openssl
+.else
+CONFIGURE_ARGS+=        --enable-openssl=${OPENSSLBASE}
+.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
index 40f6bdd4e511..e0eb668d377d 100644
--- a/databases/pgmodeler/Makefile
+++ b/databases/pgmodeler/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	pgmodeler
 PORTVERSION=	0.9.4
 PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PostgreSQL Database Modeler
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++11-lib gl gmake gnome pgsql pkgconfig qmake qt:5 \
 		xorg
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_GL=		gl
 USE_QT=		core gui network printsupport sql svg widgets testlib uitools \
-		buildtools_build 
+		buildtools_build
 USE_XORG=	x11 xext
 
 USE_LDCONFIG=	yes
 
 QMAKE_SOURCE_PATH=	${WRKSRC}/${PORTNAME}.pro
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|linux|unix|g' ${WRKSRC}/${PORTNAME}.pri
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile
index ddc4f77f84be..243c2cc879ec 100644
--- a/databases/postgresql10-contrib/Makefile
+++ b/databases/postgresql10-contrib/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
 MASTERDIR=	${.CURDIR}/../postgresql10-server
 
 USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib
 
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 OPTIONS_DEFINE=	DOCS XML
 OPTIONS_DEFAULT=XML
 OPTIONS_SUB=	yes
 
 XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 XML_CONFIGURE_WITH=	libxml libxslt
 
-post-configure: 
+post-configure:
 		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/py-alembic14/Makefile b/databases/py-alembic14/Makefile
index 31f4596e5fea..2361cee93075 100644
--- a/databases/py-alembic14/Makefile
+++ b/databases/py-alembic14/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	alembic
 PORTVERSION=	1.4.3
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	14
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Database migration tool for SQLAlchemy (1.4.X branch)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-editor>=0.3:devel/py-python-editor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1.0:databases/py-sqlalchemy12@${PY_FLAVOR}
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils 
+USE_PYTHON=	autoplist concurrent distutils
 
 CONFLICTS_INSTALL=	py*-alembic* # lib/python3.8/site-packages/alembic/__init__.py'
 
 NO_ARCH=	yes
 PORTSCOUT=	limit:^1\.4\.
 
 do-test:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox -e ${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/argparse/Makefile b/devel/argparse/Makefile
index c5375abd66a5..8e5e52b073cf 100644
--- a/devel/argparse/Makefile
+++ b/devel/argparse/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	argparse
 PORTVERSION=	2.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Argument Parser for Modern C++ 
+COMMENT=	Argument Parser for Modern C++
 
 LICENSE=	MIT
 
 USES=		cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	p-ranav
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/codequery/Makefile b/devel/codequery/Makefile
index f1a7497e728a..1ecdae0413aa 100644
--- a/devel/codequery/Makefile
+++ b/devel/codequery/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	codequery
 PORTVERSION=	0.25.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Code understanding, browsing and search tool
 
 LICENSE=	MPL20 MIT
 LICENSE_COMB=	multi
 
 LICENSE_FILE_MIT=	${WRKSRC}/querylib/README.txt
 LICENSE_FILE_MPL20=	${WRKSRC}/LICENSE.md
 
 USES=		cmake:insource compiler:c++11-lang ninja qt:5 sqlite
-		
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	ruben2020
 
 USE_QT=		concurrent core gui widgets xml  \
 		buildtools_build linguisttools_build qmake_build
 
 CMAKE_ON=	BUILD_QT5
 
 DESKTOP_ENTRIES="CodeQuery" "" "" "${PORTNAME}" "Development;" ""
 
 PLIST_FILES=	bin/codequery \
 		bin/cqmakedb \
 		bin/cqsearch
 
 .include <bsd.port.mk>
diff --git a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile
index 48486211a35a..16e364fef823 100644
--- a/devel/gcc-msp430-ti-toolchain/Makefile
+++ b/devel/gcc-msp430-ti-toolchain/Makefile
@@ -1,211 +1,211 @@
 PORTNAME=	gcc-msp430-ti-toolchain
 PORTVERSION=	${TI_VERSION}.${RELEASE_DATE}
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${GCC_REL_VERSION}:gcc \
 		SOURCEWARE/binutils/releases:binutils \
 		ftp://sources.redhat.com/pub/:newlib \
 		GNU/gdb:gdb \
 		SOURCEWARE/newlib:newlib \
 		http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${TI_VERSION:S/./_/g}/export/:tipatch \
 		http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${TI_VERSION:S/./_/g}/export/:tisupport \
 		http://www.ti.com/lit/ug/slau${DOC_VERSION}/:tidocs
 DISTFILES=	gcc-${GCC_REL_VERSION}.tar.xz:gcc \
 		binutils-${BINUTILS_VERSION}.tar.bz2:binutils \
 		gdb-${GDB_VERSION}.tar.xz:gdb \
 		newlib-${NEWLIB_VERSION}.tar.gz:newlib \
 		msp430-gcc-${PATCHSET_VERSION}-source-patches.tar.bz2:tipatch \
 		msp430-gcc-support-files-${SUPPORT_VERSION}.zip:tisupport \
 		slau${DOC_VERSION}.pdf:tidocs
 EXTRACT_ONLY=	gcc-${GCC_REL_VERSION}.tar.xz \
 		binutils-${BINUTILS_VERSION}.tar.bz2 \
 		gdb-${GDB_VERSION}.tar.xz \
 		newlib-${NEWLIB_VERSION}.tar.gz \
 		msp430-gcc-${PATCHSET_VERSION}-source-patches.tar.bz2 \
 		msp430-gcc-support-files-${SUPPORT_VERSION}.zip
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Complete gcc-based toolcahin for TI MSP430 uC
 
 LICENSE=	GPLv2 LGPL20 LGPL21 GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc \
 		libisl.so:devel/isl
 
 # Akami tarpitting fetch by user agent
 FETCH_BEFORE_ARGS=	--user-agent=Wget/1.20.3
 
 USES=		bison compiler cpe gmake iconv libtool makeinfo ncurses \
 		tar:bzip2
 USE_CSTD=	gnu89
 
 GNU_CONFIGURE=		yes
 
 TI_VERSION=		9.3.1.2
 GCC_REL_VERSION=	9.3.0
 GCC_VERSION=		9.3.1
 SUPPORT_VERSION=	1.212
 BINUTILS_VERSION=	2.34
 GDB_VERSION=		9.1
 NEWLIB_VERSION=		2.4.0
 PATCHSET_VERSION=	9.3.1.11
 DOC_VERSION=		646f
 RELEASE_DATE=		20210722
 TARGET=			msp430-elf
 
 CPE_PRODUCT=	gcc
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_REL_VERSION}
 
 PATCH_WRKSRC=	${WRKDIR}
 MANPREFIX=	${PREFIX}/${PORTNAME}-${TI_VERSION}
 DOCSDIR=	${PREFIX}/${PORTNAME}-${TI_VERSION}/docs
 PLIST_SUB+=	TARGET=${TARGET} GCC_VERSION=${GCC_VERSION} \
 		TI_VERSION=${TI_VERSION} DOC_VERSION=${DOC_VERSION}
 
 DIST_PATCH_ARGS=--forward --force --quiet --remove-empty-files --strip=0
 
 UNNEEDED_HOST_FILES=	lib/lib${TARGET}-sim.a
 UNNEEDED_HOST_DIRS=	lib/gcc/${TARGET}/${GCC_VERSION}/plugin/include/ada \
 			lib/gcc/${TARGET}/${GCC_VERSION}/plugin/include/java \
 			lib/gcc/${TARGET}/${GCC_VERSION}/plugin/include/objc \
 			include info man share
 
 BUILD_DIR=	${WRKDIR}/build
 INTERIM_WORLD=	${WRKDIR}/install
 INTERIM_PREFIX=	${INTERIM_WORLD}/${PORTNAME}-${TI_VERSION}
 
 MAKE_ENV=	PATH="${PATH}:${INTERIM_PREFIX}/bin"
 CONFIGURE_ENV=	PATH="${PATH}:${INTERIM_PREFIX}/bin"
 
 GCC_DIRS_FROM_NEWLIB=	libgloss newlib
 
 CONFIGURE_ARGS_COMMON=	--prefix=${INTERIM_PREFIX} \
 			--target=msp430-elf \
 			--enable-languages=c,c++ \
 			--disable-nls \
 			--enable-initfini-array
 
 pre-patch:
 	@${ECHO_MSG} "===> Apply distribution patches..."
 	@${ECHO_MSG} "====> Patch gcc"
 	@cd ${WRKDIR}/gcc-${GCC_REL_VERSION} && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/gcc-${GCC_REL_VERSION}.patch
 	@${ECHO_MSG} "====> Patch binutils"
 	@cd ${WRKDIR}/binutils-${BINUTILS_VERSION} && \
 	 ${MKDIR} sim/testsuite/sim/msp430 && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/binutils-${BINUTILS_VERSION:S/./_/g}.patch
 	@${ECHO_MSG} "====> Patch gdb"
 	@cd ${WRKDIR}/gdb-${GDB_VERSION} && \
 	 ${MKDIR} gas/config ld/emultempl && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/gdb-${GDB_VERSION}-release.patch
 	@${ECHO_MSG} "====> Patch newlib"
 	@cd ${WRKDIR}/newlib-${NEWLIB_VERSION} && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/newlib-${NEWLIB_VERSION:S/./_/g}.patch
 
 do-configure:
 .for _DIR in ${GCC_DIRS_FROM_NEWLIB}
 	@${LN} -fns ${WRKDIR}/newlib-${NEWLIB_VERSION}/${_DIR} ${WRKDIR}/gcc-${GCC_REL_VERSION}/${_DIR}
 .endfor
 	@${RM} -r ${BUILD_DIR}
 	@${MKDIR} ${BUILD_DIR}
 	@${RM} -r ${INTERIM_PREFIX}
 	@${MKDIR} ${INTERIM_PREFIX}
 
 do-build:
 # Build & install binutils
 	${MKDIR} ${BUILD_DIR}/binutils
 	@cd ${BUILD_DIR}/binutils && \
 		${MAKE_ENV} ${CONFIGURE_ENV} ${WRKDIR}/binutils-${BINUTILS_VERSION}/configure \
 		 ${CONFIGURE_ARGS_COMMON} \
 		 --disable-sim \
 		 --disable-gdb \
 		 --disable-werror \
 		 --with-pkgversion="FreeBSD Ports Collection" \
 	         --with-system-zlib
 	@cd ${BUILD_DIR}/binutils && \
 		${DO_MAKE_BUILD}
 	@cd ${BUILD_DIR}/binutils && \
 		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install DESTDIR=''
 # Build & install gcc & newlib
 	@${MKDIR} ${BUILD_DIR}/gcc
 	@cd ${BUILD_DIR}/gcc && \
 		${MAKE_ENV} ${CONFIGURE_ENV} ${WRKDIR}/gcc-${GCC_REL_VERSION}/configure \
 		 ${CONFIGURE_ARGS_COMMON} \
 		 --enable-target-optspace \
 		 --enable-newlib-nano-formatted-io \
 		 --with-gmp=${PREFIX} \
 		 --with-mprf=${PREFIX} \
 		 --with-mpc=${PREFIX} \
 		 --with-isl=${PREFIX} \
 		 --with-pkgversion="FreeBSD Ports Collection" \
 		 --with-system-zlib
 	@cd ${BUILD_DIR}/gcc && \
 		${DO_MAKE_BUILD}
 	@cd ${BUILD_DIR}/gcc && \
 		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install DESTDIR=''
 # Build & install gdb
 	@${MKDIR} ${BUILD_DIR}/gdb
 	@cd ${BUILD_DIR}/gdb && \
 		${MAKE_ENV} ${CONFIGURE_ENV} ${WRKDIR}/gdb-${GDB_VERSION}/configure \
 		 ${CONFIGURE_ARGS_COMMON} \
 		 --disable-binutils \
 		 --disable-gas \
 		 --disable-ld \
 		 --disable-gprof \
 		 --disable-etc \
 		 --without-mpfr \
 		 --without-lzma \
 		 --with-python=no \
 		 --with-pkgversion="FreeBSD Ports Collection" \
 		 --with-system-zlib
 	@cd ${BUILD_DIR}/gdb && \
 		${DO_MAKE_BUILD}
 	@cd ${BUILD_DIR}/gdb && \
 		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install DESTDIR=''
 # Strip binaries
 .if !defined(DEBUG)
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/bin -type f -name ${TARGET}-\*) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/${TARGET}/bin -type f -maxdepth 1 -mindepth 1) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/libexec/gcc/${TARGET}/${GCC_VERSION} -type f) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 	@${STRIP_CMD} ${INTERIM_PREFIX}/lib/libcc1.so.0
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/lib/gcc/${TARGET}/${GCC_VERSION} -perm +111 -and ! -type d) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 .endif
-		
+
 do-install:
 	@${TAR} -cf - -C ${INTERIM_WORLD} ${PORTNAME}-${TI_VERSION} | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}
 	@${ECHO_MSG} "Remove unneeded host files..."
 	@for f in ${UNNEEDED_HOST_FILES} ; do \
 		${RM} "${STAGEDIR}${PREFIX}/$$f" ; \
 	done
 	@for f in ${UNNEEDED_HOST_DIRS} ; do \
 		${RM} -r "${STAGEDIR}${PREFIX}/$$f" ; \
 	done
 	@${ECHO_MSG} "Install devices' headers and linker scripts..."
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include
 	cd ${WRKDIR}/msp430-gcc-support-files && \
 		${TAR} cf - . | \
 		${TAR} xf - -C ${STAGEDIR}${PREFIX}/${PORTNAME}-${TI_VERSION}
 	@${ECHO_MSG} "Install minimal documentation..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau${DOC_VERSION}.pdf \
 		${STAGEDIR}${DOCSDIR}/slau${DOC_VERSION}.pdf
 	${INSTALL_DATA} ${FILESDIR}/watchdog.txt ${STAGEDIR}${DOCSDIR}/watchdog.txt
 
 .include <bsd.port.mk>
diff --git a/devel/kf5-ki18n/Makefile b/devel/kf5-ki18n/Makefile
index f6b643ca7029..3a06a3a42b43 100644
--- a/devel/kf5-ki18n/Makefile
+++ b/devel/kf5-ki18n/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	ki18n
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 advanced internationalization framework
 
 USES=		cmake compiler:c++11-lib gettext-runtime \
 		gettext-tools:build,run kde:5 qt:5 tar:xz
 USE_KDE=	ecm_build
 USE_QT=		concurrent core declarative network script \
-		buildtools_build qmake_build testlib_build 
+		buildtools_build qmake_build testlib_build
 
 .include <bsd.port.mk>
diff --git a/devel/kf5-kpackage/Makefile b/devel/kf5-kpackage/Makefile
index 7e9f0051eea3..7eb27a901ec2 100644
--- a/devel/kf5-kpackage/Makefile
+++ b/devel/kf5-kpackage/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	kpackage
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library to load and install packages
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive config coreaddons i18n \
-		doctools_build ecm_build 
+		doctools_build ecm_build
 USE_QT=		core dbus xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/devel/kf5-kservice/Makefile b/devel/kf5-kservice/Makefile
index 5c20092607df..b15a1fe61364 100644
--- a/devel/kf5-kservice/Makefile
+++ b/devel/kf5-kservice/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	kservice
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 advanced plugin and service introspection
 
 USES=		bison cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive config coreaddons crash dbusaddons i18n \
-		doctools_build ecm_build 
+		doctools_build ecm_build
 USE_QT=		core dbus gui xml \
 		buildtools_build qmake_build
 
 # Make the applications.menu file not conflict with KDE4.
 CMAKE_ARGS=	-DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu"
 
 .include <bsd.port.mk>
diff --git a/devel/libgraphqlparser/Makefile b/devel/libgraphqlparser/Makefile
index 8ad075ad55f4..4f53b15a108e 100644
--- a/devel/libgraphqlparser/Makefile
+++ b/devel/libgraphqlparser/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	libgraphqlparser
 PORTVERSION=	0.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-#MASTER_SITES=	
+#MASTER_SITES=
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GraphQL query parser
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		bison cmake compiler:c++11-lang python:3.6+,build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	graphql
 
 .include <bsd.port.mk>
diff --git a/devel/libmustache/Makefile b/devel/libmustache/Makefile
index 547e7bee19c4..90335e40c26c 100644
--- a/devel/libmustache/Makefile
+++ b/devel/libmustache/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	libmustache
 PORTVERSION=	0.5.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	devel
-#MASTER_SITES=	
+#MASTER_SITES=
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C++ implementation of Mustache
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libyaml.so:textproc/libyaml
 
 USES=		cmake compiler:c++11-lang localbase
 
 USE_CXXSTD=	c++11
 
 GH_ACCOUNT=	jbboehr
 USE_GITHUB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
index 12daf3b7fe55..e75db52e4a31 100644
--- a/devel/llvm10/Makefile
+++ b/devel/llvm10/Makefile
@@ -1,595 +1,595 @@
 PORTNAME=	llvm
 DISTVERSION=	10.0.1
 PORTREVISION=	10
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE.TXT
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
 LLVM_SUFFIX=	${LLVM_MAJOR}
 PRE_=		${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*}
 RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
 
 LLVM_DIR=	llvm${LLVM_SUFFIX}
 LLVM_PREFIX=	${PREFIX}/${LLVM_DIR}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake compiler:c++11-lib cpe libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:3.6+,build
 USES+=		${_USES_PYTHON}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
 		tools/opt-viewer/optrecord.py \
 		tools/opt-viewer/opt-diff.py \
 		tools/opt-viewer/opt-stats.py \
 		tools/opt-viewer/opt-viewer.py
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DLLVM_ENABLE_RTTI=ON
 CMAKE_ARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
 CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
 # Following commit https://github.com/kitware/cmake/commit/956054
 # we need to either change the whole man-shuffle below, or simply
 # redefine CMAKE_INSTALL_MANDIR
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
 		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so
 # LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.*
 CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFINE_aarch64=	OPENMP
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFINE_riscv64=	OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT_powerpc=	GOLD
 OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
 OPTIONS_DEFAULT_powerpc64_13=	GOLD
 OPTIONS_DEFAULT_powerpc64_14=	GOLD
 OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFAULT_riscv64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
 
 BE_AMDGPU_DESC=		AMD GPU backend (required by mesa)
 BE_FREEBSD_DESC=	Backends for FreeBSD architectures
 BE_FREEBSD_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}"
 BE_NATIVE_DESC=		Backend(s) for this architecture (${_NATIVE_BACKENDS})
 BE_NATIVE_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}"
 BE_STANDARD_DESC=	All non-experimental backends
 .for BE in FREEBSD NATIVE STANDARD
 BE_${BE}_PLIST_FILES=	${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|}
 .endfor
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
 CLANG_DISTFILES=	clang-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang
 CLANG_PLIST_FILES=	share/toolchains/llvm${LLVM_SUFFIX}.mk
 CLANG_SUB_FILES=	xtoolchain.mk
 CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
 			XCXX=clang++${LLVM_SUFFIX} \
 			XCPP=clang-cpp${LLVM_SUFFIX} \
 			XLD=ld.lld${LLVM_SUFFIX} \
 			X_COMPILER_TYPE=clang
 CLANG_USE=		GNOME=libxml2
 COMPILER_RT_DESC=	Sanitizer libraries
 COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
 COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
 COMPILER_RT_CMAKE_ON=	-DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CONFLICTS_BUILD=	commonmark-cmark
 DOCS_PORTDOCS=		llvm
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_EXTRA_PATCHES=	${PATCHDIR}/extras
 EXTRAS_IMPLIES=		CLANG
 EXTRAS_DISTFILES=	clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX}
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 LIT_DESC=		Install lit and FileCheck test tools
 LIT_VARS=		_USES_PYTHON=python:3.6+
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
 			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \
 			-DCURSES_INCLUDE_PATH=/usr/include \
 			-DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \
 			-DCURSES_FORM_LIBRARY=/usr/lib/libform.so \
 			-DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \
 			-DPANEL_LIBRARIES=/usr/lib/libpanel.so
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb
 LLDB_IMPLIES=		CLANG
 LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 PYCLANG_DESC=		Install python bindings to libclang
 PYCLANG_IMPLIES=	CLANG
 PYCLANG_VARS=		_USES_PYTHON=python:3.6+
 PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
 .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} \
 		LLVM_SUFFIX=${LLVM_SUFFIX} \
 		LLVM_MAJOR=${LLVM_MAJOR}
 
 COMMANDS=	${LLVM_COMMANDS}
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 MAN1SRCS+=	${LLVM_MAN1SRCS}
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
 EXTRAS_LIBS=	libclangApplyReplacements \
 		libclangChangeNamespace \
 		libclangDaemon \
 		libclangDoc \
 		libclangChangeNamespace \
 		libclangDaemon \
 		libclangDoc \
 		libclangIncludeFixer \
 		libclangMove \
 		libclangQuery \
 		libclangRename \
 		libclangReorderFields \
 		libclangTidy \
 		libclangTidyGoogleModule \
 		libclangTidyLLVMModule \
 		libclangTidyMiscModule \
 		libclangTidyReadabilityModule \
 		libclangTidyUtils \
 		libfindAllSymbols \
 		libmodernizeCore
 EXTRAS_FILES=	index.js
 EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
 
 .include <bsd.port.options.mk>
 
 # keep in sync with /usr/src/lib/clang/clang.build.mk
 # ----------- start of sync block ------------------
 # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
 # arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
 # For all other targets, we stick with 'unknown'.
 .if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 TARGET_ABI=	-gnueabihf
 .elif ${ARCH:Marm*}
 TARGET_ABI=	-gnueabi
 .else
 TARGET_ABI=
 .endif
 
 CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI}
 # ----------- end of sync block --------------------
 
 .if ${PORT_OPTIONS:MCLANG}
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	${CLANG_MAN1SRCS}
 CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
 SHEBANG_FILES+=	tools/clang/tools/scan-view/bin/scan-view \
 		tools/clang/tools/clang-format/clang-format-diff.py \
 		tools/clang/tools/clang-format/git-clang-format \
 		tools/clang/utils/hmaptool/hmaptool
 USES+=		gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
 COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAS}
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	${EXTRAS_MAN1SRCS}
 PORTDOCS+=	clang-tools
 SHEBANG_FILES+=	tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
 		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
 		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	${LIT_MAN1SRCS}
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
 COMMANDS+=	${LLD_COMMANDS}
 PORTDOCS+=	lld
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
 COMMANDS+=	${LLDB_COMMANDS}
 MAN1SRCS+=	${LLDB_MAN1SRCS}
 USES+=		lua
 .endif
 
 OPENMP_PATTERN=	libarcher|lib[ig]*omp|omp.h|ompt.h|omp-tools.h
 
 .if ${PORT_OPTIONS:MPYCLANG}
 PYCLANG_PATTERN=	(clang\/(__init__|cindex|enumerations).py)$$
 .endif
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
 .include "${.CURDIR}/Makefile.MAN1SRCS"
 
 _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH} == aarch64
 _NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH:Mmips*}
 _NATIVE_BACKENDS=	Mips
 .elif ${ARCH:Mpowerpc*}
 _NATIVE_BACKENDS=	PowerPC
 .elif ${ARCH:Mriscv*}
 _NATIVE_BACKENDS=	RISCV
 .endif
 NATIVE_BACKENDS=	${_NATIVE_BACKENDS}
 .if ${PORT_OPTIONS:MBE_AMDGPU}
 FREEBSD_BACKENDS+=	AMDGPU
 NATIVE_BACKENDS+=	AMDGPU
 .endif
 STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \
 			NVPTX SystemZ WebAssembly XCore
 _BE_LIBS_COMMON=	CodeGen Desc Info
 _BE_LIBS_AArch64=	AsmParser Disassembler Utils
 _BE_LIBS_AMDGPU=	AsmParser Disassembler Utils
 _BE_LIBS_ARM=		AsmParser Disassembler Utils
-_BE_LIBS_BPF=		AsmParser Disassembler 
+_BE_LIBS_BPF=		AsmParser Disassembler
 _BE_LIBS_Hexagon=	AsmParser Disassembler
 _BE_LIBS_Lanai=		AsmParser Disassembler
 _BE_LIBS_MSP430=	AsmParser Disassembler
 _BE_LIBS_Mips=		AsmParser Disassembler
 _BE_LIBS_PowerPC=	AsmParser Disassembler
 _BE_LIBS_RISCV=		AsmParser Disassembler Utils
 _BE_LIBS_Sparc=		AsmParser Disassembler
 _BE_LIBS_SystemZ=	AsmParser Disassembler
 _BE_LIBS_WebAssembly=	AsmParser Disassembler
 _BE_LIBS_X86=		AsmParser Disassembler Utils
 _BE_LIBS_XCore=		Disassembler
 .for BE in FREEBSD NATIVE STANDARD
 .for BE_ARCH in ${${BE}_BACKENDS}
 _BE_LIBS_${BE}+=	${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \
 			${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/}
 .endfor
 .endfor
 BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}
 
 _CRTLIBDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd
 _CRTBLDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share
 _COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
 .if ${ARCH} == "amd64"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_BLACKLISTS+=	msan_blacklist.txt
 _COMPILER_RT_LIBS= \
 	libclang_rt.asan-preinit-x86_64.a \
 	libclang_rt.asan-x86_64.a \
 	libclang_rt.asan-x86_64.a.syms \
 	libclang_rt.asan-x86_64.so \
 	libclang_rt.asan_cxx-x86_64.a \
 	libclang_rt.asan_cxx-x86_64.a.syms \
 	libclang_rt.builtins-x86_64.a \
 	libclang_rt.cfi-x86_64.a \
 	libclang_rt.cfi_diag-x86_64.a \
 	libclang_rt.dd-x86_64.a \
 	libclang_rt.dyndd-x86_64.so \
 	libclang_rt.fuzzer-x86_64.a \
 	libclang_rt.fuzzer_no_main-x86_64.a \
 	libclang_rt.msan-x86_64.a \
 	libclang_rt.msan-x86_64.a.syms \
 	libclang_rt.msan_cxx-x86_64.a \
 	libclang_rt.msan_cxx-x86_64.a.syms \
 	libclang_rt.profile-x86_64.a \
 	libclang_rt.safestack-x86_64.a \
 	libclang_rt.stats-x86_64.a \
 	libclang_rt.stats_client-x86_64.a \
 	libclang_rt.tsan-x86_64.a \
 	libclang_rt.tsan-x86_64.a.syms \
 	libclang_rt.tsan_cxx-x86_64.a \
 	libclang_rt.tsan_cxx-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.a \
 	libclang_rt.ubsan_minimal-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.so \
 	libclang_rt.ubsan_standalone-x86_64.a \
 	libclang_rt.ubsan_standalone-x86_64.a.syms \
 	libclang_rt.ubsan_standalone-x86_64.so \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
 	libclang_rt.xray-basic-x86_64.a \
 	libclang_rt.xray-fdr-x86_64.a \
 	libclang_rt.xray-profiling-x86_64.a \
 	libclang_rt.xray-x86_64.a
 .endif
 .if ${ARCH} == "i386"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_LIBS+= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
 	libclang_rt.asan-preinit-i386.a \
 	libclang_rt.asan_cxx-i386.a \
 	libclang_rt.builtins-i386.a \
 	libclang_rt.cfi-i386.a \
 	libclang_rt.cfi_diag-i386.a \
 	libclang_rt.profile-i386.a \
 	libclang_rt.safestack-i386.a \
 	libclang_rt.stats-i386.a \
 	libclang_rt.stats_client-i386.a \
 	libclang_rt.ubsan_minimal-i386.a \
 	libclang_rt.ubsan_minimal-i386.so \
 	libclang_rt.ubsan_standalone-i386.a \
 	libclang_rt.ubsan_standalone-i386.so \
 	libclang_rt.ubsan_standalone_cxx-i386.a
 .endif
 
 .if ${ARCH} == "armv6"
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
 .if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
 # Hack to disable COMPILER_RT in plist of unsupported architectures
 PLIST_SUB+=	COMPILER_RT="@comment "
 .else
 .endif
 
 .if ! ${OPTIONS_DEFINE:MGOLD}
 # Hack to disable GOLD in plist of unsupported architectures
 PLIST_SUB+=	GOLD="@comment "
 .else
 .endif
 
 .if ! ${OPTIONS_DEFINE:MOPENMP}
 # Hack to disable OPENMP in plist of unsupported architectures
 PLIST_SUB+=	OPENMP="@comment "
 .else
 .endif
 
 post-extract-CLANG-on:
 	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
 
 post-extract-EXTRAS-on:
 	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
 
 post-extract-LLD-on:
 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
 
 post-extract-LLDB-on:
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
 
 post-extract-OPENMP-on:
 	# FreeBSD/aarch64 needs same va_list handling as Linux/aarch64
 	# see https://reviews.freebsd.org/D21167
 	${REINPLACE_CMD} -e 's/KMP_ARCH_AARCH64) && KMP_OS_LINUX/KMP_ARCH_AARCH64)/' \
 	    ${WRKSRC_openmp}/runtime/src/kmp.h \
 	    ${WRKSRC_openmp}/runtime/src/kmp_csupport.cpp \
 	    ${WRKSRC_openmp}/runtime/src/kmp_runtime.cpp \
 	    ${WRKSRC_openmp}/runtime/src/kmp_gsupport.cpp
 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp
 
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \
 	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \
 	    ${WRKSRC}/utils/lit/lit/formats/*.py
 	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
 	    ${WRKSRC}/CMakeLists.txt
 
 post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
 	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
 		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	    ${MAKE_ENV} ${MAKE_CMD}
 
 post-install:
 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 
 post-install-DOCS-on:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
 .endfor
 .if ! ${PORT_OPTIONS:MLIT}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 .if ${PORT_OPTIONS:MCLANG}
 post-install-DOCS-off:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 .endif
 
 post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 
 post-install-COMPILER_RT-on:
 	cd ${WRKDIR}/compiler-rt-build && \
 	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
 .if ${ARCH} == "amd64"
 	${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386*
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
 
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \
 			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \
 			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
 post-install-LLD-on:
 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 build-plist:
 	${RM} ${PLIST} ${PLIST}.tmp
 	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
 	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
 .endfor
 .for command in ${LIT_COMMANDS}
 	${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
 	${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
 .endfor
 
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '_blacklist.txt$$' | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${AWK} '{ \
 	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \
 	    if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index f0c2973f0dc0..86ca4682e234 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -1,594 +1,594 @@
 PORTNAME=	llvm
 DISTVERSION=	11.0.1
 PORTREVISION=	7
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE.TXT
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
 LLVM_SUFFIX=	${LLVM_MAJOR}
 PRE_=		${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*}
 RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
 
 LLVM_DIR=	llvm${LLVM_SUFFIX}
 LLVM_PREFIX=	${PREFIX}/${LLVM_DIR}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake compiler:c++11-lib cpe libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
 		tools/opt-viewer/optrecord.py \
 		tools/opt-viewer/opt-diff.py \
 		tools/opt-viewer/opt-stats.py \
 		tools/opt-viewer/opt-viewer.py
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DLLVM_ENABLE_RTTI=ON
 CMAKE_ARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
 CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
 # Following commit https://github.com/kitware/cmake/commit/956054
 # we need to either change the whole man-shuffle below, or simply
 # redefine CMAKE_INSTALL_MANDIR
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DPython3_EXECUTABLE=${PYTHON_CMD}
 # LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.*
 CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 OPTIONS_DEFINE=	BE_AMDGPU BE_WASM CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFINE_aarch64=	OPENMP
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD BE_WASM CLANG EXTRAS LIT LLD LLDB PYCLANG
 OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT_powerpc=	GOLD
 OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
 OPTIONS_DEFAULT_powerpc64_13=	GOLD
 OPTIONS_DEFAULT_powerpc64_14=	GOLD
 OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
 
 BE_AMDGPU_DESC=		AMD GPU backend (required by mesa)
 BE_FREEBSD_DESC=	Backends for FreeBSD architectures
 BE_FREEBSD_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}"
 BE_NATIVE_DESC=		Backend(s) for this architecture (${_NATIVE_BACKENDS})
 BE_NATIVE_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}"
 BE_STANDARD_DESC=	All non-experimental backends
 BE_WASM_DESC=		WebAssembly backend (required by firefox via wasi)
 .for BE in FREEBSD NATIVE STANDARD
 BE_${BE}_PLIST_FILES=	${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|}
 .endfor
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
 CLANG_DISTFILES=	clang-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang
 CLANG_PLIST_FILES=	share/toolchains/llvm${LLVM_SUFFIX}.mk
 CLANG_SUB_FILES=	xtoolchain.mk
 CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
 			XCXX=clang++${LLVM_SUFFIX} \
 			XCPP=clang-cpp${LLVM_SUFFIX} \
 			XLD=ld.lld${LLVM_SUFFIX} \
 			X_COMPILER_TYPE=clang
 CLANG_USE=		GNOME=libxml2
 COMPILER_RT_DESC=	Sanitizer libraries
 COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
 COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
 COMPILER_RT_CMAKE_ON=	-DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CONFLICTS_BUILD=	commonmark-cmark
 DOCS_PORTDOCS=		llvm
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_EXTRA_PATCHES=	${PATCHDIR}/extras
 EXTRAS_IMPLIES=		CLANG
 EXTRAS_DISTFILES=	clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX}
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 LIT_DESC=		Install lit and FileCheck test tools
 LIT_VARS=		_USES_PYTHON=python
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
 			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \
 			-DCURSES_INCLUDE_PATH=/usr/include \
 			-DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \
 			-DCURSES_FORM_LIBRARY=/usr/lib/libform.so \
 			-DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \
 			-DPANEL_LIBRARIES=/usr/lib/libpanel.so
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb
 LLDB_IMPLIES=		CLANG
 LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 PYCLANG_DESC=		Install python bindings to libclang
 PYCLANG_IMPLIES=	CLANG
 PYCLANG_VARS=		_USES_PYTHON=python
 PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
 .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} \
 		LLVM_SUFFIX=${LLVM_SUFFIX} \
 		LLVM_MAJOR=${LLVM_MAJOR}
 
 COMMANDS=	${LLVM_COMMANDS}
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 MAN1SRCS+=	${LLVM_MAN1SRCS}
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
 EXTRAS_LIBS=	libclangApplyReplacements \
 		libclangChangeNamespace \
 		libclangDaemon \
 		libclangDoc \
 		libclangIncludeFixer \
 		libclangMove \
 		libclangQuery \
 		libclangRename \
 		libclangReorderFields \
 		libclangTidy \
 		libclangTidyGoogleModule \
 		libclangTidyLLVMModule \
 		libclangTidyMiscModule \
 		libclangTidyReadabilityModule \
 		libclangTidyUtils \
 		libfindAllSymbols \
 		libmodernizeCore
 EXTRAS_FILES=	index.js
 EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
 
 .include <bsd.port.options.mk>
 
 # keep in sync with /usr/src/lib/clang/clang.build.mk
 # ----------- start of sync block ------------------
 # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
 # arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
 # For all other targets, we stick with 'unknown'.
 .if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 TARGET_ABI=	-gnueabihf
 .elif ${ARCH:Marm*}
 TARGET_ABI=	-gnueabi
 .else
 TARGET_ABI=
 .endif
 
 CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI}
 # ----------- end of sync block --------------------
 
 .if ${PORT_OPTIONS:MCLANG}
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	${CLANG_MAN1SRCS}
 CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
 SHEBANG_FILES+=	tools/clang/tools/scan-view/bin/scan-view \
 		tools/clang/tools/clang-format/clang-format-diff.py \
 		tools/clang/tools/clang-format/git-clang-format \
 		tools/clang/utils/hmaptool/hmaptool
 USES+=		gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
 COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAS}
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	${EXTRAS_MAN1SRCS}
 PORTDOCS+=	clang-tools
 PLIST_DIRS+=	${LLVM_DIR}/include/clang-tidy/plugin
 SHEBANG_FILES+=	tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
 		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
 		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	${LIT_MAN1SRCS}
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
 COMMANDS+=	${LLD_COMMANDS}
 PORTDOCS+=	lld
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
 COMMANDS+=	${LLDB_COMMANDS}
 MAN1SRCS+=	${LLDB_MAN1SRCS}
 USES+=		lua
 .endif
 
 OPENMP_PATTERN=	libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
 
 .if ${PORT_OPTIONS:MPYCLANG}
 PYCLANG_PATTERN=	(clang\/(__init__|cindex|enumerations).py)$$
 .endif
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
 .include "${.CURDIR}/Makefile.MAN1SRCS"
 
 _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH} == aarch64
 _NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH:Mmips*}
 _NATIVE_BACKENDS=	Mips
 .elif ${ARCH:Mpowerpc*}
 _NATIVE_BACKENDS=	PowerPC
 .elif ${ARCH:Mriscv*}
 _NATIVE_BACKENDS=	RISCV
 .endif
 NATIVE_BACKENDS=	${_NATIVE_BACKENDS}
 .if ${PORT_OPTIONS:MBE_AMDGPU}
 FREEBSD_BACKENDS+=	AMDGPU
 NATIVE_BACKENDS+=	AMDGPU
 .endif
 .if ${PORT_OPTIONS:MBE_WASM}
 FREEBSD_BACKENDS+=	WebAssembly
 NATIVE_BACKENDS+=	WebAssembly
 .endif
 STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \
 			MSP430 NVPTX SystemZ WebAssembly XCore
 _BE_LIBS_COMMON=	CodeGen Desc Info
 _BE_LIBS_AArch64=	AsmParser Disassembler Utils
 _BE_LIBS_AMDGPU=	AsmParser Disassembler Utils
 _BE_LIBS_ARM=		AsmParser Disassembler Utils
 _BE_LIBS_AVR=		AsmParser Disassembler
-_BE_LIBS_BPF=		AsmParser Disassembler 
+_BE_LIBS_BPF=		AsmParser Disassembler
 _BE_LIBS_Hexagon=	AsmParser Disassembler
 _BE_LIBS_Lanai=		AsmParser Disassembler
 _BE_LIBS_MSP430=	AsmParser Disassembler
 _BE_LIBS_Mips=		AsmParser Disassembler
 _BE_LIBS_PowerPC=	AsmParser Disassembler
 _BE_LIBS_RISCV=		AsmParser Disassembler Utils
 _BE_LIBS_Sparc=		AsmParser Disassembler
 _BE_LIBS_SystemZ=	AsmParser Disassembler
 _BE_LIBS_WebAssembly=	AsmParser Disassembler
 _BE_LIBS_X86=		AsmParser Disassembler
 _BE_LIBS_XCore=		Disassembler
 .for BE in FREEBSD NATIVE STANDARD
 .for BE_ARCH in ${${BE}_BACKENDS}
 _BE_LIBS_${BE}+=	${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \
 			${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/}
 .endfor
 .endfor
 BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}
 
 _CRTLIBDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd
 _CRTBLDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share
 _COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
 .if ${ARCH} == "amd64"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_BLACKLISTS+=	msan_blacklist.txt
 _COMPILER_RT_LIBS= \
 	libclang_rt.asan-preinit-x86_64.a \
 	libclang_rt.asan-x86_64.a \
 	libclang_rt.asan-x86_64.a.syms \
 	libclang_rt.asan-x86_64.so \
 	libclang_rt.asan_cxx-x86_64.a \
 	libclang_rt.asan_cxx-x86_64.a.syms \
 	libclang_rt.builtins-x86_64.a \
 	libclang_rt.cfi-x86_64.a \
 	libclang_rt.cfi_diag-x86_64.a \
 	libclang_rt.dd-x86_64.a \
 	libclang_rt.dyndd-x86_64.so \
 	libclang_rt.fuzzer-x86_64.a \
 	libclang_rt.fuzzer_no_main-x86_64.a \
 	libclang_rt.msan-x86_64.a \
 	libclang_rt.msan-x86_64.a.syms \
 	libclang_rt.msan_cxx-x86_64.a \
 	libclang_rt.msan_cxx-x86_64.a.syms \
 	libclang_rt.profile-x86_64.a \
 	libclang_rt.safestack-x86_64.a \
 	libclang_rt.stats-x86_64.a \
 	libclang_rt.stats_client-x86_64.a \
 	libclang_rt.tsan-x86_64.a \
 	libclang_rt.tsan-x86_64.a.syms \
 	libclang_rt.tsan_cxx-x86_64.a \
 	libclang_rt.tsan_cxx-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.a \
 	libclang_rt.ubsan_minimal-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.so \
 	libclang_rt.ubsan_standalone-x86_64.a \
 	libclang_rt.ubsan_standalone-x86_64.a.syms \
 	libclang_rt.ubsan_standalone-x86_64.so \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
 	libclang_rt.xray-basic-x86_64.a \
 	libclang_rt.xray-fdr-x86_64.a \
 	libclang_rt.xray-profiling-x86_64.a \
 	libclang_rt.xray-x86_64.a
 .endif
 .if ${ARCH} == "i386"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_LIBS+= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
 	libclang_rt.asan-preinit-i386.a \
 	libclang_rt.asan_cxx-i386.a \
 	libclang_rt.builtins-i386.a \
 	libclang_rt.cfi-i386.a \
 	libclang_rt.cfi_diag-i386.a \
 	libclang_rt.profile-i386.a \
 	libclang_rt.safestack-i386.a \
 	libclang_rt.stats-i386.a \
 	libclang_rt.stats_client-i386.a \
 	libclang_rt.ubsan_minimal-i386.a \
 	libclang_rt.ubsan_minimal-i386.so \
 	libclang_rt.ubsan_standalone-i386.a \
 	libclang_rt.ubsan_standalone-i386.so \
 	libclang_rt.ubsan_standalone_cxx-i386.a
 .endif
 
 .if ${ARCH} == "armv6"
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
 .if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
 # Hack to disable COMPILER_RT in plist of unsupported architectures
 PLIST_SUB+=	COMPILER_RT="@comment "
 .else
 .endif
 
 .if ! ${OPTIONS_DEFINE:MGOLD}
 # Hack to disable GOLD in plist of unsupported architectures
 PLIST_SUB+=	GOLD="@comment "
 .else
 .endif
 
 .if ! ${OPTIONS_DEFINE:MOPENMP}
 # Hack to disable OPENMP in plist of unsupported architectures
 PLIST_SUB+=	OPENMP="@comment "
 .else
 .endif
 
 post-extract-CLANG-on:
 	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
 
 post-extract-EXTRAS-on:
 	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
 
 post-extract-LLD-on:
 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
 
 post-extract-LLDB-on:
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
 
 post-extract-OPENMP-on:
 	# FreeBSD/aarch64 needs same va_list handling as Linux/aarch64
 	# see https://reviews.freebsd.org/D21167
 	${REINPLACE_CMD} -e 's/KMP_ARCH_AARCH64) && KMP_OS_LINUX/KMP_ARCH_AARCH64)/' \
 	    ${WRKSRC_openmp}/runtime/src/kmp.h \
 	    ${WRKSRC_openmp}/runtime/src/kmp_csupport.cpp \
 	    ${WRKSRC_openmp}/runtime/src/kmp_runtime.cpp \
 	    ${WRKSRC_openmp}/runtime/src/kmp_gsupport.cpp
 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp
 
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \
 	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \
 	    ${WRKSRC}/utils/lit/lit/formats/*.py
 	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
 	    ${WRKSRC}/CMakeLists.txt
 
 post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
 	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
 		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	    ${MAKE_ENV} ${MAKE_CMD}
 
 post-install:
 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 
 post-install-DOCS-on:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
 .endfor
 .if ! ${PORT_OPTIONS:MLIT}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 .if ${PORT_OPTIONS:MCLANG}
 post-install-DOCS-off:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 .endif
 
 post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 
 post-install-COMPILER_RT-on:
 	cd ${WRKDIR}/compiler-rt-build && \
 	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
 .if ${ARCH} == "amd64"
 	${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386*
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
 
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \
 			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
 	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \
 			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
 post-install-LLD-on:
 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 build-plist:
 	${RM} ${PLIST} ${PLIST}.tmp
 	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
 	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
 .endfor
 .for command in ${LIT_COMMANDS}
 	${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
 	${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
 .endfor
 
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '_blacklist.txt$$' | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${AWK} '{ \
 	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \
 	    if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 1324fab94452..bf1cc30b3422 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -1,567 +1,567 @@
 PORTNAME=	llvm
 DISTVERSION=	12.0.1
 PORTREVISION=	10
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${LICENSE_DIR}/LICENSE.TXT
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
 LLVM_SUFFIX=	${LLVM_MAJOR}
 PRE_=		${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*}
 RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
 
 LLVM_DIR=	llvm${LLVM_SUFFIX}
 LLVM_PREFIX=	${PREFIX}/${LLVM_DIR}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake compiler:c++11-lib cpe perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:3.6-3.9,build
 USES+=		${_USES_PYTHON}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	llvm/utils/lit/lit.py llvm/utils/llvm-lit/llvm-lit.in \
 		llvm/tools/opt-viewer/optrecord.py \
 		llvm/tools/opt-viewer/opt-diff.py \
 		llvm/tools/opt-viewer/opt-stats.py \
 		llvm/tools/opt-viewer/opt-viewer.py \
 		clang/tools/scan-view/bin/scan-view \
 		clang/tools/clang-format/clang-format-diff.py \
 		clang/tools/clang-format/git-clang-format \
 		clang/utils/hmaptool/hmaptool \
 		clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
 		clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py \
 		clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_SOURCE_PATH=	${WRKSRC}/llvm
 CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DLLVM_ENABLE_RTTI=ON
 CMAKE_ARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
 CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
 # Following commit https://github.com/kitware/cmake/commit/956054
 # we need to either change the whole man-shuffle below, or simply
 # redefine CMAKE_INSTALL_MANDIR
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_LIBEDIT=OFF
 CMAKE_ARGS+=	-DPython3_EXECUTABLE=${PYTHON_CMD}
 # LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.*
 CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 OPTIONS_DEFINE=	BE_AMDGPU BE_WASM CLANG DOCS EXTRAS LIT LLD PYCLANG
 OPTIONS_DEFINE_aarch64=	OPENMP
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD LLDB OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT LLDB OPENMP
 OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFINE_riscv64=	OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD BE_WASM CLANG EXTRAS LIT LLD PYCLANG
 OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD LLDB OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT LLDB OPENMP
 OPTIONS_DEFAULT_powerpc=	GOLD
 OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
 OPTIONS_DEFAULT_powerpc64_13=	GOLD
 OPTIONS_DEFAULT_powerpc64_14=	GOLD
 OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFAULT_riscv64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
 # All non-backend options
 _ALL_OPTIONS=	CLANG COMPILER_RT DOCS EXTRAS GOLD LIT LLD LLDB PYCLANG OPENMP
 
 BE_AMDGPU_DESC=		AMD GPU backend (required by mesa)
 BE_FREEBSD_DESC=	Backends for FreeBSD architectures
 BE_FREEBSD_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}"
 BE_NATIVE_DESC=		Backend(s) for this architecture (${_NATIVE_BACKENDS})
 BE_NATIVE_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}"
 BE_STANDARD_DESC=	All non-experimental backends
 BE_WASM_DESC=		WebAssembly backend (required by firefox via wasi)
 .for BE in FREEBSD NATIVE STANDARD
 BE_${BE}_PLIST_FILES=	${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|}
 .endfor
 CLANG_DESC=	Build clang
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang
 CLANG_PLIST_FILES=	share/toolchains/llvm${LLVM_SUFFIX}.mk
 CLANG_SUB_FILES=	xtoolchain.mk
 CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
 			XCXX=clang++${LLVM_SUFFIX} \
 			XCPP=clang-cpp${LLVM_SUFFIX} \
 			XLD=ld.lld${LLVM_SUFFIX} \
 			X_COMPILER_TYPE=clang
 CLANG_USE=		GNOME=libxml2
 COMPILER_RT_DESC=	Sanitizer libraries
 # An unwind.h is require to build.  I think an in-tree one should be used
 # but this seems to work as a workaround...
 COMPILER_RT_BUILD_DEPENDS=	libunwind>0:devel/libunwind
 COMPILER_RT_CMAKE_ON=	-DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
 # Allow unwind.h to be found reliably
 COMPILER_RT_USES=	localbase
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CONFLICTS_BUILD=	commonmark-cmark
 DOCS_PORTDOCS=		llvm
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_IMPLIES=		CLANG
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 LIT_DESC=		Install lit and FileCheck test tools
 LIT_VARS=		_USES_PYTHON=python:3.6-3.9
 LLD_DESC=		Install lld, the LLVM linker
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
 			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \
 			-DCURSES_INCLUDE_PATH=/usr/include \
 			-DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \
 			-DCURSES_FORM_LIBRARY=/usr/lib/libform.so \
 			-DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \
 			-DPANEL_LIBRARIES=/usr/lib/libpanel.so
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_IMPLIES=		CLANG
 LLDB_USES=		lua:53 libedit
 LLDB_VARS=		_USES_PYTHON=python:3.6-3.9
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_PORTDOCS=	openmp
 PYCLANG_DESC=		Install python bindings to libclang
 PYCLANG_IMPLIES=	CLANG
 PYCLANG_VARS=		_USES_PYTHON=python:3.6-3.9
 PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} \
 		LLVM_SUFFIX=${LLVM_SUFFIX} \
 		LLVM_MAJOR=${LLVM_MAJOR}
 
 COMMANDS=	${LLVM_COMMANDS}
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 MAN1SRCS+=	${LLVM_MAN1SRCS}
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
 EXTRAS_LIBS=	libclangApplyReplacements \
 		libclangChangeNamespace \
 		libclangDaemon \
 		libclangDoc \
 		libclangIncludeFixer \
 		libclangMove \
 		libclangQuery \
 		libclangRename \
 		libclangReorderFields \
 		libclangTidy \
 		libclangTidyGoogleModule \
 		libclangTidyLLVMModule \
 		libclangTidyMiscModule \
 		libclangTidyReadabilityModule \
 		libclangTidyUtils \
 		libfindAllSymbols \
 		libmodernizeCore
 EXTRAS_FILES=	index.js
 EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
 
 .include <bsd.port.options.mk>
 
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp
 .endif
 
 # keep in sync with /usr/src/lib/clang/clang.build.mk
 # ----------- start of sync block ------------------
 # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
 # arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
 # For all other targets, we stick with 'unknown'.
 .if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 TARGET_ABI=	-gnueabihf
 .elif ${ARCH:Marm*}
 TARGET_ABI=	-gnueabi
 .else
 TARGET_ABI=
 .endif
 
 CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI}
 # ----------- end of sync block --------------------
 
 .if ${PORT_OPTIONS:MCLANG}
 LLVM_ENABLE_PROJECTS+=	clang
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	${CLANG_MAN1SRCS}
 CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
 USES+=		gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
 LLVM_ENABLE_PROJECTS+=	compiler-rt
 COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAS}
 LLVM_ENABLE_PROJECTS+=	clang-tools-extra
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	${EXTRAS_MAN1SRCS}
 PORTDOCS+=	clang-tools
 PLIST_DIRS+=	${LLVM_DIR}/include/clang-tidy/plugin
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	${LIT_MAN1SRCS}
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
 LLVM_ENABLE_PROJECTS+=	lld
 COMMANDS+=	${LLD_COMMANDS}
 PORTDOCS+=	lld
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
 LLVM_ENABLE_PROJECTS+=	lldb
 COMMANDS+=	${LLDB_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MOPENMP}
 LLVM_ENABLE_PROJECTS+=	openmp
 MAN1SRCS+=	${OPENMP_MAN1SRCS}
 .endif
 OPENMP_PATTERN=	libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
 
 .if ${PORT_OPTIONS:MPYCLANG}
 PYCLANG_PATTERN=	(clang\/(__init__|cindex|enumerations).py)$$
 .endif
 
 .if defined(LLVM_ENABLE_PROJECTS)
 CMAKE_ARGS+=	-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
 .endif
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
 .include "${.CURDIR}/Makefile.MAN1SRCS"
 
 _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH} == aarch64
 _NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH:Mmips*}
 _NATIVE_BACKENDS=	Mips
 .elif ${ARCH:Mpowerpc*}
 _NATIVE_BACKENDS=	PowerPC
 .elif ${ARCH:Mriscv*}
 _NATIVE_BACKENDS=	RISCV
 .endif
 NATIVE_BACKENDS=	${_NATIVE_BACKENDS}
 .if ${PORT_OPTIONS:MBE_AMDGPU}
 FREEBSD_BACKENDS+=	AMDGPU
 NATIVE_BACKENDS+=	AMDGPU
 .endif
 .if ${PORT_OPTIONS:MBE_WASM}
 FREEBSD_BACKENDS+=	WebAssembly
 NATIVE_BACKENDS+=	WebAssembly
 .endif
 STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \
 			MSP430 NVPTX SystemZ WebAssembly XCore
 _BE_LIBS_COMMON=	CodeGen Desc Info
 _BE_LIBS_AArch64=	AsmParser Disassembler Utils
 _BE_LIBS_AMDGPU=	AsmParser Disassembler Utils
 _BE_LIBS_ARM=		AsmParser Disassembler Utils
 _BE_LIBS_AVR=		AsmParser Disassembler
-_BE_LIBS_BPF=		AsmParser Disassembler 
+_BE_LIBS_BPF=		AsmParser Disassembler
 _BE_LIBS_Hexagon=	AsmParser Disassembler
 _BE_LIBS_Lanai=		AsmParser Disassembler
 _BE_LIBS_MSP430=	AsmParser Disassembler
 _BE_LIBS_Mips=		AsmParser Disassembler
 _BE_LIBS_PowerPC=	AsmParser Disassembler
 _BE_LIBS_RISCV=		AsmParser Disassembler
 _BE_LIBS_Sparc=		AsmParser Disassembler
 _BE_LIBS_SystemZ=	AsmParser Disassembler
 _BE_LIBS_WebAssembly=	AsmParser Disassembler
 _BE_LIBS_X86=		AsmParser Disassembler
 _BE_LIBS_XCore=		Disassembler
 .for BE in FREEBSD NATIVE STANDARD
 .for BE_ARCH in ${${BE}_BACKENDS}
 _BE_LIBS_${BE}+=	${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \
 			${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/}
 .endfor
 .endfor
 BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}
 
 _CRTLIBDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd
 _CRTBLDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share
 _COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
 _COMPILER_RT_LIBS_i386= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
 	libclang_rt.asan-preinit-i386.a \
 	libclang_rt.asan_cxx-i386.a \
 	libclang_rt.builtins-i386.a \
 	libclang_rt.cfi-i386.a \
 	libclang_rt.cfi_diag-i386.a \
 	libclang_rt.profile-i386.a \
 	libclang_rt.safestack-i386.a \
 	libclang_rt.stats-i386.a \
 	libclang_rt.stats_client-i386.a \
 	libclang_rt.ubsan_minimal-i386.a \
 	libclang_rt.ubsan_minimal-i386.so \
 	libclang_rt.ubsan_standalone-i386.a \
 	libclang_rt.ubsan_standalone-i386.so \
 	libclang_rt.ubsan_standalone_cxx-i386.a
 .if ${ARCH} == "amd64"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_BLACKLISTS+=	msan_blacklist.txt
 _COMPILER_RT_LIBS= \
 	libclang_rt.asan-preinit-x86_64.a \
 	libclang_rt.asan-x86_64.a \
 	libclang_rt.asan-x86_64.a.syms \
 	libclang_rt.asan-x86_64.so \
 	libclang_rt.asan_cxx-x86_64.a \
 	libclang_rt.asan_cxx-x86_64.a.syms \
 	libclang_rt.builtins-x86_64.a \
 	libclang_rt.cfi-x86_64.a \
 	libclang_rt.cfi_diag-x86_64.a \
 	libclang_rt.dd-x86_64.a \
 	libclang_rt.dyndd-x86_64.so \
 	libclang_rt.fuzzer_interceptors-x86_64.a \
 	libclang_rt.fuzzer_no_main-x86_64.a \
 	libclang_rt.fuzzer-x86_64.a \
 	libclang_rt.msan-x86_64.a \
 	libclang_rt.msan-x86_64.a.syms \
 	libclang_rt.msan_cxx-x86_64.a \
 	libclang_rt.msan_cxx-x86_64.a.syms \
 	libclang_rt.profile-x86_64.a \
 	libclang_rt.safestack-x86_64.a \
 	libclang_rt.stats-x86_64.a \
 	libclang_rt.stats_client-x86_64.a \
 	libclang_rt.tsan-x86_64.a \
 	libclang_rt.tsan-x86_64.a.syms \
 	libclang_rt.tsan_cxx-x86_64.a \
 	libclang_rt.tsan_cxx-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.a \
 	libclang_rt.ubsan_minimal-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.so \
 	libclang_rt.ubsan_standalone-x86_64.a \
 	libclang_rt.ubsan_standalone-x86_64.a.syms \
 	libclang_rt.ubsan_standalone-x86_64.so \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
 	libclang_rt.xray-basic-x86_64.a \
 	libclang_rt.xray-fdr-x86_64.a \
 	libclang_rt.xray-profiling-x86_64.a \
 	libclang_rt.xray-x86_64.a
 .if exists(/usr/lib32/libc.so.7)
 _COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
 .endif
 .endif
 .if ${ARCH} == "i386"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
 .endif
 
 .if ${ARCH} == "armv6"
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
 # Comment out plist entries for unsupported options.
 .for opt in ${_ALL_OPTIONS}
 .if !${OPTIONS_DEFINE:M${opt}}
 PLIST_SUB+=     ${opt}="@comment "
 .endif
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \
 	    ${WRKSRC}/llvm/utils/lit/lit.py \
 	    ${WRKSRC}/llvm/utils/lit/lit/*.py \
 	    ${WRKSRC}/llvm/utils/lit/lit/formats/*.py
 	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
 	    ${WRKSRC}/llvm/CMakeLists.txt
 
 post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
 	    ${WRKSRC}/clang/lib/Driver/ToolChains/CommonArgs.cpp
 	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
 	    ${WRKSRC}/clang/tools/clang-format/clang-format.py \
 	    ${WRKSRC}/clang/tools/clang-format/clang-format-sublime.py \
 	    ${WRKSRC}/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
 	${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 		${WRKSRC}/lld/docs/conf.py
 
 post-install:
 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 
 post-install-DOCS-on:
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/* ${STAGEDIR}${DOCSDIR}
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
 .endfor
 .if ! ${PORT_OPTIONS:MLIT}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 .if ${PORT_OPTIONS:MCLANG}
 post-install-DOCS-off:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 .endif
 
 post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \
 			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \
 			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
 post-install-LLD-on:
 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 build-plist:
 	${RM} ${PLIST} ${PLIST}.tmp
 	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
 	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
 .endfor
 .for command in ${LIT_COMMANDS}
 	${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
 	${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
 .endfor
 
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '_blacklist.txt$$' | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${AWK} '{ \
 	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \
 	    if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Proc-ProcessTable/Makefile b/devel/p5-Proc-ProcessTable/Makefile
index 4a683919d943..09f03fa511bd 100644
--- a/devel/p5-Proc-ProcessTable/Makefile
+++ b/devel/p5-Proc-ProcessTable/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	Proc-ProcessTable
 PORTVERSION=	0.634
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JWB
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl interface to the unix process table
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 USES=		perl5
 USE_PERL5=	configure
 
 OPTIONS_DEFINE=	DOCS
 
 PORTSCOUT=	limit:^[0-9\.]*$$ skipv:0.611,0.612
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Proc/ProcessTable/ProcessTable.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.freebsd-* ${STAGEDIR}${DOCSDIR}	
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.freebsd-* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index db5e18730395..182760085895 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	sip
 PORTVERSION=	${SIP_VERSION}
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_SIP}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${SIP_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
 
 LICENSE=		SIP GPLv2 GPLv3
 LICENSE_COMB=		multi
 LICENSE_NAME_SIP=	SIP License
 LICENSE_GROUPS_SIP=	FSF GPL OSI
 LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_SIP=	${WRKSRC}/LICENSE 
+LICENSE_FILE_SIP=	${WRKSRC}/LICENSE
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-GPL2
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python:3.5+ pyqt:sip
 USE_PYTHON=	autoplist concurrent distutils flavors py3kplist
 USE_PYQT=	#
 
 .include <bsd.port.mk>
diff --git a/devel/py-testpath/Makefile b/devel/py-testpath/Makefile
index 74d3e3b9bcbc..bafb8061edc4 100644
--- a/devel/py-testpath/Makefile
+++ b/devel/py-testpath/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	testpath
 PORTVERSION=	0.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	Test utilities for Python code working with files and commands 
+COMMENT=	Test utilities for Python code working with files and commands
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils pytest
 
 NO_ARCH=	yes
 
 post-patch:
 	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/revive/Makefile b/devel/revive/Makefile
index 26e2b537083f..0703c899c752 100644
--- a/devel/revive/Makefile
+++ b/devel/revive/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	revive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
 PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Extensible static code analysis framework for Go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 _BUILD_VERSION=	${DISTVERSION}
-_BUILD_COMMIT=	23828cc	
+_BUILD_COMMIT=	23828cc
 _BUILD_DATE=	$$(date +%Y-%m-%d)
 
 GO_MODULE=	github.com/mgechev/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
 		-X main.version=${_BUILD_VERSION} \
 		-X main.commit=${_BUILD_COMMIT} \
 		-X main.date=${_BUILD_DATE}"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CODE_OF_CONDUCT.md CONTRIBUTING.md DEVELOPING.md \
 		PULL_REQUEST_TEMPLATE.md README.md RULES_DESCRIPTIONS.md
 PORTEXAMPLES=	defaults.toml untyped.toml
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-rdoc63/Makefile b/devel/rubygem-rdoc63/Makefile
index 3d8d12b9020a..c2e6b5b435b5 100644
--- a/devel/rubygem-rdoc63/Makefile
+++ b/devel/rubygem-rdoc63/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	rdoc
 PORTVERSION=	6.3.3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	63
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	RDoc produces HTML and command-line documentation for Ruby projects
 
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.rdoc
 
 USES=		cpe gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	ruby-lang
 
 PORTSCOUT=	limit:^6\.3\.
 
 .include <bsd.port.pre.mk>
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/rdoc
 	${RM} ${STAGEDIR}${PREFIX}/bin/ri
-	${RM} ${STAGEDIR}${PREFIX}/share/man/man1/ri.1 
+	${RM} ${STAGEDIR}${PREFIX}/share/man/man1/ri.1
 
 .include <bsd.port.post.mk>
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index e0afa103c2a2..3ad7c14330e4 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,236 +1,236 @@
 PORTREVISION=	2
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
 CONFLICTS_INSTALL=	subversion-lts
 
 USE_RC_SUBR=	svnserve
 
 PORTDOCS=	BUGS CHANGES COMMITTERS INSTALL README
 
 OPTIONS_DEFINE=	\
 		BDB		\
 		DOCS		\
 		FREEBSD_TEMPLATE\
 		GPG_AGENT 	\
 		NLS		\
 		SASL		\
 		SERF		\
 		STATIC		\
 		SVNSERVE_WRAPPER\
 		TEST		\
 		TOOLS
 
 OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS
 
 FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
 GPG_AGENT_DESC=		Enable GPG agent password store
 SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
 STATIC_DESC=		No shared libs (disables SVN integration)
 SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
 TEST_DESC=		Run subversion test suite
 TOOLS_DESC=		Install several tools
 
 # Patches required for use with the FreeBSD Project repository only
 FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
 SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
 
 USES+=			shebangfix python:3.5+,env
 python_OLD_CMD+=	"/bin/env python"
 SHEBANG_REGEX=		./tools/.*
 
 .include "Makefile.common"
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 SVNGROUP?=	svn
 SVNUSER?=	svn
 
 CONFIGURE_ARGS+=	--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
 PLIST_SUB+=	NO_SVNSERVE_WRAPPER="@comment "
 SVNSERVE_EXT=	.bin
 .else
 SUB_LIST+=	SVNSERVE_BIN_EXT=""
 PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 SVNSERVE_EXT=
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
 .  if ${PORT_OPTIONS:MNLS}
 USES+=			gettext-tools
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
 .  endif
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
 .endif
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 
 BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \
 		svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion
 
 TOOLS_TO_STRIP=	fsfs-access-map svn-mergeinfo-normalizer \
 		 svn-populate-node-origins-index svnauthz \
 		 svnauthz-validate svnconflict svndiff svndiff3 \
 		 svndiff4 svnmover svnraisetreeconflict x509-parser
 
 pre-everything::
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 
 	@${ECHO_MSG} ""
 .if ${PORT_OPTIONS:MSTATIC}
 	@${ECHO_MSG} "Static binaries will be built."
 .endif # STATIC
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
 .if ${PORT_OPTIONS:MBDB}
 	@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
 	if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6"  -a "$${BDB_VERSION}" != "18" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
 LIBS_SQLITE3!=	pkgconf --libs --static sqlite3
 LIBS+=		${LIBS_SQLITE3}
 # for work with ICU
 LIBS+=		-lc++ -lm
 .endif
 
 post-configure:
 # Enable GNOME Keyring / KWallet support in main code, as it is harmless
 	@${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h
 # ugly hack: save tools directory so we don't have to cleanup before installing
 	@${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples
 	@${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples
 
 # takes a long time, and will fail but gives maintainer a good oversight
 .if ${PORT_OPTIONS:MTEST}
 test: build
 	-@make check -C ${WRKSRC}
 .endif
 
 post-build-TOOLS-on:
 	@${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS}
 
 post-install:	${MKREPOS_TARGET}
 	for F in ${BINS_TO_STRIP} ; do \
 	 ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \
 	done
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-STATIC-off:
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 post-install-SVNSERVE_WRAPPER-on:
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
 
 post-install-TOOLS-on:
 	@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
 	for F in ${TOOLS_TO_STRIP} ; do \
 	 ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \
 	done
- 
+
 
 # ===============================================================================
 repository:	_mkrepos
 
 _SVNGRPFILES=	db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 	@if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw useradd ${SVNUSER} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 svn-build-outputs-hack:
 	(cd ${WRKSRC} && python gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
 	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 
 .include <bsd.port.post.mk>
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 7f367bd45bfc..eccaf58c6b32 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	cudatext
 PORTVERSION=	1.169.2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Cross-platform text editor, written in Lazarus
 
 LICENSE=	MPL20
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors python xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-stl fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alexey-T
 GH_PROJECT=	CudaText
 GH_TUPLE=	bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmap \
 		Alexey-T:Python-for-Lazarus:24d15bb:python4lazarus/python4lazarus \
 		Alexey-T:ATFlatControls:774028b:atflatcontrols/atflatcontrols  \
 		Alexey-T:ATSynEdit:1be6045:atsynedit/atsynedit \
 		Alexey-T:Emmet-Pascal:6143720:emmet/emmet \
 		Alexey-T:EControl:72dccb1:econtrol/econtrol \
 		Alexey-T:ATSynEdit_Ex:cde4e8b:atsyneditex/atsyneditex \
 		Alexey-T:ATSynEdit_Cmp:7ae41f8:atsyneditcmp/atsyneditcmp \
 		Alexey-T:ATBinHex-Lazarus:c63346b:atbinhex/atbinhex \
 		Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \
 		Alexey-T:EncConv:061e871:encconv/encconv
 
 DOS2UNIX_FILES=	app/settings_default/default.json setup/debfiles/cudatext.desktop
 
 LAZARUS_PROJECT_FILES=	bgrabitmap/bgrabitmap/bgrabitmappack.lpk
 LAZARUS_PROJECT_FILES+=	atflatcontrols/atflatcontrols/atflatcontrols_package.lpk
 LAZARUS_PROJECT_FILES+=	python4lazarus/python4lazarus/python4lazarus_package.lpk
 LAZARUS_PROJECT_FILES+= encconv/encconv/encconv_package.lpk
 LAZARUS_PROJECT_FILES+=	atsynedit/atsynedit/atsynedit_package.lpk
 LAZARUS_PROJECT_FILES+=	emmet/emmet/emmet_package.lpk
 LAZARUS_PROJECT_FILES+=	econtrol/econtrol/econtrol_package.lpk
 LAZARUS_PROJECT_FILES+=	atsyneditex/atsynedit_ex/atsynedit_ex_package.lpk
 LAZARUS_PROJECT_FILES+=	atsyneditcmp/atsynedit_cmp/atsynedit_cmp_package.lpk
 LAZARUS_PROJECT_FILES+=	atbinhex/atbinhex/atbinhex_package.lpk
 LAZARUS_PROJECT_FILES+= uniqueinstance/uniqueinstance/uniqueinstance_package.lpk
 LAZARUS_PROJECT_FILES+=	app/cudatext.lpi
 
 LAZBUILD_ARGS=		-d
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 #WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} 's|-512||g' ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/app/proc_globdata.pas
 	${REINPLACE_CMD} 's|TEncoding.UTF8|True|g' ${WRKSRC}/app/formmain_py_pluginwork.inc
 
-do-install:	
+do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/app/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
 	${INSTALL_DATA} ${WRKSRC}/setup/debfiles/${PORTNAME}-512.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/app && ${COPYTREE_SHARE} "data py readme settings_default" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index a38422196fe4..721180fee6ff 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -1,103 +1,103 @@
 PORTNAME=	odoo
 PORTVERSION=	15.0
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Suite of web based open source business apps
 
 LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_TAGNAME=	02b4e98ebb2c45d9a4af10fe1bc732f048708f85
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libxslt.so:textproc/libxslt \
 		libevent.so:devel/libevent \
 		libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}num2words>=0:devel/py-num2words@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}secure-cookie>0:www/py-secure-cookie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
 
 USES=		cpe python:3.5+ pgsql shebangfix
 USE_PYTHON=	distutils
 USE_OPENLDAP=	yes
 
 SHEBANG_LANG=	python
 SHEBANG_FILES=	${WRKSRC}/${PORTNAME}-bin
 
 USERS=		odoo
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 CONFLICTS=	odoo14
 
 ETCDIR=		${PREFIX}/etc/odoo
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e '25d' ${WRKSRC}/odoo/service/wsgi_server.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_quote_plus|werkzeug.urls.url_quote_plus|g' \
-		${WRKSRC}/odoo/addons/base/models/ir_ui_view.py 
+		${WRKSRC}/odoo/addons/base/models/ir_ui_view.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_unquote_plus|werkzeug.urls.url_quote_plus|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_http.py \
 		${WRKSRC}/odoo/addons/http_routing/models/ir_http.py
 	@${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \
 		${WRKSRC}/odoo/addons/mail/models/mail_thread.py \
 		${WRKSRC}/odoo/addons/hr/models/hr_employee.py
 
 post-extract:
 	@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample
 
 .include <bsd.port.mk>
diff --git a/games/libretro-handy/Makefile b/games/libretro-handy/Makefile
index 8a997a303042..cc270e136dc2 100644
--- a/games/libretro-handy/Makefile
+++ b/games/libretro-handy/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	libretro-handy
 PORTVERSION=	0.20220215
 CATEGORIES=	games
 
 MAINTAINER=	dmenelkir@gmail.com
 COMMENT=	Atari Lynx emulator Handy for Libretro
 
 LICENSE=	ZLIB
 
 USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_TAGNAME=	5145f79
 
 PLIST_FILES=	lib/libretro/handy_libretro.so
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKSRC}/handy_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
-	
+
 .include <bsd.port.mk>
diff --git a/games/libretro/Makefile b/games/libretro/Makefile
index 9fc7613a7a7b..eaec0f18a285 100644
--- a/games/libretro/Makefile
+++ b/games/libretro/Makefile
@@ -1,149 +1,149 @@
 PORTNAME=	libretro
 PORTVERSION=	0.3
 CATEGORIES=	games
 
 MAINTAINER=	dmenelkir@gmail.com
 COMMENT=	Meta-port for libretro cores
 
 USES=		metaport
 
 OPTIONS_DEFINE=		2048 BEETLE_BSNES BEETLE_GBA BEETLE_LYNX BEETLE_NGP \
 			BEETLE_PCE_FAST BEETLE_PCFX BEETLE_PSX BEETLE_SUPERGRAFX BEETLE_SATURN \
 			BEETLE_VB BEETLE_WSWAN BLUEMSX CAP32 DESMUME2015 DOSBOX EMUX \
 			FBALPHA FBNEO FCEUMM FMSX FUSE GAMBATTE GENESIS_PLUS_GX GPSP GW \
 			HANDY HATARI MAME2000 MAME2003 MAME2003_PLUS MGBA MU NESTOPIA \
 			NXENGINE O2EM OPERA PARALLELN64 PCSX_REARMED PICODRIVE PLAY \
 			PRBOOM PROSYSTEM QUICKNES SCUMMVM SNES9X SNES9X2005 SNES9X2010 \
 			STELLA2014 TGBDUAL TYRQUAKE UAE VBANEXT VECX VIRTUALJAGUAR YABAUSE
-			
+
 OPTIONS_DEFAULT=	2048 BEETLE_BSNES BEETLE_GBA BEETLE_LYNX BEETLE_NGP \
 			BEETLE_PCE_FAST BEETLE_PCFX BEETLE_PSX BEETLE_SUPERGRAFX BEETLE_SATURN \
 			BEETLE_VB BEETLE_WSWAN BLUEMSX CAP32 DESMUME2015 DOSBOX EMUX \
 			FBALPHA FBNEO FCEUMM FMSX FUSE GAMBATTE GENESIS_PLUS_GX GPSP GW \
 			HANDY HATARI MAME2000 MAME2003 MAME2003_PLUS MGBA MU NESTOPIA \
 			NXENGINE O2EM OPERA PARALLELN64 PCSX_REARMED PICODRIVE PLAY \
 			PRBOOM PROSYSTEM QUICKNES SNES9X SNES9X2005 SNES9X2010 \
 			STELLA2014 TGBDUAL TYRQUAKE UAE VBANEXT VECX VIRTUALJAGUAR YABAUSE
 
 OPTIONS_DEFAULT_aarch64=	2048 BEETLE_BSNES BEETLE_GBA BEETLE_LYNX BEETLE_NGP \
 			BEETLE_PCE_FAST BEETLE_PCFX BEETLE_PSX BEETLE_SUPERGRAFX \
 			BEETLE_VB BEETLE_WSWAN DOSBOX EMUX \
 			FBALPHA FBNEO FCEUMM FMSX FUSE GAMBATTE GENESIS_PLUS_GX GPSP GW \
 			HANDY HATARI MAME2000 MAME2003 MAME2003_PLUS MGBA MU NESTOPIA \
 			NXENGINE O2EM OPERA PCSX_REARMED PRBOOM PROSYSTEM QUICKNES \
 			SCUMMVM SNES9X SNES9X2005 SNES9X2010 STELLA2014 TGBDUAL \
 			TYRQUAKE UAE VBANEXT VECX VIRTUALJAGUAR
 
 2048_DESC=			2048 puzzle game
 BEETLE_BSNES_DESC=		Mednafen Super Nintendo
 BEETLE_GBA_DESC=		Mednafen GameBoy Advance
 BEETLE_LYNX_DESC=		Mednafen Atari Lynx
 BEETLE_NGP_DESC=		Mednafen SNK Neo Geo Pocket
 BEETLE_PCE_FAST_DESC=		Mednafen NEC PC-Engine/Turbografx-16
 BEETLE_PCFX_DESC=		Mednafen NEC PC-FX
 BEETLE_PSX_DESC=		Mednafen Sony Playstation
 BEETLE_SUPERGRAFX_DESC=		Mednafen NEC Supergrafx
 BEETLE_VB_DESC=			Mednafen Nintendo Virtual Boy
 BEETLE_WSWAN_DESC=		Mednafen Nintendo Bandai Wonderswan
 BLUEMSX_DESC=			MSX1/2/Turbo-R
 CAP32_DESC=			Caprice32 - Amstrad CPC Emulator
 DESMUME2015_DESC=		Nintendo DS
 DOSBOX_DESC=			MS-DOS
 EMUX_DESC=			Multiple 8-Bit Console (Chip-8, GameBoy, NES, Mastersystem)
 FBALPHA_DESC=			Final Burn Alpha
 FBNEO_DESC=			Final Burn Neo
 FCEUMM_DESC=			Nintendo NES/Famicon
 FMSX_DESC=			MSX Emulator
 FUSE_DESC=			Sinclair ZX-Spectrum
 GAMBATTE_DESC=			Nintendo GameBoy Color
 GENESIS_PLUS_GX_DESC=		Sega 8-bit/16-bit Consoles and peripherals
 GPSP_DESC=			Nintendo GameBoy
 GW_DESC=			Nintendo Game & Watch
 HANDY_DESC=			Atari Lynx
 HATARI_DESC=			Atari ST/STE/TT/Falcon
 MAME2000_DESC=			M.A.M.E 0.37b5
 MAME2003_DESC=			M.A.M.E 0.78
 MAME2003_PLUS_DESC=		M.A.M.E 0.78 with extra additions
 MGBA_DESC=			Nintendo Gameboy Advance
 MU_DESC=			PalmOS emulator
 NESTOPIA_DESC=			Nintendo NES/Famicon
 NXENGINE_DESC=			Cave Story game
 O2EM_DESC=			Magnavox Odyssey 2 / Philips Videopac
 OPERA_DESC=			Panasonic 3DO
 PARALLELN64_DESC=		Improved Nintendo 64
 PCSX_REARMED_DESC=		Sony Playstation
 PICODRIVE_DESC=			Sega Genesis/Megadrive with peripherals
 PLAY_DESC=			PlayStation 2 Emulator
 PRBOOM_DESC=			Doom game
 PROSYSTEM_DESC=			Atari 7800
 QUICKNES_DESC=			Nintendo NES
 SCUMMVM_DESC=			Script Creation Utility for Maniac Mansion Virtual Machine
 SNES9X_DESC=			Nintendo Super NES/Super Famicon (Trunk)
 SNES9X2005_DESC=		Nintendo Super NES/Super Famicon (1.43)
 SNES9X2010_DESC=		Nintendo Super NES/Super Famicon (1.52)
 STELLA2014_DESC=		Atari 2600
 TGBDUAL_DESC=			Nintendo GameBoy and GameBoy Color (with link support)
 TYRQUAKE_DESC=			Quake game
 UAE_DESC=			Commodore Amiga
 VBANEXT_DESC=			Nintendo GameBoy Advance
 VECX_DESC=			GCE Vectrex
 VIRTUALJAGUAR_DESC=		Atari Jaguar
 YABAUSE_DESC=			Sega Saturn Emulator
 
 2048_RUN_DEPENDS=		libretro-2048>=0:games/libretro-2048
 BEETLE_BSNES_RUN_DEPENDS=	libretro-beetle_bsnes>=0:games/libretro-beetle_bsnes
 BEETLE_GBA_RUN_DEPENDS=		libretro-beetle_gba>=0:games/libretro-beetle_gba
 BEETLE_LYNX_RUN_DEPENDS=	libretro-beetle_lynx>=0:games/libretro-beetle_lynx
 BEETLE_NGP_RUN_DEPENDS=		libretro-beetle_ngp>=0:games/libretro-beetle_ngp
 BEETLE_PCE_FAST_RUN_DEPENDS=	libretro-beetle_pce_fast>=0:games/libretro-beetle_pce_fast
 BEETLE_PCFX_RUN_DEPENDS=	libretro-beetle_pcfx>=0:games/libretro-beetle_pcfx
 BEETLE_PSX_RUN_DEPENDS=		libretro-beetle_psx>=0:games/libretro-beetle_psx
 BEETLE_SUPERGRAFX_RUN_DEPENDS=	libretro-beetle_supergrafx>=0:games/libretro-beetle_supergrafx
 BEETLE_VB_RUN_DEPENDS=		libretro-beetle_vb>=0:games/libretro-beetle_vb
 BEETLE_WSWAN_RUN_DEPENDS=	libretro-beetle_wswan>=0:games/libretro-beetle_wswan
 BLUEMSX_RUN_DEPENDS=		libretro-bluemsx>=0:games/libretro-bluemsx
 CAP32_RUN_DEPENDS=		libretro-cap32>=0:games/libretro-cap32
 DESMUME2015_RUN_DEPENDS=	libretro-desmume2015>=0:games/libretro-desmume2015
 DOSBOX_RUN_DEPENDS=		libretro-dosbox>=0:games/libretro-dosbox
 EMUX_RUN_DEPENDS=		libretro-emux>=0:games/libretro-emux
 FBALPHA_RUN_DEPENDS=		libretro-fbalpha>=0:games/libretro-fbalpha
 FBNEO_RUN_DEPENDS=		libretro-fbneo>=0:games/libretro-fbneo
 FCEUMM_RUN_DEPENDS=		libretro-fceumm>=0:games/libretro-fceumm
 FMSX_RUN_DEPENDS=		libretro-fmsx>=0:games/libretro-fmsx
 FUSE_RUN_DEPENDS=		libretro-fuse>=0:games/libretro-fuse
 GAMBATTE_RUN_DEPENDS=		libretro-gambatte>=0:games/libretro-gambatte
 GENESIS_PLUS_GX_RUN_DEPENDS=	libretro-genesis_plus_gx>=0:games/libretro-genesis_plus_gx
 GPSP_RUN_DEPENDS=		libretro-gpsp>=0:games/libretro-gpsp
 GW_RUN_DEPENDS=			libretro-gw>=0:games/libretro-gw
 HANDY_RUN_DEPENDS=		libretro-handy>=0:games/libretro-handy
 HATARI_RUN_DEPENDS=		libretro-hatari>=0:games/libretro-hatari
 MAME2000_RUN_DEPENDS=		libretro-mame2000>=0:games/libretro-mame2000
 MAME2003_RUN_DEPENDS=		libretro-mame2003>=0:games/libretro-mame2003
 MAME2003_PLUS_RUN_DEPENDS=	libretro-mame2003_plus>=0:games/libretro-mame2003_plus
 MGBA_RUN_DEPENDS=		libretro-mgba>=0:games/libretro-mgba
 MU_RUN_DEPENDS=			libretro-mu>=0:games/libretro-mu
 NESTOPIA_RUN_DEPENDS=		libretro-nestopia>=0:games/libretro-nestopia
 NXENGINE_RUN_DEPENDS=		libretro-nxengine>=0:games/libretro-nxengine
 O2EM_RUN_DEPENDS=		libretro-o2em>=0:games/libretro-o2em
 OPERA_RUN_DEPENDS=		libretro-opera>=0:games/libretro-opera
 PARALLELN64_RUN_DEPENDS=	libretro-paralleln64>=0:games/libretro-paralleln64
 PCSX_REARMED_RUN_DEPENDS=	libretro-pcsx_rearmed>=0:games/libretro-pcsx_rearmed
 PICODRIVE_RUN_DEPENDS=		libretro-picodrive>=0:games/libretro-picodrive
 PLAY_RUN_DEPENDS=		libretro-play>=0:games/libretro-play
 PRBOOM_RUN_DEPENDS=		libretro-prboom>=0:games/libretro-prboom
 PROSYSTEM_RUN_DEPENDS=		libretro-prosystem>=0:games/libretro-prosystem
 QUICKNES_RUN_DEPENDS=		libretro-quicknes>=0:games/libretro-quicknes
 SCUMMVM_RUN_DEPENDS=		libretro-scummvm>=0:games/libretro-scummvm
 SNES9X_RUN_DEPENDS=		libretro-snes9x>=0:games/libretro-snes9x
 SNES9X2005_RUN_DEPENDS=		libretro-snes9x2005>=0:games/libretro-snes9x2005
 SNES9X2010_RUN_DEPENDS=		libretro-snes9x2010>=0:games/libretro-snes9x2010
 STELLA2014_RUN_DEPENDS=		libretro-stella2014>=0:games/libretro-stella2014
 TGBDUAL_RUN_DEPENDS=		libretro-tgbdual>=0:games/libretro-tgbdual
 TYRQUAKE_RUN_DEPENDS=		libretro-tyrquake>=0:games/libretro-tyrquake
 UAE_RUN_DEPENDS=		libretro-uae>=0:games/libretro-uae
 VBANEXT_RUN_DEPENDS=		libretro-vbanext>=0:games/libretro-vbanext
 VECX_RUN_DEPENDS=		libretro-vecx>=0:games/libretro-vecx
 VIRTUALJAGUAR_RUN_DEPENDS=	libretro-virtualjaguar>=0:games/libretro-virtualjaguar
 YABAUSE_RUN_DEPENDS=		libretro-yabause>=0:games/libretro-yabause
 
 .include <bsd.port.mk>
diff --git a/games/xorgramana/Makefile b/games/xorgramana/Makefile
index cbec4ce880f1..d530ceaf491f 100644
--- a/games/xorgramana/Makefile
+++ b/games/xorgramana/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	xorgramana
 PORTVERSION=	0.0.8
 PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://www.jwm-art.net/XorGramana/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	XorGramana-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Logic word puzzle game set inside a series of mazes
 
-USES=		gl gmake sdl tar:bzip2 
+USES=		gl gmake sdl tar:bzip2
 USE_SDL=	sdl image
 USE_GL=		glu
 
 ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
 DESKTOP_ENTRIES="XorGramana" \
 		"Logic word puzzle game set inside a series of mazes" \
 		"${DATADIR}/GFX/x.png" \
 		"xorgramana" \
 		"Game;LogicGame;" \
 		false
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GFX/|${DATADIR}/&|' ${WRKSRC}/icons.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "data GFX" ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/peruse/Makefile b/graphics/peruse/Makefile
index 486c076e787f..a650d6a2860d 100644
--- a/graphics/peruse/Makefile
+++ b/graphics/peruse/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	peruse
 DISTVERSION=	1.2-502
 PORTREVISION=	1
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Comic book viewer
 
 LICENSE=	LGPL21
 
 USES=		cmake compiler:c++11-lang gl pkgconfig kde:5 qt:5 tar:xz xorg
 USE_GL=		gl
 USE_KDE=	archive attica baloo completion config coreaddons crash ecm \
 		filemetadata guiaddons i18n iconthemes jobwidgets \
 		kdeclarative kio newstuff package service solid \
-		widgetsaddons windowsystem 
+		widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui network opengl sql widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11
 
 KDE_INVENT=	8d1de5f4a7c4a6ca7444b0c55cb9aaa44a982a78
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index ec4578892875..0d38ce6e5b61 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,182 +1,182 @@
 PORTNAME=	qgis
 DISTVERSION=	3.22.10
 PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		liblazperf.so:archivers/lazperf \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-USE_PYQT=	pyqt5 qscintilla2 pysip sip 
+USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer_build qdoc_build gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools_build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
 		-DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \
 		-DWITH_INTERNAL_MDAL:BOOL=false \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \
 		WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 06dfa580e51a..a4e15927cb4e 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,178 +1,178 @@
 PORTNAME=	qgis
 DISTVERSION=	3.26.2
 PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-USE_PYQT=	pyqt5 qscintilla2 pysip sip 
+USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer_build qdoc_build gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools_build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT  WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 2f561c20a4d0..8f914b4d97b8 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,193 +1,193 @@
 PORTNAME=	rawtherapee
 PORTVERSION=	5.8
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	https://rawtherapee.com/shared/source/ \
 		LOCAL/mandree/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Powerful RAW image processing application
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	\
 		liblensfun.so:graphics/lensfun \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libexpat.so:textproc/expat2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libiptcdata.so:graphics/libiptcdata \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libsigc-2.0.so:devel/libsigc++20 \
 		libtiff.so:graphics/tiff
 
 USES=		cmake desktop-file-utils compiler:gcc-c++11-lib gnome \
 		jpeg localbase:ldflags pkgconfig tar:xz
 
 # Binutils required for LTO (base ar/nm/ld/ranlib don't work)
 USE_BINUTILS=	yes
 
 # As of 2019-09-29, this port is known to be miscompiled by clang90
 # (SIGSEGV or SIBGUS).
 # So we shall stick to a modern GCC for now,
-# XXX FIXME note that rawtherapee is somewhat sensitive 
+# XXX FIXME note that rawtherapee is somewhat sensitive
 # versus compiler details so we may need to pin GCC 9.x
 # or a version range.
 USE_GCC=	yes
 
 USE_GNOME=	gtkmm30 librsvg2
 
 _LTO_FLAGS=	-flto=${MAKE_JOBS_NUMBER}
 # gcc needs -flto=${MAKE_JOBS_NUMBER} for parallel link (fixed in GCC 10?)
 #     and does not understand -flto=thin
 #
 # llvm/clang needs -flto=thin and will automatically parallelize the link
 
 # Fix <https://bugs.freebsd.org/251041>:
 # 11.x has binutils that don't accept a --plugin option,
 # and gcc-ar9 appears to grab those, so make sure that USE_BINUTILS
 # override those in /usr/bin which usually is first in the PATH,
 # before ${LOCALBASE}/bin.
 # (For some reason, poudriere does not trigger this.)
 BINARY_ALIAS+=	ar=${AR} ranlib=${RANLIB}
 #
 _AR=		${CC:S/gcc/gcc-ar/}
 _RANLIB=	${CC:S/gcc/gcc-ranlib/}
 CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
 		-DCREDITSDIR="${DOCSDIR}" \
 		-DLICENCEDIR="${DOCSDIR}" \
 		-DDESKTOPDIR="${DESKTOPDIR}" \
 		-DDATADIR="${DATADIR}" \
 		-DCACHE_NAME_SUFFIX="" \
 		-Wno-dev \
 		-DCMAKE_AR:FILEPATH=${_AR} \
 		-DCMAKE_RANLIB:FILEPATH=${_RANLIB} \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
 # any more. The CMP0056 policy must be explicitly set to NEW to ensure
 # linker flags are passed. Else -lomp is not found with clang.
 # See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html
 CFLAGS+=	-I${LOCALBASE}/include -fPIC ${_LTO_FLAGS} ${_OPT_FLAGS}
 LDFLAGS+=	-Wl,--as-needed -lpthread ${_LTO_FLAGS} ${_OPT_FLAGS}
 
 .if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*) && (${ARCH} == i386 || ${ARCH} == amd64 || ${ARCH} == aarch64)
 # this gets translated to -mtune=generic, see ${WRKSRC}/ProcessorTargets.cmake
 # and as of GCC 8.3, it appears that among FreeBSD's supported architectures,
 # only the three listed above support this GCC option.
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
 .endif
 
 # XXX FIXME - check this every few months, cmake might be fixed one day
 .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE)
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN}
 .endif
 
 OPTIONS_DEFINE=		DOCS NATIVE
 OPTIONS_DEFINE_amd64=	OPENMP
 OPTIONS_DEFINE_i386=	OPENMP
 OPTIONS_DEFAULT=	OPENMP
 NATIVE_DESC=		Use -march=native (avoid for generic packages!)
 OPENMP_DESC=		Enable OpenMP parallel processing (i386/amd64 only)
 
 OPENMP_CMAKE_BOOL=	OPTION_OMP
 
 .include <bsd.port.options.mk>
 
 # -------------------------------------------------------------------
 
 .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1400000)
 # don't waste everybody's time with Tier-2 and moving targets.
 # might add ARM64 later on if they are established by the
 # time FreeBSD 13 is out.
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=only amd64 is supported on non-released FreeBSD versions
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="2"
 .endif
 
 .if !empty(PORT_OPTIONS:MOPENMP) && !empty(OPTIONS_DEFINE:MOPENMP)
 OPENMP_FLAGS=	-lm -lomp
 LDFLAGS+=	${OPENMP_FLAGS}
 .endif
 
 .if defined(WITH_DEBUG)
 STRIP=
 CMAKE_BUILD_TYPE=	None	# Arch Linux packaging trick to avoid cmake overriding our flags
 _OPT_FLAGS=	-ggdb3 -Og	# -Og is GCC-specific, use -O1 for clang
 .else
 _OPT_FLAGS=	-O3 -funroll-loops
 .endif
 
 # x86_64/amd64 includes -msse2 by default
 .if ${ARCH} == i386
 # and SSE2 has been around since the year 2003 latest
 _OPT_FLAGS+=	-msse2
 .endif
 
 # workaround for values passed on the stack that cause SIGBUS on SSE2
 .if ${ARCH} == i386
 _OPT_FLAGS+=	-mstackrealign
 .endif
 
 # -------------------------------------------------------------------
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
 		${WRKSRC}/CMakeLists.txt
 
 TESTIMAGES=	${FILESDIR}/../testimages
 
 # paranoia: run rawtherapee to be sure it finds all its
 # shared libraries (this hinges on proper RPATH setting and propagation)
 #
 # _check_version strips stuffixes from distnames etc. that do not appear
 # in the program's version numbering
 _check_version=	${PKGVERSION:C/.g0//}
 _env=		LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME="$$TMP" RT_SETTINGS=${WRKDIR}/rt-config RT_CACHE="$$TMP/rtcache"
 post-install:
 	@${RM} -f ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect
 	@(set -e; _mp=$$(/bin/df -P ${STAGEDIR}${PREFIX}/bin/rawtherapee | ${AWK} 'NR==2{print $$NF}') ; \
 	_fsflags=$$(${MOUNT} -p | ${AWK} "{ if (\$$2 == \"$$_mp\") { print \$$4 } }") ; \
 	case $$_fsflags in *noexec*) \
 		${TOUCH} ${WRKDIR}/selftest.expect ${WRKDIR}/selftest.exitcodes ; \
 		${ECHO_CMD} "===> Skipping smoke tests, STAGEDIR=${STAGEDIR} is on a noexec file system" ; \
 		exit 0 ;; \
 	esac ; \
 	${ECHO_MSG} "===> Running smoke tests" ; \
 	${RM} -rf ${WRKDIR}/rt-config ; \
 	${MKDIR} ${WRKDIR}/rt-config ${WRKDIR}/rt-config/dcpprofiles ${WRKDIR}/rt-config/profiles ; \
 	${CP} ${WRKSRC}/rtengine/camconst.json ${WRKDIR}/rt-config ; \
 	${CP} ${WRKSRC}/rtdata/options/options.lin ${WRKDIR}/rt-config/options ; \
 	(cd ${WRKSRC}/rtdata/ && ${COPYTREE_SHARE} "profiles dcpprofiles" ${WRKDIR}/rt-config ) ; \
 	(set -x ; TMP=$$(${MKTEMP} -d -t ${PORTNAME}) && trap "rc=$$? ; ${RM} -rf \"$$TMP\" ; exit \$$rc" 0 && \
 		( set +e ; ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee -v ; \
 		    echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}|cannot open display:" && \
 		( set +e ; ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli ; \
 		    echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}" && \
 		expect=$$'0\n0\n' && \
 		onefile=$$(ls "${TESTIMAGES}"/* | head -1) && \
 		if test -d "${TESTIMAGES}" && test -n "$$onefile" -a -r "$$onefile" ; then \
 		  expect=$$'0\n0\n0\n0\n0\n' && \
 		  ( set +e ; \
 		  /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \
 			-o "$$TMP" -q -f -c ${TESTIMAGES} ; echo $$? >&3 ; \
 		  /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \
 			-o "$$TMP" -q -s -Y -c ${TESTIMAGES} ; echo $$? >&3 ; \
 		  /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \
 			-o "$$TMP" -q -s -Y -tz -c ${TESTIMAGES} ; echo $$? >&3 ) 3>&3 ; \
 		fi ; \
 		ls -Rlbai "${TESTIMAGES}" "$${TMP}" || :; \
 	${PRINTF} "%s" "$$expect" >&4 ) ) 3>${WRKDIR}/selftest.exitcodes 4>${WRKDIR}/selftest.expect  ; \
 	${HEAD} ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect ; \
 	cmp ${WRKDIR}/selftest.expect ${WRKDIR}/selftest.exitcodes \
 	|| { ${ECHO_CMD} '===> !!! SELF-TEST FAILED !!! <===' ; exit 1 ; }
 
 .include <bsd.port.post.mk>
diff --git a/lang/kf5-kross/Makefile b/lang/kf5-kross/Makefile
index e57ead292ceb..08bef6c07041 100644
--- a/lang/kf5-kross/Makefile
+++ b/lang/kf5-kross/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	kross
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	lang kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 multi-language application scripting
 
 USES=		cmake compiler:c++11-lib gettext gl kde:5 qt:5 tar:xz xorg
 USE_GL=		gl
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons i18n iconthemes itemviews \
 		jobwidgets kio parts service solid sonnet textwidgets \
 		widgetsaddons windowsystem xmlgui \
-		doctools_build ecm_build 
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network script uiplugin \
 		uitools widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/lang/lfe/Makefile b/lang/lfe/Makefile
index 8c17ba4b5fae..0f36f0349cc8 100644
--- a/lang/lfe/Makefile
+++ b/lang/lfe/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	lfe
 PORTVERSION=	1.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Lisp Flavored Erlang
 
 LICENSE=	APACHE20
 
 USES=		erlang gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvirding
 ALL_TARGET=	compile
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	cd ${BUILD_WRKSRC} && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/bin
 .for FILE in lfe lfec lfedoc lfescript
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${FILE} ${STAGEDIR}${ERL_APP_ROOT}/bin
 	${LN} -sf ${ERL_APP_ROOT:S,^${PREFIX}/,,:S,^,../,}/bin/${FILE} \
 	    ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for FILE in lfe.1 lfescript.1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/${FILE} \
-		${STAGEDIR}${MAN1PREFIX}/man/man1             
+		${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 .for FILE in lfe_lib.3 lfe_doc.3 lfe_clj.3 lfe_cl.3 lfe_gen.3 \
 	lfe_io.3 lfe_macro.3 lfe_comp.3 lfe_bits.3
 	${INSTALL_MAN} ${WRKSRC}/doc/man/${FILE} \
 		${STAGEDIR}${MAN1PREFIX}/man/man3
 .endfor
 .for FILE in lfe_guide.7 lfe_types.7
 	${INSTALL_MAN} ${WRKSRC}/doc/man/${FILE} \
 		${STAGEDIR}${MAN1PREFIX}/man/man7
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 8021649694c9..1ecf728a7de0 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	squeak
 PORTVERSION=	4.10.2
 PORTREVISION=	11
 CATEGORIES=	lang
 MASTER_SITES=	http://www.squeakvm.org/unix/release/:vmsrc \
 		http://ftp.squeak.org/${IMAGE_VERSION}/:src \
 		ftp://squeak.org/${IMAGE_VERSION}/:sqsrc \
 		http://squeak.610t.org/patches/:mainsrc
 DISTFILES=	Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:vmsrc \
 		Squeak${IMAGE_FULL_VERSION}.zip:src \
 		${SQUEAK_SRC}.zip:sqsrc
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	Squeak-${VM_VERSION}-src${EXTRACT_SUFX}
 
 MAINTAINER=	takeshi.mutoh@gmail.com
 COMMENT=	Full Smalltalk 80 with portability to Unix, Mac, and Windows
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=		aarch64 amd64 i386 powerpc powerpc64 powerpc64le powerpcspe
 
 BUILD_DEPENDS=	cmake:devel/cmake \
 		v4l_compat>=1.0.20120501:multimedia/v4l_compat
 LIB_DEPENDS=	libaudio.so:audio/nas \
 		libdbus-1.so:devel/dbus \
 		libffi.so:devel/libffi \
 		libfreetype.so:print/freetype2 \
 		libasound.so:audio/alsa-lib \
 		libpulse-simple.so:audio/pulseaudio \
 		libv4l2.so:multimedia/libv4l
 
 USES=		gl gnome iconv pkgconfig xorg
 USE_GL=		gl
 USE_GNOME=	cairo pango
-USE_XORG=	ice sm x11 xext xrender 
+USE_XORG=	ice sm x11 xext xrender
 
 VM_VERSION=	${PORTVERSION}.${SVN_VERSION}
 SVN_VERSION=	2614
 IMAGE_VERSION=	4.6
 IMAGE_SVN_VERSION=	15102
 IMAGE_FULL_VERSION=	${IMAGE_VERSION}-${IMAGE_SVN_VERSION}
 SQUEAK_SRC=	SqueakV46.sources
 SQUEAK_LIB_DIR=	${PORTVERSION}-${SVN_VERSION}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	unix/cmake/configure
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 CONFIGURE_OUTSOURCE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} \
 		IMAGE_FULL_VERSION=${IMAGE_FULL_VERSION}
 
 WRKSRC=		${WRKDIR}/Squeak-${VM_VERSION}-src
 
 PLIST_SUB=	SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} \
 		IMAGE_FULL_VERSION=${IMAGE_FULL_VERSION}
 
 IMAGES=		Squeak${IMAGE_FULL_VERSION}.image \
 		Squeak${IMAGE_FULL_VERSION}.changes \
 		${SQUEAK_SRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,<utmp\.h>,<utmpx.h>,' \
 		${WRKSRC}/unix/plugins/PseudoTTYPlugin/openpty.h
 	@${REINPLACE_CMD} -e 's,return;,return 0;,' \
 		${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c \
 		${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c
 	@${REINPLACE_CMD} -e 's,return;,return 1;,' \
 		${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/so.* \
 		${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/squeakvm \
 		${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/ckformat
 	${UNZIP_NATIVE_CMD} -u ${_DISTDIR}/${SQUEAK_SRC}.zip -d ${WRKDIR}
 	${UNZIP_NATIVE_CMD} -u ${_DISTDIR}/Squeak${IMAGE_FULL_VERSION}.zip \
 		-d ${WRKDIR}
 	${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/,} \
 		${STAGEDIR}${PREFIX}/lib/squeak
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-litehtml_viewer/Makefile b/mail/claws-mail-litehtml_viewer/Makefile
index c9cefd3af0df..c81814e893cd 100644
--- a/mail/claws-mail-litehtml_viewer/Makefile
+++ b/mail/claws-mail-litehtml_viewer/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	litehtml_viewer
 
 COMMENT=	Viewer plugin for HTML emails, using the litehtml library
 
 USES+=		compiler:c++11-lang gnome
-USE_GNOME=	cairo glib20 
+USE_GNOME=	cairo glib20
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgumbo.so:devel/gumbo \
 		libcurl.so:ftp/curl
 
 CLAWS_PLUGINS_BUILD=	${PORTNAME}
 
 post-configure:
 	@${RM} ${WRKSRC}/version
 
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index bfa7146eeaf6..6a8bb08d8828 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	mu
 PORTVERSION=	1.6.10
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libgmime-3.0.so:mail/gmime30 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libjson-glib-1.0.so:devel/json-glib
- 
+
 USES=		autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
 		libtool makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk --disable-mu4e
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS GUILE
 OPTIONS_SUB=		yes
 
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
 
 post-install:
 	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
 	    ${STAGEDIR}${PREFIX}/bin
 
 post-install-GUILE-on:
 	${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
 	    ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/math/dune-grid/Makefile b/math/dune-grid/Makefile
index 5e5f7b923644..9e2231cfeb40 100644
--- a/math/dune-grid/Makefile
+++ b/math/dune-grid/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	dune-grid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
 PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Geometry transformations, reference elements, etc
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	alberta-fem>0:math/alberta \
 		openmpi>0:net/openmpi \
 		psurface>0:math/psurface \
-		vc>0:devel/vc 
+		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libduneuggrid.so:math/dune-uggrid \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	alberta-fem>0:math/alberta # binaries aren't linked with alberta, instead users' binaries are linked with it
 RUN_DEPENDS+=	psurface>0:math/psurface
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig python:build
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_COMMIT=	de36e4b4e99da4cd7a120a39779345e701821115
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/jts/Makefile b/math/jts/Makefile
index b93eeae5c295..93c58e9cd6e0 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	jts
 DISTVERSION=	1.18.1
 DISTVERSIONPREFIX=	jts-
 CATEGORIES=	math databases java
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	JTS Topology Suite
 
 LICENSE=	EPL
 #LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	mvn:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	locationtech
 
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 NO_ARCH=	yes
 
 VER=		${PORTVERSION:tl}
 JARFILES=	core/target/jts-core app/target/jts-app io/common/target/jts-io-common lab/target/jts-lab
 JARDOCFILES=	io/common/target/jts-io-common core/target/jts-core lab/target/jts-lab
 PLIST_SUB=	VERSION=${VER}
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps using: make pushToGH
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 pre-build:
 	mkdir -p ${WRKDIR}/.m2
 	cd ${WRKDIR}/.m2 && rm -Rf .git
 	cd ${WRKDIR}/.m2 && git init
 	cd ${WRKDIR}/.m2 && git remote add origin git@github.com:mfechner/freebsd-math-jts-deps.git
 	cd ${WRKDIR}/.m2 && git fetch
 	cd ${WRKDIR}/.m2 && rm -Rf repository
 	cd ${WRKDIR}/.m2 && git checkout master
 	cd ${WRKDIR}/.m2 && rm -Rf repository
-	
+
 post-build:
 	@${ECHO} "(!!!) Please upload the maven repo using: make pushToGH"
 .else
 GH_TUPLE=	mfechner:freebsd-math-jts-deps:${VER}:m2
 MASTER_SITES+=  LOCAL/mfechner/:maven
 MVN_ARGS=	--offline
 
 # Move the download deps to correct destination
 post-patch:
 	@${MV} ${WRKDIR}/freebsd-math-jts-deps-${VER} ${WRKDIR}/.m2
 .endif
 
 #-Dmaven.repo.local=${WRKDIR}/freebsd-math-jts-deps-${VER}/
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae clean install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR}
 
 do-install:
 .for jar in ${JARFILES}
 	@${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}.jar	\
 		${STAGEDIR}${JAVALIBDIR}/
 .endfor
 	${RLN} ${STAGEDIR}${JAVALIBDIR}/jts-core-${VER}.jar ${STAGEDIR}${JAVALIBDIR}/jts-core.jar
 
 do-install-DOCS-on:
 .for jar in ${JARDOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}-javadoc.jar	\
 		${STAGEDIR}${JAVALIBDIR}/
 .endfor
 
 # Make sure you build the port before (not in poudriere, make build) with DEV_UPDATE_MODE=yes
 # before you execute this target
 pushToGH:
 	@cd ${WRKDIR}/.m2
 	cd ${WRKDIR}/.m2 && git add .
 	cd ${WRKDIR}/.m2 && git status
 	cd ${WRKDIR}/.m2 && git commit -m "Update deps for version ${VER}."
 	read -p "Continue to push new version ${VER} to GH" dummy
 	cd ${WRKDIR}/.m2 && git push -u origin master
 	cd ${WRKDIR}/.m2 && git tag -f ${VER}
 	cd ${WRKDIR}/.m2 && git push --tags -f
 
 .include <bsd.port.mk>
diff --git a/math/py-fenics-ufl/Makefile b/math/py-fenics-ufl/Makefile
index 0477d35f7ac1..d25f07ddfc65 100644
--- a/math/py-fenics-ufl/Makefile
+++ b/math/py-fenics-ufl/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	fenics-ufl
 DISTVERSION=	2022.2.0
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	FEniCS Unified Form Language 
+COMMENT=	FEniCS Unified Form Language
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		localbase python
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FEniCS
 GH_PROJECT=	ufl
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/kf5-kmediaplayer/Makefile b/multimedia/kf5-kmediaplayer/Makefile
index d5a0d6ee573c..999273298ec3 100644
--- a/multimedia/kf5-kmediaplayer/Makefile
+++ b/multimedia/kf5-kmediaplayer/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	kmediaplayer
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	multimedia kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 plugin interface for media player features
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
 		i18n jobwidgets kio parts service solid sonnet textwidgets \
 		widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_QT=		concurrent core dbus gui network widgets xml \
-		buildtools_build qmake_build testlib_build 
+		buildtools_build qmake_build testlib_build
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/multimedia/lebiniou-data/Makefile b/multimedia/lebiniou-data/Makefile
index ebba198c3cde..fc1290988d96 100644
--- a/multimedia/lebiniou-data/Makefile
+++ b/multimedia/lebiniou-data/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	lebiniou-data
 DISTVERSION=	3.66.0
-CATEGORIES=	multimedia graphics 
+CATEGORIES=	multimedia graphics
 
 MAINTAINER=	olivier@biniou.info
 COMMENT=	Data for lebiniou
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf
 
 USE_GITLAB=	YES
 GL_ACCOUNT=	lebiniou
 GL_COMMIT=	18949ea967b3616d251ea7eeac7f2409991a9030
 
 GNU_CONFIGURE=	YES
 
 .include <bsd.port.mk>
diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile
index c0987d08eee1..f3988254f55f 100644
--- a/net-im/jicofo/Makefile
+++ b/net-im/jicofo/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	jicofo
 DISTVERSION=	1.0-877
 CATEGORIES=	net-im java
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Server side focus component used in Jitsi Meet conferences
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jitsi
 GH_TAGNAME=	d8cca3d
 USE_JAVA=	yes
 JAVA_VERSION=	11
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
 SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/jicofo
 
 USERS=		${PORTNAME} jitsi
 GROUPS=		${USERS}
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/:maven \
 		LOCAL/grembo/:maven
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} JAVA_VERSION=${JAVA_VERSION} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	cd ${WRKSRC}/lib \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
 
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-1.1-SNAPSHOT-jar-with-dependencies.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
- 	
+
 .include <bsd.port.mk>
diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile
index 2626818d1908..70bce46cd2ec 100644
--- a/net-im/jitsi-videobridge/Makefile
+++ b/net-im/jitsi-videobridge/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	jitsi
 DISTVERSION=	2.1-681
 CATEGORIES=	net-im java
 PKGNAMESUFFIX=	-videobridge
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	WebRTC compatible video router or SFU
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	3544ed05
 USE_JAVA=	yes
 JAVA_VERSION=	11
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES+=	pkg-message
 SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/videobridge
 
 USERS=		jvb ${PORTNAME}
 GROUPS=		${USERS}
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/:maven \
 		LOCAL/grembo/:maven
 DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-PbuildFatJar -DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} JAVA_VERSION=${JAVA_VERSION} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${WRKSRC}/jvb/lib \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/sip-communicator.properties.sample \
 		${STAGEDIR}${ETCDIR}/sip-communicator.properties.sample
 	${INSTALL_DATA} ${WRKSRC}/jvb/target/${PORTNAME}${PKGNAMESUFFIX}-2.1-SNAPSHOT-jar-with-dependencies.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
- 	
+
 .include <bsd.port.mk>
diff --git a/net-im/libsignal-node/Makefile b/net-im/libsignal-node/Makefile
index 261293262727..df95ca03c8ab 100644
--- a/net-im/libsignal-node/Makefile
+++ b/net-im/libsignal-node/Makefile
@@ -1,285 +1,285 @@
 PORTNAME=	libsignal
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.2
 PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:yarn
 PKGNAMESUFFIX=	-node
 DISTFILES=	libsignal-node-${DISTVERSION}-yarn-cache.tar.gz:yarn
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Platform-agnostic APIs used by the official Signal clients and servers
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		protoc:devel/protobuf \
 		yarn:www/yarn-node16
 
 USES=		cargo gmake python:3.7+,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_TUPLE=	google:boringssl:f1c75347daa2ea81a941e953f2263e0a4d970c8d:boringssl \
 		google:boringssl:ae223d6138807a13006342edfeef32e813246b39:boringssl_fips
 
 CARGO_CRATES=	addr2line-0.17.0 \
 		adler-1.0.2 \
 		aead-0.4.3 \
 		aes-0.7.5 \
 		aes-gcm-0.9.4 \
 		aes-gcm-siv-0.10.3 \
 		aho-corasick-0.7.18 \
 		anyhow-1.0.56 \
 		arrayref-0.3.6 \
 		asn1-0.9.1 \
 		asn1_derive-0.9.1 \
 		async-trait-0.1.52 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		backtrace-0.3.64 \
 		base64-0.13.0 \
 		bincode-1.3.3 \
 		bindgen-0.60.1 \
 		bitflags-1.3.2 \
 		blake2-0.9.2 \
 		block-buffer-0.9.0 \
 		block-modes-0.8.1 \
 		block-padding-0.2.1 \
 		bstr-0.2.17 \
 		bumpalo-3.7.1 \
 		byteorder-1.4.3 \
 		bytes-1.1.0 \
 		cast-0.2.7 \
 		cc-1.0.73 \
 		cesu8-1.1.0 \
 		cexpr-0.6.0 \
 		cfg-if-1.0.0 \
 		chacha20-0.7.3 \
 		chacha20poly1305-0.8.2 \
 		chrono-0.4.19 \
 		cipher-0.3.0 \
 		clang-sys-1.3.2 \
 		clap-2.34.0 \
 		cmake-0.1.48 \
 		combine-4.6.3 \
 		cpufeatures-0.2.2 \
 		criterion-0.3.5 \
 		criterion-plot-0.4.4 \
 		crossbeam-channel-0.5.4 \
 		crossbeam-deque-0.8.1 \
 		crossbeam-epoch-0.9.8 \
 		crossbeam-utils-0.8.8 \
 		crypto-mac-0.8.0 \
 		crypto-mac-0.11.1 \
 		csv-1.1.6 \
 		csv-core-0.1.10 \
 		ctr-0.8.0 \
 		digest-0.9.0 \
 		displaydoc-0.2.3 \
 		either-1.6.1 \
 		fastrand-1.7.0 \
 		fixedbitset-0.4.1 \
 		foreign-types-0.5.0 \
 		foreign-types-macros-0.2.2 \
 		foreign-types-shared-0.3.1 \
 		futures-core-0.3.21 \
 		futures-macro-0.3.21 \
 		futures-task-0.3.21 \
 		futures-util-0.3.21 \
 		generic-array-0.14.5 \
 		getrandom-0.1.16 \
 		getrandom-0.2.5 \
 		ghash-0.4.4 \
 		gimli-0.26.1 \
 		glob-0.3.0 \
 		half-1.8.2 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.4.3 \
 		hex-literal-0.3.4 \
 		hkdf-0.11.0 \
 		hmac-0.11.0 \
 		indexmap-1.8.0 \
 		instant-0.1.12 \
 		itertools-0.10.3 \
 		itoa-0.4.8 \
 		itoa-1.0.1 \
 		jni-0.19.0 \
 		jni-sys-0.3.0 \
 		js-sys-0.3.56 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		libc-0.2.121 \
 		libloading-0.6.7 \
 		libloading-0.7.3 \
 		linkme-0.2.10 \
 		linkme-impl-0.2.10 \
 		log-0.4.14 \
 		log-panics-2.1.0 \
 		memchr-2.4.1 \
 		memoffset-0.6.5 \
 		minimal-lexical-0.2.1 \
 		miniz_oxide-0.4.4 \
 		multimap-0.8.3 \
 		neon-0.10.0 \
 		neon-build-0.10.0 \
 		neon-macros-0.10.0 \
 		neon-runtime-0.10.0 \
 		nom-7.1.1 \
 		num-integer-0.1.45 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.1 \
 		num_enum-0.5.7 \
 		num_enum_derive-0.5.7 \
 		object-0.27.1 \
 		oorandom-11.1.3 \
 		opaque-debug-0.3.0 \
 		paste-1.0.6 \
 		peeking_take_while-0.1.2 \
 		pest-2.1.3 \
 		petgraph-0.6.0 \
 		pin-project-lite-0.2.8 \
 		pin-utils-0.1.0 \
 		plotters-0.3.1 \
 		plotters-backend-0.3.2 \
 		plotters-svg-0.3.1 \
 		poly1305-0.7.2 \
 		polyval-0.5.3 \
 		ppv-lite86-0.2.16 \
 		proc-macro-crate-1.1.3 \
 		proc-macro2-1.0.29 \
 		prost-0.9.0 \
 		prost-build-0.9.0 \
 		prost-derive-0.9.0 \
 		prost-types-0.9.0 \
 		quote-1.0.10 \
 		rand-0.7.3 \
 		rand-0.8.5 \
 		rand_chacha-0.2.2 \
 		rand_chacha-0.3.1 \
 		rand_core-0.5.1 \
 		rand_core-0.6.3 \
 		rand_hc-0.2.0 \
 		rayon-1.5.1 \
 		rayon-core-1.9.1 \
 		redox_syscall-0.2.11 \
 		regex-1.5.5 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.25 \
 		remove_dir_all-0.5.3 \
 		rustc-demangle-0.1.21 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.3.3 \
 		rustc_version-0.4.0 \
 		ryu-1.0.9 \
 		same-file-1.0.6 \
 		scopeguard-1.1.0 \
 		semver-0.9.0 \
 		semver-0.11.0 \
 		semver-1.0.6 \
 		semver-parser-0.7.0 \
 		semver-parser-0.10.2 \
 		serde-1.0.136 \
 		serde_cbor-0.11.2 \
 		serde_derive-1.0.136 \
 		serde_json-1.0.79 \
 		sha-1-0.9.8 \
 		sha2-0.9.9 \
 		shlex-1.1.0 \
 		slab-0.4.5 \
 		smallvec-1.8.0 \
 		snow-0.8.0 \
 		static_assertions-1.1.0 \
 		subtle-2.4.1 \
 		syn-1.0.80 \
 		syn-mid-0.5.3 \
 		synstructure-0.12.6 \
 		tempfile-3.3.0 \
 		textwrap-0.11.0 \
 		thiserror-1.0.30 \
 		thiserror-impl-1.0.30 \
 		time-0.1.44 \
 		tinytemplate-1.2.1 \
 		toml-0.5.8 \
 		typenum-1.15.0 \
 		ucd-trie-0.1.3 \
 		unicode-segmentation-1.9.0 \
 		unicode-width-0.1.9 \
 		unicode-xid-0.2.2 \
 		universal-hash-0.4.1 \
 		unzip3-1.0.0 \
 		uuid-1.1.2 \
 		variant_count-1.1.0 \
 		version_check-0.9.4 \
 		walkdir-2.3.2 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.79 \
 		wasm-bindgen-backend-0.2.79 \
 		wasm-bindgen-macro-0.2.79 \
 		wasm-bindgen-macro-support-0.2.79 \
 		wasm-bindgen-shared-0.2.79 \
 		web-sys-0.3.56 \
 		which-4.2.4 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		x25519-dalek-1.1.1 \
 		zeroize-1.3.0 \
 		zeroize_derive-1.3.2 \
 		boring,boring-sys@git+https://github.com/signalapp/boring?branch=libsignal\#e1c719c0964ba37e6935355e9bf19821b072797e \
 		curve25519-dalek@git+https://github.com/signalapp/curve25519-dalek?branch=lizard2\#4f0aa6653c51598daa0a2f53b8ba54ce0eedfbdd
 
 MAKE_ENV=	ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron18 \
 		ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
 		HOME=${WRKDIR} \
 		PYTHON=${PYTHON_CMD} \
-		XDG_CACHE_HOME=${WRKDIR}/.cache 
+		XDG_CACHE_HOME=${WRKDIR}/.cache
 
 MAKE_ENV+=	RUSTC_BOOTSTRAP=aes,polyval
 
 USE_LDCONFIG=		yes
 
 PLIST_FILES=	lib/libsignal_node.so
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/:C/powerpc64.*/ppc64/}
 RUST_ARCH=	${ARCH:S/amd64/x86_64/:S/i386/i686/}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
 EXTRA_PATCHES=	${FILESDIR}/${ARCH}-patch-node_binding.gyp
 .endif
 
 post-patch:
 	${REINPLACE_CMD} "s#python3#${PYTHON_CMD}#" \
 		${WRKSRC}/node/binding.gyp
 
 # Check hash here: https://github.com/signalapp/boring/tree/libsignal/boring-sys/deps
 post-extract:
 	${MV} ${WRKDIR}/boringssl-f1c75347daa2ea81a941e953f2263e0a4d970c8d/* ${WRKDIR}/boring-e1c719c0964ba37e6935355e9bf19821b072797e/boring-sys/deps/boringssl
 	${MV} ${WRKDIR}/boringssl-ae223d6138807a13006342edfeef32e813246b39/* ${WRKDIR}/boring-e1c719c0964ba37e6935355e9bf19821b072797e/boring-sys/deps/boringssl-fips
 
 do-build:
 	${ECHO_CMD} 'yarn-offline-mirror "../yarn-cache"' > ${WRKSRC}/.yarnrc
 	cd ${WRKSRC}/node && \
 		${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional #--offline
 	cd ${WRKSRC}/node && \
 		${SETENV} ${MAKE_ENV} yarn tsc
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/node/build/Release/obj.target/libsignal_client_freebsd_${NODE_ARCH}.node/geni/rust/${RUST_ARCH}-unknown-freebsd/release/libsignal_node.so \
 		${STAGEDIR}${PREFIX}/lib/
 
 create-caches-tarball:
 	# do some cleanup first
 	${RM} -r  ${WRKDIR}/.cache/yarn/v6/.tmp
 	${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
 
 	cd ${WRKDIR} && \
 		${TAR} czf libsignal-node-${DISTVERSION}-yarn-cache.tar.gz .cache yarn-cache
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index dcd8692f9e17..e6efddc3d002 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	irrtoolset
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	5.1.3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	rkoberman@gmail.com
 COMMENT=	Suite of routing policy tools to interact with the IRR
 
 LICENSE=	MIT GPLv2+ RIPE_NCC
 LICENSE_COMB=	multi
-LICENSE_NAME_RIPE_NCC=	RIPE NCC license	
+LICENSE_NAME_RIPE_NCC=	RIPE NCC license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS_RIPE_NCC=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		autoreconf bison gmake libtool
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 
 PLIST_FILES=	bin/rpslcheck bin/peval bin/rtconfig \
 		man/man1/rtconfig.1.gz man/man1/peval.1.gz \
 		man/man1/rpslcheck.1.gz man/man1/irrtoolset-errors.1.gz
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/resource-agents/Makefile b/net-mgmt/resource-agents/Makefile
index 857e23e589c9..cf7f2a28718e 100644
--- a/net-mgmt/resource-agents/Makefile
+++ b/net-mgmt/resource-agents/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	resource-agents
 PORTVERSION=	4.10.0
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	OCF Compliant Resource Agents
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		redis-cli:databases/redis
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake gnome pkgconfig python shebangfix
 USE_GNOME=	glib20
 USE_GITHUB=	yes
 GH_ACCOUNT=	ClusterLabs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-fatal-warnings --with-version=${PORTVERSION} \
 		PACKAGE_STRING="${PORTNAME} ${PORTVERSION}" \
 		PACKAGE_VERSION="${PORTVERSION}"
 
 CONFLICTS=	heartbeat
 
 SHEBANG_LANG=	sh
 sh_OLD_CMD=	/bin/sh
 sh_CMD=		${LOCALBASE}/bin/bash
 SHEBANG_FILES=	heartbeat/* \
 		ldirectord/ldirectord.in \
 		rgmanager/src/resources/*.sh.in \
 		rgmanager/src/resources/utils/*.pl \
 		rgmanager/src/resources/utils/*.sh \
 		tools/ocft/ocft.in \
 		tools/ocf-tester.in
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 
 post-patch:
 	${REINPLACE_CMD} 's|v=UNKNOWN|v=${PORTVERSION}|g' \
 	  ${WRKSRC}/make/git-version-gen
 	${REINPLACE_CMD} 's|/etc/cluster|${LOCALBASE}/etc/cluster|g' \
 	  ${WRKSRC}/heartbeat/sybaseASE.in \
 	  ${WRKSRC}/rgmanager/src/resources/utils/config-utils.sh.in \
 	  ${WRKSRC}/rgmanager/src/resources/ASEHAagent.sh.in
 	${REINPLACE_CMD} 's|/etc/redis|${LOCALBASE}/etc/redis|g' \
 	  ${WRKSRC}/heartbeat/redis.in
 	${REINPLACE_CMD} 's|/usr/bin/redis|${LOCALBASE}/bin/redis|g' \
-	  ${WRKSRC}/heartbeat/redis.in	
+	  ${WRKSRC}/heartbeat/redis.in
 
 post-install:
 	${RM} ${STAGEDIR}/${LOCALBASE}/resource-agents.conf
 
 .include <bsd.port.mk>
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index fbb9e4148c68..417ec4e89bad 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,328 +1,328 @@
 PORTNAME=	asterisk
 PORTVERSION=	16.28.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	16
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libjansson.so:devel/jansson
 
 USES=		bison compiler:c11 cpe gmake gnome iconv libedit localbase \
 		pkgconfig shebangfix sqlite ssl ncurses
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
 USE_GITHUB=	nodefault
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 PJSIP_VERSION=	2.12.1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--with-ilbc=internal \
 		--with-crypto=${OPENSSLBASE} \
 		--with-ssl=${OPENSSLBASE} \
 		--with-externals-cache=${DISTDIR}/${DIST_SUBDIR}
 
 CPE_VENDOR=	digium
 
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi \
 		contrib/scripts/astversion
 LDFLAGS+=	-L.
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OSVERSION=${OSVERSION} \
 		DOCSDIR=${DOCSDIR} \
 		ASTCFLAGS="${CFLAGS}" \
 		ASTLDFLAGS="${LDFLAGS}"
 MAKE_ARGS+=	NOISY_BUILD=yes \
 		ASTDATADIR=${DATADIR}
 
 CONFLICTS=		ossp-uuid
 CONFLICTS_BUILD=	linuxthreads
 CONFLICTS_INSTALL=	asterisk13 asterisk18
 
 OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
 				SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP
 OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \
 				PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \
 				VORBIS XMLDOC
 
 OPTIONS_DEFINE_i386=		DAHDI GEOLOCATION
 OPTIONS_DEFINE_amd64=		DAHDI GEOLOCATION
 OPTIONS_DEFINE_aarch64=		GEOLOCATION
 OPTIONS_DEFINE_sparc64=		DAHDI
 OPTIONS_DEFINE_powerpc=		DAHDI
 OPTIONS_DEFINE_powerpc64=	DAHDI
 OPTIONS_DEFINE_powerpc64le=	DAHDI
 
 OPTIONS_DEFAULT_i386=		DAHDI XMPP
 OPTIONS_DEFAULT_amd64=		DAHDI XMPP
 OPTIONS_DEFAULT_sparc64=	DAHDI XMPP
 OPTIONS_DEFAULT_powerpc=	DAHDI XMPP
 OPTIONS_DEFAULT_powerpc64=	DAHDI XMPP
 OPTIONS_DEFAULT_powerpc64le=	DAHDI XMPP
 
 OPTIONS_GROUP=			CODECS
 OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_GROUP+=			DATABASE
 OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL
 DATABASE_DESC=			Database Support
 
 OPTIONS_MULTI=			MENU
 OPTIONS_MULTI_MENU=		NCURSES NEWT
 MENU_DESC=			Menuselect Interface Backend
 NEWT_DESC=			Newt User Interface
 
 ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.5.tar.gz
 ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
 G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
 				${ASTERISK_MOH_G729_SOUNDS}:g729
 
 ASTVERSION_DESC?= Install astversion (requires bash)
 BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo
 DAHDI_DESC?=	DAHDI support
 EXCHANGE_DESC?=	Exchange calendar support
 G729_DESC?=	Install G.729 format sounds for Music-on-Hold (MoH)
 GEOLOCATION_DESC?= Enable SIP Geolocation support
 MACRO_DESC?=	Enable app_macro (deprecated)
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 OOH323_DESC?=	ooh323 support
 OPUS_DESC?=	Opus Codec
 PJSIP_DESC?=	Build the PJSIP based SIP channel
 SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
 URIPARSER_DESC?= Use RFC 3986 compliant uriparser library
 XMLDOC_DESC?=	Build and install XML documentation
 XMPP_DESC?=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
 ASTVERSION_RUN_DEPENDS=		bash:shells/bash
 
 BACKTRACE_CONFIGURE_WITH=	execinfo
 
 CURL_CONFIGURE_WITH=	libcurl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DAHDI_CONFIGURE_WITH=	dahdi openr2
 DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
 			libopenr2.so:misc/openr2 \
 			libtonezone.so:misc/dahdi
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
 EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon \
 			libexpat.so:textproc/expat2
 EXCHANGE_USES=		gettext-runtime
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
 FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 GEOLOCATION_USE=	GNOME=libxslt
 
 GSM_CONFIGURE_WITH=	gsm
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 LUA_CONFIGURE_WITH=	lua
 LUA_USES=		lua
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USES=		mysql
 
 MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
 
 NCURSES_USES=		ncurses
 NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_EXTRACT_ONLY=	${DISTFILE_opus}
 OPUS_GH_TUPLE=		traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
 PJSIP_CONFIGURE_WITH=	pjproject pjproject-bundled
 PJSIP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2 \
 			libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 PJSIP_GH_TUPLE=		pjsip:pjproject:${PJSIP_VERSION}:pjsip
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 RADIUS_CONFIGURE_WITH=	radius
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
 			libpkg.so:${PKG_ORIGIN}
 
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp \
 			libtiff.so:graphics/tiff
 
 SPEEX_CONFIGURE_WITH=	speex
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 
 SRTP_CONFIGURE_WITH=	srtp
 SRTP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2
 
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 URIPARSER_CONFIGURE_WITH=	uriparser
 URIPARSER_LIB_DEPENDS=	liburiparser.so:net/uriparser
 
 VORBIS_CONFIGURE_WITH=	ogg
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 
 XMLDOC_CONFIGURE_ENABLE=	xmldoc
 
 XMPP_CONFIGURE_WITH=	iksemel
 XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
 
 USERS=	${ASTERISK_USER}
 GROUPS=	${ASTERISK_GROUP} dahdi
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
 		ac_cv_lib_iconv_libiconv_open=no
 .endif
 
 .if ${PREFIX} == ${LOCALBASE}
 VARDIR=/var
 .else
 VARDIR=${PREFIX}/var
 .endif
 
 SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
 PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER} \
 		ASTERISK_GROUP=${ASTERISK_GROUP} \
 		VARDIR=${VARDIR}
 
 .if ${PORT_OPTIONS:MGEOLOCATION}
 .if ${ARCH} == i386
 LLD_EMULATION= elf_i386
 .elif ${ARCH} == amd64
 LLD_EMULATION= elf_x86_64
 .elif ${ARCH} == aarch64
 LLD_EMULATION= aarch64elf
 .endif
 .endif
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 post-extract-G729-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
 	${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk
 	${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs
 	${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
 	@${REINPLACE_CMD} -e 's/@XMLSTARLET@//' ${WRKSRC}/makeopts.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/main/term.c
 .if exists(${FILESDIR}/.asterisk.makeopts)
 	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
 .endif
- 
+
 post-patch-GEOLOCATION-on:
 	@${REINPLACE_CMD} -e 's/%%LLD_EMULATION%%/${LLD_EMULATION}/' ${WRKSRC}/Makefile.rules
 
 post-patch-SYSINFO-on:
 	@${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
 
 post-patch-SYSINFO-off:
 	@${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
 
 post-configure:
 	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts
- 
+
 post-configure-GEOLOCATION-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_geolocation menuselect.makeopts
 
 post-configure-GEOLOCATION-off:
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_geolocation menuselect.makeopts
 
 post-configure-MACRO-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_macro menuselect.makeopts
 
 post-configure-MYSQL-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts
 
 post-configure-OOH323-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
 
 post-configure-NEWG711-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
 
 post-configure-OPTIMIZED_CFLAGS-off:
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts
 
 post-configure-OPUS-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable codec_opus_open_source menuselect.makeopts
 
 post-install:
 	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-*
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 
 	(cd ${STAGEDIR} && \
 		${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \
 		${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \
 		${ECHO} "@owner" >> ${TMPPLIST} && \
 		${ECHO} "@group" >> ${TMPPLIST});
 
 post-install-ASTVERSION-off:
 	@${RM} ${STAGEDIR}${PREFIX}/sbin/astversion
 
 .include <bsd.port.post.mk>
diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
index a5ba18283604..7f732574f453 100644
--- a/net/ceph14/Makefile
+++ b/net/ceph14/Makefile
@@ -1,179 +1,179 @@
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	14.2.22
 PORTREVISION=	6
 CATEGORIES=	net
 PKGNAMESUFFIX=	14
 
 MAINTAINER=	wjw@digiware.nl
 COMMENT=	Ceph delivers object, block, and file storage in a unified system
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
 # even though i386 will build, it is not really advised.
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	\
 	bash:shells/bash \
 	git:devel/git \
 	gperf:devel/gperf \
 	yasm:devel/yasm \
 	${PYTHON_PKGNAMEPREFIX}sphinx>=2.1.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
 	${LOCALBASE}/bin/ld:devel/binutils
 LIB_DEPENDS=	\
 	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
 	libnss3.so:security/nss \
 	libcryptopp.so:security/cryptopp \
 	liboath.so:security/oath-toolkit \
 	libsnappy.so:archivers/snappy \
 	libcurl.so:ftp/curl \
 	libxml2.so:textproc/libxml2 \
 	libexpat.so:textproc/expat2 \
 	liblz4.so:archivers/liblz4 \
 	libplds4.so:devel/nspr \
 	libtcmalloc.so:devel/google-perftools \
 	librabbitmq.so:net/rabbitmq-c \
 	libfmt.so:devel/libfmt
 RUN_DEPENDS=	\
 	bash:shells/bash \
 	flock:sysutils/flock \
 	jq:textproc/jq \
 	smartctl:sysutils/smartmontools \
 	xml:textproc/xmlstarlet \
 	${LOCALBASE}/bin/getopt:misc/getopt \
 	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
-	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} 
+	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
 
 USES=		cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \
 		pkgconfig python:3.8-3.9 readline shebangfix ssl
 CPE_VENDOR=	linuxfoundation
 USE_PYTHON=	cython py3kplist
 USE_OPENLDAP=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	ceph:DEFAULT
 DOS2UNIX_FILES=	src/pybind/mgr/diskprediction_cloud/common/__init__.py
 
 CONFLICTS_INSTALL=	ceph
 PORTSCOUT=	limit:^v14\.
 
 GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
 GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
 GH_TUPLE+=	ceph:civetweb:bb99e93:civetweb/src/civetweb
 GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
 GH_TUPLE+=	ceph:dmclock:4496dbc:dmclock/src/dmclock
 GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
 GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
 GH_TUPLE+=	ceph:googletest:fdb8504:googletest/src/googletest
 GH_TUPLE+=	ceph:isa-l:7e1a337:isa_l/src/isa-l
 GH_TUPLE+=	ceph:lua:1fce39c:lua/src/lua
 GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
 GH_TUPLE+=	ceph:rocksdb:4c736f1:rocksdb/src/rocksdb
 GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
 GH_TUPLE+=	facebook:zstd:b706286:zstd/src/zstd
 GH_TUPLE+=	ceph:spawn:5f4742f:spawn/src/spawn
 
 OPTIONS_DEFINE=	TESTS
 OPTIONS_SUB=	yes
 
 CMAKE_BUILD_TYPE=	Release
 CMAKE_ON=	WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3
 CMAKE_OFF=	WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS WITH_LEVELDB \
 		WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \
 		WITH_RADOSGW_KAFKA_ENDPOINT WITH_LEVELDB
 CMAKE_ARGS=	-DMGR_PYTHON_VERSION=${PYTHON_VER} \
 		-DCEPH_MAN_DIR:STRING=man
 
 SHEBANG_FILES=	src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
 		src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
 		src/ceph-create-keys
 
 TESTS_DESC=	Build test/debug tools
 TESTS_CMAKE_ON=	-DWITH_TESTS:BOOL=ON
 TESTS_CMAKE_OFF=-DWITH_TESTS:BOOL=OFF
 
 USE_RC_SUBR=	ceph
 USE_LDCONFIG=	yes
 
 USERS=		ceph
 GROUPS=		ceph
 
 BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 
 # PLIST_SUB=CMAKE_BUILD_TYPE_regex="[[:<:]]debug[[:>:]]"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64
 PLIST_SUB+=	NO_AMD64="@comment "
 .else
 PLIST_SUB+=	NO_AMD64=""
 .endif
 
 pre-configure:
 	[ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} files/file-git_version ${WRKSRC}/src/.git_version
 	# Use the module finders that come with Cmake for Boost and Python
 	${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake || true
 	# Cleanup after patching
 	${RM} ${WRKSRC}/src/pybind/mgr/diskprediction_cloud/common/__init__.py.orig
 
 post-install:
 	# To install a ceph.conf sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
 	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
 	# Get logging and rotation working
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} files/file-newsyslog_ceph-log.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	# Create directories used bij daemons
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mon
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw
 	# For PID files and command sockets and log files
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}/var/run/ceph
 	# Use the Ceph init.d script as the interface to regular
 	# starting and stopping daemons. rc.d work is done thru
 	# a separate rc.d/ceph script calling init-ceph again.
 	${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph
 	# remove files not packaged
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf
 	${RMDIR} ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd
 	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
 
 .include <bsd.port.mk>
diff --git a/net/kf5-kxmlrpcclient/Makefile b/net/kf5-kxmlrpcclient/Makefile
index 120b268f4ad7..ef1292a4797b 100644
--- a/net/kf5-kxmlrpcclient/Makefile
+++ b/net/kf5-kxmlrpcclient/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	kxmlrpcclient
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	net kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 interaction with XMLRPC services
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons i18n kio service \
-		doctools_build ecm_build 
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 3ef691cebb57..bc3d2293d42e 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	scribus
 PORTVERSION=	1.5.8
 PORTREVISION=	11
 CATEGORIES=	print editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
 		http://www.scribus.net/downloads/${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Comprehensive desktop publishing program (development version)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libboost_thread.so:devel/boost-libs \
 		libhunspell-1.7.so:textproc/hunspell \
 		libcairo.so:graphics/cairo \
 		librevenge-0.0.so:textproc/librevenge \
 		libcups.so:print/cups \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libmspub-0.1.so:print/libmspub01 \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libfreetype.so:print/freetype2 \
 		libtiff.so:graphics/tiff \
 		libpoppler.so:graphics/poppler \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpodofo.so:graphics/podofo \
 		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libqxp-0.0.so:textproc/libqxp \
 		libzmf-0.0.so:graphics/libzmf
 
 USES=		cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \
 		jpeg pkgconfig python:3.6+ qt:5 shared-mime-info tar:xz
 USE_QT=		buildtools_build core declarative gui linguisttools_build \
 		network opengl printsupport qmake_build widgets xml
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 USE_GNOME=	libxml2
 
 CMAKE_ARGS+=	-DWANT_HUNSPELL=YES \
 		-DWANT_CPP17=YES \
-		-DCMAKE_COLOR_MAKEFILE:BOOL=ON 
+		-DCMAKE_COLOR_MAKEFILE:BOOL=ON
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 		${LN} -sf ../share/icons/1_5_1/scribus.png \
 			${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 1cdef7513f05..13973fc159bd 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -1,101 +1,101 @@
 PORTNAME=	luatex
 PORTVERSION=	1.12.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libmpfr.so:math/mpfr \
 		libzzip.so:devel/zziplib
 
 USES=		gnome libtool pkgconfig shebangfix tar:xz xorg
 USE_TEX=	kpathsea web2c texmf formats texlua texluajit fmtutil
 USE_XORG=	pixman
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux \
 		libs/xpdf \
 		libs/lua53 \
 		libs/luajit \
 		libs/pplib \
 		texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
 EXTRACT_FILES_TEXMF=	\
 	texmf-dist/doc/lualatex \
 	texmf-dist/doc/luatex \
 	texmf-dist/scripts/context/lua \
 	texmf-dist/source/luatex \
 	texmf-dist/source/lualatex \
 	texmf-dist/fonts/map/luatex \
 	texmf-dist/tex/luatex \
 	texmf-dist/tex/generic/config/luatex-unicode-letters.tex \
 	texmf-dist/tex/generic/config/luatexiniconfig.tex \
 	texmf-dist/tex/generic/context/luatex \
 	texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex \
 	texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
 	texmf-dist/tex/lualatex
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 EXCLUDE_ENGINES=aleph etex pdftex mf mf-nowin \
 		ptex eptex uptex euptex \
 		otangle mp pmp upmp web2c web-progs xetex tex synctex \
 		mflua mfluajit luahbtex luajithbtex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-luatex \
 		--enable-luajittex \
 		--with-system-zlib \
 		--with-system-zziplib
 .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc
 CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
 CONFIGURE_ARGS+=CC="${CC}" \
 		CXX="${CXX}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	luatex
 
 # buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	cd ${WRKSRC}/.. && \
 	    ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea
 
 pre-configure:
 	for D in libs/xpdf libs/pplib; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
 		    ${CONFIGURE_ARGS}; \
 	done
 	cd ${WRKDIR}/${DISTNAME}/libs/pplib && \
 		${MAKE}
 
 pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 	    ${EXTRACT_AFTER_ARGS_TEXMF}
 	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh
 
 post-install:
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.log" >> ${TMPPLIST}
-	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.fmt" >> ${TMPPLIST} 
+	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.fmt" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index 987e2f498fa5..6087d14b28fd 100644
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@@ -1,331 +1,331 @@
 PORTNAME=	texlive
 PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMESUFFIX=	-texmf
 DISTFILES=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, texmf Tree
 
 USES=		cpe python:run shebangfix tar:xz
 CPE_VENDOR=	tug
 USE_TEX=	base basic:extract texhash tlmgr:run
 
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - \
 			${EXCLUDE_FILES:S,^,--exclude ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}/,}
 DISABLE_SIZE=	yes # XXX bug 262056: distfile too large
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 EXCLUDE_FILES=	\*/doc/man texmf-dist/ls-R texmf-dist/bibtex/csf/base \
 		texmf-dist/doc texmf-dist/dvipdfm texmf-dist/dvipdfmx \
 		texmf-dist/dvips texmf-dist/fonts/cmap/dvipdfmx \
 		texmf-dist/fonts/cmap/uptex texmf-dist/fonts/enc/dvips \
 		texmf-dist/fonts/map/dvipdfm texmf-dist/fonts/map/dvipdfmx \
 		texmf-dist/fonts/map/dvips texmf-dist/fonts/map/luatex \
 		texmf-dist/fonts/misc/xetex \
 		texmf-dist/fonts/ofm/public/japanese-otf \
 		texmf-dist/fonts/ovp/public/japanese-otf-uptex \
 		texmf-dist/fonts/source/ptex texmf-dist/fonts/tfm/ptex \
 		texmf-dist/fonts/tfm/public/japanese-otf \
 		texmf-dist/fonts/tfm/public/japanese-otf-uptex \
 		texmf-dist/fonts/tfm/uptex texmf-dist/fonts/type1/ptex \
 		texmf-dist/fonts/vf/ptex \
 		texmf-dist/fonts/vf/public/japanese-otf \
 		texmf-dist/fonts/vf/public/japanese-otf-uptex \
 		texmf-dist/fonts/vf/uptex texmf-dist/scripts/xetex \
 		texmf-dist/source \
 		texmf-dist/tex/generic/config/luatex-unicode-letters.tex \
 		texmf-dist/tex/generic/config/luatexiniconfig.tex \
 		texmf-dist/tex/generic/context/luatex \
 		texmf-dist/tex/generic/dvips \
 		texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
 		texmf-dist/tex/generic/xetexconfig texmf-dist/tex/jadetex \
 		texmf-dist/tex/lambda texmf-dist/tex/latex/base \
 		texmf-dist/tex/latex/latexconfig/dvilualatex.ini \
 		texmf-dist/tex/latex/latexconfig/lualatex-patch-kernel.tex \
 		texmf-dist/tex/latex/latexconfig/lualatex-reset-codes.tex \
 		texmf-dist/tex/latex/latexconfig/lualatex.ini \
 		texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
 		texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex \
 		texmf-dist/tex/latex/latexconfig/xelatex.ini \
 		texmf-dist/tex/lualatex texmf-dist/tex/luatex \
 		texmf-dist/tex/plain/config/aleph.ini \
 		texmf-dist/tex/plain/config/dviluatex.ini \
 		texmf-dist/tex/plain/config/luatex.ini \
 		texmf-dist/tex/plain/config/xetex.ini texmf-dist/tex/platex \
 		texmf-dist/tex/ptex texmf-dist/tex/uplatex texmf-dist/tex/uptex \
 		texmf-dist/tex/xelatex texmf-dist/tex/xetex \
 		texmf-dist/tex/xmltex texmf-dist/web2c/fmtutil-hdr.cnf \
 		texmf-dist/tex/cslatex \
 		texmf-dist/web2c/fmtutil.cnf texmf-dist/web2c/texmf.cnf \
 		texmf-dist/web2c/updmap-hdr.cfg texmf-dist/web2c/updmap.cfg \
 		texmf-dist/xdvi texmf-dist/scripts/a2ping/a2ping.pl \
 		texmf-dist/scripts/accfonts/mkt1font \
 		texmf-dist/scripts/accfonts/vpl2ovp \
 		texmf-dist/scripts/accfonts/vpl2vpl \
 		texmf-dist/scripts/adhocfilelist/adhocfilelist.sh \
 		texmf-dist/scripts/albatross/albatross.sh \
 		texmf-dist/scripts/arara/arara.sh \
 		texmf-dist/scripts/authorindex/authorindex \
 		texmf-dist/scripts/bibexport/bibexport.sh \
 		texmf-dist/scripts/bundledoc/arlatex \
 		texmf-dist/scripts/bundledoc/bundledoc \
 		texmf-dist/scripts/cachepic/cachepic.tlu \
 		texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl \
 		texmf-dist/scripts/checkcites/checkcites.lua \
 		texmf-dist/scripts/context/perl/mptopdf.pl \
 		texmf-dist/scripts/context/stubs/unix/context \
 		texmf-dist/scripts/context/stubs/unix/contextjit \
 		texmf-dist/scripts/context/stubs/unix/luatools \
 		texmf-dist/scripts/context/stubs/unix/mtxrun \
 		texmf-dist/scripts/context/stubs/unix/mtxrunjit \
 		texmf-dist/scripts/context/stubs/unix/texexec \
 		texmf-dist/scripts/context/stubs/unix/texmfstart \
 		texmf-dist/scripts/context/lua \
 		texmf-dist/scripts/convbkmk/convbkmk.rb \
 		texmf-dist/scripts/crossrefware/bibdoiadd.pl \
 		texmf-dist/scripts/crossrefware/bibzbladd.pl \
 		texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl \
 		texmf-dist/scripts/ctanify/ctanify \
 		texmf-dist/scripts/ctanupload/ctanupload.pl \
 		texmf-dist/scripts/de-macro/de-macro \
 		texmf-dist/scripts/dosepsbin/dosepsbin.pl \
 		texmf-dist/scripts/dtxgen/dtxgen \
 		texmf-dist/scripts/dviasm/dviasm.py \
 		texmf-dist/scripts/ebong/ebong.py \
 		texmf-dist/scripts/epspdf/epspdf.tlu \
 		texmf-dist/scripts/epspdf/epspdftk.tcl \
 		texmf-dist/scripts/epstopdf/epstopdf.pl \
 		texmf-dist/scripts/exceltex/exceltex \
 		texmf-dist/scripts/fig4latex/fig4latex \
 		texmf-dist/scripts/findhyph/findhyph \
 		texmf-dist/scripts/fontools/afm2afm \
 		texmf-dist/scripts/fontools/autoinst \
 		texmf-dist/scripts/fontools/ot2kpx \
 		texmf-dist/scripts/fragmaster/fragmaster.pl \
 		texmf-dist/scripts/getmap/getmapdl.lua \
 		texmf-dist/scripts/git-latexdiff/git-latexdiff \
 		texmf-dist/scripts/glossaries/makeglossaries \
 		texmf-dist/scripts/hyperxmp/hyperxmp-add-bytecount.pl \
 		texmf-dist/scripts/installfont/installfont-tl \
 		texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh \
 		texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl \
 		texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl \
 		texmf-dist/scripts/kotex-utils/jamo-normalize.pl \
 		texmf-dist/scripts/kotex-utils/komkindex.pl \
 		texmf-dist/scripts/kotex-utils/ttf2kotexfont.pl \
 		texmf-dist/scripts/latex-git-log/latex-git-log \
 		texmf-dist/scripts/latex2man/latex2man \
 		texmf-dist/scripts/latexdiff/latexdiff-vc.pl \
 		texmf-dist/scripts/latexdiff/latexdiff.pl \
 		texmf-dist/scripts/latexdiff/latexrevise.pl \
 		texmf-dist/scripts/latexfileversion/latexfileversion \
 		texmf-dist/scripts/latexindent/latexindent.pl \
 		texmf-dist/scripts/latexmk/latexmk.pl \
 		texmf-dist/scripts/latexpand/latexpand \
 		texmf-dist/scripts/light-latex-make/llmk.lua \
 		texmf-dist/scripts/lilyglyphs/lily-glyph-commands.py \
 		texmf-dist/scripts/lilyglyphs/lily-image-commands.py \
 		texmf-dist/scripts/lilyglyphs/lily-rebuild-pdfs.py \
 		texmf-dist/scripts/listbib/listbib \
 		texmf-dist/scripts/listings-ext/listings-ext.sh \
 		texmf-dist/scripts/ltxfileinfo/ltxfileinfo \
 		texmf-dist/scripts/ltximg/ltximg.pl \
 		texmf-dist/scripts/lua2dox/lua2dox_filter \
 		texmf-dist/scripts/luaotfload/luaotfload-tool.lua \
 		texmf-dist/scripts/m-tx/m-tx.lua \
 		texmf-dist/scripts/match_parens/match_parens \
 		texmf-dist/scripts/mathspic/mathspic.pl \
 		texmf-dist/scripts/mf2pt1/mf2pt1.pl \
 		texmf-dist/scripts/mkgrkindex/mkgrkindex \
 		texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl \
 		texmf-dist/scripts/mkpic/mkpic \
 		texmf-dist/scripts/multibibliography/multibibliography.pl \
 		texmf-dist/scripts/musixtex/musixflx.lua \
 		texmf-dist/scripts/musixtex/musixtex.lua \
 		texmf-dist/scripts/attachfile2/pdfatfi.pl \
 		texmf-dist/scripts/pax/pdfannotextractor.pl \
 		texmf-dist/scripts/pdfcrop/pdfcrop.pl \
 		texmf-dist/scripts/pdfjam/pdf180 \
 		texmf-dist/scripts/pdfjam/pdf270 \
 		texmf-dist/scripts/pdfjam/pdf90 \
 		texmf-dist/scripts/pdfjam/pdfbook \
 		texmf-dist/scripts/pdfjam/pdfflip \
 		texmf-dist/scripts/pdfjam/pdfjam \
 		texmf-dist/scripts/pdfjam/pdfjam-pocketmod \
 		texmf-dist/scripts/pdfjam/pdfjam-slides3up \
 		texmf-dist/scripts/pdfjam/pdfjam-slides6up \
 		texmf-dist/scripts/pdfjam/pdfjoin \
 		texmf-dist/scripts/pdfjam/pdfnup \
 		texmf-dist/scripts/pdfjam/pdfpun \
 		texmf-dist/scripts/pedigree-perl/pedigree.pl \
 		texmf-dist/scripts/perltex/perltex.pl \
 		texmf-dist/scripts/pfarrei/a5toa4.tlu \
 		texmf-dist/scripts/pfarrei/pfarrei.tlu \
 		texmf-dist/scripts/pkfix-helper/pkfix-helper \
 		texmf-dist/scripts/pkfix/pkfix.pl \
 		texmf-dist/scripts/pmx/pmx2pdf.lua \
 		texmf-dist/scripts/pmxchords/pmxchords.lua \
 		texmf-dist/scripts/ps2eps/ps2eps.pl \
 		texmf-dist/scripts/pst-pdf/ps4pdf \
 		texmf-dist/scripts/pst2pdf/pst2pdf.pl \
 		texmf-dist/scripts/ptex2pdf/ptex2pdf.lua \
 		texmf-dist/scripts/purifyeps/purifyeps \
 		texmf-dist/scripts/pygmentex/pygmentex.py \
 		texmf-dist/scripts/pythontex/depythontex.py \
 		texmf-dist/scripts/pythontex/pythontex.py \
 		texmf-dist/scripts/rubik/rubikrotation.pl \
 		texmf-dist/scripts/simpdftex/simpdftex \
 		texmf-dist/scripts/spix/spix.py \
 		texmf-dist/scripts/splitindex/splitindex.pl \
 		texmf-dist/scripts/sty2dtx/sty2dtx.pl \
 		texmf-dist/scripts/svn-multi/svn-multi.pl \
 		texmf-dist/scripts/tex4ht/ht.sh \
 		texmf-dist/scripts/tex4ht/htcontext.sh \
 		texmf-dist/scripts/tex4ht/htlatex.sh \
 		texmf-dist/scripts/tex4ht/htmex.sh \
 		texmf-dist/scripts/tex4ht/httex.sh \
 		texmf-dist/scripts/tex4ht/httexi.sh \
 		texmf-dist/scripts/tex4ht/htxelatex.sh \
 		texmf-dist/scripts/tex4ht/htxetex.sh \
 		texmf-dist/scripts/tex4ht/mk4ht.pl \
 		texmf-dist/scripts/texcount/texcount.pl \
 		texmf-dist/scripts/texdef/texdef.pl \
 		texmf-dist/scripts/texdiff/texdiff \
 		texmf-dist/scripts/texdirflatten/texdirflatten \
 		texmf-dist/scripts/texdoc/texdoc.tlu \
 		texmf-dist/scripts/texdoctk/texdoctk.pl \
 		texmf-dist/scripts/texfot/texfot.pl \
 		texmf-dist/scripts/texlive/allcm.sh \
 		texmf-dist/scripts/texlive/allneeded.sh \
 		texmf-dist/scripts/texlive/dvi2fax.sh \
 		texmf-dist/scripts/texlive/dvired.sh \
 		texmf-dist/scripts/texlive/e2pall.pl \
 		texmf-dist/scripts/texlive/fmtutil-sys.sh \
 		texmf-dist/scripts/texlive/fmtutil.pl \
 		texmf-dist/scripts/texlive/fontinst.sh \
 		texmf-dist/scripts/texlive/kpsetool.sh \
 		texmf-dist/scripts/texlive/kpsewhere.sh \
 		texmf-dist/scripts/texlive/ps2frag.sh \
 		texmf-dist/scripts/texlive/pslatex.sh \
 		texmf-dist/scripts/texlive/rubibtex.sh \
 		texmf-dist/scripts/texlive/rumakeindex.sh \
 		texmf-dist/scripts/texlive/rungs.tlu \
 		texmf-dist/scripts/texlive/texconfig-dialog.sh \
 		texmf-dist/scripts/texlive/texconfig-sys.sh \
 		texmf-dist/scripts/texlive/texconfig.sh \
 		texmf-dist/scripts/texlive/texlinks.sh \
 		texmf-dist/scripts/texlive/tlmgr.pl \
 		texmf-dist/scripts/texlive/updmap-sys.sh \
 		texmf-dist/scripts/texlive/updmap.pl \
 		texmf-dist/scripts/texliveonfly/texliveonfly.py \
 		texmf-dist/scripts/texloganalyser/texloganalyser \
 		texmf-dist/scripts/thumbpdf/thumbpdf.pl \
 		texmf-dist/scripts/tikztosvg/tikztosvg \
 		texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh \
 		texmf-dist/scripts/ulqda/ulqda.pl \
 		texmf-dist/scripts/urlbst/urlbst texmf-dist/scripts/vpe/vpe.pl \
 		texmf-dist/scripts/yplan/yplan \
 		texmf-dist/scripts/bib2gls/bib2gls.sh \
 		texmf-dist/scripts/bib2gls/convertgls2bib.sh \
 		texmf-dist/scripts/checklistings/checklistings.sh \
 		texmf-dist/scripts/chklref/chklref.pl \
 		texmf-dist/scripts/clojure-pamphlet/pamphletangler \
 		texmf-dist/scripts/cluttex/cluttex.lua \
 		texmf-dist/scripts/crossrefware/bbl2bib.pl \
 		texmf-dist/scripts/crossrefware/bibmradd.pl \
 		texmf-dist/scripts/crossrefware/biburl2doi.pl \
 		texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl \
 		texmf-dist/scripts/ctanbib/ctanbib \
 		texmf-dist/scripts/diadia/diadia.lua \
 		texmf-dist/scripts/dviinfox/dviinfox.pl \
 		texmf-dist/scripts/glossaries/makeglossaries-lite.lua \
 		texmf-dist/scripts/jfmutil/jfmutil.pl \
 		texmf-dist/scripts/ketcindy/ketcindy.pl \
 		texmf-dist/scripts/l3build/l3build.lua \
 		texmf-dist/scripts/latex-papersize/latex-papersize.py \
 		texmf-dist/scripts/latex2nemeth/latex2nemeth \
 		texmf-dist/scripts/lwarp/lwarpmk.lua \
 		texmf-dist/scripts/make4ht/make4ht \
 		texmf-dist/scripts/makedtx/makedtx.pl \
 		texmf-dist/scripts/pdfbook2/pdfbook2 \
 		texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl \
 		texmf-dist/scripts/pdftex-quiet/pdftex-quiet \
 		texmf-dist/scripts/pdfxup/pdfxup \
 		texmf-dist/scripts/petri-nets/pn2pdf \
 		texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-sys.sh \
 		texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \
 		texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl \
 		texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl \
 		texmf-dist/scripts/srcredact/srcredact.pl \
 		texmf-dist/scripts/tex4ebook/tex4ebook \
 		texmf-dist/scripts/tex4ht/xhlatex.sh \
 		texmf-dist/scripts/texlive-extra/allcm.sh \
 		texmf-dist/scripts/texlive-extra/allneeded.sh \
 		texmf-dist/scripts/texlive-extra/dvi2fax.sh \
 		texmf-dist/scripts/texlive-extra/dvired.sh \
 		texmf-dist/scripts/texlive-extra/e2pall.pl \
 		texmf-dist/scripts/texlive-extra/fontinst.sh \
 		texmf-dist/scripts/texlive-extra/ps2frag.sh \
 		texmf-dist/scripts/texlive-extra/pslatex.sh \
 		texmf-dist/scripts/texlive-extra/rubibtex.sh \
 		texmf-dist/scripts/texlive-extra/rumakeindex.sh \
 		texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \
 		texmf-dist/scripts/texlive-extra/texconfig-sys.sh \
 		texmf-dist/scripts/texlive-extra/texconfig.sh \
 		texmf-dist/scripts/texlive-extra/texlinks.sh \
 		texmf-dist/scripts/texlive/fmtutil-user.sh \
 		texmf-dist/scripts/texlive/mktexlsr \
 		texmf-dist/scripts/texlive/mktexmf \
 		texmf-dist/scripts/texlive/mktexpk \
 		texmf-dist/scripts/texlive/mktextfm \
 		texmf-dist/scripts/texlive/updmap-user.sh \
 		texmf-dist/scripts/texosquery/texosquery-jre5.sh \
 		texmf-dist/scripts/texosquery/texosquery-jre8.sh \
 		texmf-dist/scripts/texosquery/texosquery.sh \
 		texmf-dist/scripts/texplate/texplate.sh \
 		texmf-dist/scripts/tlcockpit/tlcockpit.sh \
 		texmf-dist/scripts/tlshell/tlshell.tcl \
 		texmf-dist/scripts/webquiz/webquiz.py \
 		texmf-dist/scripts/wordcount/wordcount.sh \
 		texmf-dist/scripts/xindex/xindex.lua \
 		texmf-dist/texconfig/tcfmgr \
 		texmf-dist/texconfig/tcfmgr.map \
 
 PKG_CREATE_VERBOSE=	yes
 TEXHASHDIRS=		${TEXMFDIR} ${TEXMFDISTDIR}
 
 do-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/tex/latex/base
 	${REINPLACE_CMD} -i '' 's/\\def\\magyar@sugg@ie@low#1#2#3/\\def\\magyar@sugg@ie@low\\protect #1#2#3/' ${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/babel-hungarian/magyar.ldf
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e '1s|/bin/bash|${bash_CMD}|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/createlpsudoku \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/lpsmag \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/pgf/pgfrevisionfile.sh
 	@${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/mycv/mycv_split_contents.pl
 	@${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|; \
 		1s|/usr/bin/python|${python_CMD}|;' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/asymptote/GUI/*.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/webquiz/webquiz \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/*/*.py
 	@${REINPLACE_CMD} -i '' -E -e '/ec\.tex/d' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-la-x-liturgic.tex 
+		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-la-x-liturgic.tex
 
 
 .include <bsd.port.mk>
diff --git a/security/fizz/Makefile b/security/fizz/Makefile
index 26ab34ca5d5d..f75a736c0275 100644
--- a/security/fizz/Makefile
+++ b/security/fizz/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	fizz
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2022.09.05.00
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++14 implementation of the TLS-1.3 standard
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
-		libzstd.so:archivers/zstd			
+		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++14-lang ssl cpe
 CPE_VENDOR=	facebook
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebookincubator
 USE_LDCONFIG=	yes
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS BUILD_EXAMPLES
 
 post-install: # https://github.com/facebookincubator/fizz/issues/55
 	cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/fizz/tool/test include/fizz/util/test
 
 .include <bsd.port.mk>
diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
index e6018c0243b8..e467a9f54fd2 100644
--- a/security/fprintd/Makefile
+++ b/security/fprintd/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	fprintd
 DISTVERSIONPREFIX=	V_
 DISTVERSION=	0_8_1
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon that provides fingerprint scanning functionality over D-Bus
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DEPRECATED=	Very outdated, unsupported upstream which now have systemd as a non optional requirement
-EXPIRATION_DATE=2022-12-31 
+EXPIRATION_DATE=2022-12-31
 
 LIB_DEPENDS=	libfprint.so:security/libfprint \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		autoreconf:build gettext gmake gnome libtool pkgconfig
 USE_GNOME=	intltool glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	libfprint-${PORTNAME}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	sysconfdir="${ETCDIR}/"
 
 OPTIONS_DEFINE=	NLS PAM
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 PAM_CONFIGURE_ENABLE=	pam
 
 # Remove doc build ;  Doesn't install with/without
 # Also less deps needed
 pre-configure:
 	${REINPLACE_CMD} -e '/pushd/d ; /docize/d ; /popd/d' ${WRKSRC}/autogen.sh
 	${REINPLACE_CMD} -e '73,81d' ${WRKSRC}/doc/Makefile.am
 	${REINPLACE_CMD} -e '/DOC_CHECK/d' ${WRKSRC}/configure.ac
 	(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh)
 
 .include <bsd.port.mk>
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 9bbb4c0c70cf..cffa26e4c5c2 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	keybase
 PORTVERSION=	5.8.1
 PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 MASTER_SITES=	https://github.com/keybase/client/releases/download/v${PORTVERSION}/
 CATEGORIES=	security
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Keybase.io client and Keybase Filesystem (KBFS)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		cpe go tar:xz
 
 GO_BUILDFLAGS=	-tags production
 GO_PKGNAME=	github.com/keybase/client/go
 GO_TARGET=	${GO_PKGNAME}/keybase ${GO_PKGNAME}/kbfs/kbfsfuse ${GO_PKGNAME}/kbfs/kbfsgit/git-remote-keybase ${GO_PKGNAME}/kbfs/kbfstool
 WRKSRC=		${WRKDIR}/client-v${PORTVERSION}/go
 
-PLIST_FILES=	bin/git-remote-keybase bin/kbfsfuse bin/kbfstool bin/keybase 
+PLIST_FILES=	bin/git-remote-keybase bin/kbfsfuse bin/kbfstool bin/keybase
 
 .include <bsd.port.mk>
diff --git a/security/kf5-kdesu/Makefile b/security/kf5-kdesu/Makefile
index 67e996b16c9c..44155e49f970 100644
--- a/security/kf5-kdesu/Makefile
+++ b/security/kf5-kdesu/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	kdesu
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	security kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 integration with su for elevated privileges
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	config coreaddons dbusaddons i18n pty service \
 		ecm_build
 USE_QT=		core dbus xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xext
 
 .include <bsd.port.mk>
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 6c45dc6061af..01f4b6052c74 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	putty
 PORTVERSION=	0.77
 CATEGORIES=	security
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Secure shell and telnet client including xterm emulator
 # test plan: test ALL 4 GSSAPI_* options, GTK3 yes/no, WITH_DEBUG=yes build.
 
 LICENSE=	MIT
 LICENSE_FILE=	${PATCH_WRKSRC}/LICENCE
 
 USES=		cmake cpe perl5 pkgconfig
 USE_PERL5=	build
 
 CONFLICTS_INSTALL?=	pssh putty-nogtk
 
 PLIST_FILES=	bin/plink \
 		bin/pscp \
 		bin/psftp \
 		bin/psusan \
 		bin/puttygen \
 		share/man/man1/plink.1.gz \
 		share/man/man1/pscp.1.gz \
 		share/man/man1/psftp.1.gz \
 		share/man/man1/psusan.1.gz \
 		share/man/man1/puttygen.1.gz
 
 OPTIONS_DEFINE=			GTK3
 OPTIONS_DEFAULT=		GSSAPI_NONE GTK3
 OPTIONS_SINGLE=			GSSAPI_SELECT
 OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_MIT \
 				GSSAPI_DYNAMIC \
 				GSSAPI_NONE
 GSSAPI_DYNAMIC_DESC=	EXPERIMENTAL dynamic runtime load of GSS libs
 
 .include <bsd.port.options.mk>
 
 LDFLAGS+=	-Wl,--as-needed
 
 # XXX FIXME this is simplified on these assumptions:
 # - we only support GTK3 in FreeBSD
 #   (Putty would support EOL GTK2 and GTK1 as well)
 # - Putty 0.77 cannot have X11 without the gdk/gdkx.h header i. e. GTK.
 .if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11)
 USES+=		xorg
 USE_XORG=	x11
 USES+=		gnome
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 CMAKE_ARGS+=	-DPUTTY_GTK_VERSION:STRING=3
 
 PLIST_FILES+=	bin/pageant \
 		bin/pterm \
 		bin/putty \
 		share/man/man1/pageant.1.gz \
 		share/man/man1/pterm.1.gz \
 		share/man/man1/putty.1.gz \
 		share/pixmaps/putty.ico
 DESKTOP_ENTRIES=	"PuTTY" \
 			"${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 			"${PORTNAME}" \
 			"" \
 			false
 .else
 # XXX FIXME HACK ALERT
 # PUTTY_GTK_VERSION=OFF is not a valid choice, but manages to
 # skip all version comparisons for GTK in cmake/gtk.cmake:
 CMAKE_ARGS+=	-DPUTTY_GTK_VERSION:STRING=OFF
 # this is standard stuff:
-CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_X11:BOOL=TRUE 
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_X11:BOOL=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
 # does not compile currently
 BROKEN=		GSSAPI_HEIMDAL does not compile as of putty 0.77
 USES+=		gssapi:heimdal,flags
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_MIT}
 USES+=		gssapi:mit,flags
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_DYNAMIC}
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=DYNAMIC
 .else
-# XXX FIXME buglet in putty 0.77: PUTTY_GSSAPI=OFF 
+# XXX FIXME buglet in putty 0.77: PUTTY_GSSAPI=OFF
 # does not appear to get NO_GSSAPI into .build/CMakeFiles/cmake.h,
 # so we shove it down explicitly:
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=OFF -DNO_GSSAPI=ON
 .endif
 
 post-patch:
 	# we don't want to inherit FreeBSD commits
 	# as PUTTY Git commit revisions,
 	# so pretend we do not have Git:
 	${REINPLACE_CMD} '/FindGit/d' \
 		${WRKSRC}/cmake/setup.cmake \
 		${WRKSRC}/doc/CMakeLists.txt
 
 post-install:
 .if ${PORT_OPTIONS:MGTK3}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/windows/putty.ico \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/wazuh-manager/Makefile b/security/wazuh-manager/Makefile
index 084c93cd217e..b0656aa84f1d 100644
--- a/security/wazuh-manager/Makefile
+++ b/security/wazuh-manager/Makefile
@@ -1,312 +1,312 @@
 PORTNAME=	wazuh
 DISTVERSION=	4.3.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 MASTER_SITES=	https://packages.wazuh.com/deps/16/libraries/sources/:wazuh_sources \
 		LOCAL/acm/${PORTNAME}/:wazuh_cache
 PKGNAMESUFFIX=	-manager
 DISTFILES=	${EXTERNAL_DISTFILES} \
 		${PORTNAME}-cache-any${EXTRACT_SUFX}:wazuh_cache
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Security tool to monitor and check logs and intrusions (manager)
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm \
 		libnghttp2.so:www/libnghttp2
 
 USES=		cpe gmake perl5 python:3.9 readline shebangfix sqlite:3 uidfix
 
 ONLY_FOR_ARCHS=	amd64
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAKE_ARGS+=	TARGET=server INSTALLDIR=${WAZUHPREFIX} INSTALL_SHARED="${INSTALL_LIB}" PYTHON_SOURCE=yes
 
 WAZUH_CACHEFILE=	${PORTNAME}-cache-any${EXTRACT_SUFX}
 EXTERNAL_DISTFILES=	cJSON.tar.gz:wazuh_sources \
 			curl.tar.gz:wazuh_sources \
 			libdb.tar.gz:wazuh_sources \
 			libffi.tar.gz:wazuh_sources \
 			libyaml.tar.gz:wazuh_sources \
 			openssl.tar.gz:wazuh_sources \
 			procps.tar.gz:wazuh_sources \
 			sqlite.tar.gz:wazuh_sources \
 			zlib.tar.gz:wazuh_sources \
 			audit-userspace.tar.gz:wazuh_sources \
 			msgpack.tar.gz:wazuh_sources \
 			bzip2.tar.gz:wazuh_sources \
 			nlohmann.tar.gz:wazuh_sources \
 			googletest.tar.gz:wazuh_sources \
 			libpcre2.tar.gz:wazuh_sources \
 			libplist.tar.gz:wazuh_sources	\
 			libarchive.tar.gz:wazuh_sources \
 			popt.tar.gz:wazuh_sources \
 			cpython.tar.gz:wazuh_sources
 
 OPTIONS_DEFINE=	INOTIFY PRELUDE ZEROMQ
 OPTIONS_GROUP_DATABASE=	MYSQL PGSQL
 OPTIONS_GROUP=		DATABASE
 
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 PRELUDE_LIB_DEPENDS=	libprelude.so:security/libprelude
 ZEROMQ_LIB_DEPENDS=	libczmq.so:net/czmq
 
 INOTIFY_DESC=	Kevent based real time monitoring
 PRELUDE_DESC=	Sensor support from Prelude SIEM
 ZEROMQ_DESC=	ZeroMQ support
 
 ZEROMQ_MAKE_ENV=	USE_ZEROMQ=yes
 PRELUDE_MAKE_ENV=	USE_PRELUDE=yes
 INOTIFY_MAKE_ENV=	USE_INOTIFY=yes
 INOTIFY_USES=	pkgconfig
 PGSQL_MAKE_ARGS=DATABASE=pgsql
 PGSQL_USES=	pgsql
 MYSQL_MAKE_ARGS=DATABASE=mysql
 MYSQL_USES=	mysql
 
 WAZUH_USER=	wazuh
 WAZUH_GROUP=	wazuh
 USERS=		${WAZUH_USER}
 GROUPS=		${WAZUH_GROUP}
 
 SUB_FILES=	pkg-message
 CONFLICTS=	ossec-* wazuh-agent
 
 WZBIN_FILES=	wazuh-logcollector wazuh-syscheckd wazuh-execd  manage_agents wazuh-modulesd \
 		wazuh-agentlessd wazuh-analysisd wazuh-monitord wazuh-reportd wazuh-maild \
 		wazuh-logtest-legacy wazuh-csyslogd wazuh-dbd verify-agent-conf clear_stats \
 		wazuh-regex agent_control wazuh-integratord wazuh-db wazuh-remoted wazuh-authd
 
 WZARBIN_FILES=	default-firewall-drop pf npf ipfw firewalld-drop disable-account \
 		host-deny ip-customblock restart-wazuh route-null kaspersky wazuh-slack
 
 WZSHEBANG_FILES=fixup_pubsub_v1_keywords.py pasteurize rst2xetex.py connexion rst2man.py rst2odt.py \
 		pyrsa-priv2pub pyrsa-encrypt cygdb pyrsa-sign rstpep2html.py rst2s5.py rst2latex.py \
 		chardetect futurize cython rst2pseudoxml.py pyrsa-keygen wsdump.py rst2odt_prepstyles.py \
 		jp.py cythonize pyrsa-verify normalizer rst2html.py rst2html5.py openapi-spec-validator \
 		rst2html4.py jsonschema rst2xml.py tabulate flask pyrsa-decrypt
 
 WAZUHMOD750=	/ /logs/wazuh /logs/archives /logs/alerts /logs/firewall \
 		/logs/api /logs/cluster /bin /lib /queue /queue/agentless \
 		/queue/db /queue/diff /queue/fts /queue/logcollector \
 		/queue/syscollector /queue/syscollector/db  /ruleset \
 		/ruleset/decoders /ruleset/rules /ruleset/sca /wodles \
 		/active-response /active-response/bin /agentless /var /backup \
 		/backup/agents /backup/groups /backup/shared /queue/rids \
 		/wodles/aws /wodles/azure /wodles/docker /wodles/gcloud \
 		/wodles/gcloud/buckets /wodles/gcloud/pubsub /wodles/oscap \
 		/wodles/oscap/content /stats /integrations
-         
+
 WAZUHMOD770=	/etc/decoders /etc/lists /etc/lists/amazon /etc/rootcheck \
 		/etc/rules /etc/shared/default /logs /queue/agent-groups \
 		/queue/alerts /queue/cluster /queue/fim /queue/fim/db \
 		/queue/rids /queue/sockets /queue/tasks /etc /etc/shared \
 		/.ssh /var/db /var/download /var/db/agents /var/run /var/upgrade \
 		/var/selinux /var/wodles /var/incoming /var/multigroups  \
 
 WAZUHPREFIX=	/var/ossec
 
 WZPYTHONWHEELS=	aiohttp-3.8.1-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		cffi-1.14.4-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		cryptography-3.3.2-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		frozenlist-1.2.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		grpcio-1.38.1-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		hiredis-1.1.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		MarkupSafe-1.1.1-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		multidict-5.1.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		psutil-5.7.0-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		PyYAML-5.4.1-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		SQLAlchemy-1.3.11-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		uvloop-0.15.2-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl \
 		yarl-1.6.3-cp39-cp39-${FBSD_VERSION_BASE}_${ARCH}.whl
 
 UNAME_r=	${_OSRELEASE:tl}
 FBSD_RELEASE=	freebsd_${UNAME_r:S/./_/g:S/-/_/g}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1200500 && ${OSVERSION} < 1300000
 FBSD_VERSION_BASE=freebsd_12_3_release_p5
 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd12-${ARCH}
 DISTFILES+=	${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache
 .elif ${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000
 FBSD_VERSION_BASE=freebsd_13_1_release
 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd13-${ARCH}
 DISTFILES+=	${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache
 .elif ${OSVERSION} >= 1400000
 FBSD_VERSION_BASE=freebsd_14_0_current
 WAZUH_CACHENAME=${PORTNAME}-cache-fbsd14-${ARCH}
 DISTFILES+=	${WAZUH_CACHENAME}${EXTRACT_SUFX}:wazuh_cache
 .else
 IGNORE=		FreeBSD ${OSVERSION} is not supported
 .endif
 
 post-extract:
 .for FILE in ${EXTERNAL_DISTFILES}
 	@cd ${WRKSRC}/src/external && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${FILE:S/:wazuh_sources//} ${EXTRACT_AFTER_ARGS}
 .endfor
 	@cd ${WRKSRC}/src && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${WAZUH_CACHEFILE} ${EXTRACT_AFTER_ARGS}
 	@cd ${WRKSRC}/src && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${WAZUH_CACHENAME}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
 .	for FILE in ${WZPYTHONWHEELS}
 		@${MV} ${WRKSRC}/src/wazuh-cache-${ARCH}/${FILE} ${WRKSRC}/src/wazuh-cache-${ARCH}/${FILE:S/${FBSD_VERSION_BASE}/${FBSD_RELEASE}/}
 .	endfor
 	@${RM} ${WRKSRC}/src/external/cpython/python
 
 post-patch:
 	${REINPLACE_CMD} -e 's|HOST_NAME_MAX|_POSIX_HOST_NAME_MAX|g' ${WRKSRC}/src/wazuh_modules/wm_database.c
 	${REINPLACE_CMD} -e 's|CC=|CC?=|g' -e 's|AR=|AR?=|g' ${WRKSRC}/src/external/bzip2/Makefile
 	${REINPLACE_CMD} '115d' ${WRKSRC}/src/wazuh_modules/syscollector/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/src/external/cpython/configure
 
 do-build:
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/bin
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/lib
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/tmp
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/.ssh
 
 .for DIRE in ${WAZUHMOD750}
 	${MKDIR} -m 0750 ${STAGEDIR}${WAZUHPREFIX}${DIRE}
 .endfor
 
 .for DIRE in ${WAZUHMOD770}
 	${MKDIR} -m 0770 ${STAGEDIR}${WAZUHPREFIX}${DIRE}
 .endfor
 
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/ossec.log
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/ossec.json
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/active-responses.log
 
 .for FILE in ${WZBIN_FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${STAGEDIR}${WAZUHPREFIX}/bin
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/src/init/wazuh-server.sh ${STAGEDIR}${WAZUHPREFIX}/bin/wazuh-control
 
 	${TOUCH} ${STAGEDIR}${WAZUHPREFIX}/etc/localtime
 
 	${INSTALL_DATA} ${WRKSRC}/etc/internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/src/wazuh_modules/syscollector/norm_config.json ${STAGEDIR}${WAZUHPREFIX}/queue/syscollector
 	${INSTALL_DATA} ${WRKSRC}/etc/local_internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc/local_internal_options.conf
 
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${WAZUHPREFIX}/etc/client.keys
 
 	${INSTALL_DATA} ${WRKSRC}/etc/ossec-server.conf ${STAGEDIR}${WAZUHPREFIX}/etc/ossec.conf.sample
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/agentlessd/scripts/* ${STAGEDIR}${WAZUHPREFIX}/agentless/
 
 .for FILE in ${WZARBIN_FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/src/active-response/*.sh ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/active-response/*.py ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 
 	${INSTALL_PROGRAM} ${WRKSRC}/src/default-firewall-drop ${STAGEDIR}${WAZUHPREFIX}/active-response/bin/firewall-drop
 
 	${INSTALL_DATA} ${WRKSRC}/ruleset/rules/*.xml ${STAGEDIR}${WAZUHPREFIX}/ruleset/rules
 
 	${INSTALL_DATA} ${WRKSRC}/ruleset/decoders/*.xml ${STAGEDIR}${WAZUHPREFIX}/ruleset/decoders
 	${INSTALL_DATA} ${WRKSRC}/ruleset/rootcheck/db/*.txt ${STAGEDIR}${WAZUHPREFIX}/etc/rootcheck
 
 	${INSTALL_DATA} ${WRKSRC}/etc/local_decoder.xml ${STAGEDIR}${WAZUHPREFIX}/etc/decoders/local_decoder.xml
 	${INSTALL_DATA} ${WRKSRC}/etc/local_rules.xml ${STAGEDIR}${WAZUHPREFIX}/etc/rules/local_rules.xml
 
 	${INSTALL_DATA} ${WRKSRC}/ruleset/lists/amazon/* ${STAGEDIR}${WAZUHPREFIX}/etc/lists/amazon/
 	${INSTALL_DATA} ${WRKSRC}/ruleset/lists/audit-keys ${STAGEDIR}${WAZUHPREFIX}/etc/lists/audit-keys
 	${INSTALL_DATA} ${WRKSRC}/ruleset/lists/security-eventchannel ${STAGEDIR}${WAZUHPREFIX}/etc/lists/security-eventchannel
 
 	${INSTALL_SCRIPT} ${WRKSRC}/integrations/pagerduty ${STAGEDIR}${WAZUHPREFIX}/integrations/pagerduty
 	${INSTALL_SCRIPT} ${WRKSRC}/integrations/slack ${STAGEDIR}${WAZUHPREFIX}/integrations/slack.py
 	${INSTALL_SCRIPT} ${WRKSRC}/integrations/virustotal ${STAGEDIR}${WAZUHPREFIX}/integrations/virustotal.py
 
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/queue/vulnerabilities/dictionaries
 	${INSTALL_DATA} ${WRKSRC}/src/wazuh_modules/vulnerability_detector/cpe_helper.json ${STAGEDIR}${WAZUHPREFIX}/queue/vulnerabilities/dictionaries
 
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${WAZUHPREFIX}/queue/agents-timestamp
 	${INSTALL_DATA} ${WRKSRC}/ruleset/rootcheck/db/*.txt ${STAGEDIR}${WAZUHPREFIX}/etc/shared/default
 	${INSTALL_DATA} ${WRKSRC}/etc/agent.conf ${STAGEDIR}${WAZUHPREFIX}/etc/shared/default
 	${INSTALL_DATA} ${WRKSRC}/etc/agent.conf ${STAGEDIR}${WAZUHPREFIX}/etc/shared/agent-template.conf
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/__init__.py ${STAGEDIR}${WAZUHPREFIX}/wodles/__init__.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/utils.py ${STAGEDIR}${WAZUHPREFIX}/wodles/utils.py
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/aws/aws_s3.py ${STAGEDIR}${WAZUHPREFIX}/wodles/aws/aws-s3.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/aws/aws-s3
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/gcloud.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/gcloud.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/integration.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/integration.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/tools.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/tools.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/buckets/bucket.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/buckets/bucket.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/buckets/access_logs.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/buckets/access_logs.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/pubsub/subscriber.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/pubsub/subscriber.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/gcloud
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/docker-listener/DockerListener.py ${STAGEDIR}${WAZUHPREFIX}/wodles/docker/DockerListener.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/docker/DockerListener
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/azure/azure-logs.py ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/azure-logs.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/azure-logs
 
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/integrations/slack
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/integrations/virustotal
 
 	${FIND} ${WRKSRC}/ruleset/sca -type f -name "*.yml" -exec ${INSTALL_DATA} "{}" ${STAGEDIR}${WAZUHPREFIX}/ruleset/sca \;
 
 	${INSTALL_LIB} ${WRKSRC}/src/libwazuhext.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/libwazuhshared.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/shared_modules/dbsync/build/lib/libdbsync.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/shared_modules/rsync/build/lib/librsync.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/wazuh_modules/syscollector/build/lib/libsyscollector.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/data_provider/build/lib/libsysinfo.so ${STAGEDIR}${WAZUHPREFIX}/lib
 
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} install_python ${MAKE_ARGS}
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} install_dependencies ${MAKE_ARGS}
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} install_framework ${MAKE_ARGS}
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} install_api ${MAKE_ARGS}
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} install_mitre ${MAKE_ARGS}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} --quiet -C framework install INSTALLDIR=${STAGEDIR}${WAZUHPREFIX}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} --quiet -C api install INSTALLDIR=${STAGEDIR}${WAZUHPREFIX}
 
 	@cd ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib && \
 		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "python3.9"
 	@cd ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib && \
 		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -O -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "python3.9"
 	@cd ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib && \
 		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -OO -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "python3.9"
 
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/etc/templates
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/databases
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/src
 
 	cd ${WRKSRC}/etc/templates && ${COPYTREE_SHARE} config \
 		${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/etc/templates/
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} init \
 		${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/src/
 
 	${INSTALL_SCRIPT} ${WRKSRC}/gen_ossec.sh ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/
 	${INSTALL_SCRIPT} ${WRKSRC}/add_localfiles.sh ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/
 	${INSTALL_DATA} ${WRKSRC}/src/os_dbd/mysql.schema ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/databases
 	${INSTALL_DATA} ${WRKSRC}/src/os_dbd/postgresql.schema ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/databases
 
 post-install:
 .for FILE in ${WZSHEBANG_FILES}
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||g' ${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/${FILE}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/calamares/Makefile b/sysutils/calamares/Makefile
index 04d21ffc52e9..a437f77a471d 100644
--- a/sysutils/calamares/Makefile
+++ b/sysutils/calamares/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	calamares
 DISTVERSION=	3.2.61
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/calamares/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Distro- and desktop-independent installer
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libpwquality.so:security/libpwquality \
 		libboost_python${PYTHON_SUFFIX}.so:devel/boost-python-libs
 
 USES=		cmake compiler:c++17-lang cpe gettext kde:5 python qt:5
 USE_KDE=	coreaddons dbusaddons \
 		ecm_build
 USE_QT=		concurrent core dbus declarative gui network quickcontrols2 \
 		svg widgets xml \
 		buildtools_build qmake_build
 
 CMAKE_OFF=	INSTALL_POLKIT
-		
+
 .include <bsd.port.mk>
diff --git a/sysutils/lsyncd/Makefile b/sysutils/lsyncd/Makefile
index 71a9d6244ca7..ef1f96bd1ba2 100644
--- a/sysutils/lsyncd/Makefile
+++ b/sysutils/lsyncd/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	lsyncd
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.2.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	junichi@junichi.org
 COMMENT=	Live Syncing (Mirror) Daemon
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		cmake localbase lua
 USE_GITHUB=	yes
 GH_ACCOUNT=	axkibe
 USE_RC_SUBR=	lsyncd
 
 CFLAGS+=	-D__BSD_VISIBLE # for DT_{UNKNOWN,DIR}
 PLIST_FILES=	sbin/lsyncd \
 		man/man1/lsyncd.1.gz \
 		"@sample etc/lsyncd.conf.sample"
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/default-rsync.lua
-	
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/lsyncd.conf.sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/sysutils/mdf2iso/Makefile b/sysutils/mdf2iso/Makefile
index 7926fbf5d0bb..ed5de0f0c97b 100644
--- a/sysutils/mdf2iso/Makefile
+++ b/sysutils/mdf2iso/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	mdf2iso
 PORTVERSION=	0.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
-DISTFILES=	${PORTNAME}_${PORTVERSION}.orig.tar.gz ${PORTNAME}_${PORTVERSION}-${DEBIANVERSION}.debian.tar.xz  
+DISTFILES=	${PORTNAME}_${PORTVERSION}.orig.tar.gz ${PORTNAME}_${PORTVERSION}-${DEBIANVERSION}.debian.tar.xz
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Alcohol 120% to ISO converter
 
 LICENSE=	GPLv2+
 
 DEBIANVERSION=	2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 		${INSTALL_MAN} ${WRKDIR}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/openshift-install/Makefile b/sysutils/openshift-install/Makefile
index 0ec4dfbfc462..a4be190e59f0 100644
--- a/sysutils/openshift-install/Makefile
+++ b/sysutils/openshift-install/Makefile
@@ -1,408 +1,408 @@
 PORTNAME=	openshift-install
 PORTVERSION=	4.9
 DISTVERSIONPREFIX=	release-
 PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@freebsd.org
 COMMENT=	RedHat OpenShift installer
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${GO_WRKSRC}/LICENSE
 
 BROKEN=		unfetchable dependency openshift-cluster-api-provider-gcp
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		go:modules
 
 PLIST_FILES=	bin/${PORTNAME}
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	jhixson74	
+GH_ACCOUNT=	jhixson74
 GH_PROJECT=	installer
 GH_SUBDIR=	src/github.com/openshift/installer
 GH_TAGNAME=	6fb15ac10a00e762a9934c8b5d9f559b130dd485
 GIT_TAG=	unreleased-master-3148-g${GIT_TAGNAME}
 GH_TUPLE=	\
 		AlecAivazis:survey:v2.2.12:alecaivazis_survey_v2/vendor/github.com/AlecAivazis/survey/v2 \
 		Azure:azure-sdk-for-go:v51.2.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
 		Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \
 		Azure:go-autorest:446f41b7d65b:azure_go_autorest_validation \
 		Azure:go-autorest:55c0c4ebc34d:azure_go_autorest_cli \
 		Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \
 		Azure:go-autorest:autorest/v0.11.18:azure_go_autorest_autorest \
 		Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \
 		Azure:go-autorest:c468b8dd87c0:azure_go_autorest_auth \
 		Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \
 		Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \
 		Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
 		Azure:go-ntlmssp:2b2be6cc8ed4:azure_go_ntlmssp/vendor/github.com/Azure/go-ntlmssp \
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		ChrisTrenkamp:goxpath:c5096ec8773d:christrenkamp_goxpath/vendor/github.com/ChrisTrenkamp/goxpath \
 		IBM-Cloud:bluemix-go:cdc80c935c05:ibm_cloud_bluemix_go/vendor/github.com/IBM-Cloud/bluemix-go \
 		IBM-Cloud:power-go-client:v1.0.55:ibm_cloud_power_go_client/vendor/github.com/IBM-Cloud/power-go-client \
 		IBM:apigateway-go-sdk:a5d5d49caaca:ibm_apigateway_go_sdk/vendor/github.com/IBM/apigateway-go-sdk \
 		IBM:appconfiguration-go-admin-sdk:v0.1.0:ibm_appconfiguration_go_admin_sdk/vendor/github.com/IBM/appconfiguration-go-admin-sdk \
 		IBM:container-registry-go-sdk:v0.0.13:ibm_container_registry_go_sdk/vendor/github.com/IBM/container-registry-go-sdk \
 		IBM:go-sdk-core:v1.1.0:ibm_go_sdk_core/vendor/github.com/IBM/go-sdk-core \
 		IBM:go-sdk-core:v3.3.1:ibm_go_sdk_core_v3/vendor/github.com/IBM/go-sdk-core/v3 \
 		IBM:go-sdk-core:v4.10.0:ibm_go_sdk_core_v4 \
 		IBM:go-sdk-core:v5.4.3:ibm_go_sdk_core_v5 \
 		IBM:ibm-cos-sdk-go-config:v1.2.0:ibm_ibm_cos_sdk_go_config/vendor/github.com/IBM/ibm-cos-sdk-go-config \
 		IBM:ibm-cos-sdk-go:v1.7.0:ibm_ibm_cos_sdk_go/vendor/github.com/IBM/ibm-cos-sdk-go \
 		IBM:keyprotect-go-client:v0.7.0:ibm_keyprotect_go_client/vendor/github.com/IBM/keyprotect-go-client \
 		IBM:networking-go-sdk:v0.14.0:ibm_networking_go_sdk/vendor/github.com/IBM/networking-go-sdk \
 		IBM:platform-services-go-sdk:v0.18.16:ibm_platform_services_go_sdk/vendor/github.com/IBM/platform-services-go-sdk \
 		IBM:push-notifications-go-sdk:5790b96c47f5:ibm_push_notifications_go_sdk/vendor/github.com/IBM/push-notifications-go-sdk \
 		IBM:schematics-go-sdk:v0.0.2:ibm_schematics_go_sdk/vendor/github.com/IBM/schematics-go-sdk \
 		IBM:secrets-manager-go-sdk:v0.1.19:ibm_secrets_manager_go_sdk/vendor/github.com/IBM/secrets-manager-go-sdk \
 		IBM:vpc-go-sdk:v0.7.0:ibm_vpc_go_sdk/vendor/github.com/IBM/vpc-go-sdk \
 		MakeNowJust:heredoc:v1.0.0:makenowjust_heredoc/vendor/github.com/MakeNowJust/heredoc \
 		Netflix:go-expect:0e00d9168667:netflix_go_expect/vendor/github.com/Netflix/go-expect \
 		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
 		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
 		ScaleFT:sshkeys:6142f742bca5:scaleft_sshkeys/vendor/github.com/ScaleFT/sshkeys \
 		Shopify:sarama:v1.27.2:shopify_sarama/vendor/github.com/Shopify/sarama \
 		agext:levenshtein:v1.2.3:agext_levenshtein/vendor/github.com/agext/levenshtein \
 		antchfx:xpath:v1.1.2:antchfx_xpath/vendor/github.com/antchfx/xpath \
 		apache:openwhisk-client-go:a804fb82d105:apache_openwhisk_client_go/vendor/github.com/apache/openwhisk-client-go \
 		apparentlymart:go-cidr:v1.0.1:apparentlymart_go_cidr/vendor/github.com/apparentlymart/go-cidr \
 		apparentlymart:go-textseg:v12.0.0:apparentlymart_go_textseg_v12/vendor/github.com/apparentlymart/go-textseg/v12 \
 		armon:circbuf:5111143e8da2:armon_circbuf/vendor/github.com/armon/circbuf \
 		armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
 		asaskevich:govalidator:f21760c49a8d:asaskevich_govalidator/vendor/github.com/asaskevich/govalidator \
 		awalterschulze:gographviz:fa59802746ab:awalterschulze_gographviz/vendor/github.com/awalterschulze/gographviz \
 		aws:aws-sdk-go:v1.32.3:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beevik:etree:v1.1.0:beevik_etree/vendor/github.com/beevik/etree \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		bgentry:go-netrc:9fd32a8b3d3d:bgentry_go_netrc/vendor/github.com/bgentry/go-netrc \
 		bgentry:speakeasy:v0.1.0:bgentry_speakeasy/vendor/github.com/bgentry/speakeasy \
 		blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
 		bmatcuk:doublestar:v1.3.2:bmatcuk_doublestar/vendor/github.com/bmatcuk/doublestar \
 		btubbs:datetime:v0.1.1:btubbs_datetime/vendor/github.com/btubbs/datetime \
 		c4milo:gotoolkit:67483a18c17a:c4milo_gotoolkit/vendor/github.com/c4milo/gotoolkit \
 		census-instrumentation:opencensus-go:v0.22.5:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \
 		clarketm:json:v1.14.1:clarketm_json/vendor/github.com/clarketm/json \
 		cloudfoundry:jibber_jabber:bcc4c8345a21:cloudfoundry_jibber_jabber/vendor/github.com/cloudfoundry/jibber_jabber \
 		community-terraform-providers:terraform-provider-ignition:v2.1.0:community_terraform_providers_terraform_provider_ignition_v2/vendor/github.com/terraform-providers/terraform-provider-ignition/v2 \
 		containers:image:v3.0.2:containers_image/vendor/github.com/containers/image \
 		coreos:go-json:5ae607161559:coreos_go_json/vendor/github.com/coreos/go-json \
 		coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \
 		coreos:go-systemd:v22.0.0:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
 		coreos:ignition:v2.9.0:coreos_ignition_v2/vendor/github.com/coreos/ignition/v2 \
 		coreos:stream-metadata-go:70edb9eb47b3:coreos_stream_metadata_go/vendor/github.com/coreos/stream-metadata-go \
 		coreos:vcontext:b0e13dab675c:coreos_vcontext/vendor/github.com/coreos/vcontext \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dchest:bcrypt_pbkdf:83f37f9c154a:dchest_bcrypt_pbkdf/vendor/github.com/dchest/bcrypt_pbkdf \
 		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		dimchansky:utfbom:v1.1.1:dimchansky_utfbom/vendor/github.com/dimchansky/utfbom \
 		dmacvicar:terraform-provider-libvirt:2b60d7626ff8:dmacvicar_terraform_provider_libvirt/vendor/github.com/dmacvicar/terraform-provider-libvirt \
 		dominikh:go-tools:v0.0.1-2020.1.6:dominikh_go_tools/vendor/honnef.co/go/tools \
 		dustinkirkland:golang-petname:8e5a1ed0cff0:dustinkirkland_golang_petname/vendor/github.com/dustinkirkland/golang-petname \
 		dylanmei:iso8601:v0.1.0:dylanmei_iso8601/vendor/github.com/dylanmei/iso8601 \
 		eapache:go-resiliency:v1.2.0:eapache_go_resiliency/vendor/github.com/eapache/go-resiliency \
 		eapache:go-xerial-snappy:776d5712da21:eapache_go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \
 		eapache:queue:v1.1.0:eapache_queue/vendor/github.com/eapache/queue \
 		emicklei:go-restful:v2.14.2:emicklei_go_restful/vendor/github.com/emicklei/go-restful \
 		evanphx:json-patch:v4.9.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
 		exponent-io:jsonpath:d6023ce2651d:exponent_io_jsonpath/vendor/github.com/exponent-io/jsonpath \
 		fatih:camelcase:v1.0.0:fatih_camelcase/vendor/github.com/fatih/camelcase \
 		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
 		form3tech-oss:jwt-go:v3.2.2:form3tech_oss_jwt_go/vendor/github.com/form3tech-oss/jwt-go \
 		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		gammazero:deque:2afb3858e9c7:gammazero_deque/vendor/github.com/gammazero/deque \
 		gammazero:workerpool:88d534f22b56:gammazero_workerpool/vendor/github.com/gammazero/workerpool \
 		ghodss:yaml:25d852aebe32:ghodss_yaml/vendor/github.com/ghodss/yaml \
 		go-errors:errors:v1.0.1:go_errors_errors/vendor/github.com/go-errors/errors \
 		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
 		go-ini:ini:v1.61.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-log:log:a514cf01a3eb:go_log_log/vendor/github.com/go-log/log \
 		go-logr:logr:v0.4.0:go_logr_logr/vendor/github.com/go-logr/logr \
 		go-openapi:analysis:v0.19.5:go_openapi_analysis/vendor/github.com/go-openapi/analysis \
 		go-openapi:errors:v0.19.2:go_openapi_errors/vendor/github.com/go-openapi/errors \
 		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
 		go-openapi:jsonreference:v0.19.4:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
 		go-openapi:loads:v0.19.4:go_openapi_loads/vendor/github.com/go-openapi/loads \
 		go-openapi:runtime:v0.19.11:go_openapi_runtime/vendor/github.com/go-openapi/runtime \
 		go-openapi:spec:v0.19.4:go_openapi_spec/vendor/github.com/go-openapi/spec \
 		go-openapi:strfmt:v0.20.1:go_openapi_strfmt/vendor/github.com/go-openapi/strfmt \
 		go-openapi:swag:v0.19.9:go_openapi_swag/vendor/github.com/go-openapi/swag \
 		go-openapi:validate:v0.19.8:go_openapi_validate/vendor/github.com/go-openapi/validate \
 		go-playground:locales:v0.13.0:go_playground_locales/vendor/github.com/go-playground/locales \
 		go-playground:universal-translator:v0.17.0:go_playground_universal_translator/vendor/github.com/go-playground/universal-translator \
 		go-playground:validator:v10.2.0:go_playground_validator_v10/vendor/github.com/go-playground/validator/v10 \
 		go-playground:validator:v9.31.0:go_playground_validator/vendor/gopkg.in/go-playground/validator.v9 \
 		go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \
 		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		gobuffalo:flect:v0.2.2:gobuffalo_flect/vendor/github.com/gobuffalo/flect \
 		gofrs:uuid:v3.2.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:0c34fe9e7dc2:golang_crypto/vendor/golang.org/x/crypto \
 		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:lint:738671d3881b:golang_lint/vendor/golang.org/x/lint \
 		golang:mock:v1.4.4:golang_mock/vendor/github.com/golang/mock \
 		golang:mod:v0.4.0:golang_mod/vendor/golang.org/x/mod \
 		golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:5d25da1a8d43:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sys:a50acf3fe073:golang_sys/vendor/golang.org/x/sys \
 		golang:term:6a3ed077a48d:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
 		golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
 		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
 		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
 		gomodules:jsonpatch:v2.1.0:gomodules_jsonpatch/vendor/gomodules.xyz/jsonpatch/v2 \
 		google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \
 		google:go-cmp:v0.5.2:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:cb27e3aa2013:google_go_genproto/vendor/google.golang.org/genproto \
 		google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \
 		google:gofuzz:v1.2.0:google_gofuzz/vendor/github.com/google/gofuzz \
 		google:martian:25dcb96d9e51:google_martian/vendor/github.com/google/martian \
 		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
 		google:starlark-go:8dd3e2ee1dd5:google_starlark_go/vendor/go.starlark.net \
 		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
 		googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
 		googleapis:gnostic:v0.5.4:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
 		googleapis:google-api-go-client:v0.25.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:bigtable/v1.5.0:googleapis_google_cloud_go_bigtable \
 		googleapis:google-cloud-go:storage/v1.11.0:googleapis_google_cloud_go_storage \
 		googleapis:google-cloud-go:v0.57.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
 		gophercloud:gophercloud:v0.17.0:gophercloud_gophercloud/vendor/github.com/gophercloud/gophercloud \
 		gophercloud:utils:7b186010c04f:gophercloud_utils/vendor/github.com/gophercloud/utils \
 		gregjones:httpcache:901d90724c79:gregjones_httpcache/vendor/github.com/gregjones/httpcache \
 		grpc:grpc-go:v1.29.1:grpc_grpc_go/vendor/google.golang.org/grpc \
 		h2non:filetype:v1.0.12:h2non_filetype/vendor/github.com/h2non/filetype \
 		hashicorp:aws-sdk-go-base:v0.4.0:hashicorp_aws_sdk_go_base/vendor/github.com/hashicorp/aws-sdk-go-base \
 		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
 		hashicorp:go-azure-helpers:v0.16.5:hashicorp_go_azure_helpers/vendor/github.com/hashicorp/go-azure-helpers \
 		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
 		hashicorp:go-getter:9813cbd4eb02:hashicorp_go_getter/vendor/github.com/hashicorp/go-getter \
 		hashicorp:go-hclog:v0.14.1:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
 		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
 		hashicorp:go-plugin:v1.2.2:hashicorp_go_plugin/vendor/github.com/hashicorp/go-plugin \
 		hashicorp:go-retryablehttp:v0.6.6:hashicorp_go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \
 		hashicorp:go-safetemp:v1.0.0:hashicorp_go_safetemp/vendor/github.com/hashicorp/go-safetemp \
 		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
 		hashicorp:go-version:v1.3.0:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		hashicorp:hcl:v2.6.0:hashicorp_hcl_v2/vendor/github.com/hashicorp/hcl/v2 \
 		hashicorp:hil:97b3a9cdfa93:hashicorp_hil/vendor/github.com/hashicorp/hil \
 		hashicorp:logutils:v1.0.0:hashicorp_logutils/vendor/github.com/hashicorp/logutils \
 		hashicorp:terraform-config-inspect:c481b8bfa41e:hashicorp_terraform_config_inspect/vendor/github.com/hashicorp/terraform-config-inspect \
 		hashicorp:terraform-json:v0.6.0:hashicorp_terraform_json/vendor/github.com/hashicorp/terraform-json \
 		hashicorp:terraform-plugin-test:v1.3.0:hashicorp_terraform_plugin_test/vendor/github.com/hashicorp/terraform-plugin-test \
 		hashicorp:terraform-provider-kubernetes:v1.13.3:hashicorp_terraform_provider_kubernetes/vendor/github.com/hashicorp/terraform-provider-kubernetes \
 		hashicorp:terraform-svchost:f050f53b9734:hashicorp_terraform_svchost/vendor/github.com/hashicorp/terraform-svchost \
 		hashicorp:vault:v1.3.0:hashicorp_vault/vendor/github.com/hashicorp/vault \
 		hashicorp:yamux:aecfd211c9ce:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
 		hinshun:vt10x:d55458df857c:hinshun_vt10x/vendor/github.com/hinshun/vt10x \
 		hokaccha:go-prettyjson:e6b9231a2b1c:hokaccha_go_prettyjson/vendor/github.com/hokaccha/go-prettyjson \
 		hooklift:iso9660:v1.0.0:hooklift_iso9660/vendor/github.com/hooklift/iso9660 \
 		imdario:mergo:v0.3.11:imdario_mergo/vendor/github.com/imdario/mergo \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		jcmturner:aescts:v1.0.1:jcmturner_aescts/vendor/gopkg.in/jcmturner/aescts.v1 \
 		jcmturner:dnsutils:v1.0.1:jcmturner_dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \
 		jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \
 		jcmturner:gokrb5:v7.5.0:jcmturner_gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v7 \
 		jcmturner:rpc:v1.1.0:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v1 \
 		jen20:awspolicyequivalence:v1.1.0:jen20_awspolicyequivalence/vendor/github.com/jen20/awspolicyequivalence \
 		jinzhu:copier:b57f9002281a:jinzhu_copier/vendor/github.com/jinzhu/copier \
 		jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		josharian:intern:v1.0.0:josharian_intern/vendor/github.com/josharian/intern \
 		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
 		jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
 		k8snetworkplumbingwg:network-attachment-definition-client:79f836b90111:k8snetworkplumbingwg_network_attachment_definition_client/vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client \
 		kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
 		kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \
 		keybase:go-crypto:de78d2cb44f4:keybase_go_crypto/vendor/github.com/keybase/go-crypto \
 		klauspost:compress:v1.11.0:klauspost_compress/vendor/github.com/klauspost/compress \
 		kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \
 		kr:pretty:v0.2.1:kr_pretty/vendor/github.com/kr/pretty \
 		kr:text:v0.2.0:kr_text/vendor/github.com/kr/text \
 		kubernetes-sigs:controller-runtime:v0.9.0-alpha.1:kubernetes_sigs_controller_runtime/vendor/sigs.k8s.io/controller-runtime \
 		kubernetes-sigs:controller-tools:651903477185:kubernetes_sigs_controller_tools/vendor/sigs.k8s.io/controller-tools \
 		kubernetes-sigs:kustomize:kyaml/v0.10.15:kubernetes_sigs_kustomize_1/vendor/sigs.k8s.io/kustomize/kyaml \
 		kubernetes-sigs:kustomize:api/v0.8.5:kubernetes_sigs_kustomize/vendor/sigs.k8s.io/kustomize/api \
 		kubernetes-sigs:structured-merge-diff:v4.1.1:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff/v4 \
 		kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
 		kubernetes:api:v0.21.1:kubernetes_api/vendor/k8s.io/api \
 		kubernetes:apiextensions-apiserver:v0.21.0-rc.0:kubernetes_apiextensions_apiserver/vendor/k8s.io/apiextensions-apiserver \
 		kubernetes:apimachinery:v0.21.1:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
 		kubernetes:cli-runtime:v0.21.0-rc.0:kubernetes_cli_runtime/vendor/k8s.io/cli-runtime \
 		kubernetes:client-go:v0.21.0-rc.0:kubernetes_client_go/vendor/k8s.io/client-go \
 		kubernetes:component-base:v0.21.0:kubernetes_component_base/vendor/k8s.io/component-base \
 		kubernetes:klog:v1.0.0:kubernetes_klog/vendor/k8s.io/klog \
 		kubernetes:klog:v2.8.0:kubernetes_klog_1/vendor/k8s.io/klog/v2 \
 		kubernetes:kube-aggregator:v0.21.0-rc.0:kubernetes_kube_aggregator/vendor/k8s.io/kube-aggregator \
 		kubernetes:kube-openapi:591a79e4bda7:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
 		kubernetes:kubectl:v0.21.0-rc.0:kubernetes_kubectl/vendor/k8s.io/kubectl \
 		kubernetes:utils:fddb29f9d009:kubernetes_utils/vendor/k8s.io/utils \
 		kubevirt:client-go:v0.29.0:kubevirt_kubevirt/vendor/github.com/kubevirt/client-go \
 		kubevirt:containerized-data-importer:v1.10.9:kubevirt_kubevirt_1/vendor/github.com/kubevirt/containerized-data-importer \
 		leodido:go-urn:v1.2.1:leodido_go_urn/vendor/github.com/leodido/go-urn \
 		libvirt:libvirt-go-xml:v5.10.0:libvirt_libvirt_go_xml/vendor/github.com/libvirt/libvirt-go-xml \
 		libvirt:libvirt-go:v5.10.0:libvirt_libvirt_go/vendor/github.com/libvirt/libvirt-go \
 		liggitt:tabwriter:89fcab3d43de:liggitt_tabwriter/vendor/github.com/liggitt/tabwriter \
 		mailru:easyjson:v0.7.6:mailru_easyjson/vendor/github.com/mailru/easyjson \
 		masterzen:simplexml:31eea3082786:masterzen_simplexml/vendor/github.com/masterzen/simplexml \
 		masterzen:winrm:1d17eaf15943:masterzen_winrm/vendor/github.com/masterzen/winrm \
 		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		matttproud:golang_protobuf_extensions:c182affec369:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		mgutz:ansi:9520e82c474b:mgutz_ansi/vendor/github.com/mgutz/ansi \
 		minsikl:netscaler-nitro-go:5b14ce3643e3:minsikl_netscaler_nitro_go/vendor/github.com/minsikl/netscaler-nitro-go \
 		mitchellh:cli:v1.1.1:mitchellh_cli/vendor/github.com/mitchellh/cli \
 		mitchellh:colorstring:d06e56a500db:mitchellh_colorstring/vendor/github.com/mitchellh/colorstring \
 		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:go-linereader:1b945b3263eb:mitchellh_go_linereader/vendor/github.com/mitchellh/go-linereader \
 		mitchellh:go-testing-interface:v1.14.1:mitchellh_go_testing_interface/vendor/github.com/mitchellh/go-testing-interface \
 		mitchellh:go-wordwrap:v1.0.0:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
 		mitchellh:hashstructure:v1.0.0:mitchellh_hashstructure/vendor/github.com/mitchellh/hashstructure \
 		mitchellh:mapstructure:v1.3.3:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		mitchellh:panicwrap:v1.0.0:mitchellh_panicwrap/vendor/github.com/mitchellh/panicwrap \
 		mitchellh:reflectwalk:v1.0.1:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
 		moby:spdystream:v0.2.0:moby_spdystream/vendor/github.com/moby/spdystream \
 		moby:term:df9cb8a40635:moby_term/vendor/github.com/moby/term \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		mongodb:mongo-go-driver:v1.5.1:mongodb_mongo_go_driver/vendor/go.mongodb.org/mongo-driver \
 		monochromegane:go-gitignore:205db1a8cc00:monochromegane_go_gitignore/vendor/github.com/monochromegane/go-gitignore \
 		nicksnyder:go-i18n:v1.10.0:nicksnyder_go_i18n/vendor/github.com/nicksnyder/go-i18n \
 		nirarg:terraform-provider-kubevirt:101cee051ed3:nirarg_terraform_provider_kubevirt/vendor/github.com/kubevirt/terraform-provider-kubevirt \
 		nu7hatch:gouuid:179d4d0c4d8d:nu7hatch_gouuid/vendor/github.com/nu7hatch/gouuid \
 		oklog:run:v1.1.0:oklog_run/vendor/github.com/oklog/run \
 		oklog:ulid:v1.3.1:oklog_ulid/vendor/github.com/oklog/ulid \
 		opencontainers:go-digest:v1.0.0:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
 		opencontainers:image-spec:775207bd45b6:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
 		openshift-metal3:terraform-provider-ironic:v0.2.6:openshift_metal3_terraform_provider_ironic/vendor/github.com/openshift-metal3/terraform-provider-ironic \
 		openshift:api:7740bfb97397:openshift_api/vendor/github.com/openshift/api \
 		openshift:baremetal-operator:5240e42f012a:openshift_baremetal_operator/vendor/github.com/metal3-io/baremetal-operator \
 		openshift:client-go:91d71ef2122c:openshift_client_go/vendor/github.com/openshift/client-go \
 		openshift:cloud-credential-operator:d10080b52c9e:openshift_cloud_credential_operator/vendor/github.com/openshift/cloud-credential-operator \
 		openshift:cluster-api-provider-aws:5ffc5f422a80:openshift_cluster_api_provider_aws/vendor/sigs.k8s.io/cluster-api-provider-aws \
 		openshift:cluster-api-provider-azure:5d94c794092f:openshift_cluster_api_provider_azure/vendor/sigs.k8s.io/cluster-api-provider-azure \
 		openshift:cluster-api-provider-baremetal:a2a477909c1d:openshift_cluster_api_provider_baremetal/vendor/github.com/metal3-io/cluster-api-provider-baremetal \
 		openshift:cluster-api-provider-gcp:4dc702fd57a5:openshift_cluster_api_provider_gcp/vendor/github.com/openshift/cluster-api-provider-gcp \
 		openshift:cluster-api-provider-ibmcloud:676faba9895d:openshift_cluster_api_provider_ibmcloud/vendor/github.com/openshift/cluster-api-provider-ibmcloud \
 		openshift:cluster-api-provider-kubevirt:e5aed9c73f1f:openshift_cluster_api_provider_kubevirt/vendor/github.com/openshift/cluster-api-provider-kubevirt \
 		openshift:cluster-api-provider-libvirt:2336783d4603:openshift_cluster_api_provider_libvirt/vendor/github.com/openshift/cluster-api-provider-libvirt \
 		openshift:cluster-api-provider-openstack:8498241fa4bd:openshift_cluster_api_provider_openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack \
 		openshift:cluster-api-provider-ovirt:c4f9f269bcb7:openshift_cluster_api_provider_ovirt/vendor/github.com/openshift/cluster-api-provider-ovirt \
 		openshift:cluster-api:f8de78af80fc:openshift_cluster_api/vendor/github.com/openshift/cluster-api \
 		openshift:custom-resource-status:e62f2f3b79f3:openshift_custom_resource_status/vendor/github.com/openshift/custom-resource-status \
 		openshift:hashicorp-terraform-plugin-sdk:v1.14.0-openshift:openshift_hashicorp_terraform_plugin_sdk/vendor/github.com/hashicorp/terraform-plugin-sdk \
 		openshift:library-go:7a65fdb398e2:openshift_library_go/vendor/github.com/openshift/library-go \
 		openshift:machine-api-operator:b7ef098180db:openshift_machine_api_operator/vendor/github.com/openshift/machine-api-operator \
 		openshift:machine-config-operator:4fe8559913b8:openshift_machine_config_operator/vendor/github.com/openshift/machine-config-operator \
 		openshift:terraform-provider-aws:7d13cfbb1a8c:openshift_terraform_provider_aws/vendor/github.com/terraform-providers/terraform-provider-aws \
 		openshift:terraform-provider-azurerm:7509319df0f4:openshift_terraform_provider_azurerm/vendor/github.com/terraform-providers/terraform-provider-azurerm \
 		openshift:terraform-provider-azurestack:v0.10.0-openshift:openshift_terraform_provider_azurestack/vendor/github.com/terraform-providers/terraform-provider-azurestack \
 		openshift:terraform-provider-ibm:v1.26.2-openshift-2:openshift_terraform_provider_ibm/vendor/github.com/IBM-Cloud/terraform-provider-ibm \
 		openshift:terraform-provider-vsphere:v1.24.3-openshift:openshift_terraform_provider_vsphere/vendor/github.com/hashicorp/terraform-provider-vsphere \
 		openshift:hashicorp-terraform:v0.12.20-openshift-4:openshift_terraform/vendor/github.com/hashicorp/terraform \
 		ovirt:go-ovirt:ac0bcbc88d7c:ovirt_go_ovirt/vendor/github.com/ovirt/go-ovirt \
 		ovirt:terraform-provider-ovirt:78ce17b16709:ovirt_terraform_provider_ovirt/vendor/github.com/ovirt/terraform-provider-ovirt \
 		packer-community:winrmcp:c76d91c1e7db:packer_community_winrmcp/vendor/github.com/packer-community/winrmcp \
 		pborman:uuid:v1.2.0:pborman_uuid \
 		pelletier:go-toml:v1.8.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		peterbourgon:diskv:v2.0.1:peterbourgon_diskv/vendor/github.com/peterbourgon/diskv \
 		pierrec:lz4:v2.5.2:pierrec_lz4/vendor/github.com/pierrec/lz4 \
 		pkg:browser:0a3d74bf9ce4:pkg_browser/vendor/github.com/pkg/browser \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pkg:sftp:v1.10.1:pkg_sftp/vendor/github.com/pkg/sftp \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		posener:complete:v1.2.3:posener_complete/vendor/github.com/posener/complete \
 		prometheus:client_golang:v1.9.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.2.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		rcrowley:go-metrics:10cdbea86bc0:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \
 		rickb777:date:6300e543c4d9:rickb777_date/vendor/github.com/rickb777/date \
 		rickb777:plural:v1.2.0:rickb777_plural/vendor/github.com/rickb777/plural \
 		robfig:cron:v1.2.0:robfig_cron/vendor/github.com/robfig/cron \
 		russross:blackfriday:v1.5.2:russross_blackfriday/vendor/github.com/russross/blackfriday \
 		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
 		satori:uuid:v1.2.0:satori_uuid \
 		shurcooL:httpfs:8d4bc4ba7749:shurcool_httpfs/vendor/github.com/shurcooL/httpfs \
 		shurcooL:vfsgen:6a9ea43bcacd:shurcool_vfsgen/vendor/github.com/shurcooL/vfsgen \
 		sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		softlayer:softlayer-go:v1.0.3:softlayer_softlayer_go/vendor/github.com/softlayer/softlayer-go \
 		softlayer:xmlrpc:5f089df7cb7e:softlayer_xmlrpc/vendor/github.com/softlayer/xmlrpc \
 		spf13:afero:v1.3.5:spf13_afero/vendor/github.com/spf13/afero \
 		spf13:cobra:v1.1.1:spf13_cobra/vendor/github.com/spf13/cobra \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		stoewer:go-strcase:v1.2.0:stoewer_go_strcase/vendor/github.com/stoewer/go-strcase \
 		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		terraform-provider-openstack:terraform-provider-openstack:v1.37.0:terraform_provider_openstack_terraform_provider_openstack/vendor/github.com/terraform-provider-openstack/terraform-provider-openstack \
 		terraform-providers:terraform-provider-google:27107f2ee160:terraform_providers_terraform_provider_google/vendor/github.com/terraform-providers/terraform-provider-google \
 		terraform-providers:terraform-provider-local:v1.4.0:terraform_providers_terraform_provider_local/vendor/github.com/terraform-providers/terraform-provider-local \
 		terraform-providers:terraform-provider-random:83518d96ae4f:terraform_providers_terraform_provider_random/vendor/github.com/terraform-providers/terraform-provider-random \
 		tombuildsstuff:giovanni:v0.15.1:tombuildsstuff_giovanni/vendor/github.com/tombuildsstuff/giovanni \
 		ulikunitz:xz:v0.5.7:ulikunitz_xz/vendor/github.com/ulikunitz/xz \
 		vincent-petithory:dataurl:d1553a71de50:vincent_petithory_dataurl/vendor/github.com/vincent-petithory/dataurl \
 		vmihailenco:msgpack:v4.3.12:vmihailenco_msgpack_v4/vendor/github.com/vmihailenco/msgpack/v4 \
 		vmihailenco:tagparser:v0.1.1:vmihailenco_tagparser/vendor/github.com/vmihailenco/tagparser \
 		vmware:govmomi:v0.24.0:vmware_govmomi/vendor/github.com/vmware/govmomi \
 		xanzy:ssh-agent:v0.2.1:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
 		xlab:treeprint:a009c3971eca:xlab_treeprint/vendor/github.com/xlab/treeprint \
 		zclconf:go-cty-yaml:v1.0.2:zclconf_go_cty_yaml/vendor/github.com/zclconf/go-cty-yaml \
 		zclconf:go-cty:v1.6.1:zclconf_go_cty/vendor/github.com/zclconf/go-cty
 
 post-extract:
 	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/bigtable
 	@${RLN} ${WRKSRC_googleapis_google_cloud_go_bigtable}/bigtable ${WRKSRC}/vendor/cloud.google.com/go/bigtable
 	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage
 	@${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/storage
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
 	@${RLN} ${WRKSRC_azure_go_autorest_autorest}/autorest ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
 	@${RLN} ${WRKSRC_azure_go_autorest_adal}/autorest/adal ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/auth
 	@${RLN} ${WRKSRC_azure_go_autorest_auth}/autorest/azure/auth ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/auth
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/cli
 	@${RLN} ${WRKSRC_azure_go_autorest_cli}/autorest/azure/cli ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/cli
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date
 	@${RLN} ${WRKSRC_azure_go_autorest_date}/autorest/date ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/validation
 	@${RLN} ${WRKSRC_azure_go_autorest_validation}/autorest/validation ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/validation
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
 	@${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
 	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
 	@${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
 	@${RM} -r ${WRKSRC}/vendor/github.com/IBM/go-sdk-core/v4
 	@${RLN} ${WRKSRC_ibm_go_sdk_core_v4}/v4 ${WRKSRC}/vendor/github.com/IBM/go-sdk-core/v4
 	@${RM} -r ${WRKSRC}/vendor/github.com/IBM/go-sdk-core/v5
 	@${RLN} ${WRKSRC_ibm_go_sdk_core_v5}/v5 ${WRKSRC}/vendor/github.com/IBM/go-sdk-core/v5
 	@${MKDIR} ${WRKSRC}/vendor/github.com/pborman
 	@${RLN} ${WRKSRC_google_uuid} ${WRKSRC}/vendor/github.com/pborman/uuid
 	@${MKDIR} ${WRKSRC}/vendor/github.com/satori
 	@${RLN} ${WRKSRC_pborman_uuid} ${WRKSRC}/vendor/github.com/satori/uuid
 	@${CP} ${FILESDIR}/assets_vfsdata.go ${WRKSRC}/data/assets_vfsdata.go
 
 do-build:
 	@(cd ${GO_WRKSRC}; out="${PORTNAME}"; pkg=${GO_TARGET}; \
 		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} \
 			-o ${GO_WRKDIR_BIN}/$${out} $${pkg};)
 
 do-install:
 	@(src="${PORTNAME}"; dst=${STAGEDIR}${PREFIX}/bin/$${src}; \
 		${ECHO_MSG} "===>  Installing $${src} as $${dst}"; \
 		${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/$${src} $${dst};)
 
 GO_BUILDFLAGS=	-tags release -ldflags="-s -w \
 				-X github.com/openshift/installer/pkg/version.Raw=${GIT_TAG} \
 				-X github.com/openshift/installer/pkg/version.Commit=${GIT_TAGNAME}" -o "${PLIST_FILES}"
 GO_TARGET=	./cmd/openshift-install
 CGO_ENABLED=	0
 
 .include <bsd.port.mk>
diff --git a/sysutils/plasma5-plasma-disks/Makefile b/sysutils/plasma5-plasma-disks/Makefile
index f42b2d988f94..ce28228d7aef 100644
--- a/sysutils/plasma5-plasma-disks/Makefile
+++ b/sysutils/plasma5-plasma-disks/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	plasma-disks
 DISTVERSION=	${KDE_PLASMA_VERSION}
 PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Monitors S.M.A.R.T. capable devices for imminent failure
 
 # XXX license
 # https://invent.kde.org/plasma/plasma-disks/-/tree/master/LICENSES
 LICENSE=	BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL3 # FSF KDE-GPL KDE-LGPL
 LICENSE_COMB=	multi
 #LICENSE_NAME_KDE-GPL=	LicenseRef KDE Accepted GPL
 #LICENSE_NAME_KDE-LGPL=	LicenseRef KDE Accepted LGPL
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSES/BSD-3-Clause.txt
 LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSES/CC0-1.0.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSES/GPL-2.0-only.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/LICENSES/LGPL-3.0-only.txt
 #LICENSE_FILE_FSF=	${WRKSRC}/LICENSES/FSFAP.txt
 #LICENSE_PERMS_KDE-GPL=	gpl3
-#LICENSE_PERMS_KDE-LGPL= gpl3	
+#LICENSE_PERMS_KDE-LGPL= gpl3
 
 RUN_DEPENDS=	smartmontools>0:sysutils/smartmontools
 
 USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg
 
 USE_KDE=	activities auth codecs config configwidgets coreaddons \
 		dbusaddons ecm i18n kdeclarative kio ksysguard notifications \
 		plasma-framework service solid widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui network quickcontrols \
 		widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11
 
 post-patch:
 	${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" \
 		${WRKSRC}/src/helper.cpp
 
 .include <bsd.port.mk>
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index e9080e136b65..f99fd27e35c6 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,239 +1,239 @@
 PORTNAME=	syslog-ng
 DISTVERSION=	3.38.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \
 		libtool pathfix pkgconfig python:3.5+,build shebangfix ssl
 
 CPE_VENDOR=	oneidentity
 
 CONFLICTS?=	syslog-ng syslog-ng[0-9] \
 		syslog-ng[0-9][0-9] \
 		syslog-ng-devel eventlog*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST
 OPTIONS_DEFAULT=	CURL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP2_DESC=		Build with geoip2 (MaxMindDB) support
 REDIS_DESC=		Build with Redis support
 JAVA_DESC=		Build with Java support (no modules)
 JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
 PYTHON_DESC=		Build with Python ${PYTHON_VER} support
 CURL_DESC=		Build with Curl HTTP support
 AMQP_DESC=		Build with AMQP support
 RIEMANN_DESC=		Build with Riemann support
 KAFKA_DESC=		Build with Kafka (librdkafka) support
 SNMPDEST_DESC=		Build with SNMP destination (net-snmp) support
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 SHEBANG_FILES=	lib/merge-grammar.py
 GNU_CONFIGURE=	yes
 # Note: Even if PYTHON is deselected, glib20 will install python.
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --enable-manpages \
 		--disable-linux-caps \
 		--datadir=${PREFIX}/share/ \
 		--with-python=${PYTHON_VER}
 
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 
 TCP_WRAPPERS_CONFIGURE_ENABLE=	tcp-wrapper
 
 SPOOF_LIB_DEPENDS=		libnet.so:net/libnet
 SPOOF_CONFIGURE_ENABLE=		spoof-source
 SPOOF_CONFIGURE_ON=		--with-libnet=${LOCALBASE}/bin
 SPOOF_CONFIGURE_ENV=		LIBNET_CFLAGS="-I${LOCALBASE}/include" \
 				LIBNET_LIBS="-L${LOCALBASE}/lib -lnet"
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 
 AMQP_CONFIGURE_ENABLE=		amqp
 AMQP_PLIST_FILES=		lib/syslog-ng/libafamqp.so
 AMQP_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 
 GEOIP2_CONFIGURE_ENABLE=	geoip2
 GEOIP2_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 GEOIP2_LDFLAGS=			-L${LOCALBASE}/lib
 GEOIP2_PLIST_FILES=		lib/syslog-ng/libgeoip2-plugin.so
 
 REDIS_CONFIGURE_ENABLE=		redis
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REDIS_PLIST_FILES=		lib/syslog-ng/libredis.so
 
 SNMPDEST_CONFIGURE_ENABLE=	afsnmp
 SNMPDEST_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMPDEST_PLIST_FILES=		lib/syslog-ng/libafsnmp.so
 
 SMTP_CONFIGURE_ON=		--with-libesmtp=${LOCALBASE} --enable-smtp
 SMTP_CONFIGURE_OFF=		--without-libesmtp --disable-smtp
 SMTP_LIB_DEPENDS=		libesmtp.so:mail/libesmtp
 SMTP_PLIST_FILES=		lib/syslog-ng/libafsmtp.so
 
 SQL_CONFIGURE_ENABLE=		sql
 SQL_LIB_DEPENDS=		libdbi.so:databases/libdbi
 SQL_CONFIGURE_ENV=		LIBDBI_LIBS="-L${LOCALBASE}/lib -ldbi"
 SQL_PLIST_FILES=		lib/syslog-ng/libafsql.so
 
 MONGO_CONFIGURE_ENABLE=		mongodb
 MONGO_CONFIGURE_ON=		--with-mongoc=system
 MONGO_LIB_DEPENDS=		libmongoc-1.0.so:devel/mongo-c-driver
 MONGO_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson
 MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so \
 				share/syslog-ng/include/scl/cim/template.conf
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
 JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
 				bash:shells/bash
 JAVA_MOD_PLIST_DIRS=		lib/syslog-ng/java-modules/elastic-jest-client
 JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-api-2.17.2.jar \
 				lib/syslog-ng/java-modules/log4j-core-2.17.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/jest-2.0.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/jest-common-2.0.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpcore-nio-4.4.4.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpclient-4.5.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpasyncclient-4.1.1.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/slf4j-api-1.7.13.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/guava-19.0.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/gson-2.6.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/commons-lang3-3.4.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpcore-4.4.4.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/commons-logging-1.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/commons-codec-1.9.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/slf4j-simple-1.7.13.jar \
 				lib/syslog-ng/java-modules/hdfs.jar \
 				lib/syslog-ng/java-modules/elastic-v2.jar \
 				lib/syslog-ng/java-modules/kafka.jar \
 				lib/syslog-ng/java-modules/dummy.jar \
 				lib/syslog-ng/java-modules/http.jar \
 				lib/syslog-ng/java-modules/syslog-ng-common.jar
 
-PYTHON_USES=			python:3.5+ 
-PYTHON_CONFIGURE_ON=		--enable-python 
+PYTHON_USES=			python:3.5+
+PYTHON_CONFIGURE_ON=		--enable-python
 PYTHON_CONFIGURE_OFF=		--disable-python
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
 		lib/syslog-ng/python/syslogng/__init__.py \
 		lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/__init__.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/choicecompleter.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/commandlinelexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/completer.py  \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/completerlang.py  \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/debuggercli.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/debuglang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/getoptlexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/langcompleter.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/lexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/lexertoken.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/macrocompleter.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/readline.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/syslognginternals.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/tablexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/templatelang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/templatelexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/editline.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/editline.py \
 		lib/syslog-ng/python/syslogng/debuggercli/tflang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_CONFIGURE_ON=		--enable-http
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
 CURL_PLIST_FILES=		lib/syslog-ng/libhttp.so \
 				include/syslog-ng/modules/http/http-signals.h
 
 RIEMANN_CONFIGURE_ON=		--enable-riemann
 RIEMANN_CONFIGURE_OFF=		--disable-riemann
 RIEMANN_LIB_DEPENDS=		libriemann-client-gnutls.so:net-mgmt/riemann-c-client
 RIEMANN_PLIST_FILES=		lib/syslog-ng/libriemann.so
 
 KAFKA_CONFIGURE_ON=		--enable-kafka
 KAFKA_CONFIGURE_OFF=		--disable-kafka
 KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
 KAFKA_PLIST_FILES=		lib/syslog-ng/libkafka.so
 
 .include <bsd.port.pre.mk>
 
 .if !${PORT_OPTIONS:MJSON}
 BROKEN=		Default configuration does not currently support non-JSON builds
 .endif
 
 post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 	touch -r ${WRKSRC}/lib/cfg-grammar.y ${WRKSRC}/lib/merge-grammar.py
 
 post-patch-JAVA_MOD-on:
 	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/
 	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \
 		${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \
 		${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
 		${STAGEDIR}${PREFIX}/include/syslog-ng/
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/u-boot-rpi3-32/Makefile b/sysutils/u-boot-rpi3-32/Makefile
index 777cd58d3c55..c62aa647ef76 100644
--- a/sysutils/u-boot-rpi3-32/Makefile
+++ b/sysutils/u-boot-rpi3-32/Makefile
@@ -1,6 +1,6 @@
 MODEL=		rpi3-32
 BOARD_CONFIG=	rpi_3_32b_defconfig
 UBOOT_ARCH=	arm
-EXTRA_PATCHES=	
+EXTRA_PATCHES=
 
 .include "${.CURDIR}/../u-boot-rpi3/Makefile"
diff --git a/textproc/kf5-syntax-highlighting/Makefile b/textproc/kf5-syntax-highlighting/Makefile
index e2192c98f67e..5a4a33b813ba 100644
--- a/textproc/kf5-syntax-highlighting/Makefile
+++ b/textproc/kf5-syntax-highlighting/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	syntax-highlighting
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	textproc kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 syntax highlighting engine for structured text and code
 
 USES=		cmake compiler:c++11-lib kde:5 perl5 qt:5 tar:xz
 USE_KDE=	ecm_build
 USE_QT=		core gui network \
-		buildtools_build linguisttools_build testlib_build qmake_build 
+		buildtools_build linguisttools_build testlib_build qmake_build
 
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=TRUE
 
 .include <bsd.port.mk>
diff --git a/textproc/py-python-lsp-server/Makefile b/textproc/py-python-lsp-server/Makefile
index 65c37a1e5e90..a0627fd551a0 100644
--- a/textproc/py-python-lsp-server/Makefile
+++ b/textproc/py-python-lsp-server/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	python-lsp-server
 PORTVERSION=	1.5.0
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Python implementation of the Language Server Protocol
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}autopep8>0:textproc/py-autopep8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mccabe>0:devel/py-mccabe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydocstyle>0:devel/py-pydocstyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>0:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyls-black>0:devel/py-pyls-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-jsonrpc>0:textproc/py-python-lsp-jsonrpc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rope>0:devel/py-rope@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flaky>=3.4.0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>0:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whatthepatch>0:textproc/py-whatthepatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \
 		${PYNUMPY}
 
-# make test: 3 failed, 134 passed, 9 skipped, 18 warnings 
+# make test: 3 failed, 134 passed, 9 skipped, 18 warnings
 # mainly because of py-numpy>=1.23.0 ...
 USES=		python:3.7+ pytest
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile
index 559f64da39fb..24f515aee862 100644
--- a/textproc/tinyxml2/Makefile
+++ b/textproc/tinyxml2/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	tinyxml2
 PORTVERSION=	9.0.0
 PORTEPOCH=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Small C++ XML Parser
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake:insource compiler:c++11-lang cpe dos2unix pathfix
 
 CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_SHARED_LIBS
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	leethomason
 USE_GITHUB=	yes
 
 CPE_VENDOR=	tinyxml2_project
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e '/CMAKE_DEBUG_POSTFIX/d' ${WRKSRC}/CMakeLists.txt
 
 post-install:
 	${AR} cq ${STAGEDIR}${PREFIX}/lib/libtinyxml2.a ${WRKSRC}/CMakeFiles/tinyxml2.dir/tinyxml2.cpp.o
-	
+
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/
 
 do-test:
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xmltest && ./xmltest
 
 .include <bsd.port.mk>
diff --git a/www/kf5-kdewebkit/Makefile b/www/kf5-kdewebkit/Makefile
index a23f6ef92f15..2d6d01e3b9f8 100644
--- a/www/kf5-kdewebkit/Makefile
+++ b/www/kf5-kdewebkit/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	kdewebkit
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library providing integration of QtWebKit
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
 		i18n jobwidgets kio parts service sonnet solid \
 		textwidgets wallet widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_QT=		concurrent core dbus gui network webkit widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile
index 666bd990fa17..2f9cadcc2c13 100644
--- a/www/kf5-khtml/Makefile
+++ b/www/kf5-khtml/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	khtml
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 KTHML rendering engine
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png
 
 USES=		cmake compiler:c++11-lib gettext gperf jpeg kde:5 \
 		qt:5 tar:xz xorg
 USE_KDE=	archive auth bookmarks codecs completion config \
 		configwidgets coreaddons globalaccel i18n iconthemes \
 		jobwidgets js kio notifications parts service solid sonnet \
 		textwidgets wallet widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_QT=		concurrent core dbus gui network phonon4 \
 		printsupport widgets x11extras xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xext
 
 .include <bsd.port.mk>
diff --git a/www/kf5-kjsembed/Makefile b/www/kf5-kjsembed/Makefile
index cebdeb2930a0..6b7378cc4ca5 100644
--- a/www/kf5-kjsembed/Makefile
+++ b/www/kf5-kjsembed/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	kjsembed
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library for binding JavaScript objects to QObjects
 
 USES=		cmake compiler:c++11-lib gettext gl kde:5 qt:5 tar:xz
 USE_GL=		gl
 USE_KDE=	archive i18n js \
-		doctools_build ecm_build 
+		doctools_build ecm_build
 USE_QT=		core gui svg uiplugin uitools widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/www/selenium/Makefile b/www/selenium/Makefile
index 90d217daa510..49047dc3cefc 100644
--- a/www/selenium/Makefile
+++ b/www/selenium/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	selenium
-PORTVERSION=	4.1.3	
+PORTVERSION=	4.1.3
 PORTREVISION=	1
 CATEGORIES=	www devel java
 MASTER_SITES=	https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/
 DISTNAME=	selenium-server-${PORTVERSION}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	daniel@blodan.se
 COMMENT=	Selenium Standalone Server, allows browser testing
 
 LICENSE=	APACHE20
 
 USES=		cpe
 CPE_VENDOR=	jenkins
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 JAVA_RUN=	yes
 
 USE_RC_SUBR=	selenium
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
 		SELENIUM_VERSION=${PORTVERSION}
 
 SELENIUM_HOME=	${PREFIX}/selenium
 
 USERS=		selenium
 GROUPS=		selenium
 
 PLIST_FILES=	\@dir\(${USERS},${GROUPS},\)\ selenium \
 		${DATADIR}/${DISTNAME}${EXTRACT_SUFX}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${SELENIUM_HOME}
 	${INSTALL_DATA} ${DISTDIR}${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile
index 5754330ce8c4..c55b50af14f8 100644
--- a/www/unit-java/Makefile
+++ b/www/unit-java/Makefile
@@ -1,103 +1,103 @@
 MASTER_SITES=	https://unit.nginx.org/download/:unit \
 	https://repo1.maven.org/maven2/io/github/classgraph/classgraph/${CLASSGRAPH_VERSION}/:classgraph \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-api/${TOMCAT_VERSION}/:api \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-el-api/${TOMCAT_VERSION}/:elapi \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper/${TOMCAT_VERSION}/:jasper \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/${TOMCAT_VERSION}/:jasperel \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/${TOMCAT_VERSION}/:jsp \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-juli/${TOMCAT_VERSION}/:juli \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/${TOMCAT_VERSION}/:servlet \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util/${TOMCAT_VERSION}/:tutil \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util-scan/${TOMCAT_VERSION}/:utilscan \
 	https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/${ECJ_VERSION}/:ecj \
 	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/${JETTY_VERSION}/:http \
 	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/${JETTY_VERSION}/:server \
 	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/:jutil
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
 DISTFILES=	unit-${UNIT_VERSION}.tar.gz:unit \
 	classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \
 	ecj-${ECJ_VERSION}.jar:ecj \
 	jetty-http-${JETTY_VERSION}.jar:http \
 	jetty-server-${JETTY_VERSION}.jar:server \
 	jetty-util-${JETTY_VERSION}.jar:jutil \
 	tomcat-api-${TOMCAT_VERSION}.jar:api \
 	tomcat-el-api-${TOMCAT_VERSION}.jar:elapi \
 	tomcat-jsp-api-${TOMCAT_VERSION}.jar:jsp \
 	tomcat-jasper-${TOMCAT_VERSION}.jar:jasper \
 	tomcat-jasper-el-${TOMCAT_VERSION}.jar:jasperel \
 	tomcat-juli-${TOMCAT_VERSION}.jar:juli \
 	tomcat-servlet-api-${TOMCAT_VERSION}.jar:servlet \
 	tomcat-util-${TOMCAT_VERSION}.jar:tutil \
 	tomcat-util-scan-${TOMCAT_VERSION}.jar:utilscan
 EXTRACT_ONLY=	unit-${UNIT_VERSION}.tar.gz
 
-DISTINFO_FILE=	${.CURDIR}/distinfo	
+DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 
 COMMENT=	Java module for NGINX Unit
 
 RUN_DEPENDS=	unitd:www/unit
 
 UNIT_MODNAME=	java${JAVA_PORT_VERSION}
 CLASSGRAPH_VERSION=	4.8.112
 ECJ_VERSION=	3.26.0
 JETTY_VERSION=	9.4.43.v20210629
 TOMCAT_VERSION=	9.0.52
 
 PLIST_FILES=	%%JAVAJARDIR%%/classgraph-${CLASSGRAPH_VERSION}.jar \
 		%%JAVAJARDIR%%/ecj-${ECJ_VERSION}.jar \
 		%%JAVAJARDIR%%/jetty-http-${JETTY_VERSION}.jar \
 		%%JAVAJARDIR%%/jetty-server-${JETTY_VERSION}.jar \
 		%%JAVAJARDIR%%/jetty-util-${JETTY_VERSION}.jar \
 		%%JAVAJARDIR%%/nginx-unit-jsc-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-el-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-jasper-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-jasper-el-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-jsp-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-juli-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-servlet-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-util-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-util-scan-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \
 		libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 USE_JAVA=	yes
 JAVA_VERSION=	8+
-#JAVA_VERSION=	8 11 12 13 14 15 
+#JAVA_VERSION=	8 11 12 13 14 15
 
 USE_RC_SUBR?=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 # Do not run the sha512 checker because:
 # - it tries to create a checksum file in ${DISTDIR} and in case
 #   of failure build also fails;
 # - the checker can be useful when the NGINX Unit Java module
 #   downloads those jars by itself.
 post-extract:
 	${CP} /dev/null ${WRKSRC}/auto/modules/java_chk_sha512
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \
 		--module=${UNIT_MODNAME} \
 		--local-repo=${DISTDIR} \
 		--jars=${JAVAJARDIR}
 
 do-build:
 	cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 			${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
 	cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 			${MAKEFILE} ${MAKE_ARGS} \
 			${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index f5b2168178e3..b88ff54a736a 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	xorg-drivers
 PORTVERSION=	7.7
 PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org drivers meta-port
 
 VIDEODIR=	${LOCALBASE}/lib/xorg/modules/drivers
 INPUTDIR=	${LOCALBASE}/lib/xorg/modules/input
 
 USES=		metaport
 
 INPUT_DRIVERS=		egalax \
 			elographics \
 			evdev \
 			joystick \
 			keyboard \
 			libinput \
 			mouse \
 			synaptics \
 			void \
 			wacom
 
 VIDEO_DRIVERS=		apm \
 			ark \
 			ast \
 			chips \
 			cirrus \
 			dummy \
 			i128 \
 			i740 \
 			mach64 \
 			mga \
 			neomagic \
 			nv \
 			openchrome \
 			r128 \
 			rendition \
 			s3virge \
 			savage \
 			scfb \
 			siliconmotion \
 			sis \
 			tdfx \
 			tseng \
 			vesa \
 			voodoo
 
 OPTIONS_DEFAULT=	KEYBOARD \
 			LIBINPUT \
 			MOUSE \
 			SCFB
 
 .for type in input video
 . for a in ${${type:tu}_DRIVERS}
 OPTIONS_DEFINE+=	${a:tu}
 ${a:tu}_DESC=		Install ${a} ${type} driver
 . endfor
 .endfor
 
 OPTIONS_DEFINE_amd64=	AMDGPU ATI INTEL VMMOUSE VMWARE
 OPTIONS_DEFAULT_amd64=	VESA
 
 OPTIONS_DEFINE_i386:=	${OPTIONS_DEFINE_amd64} GEODE
 OPTIONS_DEFAULT_i386:=	${OPTIONS_DEFAULT_amd64}
 
 OPTIONS_DEFINE_sparc64=	SUNFFB
 OPTIONS_DEFAULT_sparc64=SUNFFB
 
 AMDGPU_DESC=		Install amdgpu video driver
-ATI_DESC=		Install ati (radeon) video driver 
+ATI_DESC=		Install ati (radeon) video driver
 GEODE_DESC=		Install geode video driver
 INTEL_DESC=		Install intel video driver
 SUNFFB_DESC=		Install sunffb video driver
 VMMOUSE_DESC=		Install vmmouse input driver
 VMWARE_DESC=		Install vmware video driver
 
 # these drivers have a different module name compared to the plugin they install
 QUIRKS=		keyboard:kbd
 
 .include <bsd.port.options.mk>
 
 # Manual add arch specific drivers so they be added to depend lines.
 .if ${ARCH}==i386 || ${ARCH}==amd64
 INPUT_DRIVERS+= vmmouse
 VIDEO_DRIVERS+=	amdgpu ati intel vmware
 .endif
 
 .if ${ARCH}==i386
 VIDEO_DRIVERS+= geode
 .endif
 
 .if ${ARCH}==sparc64
 VIDEO_DRIVERS+=	sunffb
 .endif
 
 .for type in input video
 . for i in ${${type:tu}_DRIVERS}
 .  if ${PORT_OPTIONS:M${i:tu}} != ""
 .   if ${QUIRKS:M${i}\:*:C/.*://} != ""
 RUN_DEPENDS+=	${${type:tu}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:x11-drivers/xf86-${type}-${i}
 .   else
 RUN_DEPENDS+=	${${type:tu}DIR}/${i}_drv.so:x11-drivers/xf86-${type}-${i}
 .   endif
 .  endif
 . endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/oxygen-fonts/Makefile b/x11-fonts/oxygen-fonts/Makefile
index 36c6d7f48517..2e470f0ac326 100644
--- a/x11-fonts/oxygen-fonts/Makefile
+++ b/x11-fonts/oxygen-fonts/Makefile
@@ -1,26 +1,26 @@
-PKGNAMEPREFIX=	
+PKGNAMEPREFIX=
 PORTNAME=	oxygen-fonts
 DISTVERSION=	5.4.3
 CATEGORIES=	x11-fonts kde-plasma
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Plasma5 Oxygen font family
 
 LICENSE=	OFL11 GPLv3RLE+
 LICENSE_COMB=	dual
 LICENSE_FILE_OFL11=	${WRKSRC}/COPYING-OFL
 LICENSE_FILE_GPLv3RLE+ =	${WRKSRC}/COPYING-GPL+FE.txt
 
 BUILD_DEPENDS=	fontforge:print/fontforge
 
 USES=		cmake fonts:none kde:5 qt:5 tar:xz
 
 USE_KDE=	ecm_build
 KDE_PLASMA_VERSION=	${DISTVERSION}
 KDE_PLASMA_BRANCH=	Attic
 
 USE_QT=	buildtools_build qmake_build
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-faenza/Makefile b/x11-themes/gnome-icons-faenza/Makefile
index b043fd7d8827..299ad1b150c4 100644
--- a/x11-themes/gnome-icons-faenza/Makefile
+++ b/x11-themes/gnome-icons-faenza/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	faenza
 PORTVERSION=	1.3.1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	https://launchpad.net/~tiheum/+archive/ubuntu/equinox/+files/
 PKGNAMEPREFIX=	gnome-icons-
 DISTNAME=	${PORTNAME}-icon-theme_${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Faenza GNOME 2 icon themes
 
 LICENSE=	GPLv3
 
 USES=		gnome
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-icon-theme-${PORTVERSION:R}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 THEMES=		Faenza Faenza-Dark Faenza-Darkest Faenza-Darker \
 		Faenza-Ambiance Faenza-Radiance
 FAENZA_LIGHT=	Faenza
 FAENZA_DARK=	Faenza-Dark
 INSTALLDIR=	${STAGEDIR}${PREFIX}/share/icons
 
 do-install:
 	@${MKDIR} ${INSTALLDIR}
 .for theme in ${THEMES}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${theme} ${INSTALLDIR})	
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${theme} ${INSTALLDIR})
 
 .if ${FAENZA_LIGHT} == ${theme} || ${FAENZA_DARK} == ${theme}
 	@cd ${INSTALLDIR}/${theme}/places/scalable && \
 	${LN} -sf start-here-gnome.svg start-here.svg && \
 	${LN} -sf start-here-gnome-symbolic.svg start-here-symbolic.svg
 .for size in 22 24 32 48 64 96
 	@cd ${INSTALLDIR}/${theme}/places/${size} && \
 	${LN} -sf start-here-gnome.png start-here.png
 .endfor
 .endif
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} share/icons/${theme} ! -type d >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kf5-kemoticons/Makefile b/x11-themes/kf5-kemoticons/Makefile
index 0bba0e34c7ab..95cbf2a4b197 100644
--- a/x11-themes/kf5-kemoticons/Makefile
+++ b/x11-themes/kf5-kemoticons/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	kemoticons
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-themes kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library to convert emoticons
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	archive config coreaddons service \
 		ecm_build
 USE_QT=		core dbus gui widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kf5-kiconthemes/Makefile b/x11-themes/kf5-kiconthemes/Makefile
index 09d1b52fb575..1263f6ba30a6 100644
--- a/x11-themes/kf5-kiconthemes/Makefile
+++ b/x11-themes/kf5-kiconthemes/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	kiconthemes
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-themes kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library for handling icons in applications
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive auth codecs config configwidgets coreaddons \
 		i18n itemviews widgetsaddons \
 		ecm_build
 USE_QT=		concurrent core dbus gui script svg widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 OPTIONS_DEFINE=	ICONS
 OPTIONS_DEFAULT=	ICONS
 ICONS_DESC=	Install Breeze Icons
 ICONS_USE=	KDE=breeze-icons_run
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf5-attica/Makefile b/x11-toolkits/kf5-attica/Makefile
index 68bdec590c06..b1efae080b05 100644
--- a/x11-toolkits/kf5-attica/Makefile
+++ b/x11-toolkits/kf5-attica/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	attica
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Open Collaboration Services API library KDE5 version
 
 # The sources are LGPL21 or LGPL3 or later-version-approved-by-KDE,
 # so use the OR of existing license versions. COPYING is LGPL21.
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
 USES=		cmake compiler:c++11-lib kde:5 pathfix qt:5 tar:xz
 USE_KDE=	ecm_build
 USE_QT=		core network \
-		buildtools_build qmake_build testlib_build 
+		buildtools_build qmake_build testlib_build
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf5-kcompletion/Makefile b/x11-toolkits/kf5-kcompletion/Makefile
index 81f9fc827765..87d1488cb77e 100644
--- a/x11-toolkits/kf5-kcompletion/Makefile
+++ b/x11-toolkits/kf5-kcompletion/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	kcompletion
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 text completion helpers and widgets
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	config widgetsaddons \
 		ecm_build
 USE_QT=		core gui linguisttools widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf5-kdesignerplugin/Makefile b/x11-toolkits/kf5-kdesignerplugin/Makefile
index 84b41a50b879..7dfb16866d89 100644
--- a/x11-toolkits/kf5-kdesignerplugin/Makefile
+++ b/x11-toolkits/kf5-kdesignerplugin/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	kdesignerplugin
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 integration of Frameworks widgets in Qt Designer/Creator
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons i18n iconthemes itemviews \
 		jobwidgets kdewebkit kio plotting service solid sonnet \
 		textwidgets widgetsaddons xmlgui \
 		doctools_build ecm_build
 USE_QT=		concurrent core dbus designer gui linguisttools \
 		network webkit widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf5-kjobwidgets/Makefile b/x11-toolkits/kf5-kjobwidgets/Makefile
index d825cfff6546..77d179047508 100644
--- a/x11-toolkits/kf5-kjobwidgets/Makefile
+++ b/x11-toolkits/kf5-kjobwidgets/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	kjobwidgets
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 widgets for tracking KJob instance
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	coreaddons widgetsaddons \
 		ecm_build
 USE_QT=		core dbus gui linguisttools widgets x11extras \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf5-ktextwidgets/Makefile b/x11-toolkits/kf5-ktextwidgets/Makefile
index 1694c9868f15..629a790d47d1 100644
--- a/x11-toolkits/kf5-ktextwidgets/Makefile
+++ b/x11-toolkits/kf5-ktextwidgets/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	ktextwidgets
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 advanced text editing widgets
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets \
 		coreaddons i18n service sonnet widgetsaddons \
 		ecm_build
 USE_QT=		concurrent core gui widgets xml \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 OPTIONS_DEFINE=		AUDIO
 OPTIONS_DEFAULT=	AUDIO
 
 AUDIO_DESC=		Audio notifications/speech support
 AUDIO_USE=		QT=speech
 
 .include <bsd.port.mk>
diff --git a/x11/kf5-kactivities-stats/Makefile b/x11/kf5-kactivities-stats/Makefile
index ad2a16430c00..b1de65ed986a 100644
--- a/x11/kf5-kactivities-stats/Makefile
+++ b/x11/kf5-kactivities-stats/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	kactivities-stats
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 statistics for activities
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
 
 USES=		cmake compiler:c++11-lib kde:5 pathfix qt:5 tar:xz
 USE_KDE=	activities config \
 		ecm_build
 USE_QT=		core dbus sql \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11/kf5-kded/Makefile b/x11/kf5-kded/Makefile
index 64f09fbeae6a..85655e2b22b2 100644
--- a/x11/kf5-kded/Makefile
+++ b/x11/kf5-kded/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	kded
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 extensible daemon for providing system level services
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons crash dbusaddons service \
 		doctools_build ecm_build
 USE_QT=		core dbus gui widgets \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11/kf5-kinit/Makefile b/x11/kf5-kinit/Makefile
index 80abaedf5216..7183fca9afda 100644
--- a/x11/kf5-kinit/Makefile
+++ b/x11/kf5-kinit/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	kinit
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 process launcher to speed up launching KDE applications
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	completion config coreaddons crash dbusaddons i18n \
 		jobwidgets kio service solid widgetsaddons windowsystem \
-		doctools_build ecm_build 
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network widgets \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 USE_XORG=	x11 xcb
 
 .include <bsd.port.mk>
diff --git a/x11/kf5-krunner/Makefile b/x11/kf5-krunner/Makefile
index bf089f35213b..1c0c413183ac 100644
--- a/x11/kf5-krunner/Makefile
+++ b/x11/kf5-krunner/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	krunner
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 parallelized query system
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	activities config coreaddons i18n kio package plasma-framework \
 		service solid threadweaver \
 		ecm_build
 USE_QT=		concurrent core dbus declarative gui network widgets \
-		buildtools_build qmake_build 
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11/plasma5-kscreen/Makefile b/x11/plasma5-kscreen/Makefile
index e1f1a312b815..e992172d8dfc 100644
--- a/x11/plasma5-kscreen/Makefile
+++ b/x11/plasma5-kscreen/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	kscreen
 DISTVERSION=	${KDE_PLASMA_VERSION}
 PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 screen management library
 
 LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	auth codecs config configwidgets coreaddons dbusaddons \
 		globalaccel i18n kcmutils kdeclarative libkscreen package \
 		plasma-framework service widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_QT=		core dbus declarative gui network sensors widgets x11extras xml \
 		buildtools_build qmake_build testlib_build
-USE_XORG=	x11 xcb xext xi 
+USE_XORG=	x11 xcb xext xi
 
 .include <bsd.port.mk>
diff --git a/x11/screenkey/Makefile b/x11/screenkey/Makefile
index eacd00bc7901..b096f8c36ade 100644
--- a/x11/screenkey/Makefile
+++ b/x11/screenkey/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	screenkey
 PORTVERSION=	1.5
 CATEGORIES=	x11 python
 MASTER_SITES=	https://www.thregr.org/~wavexx/software/screenkey/releases/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Screencast tool to display pressed keys
 
 LICENSE=	GPLv3+
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${PY_FLAVOR} 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${PY_FLAVOR}
 
 USES=		gnome python xorg
 USE_GNOME=	gtk30 pygobject3
 USE_PYTHON=	autoplist distutils noflavors
 USE_XORG=	xtst
 
 .include <bsd.port.mk>
diff --git a/x11/xforward/Makefile b/x11/xforward/Makefile
index ab26bde809cb..9c2ff4cc8813 100644
--- a/x11/xforward/Makefile
+++ b/x11/xforward/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	xforward
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Provide user-level X forwarding service
 
 LICENSE_FILE=	${WRKSRC}/NOTICE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2
-		
+
 USES=		motif xorg
 USE_XORG=	x11 xt xaw xmu xt xext sm ice xft xau xcb xdmcp xrender
 
 MAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/xforward man/man1/xforward.1.gz
 
 OPTIONS_DEFINE=		STATIC
 
 STATIC_ALL_TARGET=	all-static
 STATIC_INSTALL_TARGET=	install-static
 STATIC_PLIST_FILES=	bin/xforward-static
 
 .include <bsd.port.mk>