*: fix tab vs. space issues, and comments according to the guide.

80 files changed, 111 insertions, 110 deletions

diff --git a/devel/R-cran-blob/Makefile b/devel/R-cran-blob/Makefile
index 30ea900825c0..26ca21ae516b 100644
--- a/devel/R-cran-blob/Makefile
+++ b/devel/R-cran-blob/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
-COMMENT=	A Simple S3 Class for Representing Vectors of Binary Data ('BLOBS')
+COMMENT=	Simple S3 Class for Representing Vectors of Binary Data ('BLOBS')
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/R-cran-gert/Makefile b/devel/R-cran-gert/Makefile
index 603a2a53b80a..326f933b68ed 100644
--- a/devel/R-cran-gert/Makefile
+++ b/devel/R-cran-gert/Makefile
@@ -16,7 +16,7 @@ CRAN_DEPENDS=	R-cran-askpass>0:security/R-cran-askpass \
 		R-cran-zip>=2.1.0:archivers/R-cran-zip
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
-LIB_DEPENDS=    libgit2.so:devel/libgit2
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cran:auto-plist
 
diff --git a/devel/allegro5/Makefile b/devel/allegro5/Makefile
index 22c2ab686448..75e0ec729383 100644
--- a/devel/allegro5/Makefile
+++ b/devel/allegro5/Makefile
@@ -26,8 +26,8 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 USES=		cmake:insource compiler:c++11-lang gl gnome jpeg \
 		openal:soft pkgconfig xorg uniquefiles:dirs
 USE_GITHUB=	yes
-GH_ACCOUNT=    	liballeg
-GH_PROJECT=    	allegro5
+GH_ACCOUNT=	liballeg
+GH_PROJECT=	allegro5
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga sm ice xi xinerama xrandr \
 		xscrnsaver
 USE_GL=		gl glu
diff --git a/devel/aphpbreakdown/Makefile b/devel/aphpbreakdown/Makefile
index 80982e4eba03..b870a96b8b15 100644
--- a/devel/aphpbreakdown/Makefile
+++ b/devel/aphpbreakdown/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	aphpbreakdown
 DISTVERSION=	2.2.2
 CATEGORIES=	devel www
 MASTER_SITES=	http://phar.code-mesa.com/
-PKGNAMEPREFIX=  ${PHP_PKGNAMEPREFIX}
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.phar
 
 MAINTAINER=	freebsd@code-mesa.com
diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile
index ef52ff679e88..a9c0090d36a8 100644
--- a/devel/arm-none-eabi-gcc492/Makefile
+++ b/devel/arm-none-eabi-gcc492/Makefile
@@ -34,7 +34,7 @@ BU_PREFIX?=	${GCC_TARGET}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 # libstdcxx won't build, but we don't need it or multiple float-abi libs.
-CONFIGURE_ARGS= --target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
+CONFIGURE_ARGS=	--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
diff --git a/devel/bennugd-core/Makefile b/devel/bennugd-core/Makefile
index 53def024bed2..522410af82f2 100644
--- a/devel/bennugd-core/Makefile
+++ b/devel/bennugd-core/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High level open source game development suite, core libs
 
 USES=		dos2unix libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --bindir="${PREFIX}/libexec"
+CONFIGURE_ARGS=	--bindir="${PREFIX}/libexec"
 SUB_FILES=	bgdc bgdi
 USE_LDCONFIG=	yes
 DOS2UNIX_GLOB=	*.c *.h
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index f0fce0519962..604d7d49a2fa 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -30,7 +30,7 @@ CONFLICTS_INSTALL=	libeio
 USES=		compiler:c++14-lang gettext-tools gnome iconv \
 		jpeg libtool meson ninja ssl pathfix pkgconfig python:3.5+ shared-mime-info \
 		shebangfix tar:xz xorg
-SHEBANG_FILES=  src/tests/elementary/spec/generator.py \
+SHEBANG_FILES=	src/tests/elementary/spec/generator.py \
 		src/bin/exactness/exactness_play.in \
 		src/bin/exactness/exactness_record.in
 USE_XORG=	x11 xcb xcursor xcomposite xdamage xext xfixes xi xinerama \
diff --git a/devel/elixir-timex/Makefile b/devel/elixir-timex/Makefile
index 6f9f9ea95067..07e0fe942a61 100644
--- a/devel/elixir-timex/Makefile
+++ b/devel/elixir-timex/Makefile
@@ -12,7 +12,7 @@ USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwalker
 
-MIX_BUILD_DEPS= devel/elixir-combine \
+MIX_BUILD_DEPS=	devel/elixir-combine \
 		devel/elixir-gettext \
 		devel/elixir-tzdata \
 		www/elixir-httpoison
diff --git a/devel/erlang-erlware_commons/Makefile b/devel/erlang-erlware_commons/Makefile
index 5196faaad0a2..33f3cf25651a 100644
--- a/devel/erlang-erlware_commons/Makefile
+++ b/devel/erlang-erlware_commons/Makefile
@@ -14,8 +14,8 @@ USES=		erlang:rebar
 USE_GITHUB=	yes
 GH_ACCOUNT=	erlware
 
-ERL_BUILD_DEPS= devel/erlang-cf
-ERL_RUN_DEPS:=  ${ERL_BUILD_DEPS}
+ERL_BUILD_DEPS=	devel/erlang-cf
+ERL_RUN_DEPS:=	${ERL_BUILD_DEPS}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/evemu/Makefile b/devel/evemu/Makefile
index b6c8a518cdde..852816f6190d 100644
--- a/devel/evemu/Makefile
+++ b/devel/evemu/Makefile
@@ -29,9 +29,9 @@ PYTHON_USES_OFF=		python:build
 PYTHON_CONFIGURE_ENABLE=	python-bindings
 PYTHON_USE=			PYTHON=py3kplist
 
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 CFLAGS+=	-include stdlib.h -include limits.h
-USE_LDCONFIG=   yes
+USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 REINPLACE_ARGS=	-i ''
 
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index 85f80e38596e..42d8bfe2fd72 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Profiling library/utilities for C/C++ programs
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=  gnulibiberty>=2.19.1:devel/gnulibiberty
+BUILD_DEPENDS=	gnulibiberty>=2.19.1:devel/gnulibiberty
 LIB_DEPENDS=	libbfd.so:devel/libbfd
 
 USES=		autoreconf libtool
diff --git a/devel/git-lab/Makefile b/devel/git-lab/Makefile
index 098976970339..496dc40bbcfc 100644
--- a/devel/git-lab/Makefile
+++ b/devel/git-lab/Makefile
@@ -1,15 +1,15 @@
-PORTNAME=       git-lab
-DISTVERSION=    0.1
-CATEGORIES=     devel
+PORTNAME=	git-lab
+DISTVERSION=	0.1
+CATEGORIES=	devel
 
-MAINTAINER=     adridg@FreeBSD.org
-COMMENT=        GitLab management commands for git CLI
+MAINTAINER=	adridg@FreeBSD.org
+COMMENT=	GitLab management commands for git CLI
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=2.1.8:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gitlab>=2.7.1:devel/py-python-gitlab@${PY_FLAVOR}
 
-USES=           python
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 USE_GITLAB=	yes
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 7ac6b8964627..599779c4f2d1 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	gplink-[0-9]*
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --disable-dependency-tracking --disable-html-doc
+CONFIGURE_ARGS=	--disable-dependency-tracking --disable-html-doc
 USES=		bison:alias gmake tar:bz2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*//}
 
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index bac8270380db..5fa1ec240b82 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from X.Org
 
 LICENSE=	MIT
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	tradcpp:devel/tradcpp
 RUN_DEPENDS=	gccmakedep:devel/gccmakedep \
diff --git a/devel/jwasm/Makefile b/devel/jwasm/Makefile
index 90585e634d23..c74db50d4b7f 100644
--- a/devel/jwasm/Makefile
+++ b/devel/jwasm/Makefile
@@ -15,7 +15,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		alias dos2unix gmake
 
-USE_GITHUB=     yes
+USE_GITHUB=	yes
 GH_ACCOUNT=	Baron-von-Riedesel
 GH_PROJECT=	JWasm
 GH_TAGNAME=	f0a2fdd
diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile
index 040e7f1e268a..4d920d857a6a 100644
--- a/devel/kdesdk/Makefile
+++ b/devel/kdesdk/Makefile
@@ -29,7 +29,7 @@ DEVUTILS_DESC=		KDE development utilities
 DEVUTILS_RUN_DEPENDS=	kde-dev-utils>=${KDE_APPLICATIONS_VERSION}:devel/kde-dev-utils
 
 DEVSCRIPTS_DESC=	KDE development scripts
-DEVSCRIPTS_RUN_DEPENDS= kde-dev-scripts>=${KDE_APPLICATIONS_VERSION}:devel/kde-dev-scripts
+DEVSCRIPTS_RUN_DEPENDS=	kde-dev-scripts>=${KDE_APPLICATIONS_VERSION}:devel/kde-dev-scripts
 
 DOLPHIN_DESC=		Plugins for Dolphin file manager
 DOLPHIN_RUN_DEPENDS=	dolphin-plugins>=${KDE_APPLICATIONS_VERSION}:devel/dolphin-plugins
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index fbd35e2564da..52dfd175b4a0 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	libevent
 DISTVERSION=	2.1.12
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel
-MASTER_SITES=   https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${DISTVERSION}${DISTVERSIONSUFFIX}/
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${DISTVERSION}${DISTVERSIONSUFFIX}/
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	API for executing callback functions on events or timeouts
diff --git a/devel/libfsapfs/Makefile b/devel/libfsapfs/Makefile
index d49e75a06665..da16dc755d10 100644
--- a/devel/libfsapfs/Makefile
+++ b/devel/libfsapfs/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-openssl=no
-CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config
+CONFIGURE_ENV=	PYTHON_CONFIG=${PYTHON_CMD}-config
 USES=		fuse libtool pathfix pkgconfig python:3.5+
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libsavitar/Makefile b/devel/libsavitar/Makefile
index 5143d7f473fc..4cb3234b1cf7 100644
--- a/devel/libsavitar/Makefile
+++ b/devel/libsavitar/Makefile
@@ -4,8 +4,8 @@ PORTREVISION=	6
 CATEGORIES=	devel cad
 DIST_SUBDIR=	Ultimaker
 
-PATCH_SITES=   https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=    195633cf0c5f.patch:-p1
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	195633cf0c5f.patch:-p1
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	C++ implementation of 3mf loading/python bindings
diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
index 52a01fcb9807..3f889f8bcfd8 100644
--- a/devel/libunwind/Makefile
+++ b/devel/libunwind/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generic stack unwinding library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386 powerpc64 powerpc64le
 
 USES=		compiler:c11 cpe libtool pathfix pkgconfig
 
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 5fe5b1e8267b..b7c6dff379aa 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -13,7 +13,7 @@ LICENSE_DIR=	${WRKSRC}/llvm
 .include "Makefile.LICENSE"
 LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${LICENSE_DIR}/LICENSE.TXT
-LICENSE_NAME_LLVM2= 	Apache License 2.0 with LLVM Exceptions
+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}
 
@@ -280,7 +280,7 @@ MAN1SRCS+=	clang.1 \
 		diagtool.1 \
 		scan-build.1
 CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
-SHEBANG_FILES+= clang/tools/clang-format/git-clang-format \
+SHEBANG_FILES+=	clang/tools/clang-format/git-clang-format \
 		clang/tools/clang-format/clang-format-diff.py \
 		clang/tools/scan-view/bin/scan-view \
 		clang/utils/hmaptool/hmaptool
diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
index 77a0200ee703..f0a2cfbcb1d8 100644
--- a/devel/llvm10/Makefile
+++ b/devel/llvm10/Makefile
@@ -152,10 +152,10 @@ 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_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}
+PYCLANG_VARS=		_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index 5169370c65af..e9e1269cdbde 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -147,10 +147,10 @@ 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}
-PYCLANG_DESC=	Install python bindings to libclang
+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}
+PYCLANG_VARS=		_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 3a8cc22c1b28..609f8b1b1785 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -157,10 +157,10 @@ 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_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}
+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
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index 6a6dfde8cac4..796455af389f 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -175,10 +175,10 @@ MLIR_DESC=		Multi-Level Intermediate Representation
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_CMAKE_ON=	-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
 OPENMP_PORTDOCS=	openmp
-PYCLANG_DESC=	Install python bindings to libclang
+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}
+PYCLANG_VARS=		_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
index 0c0e0443e19c..553c45035bf9 100644
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@@ -134,10 +134,10 @@ LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
-PYCLANG_DESC=	Install python bindings to libclang
+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}
+PYCLANG_VARS=		_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON=	-DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
diff --git a/devel/log4net/Makefile b/devel/log4net/Makefile
index f7d0b4b4271f..79ad251286c5 100644
--- a/devel/log4net/Makefile
+++ b/devel/log4net/Makefile
@@ -25,7 +25,7 @@ SUB_LIST=	PORTVERSION=${PORTVERSION}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE= DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@(cd ${INSTALL_WRKSRC}/bin/mono/2.0/release && ${SETENV} MONO_SHARED_DIR=${WRKDIR} ${LOCALBASE}/bin/gacutil /root ${STAGEDIR}${PREFIX}/lib/ /gacdir ${STAGEDIR}${PREFIX}/lib /package 2.0 /i log4net.dll)
diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile
index 582e732b03a9..40554c640ec4 100644
--- a/devel/maven33/Makefile
+++ b/devel/maven33/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Java project management tool, 3.3.x branch
 
 LICENSE=	APACHE20
 
-DEPRECATED=     Outdated, unsupported upstream
+DEPRECATED=	Outdated, unsupported upstream
 EXPIRATION_DATE=2022-01-15
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
diff --git a/devel/p5-Devel-Cover-Report-Clover/Makefile b/devel/p5-Devel-Cover-Report-Clover/Makefile
index ead6520eb79e..b7a55458e26c 100644
--- a/devel/p5-Devel-Cover-Report-Clover/Makefile
+++ b/devel/p5-Devel-Cover-Report-Clover/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	\
 	p5-Devel-Cover>0:devel/p5-Devel-Cover \
 	p5-HTML-Parser>0:www/p5-HTML-Parser \
 	p5-Template-Toolkit>0:www/p5-Template-Toolkit
-TEST_DEPENDS= \
+TEST_DEPENDS=	\
 	p5-File-Which>=1.08:sysutils/p5-File-Which \
 	p5-Test-Exception>0:devel/p5-Test-Exception \
 	p5-Test-MockObject>0:devel/p5-Test-MockObject
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index 2a941a728ed3..ad9f49f394af 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for sorting objects by some DateTime key
 
 RUN_DEPENDS=	p5-DateTime>=0.28:devel/p5-DateTime \
 		p5-Sort-Key>=1.28:devel/p5-Sort-Key
-BUILD_DEPENDS=  ${RUN_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/pcsc-ada/Makefile b/devel/pcsc-ada/Makefile
index 95e6976b9a41..dfaca6accff4 100644
--- a/devel/pcsc-ada/Makefile
+++ b/devel/pcsc-ada/Makefile
@@ -23,8 +23,8 @@ PORTEXAMPLES=	src bin
 
 OPTIONS_DEFINE=	UNIT_TEST INTF_TEST DOCS EXAMPLES
 OPTIONS_SUB=	yes
-UNIT_TEST_DESC= Run unit test suite before installation
-INTF_TEST_DESC= Run interface tests against installed smart card after build
+UNIT_TEST_DESC=	Run unit test suite before installation
+INTF_TEST_DESC=	Run interface tests against installed smart card after build
 NO_OPTIONS_SORT=yes
 
 DOCS_USES=		gmake
diff --git a/devel/pear-Date_Holidays_Discordian/Makefile b/devel/pear-Date_Holidays_Discordian/Makefile
index 0bed71d6b18a..492b3f382714 100644
--- a/devel/pear-Date_Holidays_Discordian/Makefile
+++ b/devel/pear-Date_Holidays_Discordian/Makefile
@@ -7,7 +7,7 @@ COMMENT=	Driver based class to calculate Discordian holidays
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
diff --git a/devel/php73-gettext/Makefile b/devel/php73-gettext/Makefile
index 73bcdd719b89..b7806acc0bf3 100644
--- a/devel/php73-gettext/Makefile
+++ b/devel/php73-gettext/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-gettext
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-intl/Makefile b/devel/php73-intl/Makefile
index 6dd852cec427..07497cbab4af 100644
--- a/devel/php73-intl/Makefile
+++ b/devel/php73-intl/Makefile
@@ -9,6 +9,6 @@ USE_CXXSTD=	gnu++11
 
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-json/Makefile b/devel/php73-json/Makefile
index bf40ef07b649..73e75b5917da 100644
--- a/devel/php73-json/Makefile
+++ b/devel/php73-json/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-json
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-pcntl/Makefile b/devel/php73-pcntl/Makefile
index 7b0b60641feb..4eb3579bae01 100644
--- a/devel/php73-pcntl/Makefile
+++ b/devel/php73-pcntl/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-pcntl
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-readline/Makefile b/devel/php73-readline/Makefile
index 46f56eba0073..372ce69ce3a4 100644
--- a/devel/php73-readline/Makefile
+++ b/devel/php73-readline/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-readline
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-shmop/Makefile b/devel/php73-shmop/Makefile
index c47b5fe34fb6..0af3ff88494d 100644
--- a/devel/php73-shmop/Makefile
+++ b/devel/php73-shmop/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-shmop
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-sysvmsg/Makefile b/devel/php73-sysvmsg/Makefile
index 407e8ec8a31e..415a21cdefde 100644
--- a/devel/php73-sysvmsg/Makefile
+++ b/devel/php73-sysvmsg/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-sysvmsg
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-sysvsem/Makefile b/devel/php73-sysvsem/Makefile
index a6e43cf58dcf..1b5a51933b04 100644
--- a/devel/php73-sysvsem/Makefile
+++ b/devel/php73-sysvsem/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-sysvsem
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-sysvshm/Makefile b/devel/php73-sysvshm/Makefile
index cdd82fd8407d..733068477157 100644
--- a/devel/php73-sysvshm/Makefile
+++ b/devel/php73-sysvshm/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-sysvshm
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-tokenizer/Makefile b/devel/php73-tokenizer/Makefile
index 3487f074872d..98f928683915 100644
--- a/devel/php73-tokenizer/Makefile
+++ b/devel/php73-tokenizer/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php73
 
 PKGNAMESUFFIX=	-tokenizer
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-ffi/Makefile b/devel/php74-ffi/Makefile
index c680a42e2691..4e685e0b1352 100644
--- a/devel/php74-ffi/Makefile
+++ b/devel/php74-ffi/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-ffi
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-gettext/Makefile b/devel/php74-gettext/Makefile
index 00fd1cc38a7c..96bd22e84ff9 100644
--- a/devel/php74-gettext/Makefile
+++ b/devel/php74-gettext/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-gettext
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-intl/Makefile b/devel/php74-intl/Makefile
index de88339950b4..482d1fced016 100644
--- a/devel/php74-intl/Makefile
+++ b/devel/php74-intl/Makefile
@@ -9,6 +9,6 @@ USE_CXXSTD=	gnu++11
 
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-json/Makefile b/devel/php74-json/Makefile
index 3098884fa72d..6de1c886bb80 100644
--- a/devel/php74-json/Makefile
+++ b/devel/php74-json/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-json
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-pcntl/Makefile b/devel/php74-pcntl/Makefile
index 2ca95bdd8ba4..f60c93a1f907 100644
--- a/devel/php74-pcntl/Makefile
+++ b/devel/php74-pcntl/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-pcntl
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-readline/Makefile b/devel/php74-readline/Makefile
index 31e4dffa15f4..31b0038c3e3e 100644
--- a/devel/php74-readline/Makefile
+++ b/devel/php74-readline/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-readline
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-shmop/Makefile b/devel/php74-shmop/Makefile
index 7d444868d430..db20089bc219 100644
--- a/devel/php74-shmop/Makefile
+++ b/devel/php74-shmop/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-shmop
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-sysvmsg/Makefile b/devel/php74-sysvmsg/Makefile
index 5a181ae9ad72..94d3747bc991 100644
--- a/devel/php74-sysvmsg/Makefile
+++ b/devel/php74-sysvmsg/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-sysvmsg
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-sysvsem/Makefile b/devel/php74-sysvsem/Makefile
index 408022620af1..654e51ff652e 100644
--- a/devel/php74-sysvsem/Makefile
+++ b/devel/php74-sysvsem/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-sysvsem
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-sysvshm/Makefile b/devel/php74-sysvshm/Makefile
index 0be91e057548..b1f7d5b7e728 100644
--- a/devel/php74-sysvshm/Makefile
+++ b/devel/php74-sysvshm/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-sysvshm
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php74-tokenizer/Makefile b/devel/php74-tokenizer/Makefile
index 3eb4ccafeb16..124fee382706 100644
--- a/devel/php74-tokenizer/Makefile
+++ b/devel/php74-tokenizer/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php74
 
 PKGNAMESUFFIX=	-tokenizer
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-ffi/Makefile b/devel/php80-ffi/Makefile
index d664b68bee56..53658b8bbff9 100644
--- a/devel/php80-ffi/Makefile
+++ b/devel/php80-ffi/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-ffi
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-gettext/Makefile b/devel/php80-gettext/Makefile
index 557769e93966..6e4f76cf5d15 100644
--- a/devel/php80-gettext/Makefile
+++ b/devel/php80-gettext/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-gettext
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-intl/Makefile b/devel/php80-intl/Makefile
index ac523eb118cd..0583fc5566ea 100644
--- a/devel/php80-intl/Makefile
+++ b/devel/php80-intl/Makefile
@@ -9,6 +9,6 @@ USE_CXXSTD=	gnu++11
 
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-pcntl/Makefile b/devel/php80-pcntl/Makefile
index b166805eabf7..e8476e938321 100644
--- a/devel/php80-pcntl/Makefile
+++ b/devel/php80-pcntl/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pcntl
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-readline/Makefile b/devel/php80-readline/Makefile
index e0b347ac44d7..437ced4189dc 100644
--- a/devel/php80-readline/Makefile
+++ b/devel/php80-readline/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-readline
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-shmop/Makefile b/devel/php80-shmop/Makefile
index fdfb762cf00a..5f6e76d3802b 100644
--- a/devel/php80-shmop/Makefile
+++ b/devel/php80-shmop/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-shmop
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-sysvmsg/Makefile b/devel/php80-sysvmsg/Makefile
index c673f45fd11d..96fb9f9f69a6 100644
--- a/devel/php80-sysvmsg/Makefile
+++ b/devel/php80-sysvmsg/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sysvmsg
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-sysvsem/Makefile b/devel/php80-sysvsem/Makefile
index 578fa3c8319d..7ac5d2130e9d 100644
--- a/devel/php80-sysvsem/Makefile
+++ b/devel/php80-sysvsem/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sysvsem
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-sysvshm/Makefile b/devel/php80-sysvshm/Makefile
index aafb85f49208..a8dccc308773 100644
--- a/devel/php80-sysvshm/Makefile
+++ b/devel/php80-sysvshm/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sysvshm
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-tokenizer/Makefile b/devel/php80-tokenizer/Makefile
index 62b25cf4343c..e736bfe4c5f5 100644
--- a/devel/php80-tokenizer/Makefile
+++ b/devel/php80-tokenizer/Makefile
@@ -4,6 +4,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-tokenizer
 
-TEST_TARGET=    test
+TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/py-PyExecJS/Makefile b/devel/py-PyExecJS/Makefile
index 67a55e04fb24..3491779e69aa 100644
--- a/devel/py-PyExecJS/Makefile
+++ b/devel/py-PyExecJS/Makefile
@@ -12,7 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
-USE_PYTHON=     distutils autoplist
+USE_PYTHON=	autoplist distutils
 
 OPTIONS_GROUP=		RUNTIME
 OPTIONS_GROUP_RUNTIME=	NODE SPIDERMONKEY
diff --git a/devel/py-bsd/Makefile b/devel/py-bsd/Makefile
index 494b4b46ff61..196edb550831 100644
--- a/devel/py-bsd/Makefile
+++ b/devel/py-bsd/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils cython
 
-USE_GITHUB=     yes
+USE_GITHUB=	yes
 GH_ACCOUNT=	freenas
 GH_PROJECT=	py-bsd
 GH_TAGNAME=	6d148fa
diff --git a/devel/py-celery-progress/Makefile b/devel/py-celery-progress/Makefile
index a6b755be95d1..a747bfad58f0 100644
--- a/devel/py-celery-progress/Makefile
+++ b/devel/py-celery-progress/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	celery-progress
 PORTVERSION=	0.1.1
 CATEGORIES=	devel
-MASTER_SITES=   CHEESESHOP
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gettoknowmi@yahoo.com
diff --git a/devel/py-libzfs/Makefile b/devel/py-libzfs/Makefile
index b153b36c642d..0fe345ad3861 100644
--- a/devel/py-libzfs/Makefile
+++ b/devel/py-libzfs/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Python libzfs bindings
 
 LICENSE=	BSD2CLAUSE
 
-USE_GITHUB=     yes
+USE_GITHUB=	yes
 GH_ACCOUNT=	truenas
 GH_PROJECT=	py-libzfs
 GH_TAGNAME=	8702fda
diff --git a/devel/py-phx-class-registry/Makefile b/devel/py-phx-class-registry/Makefile
index ae938ab97a61..b8894526d3c0 100644
--- a/devel/py-phx-class-registry/Makefile
+++ b/devel/py-phx-class-registry/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.13:devel/py-six@${PY_FLAVOR}
 
-TEST_DEPENDS=   ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index 3b715f7c34cd..6836c66b964a 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -19,11 +19,11 @@ USE_PYQT=	core gui printsupport widgets sip_build qtbuilder
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui printsupport widgets buildtools_build qmake_build
 
-OPTIONS_DEFINE=         DEBUG
-DEBUG_CONFIGURE_ON=     --debug --trace
+OPTIONS_DEFINE=		DEBUG
+DEBUG_CONFIGURE_ON=	--debug --trace
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}/Python
-ALL_TARGET=     #empty
+WRKSRC=		${WRKDIR}/${DISTNAME}/Python
+ALL_TARGET=	#empty
 
 post-extract:
 	${CP} ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index 6d19ab048c9a..a86cf9f14fdb 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -28,7 +28,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # The port does not build with C++11 or later (bug 219275).
-USE_CXXSTD=     gnu++98
+USE_CXXSTD=	gnu++98
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
diff --git a/devel/rubygem-hike1/Makefile b/devel/rubygem-hike1/Makefile
index 1ed5e25a9e5d..cac2507081f0 100644
--- a/devel/rubygem-hike1/Makefile
+++ b/devel/rubygem-hike1/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ruby library for finding files in a set of paths
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PORTSCOUT=      limit:^1.*
+PORTSCOUT=	limit:^1.*
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-mustache0/Makefile b/devel/rubygem-mustache0/Makefile
index c9b8ee5d4b5c..43c8566e8a55 100644
--- a/devel/rubygem-mustache0/Makefile
+++ b/devel/rubygem-mustache0/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	mustache
 PORTVERSION=	0.99.8
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
-PKGNAMESUFFIX=  0
+PKGNAMESUFFIX=	0
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Framework-agnostic way to render logic-free views
diff --git a/devel/rubygem-pdk/Makefile b/devel/rubygem-pdk/Makefile
index f5b1f9b44607..d6351c0113f3 100644
--- a/devel/rubygem-pdk/Makefile
+++ b/devel/rubygem-pdk/Makefile
@@ -9,7 +9,7 @@ COMMENT=	CLI for development of Puppet modules
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=    rubygem-bundler>=1.15:sysutils/rubygem-bundler \
+RUN_DEPENDS=	rubygem-bundler>=1.15:sysutils/rubygem-bundler \
 		rubygem-childprocess>=4.0.0:devel/rubygem-childprocess \
 		rubygem-concurrent-ruby>=1.1.5:devel/rubygem-concurrent-ruby \
 		rubygem-cri>=2.10.1:devel/rubygem-cri \
diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile
index 1d7b5cbfc8fb..df3344f4b703 100644
--- a/devel/rubygem-rdoc/Makefile
+++ b/devel/rubygem-rdoc/Makefile
@@ -31,7 +31,7 @@ post-install:
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri
 .else
-IGNORE=         ${PORTNAME} is included in lang/${RUBY_NAME}
+IGNORE=		${PORTNAME} is included in lang/${RUBY_NAME}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/sdlskk/Makefile b/devel/sdlskk/Makefile
index 535d9b5cf431..a077def010cb 100644
--- a/devel/sdlskk/Makefile
+++ b/devel/sdlskk/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL21
 GNU_CONFIGURE=	yes
 USES=		iconv libtool sdl
 USE_SDL=	image ttf sdl
-USE_LDCONFIG=   yes
+USE_LDCONFIG=	yes
 
 PLIST_FILES=	include/SDL/sdlskk.h \
 		lib/libSDLSKK.a \
@@ -25,7 +25,7 @@ PLIST_FILES=	include/SDL/sdlskk.h \
 
 PORTDOCS=	AUTHORS NEWS README README.ja
 
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDLSKK.so
diff --git a/devel/sublime-merge/Makefile b/devel/sublime-merge/Makefile
index 059704d9d785..057f95456b49 100644
--- a/devel/sublime-merge/Makefile
+++ b/devel/sublime-merge/Makefile
@@ -11,7 +11,7 @@ LICENSE_NAME=	End User License Agreement
 LICENSE_FILE=	${FILESDIR}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-ONLY_FOR_ARCHS= aarch64 amd64
+ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64 and arm64
 
 USES=		desktop-file-utils gnome linux tar:xz
diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile
index f81ac08a32a0..a0b25c05732d 100644
--- a/devel/thrift-c_glib/Makefile
+++ b/devel/thrift-c_glib/Makefile
@@ -18,14 +18,15 @@ DISTINFO_FILE=	${.CURDIR}/../thrift/distinfo
 
 USES=		bison cmake compiler:c++11-lang gnome libtool pathfix \
 		pkgconfig ssl
-CMAKE_ON=      BUILD_C_GLIB BUILD_SHARED_LIBS
-CMAKE_OFF=     BUILD_CPP BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
+CMAKE_ON=	BUILD_C_GLIB BUILD_SHARED_LIBS
+CMAKE_OFF=	BUILD_CPP BUILD_HASKELL BUILD_JAVA BUILD_JAVASCRIPT \
+		BUILD_NODEJS BUILD_PYTHON
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 .include "../thrift/bsd.thrift.mk"
 
-PLIST_SUB+=     PORTVERSION="${PORTVERSION}"
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \
diff --git a/devel/vc-intrinsics/Makefile b/devel/vc-intrinsics/Makefile
index 51de93d52411..003c45838f0a 100644
--- a/devel/vc-intrinsics/Makefile
+++ b/devel/vc-intrinsics/Makefile
@@ -18,7 +18,7 @@ GH_ACCOUNT=	intel
 GH_TAGNAME=	9aafb51
 CMAKE_ARGS=	-DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}"
 CMAKE_INSTALL_PREFIX=		${PREFIX}/${FLAVOR}
-_PLIST_FILES= 	include/llvm/GenXIntrinsics/GenXIntrOpts.h \
+_PLIST_FILES=	include/llvm/GenXIntrinsics/GenXIntrOpts.h \
 		include/llvm/GenXIntrinsics/GenXIntrinsicDescription.gen \
 		include/llvm/GenXIntrinsics/GenXIntrinsicInst.h \
 		include/llvm/GenXIntrinsics/GenXIntrinsics.h \
diff --git a/devel/viewvc-devel/Makefile b/devel/viewvc-devel/Makefile
index 14825c1b2819..a0385f94885f 100644
--- a/devel/viewvc-devel/Makefile
+++ b/devel/viewvc-devel/Makefile
@@ -4,8 +4,8 @@ PORTNAME=	viewvc
 DISTVERSION=	1.3.0-20201006
 PORTREVISION=	1
 CATEGORIES=	devel python
-PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=  -devel
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
@@ -40,7 +40,7 @@ SUBVERSION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion
 
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}pygments>=1.1:textproc/py-pygments@${PY_FLAVOR}
 
-CONFLICTS_INSTALL=      viewvc-1.[12].[0-9]*
+CONFLICTS_INSTALL=	viewvc-1.[12].[0-9]*
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/wasm3/Makefile b/devel/wasm3/Makefile
index 6bd65a2ab3b3..55a843b36eda 100644
--- a/devel/wasm3/Makefile
+++ b/devel/wasm3/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.5.0
 CATEGORIES=	devel
 
 MAINTAINER=	freebsd@sysctl.cz
-COMMENT=	The fastest WebAssembly interpreter, and the most universal runtime.
+COMMENT=	The fastest WebAssembly interpreter, and the most universal runtime
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,7 +15,7 @@ USES=		cmake:insource localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	wasm3
 GH_PROJECT=	wasm3
-GH_TUPLE+= 	vshymanskyy:uvwasi:b063d686848:uvwasi/_deps/uvwasi-src
+GH_TUPLE+=	vshymanskyy:uvwasi:b063d686848:uvwasi/_deps/uvwasi-src
 
 PLIST_FILES=	bin/wasm3