framework: cleanup conditional-indentations in Mk/

Run Tools/scripts/indent_make_if.pl on all of Mk.

These white space changes contribute greatly to the readability of those files.
As we have a version control system, finding out the reasons for the changes
prior to these white space changes is still easily possible

Differential Revision:	https://reviews.freebsd.org/D35024
Reviewed by:		portmgr (rene, bapt)

118 files changed, 4539 insertions, 4539 deletions

diff --git a/Mk/Uses/7z.mk b/Mk/Uses/7z.mk
index fb029b3317d7..f2a7d81639e4 100644
--- a/Mk/Uses/7z.mk
+++ b/Mk/Uses/7z.mk
@@ -17,29 +17,29 @@ _INCLUDE_USES_7Z_MK=	yes
 7-ZIP_AFTER_ARGS?=	# empty
 7-ZIP_WRKDIR?=		${EXTRACT_WRKDIR}
 
-.if !empty(7z_ARGS:N7-zip:Npartial)
+.  if !empty(7z_ARGS:N7-zip:Npartial)
 IGNORE=			USES=7z has invalid arguments: ${7z_ARGS:N7-zip:Npartial}
-.endif
+.  endif
 
-.if ${7z_ARGS:M7-zip}
+.  if ${7z_ARGS:M7-zip}
 EXTRACT_DEPENDS+=	${7-ZIP_CMD}:archivers/7-zip
-.endif
+.  endif
 
-.if ! ${7z_ARGS:Mpartial}
+.  if ! ${7z_ARGS:Mpartial}
 EXTRACT_SUFX?=		.7z
-.endif
+.  endif
 
-.if ${7z_ARGS:M7-zip} && ! ${7z_ARGS:Mpartial}
+.  if ${7z_ARGS:M7-zip} && ! ${7z_ARGS:Mpartial}
 EXTRACT_CMD?=		${7-ZIP_CMD}
 EXTRACT_BEFORE_ARGS?=	${7-ZIP_BEFORE_ARGS}
 EXTRACT_AFTER_ARGS?=	${7-ZIP_AFTER_ARGS}
-.endif
+.  endif
 
-.if ! ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY)
+.  if ! ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY)
 EXTRACT_ONLY+=		${EXTRACT_ONLY_7z}
-.endif
+.  endif
 
-.if ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial}
+.  if ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial}
 EXTRACT_ONLY?=		${DISTFILES:N*\:*7z*:C/:.*//}
 EXTRACT_ONLY_7z?=	${DISTFILES:M*\:*7z*:C/:.*//}
 
@@ -52,6 +52,6 @@ do-7-zip-extract:
 			exit 1; \
 		fi; \
 	done
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index a0ec072e0205..e695e3c64a2f 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -15,9 +15,9 @@ EXPIRATION_DATE=2022-06-30
 
 CC=	ada
 
-. if ${ada_ARGS:Mrun}
+.  if ${ada_ARGS:Mrun}
 RUN_DEPENDS+=	${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux
-. endif
+.  endif
 
 BUILD_DEPENDS+=	${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux
 MAKE_ENV+=	PATH=${LOCALBASE}/gcc6-aux/bin:${PATH} \
diff --git a/Mk/Uses/alias.mk b/Mk/Uses/alias.mk
index 524d1d9f9214..5eee3a957158 100644
--- a/Mk/Uses/alias.mk
+++ b/Mk/Uses/alias.mk
@@ -11,18 +11,18 @@
 .if !defined(_INCLUDE_USES_ALIAS_MK)
 _INCLUDE_USES_ALIAS_MK=    yes
 
-.if ${OPSYS} != FreeBSD
+.  if ${OPSYS} != FreeBSD
 
-.if empty(alias_ARGS)
+.    if empty(alias_ARGS)
 CFLAGS+=	-D__FreeBSD__=9
-.else
-.  if ${alias_ARGS} == 9 || ${alias_ARGS} == 10 || ${alias_ARGS} == 11
+.    else
+.      if ${alias_ARGS} == 9 || ${alias_ARGS} == 10 || ${alias_ARGS} == 11
 CFLAGS+=	-D__FreeBSD__=${alias_ARGS}
-.  else
+.      else
 IGNORE=	invalid MAJOR RELEASE argument (${alias_ARGS}) for USES=alias
-.  endif
-.endif
+.      endif
+.    endif
 
-.endif # OPSYS != FreeBSD
+.  endif # OPSYS != FreeBSD
 
 .endif
diff --git a/Mk/Uses/angr.mk b/Mk/Uses/angr.mk
index 7d2489854e6c..a1e41b042dae 100644
--- a/Mk/Uses/angr.mk
+++ b/Mk/Uses/angr.mk
@@ -25,17 +25,17 @@ _INCLUDE_USES_ANGR_MK=	yes
 
 # Arguments validation.
 _valid_ARGS=    binaries nose
-.for _arg in ${angr_ARGS}
-.  if !${_valid_ARGS:M${_arg}}
+.  for _arg in ${angr_ARGS}
+.    if !${_valid_ARGS:M${_arg}}
 IGNORE=	USES=angr: invalid argument: ${_arg}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 # Set the default angr version for all angr-related ports.
 ANGR_VERSION?=		9.0.5405
 ANGR_BINARIES_TAGNAME?=	v${ANGR_VERSION}
 
-.if "${angr_ARGS:Mbinaries}" != ""
+.  if "${angr_ARGS:Mbinaries}" != ""
 USE_GITHUB?=	yes
 GH_TUPLE+=	angr:binaries:${ANGR_BINARIES_TAGNAME}:binaries
 
@@ -43,15 +43,15 @@ GH_TUPLE+=	angr:binaries:${ANGR_BINARIES_TAGNAME}:binaries
 pre-test: angr-provide-test-binaries
 angr-provide-test-binaries:
 	@${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries
-.endif # "${angr_ARGS:Mbinaries}" != ""
+.  endif # "${angr_ARGS:Mbinaries}" != ""
 
-.if "${angr_ARGS:Mnose}" != ""
+.  if "${angr_ARGS:Mnose}" != ""
 # Ensure that python.mk variables are available.
-.  if !${USES:Mpython*}
+.    if !${USES:Mpython*}
 python_ARGS=	test
 _USES_POST+=		python:test
 .include "${USESDIR}/python.mk"
-.  endif # !${USES:Mpython*}
+.    endif # !${USES:Mpython*}
 
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 TEST_WRKSRC?=	${WRKSRC}/tests
@@ -60,6 +60,6 @@ ANGR_NOSETESTS?=	nosetests-${PYTHON_VER}
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${ANGR_NOSETESTS})
-.endif # "${angr_ARGS:Mnose}" != ""
+.  endif # "${angr_ARGS:Mnose}" != ""
 
 .endif
diff --git a/Mk/Uses/ansible.mk b/Mk/Uses/ansible.mk
index d46be3f98eed..6e0e2e9ba501 100644
--- a/Mk/Uses/ansible.mk
+++ b/Mk/Uses/ansible.mk
@@ -40,23 +40,23 @@
 _INCLUDE_USES_ANSIBLE_MK=	yes
 
 _valid_ARGS=    env module plugin
-.for _arg in ${ansible_ARGS}
-.  if !${_valid_ARGS:M${_arg}}
+.  for _arg in ${ansible_ARGS}
+.    if !${_valid_ARGS:M${_arg}}
 IGNORE=	USES=ansible: invalid argument: ${_arg}
-.  endif
-.endfor
-.if ${ansible_ARGS:[#]} != 1
+.    endif
+.  endfor
+.  if ${ansible_ARGS:[#]} != 1
 IGNORE=	USES=ansible: too many arguments: ${ansible_ARGS}
-.endif
-.if empty(ansible_ARGS)
+.  endif
+.  if empty(ansible_ARGS)
 IGNORE=	USES=ansible: no arguments specified
-.endif
+.  endif
 
-.if !${USES:Mpython*}
+.  if !${USES:Mpython*}
 python_ARGS=	env
 _USES_POST+=		python:env
 .include "${USESDIR}/python.mk"
-.endif
+.  endif
 
 ANSIBLE_CMD?=		${LOCALBASE}/bin/ansible
 ANSIBLE_DOC_CMD?=	${LOCALBASE}/bin/ansible-doc
@@ -65,16 +65,16 @@ ANSIBLE_RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLA
 ANSIBLE_DATADIR?=		${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible
 ANSIBLE_ETCDIR?=		${PREFIX}/etc/ansible
 ANSIBLE_PLUGINS_PREFIX?=	${ANSIBLE_DATADIR}/plugins
-.if ${ansible_ARGS} == "module"
+.  if ${ansible_ARGS} == "module"
 ANSIBLE_MODULESDIR?=		${ANSIBLE_PLUGINS_PREFIX}/modules
-.elif ${ansible_ARGS} == "plugin"
-.  if empty(ANSIBLE_PLUGIN_TYPE)
+.  elif ${ansible_ARGS} == "plugin"
+.    if empty(ANSIBLE_PLUGIN_TYPE)
 IGNORE=	ANSIBLE_PLUGIN_TYPE must be set
-.  endif
+.    endif
 ANSIBLE_PLUGINSDIR?=		${ANSIBLE_PLUGINS_PREFIX}/${ANSIBLE_PLUGIN_TYPE}
-.endif
+.  endif
 
-.if ${ansible_ARGS} == "module" || ${ansible_ARGS} == "plugin"
+.  if ${ansible_ARGS} == "module" || ${ansible_ARGS} == "plugin"
 RUN_DEPENDS+=	${ANSIBLE_RUN_DEPENDS}
-.endif
+.  endif
 .endif
diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk
index 244001c4d5ed..c711648af941 100644
--- a/Mk/Uses/apache.mk
+++ b/Mk/Uses/apache.mk
@@ -85,78 +85,78 @@ _ERROR_MSG=	: Error from apache.mk.
 # Important Note:
 #  The "+" sign is only valid as last sign, not between
 #  two versions or in combination with range!
-.if defined(apache_ARGS) && !empty(apache_ARGS)
+.  if defined(apache_ARGS) && !empty(apache_ARGS)
 # Preserve original arguments list
 _APACHE_ARGS=		${apache_ARGS}
-.	if ${_APACHE_ARGS:Mserver} || ${_APACHE_ARGS:Mcommon}
+.    if ${_APACHE_ARGS:Mserver} || ${_APACHE_ARGS:Mcommon}
 _APACHE_PORT_IS_SERVER=	yes
 _APACHE_ARGS:=		${_APACHE_ARGS:Nserver}
-.	endif
-.	if ${_APACHE_ARGS:Mbuild}
+.    endif
+.    if ${_APACHE_ARGS:Mbuild}
 _APACHE_BUILD_DEP=	yes
 _APACHE_ARGS:=		${_APACHE_ARGS:Nbuild}
-.	endif
-.	if ${_APACHE_ARGS:Mrun}
+.    endif
+.    if ${_APACHE_ARGS:Mrun}
 _APACHE_RUN_DEP=	yes
 _APACHE_ARGS:=		${_APACHE_ARGS:Nrun}
-.	endif
-.	if empty(_APACHE_ARGS)
+.    endif
+.    if empty(_APACHE_ARGS)
 _APACHE_ARGS=		${APACHE_DEFAULT}
-.	endif
+.    endif
 # _APACHE_ARGS must now contain a version(-range)
-.	if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//)
+.    if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//)
 IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
 # Catch USES= apache:[min]-[max]+
-.	elif ${apache_ARGS:C/[.a-z0-9]//g} == "-+"
+.    elif ${apache_ARGS:C/[.a-z0-9]//g} == "-+"
 IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
-.	endif
-.endif # defined(apache_ARGS)
+.    endif
+.  endif # defined(apache_ARGS)
 
 # The port does not specify a build, run or server dependency, assume both
 # build and run are required.
-.if !defined(_APACHE_BUILD_DEP) && !defined(_APACHE_RUN_DEP) && \
+.  if !defined(_APACHE_BUILD_DEP) && !defined(_APACHE_RUN_DEP) && \
 	!defined(_APACHE_PORT_IS_SERVER)
 _APACHE_BUILD_DEP=	yes
 _APACHE_RUN_DEP=	yes
-.endif
+.  endif
 
-.if defined(DEFAULT_APACHE_VER)
+.  if defined(DEFAULT_APACHE_VER)
 IGNORE+=	"DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
-.endif
+.  endif
 
-.if defined(WITH_MODULES) || defined(WITHOUT_MODULES)
+.  if defined(WITH_MODULES) || defined(WITHOUT_MODULES)
 IGNORE=	${_ERROR_MSG} WITH(OUT)_MODULES has been removed, use www_${PORTNAME}_(UN)SET
-.endif
+.  endif
 
 # ===============================================================
-.if defined(_APACHE_PORT_IS_SERVER)
+.  if defined(_APACHE_PORT_IS_SERVER)
 
 # Module selection
-.for category in ${DEFAULT_MODULES_CATEGORIES}
+.    for category in ${DEFAULT_MODULES_CATEGORIES}
 DEFAULT_MODULES+=	${${category}_MODULES}
-.endfor
+.    endfor
 
-.for category in ${ALL_MODULES_CATEGORIES}
+.    for category in ${ALL_MODULES_CATEGORIES}
 AVAILABLE_MODULES+=	${${category}_MODULES}
-.endfor
+.    endfor
 
 # OPTIONS handling
-.for module in ${AVAILABLE_MODULES}
-.	if ${PORT_OPTIONS:M${module}}
+.    for module in ${AVAILABLE_MODULES}
+.      if ${PORT_OPTIONS:M${module}}
 _APACHE_ENABLED_MODS+=	${module}
-.	else
+.      else
 _APACHE_DISABLED_MODS+=	${module}
-.	endif
-.endfor
+.      endif
+.    endfor
 
-.if !defined(WITH_STATIC_APACHE)
+.    if !defined(WITH_STATIC_APACHE)
 CONFIGURE_ARGS+=	--enable-so
-.else
+.    else
 CONFIGURE_ARGS+=	--disable-so
 WITH_ALL_STATIC_MODULES=	yes
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MSUEXEC}
+.    if ${PORT_OPTIONS:MSUEXEC}
 _APACHE_ENABLED_MODS+=	${SUEXEC_MODULES}
 SUEXEC_CONFARGS=	with-suexec
 
@@ -165,11 +165,11 @@ SUEXEC_DOCROOT?=	${PREFIX}/www/data
 #SUEXEC_DOCROOT?=	${WWWDIR}
 SUEXEC_USERDIR?=	public_html
 # avoid duplicate search paths
-.if ${LOCALBASE} == ${PREFIX}
+.      if ${LOCALBASE} == ${PREFIX}
 SUEXEC_SAFEPATH?=	${LOCALBASE}/bin:/usr/bin:/bin
-.else
+.      else
 SUEXEC_SAFEPATH?=	${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin
-.endif
+.      endif
 SUEXEC_LOGFILE?=	/var/log/httpd-suexec.log
 SUEXEC_UIDMIN?=		1000
 SUEXEC_GIDMIN?=		1000
@@ -182,69 +182,69 @@ CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-caller=${SUEXEC_CALLER} \
 			--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
 			--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
 
-.	if defined(WITH_SUEXEC_UMASK)
+.      if defined(WITH_SUEXEC_UMASK)
 CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
-.	endif
+.      endif
 
-.	if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
+.      if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
 CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
-.	endif
+.      endif
 
-.endif
+.    endif
 
-.if !defined(_APACHE_DISABLED_MODS)
+.    if !defined(_APACHE_DISABLED_MODS)
 APACHE_MODULES=		${_APACHE_ENABLED_MODS}
-.else
-.for module in ${_APACHE_ENABLED_MODS:O:u}
-.	if !${_APACHE_DISABLED_MODS:M${module}}
+.    else
+.      for module in ${_APACHE_ENABLED_MODS:O:u}
+.        if !${_APACHE_DISABLED_MODS:M${module}}
 APACHE_MODULES+=	${module}
-.	endif
-.endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
-.if defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
+.    if defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
-.endif
+.    endif
 
-.for module in ${AVAILABLE_MODULES}
-.	if !empty(WITH_STATIC_MODULES:M${module})
+.    for module in ${AVAILABLE_MODULES}
+.      if !empty(WITH_STATIC_MODULES:M${module})
 CONFIGURE_ARGS+=	--enable-${module:tl}=static
 PLIST_SUB+=	MOD_${module}="@comment "
-.	elif !empty(APACHE_MODULES:M${module})
+.      elif !empty(APACHE_MODULES:M${module})
 CONFIGURE_ARGS+=	--enable-${module:tl}=shared
 PLIST_SUB+=	MOD_${module}=""
-.	else
+.      else
 CONFIGURE_ARGS+=	--disable-${module:tl}
 PLIST_SUB+=	MOD_${module}="@comment "
-.	endif
-.endfor
+.      endif
+.    endfor
 
 # pkg-plist workaround STATIC support
-.if ${PORT_OPTIONS:MSUEXEC}
+.    if ${PORT_OPTIONS:MSUEXEC}
 PLIST_SUB+=	SUEXEC=""
-.else
+.    else
 PLIST_SUB+=	SUEXEC="@comment "
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MLOG_FORENSIC}
+.    if ${PORT_OPTIONS:MLOG_FORENSIC}
 PLIST_SUB+=	FORENSIC=""
-.else
+.    else
 PLIST_SUB+=	FORENSIC="@comment "
-.endif
+.    endif
 
 #### End of _APACHE_PORT_IS_SERVER ####
 
 # ===============================================================
-.else
+.  else
 HTTPD?=		${LOCALBASE}/sbin/httpd
 
 MODULENAME?=	${PORTNAME}
 SHORTMODNAME?=	${MODULENAME:S/mod_//}
 SRC_FILE?=	${MODULENAME}.c
 
-.if exists(${HTTPD})
+.    if exists(${HTTPD})
 _APACHE_VERSION!=	${HTTPD} -v | ${SED} -ne 's/^Server version: Apache\/\([1-9]\.[0-9]*\).*/\1/p'
-.endif
+.    endif
 
 # Validate Apache version whether it meets the version restriction.
 _APACHE_VERSION_CHECK:=		${_APACHE_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}
@@ -255,56 +255,56 @@ _APACHE_VERSION_MAX:=		${_APACHE_VERSION_MAX_TMP:M[1-9].[0-9]}
 
 # Remove from _WANTED_VERSIONS that which is not wanted
 _APACHE_WANTED_VERSIONS=	${_APACHE_SUPPORTED_VERSIONS}
-.for _ver in ${_APACHE_SUPPORTED_VERSIONS:O}
-.	if !empty(_APACHE_VERSION_MIN) && ${_ver} < ${_APACHE_VERSION_MIN}
+.    for _ver in ${_APACHE_SUPPORTED_VERSIONS:O}
+.      if !empty(_APACHE_VERSION_MIN) && ${_ver} < ${_APACHE_VERSION_MIN}
 _APACHE_WANTED_VERSIONS:=	${_APACHE_WANTED_VERSIONS:N${_ver}}
-.	endif
-.	if !empty(_APACHE_VERSION_MAX) && ${_ver} > ${_APACHE_VERSION_MAX}
+.      endif
+.      if !empty(_APACHE_VERSION_MAX) && ${_ver} > ${_APACHE_VERSION_MAX}
 _APACHE_WANTED_VERSIONS:=	${_APACHE_WANTED_VERSIONS:N${_ver}}		
-.	endif
-.endfor
+.      endif
+.    endfor
 
 # Check if installed Apache version matches a wanted version
-.if defined(_APACHE_VERSION) && $(_APACHE_WANTED_VERSIONS:M${_APACHE_VERSION})
+.    if defined(_APACHE_VERSION) && $(_APACHE_WANTED_VERSIONS:M${_APACHE_VERSION})
 _APACHE_WANTED_VERSION=	${_APACHE_VERSION}
-.endif
+.    endif
 # Select Apache version if not already set
-.for _ver in ${APACHE_DEFAULT} ${_APACHE_SUPPORTED_VERSIONS}
-.	if !defined(_APACHE_WANTED_VERSION) && ${_APACHE_WANTED_VERSIONS:M${_ver}}
+.    for _ver in ${APACHE_DEFAULT} ${_APACHE_SUPPORTED_VERSIONS}
+.      if !defined(_APACHE_WANTED_VERSION) && ${_APACHE_WANTED_VERSIONS:M${_ver}}
 _APACHE_WANTED_VERSION=	${_ver}
-.	endif
-.endfor
+.      endif
+.    endfor
 
 APACHE_VERSION:=	${_APACHE_WANTED_VERSION}
 
-.if defined(_APACHE_VERSION) && ${_APACHE_VERSION} != ${APACHE_VERSION}
+.    if defined(_APACHE_VERSION) && ${_APACHE_VERSION} != ${APACHE_VERSION}
 BROKEN=	${_ERROR_MSG} Apache ${_APACHE_VERSION} is installed and port requires ${_APACHE_WANTED_VERSION}
-.endif
+.    endif
 
-.if ${APACHE_VERSION} >= 2.5
+.    if ${APACHE_VERSION} >= 2.5
 APXS?=	${LOCALBASE}/bin/apxs
-.else
+.    else
 APXS?=	${LOCALBASE}/sbin/apxs
-.endif
+.    endif
 
-.if exists(${APXS})
+.    if exists(${APXS})
 APXS_PREFIX!=	${APXS} -q prefix 2> /dev/null || echo NULL
-.	if ${APXS_PREFIX} == NULL
+.      if ${APXS_PREFIX} == NULL
 IGNORE=	: Your apache does not support DSO modules
-.	endif
-.	if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
+.      endif
+.      if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
 IGNORE?=	PREFIX must be equal to APXS_PREFIX.
-.	endif
-.endif
+.      endif
+.    endif
 
 APACHEMODDIR=		libexec/apache${APACHE_VERSION:S/.//}
 APACHEINCLUDEDIR=	include/apache${APACHE_VERSION:S/.//}
 APACHEETCDIR=		etc/apache${APACHE_VERSION:S/.//}
-.if ${APACHE_VERSION} == 2.5
+.    if ${APACHE_VERSION} == 2.5
 _APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}-devel
-.else
+.    else
 _APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}
-.endif
+.    endif
 
 PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \
 		APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \
@@ -317,44 +317,44 @@ SUB_LIST+=	APACHEMODDIR="${APACHEMODDIR}" \
 
 APACHE_PKGNAMEPREFIX=	ap${APACHE_VERSION:S/.//}-
 
-.if defined(AP_FAST_BUILD)
+.    if defined(AP_FAST_BUILD)
 PKGNAMEPREFIX?=	${APACHE_PKGNAMEPREFIX}
-.endif
+.    endif
 
-.if defined(_APACHE_BUILD_DEP)
+.    if defined(_APACHE_BUILD_DEP)
 BUILD_DEPENDS+=	${APXS}:${_APACHE_PORT}
-.endif
+.    endif
 
-.if defined(_APACHE_RUN_DEP)
+.    if defined(_APACHE_RUN_DEP)
 RUN_DEPENDS+=	${APXS}:${_APACHE_PORT}
-.endif
+.    endif
 
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
 PLIST_SUB+=	AP_MODULE="${MODULENAME}.so"
 
-.if defined(AP_GENPLIST)
+.    if defined(AP_GENPLIST)
 PLIST?=		${WRKDIR}/ap-plist
-.endif
+.    endif
 
-.if defined(AP_INC)
+.    if defined(AP_INC)
 AP_EXTRAS+=	-I ${AP_INC}
-.endif
-.if defined(AP_LIB)
+.    endif
+.    if defined(AP_LIB)
 AP_EXTRAS+=	-L ${AP_LIB}
-.endif
+.    endif
 
-.endif # End of _APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MOULE
+.  endif # End of _APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MOULE
 .endif # End of !_INCLUDE_USES_APACHE_PRE_MK
 
 # ===============================================================
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_APACHE_POST_MK)
 _INCLUDE_USES_APACHE_POST_MK=	apache.mk
-.if defined(NO_BUILD) && !defined(_APACHE_RUN_DEP)
+.  if defined(NO_BUILD) && !defined(_APACHE_RUN_DEP)
 BROKEN=	If NO_BUILD is used, then apache:run is sufficient. Please fix your Makefile
-.endif
+.  endif
 
-.if defined(_APACHE_PORT_IS_SERVER)
-.if !target(print-closest-mirrors)
+.  if defined(_APACHE_PORT_IS_SERVER)
+.    if !target(print-closest-mirrors)
 print-closest-mirrors:
 	@${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2
 	@MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\
@@ -364,72 +364,72 @@ print-closest-mirrors:
 	${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\
 	${ECHO_MSG} $$MIRRORS; else \
 	${ECHO_MSG} "No mirrors found!">&2 ; fi
-.endif
+.    endif
 
-.if !target(show-modules)
+.    if !target(show-modules)
 show-modules:
-.if !empty(APACHE_MODULES)
-.for module in ${AVAILABLE_MODULES}
+.      if !empty(APACHE_MODULES)
+.        for module in ${AVAILABLE_MODULES}
 	@${PRINTF} "%-20s : " ${module}
-.	if ${APACHE_MODULES:M${module}}
+.          if ${APACHE_MODULES:M${module}}
 		@${ECHO_CMD} -n "enabled "
-.		if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
+.            if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
 			@${ECHO_CMD} " (static)"
-.		else
+.            else
 			@${ECHO_CMD} "(shared)"
-.		endif
-.	else
+.            endif
+.          else
 		@${ECHO_CMD} disabled
-.	endif
-.endfor
-.else
-.for module in ${AVAILABLE_MODULES}
+.          endif
+.        endfor
+.      else
+.        for module in ${AVAILABLE_MODULES}
 	@${PRINTF} "%-20s : disabled\n" ${module}
-.endfor
-.endif
-.endif
+.        endfor
+.      endif
+.    endif
 
-.else
+.  else
 
-.if defined(AP_MODENABLE)
+.    if defined(AP_MODENABLE)
 AP_MOD_EN=	-a
-.else
+.    else
 AP_MOD_EN=	-A
-.endif
+.    endif
 PLIST_SUB+=	AP_MOD_EN="${AP_MOD_EN}"
 
-.if defined(AP_FAST_BUILD)
-.if !target(ap-gen-plist)
+.    if defined(AP_FAST_BUILD)
+.      if !target(ap-gen-plist)
 _USES_build+=	490:ap-gen-plist
 ap-gen-plist:
-.if defined(AP_GENPLIST)
-.	if !exists(${PLIST})
+.        if defined(AP_GENPLIST)
+.          if !exists(${PLIST})
 	@${ECHO_MSG} "===>  Generating apache plist"
 	@${ECHO_CMD} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
 	@${ECHO_CMD} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
 	@${ECHO_CMD} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
 	@${ECHO_CMD} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"" >> ${PLIST}
-.	endif
-.endif
-.endif
+.          endif
+.        endif
+.      endif
 
-.if !target(do-build)
+.      if !target(do-build)
 do-build:
 	(cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.la ${SRC_FILE})
-.endif
+.      endif
 
-.if !target(do-install)
+.      if !target(do-install)
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.la
-.	if !defined(DEBUG)
+.        if !defined(DEBUG)
 		@${ECHO_MSG} "===> strip ${APACHEMODDIR}/${MODULENAME}.so"
 		@[ -e ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
-.	else
+.        else
 		@${ECHO_MSG} "===> DEBUG is set, will not strip ${APACHEMODDIR}/${MODULENAME}.so"
-.	endif
-.endif
+.        endif
+.      endif
 
-.endif          # defined(AP_FAST_BUILD)
-.endif          # defined(_APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MODULE)
+.    endif          # defined(AP_FAST_BUILD)
+.  endif          # defined(_APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MODULE)
 .endif          # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_APACHE_PRE_MK)
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index ac50a82f2af3..8353e5a01818 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -65,27 +65,27 @@ _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
 		automake>=1.16.1:devel/automake
 
-.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
+.  if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
 BUILD_DEPENDS+=	libtoolize:devel/libtool
-.endif
+.  endif
 
-.if empty(autoreconf_ARGS)
+.  if empty(autoreconf_ARGS)
 _USES_configure+=	470:do-autoreconf
 do-autoreconf:
-.for f in AUTHORS ChangeLog INSTALL NEWS README
+.    for f in AUTHORS ChangeLog INSTALL NEWS README
 # Don't modify time stamps if the files already exist
 	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
-.endfor
-.if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
+.    endfor
+.    if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
 	@(cd ${AUTORECONF_WRKSRC} && \
 		if test -f configure.ac; then configure=configure.ac; \
 		else configure=configure.in; fi && \
 		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
 		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
-.endif
+.    endif
 	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
-.elif ! ${autoreconf_ARGS:Mbuild}
+.  elif ! ${autoreconf_ARGS:Mbuild}
 IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk
index c80db16b58a2..645b9e9a7b0e 100644
--- a/Mk/Uses/bdb.mk
+++ b/Mk/Uses/bdb.mk
@@ -45,9 +45,9 @@
 .if !defined(_INCLUDE_USES_BDB_MK)
 _INCLUDE_USES_BDB_MK=	yes
 
-.if !empty(bdb_ARGS)
+.  if !empty(bdb_ARGS)
 _bdb_ARGS:=	${bdb_ARGS}
-.endif
+.  endif
 _bdb_ARGS?=	yes
 
 # TODO: avoid malformed conditional with invalid _bdb_ARGS/BDB_DEFAULT
@@ -63,9 +63,9 @@ _DB_DEFAULTS=	5
 #   Since 2020-12-02, this name is not fitting too much but
 #   retained for now for compatibility. The name of this variable
 #   is subject to change especially once db6 were removed.
-. if defined(WITH_BDB6_PERMITTED)
+.  if defined(WITH_BDB6_PERMITTED)
 _DB_DEFAULTS+=	18
-. endif
+.  endif
 
 # Dependency lines for different db versions
 db5_DEPENDS=	libdb-5.3.so:databases/db5
@@ -76,120 +76,120 @@ db18_FIND=	${LOCALBASE}/include/db18/db.h
 
 # Override the global BDB_DEFAULT with the
 # port specific <BDB_UNIQUENAME>_WITH_BDB_VER
-.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
+.  if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
 BDB_DEFAULT=	${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
-.endif
+.  endif
 
 # Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
 # ask for a more specific version.
-. if ${_bdb_ARGS} == yes
-.  if ${BDB_DEFAULT} != 1
+.  if ${_bdb_ARGS} == yes
+.    if ${BDB_DEFAULT} != 1
 _bdb_ARGS=	${BDB_DEFAULT}
-.  else
+.    else
 _bdb_ARGS:=	5+
+.    endif
 .  endif
-. endif
 
 # Compatiblity hack:
 # upgrade older plussed versions to 5+
 _BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+
-.for i in ${_bdb_ARGS}
-. if ${_BDB_OLDPLUSVERS:M${i}}
+.  for i in ${_bdb_ARGS}
+.    if ${_BDB_OLDPLUSVERS:M${i}}
 _bdb_ARGS:=	5+
-. endif
-.endfor
+.    endif
+.  endfor
 
 # 1. detect installed versions
 _INST_BDB_VER=
-.for bdb in ${_DB_PORTS}
-. if exists(${db${bdb}_FIND})
+.  for bdb in ${_DB_PORTS}
+.    if exists(${db${bdb}_FIND})
 _INST_BDB_VER+=${bdb}
-. endif
-.endfor
+.    endif
+.  endfor
 
 # 2. parse supported versions:
 # 2a. build list from _bdb_ARGS
 _SUPP_BDB_VER=
 __bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
-.if !empty(_bdb_ARGS:M*+)
-. for bdb in ${_DB_PORTS}
-.  if ${__bdb_ARGS} <= ${bdb}
+.  if !empty(_bdb_ARGS:M*+)
+.    for bdb in ${_DB_PORTS}
+.      if ${__bdb_ARGS} <= ${bdb}
 _SUPP_BDB_VER+=${bdb:C/\.//}
-.  endif
-. endfor
-.else
+.      endif
+.    endfor
+.  else
 _SUPP_BDB_VER=${_bdb_ARGS}
-.endif
+.  endif
 # 2b. expand INVALID_BDB_VER if given with "+":
-.if !empty(INVALID_BDB_VER:M*+)
+.  if !empty(INVALID_BDB_VER:M*+)
 _INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
 _INV_BDB_VER:=
-. for bdb in ${_DB_PORTS}
-.  if ${_INV_BDB} <= ${bdb}
+.    for bdb in ${_DB_PORTS}
+.      if ${_INV_BDB} <= ${bdb}
 _INV_BDB_VER+=${bdb:C/\.//}
-.  endif
-. endfor
-.else
+.      endif
+.    endfor
+.  else
 _INV_BDB_VER:=${INVALID_BDB_VER}
-.endif
+.  endif
 # 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER
-.for unsupp in ${_INV_BDB_VER}
+.  for unsupp in ${_INV_BDB_VER}
 _SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}}
-.endfor
+.  endfor
 
 # 3a. calculate intersection in _INST_BDB_VER to see if there
 # is a usable installed version
-.for i in ${_INST_BDB_VER}
-. if empty(_SUPP_BDB_VER:M${i})
+.  for i in ${_INST_BDB_VER}
+.    if empty(_SUPP_BDB_VER:M${i})
 _INST_BDB_VER:=	${_INST_BDB_VER:N${i}}
-. endif
-.endfor
+.    endif
+.  endfor
 _ELIGIBLE_BDB_VER:=${_INST_BDB_VER}
 
 # 3b. if there is no usable version installed, check defaults
-.if empty(_INST_BDB_VER)
+.  if empty(_INST_BDB_VER)
 _DFLT_BDB_VER:=${_DB_DEFAULTS}
 # make sure we use a reasonable version for package builds
 _WITH_BDB_HIGHEST=yes
-. for i in ${_DFLT_BDB_VER}
-.  if empty(_SUPP_BDB_VER:M${i})
+.    for i in ${_DFLT_BDB_VER}
+.      if empty(_SUPP_BDB_VER:M${i})
 _DFLT_BDB_VER:=	${_DFLT_BDB_VER:N${i}}
-.  endif
-. endfor
+.      endif
+.    endfor
 _ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}
-.endif
+.  endif
 
 # 4. elect a version
 _BDB_VER=
-.for i in ${_ELIGIBLE_BDB_VER}
-. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER})
+.  for i in ${_ELIGIBLE_BDB_VER}
+.    if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER})
 _BDB_VER:=${i}
-. endif
-.endfor
+.    endif
+.  endfor
 
 # 5. catch errors or set variables
-.if empty(_BDB_VER)
+.  if empty(_BDB_VER)
 IGNORE=		cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb
-.else
-. if defined(BDB_BUILD_DEPENDS)
+.  else
+.    if defined(BDB_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
-. else
+.    else
 LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
-. endif
-. if ${_BDB_VER} == 5
+.    endif
+.    if ${_BDB_VER} == 5
 BDB_LIB_NAME=		db-5.3
 BDB_LIB_CXX_NAME=	db_cxx-5.3
 BDB_LIB_DIR=		${LOCALBASE}/lib/db5
-. elif ${_BDB_VER} == 18
+.    elif ${_BDB_VER} == 18
 BDB_LIB_NAME=		db-18.1
 BDB_LIB_CXX_NAME=	db_cxx-18.1
 BDB_LIB_DIR=		${LOCALBASE}/lib/db18
-. endif
+.    endif
 BDB_LIB_NAME?=		db${_BDB_VER}
 BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
 BDB_INCLUDE_DIR?=	${LOCALBASE}/include/db${_BDB_VER}
 BDB_LIB_DIR?=		${LOCALBASE}/lib
-.endif
+.  endif
 BDB_VER=	${_BDB_VER}
 
 debug-bdb:
@@ -220,21 +220,21 @@ debug-bdb:
 # Obsolete variables - ports can define these to want users about
 # variables that may be in /etc/make.conf but that are no longer
 # effective:
-.if defined(OBSOLETE_BDB_VAR)
-. for var in ${OBSOLETE_BDB_VAR}
-.  if defined(${var})
+.  if defined(OBSOLETE_BDB_VAR)
+.    for var in ${OBSOLETE_BDB_VAR}
+.      if defined(${var})
 BAD_VAR+=	${var},
-.  endif
-. endfor
-. if defined(BAD_VAR)
+.      endif
+.    endfor
+.    if defined(BAD_VAR)
 _IGNORE_MSG=	Obsolete variable(s) ${BAD_VAR} use DEFAULT_VERSIONS or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version
-.  if defined(IGNORE)
+.      if defined(IGNORE)
 IGNORE+= ${_IGNORE_MSG}
-.  else
+.      else
 IGNORE=	${_IGNORE_MSG}
+.      endif
+.    endif
 .  endif
-. endif
-.endif
 
 
 .endif
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
index e74526f7087a..ed3f5cad2a3c 100644
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@@ -16,23 +16,23 @@ _INCLUDE_USES_BISON_MK=	yes
 
 _BISON_DEPENDS=	bison:devel/bison
 
-.if empty(bison_ARGS)
+.  if empty(bison_ARGS)
 bison_ARGS=	build
-.endif
+.  endif
 
-.if ${bison_ARGS} == "build"
+.  if ${bison_ARGS} == "build"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
-.elif ${bison_ARGS} == "run"
+.  elif ${bison_ARGS} == "run"
 RUN_DEPENDS+=	${_BISON_DEPENDS}
-.elif ${bison_ARGS} == "both"
+.  elif ${bison_ARGS} == "both"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
 RUN_DEPENDS+=	${_BISON_DEPENDS}
-.elif ${bison_ARGS} == "alias"
+.  elif ${bison_ARGS} == "alias"
 BINARY_ALIAS+=	bison=byacc
-.elif ${bison_ARGS} == "wrapper"
+.  elif ${bison_ARGS} == "wrapper"
 BINARY_WRAPPERS+=	bison
-.else
+.  else
 IGNORE=	USES=bison - invalid args: [${bison_ARGS}] specified
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk
index 6a9d7f2c1320..467173412d07 100644
--- a/Mk/Uses/blaslapack.mk
+++ b/Mk/Uses/blaslapack.mk
@@ -15,35 +15,35 @@ _valid_ARGS=	atlas gotoblas netlib openblas
 
 _DEFAULT_BLASLAPACK=	netlib
 
-.if empty(blaslapack_ARGS)
+.  if empty(blaslapack_ARGS)
 blaslapack_ARGS=	${_DEFAULT_BLASLAPACK}
-.endif
+.  endif
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if ${blaslapack_ARGS} == atlas
+.  if ${blaslapack_ARGS} == atlas
 LIB_DEPENDS+=	libatlas.so:math/atlas
 _BLASLIB=	ptf77blas
 LAPACKLIB=	-lalapack -lptcblas
 _ATLASLIB=	atlas
 ATLASLIB=	-l${_ATLASLIB}
-.elif ${blaslapack_ARGS} == gotoblas
+.  elif ${blaslapack_ARGS} == gotoblas
 LIB_DEPENDS+=	libgoto2.so:math/gotoblas
 LIB_DEPENDS+=	liblapack.so:math/lapack
 _BLASLIB=	goto2p
 LAPACKLIB=	-lgoto2p
-.elif ${blaslapack_ARGS} == netlib
+.  elif ${blaslapack_ARGS} == netlib
 LIB_DEPENDS+=	libblas.so:math/blas
 LIB_DEPENDS+=	liblapack.so:math/lapack
 _BLASLIB=	blas
 LAPACKLIB=	-llapack
-.elif ${blaslapack_ARGS} == openblas
+.  elif ${blaslapack_ARGS} == openblas
 LIB_DEPENDS+=	libopenblas.so:math/openblas
 _BLASLIB=	openblas
 LAPACKLIB=	-lopenblas
-.else
+.  else
 IGNORE=		USES=blaslapack: invalid arguments: ${blaslapack_ARGS}
-.endif
+.  endif
 
 BLASLIB=	-l${_BLASLIB}
 
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index ce7cba801d69..6c6872eb0024 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -247,9 +247,9 @@ do-install:
 	${ECHO_CMD} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe}
 	${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
 	${ECHO_CMD} 'export ${exe:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
-.         for dep in ${${exe}_DATADIR_VARS}
+.        for dep in ${${exe}_DATADIR_VARS}
 	${ECHO_CMD} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
-.         endfor
+.        endfor
 	${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
 	${ECHO_CMD} 'exec ${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${exe}
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index ed6d2c8cfc42..4d4a0921abfc 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -10,9 +10,9 @@
 .if !defined(_INCLUDE_USES_CARGO_MK)
 _INCLUDE_USES_CARGO_MK=	yes
 
-.if !empty(cargo_ARGS)
+.  if !empty(cargo_ARGS)
 IGNORE+=	USES=cargo takes no arguments
-.endif
+.  endif
 
 .sinclude "${MASTERDIR}/Makefile.crates"
 
@@ -37,15 +37,15 @@ CARGO_DIST_SUBDIR?=	rust/crates
 
 # Generate list of DISTFILES.
 # Prefer canonical file extension .crate going forward
-.if make(makesum)
+.  if make(makesum)
 CARGO_CRATE_EXT=	.crate
-.else
+.  else
 # If there is a rust/crates/*.tar.gz in distinfo keep using the old
 # extension.  We need to delay eval until the last moment for
 # DISTINFO_FILE.  We cache the command output to avoid multiple
 # slow grep runs for every CARGO_CRATE_EXT access.
 CARGO_CRATE_EXT=	${defined(_CARGO_CRATE_EXT_CACHE):?${_CARGO_CRATE_EXT_CACHE}:${:!if ${GREP} -q '\(${CARGO_DIST_SUBDIR}/.*\.tar\.gz\)' "${DISTINFO_FILE}" 2>/dev/null; then ${ECHO_CMD} .tar.gz; else ${ECHO_CMD} .crate; fi!:_=_CARGO_CRATE_EXT_CACHE}}
-.endif
+.  endif
 
 _CARGO_CRATES:=		${CARGO_CRATES:N*@git+*}
 _CARGO_GIT_SOURCES:=	${CARGO_CRATES:M*@git+*}
@@ -54,7 +54,7 @@ _CARGO_CRATES:=		${empty(_CARGO_CRATES):?:${_CARGO_CRATES:range:@i@$i ${_CARGO_C
 # split up crates into (index, crate, name, version) 4-tuples
 _CARGO_CRATES:=		${_CARGO_CRATES:C/^([-_a-zA-Z0-9]+)-([0-9].*)/\0 \1 \2/}
 
-.for _index _crate _name _version in ${_CARGO_CRATES}
+.  for _index _crate _name _version in ${_CARGO_CRATES}
 # Resolving CRATESIO alias is very inefficient with many MASTER_SITES, consume MASTER_SITE_CRATESIO directly
 MASTER_SITES+=	${MASTER_SITE_CRATESIO:S,%SUBDIR%,${_name}/${_version},:S,$,:_cargo_${_index},}
 DISTFILES+=	${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}:_cargo_${_index}
@@ -64,7 +64,7 @@ WRKSRC_crate_${_name}=	${CARGO_VENDOR_DIR}/${_crate}
 # ...  also with version suffix in case of multiple versions of the
 # same crate
 WRKSRC_crate_${_crate}=	${CARGO_VENDOR_DIR}/${_crate}
-.endfor
+.  endfor
 
 _CARGO_AWK=	${AWK} -vCP="${CP}" -vFIND="${FIND}" -vGREP="${GREP}" \
 		-vCARGO_VENDOR_DIR="${CARGO_VENDOR_DIR}" \
@@ -73,11 +73,11 @@ _CARGO_AWK=	${AWK} -vCP="${CP}" -vFIND="${FIND}" -vGREP="${GREP}" \
 		-f${SCRIPTSDIR}/split-url.awk \
 		-f${SCRIPTSDIR}/cargo-crates-git-common.awk -f
 
-.if !empty(_CARGO_GIT_SOURCES)
-.  for _index _site _filename _wrksrc _crates in ${:!${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates-git-fetch.awk /dev/null!}
+.  if !empty(_CARGO_GIT_SOURCES)
+.    for _index _site _filename _wrksrc _crates in ${:!${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates-git-fetch.awk /dev/null!}
 MASTER_SITES+=	${_site}:_cargo_git${_index}
 DISTFILES+=	${_filename}:_cargo_git${_index}
-.    for _crate in ${_crates:S/,/ /g}
+.      for _crate in ${_crates:S/,/ /g}
 # Make sure the build dependencies checks below can work for git sourced crates too
 _CARGO_CRATES+=	@git ${_crate} ${_crate} @git
 
@@ -89,16 +89,16 @@ _CARGO_CRATES+=	@git ${_crate} ${_crate} @git
 # cannot set make variables at that point.  This is better than
 # nothing.
 WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
+.      endfor
 .    endfor
-.  endfor
-.endif
+.  endif
 
 # Build dependencies.
 
 CARGO_BUILDDEP?=	yes
-.if ${CARGO_BUILDDEP:tl} == "yes"
+.  if ${CARGO_BUILDDEP:tl} == "yes"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.59.0:lang/${RUST_DEFAULT}
-.endif
+.  endif
 
 # Location of toolchain (default to lang/rust's toolchain)
 CARGO?=		${LOCALBASE}/bin/cargo
@@ -133,23 +133,23 @@ CARGO_ENV+= \
 	RUSTDOC=${RUSTDOC} \
 	RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:C/.+/-C link-arg=&/}"
 
-.if ${ARCH} != powerpc
+.  if ${ARCH} != powerpc
 CARGO_ENV+=	RUST_BACKTRACE=1
-.endif
+.  endif
 
 # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.  if ${ARCH} == amd64 || ${ARCH} == i386
 RUSTFLAGS+=	${CFLAGS:M-march=*:S/-march=/-C target-cpu=/}
-.elif ${ARCH:Mpowerpc*}
+.  elif ${ARCH:Mpowerpc*}
 RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/:S/power/pwr/}
-.else
+.  else
 RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
-.endif
+.  endif
 
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
+.  if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC?=	yes
 STRIP_CMD=	${LOCALBASE}/bin/strip # unsupported e_type with base strip
-.endif
+.  endif
 
 # Helper to shorten cargo calls.
 _CARGO_RUN=		${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO}
@@ -172,98 +172,98 @@ CARGO_TEST?=	yes
 # might cause issues for users that for some reason space limit
 # their /tmp.  WRKDIR should have plenty of space.
 # Allow users and ports to still overwrite it.
-.if ${TMPDIR:U/tmp} == /tmp
+.  if ${TMPDIR:U/tmp} == /tmp
 TMPDIR=		${WRKDIR}
-.endif
+.  endif
 
 # Manage crate features.
-.if !empty(CARGO_FEATURES:M--no-default-features)
+.  if !empty(CARGO_FEATURES:M--no-default-features)
 CARGO_BUILD_ARGS+=	--no-default-features
 CARGO_INSTALL_ARGS+=	--no-default-features
 CARGO_TEST_ARGS+=	--no-default-features
-.endif
-.if !empty(CARGO_FEATURES:N--no-default-features)
+.  endif
+.  if !empty(CARGO_FEATURES:N--no-default-features)
 CARGO_BUILD_ARGS+=	--features='${CARGO_FEATURES:N--no-default-features}'
 CARGO_INSTALL_ARGS+=	--features='${CARGO_FEATURES:N--no-default-features}'
 CARGO_TEST_ARGS+=	--features='${CARGO_FEATURES:N--no-default-features}'
-.endif
+.  endif
 
-.if !defined(WITH_DEBUG)
+.  if !defined(WITH_DEBUG)
 CARGO_BUILD_ARGS+=	--release
 CARGO_TEST_ARGS+=	--release
-.else
+.  else
 CARGO_INSTALL_ARGS+=	--debug
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mcmake}
+.  if ${_CARGO_CRATES:Mcmake}
 BUILD_DEPENDS+=	cmake:devel/cmake
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mgettext-sys}
+.  if ${_CARGO_CRATES:Mgettext-sys}
 CARGO_ENV+=	GETTEXT_BIN_DIR=${LOCALBASE}/bin \
 		GETTEXT_INCLUDE_DIR=${LOCALBASE}/include \
 		GETTEXT_LIB_DIR=${LOCALBASE}/lib
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mjemalloc-sys}
+.  if ${_CARGO_CRATES:Mjemalloc-sys}
 BUILD_DEPENDS+=	gmake:devel/gmake
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mlibgit2-sys}
+.  if ${_CARGO_CRATES:Mlibgit2-sys}
 # Use the system's libgit2 instead of building the bundled version
 CARGO_ENV+=	LIBGIT2_SYS_USE_PKG_CONFIG=1
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mlibssh2-sys}
+.  if ${_CARGO_CRATES:Mlibssh2-sys}
 # Use the system's libssh2 instead of building the bundled version
 CARGO_ENV+=	LIBSSH2_SYS_USE_PKG_CONFIG=1
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Monig_sys}
+.  if ${_CARGO_CRATES:Monig_sys}
 # onig_sys always prefers the system library but will try to link
 # statically with it.  Since devel/oniguruma doesn't provide a static
 # library it'll link to libonig.so instead.  Strictly speaking setting
 # RUSTONIG_SYSTEM_LIBONIG is not necessary, but will force onig_sys to
 # always use the system's libonig as returned by `pkg-config oniguruma`.
 CARGO_ENV+=	RUSTONIG_SYSTEM_LIBONIG=1
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mopenssl-src}
+.  if ${_CARGO_CRATES:Mopenssl-src}
 DEV_WARNING+=	"Please make sure this port uses the system OpenSSL and consider removing CARGO_CRATES=${CARGO_CRATES:Mopenssl-src-[0-9]*} (a vendored copy of OpenSSL) from the build, e.g., by patching Cargo.toml appropriately."
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mopenssl-sys}
+.  if ${_CARGO_CRATES:Mopenssl-sys}
 # Make sure that openssl-sys can find the correct version of OpenSSL
 CARGO_ENV+=	OPENSSL_LIB_DIR=${OPENSSLLIB} \
 		OPENSSL_INCLUDE_DIR=${OPENSSLINC}
-.endif
+.  endif
 
-.if ${_CARGO_CRATES:Mpkg-config}
+.  if ${_CARGO_CRATES:Mpkg-config}
 .include "${USESDIR}/pkgconfig.mk"
-.endif
+.  endif
 
-.for _index _crate _name _version in ${_CARGO_CRATES}
+.  for _index _crate _name _version in ${_CARGO_CRATES}
 # Split up semantic version and try to sanitize it by removing
 # pre-release identifier (-) or build metadata (+)
-.  if ${_version:S/./ /:S/./ /:C/[-+].*//:_:[#]} == 3
-.    for _major _minor _patch in $_
+.    if ${_version:S/./ /:S/./ /:C/[-+].*//:_:[#]} == 3
+.      for _major _minor _patch in $_
 # FreeBSD 12.0 changed ABI: r318736 and r320043
 # https://github.com/rust-lang/libc/commit/78f93220d70e
 # https://github.com/rust-lang/libc/commit/969ad2b73cdc
-.      if ${_name} == libc && ${_major} == 0 && (${_minor} < 2 || (${_minor} == 2 && ${_patch} < 38))
+.        if ${_name} == libc && ${_major} == 0 && (${_minor} < 2 || (${_minor} == 2 && ${_patch} < 38))
 DEV_ERROR+=	"CARGO_CRATES=${_crate} may be unstable on FreeBSD 12.0. Consider updating to the latest version \(higher than 0.2.37\)."
-.      endif
-.      if ${_name} == libc && ${_major} == 0 && (${_minor} < 2 || (${_minor} == 2 && ${_patch} < 49))
+.        endif
+.        if ${_name} == libc && ${_major} == 0 && (${_minor} < 2 || (${_minor} == 2 && ${_patch} < 49))
 DEV_ERROR+=	"CARGO_CRATES=${_crate} may be unstable on aarch64 or not build on armv6, armv7, powerpc64. Consider updating to the latest version \(higher than 0.2.49\)."
-.      endif
+.        endif
 # FreeBSD 12.0 updated base OpenSSL in r339270:
 # https://github.com/sfackler/rust-openssl/commit/276577553501
-.      if ${_name} == openssl && !exists(${PATCHDIR}/patch-openssl-1.1.1) && ${_major} == 0 && (${_minor} < 10 || (${_minor} == 10 && ${_patch} < 4))
+.        if ${_name} == openssl && !exists(${PATCHDIR}/patch-openssl-1.1.1) && ${_major} == 0 && (${_minor} < 10 || (${_minor} == 10 && ${_patch} < 4))
 DEV_WARNING+=	"CARGO_CRATES=${_crate} does not support OpenSSL 1.1.1. Consider updating to the latest version \(higher than 0.10.3\)."
-.      endif
-.    endfor
-.  endif
-.endfor
+.        endif
+.      endfor
+.    endif
+.  endfor
 
 _USES_extract+=	600:cargo-extract
 cargo-extract:
@@ -271,8 +271,8 @@ cargo-extract:
 # the local crates directory.
 	@${ECHO_MSG} "===>  Moving crates to ${CARGO_VENDOR_DIR}"
 	@${MKDIR} ${CARGO_VENDOR_DIR}
-.for _index _crate _name _version in ${_CARGO_CRATES}
-.  if ${_index} != @git
+.  for _index _crate _name _version in ${_CARGO_CRATES}
+.    if ${_index} != @git
 	@${MV} ${WRKDIR}/${_crate} ${CARGO_VENDOR_DIR}/${_crate}
 	@${PRINTF} '{"package":"%s","files":{}}' \
 		$$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}) \
@@ -281,10 +281,10 @@ cargo-extract:
 		${MV} ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig \
 			${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig-cargo; \
 	fi
-.  endif
-.endfor
+.    endif
+.  endfor
 
-.if ${CARGO_CONFIGURE:tl} == "yes"
+.  if ${CARGO_CONFIGURE:tl} == "yes"
 _USES_configure+=	250:cargo-configure
 
 # configure hook.  Place a config file for overriding crates-io index
@@ -300,10 +300,10 @@ cargo-configure:
 	@${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config.toml
 	@${ECHO_CMD} "[source.crates-io]" >> ${WRKDIR}/.cargo/config.toml
 	@${ECHO_CMD} "replace-with = 'cargo'" >> ${WRKDIR}/.cargo/config.toml
-.if !empty(_CARGO_GIT_SOURCES)
+.    if !empty(_CARGO_GIT_SOURCES)
 	@${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates-git-configure.awk \
 		/dev/null >> ${WRKDIR}/.cargo/config.toml
-.endif
+.    endif
 	@${CAT} ${WRKDIR}/.cargo/config.toml
 	@if ! ${GREP} -qF '[profile.release]' ${CARGO_CARGOTOML}; then \
 		${ECHO_CMD} "" >> ${CARGO_CARGOTOML}; \
@@ -317,20 +317,20 @@ cargo-configure:
 		--verbose \
 		--verbose \
 		${CARGO_UPDATE_ARGS}
-.endif
+.  endif
 
-.if !target(do-build) && ${CARGO_BUILD:tl} == "yes"
+.  if !target(do-build) && ${CARGO_BUILD:tl} == "yes"
 do-build:
 	@${CARGO_CARGO_RUN} build \
 		--manifest-path ${CARGO_CARGOTOML} \
 		--verbose \
 		--verbose \
 		${CARGO_BUILD_ARGS}
-.endif
+.  endif
 
-.if !target(do-install) && ${CARGO_INSTALL:tl} == "yes"
+.  if !target(do-install) && ${CARGO_INSTALL:tl} == "yes"
 do-install:
-.  for path in ${CARGO_INSTALL_PATH}
+.    for path in ${CARGO_INSTALL_PATH}
 	@${CARGO_CARGO_RUN} install \
 		--no-track \
 		--path "${path}" \
@@ -338,17 +338,17 @@ do-install:
 		--verbose \
 		--verbose \
 		${CARGO_INSTALL_ARGS}
-.  endfor
-.endif
+.    endfor
+.  endif
 
-.if !target(do-test) && ${CARGO_TEST:tl} == "yes"
+.  if !target(do-test) && ${CARGO_TEST:tl} == "yes"
 do-test:
 	@${CARGO_CARGO_RUN} test \
 		--manifest-path ${CARGO_CARGOTOML} \
 		--verbose \
 		--verbose \
 		${CARGO_TEST_ARGS}
-.endif
+.  endif
 
 #
 # Helper targets for port maintainers
diff --git a/Mk/Uses/charsetfix.mk b/Mk/Uses/charsetfix.mk
index 1e3e6f61eb3b..bbf446c35f80 100644
--- a/Mk/Uses/charsetfix.mk
+++ b/Mk/Uses/charsetfix.mk
@@ -9,9 +9,9 @@
 .if !defined(_INCLUDE_USES_CHARSETFIX_MK)
 _INCLUDE_USES_CHARSETFIX_MK=	yes
 
-.if !empty(charsetfix_ARGS)
+.  if !empty(charsetfix_ARGS)
 IGNORE=	USES=charsetfix does not require args
-.endif
+.  endif
 
 CHARSETFIX_MAKEFILEIN?=	Makefile.in
 
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index bef3b30ac601..a4c1edd3f0b2 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -50,30 +50,30 @@ _INCLUDE_USES_CMAKE_MK=	yes
 _valid_ARGS=		insource run noninja testing
 
 # Sanity check
-.for arg in ${cmake_ARGS}
+.  for arg in ${cmake_ARGS}
 .    if empty(_valid_ARGS:M${arg})
 IGNORE=	Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
-.endfor
+.  endfor
 
 CMAKE_BIN=		${LOCALBASE}/bin/cmake
 BUILD_DEPENDS+=		${CMAKE_BIN}:devel/cmake
 
-.if ${cmake_ARGS:Mrun}
+.  if ${cmake_ARGS:Mrun}
 RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake
-.endif
+.  endif
 
-.if defined(WITH_DEBUG)
+.  if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE?=	Debug
-.else
+.  else
 CMAKE_BUILD_TYPE?=	Release
-.endif #defined(WITH_DEBUG)
+.  endif #defined(WITH_DEBUG)
 
 PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
 
-.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
+.  if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET?=	install/strip
-.endif
+.  endif
 
 CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING="${CC}" \
 			-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
@@ -93,70 +93,70 @@ CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING="${CC}" \
 			-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
 # Handle the option-like CMAKE_ON and CMAKE_OFF lists.
-.for _bool_kind in ON OFF
-.  if defined(CMAKE_${_bool_kind})
+.  for _bool_kind in ON OFF
+.    if defined(CMAKE_${_bool_kind})
 CMAKE_ARGS+=		${CMAKE_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 CMAKE_INSTALL_PREFIX?=	${PREFIX}
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
+.  if defined(BATCH) || defined(PACKAGE_BUILDING)
 CMAKE_NOCOLOR=		yes
-.endif
+.  endif
 
-.if defined(CMAKE_NOCOLOR)
+.  if defined(CMAKE_NOCOLOR)
 CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
-.endif
+.  endif
 
 _CMAKE_MSG=		"===>  Performing in-source build"
 CMAKE_SOURCE_PATH?=	${WRKSRC}
 
-.if empty(cmake_ARGS:Minsource)
+.  if empty(cmake_ARGS:Minsource)
 _CMAKE_MSG=		"===>  Performing out-of-source build"
 CONFIGURE_WRKSRC=	${WRKDIR}/.build
 BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
 TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
-.endif
+.  endif
 
 # By default we use the ninja generator.
 #  Except, if cmake:run is set (cmake not wanted as generator)
 #             fortran is used, as the ninja-generator does not handle it.
 #             or if CONFIGURE_WRKSRC does not match  BUILD_WRKSRC or INSTALL_WRKSRC
 #             as the build.ninja file won't be where ninja expects it.
-.if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
-.  if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
-.    if ! empty(USES:Mgmake)
+.  if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
+.    if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
+.      if ! empty(USES:Mgmake)
 BROKEN=		USES=gmake is incompatible with cmake's ninja-generator
-.    endif
+.      endif
 .      include "${USESDIR}/ninja.mk"
+.    endif
 .  endif
-.endif
 
-.if !target(do-configure)
+.  if !target(do-configure)
 do-configure:
 	@${ECHO_MSG} ${_CMAKE_MSG}
 	${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
-.endif
+.  endif
 
-.if !target(do-test) && ${cmake_ARGS:Mtesting}
+.  if !target(do-test) && ${cmake_ARGS:Mtesting}
 CMAKE_TESTING_ON?=		BUILD_TESTING
 CMAKE_TESTING_TARGET?=		test
 
 # Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
-.for _bool_kind in ON OFF
-.  if defined(CMAKE_TESTING_${_bool_kind})
+.    for _bool_kind in ON OFF
+.      if defined(CMAKE_TESTING_${_bool_kind})
 CMAKE_TESTING_ARGS+=		${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
-.  endif
-.endfor
+.      endif
+.    endfor
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
-.endif
+.  endif
 
 .endif #!defined(_INCLUDE_USES_CMAKE_MK)
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index 0c2421eed598..c684f4f0800a 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -29,171 +29,171 @@
 .if !defined(_INCLUDE_USES_COMPILER_MK)
 _INCLUDE_USES_COMPILER_MK=	yes
 
-.if empty(compiler_ARGS)
+.  if empty(compiler_ARGS)
 compiler_ARGS=	env
-.endif
+.  endif
 
 VALID_ARGS=	c++11-lib c++11-lang c++14-lang c++17-lang c11 features env nestedfct c++0x gcc-c++11-lib
 
 _CC_hash:=	${CC:hash}
 _CXX_hash:=	${CXX:hash}
 
-.if ${compiler_ARGS} == gcc-c++11-lib
+.  if ${compiler_ARGS} == gcc-c++11-lib
 _COMPILER_ARGS+=	features gcc-c++11-lib
-.elif ${compiler_ARGS} == c++11-lib
+.  elif ${compiler_ARGS} == c++11-lib
 _COMPILER_ARGS+=	features c++11-lib
-.elif ${compiler_ARGS} == c++0x
+.  elif ${compiler_ARGS} == c++0x
 _COMPILER_ARGS+=	features c++0x
-.elif ${compiler_ARGS} == c++11-lang
+.  elif ${compiler_ARGS} == c++11-lang
 _COMPILER_ARGS+=	features c++11-lang
-.elif ${compiler_ARGS} == c++14-lang
+.  elif ${compiler_ARGS} == c++14-lang
 _COMPILER_ARGS+=	features c++14-lang
-.elif ${compiler_ARGS} == c++17-lang
+.  elif ${compiler_ARGS} == c++17-lang
 _COMPILER_ARGS+=	features c++17-lang
-.elif ${compiler_ARGS} == c11
+.  elif ${compiler_ARGS} == c11
 _COMPILER_ARGS+=	features c11
-.elif ${compiler_ARGS} == features
+.  elif ${compiler_ARGS} == features
 _COMPILER_ARGS+=	features
-.elif ${compiler_ARGS} == env
+.  elif ${compiler_ARGS} == env
 _COMPILER_ARGS+=	env
-.elif ${compiler_ARGS} == nestedfct
+.  elif ${compiler_ARGS} == nestedfct
 _COMPILER_ARGS+=	env nestedfct
-.else
+.  else
 IGNORE=	Invalid argument "${compiler_ARGS}", valid arguments are: ${VALID_ARGS}
 _COMPILER_ARGS=	#
-.endif
+.  endif
 
-.if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11}
+.  if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11}
 _COMPILER_ARGS+=	features
-.endif
+.  endif
 
-.if defined(_CCVERSION_${_CC_hash})
+.  if defined(_CCVERSION_${_CC_hash})
 _CCVERSION=	${_CCVERSION_${_CC_hash}}
-.else
+.  else
 _CCVERSION!=	${CC} --version
 _CCVERSION_${_CC_hash}=	${_CCVERSION}
 PORTS_ENV_VARS+=	_CCVERSION_${_CC_hash}
-.endif
+.  endif
 COMPILER_VERSION=	${_CCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
-.if ${_CCVERSION:Mclang}
+.  if ${_CCVERSION:Mclang}
 COMPILER_TYPE=	clang
-.else
+.  else
 COMPILER_TYPE=	gcc
-.endif
+.  endif
 
 ALT_COMPILER_VERSION=	0
 ALT_COMPILER_TYPE=	none
 _ALTCCVERSION=		none
-.if defined(_ALTCCVERSION_${_CC_hash})
+.  if defined(_ALTCCVERSION_${_CC_hash})
 _ALTCCVERSION=	${_ALTCCVERSION_${_CC_hash}}
-.else
-.if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
-.if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default for a reason
+.  else
+.    if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
+.      if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default for a reason
 _ALTCCVERSION!=	/usr/bin/clang --version
-.endif
-.elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
+.      endif
+.    elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
 _ALTCCVERSION!=	/usr/bin/gcc --version
-.endif
+.    endif
 _ALTCCVERSION_${_CC_hash}=	${_ALTCCVERSION}
 PORTS_ENV_VARS+=		_ALTCCVERSION_${_CC_hash}
-.endif
+.  endif
 
 ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
-.if ${_ALTCCVERSION:Mclang}
+.  if ${_ALTCCVERSION:Mclang}
 ALT_COMPILER_TYPE=	clang
-.elif ${_ALTCCVERSION} != none
+.  elif ${_ALTCCVERSION} != none
 ALT_COMPILER_TYPE=	gcc
-.endif
+.  endif
 
 CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
 
-.if ${_COMPILER_ARGS:Mnestedfct}
-.if ${COMPILER_TYPE} == clang
+.  if ${_COMPILER_ARGS:Mnestedfct}
+.    if ${COMPILER_TYPE} == clang
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.endif
-.endif
+.    endif
+.  endif
 
-.if ${_COMPILER_ARGS:Mfeatures}
-.if defined(_CXXINTERNAL_${_CXX_hash})
+.  if ${_COMPILER_ARGS:Mfeatures}
+.    if defined(_CXXINTERNAL_${_CXX_hash})
 _CXXINTERNAL=	${_CXXINTERNAL_${_CXX_hash}}
-.else
+.    else
 _CXXINTERNAL!=	${CXX} -\#\#\# /dev/null 2>&1
 _CXXINTERNAL_${_CXX_hash}=	${_CXXINTERNAL}
 PORTS_ENV_VARS+=	_CXXINTERNAL_${_CXX_hash}
-.endif
-.if ${_CXXINTERNAL:M\"-lc++\"}
+.    endif
+.    if ${_CXXINTERNAL:M\"-lc++\"}
 COMPILER_FEATURES=	libc++
-.else
+.    else
 COMPILER_FEATURES=	libstdc++
-.endif
+.    endif
 
 CSTD=	c89 c99 c11 gnu89 gnu99 gnu11
 CXXSTD=	c++98 c++0x c++11 c++14 c++17 gnu++98 gnu++11 gnu++14 gnu++17
 
-.for std in ${CSTD} ${CXXSTD}
+.    for std in ${CSTD} ${CXXSTD}
 _LANG=c
-.if ${CXXSTD:M${std}}
+.      if ${CXXSTD:M${std}}
 _LANG=c++
-.endif
-.if defined(CC_OUTPUT_${_CC_hash}_${std:hash})
+.      endif
+.      if defined(CC_OUTPUT_${_CC_hash}_${std:hash})
 OUTPUT_${std}=	${CC_OUTPUT_${_CC_hash}_${std:hash}}
-.else
+.      else
 OUTPUT_${std}!=	if ${CC} -std=${std} -c -x ${_LANG} /dev/null -o /dev/null 2>&1; then echo yes; fi; echo
 CC_OUTPUT_${_CC_hash}_${std:hash}=	${OUTPUT_${std}}
 PORTS_ENV_VARS+=			CC_OUTPUT_${_CC_hash}_${std:hash}
-.endif
-.if !${OUTPUT_${std}:M*error*}
+.      endif
+.      if !${OUTPUT_${std}:M*error*}
 COMPILER_FEATURES+=	${std}
-.endif
-.endfor
-.endif
+.      endif
+.    endfor
+.  endif
 
-.if ${_COMPILER_ARGS:Mc++11-lib}
-.if !${COMPILER_FEATURES:Mc++11}
+.  if ${_COMPILER_ARGS:Mc++11-lib}
+.    if !${COMPILER_FEATURES:Mc++11}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++}
+.    elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.endif
-.endif
+.    endif
+.  endif
 
-.if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \
+.  if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \
 (${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \
 (${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \
 (${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \
 (${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11})
-.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
+.    if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.elif ${COMPILER_TYPE} == gcc
-.if ${ALT_COMPILER_TYPE} == clang
+.    elif ${COMPILER_TYPE} == gcc
+.      if ${ALT_COMPILER_TYPE} == clang
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
-.else
+.      else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang10:devel/llvm10
 CPP=	${LOCALBASE}/bin/clang-cpp10
 CC=	${LOCALBASE}/bin/clang10
 CXX=	${LOCALBASE}/bin/clang++10
 CHOSEN_COMPILER_TYPE=	clang
-.endif
-.endif
-.endif
+.      endif
+.    endif
+.  endif
 
-.if ${_COMPILER_ARGS:Mgcc-c++11-lib}
+.  if ${_COMPILER_ARGS:Mgcc-c++11-lib}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.if ${COMPILER_FEATURES:Mlibc++}
+.    if ${COMPILER_FEATURES:Mlibc++}
 CXXFLAGS+=	-nostdinc++ -isystem /usr/include/c++/v1
 LDFLAGS+=	-L${WRKDIR}
 
 _USES_configure+=	200:gcc-libc++-configure
 gcc-libc++-configure:
 	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
-.endif
-.endif
+.    endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/corosync.mk b/Mk/Uses/corosync.mk
index ee14d99f2080..634ff3cc3bb1 100644
--- a/Mk/Uses/corosync.mk
+++ b/Mk/Uses/corosync.mk
@@ -12,11 +12,11 @@ _INCLUDE_USES_COROSYNC_MK=	yes
 # Mk/bsd.default-versions.mk in sync.
 _VALID_COROSYNC_VER=	2 3
 
-.if ! ${_VALID_COROSYNC_VER:M${COROSYNC_DEFAULT}}
+.  if ! ${_VALID_COROSYNC_VER:M${COROSYNC_DEFAULT}}
 IGNORE=	Invalid corosync default version ${COROSYNC_DEFAULT}; valid versions are ${_VALID_COROSYNC_VER}
-.endif
+.  endif
 
-.if exists(${LOCALBASE}/sbin/corosync)
+.  if exists(${LOCALBASE}/sbin/corosync)
 _COROSYNC_INSTALLED_VER!=  ${LOCALBASE}/sbin/corosync -v 2>/dev/null
 _COROSYNC_INSTALLED_VER:=  ${_COROSYNC_INSTALLED_VER:M'*':C/'//g}
 _COROSYNC_INSTALLED_VER_MAJOR=	${_COROSYNC_INSTALLED_VER:C/([0-9]*).[0-9]*.*/\1/g}
@@ -24,15 +24,15 @@ _COROSYNC_INSTALLED_VER_MINOR=	${_COROSYNC_INSTALLED_VER:C/[0-9]*.([0-9]*).*/\1/
 
 # Currently corosync 3 is tagged 2.99.x so this is a temporary
 # work around until the final version is released.
-.  if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99
+.    if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99
 _COROSYNC_INSTALLED_VER_MAJOR=	3
 _COROSYNC_INSTALLED_VER_MINOR=	0
-.  endif
+.    endif
 
-.  if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR}
+.    if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR}
 IGNORE=	DEFAULT_VERSIONS=corosync=${COROSYNC_DEFAULT} but ${_COROSYNC_INSTALLED_VER} is installed
+.    endif
 .  endif
-.endif
 
 BUILD_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
 RUN_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
index 80741990b26d..e357f296ad8e 100644
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -27,49 +27,49 @@ WRKSRC?=	${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 R_COMMAND=	${LOCALBASE}/bin/R
 
-.if !target(do-test)
+.  if !target(do-test)
 R_POSTCMD_CHECK_OPTIONS?=	--timings
 
-.if !exists(${LOCALBASE}/bin/pdflatex)
+.    if !exists(${LOCALBASE}/bin/pdflatex)
 R_POSTCMD_CHECK_OPTIONS+=	--no-manual --no-build-vignettes
-.endif
+.    endif
 
 do-test:
 	@${FIND} ${WRKSRC} \( -name '*.o' -o -name '*.so' \) -delete
 	@cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \
 	${R_COMMAND} ${R_PRECMD_CHECK_OPTIONS} CMD check \
 	${R_POSTCMD_CHECK_OPTIONS} ${PORTNAME}
-.endif
+.  endif
 
-.if !target(do-install)
+.  if !target(do-install)
 R_POSTCMD_INSTALL_OPTIONS+=	-l ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
 R_POSTCMD_INSTALL_OPTIONS+=	--install-tests
 
-.if empty(PORT_OPTIONS:MDOCS)
+.    if empty(PORT_OPTIONS:MDOCS)
 R_POSTCMD_INSTALL_OPTIONS+=	--no-docs --no-html
-.endif
+.    endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
 	@cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} ${R_COMMAND} \
 	${R_PRECMD_INSTALL_OPTIONS} CMD INSTALL \
 	${R_POSTCMD_INSTALL_OPTIONS} ${PORTNAME}
-.endif
+.  endif
 
-.if ${cran_ARGS:Mauto-plist}
+.  if ${cran_ARGS:Mauto-plist}
 _USES_install+=	750:cran-auto-plist
 cran-auto-plist:
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${R_MOD_DIR} \( -type f -or -type l \) -print | \
 		${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
-.endif
+.  endif
 
-.if ${cran_ARGS:Mcompiles}
+.  if ${cran_ARGS:Mcompiles}
 _USES_install+= 755:cran-strip
 cran-strip:
 	${FIND} ${STAGEDIR}${PREFIX}/${R_MOD_DIR} -name '*.so' -exec ${STRIP_CMD} {} +
 .include "${USESDIR}/fortran.mk"
-.else
+.  else
 NO_ARCH=	yes
-.endif
+.  endif
 
 .endif #_INCLUDE_USES_CRAN_MK
diff --git a/Mk/Uses/desktop-file-utils.mk b/Mk/Uses/desktop-file-utils.mk
index 2266e84ea27c..6b9830fbe1fa 100644
--- a/Mk/Uses/desktop-file-utils.mk
+++ b/Mk/Uses/desktop-file-utils.mk
@@ -9,9 +9,9 @@
 .if !defined(_INCLUDE_USES_DESKTOP_FILE_UTILS_MK)
 _INCLUDE_USES_DESKTOP_FILE_UTILS_MK=	yes
 
-.if !empty(desktop-file-utils_ARGS)
+.  if !empty(desktop-file-utils_ARGS)
 IGNORE=	USES=desktop-file-utils does not require args
-.endif
+.  endif
 
 BUILD_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
 RUN_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
diff --git a/Mk/Uses/desthack.mk b/Mk/Uses/desthack.mk
index f29c4c972e71..a8c327422652 100644
--- a/Mk/Uses/desthack.mk
+++ b/Mk/Uses/desthack.mk
@@ -9,9 +9,9 @@
 .if !defined(_INCLUDE_USES_DESTHACK_MK)
 _INCLUDE_USES_DESTHACK_MK=	yes
 
-.if !empty(desthack_ARGS)
+.  if !empty(desthack_ARGS)
 IGNORE=	USES=desthack does not require args
-.endif
+.  endif
 
 GNU_CONFIGURE_PREFIX=	\$${${DESTDIRNAME}}${PREFIX}
 GNU_CONFIGURE_MANPREFIX=	\$${${DESTDIRNAME}}${MANPREFIX}
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index 1e7fe7f6cdef..d8ed976b5bff 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -9,11 +9,11 @@
 .if !defined(_INCLUDE_USES_DISPLAY_MK)
 _INCLUDE_USES_DISPLAY_MK=	yes
 
-.if empty(display_ARGS)
+.  if empty(display_ARGS)
 display_ARGS=	install
-.endif
+.  endif
 
-.if !defined(DISPLAY)
+.  if !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver \
 	${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
 	${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
@@ -31,5 +31,5 @@ start-display:
 stop-display:
 	pkill -15 -F ${XVFBPIDFILE}
 
-.endif
+.  endif
 .endif
diff --git a/Mk/Uses/dos2unix.mk b/Mk/Uses/dos2unix.mk
index 965175cc6c08..2e8db690dc91 100644
--- a/Mk/Uses/dos2unix.mk
+++ b/Mk/Uses/dos2unix.mk
@@ -10,35 +10,35 @@
 .if !defined(_INCLUDE_USES_DOS2UNIX_MK)
 _INCLUDE_USES_DOS2UNIX_MK=	yes
 
-.if !empty(dos2unix_ARGS)
+.  if !empty(dos2unix_ARGS)
 IGNORE=	USES=dos2unix takes no arguments
-.endif
+.  endif
 
-.if !defined(DOS2UNIX_FILES) && !defined(DOS2UNIX_REGEX) && !defined(DOS2UNIX_GLOB)
+.  if !defined(DOS2UNIX_FILES) && !defined(DOS2UNIX_REGEX) && !defined(DOS2UNIX_GLOB)
 _DOS2UNIX_ALL=	yes
-.endif
+.  endif
 
 DOS2UNIX_WRKSRC?=	${WRKSRC}
 
 _USES_patch+=	200:dos2unix
 dos2unix:
 	@${ECHO_MSG} "===>   Converting DOS text files to UNIX text files"
-.if defined(_DOS2UNIX_ALL)
+.  if defined(_DOS2UNIX_ALL)
 	@${FIND} ${DOS2UNIX_WRKSRC} -type f -print0 | \
 		${XARGS} -0 ${SED} -i '' -e 's/
$$//'
-.else
-.if defined(DOS2UNIX_FILES)
+.  else
+.    if defined(DOS2UNIX_FILES)
 	@(cd ${DOS2UNIX_WRKSRC}; \
 		${ECHO_CMD} ${DOS2UNIX_FILES} | ${XARGS} ${SED} -i '' -e 's/
$$//' )
-.elif defined(DOS2UNIX_REGEX)
+.    elif defined(DOS2UNIX_REGEX)
 	@${FIND} -E ${DOS2UNIX_WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \
 		${XARGS} -0 ${SED} -i '' -e 's/
$$//'
-.else
-.for f in ${DOS2UNIX_GLOB}
+.    else
+.      for f in ${DOS2UNIX_GLOB}
 	@${FIND} ${DOS2UNIX_WRKSRC} -type f -name '${f}' -print0 | \
 		${XARGS} -0 ${SED} -i '' -e 's/
$$//'
-.endfor
-.endif
-.endif
+.      endfor
+.    endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/drupal.mk b/Mk/Uses/drupal.mk
index c793f6827bb1..efb4b90aa0de 100644
--- a/Mk/Uses/drupal.mk
+++ b/Mk/Uses/drupal.mk
@@ -11,25 +11,25 @@
 .if !defined(_INCLUDE_USES_DRUPAL_Mk)
 _INCLUDE_USES_DRUPAL_Mk=	yes
 
-.if ${drupal_ARGS:M[7]}
+.  if ${drupal_ARGS:M[7]}
 _DRUPAL_VERSION=	${drupal_ARGS:M[7]}
-.endif
+.  endif
 
 VALID_VERSIONS=	7
 
-.if ${drupal_ARGS:N[7]:Ntheme:Nmodule}
+.  if ${drupal_ARGS:N[7]:Ntheme:Nmodule}
 IGNORE=	Unknown argument for USES=drupal: ${drupal_ARGS:N[7]:Ntheme:Nmodule}
-.endif
+.  endif
 
 _DRUPAL_COMP=	${drupal_ARGS:N[7]}
 
-.if !defined(_DRUPAL_VERSION) || ! ${VALID_VERSIONS:M${_DRUPAL_VERSION}}
+.  if !defined(_DRUPAL_VERSION) || ! ${VALID_VERSIONS:M${_DRUPAL_VERSION}}
 IGNORE=	Missing or invalid argument for USES=drupal, a version must be provided: ${VALID_VERSIONS}
-.endif
+.  endif
 
-.if ${drupal_ARGS:Mmodule} && ${drupal_ARGS:Mtheme}
+.  if ${drupal_ARGS:Mmodule} && ${drupal_ARGS:Mtheme}
 IGNORE=	theme and module arguments are mutually exclusive for USES=drupal
-.endif
+.  endif
 
 DRUPAL_BASE?=	www/drupal${_DRUPAL_VERSION}
 
@@ -38,26 +38,26 @@ DRUPAL_DOCSDIR?=	${PREFIX}/${DRUPAL_BASE}/doc
 PLIST_SUB+=		DRUPAL_BASE=${DRUPAL_BASE}
 SUB_LIST+=		DRUPAL_BASE=${DRUPAL_BASE} DRUPAL_DIR=${DRUPAL_DIR}
 
-.if ! ${_DRUPAL_COMP}
+.  if ! ${_DRUPAL_COMP}
 DOCSDIR?=	${DRUPAL_DOCSDIR}
-.endif
+.  endif
 
-.if ${_DRUPAL_COMP}
+.  if ${_DRUPAL_COMP}
 _USES_POST+=	drupal
 PKGNAMEPREFIX=  drupal${_DRUPAL_VERSION}-
 
 # drupal contributions must be licensed under the GPLv2 or GPLv3.  This is
 # documented at: http://drupal.org/licensing/faq/
-.if !defined(LICENSE)
+.    if !defined(LICENSE)
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
-.endif
+.    endif
 
-.if defined(DRUPAL_MODSUBDIR)
+.    if defined(DRUPAL_MODSUBDIR)
 DRUPAL_MODDIR?=	${DRUPAL_BASE}/sites/all/${_DRUPAL_COMP}s/${DRUPAL_MODSUBDIR}
-.else
+.    else
 DRUPAL_MODDIR?=	${DRUPAL_BASE}/sites/all/${_DRUPAL_COMP}s
-.endif
+.    endif
 
 DRUPAL_MODLIB?=	${DRUPAL_BASE}/sites/all/libraries
 
@@ -85,31 +85,31 @@ PLIST_FILES+=	"@owner www" \
 		"@owner root" \
 		"@group wheel"
 PLIST_DIRS+=	${MODULE_DIRS:C|^|%%DRUPAL_MODDIR%%/|}
-.endif
+.  endif
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_DRUPAL_POST_MK)
 _INCLUDE_USES_DRUPAL_POST_MK=	yes
 
-.if ${_DRUPAL_COMP}
-.if ${PORT_OPTIONS:MDOCS}
+.  if ${_DRUPAL_COMP}
+.    if ${PORT_OPTIONS:MDOCS}
 PLIST_FILES+=	${DOC_FILES:C|^|%%DOCSDIR%%/|}
 PLIST_DIRS+=	${DOC_DIRS:C|^|%%DOCSDIR%%/|}
 PLIST_DIRS+=	%%DOCSDIR%%
-.endif
+.    endif
 
 do-install:
 	@${MKDIR} ${DRUPAL_MODDIR:C|^|${STAGEDIR}${PREFIX}/|}
-.if defined(MODULE_DIRS)
+.    if defined(MODULE_DIRS)
 	@${MKDIR} ${MODULE_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|}
-.endif
-.for f in ${MODULE_FILES}
+.    endif
+.    for f in ${MODULE_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f}
-.endfor
+.    endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${DOC_DIRS:C|^|${STAGEDIR}${DOCSDIR}/|}
-.for f in ${DOC_FILES}
+.    for f in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f}
-.endfor
+.    endfor
 
-.endif
+.  endif
 .endif
diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk
index 7176d2aa6d3a..fbfe407907d6 100644
--- a/Mk/Uses/elixir.mk
+++ b/Mk/Uses/elixir.mk
@@ -32,9 +32,9 @@
 .if !defined(_INCLUDE_USES_ELIXIR_MK)
 _INCLUDE_USES_ELIXIR_MK=yes
 
-.if !empty(elixir_ARGS)
+.  if !empty(elixir_ARGS)
 IGNORE=	USES=elixir does not require args
-.endif
+.  endif
 
 ELIXIR_APP_NAME?=	${PORTNAME}
 ELIXIR_LIB_ROOT?=	${LOCALBASE}/lib/elixir/lib
@@ -59,35 +59,35 @@ MIX_EXTRA_FILES?=
 BUILD_DEPENDS+=	elixir:lang/elixir
 RUN_DEPENDS+=	elixir:lang/elixir
 
-.for depend in ${MIX_BUILD_DEPS}
+.  for depend in ${MIX_BUILD_DEPS}
 BUILD_DEPENDS+=	${depend:T}>=0:${depend}
-.endfor
+.  endfor
 
-.for depend in ${MIX_RUN_DEPS}
+.  for depend in ${MIX_RUN_DEPS}
 RUN_DEPENDS+=	${depend:T}>=0:${depend}
-.endfor
+.  endfor
 
-.if !target(do-build)
+.  if !target(do-build)
 do-build:
-.if ${MIX_REWRITE} != ""
+.    if ${MIX_REWRITE} != ""
 	@${REINPLACE_CMD} -i '' -E -e "s@\{.*(only|optional): .*},?@@" ${WRKSRC}/mix.exs
-.for depend in ${MIX_BUILD_DEPS}
+.      for depend in ${MIX_BUILD_DEPS}
 	@if [ $$(echo ${depend:T} | sed -e "s/erlang-//") != ${depend:T} ]; then \
 		${REINPLACE_CMD} -i '' -E -e "s@\{ *:(${depend:T:S/erlang-//}), *(github:|\").*} *,?@@" ${WRKSRC}/mix.exs; \
 	else \
 		${REINPLACE_CMD} -i '' -E -e "s@\{ *:(${depend:T:S/elixir-//}), *(github:|\").*}@{ :\1, path: \"${ELIXIR_LIB_ROOT}/\\1\", compile: false }@" ${WRKSRC}/mix.exs; \
 	fi
-.endfor
-.endif
+.      endfor
+.    endif
 	@${RM} ${WRKSRC}/mix.lock
 	@cd ${WRKSRC} && ${MIX_COMPILE}
-.for app in ${MIX_EXTRA_APPS}
+.    for app in ${MIX_EXTRA_APPS}
 	@${RM} ${WRKSRC}/${app}/mix.lock
 	@cd ${WRKSRC}/${app} && ${MIX_COMPILE}
-.endfor
-.endif # .if !target(do-build)
+.    endfor
+.  endif # .if !target(do-build)
 
-.if !target(do-install)
+.  if !target(do-install)
 do-install:
 	@${MKDIR} ${STAGEDIR}${ELIXIR_APP_ROOT}
 	@${MKDIR} ${STAGEDIR}${ELIXIR_APP_ROOT}/lib
@@ -99,26 +99,26 @@ do-install:
 		${MKDIR} ${STAGEDIR}${ELIXIR_APP_ROOT}/priv; \
 		cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${ELIXIR_APP_ROOT}/priv; \
 	fi
-.if ${MIX_DOC_FILES} != "" || ${MIX_DOC_DIRS} != ""
+.    if ${MIX_DOC_FILES} != "" || ${MIX_DOC_DIRS} != ""
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.endif
-.for file in ${MIX_DOC_FILES}
+.    endif
+.    for file in ${MIX_DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for dir in ${MIX_DOC_DIRS}
+.    endfor
+.    for dir in ${MIX_DOC_DIRS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for file in ${MIX_EXTRA_FILES}
+.    endfor
+.    for file in ${MIX_EXTRA_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${ELIXIR_APP_ROOT}
-.endfor
-.for dir in ${MIX_EXTRA_DIRS}
+.    endfor
+.    for dir in ${MIX_EXTRA_DIRS}
 	@${MKDIR} ${STAGEDIR}${ELIXIR_APP_ROOT}/${dir}
 	cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}${ELIXIR_APP_ROOT}/${dir}
-.endfor
-.for app in ${MIX_EXTRA_APPS}
+.    endfor
+.    for app in ${MIX_EXTRA_APPS}
 	${INSTALL_DATA} ${WRKSRC}/${app}/_build/${MIX_BUILD_NAME}/lib/*/ebin/* \
 		${STAGEDIR}${ELIXIR_APP_ROOT}/ebin
-.endfor
-.endif # .if !target(do-install)
+.    endfor
+.  endif # .if !target(do-install)
 
 .endif #!defined(_INCLUDE_USES_ELIXIR_MK)
diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index e2c19e5f53c1..83cfd57871cb 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -56,87 +56,87 @@ _INCLUDE_USES_EMACS_MK=	yes
 .undef _EMACS_RUN_DEP
 .undef _EMACS_NOFLAVORS
 _EMACS_ARGS=		${emacs_ARGS:S/,/ /g}
-.if ${_EMACS_ARGS:Mbuild}
+.  if ${_EMACS_ARGS:Mbuild}
 _EMACS_BUILD_DEP=	yes
 _EMACS_ARGS:=		${_EMACS_ARGS:Nbuild}
-.endif
-.if ${_EMACS_ARGS:Mrun}
+.  endif
+.  if ${_EMACS_ARGS:Mrun}
 _EMACS_RUN_DEP=		yes
 _EMACS_ARGS:=		${_EMACS_ARGS:Nrun}
-.endif
-.if ${_EMACS_ARGS:Mnoflavors}
+.  endif
+.  if ${_EMACS_ARGS:Mnoflavors}
 _EMACS_NOFLAVORS=	yes
 _EMACS_ARGS:=		${_EMACS_ARGS:Nnoflavors}
-.endif
+.  endif
 
 # If the port does not specify a build or run dependency, and does not define
 # EMACS_NO_DEPENDS, assume both dependencies are required.
-.if !defined(_EMACS_BUILD_DEP) && !defined(_EMACS_RUN_DEP) && \
+.  if !defined(_EMACS_BUILD_DEP) && !defined(_EMACS_RUN_DEP) && \
 	!defined(EMACS_NO_DEPENDS)
 _EMACS_BUILD_DEP=	yes
 _EMACS_RUN_DEP=		yes
-.endif
+.  endif
 
 # Only set FLAVORS when...
-.if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS)
+.  if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS)
 FLAVORS=	full canna nox devel_full devel_nox
 # Sort the default to be first
-.if defined(EMACS_DEFAULT)
+.    if defined(EMACS_DEFAULT)
 FLAVORS:=	${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}}
-.endif
-.for flavor in ${EMACS_FLAVORS_EXCLUDE}
+.    endif
+.    for flavor in ${EMACS_FLAVORS_EXCLUDE}
 FLAVORS:=	${FLAVORS:N${flavor}}
-.endfor
-.endif
+.    endfor
+.  endif
 
 # Only set FLAVOR when...
-.if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) && empty(FLAVOR)
-.if defined(EMACS_DEFAULT)
+.  if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) && empty(FLAVOR)
+.    if defined(EMACS_DEFAULT)
 FLAVOR=	${EMACS_DEFAULT}
-.else
+.    else
 FLAVOR=	${FLAVORS:[1]}
-.endif # defined(EMACS_DEFAULT)
-.endif # !defined(_EMACS_NOFLAVORS) && defined(_EMACS_RUN_DEP) && empty(FLAVOR)
+.    endif # defined(EMACS_DEFAULT)
+.  endif # !defined(_EMACS_NOFLAVORS) && defined(_EMACS_RUN_DEP) && empty(FLAVOR)
 
-.if !empty(FLAVOR)
+.  if !empty(FLAVOR)
 EMACS_FLAVOR=	${FLAVOR}
-.else
+.  else
 EMACS_FLAVOR=	full
-.endif
+.  endif
 
-.if ${FLAVOR:Mdevel*}
+.  if ${FLAVOR:Mdevel*}
 EMACS_VER=		29.0.50
 EMACS_PORTDIR=		editors/emacs-devel
-.else
+.  else
 EMACS_VER=		28.1
 EMACS_PORTDIR=		editors/emacs
-.endif
+.  endif
 
 EMACS_MAJOR_VER=	${EMACS_VER:C/\..*//}
 EMACS_LIBDIR=		share/emacs
 EMACS_LIBDIR_WITH_VER=	share/emacs/${EMACS_VER}
 EMACS_PORT_NAME=	emacs${EMACS_MAJOR_VER}
 
-.if ${EMACS_FLAVOR} == "devel_full"
+.  if ${EMACS_FLAVOR} == "devel_full"
 EMACS_PKGNAMESUFFIX=	-emacs_devel
-.elif ${EMACS_FLAVOR} == "devel_nox"
+.  elif ${EMACS_FLAVOR} == "devel_nox"
 EMACS_PKGNAMESUFFIX=	-emacs_devel_nox
-.elif ${EMACS_FLAVOR} == "full"
+.  elif ${EMACS_FLAVOR} == "full"
 EMACS_PKGNAMESUFFIX=
-.else
+.  else
 EMACS_PKGNAMESUFFIX=	-emacs_${EMACS_FLAVOR}
-.endif
+.  endif
 
 EMACS_CMD=	${PREFIX}/bin/emacs-${EMACS_VER}
 EMACS_SITE_LISPDIR=	${EMACS_LIBDIR}/site-lisp
 EMACS_VERSION_SITE_LISPDIR=	${EMACS_LIBDIR_WITH_VER}/site-lisp
 
-.if defined(_EMACS_BUILD_DEP)
+.  if defined(_EMACS_BUILD_DEP)
 BUILD_DEPENDS+=		${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
-.endif
-.if defined(_EMACS_RUN_DEP)
+.  endif
+.  if defined(_EMACS_RUN_DEP)
 RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
-.endif
+.  endif
 
 MAKE_ARGS+=	EMACS=${EMACS_CMD}
 SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
diff --git a/Mk/Uses/erlang.mk b/Mk/Uses/erlang.mk
index c729ed007fc9..df6927c3d501 100644
--- a/Mk/Uses/erlang.mk
+++ b/Mk/Uses/erlang.mk
@@ -39,29 +39,29 @@ PLIST_SUB+=		VERSION="${PORTVERSION}"
 BUILD_DEPENDS+=	erl:lang/erlang
 RUN_DEPENDS+=	erl:lang/erlang
 
-.if ${erlang_ARGS:Mrebar}
+.  if ${erlang_ARGS:Mrebar}
 BUILD_DEPENDS+=	rebar>=0:devel/rebar
-.endif
+.  endif
 
-.if ${erlang_ARGS:Mrebar3}
+.  if ${erlang_ARGS:Mrebar3}
 BUILD_DEPENDS+=	rebar3>=0:devel/rebar3
-.endif
+.  endif
 
-.for depend in ${ERL_BUILD_DEPS}
+.  for depend in ${ERL_BUILD_DEPS}
 BUILD_DEPENDS+=	${depend:T}>=0:${depend}
-.endfor
+.  endfor
 
-.for depend in ${ERL_RUN_DEPS}
+.  for depend in ${ERL_RUN_DEPS}
 RUN_DEPENDS+=	${depend:T}>=0:${depend}
-.endfor
+.  endfor
 
-.if ${erlang_ARGS:Mrebar}
+.  if ${erlang_ARGS:Mrebar}
 ERLANG_COMPILE=	${REBAR_CMD}
-.endif
+.  endif
 
-.if ${erlang_ARGS:Mrebar3}
+.  if ${erlang_ARGS:Mrebar3}
 ERLANG_COMPILE=	HOME=${WRKDIR} ${REBAR3_CMD}
-.endif
+.  endif
 
 _USES_patch+=	650:post-patch-erlang
 post-patch-erlang:
@@ -86,29 +86,29 @@ post-patch-erlang:
 	fi
 	@${RM} ${WRKSRC}/src/*.orig ${WRKSRC}/include/*.orig
 
-.if !target(do-build)
+.  if !target(do-build)
 do-build:
 # This will cause calls to local rebar and rebar3 to fail; makes it easier to spot them
 	@${RM} ${WRKSRC}/rebar ${WRKSRC}/rebar3
-.for target in ${REBAR_TARGETS}
+.    for target in ${REBAR_TARGETS}
 # Remove rebar.lock every time - it can be created again after each run of rebar3
 	@${RM} ${WRKSRC}/rebar.lock
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} REBAR_PROFILE=${REBAR_PROFILE} ${ERLANG_COMPILE} ${target}
-.endfor
-.endif # !target(do-build)
+.    endfor
+.  endif # !target(do-build)
 
-.if !target(do-install)
+.  if !target(do-install)
 do-install:
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/src
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} \* ${STAGEDIR}${ERL_APP_ROOT}/src
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/ebin
-.if ${erlang_ARGS:Mrebar3}
+.    if ${erlang_ARGS:Mrebar3}
 	${INSTALL_DATA} ${WRKSRC}/_build/${ERL_BUILD_NAME}/lib/${ERL_APP_NAME}/ebin/* \
 		${STAGEDIR}${ERL_APP_ROOT}/ebin
-.else
+.    else
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${ERL_APP_ROOT}/ebin
-.endif
+.    endif
 	if [ -d ${WRKSRC}/include ]; then \
 		${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/include; \
 		cd ${WRKSRC}/include && ${COPYTREE_SHARE} \* ${STAGEDIR}${ERL_APP_ROOT}/include; \
@@ -117,20 +117,20 @@ do-install:
 		${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/priv; \
 		cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${ERL_APP_ROOT}/priv; \
 	fi
-.if ${ERL_DOCS} != ""
+.    if ${ERL_DOCS} != ""
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ${ERL_DOCS}
+.      for file in ${ERL_DOCS}
 	if [ -d "${WRKSRC}/${file}" ]; then \
 		cd ${WRKSRC} && ${COPYTREE_SHARE} ${file} ${STAGEDIR}${DOCSDIR}; \
 	else \
 		${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}; \
 	fi
-.endfor
-.endif # .if ${ERL_DOCS} != ""
-.if ${REBAR_TARGETS:Mescriptize}
+.      endfor
+.    endif # .if ${ERL_DOCS} != ""
+.    if ${REBAR_TARGETS:Mescriptize}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.endif
-.endif # !target(do-install)
+.    endif
+.  endif # !target(do-install)
 
 .endif #!defined(_INCLUDE_USES_ERLANG_MK)
diff --git a/Mk/Uses/fakeroot.mk b/Mk/Uses/fakeroot.mk
index 2bef8fe2b8c7..160a7736faef 100644
--- a/Mk/Uses/fakeroot.mk
+++ b/Mk/Uses/fakeroot.mk
@@ -9,7 +9,7 @@
 .if !defined(_INCLUDE_USES_FAKEROOT_MK)
 _INCLUDE_USES_FAKEROOT_MK=	yes
 BUILD_DEPENDS+=	fakeroot:security/fakeroot
-.if ${UID} != 0
+.  if ${UID} != 0
 FAKEROOT?=	fakeroot
-.endif
+.  endif
 .endif
diff --git a/Mk/Uses/fam.mk b/Mk/Uses/fam.mk
index 6cdd1ff333e5..cc4edd6f52ce 100644
--- a/Mk/Uses/fam.mk
+++ b/Mk/Uses/fam.mk
@@ -19,41 +19,41 @@ _gamin_DEPENDS=	libfam.so.0:devel/gamin
 _FAM_SYSTEMS=	fam gamin
 _DEFAULT_FAM=	gamin
 
-.if exists(${LOCALBASE}/libexec/gam_server)
+.  if exists(${LOCALBASE}/libexec/gam_server)
 _HAVE_FAM=	gamin
-.elif exists(${LOCALBASE}/bin/fam)
+.  elif exists(${LOCALBASE}/bin/fam)
 _HAVE_FAM=	fam
-.endif
+.  endif
 
 # Sanity checks
-.if defined(WITH_FAM_SYSTEM) && defined(_HAVE_FAM) && ${_HAVE_FAM} != ${WITH_FAM_SYSTEM}
+.  if defined(WITH_FAM_SYSTEM) && defined(_HAVE_FAM) && ${_HAVE_FAM} != ${WITH_FAM_SYSTEM}
 IGNORE=	FAM mismatch: ${_HAVE_FAM} is installed, but ${WITH_FAM_SYSTEM} desired
-.endif
+.  endif
 
-.if !empty(fam_ARGS)
-.for _fam_ARGS in ${fam_ARGS}
-.  if ! ${_FAM_SYSTEMS:M${_fam_ARGS}}
+.  if !empty(fam_ARGS)
+.    for _fam_ARGS in ${fam_ARGS}
+.      if ! ${_FAM_SYSTEMS:M${_fam_ARGS}}
 IGNORE=	Incorrect 'USES+= fam:${fam_ARGS}' usage: argument [${_fam_ARGS}] is not recognized
-.  endif
-.endfor
-.  if defined(_HAVE_FAM) && ${_HAVE_FAM} != ${fam_ARGS}
+.      endif
+.    endfor
+.    if defined(_HAVE_FAM) && ${_HAVE_FAM} != ${fam_ARGS}
 IGNORE=	FAM mismatch: port wants to use ${fam_ARGS} while you have ${_HAVE_FAM}
-.  endif
-.  if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM} != ${fam_ARGS}
+.    endif
+.    if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM} != ${fam_ARGS}
 IGNORE=	FAM mismatch: port wants to use ${fam_ARGS} while you wish to use ${WITH_FAM_SYSTEM}
+.    endif
 .  endif
-.endif
 
 # Proceed
-.if !empty(fam_ARGS)
+.  if !empty(fam_ARGS)
 _USE_FAM=	${fam_ARGS}
-.elif defined(_HAVE_FAM)
+.  elif defined(_HAVE_FAM)
 _USE_FAM=	${_HAVE_FAM}
-.elif defined(WITH_FAM_SYSTEM)
+.  elif defined(WITH_FAM_SYSTEM)
 _USE_FAM=	${WITH_FAM_SYSTEM}
-.else
+.  else
 _USE_FAM=	${_DEFAULT_FAM}
-.endif
+.  endif
 
 LIB_DEPENDS+=	${_${_USE_FAM}_DEPENDS}
 
diff --git a/Mk/Uses/firebird.mk b/Mk/Uses/firebird.mk
index 80c06442a251..23aaf9c5eb65 100644
--- a/Mk/Uses/firebird.mk
+++ b/Mk/Uses/firebird.mk
@@ -6,27 +6,27 @@
 .if !defined(_INCLUDE_USES_FIREBIRD_MK)
 _INCLUDE_USES_FIREBIRD_MK=	yes
 
-.if !empty(firebird_ARGS)
+.  if !empty(firebird_ARGS)
 FIREBIRD_VER=	${firebird_ARGS}
-.else
+.  else
 FIREBIRD_VER=	${FIREBIRD_DEFAULT}
-.endif
+.  endif
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
 VALID_FIREBIRD_VER=        2.5 3.0 4.0
 
-.for v in ${FIREBIRD_DEFAULT}
-.  if ! ${VALID_FIREBIRD_VER:M$v}
+.  for v in ${FIREBIRD_DEFAULT}
+.    if ! ${VALID_FIREBIRD_VER:M$v}
 IGNORE=		Invalid Firebird default version ${FIREBIRD_DEFAULT}; valid versions are ${VALID_FIREBIRD_VER}
-.  endif
-.endfor
+.    endif
+.  endfor
 
-.for w in ${FIREBIRD_VER}
-.  if ! ${VALID_FIREBIRD_VER:M$w}
+.  for w in ${FIREBIRD_VER}
+.    if ! ${VALID_FIREBIRD_VER:M$w}
 IGNORE=		Invalid Firebird version ${FIREBIRD_VER}; valid versions are ${VALID_FIREBIRD_VER}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 LIB_DEPENDS+=	libfbclient.so:databases/firebird${FIREBIRD_VER:S/.//}-client
 
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
index 1547744747bc..0c3957410c17 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -40,34 +40,34 @@
 .if !defined(_INCLUDE_USES_FONTS_MK)
 _INCLUDE_USES_FONTS_MK=	yes
 
-.if empty(fonts_ARGS)
+.  if empty(fonts_ARGS)
 fonts_ARGS=	fontsdir
-.endif
+.  endif
 
-.if !empty(fonts_ARGS:Nfc:Nfontsdir:Nnone)
+.  if !empty(fonts_ARGS:Nfc:Nfontsdir:Nnone)
 IGNORE=	USES=fonts - invalid ARGS (${fonts_ARGS})
-.endif
+.  endif
 
-.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfontsdir)
+.  if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfontsdir)
 RUN_DEPENDS+=	fc-cache:x11-fonts/fontconfig
-.endif
-.if !empty(fonts_ARGS:Mfontsdir)
+.  endif
+.  if !empty(fonts_ARGS:Mfontsdir)
 RUN_DEPENDS+=	mkfontscale:x11-fonts/mkfontscale
-.endif
+.  endif
 
 FONTNAME?=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/share/fonts/${FONTNAME}
-.if !empty(fonts_ARGS:Mfontsdir)
+.  if !empty(fonts_ARGS:Mfontsdir)
 PLIST_FILES+=	"@${fonts_ARGS} ${FONTSDIR}"
-.endif
-.if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC)
+.  endif
+.  if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC)
 FONTPATHD?=	${LOCALBASE}/etc/X11/fontpath.d
 PLIST_FILES+=	"${FONTPATHD}/${FONTPATHSPEC}"
 _USES_install+=	690:fonts-install-fontpathd
 fonts-install-fontpathd:
 	@${MKDIR} ${STAGEDIR}${FONTPATHD}
 	${RLN} ${STAGEDIR}${FONTSDIR} ${STAGEDIR}${FONTPATHD}/${FONTPATHSPEC}
-.endif
+.  endif
 SUB_LIST+=	FONTSDIR="${FONTSDIR}"
 PLIST_SUB+=	FONTSDIR="${FONTSDIR:S,^${PREFIX}/,,}"
 .endif
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
index 734730bc2aca..b8accb6c84d1 100644
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -9,21 +9,21 @@
 .if !defined(_INCLUDE_USES_FORTRAN_MK)
 _INCLUDE_USES_FORTRAN_MK=	yes
 
-.if empty(fortran_ARGS)
+.  if empty(fortran_ARGS)
 fortran_ARGS=	${FORTRAN_DEFAULT}
-.endif
+.  endif
 
-.if ${fortran_ARGS} == flang
-.if ${ARCH} == amd64
+.  if ${fortran_ARGS} == flang
+.    if ${ARCH} == amd64
 BUILD_DEPENDS+=	flang>0:devel/flang
 RUN_DEPENDS+=	flang>0:devel/flang
 F77=		flang
 FC=		flang
 LDFLAGS+=	-L${LOCALBASE}/flang/lib -Wl,--as-needed -lflang -lexecinfo -Wl,--no-as-needed
-.else
+.    else
 IGNORE=		USES=fortran: flang argument only available for amd64
-.endif
-.elif ${fortran_ARGS} == gfortran
+.    endif
+.  elif ${fortran_ARGS} == gfortran
 _GCC_VER=	${GCC_DEFAULT:S/.//}
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
 RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
@@ -33,9 +33,9 @@ FFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
-.else
+.  else
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
-.endif
+.  endif
 
 USE_BINUTILS=	yes
 CONFIGURE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk
index 5371544865fa..f5f5517d3d4d 100644
--- a/Mk/Uses/fpc.mk
+++ b/Mk/Uses/fpc.mk
@@ -27,13 +27,13 @@ FPC_Include_MAINTAINER= acm@FreeBSD.org
 
 _INCLUDE_USES_FPC_MK=   yes
 
-.if defined(DEFAULT_FPC_VER)
+.  if defined(DEFAULT_FPC_VER)
 WARNING+=	"DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
-.endif
+.  endif
 
-.if ${fpc_ARGS:Nrun:Nbase:Nall}
+.  if ${fpc_ARGS:Nrun:Nbase:Nall}
 IGNORE=		Unknown argument for USES=fpc: ${fpc_ARGS:Nrun:Nbase:Nall}
-.endif
+.  endif
 
 DEFAULT_FPC_VER=	${FPC_DEFAULT}
 # When adding a version, please keep the comment in
@@ -41,22 +41,22 @@ DEFAULT_FPC_VER=	${FPC_DEFAULT}
 FPC_VER=		${DEFAULT_FPC_VER}
 FPC_ARCH=		${ARCH:S/amd64/x86_64/}
 
-.if exists(${LOCALBASE}/bin/fpc)
+.  if exists(${LOCALBASE}/bin/fpc)
 FPC_CURRENT_VER!=	${LOCALBASE}/bin/fpc -iV
-.	if ${FPC_CURRENT_VER} != ${FPC_VER}
+.    if ${FPC_CURRENT_VER} != ${FPC_VER}
 IGNORE=	incompatible fpc ${FPC_CURRENT_VER} compiler, please install ${FPC_VER} version
-.	endif
-.endif
+.    endif
+.  endif
 
-.if ${ARCH} == "i386"
+.  if ${ARCH} == "i386"
 PPNAME=			ppc386
-.elif ${ARCH} == "amd64"
+.  elif ${ARCH} == "amd64"
 PPNAME=			ppcx64
-.else
+.  else
 PPNAME=			ppc_not_yet_ported
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
-.endif
+.  endif
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
 			${PPNAME}:lang/fpc
@@ -79,22 +79,22 @@ _FPC_ALL_UNITS=	a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
 		rtl-unicode sdl sqlite svgalib symbolic syslog tplylib unzip \
 		users utmp uuid vcl-compat webidl x11 xforms zlib
 
-.if ${fpc_ARGS:Mbase}
+.  if ${fpc_ARGS:Mbase}
 USE_FPC=	gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \
 		postgres pthreads regexpr sqlite
-.endif
+.  endif
 
-.if ${fpc_ARGS:Mall}
+.  if ${fpc_ARGS:Mall}
 USE_FPC=	${_FPC_ALL_UNITS}
-.endif
+.  endif
 
-.if defined(USE_FPC) && ${USE_FPC:tl} != "yes"
-.	for UNITS in ${USE_FPC}
-.		if ${_FPC_ALL_UNITS:M${UNITS}}==""
+.  if defined(USE_FPC) && ${USE_FPC:tl} != "yes"
+.    for UNITS in ${USE_FPC}
+.      if ${_FPC_ALL_UNITS:M${UNITS}}==""
 IGNORE= cannot install: unknown FPC unit ${UNITS}
-.		endif
-.	endfor
-.endif
+.      endif
+.    endfor
+.  endif
 
 # Base units
 gdbint_UNIT=	devel/fpc-gdbint
@@ -205,12 +205,12 @@ zlib_UNIT=	devel/fpc-zlib
 .endif
 
 .if defined(USE_FPC)
-.	for UNIT in ${USE_FPC}
-.		if ${_FPC_ALL_UNITS:M${UNIT}} != ""
+.  for UNIT in ${USE_FPC}
+.    if ${_FPC_ALL_UNITS:M${UNIT}} != ""
 BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
-.			if ${fpc_ARGS:Mrun} || ${fpc_ARGS:Mbase}
+.      if ${fpc_ARGS:Mrun} || ${fpc_ARGS:Mbase}
 RUN_DEPENDS+=   ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
-.			endif
-.		endif
-.	endfor
+.      endif
+.    endif
+.  endfor
 .endif
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
index e56f955d1103..9250a86e2429 100644
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -8,17 +8,17 @@
 .if !defined(_INCLUDE_USES_FUSE_MK)
 _INCLUDE_USES_FUSE_MK=	yes
 
-.if !empty(fuse_ARGS)
+.  if !empty(fuse_ARGS)
 LIBFUSE_VER=	${fuse_ARGS}
-.endif
+.  endif
 LIBFUSE_VER?=	2
 
-.if ${LIBFUSE_VER} == 2
+.  if ${LIBFUSE_VER} == 2
 LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
-.elif ${LIBFUSE_VER} == 3
+.  elif ${LIBFUSE_VER} == 3
 LIB_DEPENDS+=	libfuse3.so:sysutils/fusefs-libs3
-.else
+.  else
 IGNORE=		cannot install: unknown FUSE library version: ${LIBFUSE_VERSION}
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
index 274640eb89cb..499bc1fb752a 100644
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -13,11 +13,11 @@ _INCLUDE_USES_GEM_MK=        yes
 _valid_ARGS=			noautoplist
 
 # Sanity check
-.for arg in ${gem_ARGS}
+.  for arg in ${gem_ARGS}
 .    if empty(_valid_ARGS:M${arg})
 IGNORE= Incorrect 'USES+= gem:${gem_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
-.endfor
+.  endfor
 
 BUILD_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 RUN_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
@@ -65,21 +65,21 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
 
 RUBYGEMBIN=	${LOCALBASE}/bin/gem
 
-. if defined(DISTFILES)
+.  if defined(DISTFILES)
 GEMFILES=	${DISTFILES:C/:[^:]+$//}
-. else
+.  else
 GEMFILES=	${DISTNAME}${EXTRACT_SUFX}
-. endif
+.  endif
 
 RUBYGEM_ARGS=-l --no-update-sources --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
 
-.if ${PORT_OPTIONS:MDOCS}
+.  if ${PORT_OPTIONS:MDOCS}
 RUBYGEM_ARGS+=	--document rdoc,ri
-.else
+.  else
 RUBYGEM_ARGS+=	--no-document
-.endif
+.  endif
 
-.if !target(do-extract)
+.  if !target(do-extract)
 do-extract:
 	@${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}
 	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
@@ -89,9 +89,9 @@ do-extract:
 			fi; \
 		${FALSE}; \
 		fi)
-.endif
+.  endif
 
-.if !target(do-build)
+.  if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
@@ -100,9 +100,9 @@ do-build:
 			fi; \
 		${FALSE}; \
 		fi)
-.endif
+.  endif
 
-.if !target(do-install)
+.  if !target(do-install)
 do-install:
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS})
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
@@ -113,19 +113,19 @@ do-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${PLUGINS_DIR} 2> /dev/null || ${TRUE}
-.if !${PORT_OPTIONS:MDOCS}
+.    if !${PORT_OPTIONS:MDOCS}
 	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
-.endif
-.endif
+.    endif
+.  endif
 
-.if empty(gem_ARGS:Mnoautoplist)
+.  if empty(gem_ARGS:Mnoautoplist)
 _USES_install+=	820:gem-autoplist
 gem-autoplist:
 	@${ECHO_CMD} ${GEM_SPEC} >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
+.    if ${PORT_OPTIONS:MDOCS}
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
-.endif
+.    endif
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 	@if [ -d ${STAGEDIR}${PREFIX}/${EXT_DIR} ]; then \
@@ -136,6 +136,6 @@ gem-autoplist:
 		${FIND} -ds ${STAGEDIR}${PREFIX}/${PLUGINS_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
 	fi
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk
index 568db58b87f0..374a19b45ec4 100644
--- a/Mk/Uses/gettext-runtime.mk
+++ b/Mk/Uses/gettext-runtime.mk
@@ -9,18 +9,18 @@
 .if !defined(_INCLUDE_USES_GETTEXT_RUNTIME_MK)
 _INCLUDE_USES_GETTEXT_RUNTIME_MK=	yes
 
-.if empty(gettext-runtime_ARGS)
+.  if empty(gettext-runtime_ARGS)
 gettext-runtime_ARGS=	lib
-.endif
+.  endif
 
-.if ${gettext-runtime_ARGS:Mlib}
+.  if ${gettext-runtime_ARGS:Mlib}
 LIB_DEPENDS+=	libintl.so:devel/gettext-runtime
-.endif
-.if ${gettext-runtime_ARGS:Mbuild}
+.  endif
+.  if ${gettext-runtime_ARGS:Mbuild}
 BUILD_DEPENDS+=	gettext:devel/gettext-runtime
-.endif
-.if ${gettext-runtime_ARGS:Mrun}
+.  endif
+.  if ${gettext-runtime_ARGS:Mrun}
 RUN_DEPENDS+=	gettext:devel/gettext-runtime
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk
index 63e251bde988..948a505ed8b9 100644
--- a/Mk/Uses/gettext-tools.mk
+++ b/Mk/Uses/gettext-tools.mk
@@ -9,15 +9,15 @@
 .if !defined(_INCLUDE_USES_GETTEXT_TOOLS_MK)
 _INCLUDE_USES_GETTEXT_TOOLS_MK=	yes
 
-.if empty(gettext-tools_ARGS)
+.  if empty(gettext-tools_ARGS)
 gettext-tools_ARGS=	build
-.endif
+.  endif
 
-.if ${gettext-tools_ARGS:Mbuild}
+.  if ${gettext-tools_ARGS:Mbuild}
 BUILD_DEPENDS+=	msgfmt:devel/gettext-tools
-.endif
-.if ${gettext-tools_ARGS:Mrun}
+.  endif
+.  if ${gettext-tools_ARGS:Mrun}
 RUN_DEPENDS+=	msgfmt:devel/gettext-tools
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/gettext.mk b/Mk/Uses/gettext.mk
index 936f2056f3f2..bedcbfcce669 100644
--- a/Mk/Uses/gettext.mk
+++ b/Mk/Uses/gettext.mk
@@ -9,9 +9,9 @@
 .if !defined(_INCLUDE_USES_GETTEXT_MK)
 _INCLUDE_USES_GETTEXT_MK=	yes
 
-.if !empty(gettext_ARGS)
+.  if !empty(gettext_ARGS)
 IGNORE=		USES=gettext does not take arguments
-.endif
+.  endif
 
 .include "${USESDIR}/gettext-runtime.mk"
 .include "${USESDIR}/gettext-tools.mk"
diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk
index b59bbc28e034..ea76af70ef47 100644
--- a/Mk/Uses/ghostscript.mk
+++ b/Mk/Uses/ghostscript.mk
@@ -34,72 +34,72 @@ _GS_VERSION=	7 8 9 agpl
 
 _GS_ARGS=		${ghostscript_ARGS}
 
-.if ${_GS_ARGS:N[789]:Nagpl:Nx11:Nbuild:Nrun:Ntest}
+.  if ${_GS_ARGS:N[789]:Nagpl:Nx11:Nbuild:Nrun:Ntest}
 IGNORE?=	Unknown ghostscript argument ${_GS_ARGS}
-.endif
+.  endif
 
-.if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
+.  if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
 IGNORE?=	Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
-.endif
+.  endif
 
 # Make sure that no dependency or some other environment variable
 # pollutes the build/run dependency detection
 .undef _GS_BUILD_DEP
 .undef _GS_RUN_DEP
 .undef _GS_TEST_DEP
-.if ${_GS_ARGS:Mbuild}
+.  if ${_GS_ARGS:Mbuild}
 _GS_BUILD_DEP=	yes
-.endif
-.if ${_GS_ARGS:Mrun}
+.  endif
+.  if ${_GS_ARGS:Mrun}
 _GS_RUN_DEP=	yes
-.endif
-.if ${_GS_ARGS:Mtest}
+.  endif
+.  if ${_GS_ARGS:Mtest}
 _GS_TEST_DEP=	yes
-.endif
+.  endif
 
 # The port does not specify a build, run, or test dependency, assume that
 # a build and run dependency is required.
-.if !defined(_GS_BUILD_DEP) && !defined(_GS_RUN_DEP) && !defined(_GS_TEST_DEP)
+.  if !defined(_GS_BUILD_DEP) && !defined(_GS_RUN_DEP) && !defined(_GS_TEST_DEP)
 _GS_BUILD_DEP=	yes
 _GS_RUN_DEP=	yes
-.endif
+.  endif
 
 .undef _GS_SELECTED
-.for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT}
+.  for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT}
 _V=${V}
-.if ${_V:M9}
+.    if ${_V:M9}
 _GS_SELECTED?=		9
-.elif ${_V:Magpl}
+.    elif ${_V:Magpl}
 _GS_SELECTED?=		9-agpl
-.elif ${_V:M8}
+.    elif ${_V:M8}
 _GS_SELECTED?=		8
-.elif ${_V:M7}
+.    elif ${_V:M7}
 _GS_SELECTED?=		7
-.endif
-.endfor
+.    endif
+.  endfor
 
 # Resolve minor version number for X11.so library.
-.if !empty(_GS_SELECTED:M9-agpl)
+.  if !empty(_GS_SELECTED:M9-agpl)
 _GS_VERSION_MINOR=	9.16_2
-.elif !empty(_GS_SELECTED:M9)
+.  elif !empty(_GS_SELECTED:M9)
 _GS_VERSION_MINOR=	9.06_11
-.elif !empty(_GS_SELECTED:M8)
+.  elif !empty(_GS_SELECTED:M8)
 _GS_VERSION_MINOR=	8.71_19
-.elif !empty(_GS_SELECTED:M7)
+.  elif !empty(_GS_SELECTED:M7)
 _GS_VERSION_MINOR=	7.07_32
-.endif
+.  endif
 
 # dependencies
 _GS_PORT=	ghostscript${_GS_SELECTED}-base
 _GS_X11_PORT=	ghostscript${_GS_SELECTED}-x11
 
-.for type in BUILD RUN TEST
-.if defined(_GS_${type}_DEP)
+.  for type in BUILD RUN TEST
+.    if defined(_GS_${type}_DEP)
 ${type}_DEPENDS+=	${_GS_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_PORT}
-.if ${_GS_ARGS:Mx11}
+.      if ${_GS_ARGS:Mx11}
 ${type}_DEPENDS+=	${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT}
-.endif
-.endif
-.endfor
+.      endif
+.    endif
+.  endfor
 
 .endif # _INCLUDE_USES_GHOSTSCRIPT_MK
diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
index 6bfba723773e..252fb80921be 100644
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -25,30 +25,30 @@ _GL_glu_USE_XORG=		xorgproto
 _GL_glut_LIB_DEPENDS=		libglut.so:graphics/freeglut
 _GL_opengl_LIB_DEPENDS=		libOpenGL.so:graphics/libglvnd
 
-.if !empty(gl_ARGS)
+.  if !empty(gl_ARGS)
 IGNORE=	USES=gl takes no arguments
-.endif
+.  endif
 
-.if !defined(USE_GL)
+.  if !defined(USE_GL)
 IGNORE=		need to specify gl component with USE_GL
-.elif ${USE_GL:tl} == yes
+.  elif ${USE_GL:tl} == yes
 DEV_WARNING+=	"USE_GL=yes is deprecated, please add USE_GL=glu (default) or specify component"
 USE_GL=		glu
-.endif
+.  endif
 
-.for _component in ${USE_GL}
-.if !defined(_GL_${_component}_LIB_DEPENDS)
+.  for _component in ${USE_GL}
+.    if !defined(_GL_${_component}_LIB_DEPENDS)
 IGNORE=		uses unknown GL component
-.else
+.    else
 USE_XORG+=	${_GL_${_component}_USE_XORG}
 LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
-.endif
-.endfor
+.    endif
+.  endfor
 
 # We only need to include xorg.mk if we want USE_XORG modules
-.if defined(USE_XORG) && !empty(USE_XORG)
+.  if defined(USE_XORG) && !empty(USE_XORG)
 .include "${USESDIR}/xorg.mk"
-.endif
+.  endif
 
 # _INCLUDE_USES_GL_MK
 .endif
diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk
index 50b9df2ecb3c..f39f3f685277 100644
--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@@ -8,9 +8,9 @@
 .if !defined(_INCLUDE_USES_GMAKE_MK)
 _INCLUDE_USES_GMAKE_MK=	yes
 
-.if !empty(gmake_ARGS)
+.  if !empty(gmake_ARGS)
 IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
-.endif
+.  endif
 
 BUILD_DEPENDS+=		gmake>=4.3:devel/gmake
 CONFIGURE_ENV+=		MAKE=gmake
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index f79319ebd250..b15f55c4bc7b 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -49,9 +49,9 @@ _INCLUDE_USES_GNOME_MK=        yes
 
 _USES_POST+=	gnome
 
-.if !empty(gnome_ARGS)
+.  if !empty(gnome_ARGS)
 IGNORE=	USES=gnome takes no arguments
-.endif
+.  endif
 
 # non-version specific components
 _USE_GNOME_ALL= intlhack intltool introspection \
@@ -223,15 +223,15 @@ libadwaita_LIB_DEPENDS=		libadwaita-1.so:x11-toolkits/libadwaita
 libadwaita_USE_GNOME_IMPL=	gtk40
 
 # Use librsvg2-rust where lang/rust is available
-.if ${LIBRSVG2_DEFAULT:Mrust}
+.  if ${LIBRSVG2_DEFAULT:Mrust}
 librsvg2_BUILD_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2-rust
 librsvg2_RUN_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
-.else
+.  else
 librsvg2_BUILD_DEPENDS=	librsvg2>=0:graphics/librsvg2
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 librsvg2_RUN_DEPENDS=	librsvg2>=0:graphics/librsvg2
-.endif
+.  endif
 librsvg2_USE_GNOME_IMPL=gdkpixbuf2 pango
 
 nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
@@ -302,24 +302,24 @@ gvfs_USE_GNOME_IMPL=	glib20
 
 # End component definition section
 
-.if defined(USE_GNOME)
+.  if defined(USE_GNOME)
 # First of all expand all USE_GNOME_IMPL recursively
-. for component in ${_USE_GNOME_ALL}
-.  for subcomponent in ${${component}_USE_GNOME_IMPL}
+.    for component in ${_USE_GNOME_ALL}
+.      for subcomponent in ${${component}_USE_GNOME_IMPL}
 ${component}_USE_GNOME_IMPL+=${${subcomponent}_USE_GNOME_IMPL}
-.  endfor
-. endfor
+.      endfor
+.    endfor
 
 # Then use already expanded USE_GNOME_IMPL to expand USE_GNOME.
 # Also, check to see if each component has a desktop requirement.  If it does,
 # and if the user's chosen desktop is not of the same version, mark the
 # port as IGNORE.
-. for component in ${USE_GNOME:C/^([^:]+).*/\1/}
-.  if ${_USE_GNOME_ALL:M${component}}==""
+.    for component in ${USE_GNOME:C/^([^:]+).*/\1/}
+.      if ${_USE_GNOME_ALL:M${component}}==""
 IGNORE=	cannot install: Unknown component ${component}
-.  endif
+.      endif
 _USE_GNOME+=	${${component}_USE_GNOME_IMPL} ${component}
-. endfor
+.    endfor
 
 # Setup the GTK+ API version for pixbuf loaders, input method modules,
 # and theme engines.
@@ -327,68 +327,68 @@ PLIST_SUB+=			GTK2_VERSION="${GTK2_VERSION}" \
 				GTK3_VERSION="${GTK3_VERSION}" \
 				GTK4_VERSION="${GTK4_VERSION}"
 
-.if defined(_USE_GNOME) && empty(_USE_GNOME:Mglib20:u) && defined(GLIB_SCHEMAS)
+.    if defined(_USE_GNOME) && empty(_USE_GNOME:Mglib20:u) && defined(GLIB_SCHEMAS)
 IGNORE=		GLIB_SCHEMAS is set, but needs USE_GNOME=glib20 to work
-.endif
+.    endif
 
-.if defined(_USE_GNOME) && empty(_USE_GNOME:Mgconf2:u) && defined(GCONF_SCHEMAS)
+.    if defined(_USE_GNOME) && empty(_USE_GNOME:Mgconf2:u) && defined(GCONF_SCHEMAS)
 IGNORE=		GCONF_SCHEMAS is set, but needs USE_GNOME=gconf2 to work
-.endif
+.    endif
 
 # Then traverse through all components, check which of them
 # exist in ${_USE_GNOME} and set variables accordingly
-.ifdef _USE_GNOME
+.    ifdef _USE_GNOME
 
-. for component in ${_USE_GNOME:O:u}
-.  if defined(${component}_PATCH_DEPENDS)
+.      for component in ${_USE_GNOME:O:u}
+.        if defined(${component}_PATCH_DEPENDS)
 PATCH_DEPENDS+=	${${component}_PATCH_DEPENDS}
-.  endif
+.        endif
 
-.  if ${USE_GNOME:M${component}\:build} && defined(${component}_BUILD_DEPENDS)
+.        if ${USE_GNOME:M${component}\:build} && defined(${component}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-.  elif ${USE_GNOME:M${component}\:run} && defined(${component}_RUN_DEPENDS)
+.        elif ${USE_GNOME:M${component}\:run} && defined(${component}_RUN_DEPENDS)
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.  else
-.   if defined(${component}_LIB_DEPENDS)
+.        else
+.          if defined(${component}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
-.   else
+.          else
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.   endif
-.  endif
+.          endif
+.        endif
 
-.  if defined(${component}_CONFIGURE_ARGS)
+.        if defined(${component}_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
-.  endif
+.        endif
 
-.  if defined(${component}_CONFIGURE_ENV)
+.        if defined(${component}_CONFIGURE_ENV)
 CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV}
-.  endif
+.        endif
 
-.  if defined(${component}_MAKE_ENV)
+.        if defined(${component}_MAKE_ENV)
 MAKE_ENV+=	${${component}_MAKE_ENV}
-.  endif
+.        endif
 
-.  if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
+.        if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_TARGET=	${${component}_CONFIGURE_TARGET}
-.  endif
+.        endif
 
-.  if defined(${component}_PRE_PATCH)
+.        if defined(${component}_PRE_PATCH)
 GNOME_PRE_PATCH+=	; ${${component}_PRE_PATCH}
-.  endif
-. endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
-. if defined(GCONF_SCHEMAS)
+.    if defined(GCONF_SCHEMAS)
 MAKE_ENV+=	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-. endif
-.endif
+.    endif
+.  endif
 
-.if defined(USE_GNOME_SUBR)
+.  if defined(USE_GNOME_SUBR)
 GNOME_SUBR=		${LOCALBASE}/etc/gnome.subr
 RUN_DEPENDS+=	${GNOME_SUBR}:sysutils/gnome_subr
 SUB_LIST+=		GNOME_SUBR=${GNOME_SUBR}
-.endif
+.  endif
 
 .endif
 # end of the part
@@ -396,13 +396,13 @@ SUB_LIST+=		GNOME_SUBR=${GNOME_SUBR}
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GNOME_POST_MK)
 _INCLUDE_USES_GNOME_POST_MK=     yes
 
-.if defined(GNOME_PRE_PATCH)
+.  if defined(GNOME_PRE_PATCH)
 _USES_patch+=	290:gnome-pre-patch
 gnome-pre-patch:
 	@${GNOME_PRE_PATCH:C/^;//1}
-.endif
+.  endif
 
-.if defined(GCONF_SCHEMAS)
+.  if defined(GCONF_SCHEMAS)
 _USES_install+=	690:gnome-post-gconf-schemas
 gnome-post-gconf-schemas:
 	@for i in ${GCONF_SCHEMAS}; do \
@@ -412,15 +412,15 @@ gnome-post-gconf-schemas:
 		${ECHO_CMD} "@postexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} HOME=${WRKDIR} gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \
 			>> ${TMPPLIST}; \
 	done
-.endif
+.  endif
 
-.if defined(GLIB_SCHEMAS)
+.  if defined(GLIB_SCHEMAS)
 _USES_install+=	690:gnome-post-glib-schemas
 gnome-post-glib-schemas:
 	@for i in ${GLIB_SCHEMAS}; do \
 		${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \
 	done
-.endif
+.  endif
 
 .endif
 # End of use part.
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk
index 27b947392b15..fa12bbac54dc 100644
--- a/Mk/Uses/gnustep.mk
+++ b/Mk/Uses/gnustep.mk
@@ -31,43 +31,43 @@ GNUSTEP_LOCAL_TOOLS=		${GNUSTEP_LOCAL_ROOT}/Tools
 LIB_DIRS+=	${GNUSTEP_SYSTEM_LIBRARIES} \
 		${GNUSTEP_LOCAL_LIBRARIES}
 
-.for a in CFLAGS CPPFLAGS CXXFLAGS OBJCCFLAGS OBJCFLAGS LDFLAGS
+.  for a in CFLAGS CPPFLAGS CXXFLAGS OBJCCFLAGS OBJCFLAGS LDFLAGS
 MAKE_ENV+=	ADDITIONAL_${a}="${ADDITIONAL_${a}} ${${a}}"
-.endfor
-.for a in FLAGS INCLUDE_DIRS LIB_DIRS
+.  endfor
+.  for a in FLAGS INCLUDE_DIRS LIB_DIRS
 MAKE_ENV+=	ADDITIONAL_${a}="${ADDITIONAL_${a}}"
-.endfor
+.  endfor
 MAKE_ARGS+=messages=yes
 # BFD ld can't link Objective-C programs for some reason.  Most things are fine
 # with LLD, but the things that don't (e.g. sope) need gold.
-.if defined(LLD_UNSAFE)
+.  if defined(LLD_UNSAFE)
 MAKE_ARGS+=LDFLAGS='-fuse-ld=gold'
 BUILD_DEPENDS+=         ${LOCALBASE}/bin/ld.gold:devel/binutils
-.else
+.  else
 MAKE_ARGS+=LDFLAGS='-fuse-ld=${OBJC_LLD}'
-.endif
+.  endif
 
 MAKEFILE=	GNUmakefile
 #MAKE_ENV+=	GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf
 GNU_CONFIGURE_PREFIX=	${GNUSTEP_PREFIX}
 
-.if ${MACHINE_ARCH} == "i386"
+.  if ${MACHINE_ARCH} == "i386"
 GNU_ARCH=	ix86
-.else
+.  else
 GNU_ARCH=	${MACHINE_ARCH}
-.endif
+.  endif
 
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION}
 PLIST_SUB+=	MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
 PLIST_SUB+=	LIBVERSION=${DEFAULT_LIBVERSION}
 PLIST_SUB+=	MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1}
 
-.if defined(USE_GNUSTEP)
-.  if ${USE_GNUSTEP:Mbase}
+.  if defined(USE_GNUSTEP)
+.    if ${USE_GNUSTEP:Mbase}
 LIB_DEPENDS+=	libgnustep-base.so:lang/gnustep-base
-.  endif
+.    endif
 
-.  if ${USE_GNUSTEP:Mbuild}
+.    if ${USE_GNUSTEP:Mbuild}
 PATH:=	${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}:${PATH}
 MAKE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
 # All GNUstep things installed from ports should be in the System domain.
@@ -77,17 +77,17 @@ MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 CONFIGURE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
 BUILD_DEPENDS+=	gnustep-make>0:devel/gnustep-make
 .include "${USESDIR}/objc.mk"
-.  endif
+.    endif
 
-.  if ${USE_GNUSTEP:Mgui}
+.    if ${USE_GNUSTEP:Mgui}
 LIB_DEPENDS+=	libgnustep-gui.so:x11-toolkits/gnustep-gui
-.  endif
+.    endif
 
-.  if ${USE_GNUSTEP:Mback}
+.    if ${USE_GNUSTEP:Mback}
 BUILD_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
 RUN_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
-.  endif
+.    endif
 
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index f6b564b7be38..034416dda1c1 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -63,38 +63,38 @@
 .if !defined(_INCLUDE_USES_GO_MK)
 _INCLUDE_USES_GO_MK=	yes
 
-.if !empty(go_ARGS:Nmodules:Nno_targets:Nrun)
+.  if !empty(go_ARGS:Nmodules:Nno_targets:Nrun)
 IGNORE=	USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nrun}
-.endif
+.  endif
 
 # Settable variables
 
-.if empty(GO_PKGNAME)
-.  if !empty(GH_SUBDIR)
+.  if empty(GO_PKGNAME)
+.    if !empty(GH_SUBDIR)
 GO_PKGNAME=	${GH_SUBDIR:S|^src/||}
-.  elif !empty(GL_SUBDIR)
+.    elif !empty(GL_SUBDIR)
 GO_PKGNAME=	${GL_SUBDIR:S|^src/||}
-.  else
+.    else
 GO_PKGNAME=	${PORTNAME}
+.    endif
 .  endif
-.endif
 
 GO_TARGET?=	${GO_PKGNAME}
 GO_TESTTARGET?=	./...
 
 GO_BUILDFLAGS+=	-v -buildmode=exe -trimpath
-.if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*)
+.  if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*)
 GO_BUILDFLAGS+=	-ldflags=-s
-.endif
+.  endif
 GO_TESTFLAGS+=	-v
 
 CGO_ENABLED?=	1
 CGO_CFLAGS+=	-I${LOCALBASE}/include
 CGO_LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.  if ${ARCH} == armv6 || ${ARCH} == armv7
 GOARM?=		${ARCH:C/armv//}
-.endif
+.  endif
 
 GO_GOPROXY?=	https://proxy.golang.org
 GO_GOSUMDB?=	sum.golang.org
@@ -108,7 +108,7 @@ GO_ENV+=	CGO_ENABLED=${CGO_ENABLED} \
 		CGO_LDFLAGS="${CGO_LDFLAGS}" \
 		GOARM=${GOARM}
 
-.if ${go_ARGS:Mmodules}
+.  if ${go_ARGS:Mmodules}
 GO_BUILDFLAGS+=	-mod=vendor
 GO_TESTFLAGS+=	-mod=vendor
 GO_GOPATH=	${DISTDIR}/go/${PKGORIGIN:S,/,_,g}
@@ -118,7 +118,7 @@ GO_ENV+=	GOPATH="${GO_GOPATH}" \
 		GO111MODULE=on \
 		GOFLAGS=-modcacherw \
 		GOSUMDB=${GO_GOSUMDB}
-.  if defined(GO_MODULE)
+.    if defined(GO_MODULE)
 GO_MODNAME=	${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\1/}
 GO_MODVERSION=	${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\2/:M@*:S/^@//:S/^$/${DISTVERSIONFULL}/}
 GO_MODFILE=	${GO_MODVERSION}.mod
@@ -131,23 +131,23 @@ WRKSRC=		${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
 FETCH_DEPENDS+=	${GO_CMD}:${GO_PORT} \
 		ca_root_nss>0:security/ca_root_nss
 USES+=		zip
-.  else
+.    else
 GO_ENV+=	GO_NO_VENDOR_CHECKS=1
-.  endif
-.else
+.    endif
+.  else
 GO_GOPATH=	${WRKDIR}
 GO_WRKSRC=	${WRKDIR}/src/${GO_PKGNAME}
 GO_ENV+=	GOPATH="${GO_GOPATH}" \
 		GOBIN="" \
 		GO111MODULE=off
-.endif
+.  endif
 
 GO_PORT?=	lang/go
 
 BUILD_DEPENDS+=	${GO_CMD}:${GO_PORT}
-.if ${go_ARGS:Mrun}
+.  if ${go_ARGS:Mrun}
 RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
-.endif
+.  endif
 
 _USES_POST+=	go
 .endif # !defined(_INCLUDE_USES_GO_MK)
@@ -155,26 +155,26 @@ _USES_POST+=	go
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)
 _INCLUDE_USES_GO_POST_MK=	yes
 
-.if !target(post-fetch) && ${go_ARGS:Mmodules} && defined(GO_MODULE)
+.  if !target(post-fetch) && ${go_ARGS:Mmodules} && defined(GO_MODULE)
 post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x)
-.endif
+.  endif
 
-.if !target(post-extract)
-.  if empty(go_ARGS)
+.  if !target(post-extract)
+.    if empty(go_ARGS)
 post-extract:
 	@${MKDIR} ${GO_WRKSRC:H}
 	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-.  elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
+.    elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
 post-extract:
 	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor)
-.  endif 
-.endif
+.    endif 
+.  endif
 
-.if !target(do-build) && empty(go_ARGS:Mno_targets)
+.  if !target(do-build) && empty(go_ARGS:Mno_targets)
 do-build:
 	(cd ${GO_WRKSRC}; \
 	for t in ${GO_TARGET}; do \
@@ -187,9 +187,9 @@ do-build:
 			-o ${GO_WRKDIR_BIN}/$${out} \
 			$${pkg}; \
 	done)
-.endif
+.  endif
 
-.if !target(do-install) && empty(go_ARGS:Mno_targets)
+.  if !target(do-install) && empty(go_ARGS:Mno_targets)
 do-install:
 	for t in ${GO_TARGET}; do \
 		dst=$$(${ECHO_CMD} $${t} | \
@@ -202,36 +202,36 @@ do-install:
 		${ECHO_MSG} "===>  Installing $${src} as $${dst}"; \
 		${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/$${src} $${dst}; \
 	done
-.endif
+.  endif
 
-.if !target(do-test) && empty(go_ARGS:Mno_targets)
+.  if !target(do-test) && empty(go_ARGS:Mno_targets)
 do-test:
 	(cd ${GO_WRKSRC}; \
 	for t in ${GO_TESTTARGET}; do \
 		${ECHO_MSG} "===>  Testing $${t}"; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
 	done)
-.endif
+.  endif
 
-.if ${go_ARGS:Mmodules} && defined(GO_MODULE)
+.  if ${go_ARGS:Mmodules} && defined(GO_MODULE)
 gomod-clean:
-.if exists(${GO_CMD})
+.    if exists(${GO_CMD})
 	@${ECHO_MSG} "===>  Cleaning Go module cache"
 	@${SETENV} ${GO_ENV} ${GO_CMD} clean -modcache
-.else
+.    else
 	@${ECHO_MSG} "===>    Skipping since ${GO_CMD} is not installed"
-.endif
+.    endif
 
 # Hook up to distclean
-.if !target(post-clean) && !make(clean)
+.    if !target(post-clean) && !make(clean)
 post-clean: gomod-clean
 	@${RM} -r ${GO_GOPATH}
-.endif
-.endif
+.    endif
+.  endif
 
 # Helper targets for port maintainers
 
-.if ${go_ARGS:Mmodules} && !defined(GO_MODULE)
+.  if ${go_ARGS:Mmodules} && !defined(GO_MODULE)
 _MODULES2TUPLE_CMD=	modules2tuple
 gomod-vendor-deps:
 	@if ! type ${GO_CMD} > /dev/null 2>&1; then \
@@ -250,6 +250,6 @@ gomod-vendor-diff: gomod-vendor-deps patch
 	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${SED} 's|GH_TUPLE=|	|; s| \\$$||' | ${GREP} -v '		\\' > ${WRKDIR}/GH_TUPLE-new.txt && \
 	echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^|		|" > ${WRKDIR}/GH_TUPLE-old.txt && \
 	${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0
-.endif
+.  endif
 
 .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)
diff --git a/Mk/Uses/gperf.mk b/Mk/Uses/gperf.mk
index 3a342ed17f30..abe9932dbf87 100644
--- a/Mk/Uses/gperf.mk
+++ b/Mk/Uses/gperf.mk
@@ -8,24 +8,24 @@
 .if !defined(_INCLUDE_USES_GPERF_MK)
 _INCLUDE_USES_GPERF_MK=	yes
 
-.if !exists(/usr/bin/gperf)
+.  if !exists(/usr/bin/gperf)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/gperf:devel/gperf
 GPERF=	${LOCALBASE}/bin/gperf
-.else
+.  else
 _GPERF_VERSION!=	/usr/bin/gperf --version | head -1 || true
 _GPERF_MAJ_VERSION=	${_GPERF_VERSION:M[0-9].[0-9].[0-9]:C/.*([0-9]).[0-9].[0-9].*/\1/g}
 
-.if empty(_GPERF_MAJ_VERSION)
+.    if empty(_GPERF_MAJ_VERSION)
 _GPERF_MAJ_VERSION=	0
-.endif
+.    endif
 
-.if ${_GPERF_MAJ_VERSION} < 3
+.    if ${_GPERF_MAJ_VERSION} < 3
 BUILD_DEPENDS+=	${LOCALBASE}/bin/gperf:devel/gperf
 GPERF=	${LOCALBASE}/bin/gperf
-.else
+.    else
 GPERF=	/usr/bin/gperf
-.endif
-.endif
+.    endif
+.  endif
 
 CONFIGURE_ENV+=	GPERF=${GPERF}
 MAKE_ENV+=	GPERF=${GPERF}
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index 9449b97c9494..c1b3d5954c3b 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -77,15 +77,15 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal
 _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5
 _HEADERS=	sys/types.h sys/stat.h stdint.h
 
-.if empty(gssapi_ARGS)
+.  if empty(gssapi_ARGS)
 gssapi_ARGS=	base
-.endif
-.for _A in ${gssapi_ARGS}
+.  endif
+.  for _A in ${gssapi_ARGS}
 _local:=	${_A}
-.if ${_local} == "base"
-.  if ${SSL_DEFAULT} != base
+.    if ${_local} == "base"
+.      if ${SSL_DEFAULT} != base
 IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
-.  endif
+.      endif
 HEIMDAL_HOME=	/usr
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
@@ -94,66 +94,66 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
 GSSAPILDFLAGS=
-.elif ${_local} == "heimdal"
+.    elif ${_local} == "heimdal"
 HEIMDAL_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include/heimdal
 _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
-.if !defined(_KRB_BOOTSTRAP)
+.      if !defined(_KRB_BOOTSTRAP)
 BUILD_DEPENDS+=	${_HEIMDAL_DEPENDS}
 RUN_DEPENDS+=	${_HEIMDAL_DEPENDS}
-.else
+.      else
 PREFIX=		${HEIMDAL_HOME}
-.endif
+.      endif
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 _RPATH=		${GSSAPILIBDIR}
-.elif ${_local} == "mit"
+.    elif ${_local} == "mit"
 KRB5_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${KRB5_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
 _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
-.if !defined(_KRB_BOOTSTRAP)
+.      if !defined(_KRB_BOOTSTRAP)
 BUILD_DEPENDS+=	${_MITKRB5_DEPENDS}
 RUN_DEPENDS+=	${_MITKRB5_DEPENDS}
-.else
+.      else
 PREFIX=		${KRB5_HOME}
-.endif
+.      endif
 GSSAPILIBS=	-lkrb5 -lgssapi_krb5
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 _RPATH=		${GSSAPILIBDIR}
-.elif ${_local} == "bootstrap"
+.    elif ${_local} == "bootstrap"
 _KRB_BOOTSTRAP=	1
-.elif ${_local} == "flags"
+.    elif ${_local} == "flags"
 _KRB_USEFLAGS=	1
-.else
+.    else
 IGNORE=	USES=gssapi - invalid args: [${_local}] specified
-.endif
-.endfor
+.    endif
+.  endfor
 
 KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
 
 # Fix up -Wl,-rpath in LDFLAGS
-.if defined(_RPATH) && !empty(_RPATH)
-.if !empty(LDFLAGS:M-Wl,-rpath,*)
-.for F in ${LDFLAGS:M-Wl,-rpath,*}
+.  if defined(_RPATH) && !empty(_RPATH)
+.    if !empty(LDFLAGS:M-Wl,-rpath,*)
+.      for F in ${LDFLAGS:M-Wl,-rpath,*}
 LDFLAGS:=	-Wl,-rpath,${_RPATH}:${F:S/-Wl,-rpath,//} \
 		${LDFLAGS:N-Wl,-rpath,*}
-.endfor
-.else
+.      endfor
+.    else
 LDFLAGS+=	-Wl,-rpath,${_RPATH}:/usr/lib
-.endif
+.    endif
 _DEBUG_KRB_RPATH=	-Wl,-rpath,${_RPATH}
-.endif
-.if defined(_KRB_USEFLAGS) && !empty(_KRB_USEFLAGS)
+.  endif
+.  if defined(_KRB_USEFLAGS) && !empty(_KRB_USEFLAGS)
 CPPFLAGS+=	${GSSAPICPPFLAGS}
 LDFLAGS+=	${GSSAPILDFLAGS}
 LDADD+=		${GSSAPILIBS}
-.endif
+.  endif
 GSSAPI_CONFIGURE_ARGS=	\
 	CFLAGS="${GSSAPICPPFLAGS} ${CFLAGS}" \
 	LDFLAGS="${GSSAPILDFLAGS} ${LDFLAGS}" \
diff --git a/Mk/Uses/horde.mk b/Mk/Uses/horde.mk
index 2a7378c817ee..5b3089d88c46 100644
--- a/Mk/Uses/horde.mk
+++ b/Mk/Uses/horde.mk
@@ -130,29 +130,29 @@ horde-timeobjects-DEPEND=	${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:d
 horde-trean-DEPEND=		${LOCALBASE}/${HORDE_DIR}/trean/index.php:www/horde-trean
 horde-turba-DEPEND=		${LOCALBASE}/${HORDE_DIR}/turba/index.php:mail/horde-turba
 
-.if defined(USE_HORDE_RUN)
-. for DEP in ${USE_HORDE_RUN}
-.  if !defined(horde-${DEP}-DEPEND)
+.  if defined(USE_HORDE_RUN)
+.    for DEP in ${USE_HORDE_RUN}
+.      if !defined(horde-${DEP}-DEPEND)
 UNKNOWN_HORDE_PACKAGES+=	${DEP}
-.  else
+.      else
 RUN_DEPENDS+=	${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
+.      endif
+.    endfor
 .  endif
-. endfor
-.endif
 
-.if defined(USE_HORDE_BUILD)
-. for DEP in ${USE_HORDE_BUILD}
-.  if !defined(horde-${DEP}-DEPEND)
+.  if defined(USE_HORDE_BUILD)
+.    for DEP in ${USE_HORDE_BUILD}
+.      if !defined(horde-${DEP}-DEPEND)
 UNKNOWN_HORDE_PACKAGES+=	${DEP}
-.  else
+.      else
 BUILD_DEPENDS+=	${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
+.      endif
+.    endfor
 .  endif
-. endfor
-.endif
 
-.if defined(UNKNOWN_HORDE_PACKAGES)
+.  if defined(UNKNOWN_HORDE_PACKAGES)
 IGNORE=	unknown Horde package(s): ${UNKNOWN_HORDE_PACKAGES}
-.endif
+.  endif
 
 .include "${USESDIR}/pear.mk"
 .endif
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
index 4b9fafc10d35..8561e51c666b 100644
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -11,7 +11,7 @@
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes
 
-.if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit}
+.  if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit}
 
 ICONV_CMD=	${LOCALBASE}/bin/iconv
 ICONV_LIB=	-liconv
@@ -21,15 +21,15 @@ ICONV_CONFIGURE_BASE=	--with-libiconv=${LOCALBASE}
 ICONV_INCLUDE_PATH=	${LOCALBASE}/include
 ICONV_LIB_PATH=		${LOCALBASE}/lib/libiconv.so
 
-.if ${iconv_ARGS:Mbuild}
+.    if ${iconv_ARGS:Mbuild}
 BUILD_DEPENDS+=	${ICONV_CMD}:converters/libiconv
-.elif ${iconv_ARGS:Mpatch}
+.    elif ${iconv_ARGS:Mpatch}
 PATCH_DEPENDS+=	${ICONV_CMD}:converters/libiconv
-.else
+.    else
 LIB_DEPENDS+=	libiconv.so:converters/libiconv
-.endif
+.    endif
 
-.else
+.  else
 
 ICONV_CMD=	/usr/bin/iconv
 ICONV_LIB=
@@ -39,10 +39,10 @@ ICONV_CONFIGURE_BASE=
 ICONV_INCLUDE_PATH=	/usr/include
 ICONV_LIB_PATH=		/usr/lib/libc.so
 
-.if exists(${LOCALBASE}/include/iconv.h)
+.    if exists(${LOCALBASE}/include/iconv.h)
 # Check that libiconv iconv.h is recent enough for LIBICONV_PLUG to work.
 BUILD_DEPENDS+=	libiconv>=1.14_11:converters/libiconv
-.endif
+.    endif
 
 # LIBICONV_PLUG makes libiconv iconv.h act like libc iconv.h.
 CPPFLAGS+=	-DLIBICONV_PLUG
@@ -50,7 +50,7 @@ CFLAGS+=	-DLIBICONV_PLUG
 CXXFLAGS+=	-DLIBICONV_PLUG
 OBJCFLAGS+=	-DLIBICONV_PLUG
 
-.endif
+.  endif
 
 # These are the most common names for the iconv-related variables found in
 # CMake-based ports. We set them here via CMAKE_ARGS to make sure that the best
diff --git a/Mk/Uses/imake.mk b/Mk/Uses/imake.mk
index 85b43071555c..06981bc9f819 100644
--- a/Mk/Uses/imake.mk
+++ b/Mk/Uses/imake.mk
@@ -12,37 +12,37 @@
 .if !defined(_INCLUDE_USES_IMAKE_MK)
 _INCLUDE_USES_IMAKE_MK=	yes
 
-.if ${imake_ARGS:Nnotall:Nenv:Nnoman}
+.  if ${imake_ARGS:Nnotall:Nenv:Nnoman}
 IGNORE=		USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
-.endif
+.  endif
 
 BUILD_DEPENDS+=		imake:devel/imake
 
-.if defined(USE_GCC)
+.  if defined(USE_GCC)
 IMAKECPP=		${CPP}
 IMAKECPPFLAGS=		-DCppCmd=${CPP} -DCcCmd=${CC} -DCplusplusCmd=${CXX}
-.else
+.  else
 IMAKECPP=		tradcpp
 IMAKECPPFLAGS=		-DCppCmd=tradcpp -DCcCmd=${CC} -DCplusplusCmd=${CXX}
 BUILD_DEPENDS+=		tradcpp:devel/tradcpp
-.endif
+.  endif
 MAKE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 CONFIGURE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 
-.if ! ${imake_ARGS:Mnotall}
+.  if ! ${imake_ARGS:Mnotall}
 XMKMF_ARGS+=		-a
-.endif
+.  endif
 
-.if ! ${imake_ARGS:Menv}
-.if !target(do-configure)
+.  if ! ${imake_ARGS:Menv}
+.    if !target(do-configure)
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
-.endif
+.    endif
 
-.if ! ${imake_ARGS:Mnoman}
+.    if ! ${imake_ARGS:Mnoman}
 LATE_INSTALL_ARGS=	install.man
-.endif
+.    endif
 
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/jpeg.mk b/Mk/Uses/jpeg.mk
index 71b6b22b1e19..f4108fde2f73 100644
--- a/Mk/Uses/jpeg.mk
+++ b/Mk/Uses/jpeg.mk
@@ -16,21 +16,21 @@
 _INCLUDE_USES_JPEG_MK=	yes
 JPEG_PORT?=	graphics/jpeg-turbo
 
-.if empty(jpeg_ARGS)
+.  if empty(jpeg_ARGS)
 jpeg_ARGS=	lib
-.endif
+.  endif
 
-.if ${jpeg_ARGS} == lib
+.  if ${jpeg_ARGS} == lib
 LIB_DEPENDS+=	libjpeg.so:${JPEG_PORT}
-.elif ${jpeg_ARGS} == build
+.  elif ${jpeg_ARGS} == build
 BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
-.elif ${jpeg_ARGS} == run
+.  elif ${jpeg_ARGS} == run
 RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
-.elif ${jpeg_ARGS} == both
+.  elif ${jpeg_ARGS} == both
 BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
 RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
-.else
+.  else
 IGNORE=		USES=jpeg - invalid args: [${jpeg_ARGS}] specified
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 0c6bedceec96..7e7048481e8a 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -156,11 +156,11 @@ MASTER_SITES?=		KDE/${KDE_APPLICATIONS_BRANCH}/release-service/${KDE_APPLICATION
 # defines OPTION DOCS -- the _KDE_OPTIONS here is to
 # avoid make errors when there are no options defined at all.
 _KDE_OPTIONS=		bogus ${OPTIONS_DEFINE}
-.          if ${_KDE_OPTIONS:MDOCS}
+.        if ${_KDE_OPTIONS:MDOCS}
 DOCSDIR=		${PREFIX}/share/doc
 PORTDOCS?=		HTML/*
 USE_KDE+=		doctools_build
-.          endif
+.        endif
 # Further pass along a SHLIB_VER PLIST_SUB
 PLIST_SUB+=		KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \
 			KDE_APPLICATIONS_VERSION_SHORT="${KDE_APPLICATIONS_VERSION:R:R}"
diff --git a/Mk/Uses/kmod.mk b/Mk/Uses/kmod.mk
index 26400765b6b6..a40155f1863b 100644
--- a/Mk/Uses/kmod.mk
+++ b/Mk/Uses/kmod.mk
@@ -11,26 +11,26 @@ _INCLUDE_USES_KMOD_MK=	yes
 
 _USES_POST+=	kmod
 
-.if empty(kmod_ARGS)
+.  if empty(kmod_ARGS)
 _DEBUG_KMOD=
-.elif ${kmod_ARGS} == "debug"
+.  elif ${kmod_ARGS} == "debug"
 _DEBUG_KMOD=	yes
-.else
+.  else
 IGNORE=	USES=kmod takes either no arguments or 'debug'
-.endif
+.  endif
 
-.if !exists(${SRC_BASE}/sys/Makefile) && target(build)
+.  if !exists(${SRC_BASE}/sys/Makefile) && target(build)
 IGNORE=	requires kernel source files in SRC_BASE=${SRC_BASE}
-.endif
+.  endif
 
 CATEGORIES+=	kld
 
 SSP_UNSAFE=	kernel module supports SSP natively
 
 KMODDIR?=	/boot/modules
-.if ${KMODDIR} == /boot/kernel
+.  if ${KMODDIR} == /boot/kernel
 KMODDIR=	/boot/modules
-.endif
+.  endif
 
 _DEBUG_KMOD_SH= \
 ${ECHO_CMD} -n "\"@dir /%%KERN_DEBUGDIR%%/%%KMODDIR%%\"" ; \
@@ -55,13 +55,13 @@ MAKE_ENV+=	KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" NO_XREF=yes
 PLIST_FILES+=	"@kld ${KMODDIR}"
 
 STRIP_CMD+=	--strip-debug # do not strip kernel symbols
-.if !empty(_DEBUG_KMOD)
+.  if !empty(_DEBUG_KMOD)
 KERN_DEBUGDIR?=	${DEBUGDIR}
 PLIST_SUB+=	KERN_DEBUGDIR="${KERN_DEBUGDIR:C,^/,,}"
 MAKE_ENV+=	KERN_DEBUGDIR="${KERN_DEBUGDIR}"
 _KMOD_DIRS!=	${_DEBUG_KMOD_SH}
 PLIST_FILES+=	${_KMOD_DIRS}
-.endif
+.  endif
 
 .endif
 
@@ -72,10 +72,10 @@ _USES_install+=	290:${STAGEDIR}${KMODDIR}
 ${STAGEDIR}${KMODDIR}:
 	@${MKDIR} ${.TARGET}
 
-.if !empty(_DEBUG_KMOD)
+.  if !empty(_DEBUG_KMOD)
 _USES_install+=	291:${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}
 ${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}:
 	@${MKDIR} ${.TARGET}
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/kodi.mk b/Mk/Uses/kodi.mk
index 0ea01ab64792..135ec49d20f2 100644
--- a/Mk/Uses/kodi.mk
+++ b/Mk/Uses/kodi.mk
@@ -13,11 +13,11 @@ _INCLUDE_USES_KODI_MK=	yes
 _valid_ARGS=		noautoplist
 
 # Sanity check
-.for arg in ${kodi_ARGS}
+.  for arg in ${kodi_ARGS}
 .    if empty(_valid_ARGS:M${arg})
 IGNORE= Incorrect 'USES+= kodi:${kodi_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
-.endfor
+.  endfor
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/kodi/AddonBase.h:multimedia/kodi
 LIB_DEPENDS+=	libp8-platform.so:devel/p8-platform \
@@ -29,7 +29,7 @@ KODI_ADDON?=	${PORTNAME}
 
 PLIST_SUB+=	DISTVERSION="${DISTVERSION}"
 
-.if empty(kodi_ARGS:Mnoautoplist)
+.  if empty(kodi_ARGS:Mnoautoplist)
 _USES_install+=	820:kodi-autoplist
 kodi-autoplist:
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/lib/kodi/addons/${KODI_ADDON} \( -type f -or -type l \) -print | ${SED} -E -e \
@@ -39,6 +39,6 @@ kodi-autoplist:
 		${FIND} -ds ${STAGEDIR}${PREFIX}/share/kodi/addons/${KODI_ADDON} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
 	fi
-.endif
+.  endif
 
 .endif # !defined(_INCLUDE_USES_KODI_MK)
diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index a60b620f6a3e..8f703935ae93 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -42,19 +42,19 @@ LAZARUS_Include_MAINTAINER= acm@FreeBSD.org
 
 _INCLUDE_USES_LAZARUS_MK=   yes
 
-.if defined(DEFAULT_LAZARUS_VER)
+.  if defined(DEFAULT_LAZARUS_VER)
 WARNING+=	"DEFAULT_LAZARUS_VER is defined, consider using DEFAULT_VERSIONS=lazarus=${DEFAULT_LAZARUS_VER} instead"
-.endif
+.  endif
 
-.if ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors}
+.  if ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors}
 IGNORE=		Unknown argument for USES=lazarus: ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors}
-.endif
+.  endif
 
-.if !empty(LAZARUS_NO_FLAVORS)
-.if ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5}
+.  if !empty(LAZARUS_NO_FLAVORS)
+.    if ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5}
 IGNORE=         Unknown argument for LAZARUS_NO_FLAVORS: ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5}
-.endif
-.endif
+.    endif
+.  endif
 
 DEFAULT_LAZARUS_VER=	${LAZARUS_DEFAULT}
 DEFAULT_FPC_VER=	${FPC_DEFAULT}
@@ -78,29 +78,29 @@ MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
 LAZARUS_FLAVORS=	gtk2 qt5
 
-.if ${lazarus_ARGS:Mflavors}
-.	if defined(LAZARUS_NO_FLAVORS)
-.		for flavor in ${LAZARUS_NO_FLAVORS}
+.  if ${lazarus_ARGS:Mflavors}
+.    if defined(LAZARUS_NO_FLAVORS)
+.      for flavor in ${LAZARUS_NO_FLAVORS}
 FLAVORS:=	${LAZARUS_FLAVORS:N${flavor}}
-.		endfor
-.	else
+.      endfor
+.    else
 FLAVORS:=	${LAZARUS_FLAVORS}
-.	endif
+.    endif
 
-.	if empty(FLAVOR)
+.    if empty(FLAVOR)
 FLAVOR=		${FLAVORS:[1]}
-.	endif
-.endif
+.    endif
+.  endif
 
 LAZARUS_PKGNAMESUFFIX=	-${FLAVOR}
 
-.if !defined(WANT_LAZARUS_DEVEL)
+.  if !defined(WANT_LAZARUS_DEVEL)
 LAZARUS_DEVELSUFFIX=	#
-.else
+.  else
 LAZARUS_DEVELSUFFIX=	-devel
-.endif
+.  endif
 
-.if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
+.  if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
 BUILD_DEPENDS+=	${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
 LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
@@ -109,13 +109,13 @@ LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
 LCL_PLATFORM=	gtk2
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus${LAZARUS_DEVELSUFFIX}
-.endif
+.  endif
 
-.if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
+.  if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
 LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
 LCL_PLATFORM=	qt5
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5${LAZARUS_DEVELSUFFIX}
-.endif
+.  endif
 
 LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
 LAZBUILD_ARGS?=	# empty
@@ -127,15 +127,15 @@ _USES_POST+=	lazarus
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LAZARUS_POST_MK)
 _INCLUDE_USES_LAZARUS_POST_MK=	yes
 
-.if !defined(NO_LAZBUILD)
-.if !target(do-build)
+.  if !defined(NO_LAZBUILD)
+.    if !target(do-build)
 do-build:
-.	for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
+.      for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
 		@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
 			${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE})
-.	endfor
-.endif # !target(do-build)
-.endif
+.      endfor
+.    endif # !target(do-build)
+.  endif
 
 .endif
 # End of _INCLUDE_USES_LAZARUS_POST_MK
diff --git a/Mk/Uses/lha.mk b/Mk/Uses/lha.mk
index fa7675e9cc04..04dcf8d474c2 100644
--- a/Mk/Uses/lha.mk
+++ b/Mk/Uses/lha.mk
@@ -8,9 +8,9 @@ _INCLUDE_USES_LHA_MK=	yes
 
 EXTRACT_SUFX?=	.lzh
 
-.if !empty(lha_ARGS)
+.  if !empty(lha_ARGS)
 IGNORE=	Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha'
-.endif
+.  endif
 
 EXTRACT_DEPENDS+=	lha:archivers/lha
 EXTRACT_CMD?=		${LHA_CMD}
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk
index 29bc15fa1501..6c6074be8fb8 100644
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@@ -15,9 +15,9 @@
 _INCLUDE_USES_LIBTOOL_MK=	yes
 _USES_POST+=	libtool
 
-.if ${libtool_ARGS:Mbuild}
+.  if ${libtool_ARGS:Mbuild}
 BUILD_DEPENDS+=	libtool:devel/libtool
-.endif
+.  endif
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LIBTOOL_POST_MK)
@@ -67,16 +67,16 @@ patch-libtool:
 
 _USES_stage+=	790:patch-lafiles
 patch-lafiles:
-.if ${libtool_ARGS:Mkeepla}
+.  if ${libtool_ARGS:Mkeepla}
 	@${FIND} ${STAGEDIR} -type f -name '*.la' |			\
 		${XARGS} ${SED} -i '' -e "/dependency_libs=/s/=.*/=''/"
-.else
+.  else
 	@${FIND} ${STAGEDIR} -type l -exec ${SH} -c			\
 		'case `${REALPATH} -q "{}"` in				\
 			*.la) ${ECHO_CMD} "{}" ;; esac' \; |		\
 		${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
 	@${FIND} ${STAGEDIR} -type f -name '*.la' |			\
 		${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 28ce77dc89b1..1a8a28f5008f 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -23,24 +23,24 @@
 _INCLUDE_USES_LINUX_MK=	yes
 _USES_POST+=		linux
 
-.if empty(linux_ARGS)
-.if exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7)
+.  if empty(linux_ARGS)
+.    if exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7)
 linux_ARGS=		c7
-.else
+.    else
 linux_ARGS=		${LINUX_DEFAULT}
-.endif
-.endif
+.    endif
+.  endif
 
-.if ${linux_ARGS} == c7
+.  if ${linux_ARGS} == c7
 LINUX_DIST_VER?=	7.9.2009
-.else
+.  else
 IGNORE=			Invalid Linux distribution: ${linux_ARGS}
-.endif
+.  endif
 
-.ifndef ONLY_FOR_ARCHS
+.  ifndef ONLY_FOR_ARCHS
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	Linux compatibility is only available on aarch64, amd64 and i386
-.endif
+.  endif
 
 _linux_c7_alsa-lib-devel=		linux-c7-alsa-lib-devel>0:audio/linux-c7-alsa-lib-devel
 _linux_${linux_ARGS}_alsa-plugins-oss=	linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss
@@ -138,26 +138,26 @@ _linux_c7_xcb-util=			linux-c7-xcb-util>0:x11/linux-c7-xcb-util
 _linux_c7_xorglibs=			linux-c7-xorg-libs>=7.7_7:x11/linux-c7-xorg-libs
 
 USE_LINUX?=		base
-.for i in ${USE_LINUX}
+.  for i in ${USE_LINUX}
 _i_args:=		${i:C/^[^:]*:?//:S/,/ /g}
-.if ${_i_args:Mpatch}
+.    if ${_i_args:Mpatch}
 PATCH_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
-.endif
-.if ${_i_args:Mbuild}
+.    endif
+.    if ${_i_args:Mbuild}
 BUILD_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
-.endif
-.if ${_i_args:Mrun} || empty(_i_args)
+.    endif
+.    if ${_i_args:Mrun} || empty(_i_args)
 RUN_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
-.endif
-.if !defined(_linux_${linux_ARGS}_${i:C/:.*//})
+.    endif
+.    if !defined(_linux_${linux_ARGS}_${i:C/:.*//})
 DEV_ERROR+=		"USE_LINUX=${i}: package does not exist"
-.endif
-.endfor
+.    endif
+.  endfor
 
-.ifdef USE_LINUX_RPM
+.  ifdef USE_LINUX_RPM
 
-.if ${linux_ARGS} == c7
-.ifndef MASTER_SITES
+.    if ${linux_ARGS} == c7
+.      ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
 MASTER_SITE_SUBDIR=	altarch/${LINUX_DIST_VER}/os/aarch64/Packages/:DEFAULT,aarch64 \
 			altarch/${LINUX_DIST_VER}/updates/aarch64/Packages/:DEFAULT,aarch64 \
@@ -167,9 +167,9 @@ MASTER_SITE_SUBDIR=	altarch/${LINUX_DIST_VER}/os/aarch64/Packages/:DEFAULT,aarch
 			altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
 			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
-.endif
+.      endif
 DIST_SUBDIR?=		centos
-.endif # ${linux_ARGS} == *
+.    endif # ${linux_ARGS} == *
 
 PKGNAMEPREFIX?=		linux-${linux_ARGS}-
 EXTRACT_SUFX?=		.rpm
@@ -183,33 +183,33 @@ NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
 USE_LINUX_PREFIX=	yes
 
-.endif # USE_LINUX_RPM
+.  endif # USE_LINUX_RPM
 
 .endif # ! _INCLUDE_USES_LINUX_MK
 
 .ifdef _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
 _INCLUDE_USES_LINUX_POST_MK=	yes
 
-.ifdef USE_LINUX_RPM
+.  ifdef USE_LINUX_RPM
 
-.if ${USE_LINUX_RPM} == noarch
+.    if ${USE_LINUX_RPM} == noarch
 NO_ARCH=		yes
 SHARE_DISTNAMES?=	${DISTNAME}
-.elif ${USE_LINUX_RPM} == nolib
+.    elif ${USE_LINUX_RPM} == nolib
 BIN_DISTNAMES?=		${DISTNAME}
-.else
+.    else
 LIB_DISTNAMES?=		${DISTNAME}
-.endif
-.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Maarch64)) \
+.    endif
+.    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Maarch64)) \
  && empty(NOT_FOR_ARCHS:Maarch64)
 DISTFILES_aarch64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/} \
 			${LIB_DISTNAMES_aarch64:S/$/${EXTRACT_SUFX_aarch64}:aarch64/}
-.endif
-.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
+.    endif
+.    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
  && empty(NOT_FOR_ARCHS:Mamd64)
-.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
+.      if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
  && empty(NOT_FOR_ARCHS:Mi386)
 DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
@@ -217,74 +217,74 @@ DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
-.else
+.      else
 DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \
 			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
-.endif
-.endif
-.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
+.      endif
+.    endif
+.    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
  && empty(NOT_FOR_ARCHS:Mi386)
 DISTFILES_i386?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:i386/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
-.endif
+.    endif
 SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}:SOURCE
 
-.ifdef USE_LINUX_RPM_BAD_PERMS
+.    ifdef USE_LINUX_RPM_BAD_PERMS
 EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
 EXTRACT_CMD=		rpm2archive
 EXTRACT_BEFORE_ARGS=	- <
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
-.endif
+.    endif
 
-.if ${USE_LINUX_RPM} != noarch
+.    if ${USE_LINUX_RPM} != noarch
 PLIST?=			${PKGDIR}/pkg-plist.${ARCH}
-.endif
+.    endif
 
-.if !target(do-install)
+.    if !target(do-install)
 do-install:
 	(cd ${WRKSRC} && \
 		${FIND} * | ${CPIO} -dumpl --quiet ${STAGEDIR}${PREFIX})
-.for d in bin lib lib64 sbin
+.      for d in bin lib lib64 sbin
 	[ ! -e ${STAGEDIR}${PREFIX}/${d} -o -L ${STAGEDIR}${PREFIX}/${d} ] || \
 		(cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${d} | ${CPIO} -dumpl --quiet usr && ${RM} -r ${d})
-.endfor
+.      endfor
 	[ ! -e ${STAGEDIR}${PREFIX}/usr/share/icons -o \
 		-L ${STAGEDIR}${PREFIX}/usr/share/icons ] || \
 		(cd ${STAGEDIR}${PREFIX}/usr/share && ${FIND} icons | \
 		${CPIO} -dumpl --quiet ${STAGEDIR}${LOCALBASE}/share && \
 		${RM} -r icons)
-.endif
+.    endif
 
-.endif # USE_LINUX_RPM
+.  endif # USE_LINUX_RPM
 
-.ifdef DISTNAME_aarch64
+.  ifdef DISTNAME_aarch64
 DISTFILES_aarch64?=	${DISTNAME_aarch64}${EXTRACT_SUFX}
-.endif
-.ifdef DISTNAME_amd64
+.  endif
+.  ifdef DISTNAME_amd64
 DISTFILES_amd64?=	${DISTNAME_amd64}${EXTRACT_SUFX}
-.endif
-.ifdef DISTNAME_i386
+.  endif
+.  ifdef DISTNAME_i386
 DISTFILES_i386?=	${DISTNAME_i386}${EXTRACT_SUFX}
-.endif
+.  endif
 
-.ifndef DISTFILES
-.ifdef DISTFILES_aarch64 || DISTFILES_amd64 || DISTFILES_i386
-.if make(makesum)
+.  ifndef DISTFILES
+.    ifdef DISTFILES_aarch64 || DISTFILES_amd64 || DISTFILES_i386
+.      if make(makesum)
 _ALL_DISTFILES=		${DISTFILES_aarch64} ${DISTFILES_amd64} ${DISTFILES_i386}
 DISTFILES=		${_ALL_DISTFILES:O:u}
-.else
+.      else
 DISTFILES=		${DISTFILES_${ARCH}}
-.endif
+.      endif
 EXTRACT_ONLY?=		${DISTFILES_${ARCH}:C/:[^:]+$//}
-.endif
-.endif
-.if !empty(SRC_DISTFILES) && (make(makesum) || defined(PACKAGE_BUILDING))
+.    endif
+.  endif
+.  if !empty(SRC_DISTFILES) && (make(makesum) || defined(PACKAGE_BUILDING))
 DISTFILES+=		${SRC_DISTFILES}
-.endif
+.  endif
 
 .endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
diff --git a/Mk/Uses/localbase.mk b/Mk/Uses/localbase.mk
index 32ffa6de5231..58103a6b85ce 100644
--- a/Mk/Uses/localbase.mk
+++ b/Mk/Uses/localbase.mk
@@ -17,11 +17,11 @@ _INCLUDE_USES_LOCALBASE_POST_MK=yes
 CPPFLAGS+=	-isystem ${LOCALBASE}/include
 CFLAGS+=	-isystem ${LOCALBASE}/include
 CXXFLAGS+=	-isystem ${LOCALBASE}/include
-.if ${localbase_ARGS:Mldflags}
+.  if ${localbase_ARGS:Mldflags}
 LDFLAGS+=	-L${LOCALBASE}/lib
-.else
+.  else
 LIBS+=		-L${LOCALBASE}/lib
-.endif
+.  endif
 
 # Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs
 # this, and CMAKE_ARGS is not used when bootstrapping CMake.
diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk
index 26b1b5d72dd7..7088d5e29720 100644
--- a/Mk/Uses/lua.mk
+++ b/Mk/Uses/lua.mk
@@ -56,9 +56,9 @@ _INCLUDE_USES_LUA_MK=	yes
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
 _LUA_VALID_VERSIONS:=	54 53 52 51
-.if defined(_LUA_EXTRA_VER)
+.  if defined(_LUA_EXTRA_VER)
 _LUA_VALID_VERSIONS+= ${_LUA_EXTRA_VER}
-.endif
+.  endif
 
 _LUA_DEFAULT_VERSION:=	${LUA_DEFAULT:S/.//}
 
@@ -67,107 +67,107 @@ _LUA_ARG_FLAVORS:=
 _LUA_ARG_MODULE:=
 _LUA_ARG_ENV:=
 _LUA_ARG_CORE:=
-.if ${lua_ARGS:Mmodule}
+.  if ${lua_ARGS:Mmodule}
 _LUA_ARG_FLAVORS:=yes
 _LUA_ARG_MODULE:=yes
-.endif
-.if ${lua_ARGS:Mflavors}
+.  endif
+.  if ${lua_ARGS:Mflavors}
 _LUA_ARG_FLAVORS:=yes
-.endif
-.if ${lua_ARGS:Mnoflavors}
+.  endif
+.  if ${lua_ARGS:Mnoflavors}
 _LUA_ARG_FLAVORS:=
-.endif
-.if ${lua_ARGS:Menv}
+.  endif
+.  if ${lua_ARGS:Menv}
 _LUA_ARG_ENV:=yes
-.endif
-.if ${lua_ARGS:Mcore}
+.  endif
+.  if ${lua_ARGS:Mcore}
 _LUA_ARG_CORE:=yes
 _LUA_ARG_ENV:=yes
 _LUA_ARG_FLAVORS:=
 _LUA_ARG_MODULE:=
-.endif
+.  endif
 
 # core is for building Lua itself, so it overrides all version checks
-.if ${_LUA_ARG_CORE}
+.  if ${_LUA_ARG_CORE}
 
 _LUA_WANTED_VERSION:=${lua_ARGS:M[1-9][0-9]:[1]}
 
-.  if ${lua_ARGS:M[1-9][0-9]:[#]} != 1
+.    if ${lua_ARGS:M[1-9][0-9]:[#]} != 1
 IGNORE= USES=lua:core must also specify exactly one version number
 # set to avoid spurious errors below
 _LUA_WANTED_VERSION:=${_LUA_DEFAULT_VERSION}
-.  endif
+.    endif
 
 _LUA_VALID_VERSIONS:=${_LUA_WANTED_VERSION}
 _LUA_WANTED_VERSIONS:=${_LUA_WANTED_VERSION}
 _LUA_DEFAULT_VERSION:=${_LUA_WANTED_VERSION}
 
-.endif # _LUA_ARG_CORE
+.  endif # _LUA_ARG_CORE
 
-.if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
+.  if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
 IGNORE=	Invalid lua version ${LUA_DEFAULT}
-.endif
+.  endif
 
 #
 # Parse a ver+ argument
 #
-.if ${lua_ARGS:M??+}
+.  if ${lua_ARGS:M??+}
 _LUA_MIN_VERSION:=	${lua_ARGS:M??+:S/+//}
 _LUA_MAX_VERSION:=	99
-.endif
+.  endif
 
 #
 # Parse a -ver argument
 #
-.if ${lua_ARGS:M-??}
+.  if ${lua_ARGS:M-??}
 _LUA_MAX_VERSION:=	${lua_ARGS:M-??:S/-//}
 _LUA_MIN_VERSION:=	0
-.endif
+.  endif
 
 #
 # Parse a ver-ver argument
 #
-.if ${lua_ARGS:M??-??}
+.  if ${lua_ARGS:M??-??}
 _LUA_MIN_VERSION:=	${lua_ARGS:M??-??:C/-.*//}
 _LUA_MAX_VERSION:=	${lua_ARGS:M??-??:C/.*-//}
-.endif
+.  endif
 
 #
 # Parse one or more ver arguments
 #
-.if ${lua_ARGS:M[1-9][0-9]}
-.  for _v in ${lua_ARGS:M[1-9][0-9]}
-.    if ${_LUA_VALID_VERSIONS:M${_v}}
+.  if ${lua_ARGS:M[1-9][0-9]}
+.    for _v in ${lua_ARGS:M[1-9][0-9]}
+.      if ${_LUA_VALID_VERSIONS:M${_v}}
 _LUA_WANTED_VERSIONS+=${_v}
-.    endif
-.  endfor
-.  if empty(_LUA_WANTED_VERSIONS)
+.      endif
+.    endfor
+.    if empty(_LUA_WANTED_VERSIONS)
 IGNORE= USES=lua:nn did not find any valid version number
+.    endif
 .  endif
-.endif
 
 #
 # Resolve version ranges. Append anything within the range to the list of
 # wanted versions.
 #
-.if defined(_LUA_MIN_VERSION) && defined(_LUA_MAX_VERSION)
-.  for _v in ${_LUA_VALID_VERSIONS}
-.    if ${_LUA_MIN_VERSION} <= ${_v} && ${_LUA_MAX_VERSION} >= ${_v}
+.  if defined(_LUA_MIN_VERSION) && defined(_LUA_MAX_VERSION)
+.    for _v in ${_LUA_VALID_VERSIONS}
+.      if ${_LUA_MIN_VERSION} <= ${_v} && ${_LUA_MAX_VERSION} >= ${_v}
 _LUA_WANTED_VERSIONS+=${_v}
-.    endif
-.  endfor
-.  if empty(_LUA_WANTED_VERSIONS)
+.      endif
+.    endfor
+.    if empty(_LUA_WANTED_VERSIONS)
 IGNORE= USES=lua:xx-yy did not find any valid version
+.    endif
 .  endif
-.endif
 
 #
 # If no version was specified with any of the ver or ver+ arguments, allow
 # all versions.
 #
-.if empty(_LUA_WANTED_VERSIONS)
+.  if empty(_LUA_WANTED_VERSIONS)
 _LUA_WANTED_VERSIONS:=	${_LUA_VALID_VERSIONS}
-.endif
+.  endif
 
 # The "preferred" version, which must always exist, is defined as the
 # closest value to the default version, preferring higher versions in
@@ -186,17 +186,17 @@ _LUA_NUM_ALL:=	\
 _LUA_WANTED_VERSIONS:= \
 	${_LUA_NUM_ALL:@_v@${_LUA_WANTED_VERSIONS:M${_v}}@}
 
-.if ${_LUA_ARG_FLAVORS}
-.  if empty(FLAVORS)
+.  if ${_LUA_ARG_FLAVORS}
+.    if empty(FLAVORS)
 FLAVORS= ${_LUA_WANTED_VERSIONS:S/^/lua/}
-.  endif
-.  if empty(FLAVOR)
+.    endif
+.    if empty(FLAVOR)
 FLAVOR= ${FLAVORS:[1]}
-.  endif
+.    endif
 _LUA_WANTED_VERSION:= ${FLAVOR:S/^lua//}
-.else
+.  else
 _LUA_WANTED_VERSION:= ${_LUA_WANTED_VERSIONS:[1]}
-.endif
+.  endif
 
 # If we're building Lua itself, everything should be in $PREFIX. If
 # we're building a module or app, then the stuff we're installing goes
@@ -207,11 +207,11 @@ _LUA_WANTED_VERSION:= ${_LUA_WANTED_VERSIONS:[1]}
 # define LUA_REFMOD* relative to LOCALBASE for use when specifying
 # dependencies and so on.
 
-.if ${_LUA_ARG_CORE}
+.  if ${_LUA_ARG_CORE}
 LUA_BASE=${PREFIX}
-.else
+.  else
 LUA_BASE=${LOCALBASE}
-.endif
+.  endif
 
 LUA_PREFIX=${PREFIX}
 
@@ -253,28 +253,28 @@ MAKE_ENV+=	LUA_MODLIBDIR=${LUA_MODLIBDIR} \
 
 # if building a module or Lua itself, or if the port defined LUA_DOCSUBDIR,
 # then define LUA_DOCSDIR and LUA_EXAMPLESDIR too
-.if ${_LUA_ARG_CORE} || ${_LUA_ARG_MODULE}
+.  if ${_LUA_ARG_CORE} || ${_LUA_ARG_MODULE}
 LUA_DOCSUBDIR?=${PORTNAME}
-.endif
-.if !empty(LUA_DOCSUBDIR)
+.  endif
+.  if !empty(LUA_DOCSUBDIR)
 LUA_DOCSDIR=	${LUA_MODDOCSDIR}/${LUA_DOCSUBDIR}
 LUA_EXAMPLESDIR=${LUA_MODEXAMPLESDIR}/${LUA_DOCSUBDIR}
 PLIST_SUB+=	LUA_DOCSDIR=${LUA_DOCSDIR:S,^${LUA_PREFIX}/,,}
 PLIST_SUB+=	LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR:S,^${LUA_PREFIX}/,,}
 MAKE_ENV+=	LUA_DOCSDIR=${LUA_DOCSDIR}
 MAKE_ENV+=	LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR}
-.endif
+.  endif
 
-.if empty(_LUA_ARG_ENV)
-.  if ${lua_ARGS:Mbuild}
+.  if empty(_LUA_ARG_ENV)
+.    if ${lua_ARGS:Mbuild}
 BUILD_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
-.  endif
-.  if ${lua_ARGS:Mrun}
+.    endif
+.    if ${lua_ARGS:Mrun}
 RUN_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
-.  endif
-.  if !${lua_ARGS:Mbuild} && !${lua_ARGS:Mrun}
+.    endif
+.    if !${lua_ARGS:Mbuild} && !${lua_ARGS:Mrun}
 LIB_DEPENDS+=	liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
+.    endif
 .  endif
-.endif
 
 .endif
diff --git a/Mk/Uses/lxqt.mk b/Mk/Uses/lxqt.mk
index ca6487bb3dce..035c2d5e0174 100644
--- a/Mk/Uses/lxqt.mk
+++ b/Mk/Uses/lxqt.mk
@@ -18,9 +18,9 @@
 .if !defined(_INCLUDE_USES_LXQT_MK)
 _INCLUDE_USES_LXQT_MK=	yes
 
-.if !empty(lxqt_ARGS)
+.  if !empty(lxqt_ARGS)
 IGNORE=	Incorrect 'USES+=lxqt:${lxqt_ARGS} takes no arguments
-.endif
+.  endif
 
 _LXQT_PROJECT=	${DISTNAME:S/-${DISTVERSION}//:tl}
 
@@ -59,42 +59,42 @@ lxqt_USE_LXQT_REQ=	qtxdg
 
 qtxdg_LIB_DEPENDS=	libQt5Xdg.so:devel/libqtxdg
 
-.if defined(USE_LXQT)
+.  if defined(USE_LXQT)
 
 # First, expand all USE_LXQT_REQ recursively.
-.for comp in ${_USE_LXQT_ALL}
-. for subcomp in ${${comp}_USE_LXQT_REQ}
+.    for comp in ${_USE_LXQT_ALL}
+.      for subcomp in ${${comp}_USE_LXQT_REQ}
 ${comp}_USE_LXQT_REQ+=	${${subcomp}_USE_LXQT_REQ}
-. endfor
-.endfor
+.      endfor
+.    endfor
 
 # Then, use already expanded USE_LXQT_REQ to expand USE_LXQT.
-.for comp in ${USE_LXQT}
-. if empty(_USE_LXQT_ALL:M${comp})
+.    for comp in ${USE_LXQT}
+.      if empty(_USE_LXQT_ALL:M${comp})
 IGNORE=	cannot install: Unknown component ${comp}
-. else
+.      else
 _USE_LXQT+=	${${comp}_USE_LXQT_REQ} ${comp}
-. endif
-.endfor
+.      endif
+.    endfor
 
 # Remove duplicate components
 USE_LXQT=	${_USE_LXQT:O:u}
 
-.for comp in ${USE_LXQT}
-. if defined(${comp}_BUILD_DEPENDS)
+.    for comp in ${USE_LXQT}
+.      if defined(${comp}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
-. endif
+.      endif
 
-. if defined(${comp}_LIB_DEPENDS)
+.      if defined(${comp}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
-. endif
+.      endif
 
-. if defined(${comp}_RUN_DEPENDS)
+.      if defined(${comp}_RUN_DEPENDS)
 RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
-. endif
-.endfor
+.      endif
+.    endfor
 
-.endif # end of defined(USE_LXQT)
+.  endif # end of defined(USE_LXQT)
 
 .endif # end of !defined(_INCLUDE_USES_LXQT_MK)
 
diff --git a/Mk/Uses/magick.mk b/Mk/Uses/magick.mk
index 1d44270031ab..2299ad60fe93 100644
--- a/Mk/Uses/magick.mk
+++ b/Mk/Uses/magick.mk
@@ -46,9 +46,9 @@ IGNORE=		Incorrect USES=magick:${magick_ARGS} - multiple versions defined
 .    endif
 .  endfor
 # Fallback to the default version
-.if empty(_magick_version)
+.  if empty(_magick_version)
 _magick_version=	${IMAGEMAGICK_DEFAULT}
-.endif
+.  endif
 
 #=== Flavor selection ===
 _magick_flavors=	nox11
@@ -71,9 +71,9 @@ _magick_depend=		#
 _magick_depend+=	${_depend}
 .    endif
 .  endfor
-.if empty(_magick_depend)
+.  if empty(_magick_depend)
 _magick_depend=		lib
-.endif
+.  endif
 
 #=== Dependency setup ===
 _MAGICK_PORT=	graphics/ImageMagick${_magick_version}${_magick_flavor}
diff --git a/Mk/Uses/makeinfo.mk b/Mk/Uses/makeinfo.mk
index 07a1764b8057..ea7351f826e2 100644
--- a/Mk/Uses/makeinfo.mk
+++ b/Mk/Uses/makeinfo.mk
@@ -9,9 +9,9 @@
 .if !defined(_INCLUDE_USES_MAKEINFO_MK)
 _INCLUDE_USES_MAKEINFO_MK=	yes
 
-.if !empty(makeinfo_ARGS)
+.  if !empty(makeinfo_ARGS)
 IGNORE=	USES=makeinfo - expects no arguments
-.endif
+.  endif
 
 # Depend specifically on makeinfo from ports
 BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:print/texinfo
diff --git a/Mk/Uses/makeself.mk b/Mk/Uses/makeself.mk
index 6bab118411c0..6198672a982c 100644
--- a/Mk/Uses/makeself.mk
+++ b/Mk/Uses/makeself.mk
@@ -8,9 +8,9 @@
 .if !defined(_INCLUDE_USES_MAKESELF_Mk)
 _INCLUDE_USES_MAKESELF_MK=	yes
 
-.if !empty(makeself_ARGS)
+.  if !empty(makeself_ARGS)
 IGNORE=	Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments
-.endif
+.  endif
 
 EXTRACT_DEPENDS+=	${UNMAKESELF_CMD}:archivers/unmakeself
 
diff --git a/Mk/Uses/mate.mk b/Mk/Uses/mate.mk
index a94ed49112b9..34ccb7d831c3 100644
--- a/Mk/Uses/mate.mk
+++ b/Mk/Uses/mate.mk
@@ -20,9 +20,9 @@ _INCLUDE_USES_MATE_MK= yes
 
 _USES_POST+=	mate
 
-.if !empty(mate_ARGS)
+.  if !empty(mate_ARGS)
 IGNORE=	USES=mate takes no arguments
-.endif
+.  endif
 
 # This section defines possible names of MATE components and all information
 # necessary for ports to use those components.
@@ -88,9 +88,9 @@ intlhack_PRE_PATCH=		${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${RE
 				 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
 				 s|/usr/bin/iconv|${LOCALBASE}/bin/iconv|g ; \
 				 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|'
-.if ${USE_MATE:Mintlhack}!=""
+.  if ${USE_MATE:Mintlhack}!=""
 USE_MATE+=				intltool
-.endif
+.  endif
 
 libmatekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmatekbd.pc
 libmatekbd_BUILD_DEPENDS=	${libmatekbd_DETECT}:x11/libmatekbd
@@ -144,58 +144,58 @@ settingsdaemon_RUN_DEPENDS=	${settingsdaemon_DETECT}:sysutils/mate-settings-daem
 
 # End component definition section
 
-.if defined(USE_MATE)
+.  if defined(USE_MATE)
 # Comparing between USE_MATE and _USE_MATE_ALL to make sure the component
 # exists in _USE_MATE_ALL. If it does not exist then give an error about it.
 #. for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
-. for component in ${USE_MATE:C/^([^:]+).*/\1/}
+.    for component in ${USE_MATE:C/^([^:]+).*/\1/}
 #. for component in ${USE_GNOME:C/^([^:]+).*/\1/}
-.  if ${_USE_MATE_ALL:M${component}}==""
+.      if ${_USE_MATE_ALL:M${component}}==""
 .error cannot install: Unknown component USE_MATE=${component}
-.  endif
-. endfor
+.      endif
+.    endfor
 
-. for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
-.  if defined(${component}_PATCH_DEPENDS)
+.    for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
+.      if defined(${component}_PATCH_DEPENDS)
 PATCH_DEPENDS+=	${${component}_PATCH_DEPENDS}
-.  endif
+.      endif
 
-.  if defined(${component}_DETECT)
-.   if ${USE_MATE:M${component}\:build}!=""
+.      if defined(${component}_DETECT)
+.        if ${USE_MATE:M${component}\:build}!=""
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-.   elif ${USE_MATE:M${component}\:run}!=""
+.        elif ${USE_MATE:M${component}\:run}!=""
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.   else
-.    if defined(${component}_LIB_DEPENDS)
+.        else
+.          if defined(${component}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
-.    else
+.          else
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.    endif
-.   endif
-.  endif
+.          endif
+.        endif
+.      endif
 
-.  if defined(${component}_CONFIGURE_TARGET)
+.      if defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
-.  endif
+.      endif
 
-.  if defined(${component}_CONFIGURE_ENV)
+.      if defined(${component}_CONFIGURE_ENV)
 CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV}
-.  endif
+.      endif
 
-.  if defined(${component}_MAKE_ENV)
+.      if defined(${component}_MAKE_ENV)
 MAKE_ENV+=	${${component}_MAKE_ENV}
-.  endif
+.      endif
 
-.  if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
+.      if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_TARGET=	${${component}_CONFIGURE_TARGET}
-.  endif
+.      endif
 
-.  if defined(${component}_PRE_PATCH)
+.      if defined(${component}_PRE_PATCH)
 MATE_PRE_PATCH+=	; ${${component}_PRE_PATCH}
-.  endif
-. endfor
-.endif # USE_MATE check
+.      endif
+.    endfor
+.  endif # USE_MATE check
 
 .endif
 # End of optional part.
@@ -203,7 +203,7 @@ MATE_PRE_PATCH+=	; ${${component}_PRE_PATCH}
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_MATE_POST_MK)
 _INCLUDE_USES_MATE_POST_MK=     yes
 
-.if ${USE_MATE:Mautogen}!=""
+.  if ${USE_MATE:Mautogen}!=""
 
 CONFIGURE_ENV+=	NOCONFIGURE=yes
 
@@ -211,15 +211,15 @@ _USES_configure+=	295:mate-pre-configure
 
 mate-pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
-.endif
+.  endif
 
-.if defined(MATE_PRE_PATCH)
+.  if defined(MATE_PRE_PATCH)
 
 _USES_configure+=	445:mate-pre-configure-script
 
 mate-pre-configure-script:
 	@${MATE_PRE_PATCH:C/^;//1}
-.endif
+.  endif
 
 .endif
 # End of use part.
diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk
index c87ccdeafa4d..4411bb5b9f7b 100644
--- a/Mk/Uses/meson.mk
+++ b/Mk/Uses/meson.mk
@@ -20,9 +20,9 @@
 _INCLUDE_USES_MESON_MK=	yes
 
 # Sanity check
-.if !empty(meson_ARGS)
+.  if !empty(meson_ARGS)
 IGNORE=	Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments
-.endif
+.  endif
 
 BUILD_DEPENDS+=		meson>=0.57.1_1:devel/meson
 
@@ -45,12 +45,12 @@ CONFIGURE_ARGS+=	-Db_colorout=never
 INSTALL_TARGET=		install
 
 # should we have strip separate from WITH_DEBUG?
-.if defined(WITH_DEBUG)
+.  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--buildtype debug
-.else
+.  else
 CONFIGURE_ARGS+=	--buildtype release \
 			--strip
-.endif
+.  endif
 
 HAS_CONFIGURE=		yes
 CONFIGURE_CMD=		meson
diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
index 923adc517c30..e2c659b01345 100644
--- a/Mk/Uses/mono.mk
+++ b/Mk/Uses/mono.mk
@@ -71,9 +71,9 @@
 .if !defined(_INCLUDE_USES_MONO_MK)
 _INCLUDE_USES_MONO_MK=	yes
 
-.if !empty(mono_ARGS:Nnuget:Nbuild)
+.  if !empty(mono_ARGS:Nnuget:Nbuild)
 IGNORE=	USES=mono only supports optional arguments nuget and build
-.endif
+.  endif
 
 # Set the location of the .wapi directory so we write to a location we
 # can always assume to be writable.
@@ -81,9 +81,9 @@ MONO_SHARED_DIR=	${WRKDIR}
 CONFIGURE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}"
 MAKE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC
 BUILD_DEPENDS+=		mono:lang/mono
-.if empty(mono_ARGS:Mbuild)
+.  if empty(mono_ARGS:Mbuild)
 RUN_DEPENDS+=		mono:lang/mono
-.endif
+.  endif
 
 # Set the location that webaps served by XSP should use.
 XSP_DOCROOT=		${PREFIX}/www/xsp
@@ -93,7 +93,7 @@ GACUTIL=${LOCALBASE}/bin/gacutil /root ${PREFIX}/lib/ /gacdir ${PREFIX}/lib
 GACUTIL_INSTALL=${GACUTIL} /i
 GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0
 
-.if ${mono_ARGS:Mnuget}
+.  if ${mono_ARGS:Mnuget}
 MAKE_ENV+=	NUGET_PACKAGES=${NUGET_PACKAGEDIR}
 
 # TODO: add nuget as a Port, use it for makenupkg
@@ -111,29 +111,29 @@ PAKET_PACKAGEDIR?=
 PAKET_DEPENDS?=
 NUGET_DEPENDS?=		${PAKET_DEPENDS}
 
-. for feed in ${NUGET_FEEDS}
+.    for feed in ${NUGET_FEEDS}
 ${feed}_DEPENDS?=
 ${feed}_FILE?=		${PKGDIR}/nupkg-${feed:tl}
 ${feed}_URL?=		https://dotnet.myget.org/F/${feed:tl:S/_/-/g}/api/v2/
 ${feed}_VERSION?=	v2
-.  if exists(${${feed}_FILE})
+.      if exists(${${feed}_FILE})
 ${feed}_EXTRA!=		${CAT} ${${feed}_FILE}
-.  else
+.      else
 ${feed}_EXTRA=
-.  endif
+.      endif
 MAKENUPKG_ENV+=		${feed:tl}_URL="${${feed}_URL}" ${feed:tl}_VERSION="${${feed}_VERSION}"
-.  for depend in ${${feed}_DEPENDS} ${${feed}_EXTRA}
-.   if empty(_NUGET_DEPENDS:M${depend})
+.      for depend in ${${feed}_DEPENDS} ${${feed}_EXTRA}
+.        if empty(_NUGET_DEPENDS:M${depend})
 id=		${depend:C/=.*$//}
 version=	${depend:C/^.*=//}
 group=		nuget_${depend:C/[.+=-]//g}
 nupkg=		${id:tl}.${version}.nupkg
 DISTFILES_${group}:=	${nupkg}:${group}
-.    if ${${feed}_VERSION} == v2
+.          if ${${feed}_VERSION} == v2
 MASTER_SITES_${group}:=	${${feed}_URL}package/${id}/${version}?dummy=/:${group}
-.    else
+.          else
 MASTER_SITES_${group}:=	${${feed}_URL}${id:tl}/${version}/:${group}
-.    endif
+.          endif
 NUGET_NUPKGS_${group}:=	${nupkg}:${depend}
 NUPKGS_${id}:=	${NUPKGS_${id}} ${version}
 
@@ -141,16 +141,16 @@ DISTFILES+=	${DISTFILES_nuget_${depend:S/.//g:S/-//g:S/=//g}}
 MASTER_SITES+=	${MASTER_SITES_nuget_${depend:S/.//g:S/-//g:S/=//g}}
 NUGET_NUPKGS+=	${NUGET_NUPKGS_nuget_${depend:S/.//g:S/-//g:S/=//g}}
 _NUGET_DEPENDS+=	${depend}
-.   endif
-.  endfor
-. endfor
+.        endif
+.      endfor
+.    endfor
 
 EXTRACT_ONLY?=	${_DISTFILES:N*.nupkg}
 
 _USES_extract+=	600:nuget-extract
 nuget-extract:
 	@${MKDIR} ${_NUGET_PACKAGEDIR} ${PAKET_PACKAGEDIR}
-. for nupkg in ${NUGET_NUPKGS}
+.    for nupkg in ${NUGET_NUPKGS}
 	@${MKDIR} ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}
 	@tar -xf ${DISTDIR}/${nupkg:C/:.*$//} -C ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|} \
 		-s/%2B/\+/g -s/%2B/\+/g -s/%2B/\+/g \
@@ -162,10 +162,10 @@ nuget-extract:
 	@${CP} ${DISTDIR}/${nupkg:C/:.*$//} ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/${nupkg:tl:C/^.*://:S/=/./}.nupkg
 	@openssl dgst -sha512 -binary ${DISTDIR}/${nupkg:C/:.*$//} | openssl enc -base64 | ${TR} -d "\n" \
 		> ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512
-.  if ${NUGET_LAYOUT} == legacy
+.      if ${NUGET_LAYOUT} == legacy
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/ ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S|=|.|}/
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/ ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}/
-.   if ${nupkg} != ${nupkg:tl}
+.        if ${nupkg} != ${nupkg:tl}
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}; \
 		${MV} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
@@ -174,32 +174,32 @@ nuget-extract:
 		${MV} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
-.   endif
-.  elif ${NUGET_LAYOUT} == flat
+.        endif
+.      elif ${NUGET_LAYOUT} == flat
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}/ ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:C|=.*||}/
 	@${RM} -r ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}
-.   if ${nupkg} != ${nupkg:tl}
+.        if ${nupkg} != ${nupkg:tl}
 	@${CP} -a ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:C|=.*||}/ ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}/
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:C/^.*://:C|=.*||}; \
 		${MV} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${MV} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
-.   endif
-.  endif
-. endfor
+.        endif
+.      endif
+.    endfor
 	@${RLN} ${_NUGET_PACKAGEDIR} ${NUGET_PACKAGEDIR}
 	@${TOUCH} ${WRKDIR}/.nuget-sentinal
 
 _USES_extract+=	601:paket-extract
 paket-extract:
-. for nupkg in ${PAKET_DEPENDS}
+.    for nupkg in ${PAKET_DEPENDS}
 	@${RLN} ${_NUGET_PACKAGEDIR}/${nupkg:tl:S|=|/|} ${PAKET_PACKAGEDIR}/${nupkg:C/=.*//}
 	@(cd ${_NUGET_PACKAGEDIR}/${nupkg:tl:C/^.*://:S|=|/|}; \
 		${CP} ${nupkg:tl:C/^.*://:C/=.*//}.nuspec ${nupkg:C/^.*://:C/=.*//}.nuspec; \
 		${CP} ${nupkg:tl:C/^.*://:S/=/./}.nupkg ${nupkg:C/^.*://:S/=/./}.nupkg; \
 		${CP} ${nupkg:tl:C/^.*://:S/=/./}.nupkg.sha512 ${nupkg:C/^.*://:S/=/./}.nupkg.sha512)
-. endfor
-.endif
+.    endfor
+.  endif
 
 makenuget: patch
 	@${FIND} ${WRKSRC} -name packages.config | \
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index bffddf9729d4..c65370e80a50 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -11,23 +11,23 @@
 .if !defined(_INCLUDE_USES_MOTIF_MK)
 _INCLUDE_USES_MOTIF_MK=	yes
 
-.if !empty(motif_ARGS)
+.  if !empty(motif_ARGS)
 IGNORE=	USES=motif takes no arguments
-.endif
+.  endif
 
-.if defined(WANT_LESSTIF)
+.  if defined(WANT_LESSTIF)
 LIB_DEPENDS+=		libXm.so:x11-toolkits/lesstif
-.else
+.  else
 USE_XORG+=	xpm
 LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
-.endif
+.  endif
 
 MOTIFLIB?=	-L${LOCALBASE}/lib -lXm
 MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
 
 # We only need to include xorg.mk if we want USE_XORG modules
-.if defined(USE_XORG) && !empty(USE_XORG)
+.  if defined(USE_XORG) && !empty(USE_XORG)
 .include "${USESDIR}/xorg.mk"
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/mpi.mk b/Mk/Uses/mpi.mk
index 62d86a289fd2..29c417ce62f8 100644
--- a/Mk/Uses/mpi.mk
+++ b/Mk/Uses/mpi.mk
@@ -19,47 +19,47 @@ _valid_ARGS=	mpich openmpi
 
 _DEFAULT_MPI=	mpich
 
-.if empty(mpi_ARGS)
+.  if empty(mpi_ARGS)
 mpi_ARGS=	${_DEFAULT_MPI}
-.endif
+.  endif
 
-.if ! ${USES:Mpkgconfig}
+.  if ! ${USES:Mpkgconfig}
 USES+=	pkgconfig
-.endif
+.  endif
 
-.if ${mpi_ARGS} == mpich
+.  if ${mpi_ARGS} == mpich
 LIB_DEPENDS+=	libmpich.so:net/mpich
 MPI_HOME=	${LOCALBASE}
 MPI_LIBS+=	`pkgconf --libs mpich`
-. if ${USES:Mfortran}
+.    if ${USES:Mfortran}
 MPI_LIBS+=	-lmpifort
 MPIFC=		${MPI_HOME}/bin/mpif90
 MPIF90=		${MPIFC}
-. endif
+.    endif
 MPI_CFLAGS+=	`pkgconf --cflags mpich`
-.elif ${mpi_ARGS} == openmpi
+.  elif ${mpi_ARGS} == openmpi
 LIB_DEPENDS+=	libmpi_cxx.so:net/openmpi
 MPI_HOME=	${LOCALBASE}/mpi/openmpi
-. if ${USES:Mfortran}
+.    if ${USES:Mfortran}
 MPI_LIBS+=	`pkgconf --libs ompi-fort`
 MPIFC=		${MPI_HOME}/bin/mpif90
 MPIF90=		${MPIFC}
-. else
+.    else
 MPI_LIBS+=	`pkgconf --libs ompi`
-. endif
+.    endif
 MPI_CFLAGS+=	`pkgconf --cflags ompi`
-.else
+.  else
 IGNORE=		USES=mpi: invalid arguments: ${mpi_ARGS}
-.endif
+.  endif
 
 MPICC=		${MPI_HOME}/bin/mpicc
 MPICXX=		${MPI_HOME}/bin/mpicxx
 MPIEXEC=	${MPI_HOME}/bin/mpiexec
 MPIRUN=		${MPI_HOME}/bin/mpirun
 
-.if ${USES:Mcmake} || ${USES:Mcmake\:*}
+.  if ${USES:Mcmake} || ${USES:Mcmake\:*}
 CMAKE_ARGS+=	-DMPIEXEC_EXECUTABLE:FILEPATH="${MPIEXEC}"	\
 		-DMPI_HOME:PATH="${MPI_HOME}"
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index e439940bc443..48aefe4c43b9 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -25,48 +25,48 @@
 .if !defined(_INCLUDE_USES_MYSQL_MK)
 _INCLUDE_USES_MYSQL_MK=	yes
 
-.if !empty(mysql_ARGS)
+.  if !empty(mysql_ARGS)
 .undef _WANT_MYSQL_VER
 .undef _WANT_MYSQL_SERVER
 .undef _WANT_MYSQL_EMBEDDED
 _MYSQL_ARGS=		${mysql_ARGS:S/,/ /g}
-.if ${_MYSQL_ARGS:Mserver}
+.    if ${_MYSQL_ARGS:Mserver}
 _WANT_MYSQL_SERVER=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nserver}
-.endif
-.if ${_MYSQL_ARGS:Membedded}
+.    endif
+.    if ${_MYSQL_ARGS:Membedded}
 _WANT_MYSQL_EMBEDDED=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nembedded}
-.endif
-.if ${_MYSQL_ARGS:Mclient}
+.    endif
+.    if ${_MYSQL_ARGS:Mclient}
 _WANT_MYSQL_CLIENT=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nclient}
-.endif
+.    endif
 
 # Port requested a version
-.if !empty(_MYSQL_ARGS)
+.    if !empty(_MYSQL_ARGS)
 _WANT_MYSQL_VER=	${_MYSQL_ARGS}
-.if   (${_WANT_MYSQL_VER:C/[0-9]*//} == "m")
+.      if   (${_WANT_MYSQL_VER:C/[0-9]*//} == "m")
 _WANT_MYSQL_FLAVOUR=	mariadb
-.elif (${_WANT_MYSQL_VER:C/[0-9]*//} == "p")
+.      elif (${_WANT_MYSQL_VER:C/[0-9]*//} == "p")
 _WANT_MYSQL_FLAVOUR=	percona
-.else
+.      else
 _WANT_MYSQL_FLAVOUR=	mysql
-.endif
-.endif
-.endif # !empty(mysql_ARGS)
+.      endif
+.    endif
+.  endif # !empty(mysql_ARGS)
 
-.if defined(DEFAULT_MYSQL_VER)
+.  if defined(DEFAULT_MYSQL_VER)
 WARNING+=	"DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead"
-.endif
+.  endif
 
 DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 # MySQL client version currently supported.
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-.for v in 55 55m 56 56p 56w 100m 101m
+.  for v in 55 55m 56 56p 56w 100m 101m
 MYSQL${v}_LIBVER=	18
-.endfor
+.  endfor
 MYSQL57_LIBVER=		20
 MYSQL57p_LIBVER=	20
 MYSQL80_LIBVER=		21
@@ -77,101 +77,101 @@ MYSQL105m_LIBVER=	3
 MYSQL106m_LIBVER=	3
 
 # Setting/finding MySQL version we want.
-.if exists(${LOCALBASE}/bin/mysql)
+.  if exists(${LOCALBASE}/bin/mysql)
 _MYSQL!=	${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
 _PERCONA!=	${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l
 _MARIADB!=	${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
 
-.if ${_PERCONA} == 1
+.    if ${_PERCONA} == 1
 _MYSQL_VER=	${_MYSQL}p
 _MYSQL_FLAVOUR=	percona
-.elif ${_MARIADB} == 1
+.    elif ${_MARIADB} == 1
 _MYSQL_VER=	${_MYSQL}m
 _MYSQL_FLAVOUR=	mariadb
-.else
+.    else
 _MYSQL_VER=	${_MYSQL}
 _MYSQL_FLAVOUR=	mysql
-.endif
-.endif
+.    endif
+.  endif
 
-.if defined(_WANT_MYSQL_VER)
-.if   defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m")
+.  if defined(_WANT_MYSQL_VER)
+.    if   defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m")
 WITH_MYSQL_FLAVOUR=	mariadb
-.elif defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "p")
+.    elif defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "p")
 WITH_MYSQL_FLAVOUR=	percona
-.else
+.    else
 WITH_MYSQL_FLAVOUR=	mysql
-.endif
-.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER}
+.    endif
+.    if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER}
 IGNORE=		cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[mpw]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[mpw]//}-client
-.endif
+.    endif
 MYSQL_VER=	${_WANT_MYSQL_VER}
-.elif defined(WITH_MYSQL_VER)
+.  elif defined(WITH_MYSQL_VER)
 MYSQL_VER=	${WITH_MYSQL_VER}
-.else
-.if defined(_MYSQL_VER)
+.  else
+.    if defined(_MYSQL_VER)
 MYSQL_VER=	${_MYSQL_VER}
-.else
+.    else
 MYSQL_VER=	${DEFAULT_MYSQL_VER}
-.endif
-.endif # _WANT_MYSQL_VER
+.    endif
+.  endif # _WANT_MYSQL_VER
 
-.if   ${MYSQL_VER:C/[0-9]*//} == "m"
+.  if   ${MYSQL_VER:C/[0-9]*//} == "m"
 MYSQL_FLAVOUR=     mariadb
-.elif ${MYSQL_VER:C/[0-9]*//} == "p"
+.  elif ${MYSQL_VER:C/[0-9]*//} == "p"
 MYSQL_FLAVOUR=     percona
-.else
+.  else
 MYSQL_FLAVOUR=     mysql
-.endif
+.  endif
 
-.if defined(_MYSQL_VER)
-.if ${_MYSQL_VER} != ${MYSQL_VER}
+.  if defined(_MYSQL_VER)
+.    if ${_MYSQL_VER} != ${MYSQL_VER}
 IGNORE=		cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[mpw]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[mpw]//}-client
-.endif
-.endif
+.    endif
+.  endif
 
 _MYSQL_SHLIB=	libmysqlclient
-.if (${MYSQL_VER:C/[0-9]*//} == "m")
+.  if (${MYSQL_VER:C/[0-9]*//} == "m")
 _MYSQL_SERVER_FLAVOUR=	mariadb
 _MYSQL_CLIENT_FLAVOUR=	mariadb
-.  if ${MYSQL_VER:C/m//} >= 102
+.    if ${MYSQL_VER:C/m//} >= 102
 _MYSQL_SHLIB=	libmariadb
-.  endif
-.elif (${MYSQL_VER:C/[0-9]*//} == "p")
+.    endif
+.  elif (${MYSQL_VER:C/[0-9]*//} == "p")
 _MYSQL_SERVER_FLAVOUR=	percona
 _MYSQL_CLIENT_FLAVOUR=	percona
-.elif (${MYSQL_VER:C/[0-9]*//} == "w")
+.  elif (${MYSQL_VER:C/[0-9]*//} == "w")
 _MYSQL_SERVER_FLAVOUR=	mysqlwsrep
 _MYSQL_CLIENT_FLAVOUR=	mysql
-.else
+.  else
 _MYSQL_SERVER_FLAVOUR=	mysql
 _MYSQL_CLIENT_FLAVOUR=	mysql
-.endif
+.  endif
 
 _MYSQL_CLIENT=	databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[mp]//}-client
 _MYSQL_SERVER=	databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[mp]//}-server
 
 # And now we are checking if we can use it
-.if defined(MYSQL${MYSQL_VER}_LIBVER)
-.if defined(IGNORE_WITH_MYSQL)
-.	for VER in ${IGNORE_WITH_MYSQL}
-.		if (${MYSQL_VER} == "${VER}")
+.  if defined(MYSQL${MYSQL_VER}_LIBVER)
+.    if defined(IGNORE_WITH_MYSQL)
+.      for VER in ${IGNORE_WITH_MYSQL}
+.        if (${MYSQL_VER} == "${VER}")
 IGNORE=		cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported)
-.		endif
-.	endfor
-.endif # IGNORE_WITH_MYSQL
-.if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)
+.        endif
+.      endfor
+.    endif # IGNORE_WITH_MYSQL
+.    if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
-.if defined(_WANT_MYSQL_EMBEDDED)
+.      if defined(_WANT_MYSQL_EMBEDDED)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
-.endif
-.endif
-.if defined(_WANT_MYSQL_CLIENT) || \
+.      endif
+.    endif
+.    if defined(_WANT_MYSQL_CLIENT) || \
 	!(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED))
 LIB_DEPENDS+=	${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
-.endif
-.else
+.    endif
+.  else
 IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
-.endif # Check for correct libs
+.  endif # Check for correct libs
 
 .endif
diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk
index c89ad90ff3cb..23b5c0216fa3 100644
--- a/Mk/Uses/ncurses.mk
+++ b/Mk/Uses/ncurses.mk
@@ -24,19 +24,19 @@
 .if !defined(_INCLUDE_USES_NCURSES_MK)
 _INCLUDE_USES_NCURSES_MK=	yes
 
-.if empty(ncurses_ARGS)
-.  if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/lib/libncursesw.so)
+.  if empty(ncurses_ARGS)
+.    if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/lib/libncursesw.so)
 ncurses_ARGS=	base
-.  else
+.    else
 ncurses_ARGS=	port
+.    endif
 .  endif
-.endif
 
-.if ${ncurses_ARGS} == base
+.  if ${ncurses_ARGS} == base
 NCURSESBASE=	/usr
 NCURSESINC=	${NCURSESBASE}/include
 
-.  if exists(${LOCALBASE}/lib/libncurses.so)
+.    if exists(${LOCALBASE}/lib/libncurses.so)
 _USES_sanity+=	400:check-depends-ncurses
 check-depends-ncurses:
 	@${ECHO_CMD} "Dependency error: this port wants the ncurses library from the FreeBSD"
@@ -44,27 +44,27 @@ check-depends-ncurses:
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port or undefine WITH_NCURSES_BASE."
 	@${FALSE}
-.  endif
+.    endif
 
-.elif ${ncurses_ARGS} == port
+.  elif ${ncurses_ARGS} == port
 NCURSESBASE=	${LOCALBASE}
 NCURSESINC=	${LOCALBASE}/include/ncurses
 
-.  if !defined(NCURSES_PORT) && exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so)
+.    if !defined(NCURSES_PORT) && exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so)
 PKG_DBDIR?=	${DESTDIR}/var/db/pkg
-.    if defined(DESTDIR)
+.      if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
-.    endif
+.      endif
 PKGARGS?=
 NCURSES_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libncurses.so || :
-.  endif
+.    endif
 NCURSES_INSTALLED?=
 
-.if ${NCURSES_INSTALLED} != ""
+.    if ${NCURSES_INSTALLED} != ""
 NCURSES_PORT=	${NCURSES_INSTALLED}
 NCURSES_SHLIBFILE!=	${PKG_INFO} -ql ${NCURSES_INSTALLED} | grep -m 1 "^`${PKG_QUERY} "%p" ${NCURSES_INSTALLED}`/lib/libncurses.so."
 NCURSES_SHLIBVER?=	${NCURSES_SHLIBFILE:E}
-.endif
+.    endif
 
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	6
@@ -75,14 +75,14 @@ NCURSESRPATH=		${NCURSESBASE}/lib
 TINFO_LIB=		-ltinfo
 NCURSES_LIB=		-lncurses
 
-.if defined(NCURSES_RPATH)
+.    if defined(NCURSES_RPATH)
 CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
-.endif
+.    endif
 LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
 
-.else
+.  else
 .error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
-.endif
+.  endif
 
 NCURSESLIB=	${NCURSESBASE}/lib
 NCURSES_IMPL?=	ncursesw
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk
index ce9a92af666e..5c78cf152d07 100644
--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@@ -15,53 +15,53 @@ _INCLUDE_USES_NINJA_MK=	yes
 
 _valid_ARGS=	build make run
 
-.for _arg in ${ninja_ARGS}
+.  for _arg in ${ninja_ARGS}
 .    if empty(_valid_ARGS:M${_arg})
 IGNORE=	'USES+= ninja:${ninja_ARGS}' usage: argument [${_arg}] is not recognized
 .    endif
-.endfor
+.  endfor
 
-.if empty(ninja_ARGS)
+.  if empty(ninja_ARGS)
 ninja_ARGS+=	make
-.endif
+.  endif
 
-.if ${ninja_ARGS:Mmake}
+.  if ${ninja_ARGS:Mmake}
 ninja_ARGS+=	build
-.endif
+.  endif
 
-.if ${NINJA_DEFAULT} == ninja
+.  if ${NINJA_DEFAULT} == ninja
 NINJA_CMD=	ninja
 _NINJA_PORT=	devel/ninja
-.elif ${NINJA_DEFAULT} == samurai
+.  elif ${NINJA_DEFAULT} == samurai
 NINJA_CMD=	samu
 _NINJA_PORT=	devel/samurai
 MAKE_ENV+=	SAMUFLAGS="-v -j${MAKE_JOBS_NUMBER}"
-.  if ${ninja_ARGS:Mbuild} && !${BINARY_ALIAS:U:Mninja=*}
+.    if ${ninja_ARGS:Mbuild} && !${BINARY_ALIAS:U:Mninja=*}
 # Cmake and Meson have native support for Samurai and detect and
 # use it when Ninja is not available in the build environment.  The
 # alias is needed for other ports which call Ninja directly and do
 # not fall back to Samurai. There should be no harm in providing it
 # generally.
 BINARY_ALIAS+=	ninja=samu
-.  endif
-.else
+.    endif
+.  else
 IGNORE=	invalid DEFAULT_VERSIONS+=ninja=${NINJA_DEFAULT}
-.endif
+.  endif
 
-.if ${ninja_ARGS:Mbuild}
+.  if ${ninja_ARGS:Mbuild}
 BUILD_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
 # Humanize build log and include percentage of completed jobs %p in it.
 # See samu(1) or the Ninja manual.
 MAKE_ENV+=	NINJA_STATUS="[%p %s/%t] "
-.endif
+.  endif
 
-.if ${ninja_ARGS:Mmake}
-.  if ${NINJA_DEFAULT} == ninja
+.  if ${ninja_ARGS:Mmake}
+.    if ${NINJA_DEFAULT} == ninja
 # samu does not support GNU-style args, so we cannot just append
 # -v last.  samu gets this via SAMUFLAGS above but ninja does not
 # support an equivalent environment variable.
 MAKE_ARGS+=	-v
-.  endif
+.    endif
 CMAKE_ARGS+=	-GNinja
 MAKEFILE=
 MAKE_CMD=	${NINJA_CMD}
@@ -69,10 +69,10 @@ MAKE_FLAGS=
 # Set a minimal job of 1
 _MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
 _DESTDIR_VIA_ENV=	yes
-.endif
+.  endif
 
-.if ${ninja_ARGS:Mrun}
+.  if ${ninja_ARGS:Mrun}
 RUN_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index 23aad97fa580..a54751b1b4dd 100644
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -15,44 +15,44 @@ _INCLUDE_USES_NODEJS_MK=	yes
 _VALID_NODEJS_VERSION=	14 16 17 lts current
 _NODEJS_VERSION_SUFFIX=	${NODEJS_DEFAULT}
 
-.if ! ${_VALID_NODEJS_VERSION:M${_NODEJS_VERSION_SUFFIX}}
+.  if ! ${_VALID_NODEJS_VERSION:M${_NODEJS_VERSION_SUFFIX}}
 IGNORE=	Invalid nodejs default version ${_NODEJS_VERSION_SUFFIX}; valid versions are ${_VALID_NODEJS_VERSION}
-.endif
+.  endif
 
-.if empty(nodejs_ARGS)
+.  if empty(nodejs_ARGS)
 nodejs_ARGS=	build,run
-.endif
+.  endif
 
-. if ${nodejs_ARGS:M14}
+.  if ${nodejs_ARGS:M14}
 _NODEJS_VERSION_SUFFIX=	14
-. elif ${nodejs_ARGS:M16}
+.  elif ${nodejs_ARGS:M16}
 _NODEJS_VERSION_SUFFIX=	16
-. elif ${nodejs_ARGS:Mlts}
+.  elif ${nodejs_ARGS:Mlts}
 _NODEJS_VERSION_SUFFIX=	lts
-. elif ${nodejs_ARGS:M17}
+.  elif ${nodejs_ARGS:M17}
 _NODEJS_VERSION_SUFFIX=	17
-. elif ${nodejs_ARGS:Mcurrent}
+.  elif ${nodejs_ARGS:Mcurrent}
 _NODEJS_VERSION_SUFFIX=	current
-. elif defined(NODEJS_DEFAULT)
-. endif
+.  elif defined(NODEJS_DEFAULT)
+.  endif
 
 # The nodejs 17 version is named www/node
-. if ${_NODEJS_VERSION_SUFFIX:Mcurrent}
+.  if ${_NODEJS_VERSION_SUFFIX:Mcurrent}
 _NODEJS_VERSION_SUFFIX=
-. endif
-. if ${_NODEJS_VERSION_SUFFIX:M17}
+.  endif
+.  if ${_NODEJS_VERSION_SUFFIX:M17}
 _NODEJS_VERSION_SUFFIX=
-. endif
+.  endif
 # The nodejs LTS is version 16
-. if ${_NODEJS_VERSION_SUFFIX:Mlts}
+.  if ${_NODEJS_VERSION_SUFFIX:Mlts}
 _NODEJS_VERSION_SUFFIX=	16
-. endif
+.  endif
 
-. if ${nodejs_ARGS:M*run*}
+.  if ${nodejs_ARGS:M*run*}
 RUN_DEPENDS+=	node:www/node${_NODEJS_VERSION_SUFFIX}
-. endif
-. if ${nodejs_ARGS:M*build*}
+.  endif
+.  if ${nodejs_ARGS:M*build*}
 BUILD_DEPENDS+=	node:www/node${_NODEJS_VERSION_SUFFIX}
-. endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk
index 5b055b629998..eed7585b8488 100644
--- a/Mk/Uses/objc.mk
+++ b/Mk/Uses/objc.mk
@@ -11,69 +11,69 @@ _INCLUDE_USES_OBJC_MK=	yes
 OBJC_CLANG_VERSION=70
 
 objc_ARGS?=
-.if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler}
+.  if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler}
 IGNORE=	USES=objc only accepts no arguments or 'compiler'
-.endif
+.  endif
 
 _CC_hash:=	${CC:hash}
 
-.if defined(_OBJC_CCVERSION_${_CC_hash})
+.  if defined(_OBJC_CCVERSION_${_CC_hash})
 _CCVERSION=	${_OBJC_CCVERSION_${_CC_hash}}
-.else
+.  else
 _CCVERSION!=	${CC} --version
 _OBJC_CCVERSION_${_CC_hash}=	${_CCVERSION}
 PORTS_ENV_VARS+=	_OBJC_CCVERSION_${_CC_hash}
-.endif
+.  endif
 COMPILER_VERSION=	${_CCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
-.if ${_CCVERSION:Mclang}
+.  if ${_CCVERSION:Mclang}
 COMPILER_TYPE=	clang
-.else
+.  else
 COMPILER_TYPE=	gcc
-.endif
+.  endif
 
 ALT_COMPILER_VERSION=	0
 ALT_COMPILER_TYPE=	none
 _ALTCCVERSION=		none
-.if defined(_OBJC_ALTCCVERSION_${_CC_hash})
+.  if defined(_OBJC_ALTCCVERSION_${_CC_hash})
 _ALTCCVERSION=	${_OBJC_ALTCCVERSION_${_CC_hash}}
-.else
-.if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
+.  else
+.    if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
 _ALTCCVERSION!=	/usr/bin/clang --version
-.elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
+.    elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
 _ALTCCVERSION!=	/usr/bin/gcc --version
-.endif
+.    endif
 _OBJC_ALTCCVERSION_${_CC_hash}=	${_ALTCCVERSION}
 PORTS_ENV_VARS+=		_OBJC_ALTCCVERSION_${_CC_hash}
-.endif
+.  endif
 
 ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
-.if ${_ALTCCVERSION:Mclang}
+.  if ${_ALTCCVERSION:Mclang}
 ALT_COMPILER_TYPE=	clang
-.elif !empty(_ALTCCVERSION)
+.  elif !empty(_ALTCCVERSION)
 ALT_COMPILER_TYPE=	gcc
-.endif
+.  endif
 
 # We do always need clang and prefer a recent version
-.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < ${OBJC_CLANG_VERSION}) || ${COMPILER_TYPE} != clang
-.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= ${OBJC_CLANG_VERSION}
+.  if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < ${OBJC_CLANG_VERSION}) || ${COMPILER_TYPE} != clang
+.    if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= ${OBJC_CLANG_VERSION}
 CC=	/usr/bin/clang
 CPP=	/usr/bin/clang-cpp
 CXX=	/usr/bin/clang++
 OBJC_LLD=	lld
-.else
+.    else
 BUILD_DEPENDS+=        ${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}:devel/llvm${OBJC_CLANG_VERSION}
 CPP=   ${LOCALBASE}/bin/clang-cpp${OBJC_CLANG_VERSION}
 CC=    ${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}
 CXX=   ${LOCALBASE}/bin/clang++${OBJC_CLANG_VERSION}
 OBJC_LLD=	lld${OBJC_CLANG_VERSION}
-.endif
-.endif
+.    endif
+.  endif
 
-.if ! ${objc_ARGS:Mcompiler}
+.  if ! ${objc_ARGS:Mcompiler}
 LIB_DEPENDS+=	libobjc.so.4.6:lang/libobjc2
 OBJCFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
+.  endif
 CONFIGURE_ENV+=	OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"
 MAKE_ENV+=	OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"
 
diff --git a/Mk/Uses/openal.mk b/Mk/Uses/openal.mk
index 38b2dd8043fd..ff91a4afda74 100644
--- a/Mk/Uses/openal.mk
+++ b/Mk/Uses/openal.mk
@@ -9,20 +9,20 @@
 .if !defined(_INCLUDE_USES_OPENAL_MK)
 _INCLUDE_USES_OPENAL_MK=	yes
 
-.if empty(openal_ARGS)
+.  if empty(openal_ARGS)
 openal_ARGS=	soft
-.endif
+.  endif
 
-.if !empty(openal_ARGS:Nal:Nsoft:Nalut)
+.  if !empty(openal_ARGS:Nal:Nsoft:Nalut)
 IGNORE=	has unknown USES=openal arguments: ${openal_ARGS:Nal:Nsoft:Nalut}
-.endif
+.  endif
 
 _OPENAL_al_DEPENDS=	libopenal.so.1:audio/openal-soft
 _OPENAL_soft_DEPENDS=	libopenal.so.1:audio/openal-soft
 _OPENAL_alut_DEPENDS=	libalut.so.0:audio/freealut
 
-.for _arg in ${openal_ARGS}
+.  for _arg in ${openal_ARGS}
 LIB_DEPENDS+=	${_OPENAL_${_arg}_DEPENDS}
-.endfor
+.  endfor
 
 .endif
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
index e18017933e18..59629f915d8c 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -10,22 +10,22 @@
 .if !defined(_INCLUDE_USES_PATHFIX_MK)
 _INCLUDE_USES_PATHFIX_MK=	yes
 
-.if !empty(pathfix_ARGS)
+.  if !empty(pathfix_ARGS)
 IGNORE=	USES=pathfix does not require args
-.endif
+.  endif
 
 PATHFIX_CMAKELISTSTXT?=	CMakeLists.txt
-.if ${USES:Mautoreconf*}
+.  if ${USES:Mautoreconf*}
 PATHFIX_MAKEFILEIN?=	Makefile.am Makefile.in
-.else
+.  else
 PATHFIX_MAKEFILEIN?=	Makefile.in
-.endif
+.  endif
 PATHFIX_WRKSRC?=	${WRKSRC}
 
 _USES_patch+=	190:pathfix
 pathfix:
-.if ${USES:Mcmake*}
-.for file in ${PATHFIX_CMAKELISTSTXT}
+.  if ${USES:Mcmake*}
+.    for file in ${PATHFIX_CMAKELISTSTXT}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 		's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]CMAKE_INSTALL_DATAROOTDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
@@ -38,9 +38,9 @@ pathfix:
 		s|[{]LIBRARY_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|lib/pkgconfig|libdata/pkgconfig|g'
-.endfor
-.else
-.for file in ${PATHFIX_MAKEFILEIN}
+.    endfor
+.  else
+.    for file in ${PATHFIX_MAKEFILEIN}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
@@ -55,7 +55,7 @@ pathfix:
 		s|[(]prefix[)]/share/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
 		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
-.endfor
-.endif
+.    endfor
+.  endif
 
 .endif
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 586c8aa95cab..d885e1d37654 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -42,19 +42,19 @@ USE_PERL5?=	run build
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-.    if ${PERL5_DEFAULT} == 5.30
+.  if ${PERL5_DEFAULT} == 5.30
 .include "${PORTSDIR}/lang/perl5.30/version.mk"
-.    elif ${PERL5_DEFAULT} == 5.32
+.  elif ${PERL5_DEFAULT} == 5.32
 .include "${PORTSDIR}/lang/perl5.32/version.mk"
-.    elif ${PERL5_DEFAULT} == 5.34
+.  elif ${PERL5_DEFAULT} == 5.34
 .include "${PORTSDIR}/lang/perl5.34/version.mk"
-.    elif ${PERL5_DEFAULT} == devel
+.  elif ${PERL5_DEFAULT} == devel
 .include "${PORTSDIR}/lang/perl5-devel/version.mk"
 # Force PERL_PORT here in case two identical PERL_VERSION.
 PERL_PORT?=	perl5-devel
-.    else
+.  else
 IGNORE=	Invalid perl5 version ${PERL5_DEFAULT}
-.    endif
+.  endif
 
 PERL_VER?=	${PERL_VERSION:C/\.[0-9]+$//}
 
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 27132d825267..6cfd9a6c0cec 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -45,15 +45,15 @@ VALID_PGSQL_VER=	10 11 12 13 14
 #PGSQL99_LIBVER=6
 
 PGSQL_LIBVER=	5
-.for v in ${VALID_PGSQL_VER:S,.,,}
+.  for v in ${VALID_PGSQL_VER:S,.,,}
 PGSQL$v_LIBVER?=	${PGSQL_LIBVER}
-.endfor
+.  endfor
 
-.for v in ${PGSQL_DEFAULT}
-.  if ! ${VALID_PGSQL_VER:M$v}
+.  for v in ${PGSQL_DEFAULT}
+.    if ! ${VALID_PGSQL_VER:M$v}
 IGNORE=		Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 .  for w in WITH DEFAULT
 .    ifdef $w_PGSQL_VER
@@ -134,20 +134,20 @@ PGSQL_VER=	${PGSQL_DEFAULT}
 PGSQL_VER_NODOT=	${PGSQL_VER:S,.,,}
 
 # And now we are checking if we can use it
-.   if defined(PGSQL${PGSQL_VER_NODOT}_LIBVER)
+.  if defined(PGSQL${PGSQL_VER_NODOT}_LIBVER)
 # Compat.  Please DO NOT use IGNORE_WITH_PGSQL!
 .    if defined(IGNORE_WITH_PGSQL)
 DEV_WARNING+=	"Do not set IGNORE_WITH_PGSQL, use the version argument to USES=pgsql"
-.	for ver in ${IGNORE_WITH_PGSQL}
-.		if (${PGSQL_VER} == ${ver})
+.      for ver in ${IGNORE_WITH_PGSQL}
+.        if (${PGSQL_VER} == ${ver})
 IGNORE?=		cannot install: does not work with postgresql${PGSQL_VER_NODOT}-client (PostgreSQL ${IGNORE_WITH_PGSQL} not supported)
-.		endif
-.	endfor
+.        endif
+.      endfor
 .    endif # IGNORE_WITH_PGSQL
 
-.if !defined(WANT_PGSQL) || ${WANT_PGSQL:Mlib}
+.    if !defined(WANT_PGSQL) || ${WANT_PGSQL:Mlib}
 LIB_DEPENDS+=	libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client
-.endif
+.    endif
 
 _USE_PGSQL_DEP=		client contrib docs pgtcl plperl plpython pltcl server
 _USE_PGSQL_DEP_client=	psql
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 9940d7fba047..5a3de6c0b62f 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -64,14 +64,14 @@ _INCLUDE_USES_PHP_MK=	yes
 _PHP_VALID_ARGS=	build cgi cli embed ext flavors mod noflavors pecl \
 			phpize web zend
 _PHP_UNKNOWN_ARGS=
-.for arg in ${php_ARGS}
-.  if empty(_PHP_VALID_ARGS:M${arg})
+.  for arg in ${php_ARGS}
+.    if empty(_PHP_VALID_ARGS:M${arg})
 _PHP_UNKNOWN_ARGS+=	${arg}
-.  endif
-.endfor
-.if !empty(_PHP_UNKNOWN_ARGS)
+.    endif
+.  endfor
+.  if !empty(_PHP_UNKNOWN_ARGS)
 IGNORE=	has unknown USES=php arguments: ${_PHP_UNKNOWN_ARGS}
-.endif
+.  endif
 
 .  if ${php_ARGS:Mbuild} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
 DEV_WARNING+=	"USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed"
@@ -130,14 +130,14 @@ IGNORE=	does not work with PHP versions "${IGNORE_WITH_PHP}" and "${_INSTALLED_P
 PHP_VER?=	${PHP_DEFAULT:S/.//}
 .  endif # .if exists(${PHPBASE}/etc/php.conf)
 
-.if defined(BUILD_ONLY_DEFAULT_PHP_FLAVOR)
+.  if defined(BUILD_ONLY_DEFAULT_PHP_FLAVOR)
 # Only build php ports of the default flavor
 _ALL_FLAVOR_VERSIONS=	${PHP_VER}
-.else
+.  else
 # Use the "default" php version as the first version for flavors, so that it
 # gets to be the default flavor.
 _ALL_FLAVOR_VERSIONS=	${PHP_VER} ${_ALL_PHP_VERSIONS:N${PHP_VER}}
-.endif
+.  endif
 
 # If we want flavors, fill in FLAVORS with the allowed PHP versions, if some
 # cannot be used, or all of them if they all can.
@@ -164,9 +164,9 @@ FLAVOR=	${FLAVORS:[1]}
 .    endif
 .  endif
 
-.if ${PHP_VER} == 74 && (${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64)
+.  if ${PHP_VER} == 74 && (${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64)
 USE_GCC=	yes
-.endif
+.  endif
 
 # This variable is for dependencies lines, so you write:
 # ${PHP_PKGNAMEPREFIX}foo:devel/php-foo@${PHP_FLAVOR}
@@ -413,9 +413,9 @@ iconv_DEPENDS=	converters/php${PHP_VER}-iconv
 igbinary_DEPENDS=	converters/pecl-igbinary@${PHP_FLAVOR}
 imap_DEPENDS=	mail/php${PHP_VER}-imap
 intl_DEPENDS=	devel/php${PHP_VER}-intl
-.if ${PHP_VER} < 80
+.    if ${PHP_VER} < 80
 json_DEPENDS=	devel/php${PHP_VER}-json
-.endif
+.    endif
 ldap_DEPENDS=	net/php${PHP_VER}-ldap
 mbstring_DEPENDS=	converters/php${PHP_VER}-mbstring
 mcrypt_DEPENDS=	security/pecl-mcrypt@${PHP_FLAVOR}
@@ -424,9 +424,9 @@ memcached_DEPENDS=	databases/pecl-memcached@${PHP_FLAVOR}
 mysqli_DEPENDS=	databases/php${PHP_VER}-mysqli
 odbc_DEPENDS=	databases/php${PHP_VER}-odbc
 opcache_DEPENDS=	www/php${PHP_VER}-opcache
-.if ${PHP_VER} < 80
+.    if ${PHP_VER} < 80
 openssl_DEPENDS=security/php${PHP_VER}-openssl
-.endif
+.    endif
 pcntl_DEPENDS=	devel/php${PHP_VER}-pcntl
 pdf_DEPENDS=	print/pecl-pdflib@${PHP_FLAVOR}
 pdo_DEPENDS=	databases/php${PHP_VER}-pdo
@@ -458,11 +458,11 @@ tidy_DEPENDS=	www/php${PHP_VER}-tidy
 tokenizer_DEPENDS=	devel/php${PHP_VER}-tokenizer
 xml_DEPENDS=	textproc/php${PHP_VER}-xml
 xmlreader_DEPENDS=	textproc/php${PHP_VER}-xmlreader
-.if ${PHP_VER} >= 80
+.    if ${PHP_VER} >= 80
 xmlrpc_DEPENDS=	net/pecl-xmlrpc@${PHP_FLAVOR}
-.else
+.    else
 xmlrpc_DEPENDS=	net/php${PHP_VER}-xmlrpc
-.endif
+.    endif
 xmlwriter_DEPENDS=	textproc/php${PHP_VER}-xmlwriter
 xsl_DEPENDS=	textproc/php${PHP_VER}-xsl
 zip_DEPENDS=	archivers/php${PHP_VER}-zip
diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk
index d025856d2314..499be51f1336 100644
--- a/Mk/Uses/pkgconfig.mk
+++ b/Mk/Uses/pkgconfig.mk
@@ -11,21 +11,21 @@ _INCLUDE_USES_PKGCONFIG_MK=	yes
 
 _PKGCONFIG_DEPENDS=	pkgconf>=1.3.0_1:devel/pkgconf
 
-.if empty(pkgconfig_ARGS)
+.  if empty(pkgconfig_ARGS)
 pkgconfig_ARGS=	build
-.endif
+.  endif
 
-.if ${pkgconfig_ARGS} == "build"
+.  if ${pkgconfig_ARGS} == "build"
 BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
-.elif ${pkgconfig_ARGS} == "run"
+.  elif ${pkgconfig_ARGS} == "run"
 RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
-.elif ${pkgconfig_ARGS} == "both"
+.  elif ${pkgconfig_ARGS} == "both"
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
 BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
-.else
+.  else
 IGNORE=	USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 14a0f4a33191..62013f08c376 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -160,17 +160,17 @@ SIP_ARGS=	--qmake ${QMAKE} \
 		--build-dir build \
 		--protected-is-public \
 		--api-dir ${PYQT_APIDIR}
-.	if ${PORTNAME} == "pyqt"
+.    if ${PORTNAME} == "pyqt"
 SIP_ARGS+=	--confirm-license
-.	endif
+.    endif
 
-.  if ${PORTNAME} == "pyqt"
-.    if !target(post-patch)
+.    if ${PORTNAME} == "pyqt"
+.      if !target(post-patch)
 post-patch:
 	${REINPLACE_CMD} -e "s#%%PYQT_DESIGNERDIR%%#${PYQT_DESIGNERDIR}#" ${WRKSRC}/project.py
 	${REINPLACE_CMD} -e "s#%%PYQT_QMLDIR%%#${PYQT_QMLDIR}#" ${WRKSRC}/project.py
-.    endif  # !target(post-patch)
-.  endif
+.      endif  # !target(post-patch)
+.    endif
 
 .    if !target(do-build)
 do-build:
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 4226c3823f73..0b8f782c0314 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -258,29 +258,29 @@ _VALID_PYTHON_FEATURES=	allflavors autoplist concurrent cython cython_run \
 			distutils flavors noegginfo noflavors optsuffix \
 			py3kplist pythonprefix
 _INVALID_PYTHON_FEATURES=
-.for var in ${USE_PYTHON}
-.  if empty(_VALID_PYTHON_FEATURES:M${var})
+.  for var in ${USE_PYTHON}
+.    if empty(_VALID_PYTHON_FEATURES:M${var})
 _INVALID_PYTHON_FEATURES+=	${var}
-.  endif
-.endfor
-.if !empty(_INVALID_PYTHON_FEATURES)
+.    endif
+.  endfor
+.  if !empty(_INVALID_PYTHON_FEATURES)
 IGNORE=	uses unknown USE_PYTHON features: ${_INVALID_PYTHON_FEATURES}
-.endif
+.  endif
 
 # Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
-.for var in ${USE_PYTHON}
+.  for var in ${USE_PYTHON}
 _PYTHON_FEATURE_${var:C/=.*$//:tu}=	${var:C/.*=//:S/,/ /g}
-.endfor
+.  endfor
 
 # distutils automatically generates flavors depending on the supported
 # versions.
-.if defined(_PYTHON_FEATURE_DISTUTILS)
+.  if defined(_PYTHON_FEATURE_DISTUTILS)
 _PYTHON_FEATURE_FLAVORS=	yes
-.endif
+.  endif
 
-.if defined(_PYTHON_FEATURE_NOFLAVORS)
+.  if defined(_PYTHON_FEATURE_NOFLAVORS)
 .undef _PYTHON_FEATURE_FLAVORS
-.endif
+.  endif
 
 # Make sure that no dependency or some other environment variable
 # pollutes the build/run dependency detection
@@ -288,53 +288,53 @@ _PYTHON_FEATURE_FLAVORS=	yes
 .undef _PYTHON_RUN_DEP
 .undef _PYTHON_TEST_DEP
 _PYTHON_ARGS=		${python_ARGS:S/,/ /g}
-.if ${_PYTHON_ARGS:Mpatch}
+.  if ${_PYTHON_ARGS:Mpatch}
 _PYTHON_PATCH_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Npatch}
-.endif
-.if ${_PYTHON_ARGS:Mbuild}
+.  endif
+.  if ${_PYTHON_ARGS:Mbuild}
 _PYTHON_BUILD_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Nbuild}
-.endif
-.if ${_PYTHON_ARGS:Mrun}
+.  endif
+.  if ${_PYTHON_ARGS:Mrun}
 _PYTHON_RUN_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Nrun}
-.endif
-.if ${_PYTHON_ARGS:Mtest}
+.  endif
+.  if ${_PYTHON_ARGS:Mtest}
 _PYTHON_TEST_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Ntest}
-.endif
-.if ${_PYTHON_ARGS:Menv}
+.  endif
+.  if ${_PYTHON_ARGS:Menv}
 PYTHON_NO_DEPENDS=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Nenv}
-.endif
+.  endif
 
 # The port does not specify a build, run or test dependency, assume all are
 # required.
-.if !defined(_PYTHON_BUILD_DEP) && !defined(_PYTHON_RUN_DEP) && \
+.  if !defined(_PYTHON_BUILD_DEP) && !defined(_PYTHON_RUN_DEP) && \
     !defined(_PYTHON_TEST_DEP) && !defined(PYTHON_NO_DEPENDS)
 _PYTHON_BUILD_DEP=	yes
 _PYTHON_RUN_DEP=	yes
 _PYTHON_TEST_DEP=	yes
-.endif
+.  endif
 
-.if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
+.  if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
 WARNING+=	"PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
-.endif
+.  endif
 
-.if ${_PYTHON_ARGS} == 2.7
+.  if ${_PYTHON_ARGS} == 2.7
 DEV_WARNING+=		"lang/python27 reached End of Life and will be removed somewhere in the future, please convert to a modern version of python"
-.elif ${_PYTHON_ARGS} == 2
+.  elif ${_PYTHON_ARGS} == 2
 DEV_ERROR+=		"USES=python:2 is no longer supported, use USES=python:2.7"
-.elif ${_PYTHON_ARGS} == 3
+.  elif ${_PYTHON_ARGS} == 3
 DEV_ERROR+=		"USES=python:3 is no longer supported, use USES=python:3.7+ or an appropriate version range"
-.endif  # ${_PYTHON_ARGS} == 2.7
+.  endif  # ${_PYTHON_ARGS} == 2.7
 
 _PYTHON_VERSION:=	${PYTHON_DEFAULT}
 
-.if empty(_PYTHON_ARGS)
+.  if empty(_PYTHON_ARGS)
 _PYTHON_ARGS=	3.7+
-.endif
+.  endif
 
 # Validate Python version whether it meets the version restriction.
 _PYTHON_VERSION_CHECK:=		${_PYTHON_ARGS:C/^([1-9]\.[1-9]?[0-9])$/\1-\1/}
@@ -348,89 +348,89 @@ _PYTHON_VERSION_MAXIMUM:=	${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}${_PYTHON_V
 _V1=		[1-9].[0-9]
 _V2=		[1-9].[1-9][0-9]
 _PYTHON_ARGS:=	${_PYTHON_ARGS:N${_V1}-${_V1}:N${_V1}-${_V2}:N${_V2}-${_V2}:N${_V1}:N${_V2}:N${_V1}+:N${_V2}+:N-${_V1}:N-${_V2}}
-.if !empty(_PYTHON_ARGS)
+.  if !empty(_PYTHON_ARGS)
 IGNORE=	uses unknown USES=python arguments: ${_PYTHON_ARGS}
-.endif
+.  endif
 
 # Pattern to convert python versions (X.Y or X.YY) to comparable format X.YY
 _VC=		C/^([1-9]\.)([0-9])$$/\10\2/
 
 .undef _PYTHON_VERSION_NONSUPPORTED
-.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
+.  if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MINIMUM} at least
-.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
+.  elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MAXIMUM} at most
-.endif
+.  endif
 
 # If we have an unsupported version of Python, try another.
-.if defined(_PYTHON_VERSION_NONSUPPORTED)
+.  if defined(_PYTHON_VERSION_NONSUPPORTED)
 .undef _PYTHON_VERSION
-.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
+.    for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}
-.if !defined(_PYTHON_VERSION) && \
+.      if !defined(_PYTHON_VERSION) && \
 	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
 		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
 		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
 _PYTHON_VERSION=	${ver}
-.endif
-.endfor
-.if !defined(_PYTHON_VERSION)
+.      endif
+.    endfor
+.    if !defined(_PYTHON_VERSION)
 IGNORE=		needs an unsupported version of Python
-.endif
-.endif	# defined(_PYTHON_VERSION_NONSUPPORTED)
+.    endif
+.  endif	# defined(_PYTHON_VERSION_NONSUPPORTED)
 
 # Automatically generates FLAVORS if empty
-.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
+.  if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
 .  undef _VALID_PYTHON_VERSIONS
-.  for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
+.    for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}
-.    if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
+.      if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
 		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
 		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
-.      if empty(_VALID_PYTHON_VERSIONS:M${ver})
+.        if empty(_VALID_PYTHON_VERSIONS:M${ver})
 _VALID_PYTHON_VERSIONS+=	${ver}
+.        endif
 .      endif
-.    endif
-.  endfor
+.    endfor
 # Get all possible flavors depending on version requirements
-.  if defined(_VALID_PYTHON_VERSIONS)
+.    if defined(_VALID_PYTHON_VERSIONS)
 _ALL_PYTHON_FLAVORS=	${_VALID_PYTHON_VERSIONS:S/.//:S/^/py/}
-.  else
+.    else
 _ALL_PYTHON_FLAVORS=	${_PYTHON_VERSIONS:S/.//:S/^/py/}
-.  endif
+.    endif
 # Decide how many flavors we want.  By default, only generate the default
 # versions.
-.  if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS)
+.    if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS)
 FLAVORS=	${_ALL_PYTHON_FLAVORS}
-.  else
-.    for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT}
+.    else
+.      for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT}
 _f=	py${_v:S/.//}
-.      if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
-.if !empty(FLAVORS)
+.        if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
+.          if !empty(FLAVORS)
 FLAVORS:=	${FLAVORS} ${_f}
-.else
+.          else
 FLAVORS:=	${_f}
-.endif
-.      endif
-.    endfor
-.  endif
-.  if !empty(FLAVORS) && empty(FLAVOR)
+.          endif
+.        endif
+.      endfor
+.    endif
+.    if !empty(FLAVORS) && empty(FLAVOR)
 FLAVOR=	${FLAVORS:[1]}
+.    endif
 .  endif
-.endif
 
-.if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}
+.  if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}
 _PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
-.endif
+.  endif
 
-.if !empty(FLAVOR) && ${_PYTHON_VERSION} != ${PYTHON_DEFAULT}
-.if defined(_PYTHON_FEATURE_OPTSUFFIX)
+.  if !empty(FLAVOR) && ${_PYTHON_VERSION} != ${PYTHON_DEFAULT}
+.    if defined(_PYTHON_FEATURE_OPTSUFFIX)
 DEV_WARNING+=	"USE_PYTHON=optsuffix is deprecated, consider migrating to using unconditional PKGNAMESUFFIX or PKGNAMEPREFIX"
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
-.endif
-.endif
+.    endif
+.  endif
 
 # To avoid having dependencies with @ and empty flavor:
 # _PYTHON_VERSION is either set by (first that matches):
@@ -451,9 +451,9 @@ PYTHON_ABIVER=		# empty
 PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
 
 # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
-.if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
+.  if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
 .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
-.endif
+.  endif
 # Create a 5 integer version string, prefixing 0 to the minor and patch
 # tokens if it's a single character. Only use the the first 3 tokens of
 # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
@@ -462,29 +462,29 @@ PYTHON_REL=	${PYTHON_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/
 
 # Might be overridden by calling ports
 PYTHON_CMD?=		${_PYTHON_BASECMD}${_PYTHON_VERSION}
-.if ${PYTHON_VER} != 2.7
-.if exists(${PYTHON_CMD}-config)
+.  if ${PYTHON_VER} != 2.7
+.    if exists(${PYTHON_CMD}-config)
 PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
-.elif ${PYTHON_REL} < 30800
+.    elif ${PYTHON_REL} < 30800
 # Default ABI flags for lang/python37 port
 PYTHON_ABIVER=		m
-.endif
-.endif
+.    endif
+.  endif
 
-.if ${PYTHON_REL} >= 30807
+.  if ${PYTHON_REL} >= 30807
 PYTHON_EXT_SUFFIX=	.cpython-${PYTHON_SUFFIX}
-.else
+.  else
 PYTHON_EXT_SUFFIX=	# empty
-.endif
+.  endif
 
-.if ${PYTHON_MAJOR_VER} == 2
+.  if ${PYTHON_MAJOR_VER} == 2
 DEPRECATED?=	Uses Python 2.7 which is EOLed upstream
-.endif
+.  endif
 
-.if !defined(PYTHONBASE)
+.  if !defined(PYTHONBASE)
 PYTHONBASE!=	(${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
 			2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
-.endif
+.  endif
 _EXPORTED_VARS+=	PYTHONBASE
 
 PYTHON_INCLUDEDIR=	${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
@@ -514,55 +514,55 @@ _PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp
 # - it uses USE_PYTHON=distutils
 #
 
-.if defined(_PYTHON_FEATURE_CYTHON)
+.  if defined(_PYTHON_FEATURE_CYTHON)
 BUILD_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
-.endif
+.  endif
 
-.if defined(_PYTHON_FEATURE_CYTHON_RUN)
+.  if defined(_PYTHON_FEATURE_CYTHON_RUN)
 RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
-.endif
+.  endif
 
-.if defined(_PYTHON_FEATURE_CONCURRENT)
-.if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3*} || ${_PYTHON_VERSION_MAXIMUM:M2*})
+.  if defined(_PYTHON_FEATURE_CONCURRENT)
+.    if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3*} || ${_PYTHON_VERSION_MAXIMUM:M2*})
 DEV_WARNING+=	"USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"
-.endif
+.    endif
 _USES_POST+=		uniquefiles:dirs
-.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
+.    if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
 UNIQUE_DEFAULT_LINKS=	yes
-.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${_PYTHON_VERSION} == ${PYTHON_DEFAULT}
+.    elif !defined(_PYTHON_FEATURE_FLAVORS) && ${_PYTHON_VERSION} == ${PYTHON_DEFAULT}
 UNIQUE_DEFAULT_LINKS=	yes
-.else
+.    else
 UNIQUE_DEFAULT_LINKS=	no
-.endif
+.    endif
 UNIQUE_PREFIX=		${PYTHON_PKGNAMEPREFIX}
 UNIQUE_SUFFIX=		-${PYTHON_VER}
 UNIQUE_SUFFIX_TYPES+=	SUFFIX_MAN
 UNIQUE_SUFFIX_MAN_WITH_EXT=	.[1-9ln]
 UNIQUE_SUFFIX_MAN_EXTRA_EXT=	.gz
 
-.if defined(_PYTHON_FEATURE_AUTOPLIST)
+.    if defined(_PYTHON_FEATURE_AUTOPLIST)
 _UNIQUE_FIND_SUFFIX_FILES=	${SED} -e 's|^${PREFIX}/||' ${_PYTHONPKGLIST} ${TMPPLIST}
-.else
+.    else
 _UNIQUE_FIND_SUFFIX_FILES=	${SED} -e 's|^${PREFIX}/||' ${TMPPLIST} 2>/dev/null
-.endif
+.    endif
 UNIQUE_FIND_SUFFIX_FILES+=	${_UNIQUE_FIND_SUFFIX_FILES} | \
 				${EGREP} -he '^bin/.*$$|^sbin/.*$$|^libexec/.*$$'
 UNIQUE_FIND_SUFFIX_MAN_FILES+=	${_UNIQUE_FIND_SUFFIX_FILES} | \
 				${EGREP} -he '^man/man[1-9ln]/.*$$|^share/man/man[1-9ln]/.*$$'
-.endif # defined(_PYTHON_FEATURE_CONCURRENT)
+.  endif # defined(_PYTHON_FEATURE_CONCURRENT)
 
 _CURRENTPORT:=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-.if defined(_PYTHON_FEATURE_DISTUTILS) && \
+.  if defined(_PYTHON_FEATURE_DISTUTILS) && \
 	${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools &&\
 	${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools44
-.if ${PYTHON_VER} == 2.7
+.    if ${PYTHON_VER} == 2.7
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
-.else
+.    else
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
-.endif
-.endif
+.    endif
+.  endif
 
 # distutils support
 PYSETUP?=		setup.py
@@ -573,12 +573,12 @@ PYDISTUTILS_SETUP?=	-c \
 PYDISTUTILS_CONFIGUREARGS?=	# empty
 PYDISTUTILS_BUILDARGS?=		# empty
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
-.if defined(_PYTHON_FEATURE_DISTUTILS)
-. if !defined(PYDISTUTILS_INSTALLNOSINGLE)
+.  if defined(_PYTHON_FEATURE_DISTUTILS)
+.    if !defined(PYDISTUTILS_INSTALLNOSINGLE)
 PYDISTUTILS_INSTALLARGS+=	--single-version-externally-managed
-. endif
+.    endif
 PYDISTUTILS_INSTALLARGS+=	--root=${STAGEDIR}
-.endif
+.  endif
 PYDISTUTILS_INSTALLARGS:=	--record ${_PYTHONPKGLIST} \
 		${PYDISTUTILS_INSTALLARGS}
 
@@ -587,22 +587,22 @@ PYDISTUTILS_PKGVERSION?=${PORTVERSION}
 PYDISTUTILS_EGGINFO?=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
 PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
-.if !defined(_PYTHON_FEATURE_NOEGGINFO) && \
+.  if !defined(_PYTHON_FEATURE_NOEGGINFO) && \
 	!defined(_PYTHON_FEATURE_AUTOPLIST) && \
 	defined(_PYTHON_FEATURE_DISTUTILS) && \
 	defined(PYTHON_REL)
 _USES_stage+=	933:add-plist-egginfo
 add-plist-egginfo:
-. for egginfo in ${PYDISTUTILS_EGGINFO}
+.    for egginfo in ${PYDISTUTILS_EGGINFO}
 	if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \
 		${LS} ${PYDISTUTILS_EGGINFODIR}/${egginfo} | while read f; do \
 			${ECHO_CMD} ${PYDISTUTILS_EGGINFODIR:S;^${STAGEDIR}${PREFIX}/;;}/${egginfo}/$${f} >> ${TMPPLIST}; \
 		done; \
 	fi;
-. endfor
-.endif
+.    endfor
+.  endif
 
-.if defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
+.  if defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
 _RELSITELIBDIR=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
 _RELLIBDIR=		${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
 
@@ -616,8 +616,8 @@ add-plist-pymod:
 		-e 's|[[:alnum:]|[:space:]]*/\.\./*||g; s|/\./|/|g' \
 		${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
 
-.else
-.if ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
+.  else
+.    if ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
 # When Python version is 3.2+ we rewrite all the filenames
 # of TMPPLIST that end with .py[co], so that they conform
 # to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
@@ -633,8 +633,8 @@ add-plist-python:
 		pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \
 		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
 	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
-.endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
-.endif # defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
+.    endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
+.  endif # defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
 
 # Fix for programs that build python from a GNU auto* environment
 CONFIGURE_ENV+=	PYTHON="${PYTHON_CMD}"
@@ -648,32 +648,32 @@ PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
 PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.21,1:math/py-numpy@${PY_FLAVOR}
 
 # Common Python modules that can be needed but only for some versions of Python.
-.if ${PYTHON_REL} < 30500
-.else
+.  if ${PYTHON_REL} < 30500
+.  else
 PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
-.endif
+.  endif
 
-.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
+.  if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PY_MERCURIAL=	${PYTHON_PKGNAMEPREFIX}mercurial>=5.9:devel/mercurial@${PY_FLAVOR}
-.else
+.  else
 PY_MERCURIAL=	mercurial>=5.9:devel/mercurial@${PY_FLAVOR}
-.endif
+.  endif
 
 CMAKE_ARGS+=	-DBOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX}
 PY_BOOST_LIB=	boost_python${PYTHON_SUFFIX}
 PY_BOOST=	lib${PY_BOOST_LIB}.so:devel/boost-python-libs@${PY_FLAVOR}
 
 # dependencies
-.for _stage in PATCH BUILD RUN TEST
-.  if defined(_PYTHON_${_stage}_DEP)
+.  for _stage in PATCH BUILD RUN TEST
+.    if defined(_PYTHON_${_stage}_DEP)
 ${_stage}_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 # set $PREFIX as Python's one
-.if defined(_PYTHON_FEATURE_PYTHONPREFIX)
+.  if defined(_PYTHON_FEATURE_PYTHONPREFIX)
 PREFIX=		${PYTHONBASE}
-.endif
+.  endif
 
 # Substitutions for pkg-plist
 # Use a short form of the PYTHONPREFIX_*DIR variables; we don't need the
@@ -686,11 +686,11 @@ PLIST_SUB+=	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
 		PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
 		PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERSION=${PYTHON_VERSION}
-.if ${PYTHON_REL} < 30000
+.  if ${PYTHON_REL} < 30000
 PLIST_SUB+=	PYTHON2="" PYTHON3="@comment "
-.else
+.  else
 PLIST_SUB+=	PYTHON2="@comment " PYTHON3=""
-.endif
+.  endif
 
 _USES_POST+=	python
 .endif # _INCLUDE_USES_PYTHON_MK
@@ -703,23 +703,23 @@ PYDISTUTILS_CONFIGURE_TARGET?=	config
 PYDISTUTILS_BUILD_TARGET?=	build
 PYDISTUTILS_INSTALL_TARGET?=	install
 
-.if defined(_PYTHON_FEATURE_DISTUTILS)
+.  if defined(_PYTHON_FEATURE_DISTUTILS)
 LDSHARED?=	${CC} -shared
 MAKE_ENV+=	LDSHARED="${LDSHARED}" PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE=
 
-.if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)
+.    if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)
 do-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS})
-.endif
+.    endif
 
-.if !target(do-build)
+.    if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})
-.endif
+.    endif
 
-.if !target(do-install)
+.    if !target(do-install)
 do-install:
 	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
-.endif
-.endif # defined(_PYTHON_FEATURE_DISTUTILS)
+.    endif
+.  endif # defined(_PYTHON_FEATURE_DISTUTILS)
 .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)
diff --git a/Mk/Uses/qmail.mk b/Mk/Uses/qmail.mk
index 1923cb329429..4bf431c53346 100644
--- a/Mk/Uses/qmail.mk
+++ b/Mk/Uses/qmail.mk
@@ -18,44 +18,44 @@ _INCLUDE_QMAIL_MK=	yes
 
 QMAIL_PREFIX?=	/var/qmail
 
-.if empty(qmail_ARGS)
+.  if empty(qmail_ARGS)
 qmail_ARGS=	both
-.endif
+.  endif
 
-.if ${qmail_ARGS} == "build"
+.  if ${qmail_ARGS} == "build"
 BUILD_DEPENDS+=	${_QMAIL_DEPENDS}
-.elif ${qmail_ARGS} == "run"
+.  elif ${qmail_ARGS} == "run"
 RUN_DEPENDS+=	${_QMAIL_DEPENDS}
-.elif ${qmail_ARGS} == "both"
+.  elif ${qmail_ARGS} == "both"
 BUILD_DEPENDS+=	${_QMAIL_DEPENDS}
 RUN_DEPENDS+=	${_QMAIL_DEPENDS}
-.elif ${qmail_ARGS} == "vars"
-.else
+.  elif ${qmail_ARGS} == "vars"
+.  else
 IGNORE=	USES=qmail - invalid args: [${qmail_ARGS}] specified
-.endif
+.  endif
 
-.if ${qmail_ARGS} != "vars"
+.  if ${qmail_ARGS} != "vars"
 
 _QMAIL_VALID_SLAVEPORTS=	ldap mysql spamcontrol tls
 
-.  if defined(QMAIL_SLAVEPORT)
-.    for slave in ${_QMAIL_VALID_SLAVEPORTS}
-.      if ${QMAIL_SLAVEPORT:tl} == ${slave}
+.    if defined(QMAIL_SLAVEPORT)
+.      for slave in ${_QMAIL_VALID_SLAVEPORTS}
+.        if ${QMAIL_SLAVEPORT:tl} == ${slave}
 _QMAIL_SLAVEPORT_OKAY=	true
-.      endif
-.    endfor
+.        endif
+.      endfor
 
-.    if !defined(_QMAIL_SLAVEPORT_OKAY)
+.      if !defined(_QMAIL_SLAVEPORT_OKAY)
 IGNORE=	Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${_QMAIL_VALID_SLAVEPORTS}
+.      endif
 .    endif
-.  endif
 
-.  if defined(QMAIL_SLAVEPORT)
+.    if defined(QMAIL_SLAVEPORT)
 _QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:mail/qmail-${QMAIL_SLAVEPORT:tl}
-.  else
+.    else
 _QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:mail/qmail
-.  endif
+.    endif
 
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index a91f4d407e46..7cecb91cb169 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -133,9 +133,9 @@ _USE_QT_ALL=		assistant dbus declarative declarative-test designer doc gui help
 			scripttools sql sql-mysql sql-odbc sql-pgsql \
 			sql-sqlite2 sql-sqlite3 svg testlib webkit \
 			xml xmlpatterns
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.  if ${ARCH} == amd64 || ${ARCH} == i386
 _USE_QT_ALL+=	sql-ibase
-.endif
+.  endif
 
 _USE_QT5_ONLY=		3d buildtools charts concurrent connectivity \
 			core datavis3d diag examples gamepad \
diff --git a/Mk/Uses/readline.mk b/Mk/Uses/readline.mk
index 129c5c910c6b..01b5ed09093b 100644
--- a/Mk/Uses/readline.mk
+++ b/Mk/Uses/readline.mk
@@ -8,9 +8,9 @@
 .if !defined(_INCLUDE_USES_READLINE_MK)
 _INCLUDE_USES_READLINE_MK=	yes
 
-.if !empty(readline_ARGS)
+.  if !empty(readline_ARGS)
 IGNORE= Incorrect 'USES+= readline:${readline_ARGS}' readline takes no arguments
-.endif
+.  endif
 
 LIB_DEPENDS+=		libreadline.so.8:devel/readline
 CPPFLAGS+=		-I${LOCALBASE}/include
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
index 101aa6439d68..c040d99fb374 100644
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -11,30 +11,30 @@
 .if !defined(_INCLUDE_USES_SAMBA_MK)
 _INCLUDE_USES_SAMBA_MK=   yes
 
-.if !${samba_ARGS}
+.  if !${samba_ARGS}
 samba_ARGS=	build run
-.endif
+.  endif
 
-.if ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
+.  if ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
 IGNORE=		USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
-.endif
+.  endif
 
 SAMBAPORT=	net/samba${SAMBA_DEFAULT:S/.//}
 SAMBAINCLUDES=	${LOCALBASE}/include/samba4
-.if ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13
+.  if ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13
 SAMBALIBS=	${LOCALBASE}/lib/samba4
-.else
+.  else
 IGNORE=		Invalid version of samba: ${SAMBA_DEFAULT}
-.endif
+.  endif
 
-.if ${samba_ARGS:Mbuild}
+.  if ${samba_ARGS:Mbuild}
 BUILD_DEPENDS+=	smbd:${SAMBAPORT}
-.endif
-.if ${samba_ARGS:Mlib}
+.  endif
+.  if ${samba_ARGS:Mlib}
 LIB_DEPENDS+=	libsmbclient.so:${SAMBAPORT}
-.endif
-.if ${samba_ARGS:Mrun}
+.  endif
+.  if ${samba_ARGS:Mrun}
 RUN_DEPENDS+=	smbd:${SAMBAPORT}
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/sdl.mk b/Mk/Uses/sdl.mk
index 76839cd5cc28..5289c3c02f25 100644
--- a/Mk/Uses/sdl.mk
+++ b/Mk/Uses/sdl.mk
@@ -70,43 +70,43 @@ _SDL_ttf2_LIB_DEPENDS=		libSDL2_ttf.so:graphics/sdl2_ttf
 _SDL_ttf2_REQUIRES=		sdl2
 
 # Basic checks
-.if !empty(sdl_ARGS)
+.  if !empty(sdl_ARGS)
 IGNORE=		USES=sdl takes no arguments
-.endif
+.  endif
 
-.if !defined(USE_SDL)
+.  if !defined(USE_SDL)
 IGNORE=		need to specify sdl component(s) with USE_SDL
-.endif
+.  endif
 
 # Expand implied dependencies on main SDL/SDL2 ports
 _USE_SDL=
-.for _component in ${USE_SDL}
-. if !${_SDL_USE_ALL:M${_component}}
+.  for _component in ${USE_SDL}
+.    if !${_SDL_USE_ALL:M${_component}}
 IGNORE=		uses unknown SDL component ${_component}
-. else
+.    else
 _USE_SDL+=	${_component} ${_SDL_${_component}_REQUIRES}
-. endif
-.endfor
+.    endif
+.  endfor
 
 # Provide LIB_DEPENDS
-.for _component in ${_USE_SDL:O:u}
+.  for _component in ${_USE_SDL:O:u}
 LIB_DEPENDS+=	${_SDL_${_component}_LIB_DEPENDS}
-.endfor
+.  endfor
 
 # Provide dependency on main SDL ports
-.if ${_USE_SDL:Msdl}
+.  if ${_USE_SDL:Msdl}
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl-config
 BUILD_DEPENDS+=	${SDL_CONFIG}:devel/sdl12
 CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 MAKE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
-.endif
+.  endif
 
-.if ${_USE_SDL:Msdl2}
+.  if ${_USE_SDL:Msdl2}
 SDL2_CONFIG?=	${LOCALBASE}/bin/sdl2-config
 BUILD_DEPENDS+=	${SDL2_CONFIG}:devel/sdl20
 CONFIGURE_ENV+=	SDL2_CONFIG=${SDL2_CONFIG}
 MAKE_ENV+=	SDL2_CONFIG=${SDL2_CONFIG}
-.endif
+.  endif
 
 # _INCLUDE_USES_SDL_MK
 .endif
diff --git a/Mk/Uses/shared-mime-info.mk b/Mk/Uses/shared-mime-info.mk
index 8f6bbca996c1..aa294cf5a208 100644
--- a/Mk/Uses/shared-mime-info.mk
+++ b/Mk/Uses/shared-mime-info.mk
@@ -9,9 +9,9 @@
 .if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK)
 _INCLUDE_USES_SHARED_MIME_INFO_MK=	yes
 
-.if !empty(shared-mime-info_ARGS)
+.  if !empty(shared-mime-info_ARGS)
 IGNORE=	USES=shared-mime-info does not require args
-.endif
+.  endif
 
 BUILD_DEPENDS+=	update-mime-database:misc/shared-mime-info
 RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk
index 95d0b0a87346..20dba5279964 100644
--- a/Mk/Uses/shebangfix.mk
+++ b/Mk/Uses/shebangfix.mk
@@ -38,10 +38,10 @@ _INCLUDE_USES_SHEBANGFIX_MK=	yes
 
 SHEBANG_LANG+=	bash java ksh perl php python ruby tcl tk
 
-.if ${USES:Mlua*}
+.  if ${USES:Mlua*}
 SHEBANG_LANG+=	lua
 lua_CMD?=	${LOCALBASE}/bin/${LUA_CMD}
-.endif
+.  endif
 
 tcl_OLD_CMD+=	/usr/bin/tclsh
 tcl_CMD?=	${TCLSH}
@@ -49,58 +49,58 @@ tcl_CMD?=	${TCLSH}
 tk_OLD_CMD+=	/usr/bin/wish
 tk_CMD?=	${WISH}
 
-.if ${USES:Mpython*}
+.  if ${USES:Mpython*}
 python_CMD?=	${PYTHON_CMD}
-.endif
+.  endif
 
 # Replace the same patterns for all langs and setup a default, that may have
 # been set already above with ?=.
-.for lang in ${SHEBANG_LANG}
+.  for lang in ${SHEBANG_LANG}
 ${lang}_CMD?= ${LOCALBASE}/bin/${lang}
 ${lang}_OLD_CMD+= "/usr/bin/env ${lang}"
 ${lang}_OLD_CMD+= /bin/${lang}
 ${lang}_OLD_CMD+= /usr/bin/${lang}
 ${lang}_OLD_CMD+= /usr/local/bin/${lang}
-.endfor
+.  endfor
 
-.for pyver in 2 3
+.  for pyver in 2 3
 python_OLD_CMD+= "/usr/bin/env python${pyver}"
 python_OLD_CMD+= /bin/python${pyver}
 python_OLD_CMD+= /usr/bin/python${pyver}
 python_OLD_CMD+= /usr/local/bin/python${pyver}
-.endfor
+.  endfor
 
-.for lang in ${SHEBANG_LANG}
-.  if !defined(${lang}_CMD)
+.  for lang in ${SHEBANG_LANG}
+.    if !defined(${lang}_CMD)
 IGNORE+=	missing definition for ${lang}_CMD
-.  endif
-.  if !defined(${lang}_OLD_CMD)
+.    endif
+.    if !defined(${lang}_OLD_CMD)
 IGNORE+=	missing definition for ${lang}_OLD_CMD
-.  endif
-.  for old_cmd in ${${lang}_OLD_CMD}
+.    endif
+.    for old_cmd in ${${lang}_OLD_CMD}
 _SHEBANG_REINPLACE_ARGS+=	-e "1s|^\#![[:space:]]*${old_cmd:C/\"//g}\([[:space:]]\)|\#!${${lang}_CMD}\1|"
 _SHEBANG_REINPLACE_ARGS+=	-e "1s|^\#![[:space:]]*${old_cmd:C/\"//g}$$|\#!${${lang}_CMD}|"
+.    endfor
 .  endfor
-.endfor
 
 _USES_patch+=	210:fix-shebang
 fix-shebang:
-.if defined(SHEBANG_REGEX)
+.  if defined(SHEBANG_REGEX)
 	@cd ${WRKSRC}; \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
-.endif
-.if defined(SHEBANG_GLOB)
-.  for f in ${SHEBANG_GLOB}
+.  endif
+.  if defined(SHEBANG_GLOB)
+.    for f in ${SHEBANG_GLOB}
 	@cd ${WRKSRC}; \
 		${FIND} . -type f -name '${f}' \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
-.  endfor
-.endif
-.if defined(SHEBANG_FILES)
+.    endfor
+.  endif
+.  if defined(SHEBANG_FILES)
 	@cd ${WRKSRC}; \
 		${FIND} ${SHEBANG_FILES} -type f \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/sqlite.mk b/Mk/Uses/sqlite.mk
index aaf2cf49f14c..40ce90c27b9c 100644
--- a/Mk/Uses/sqlite.mk
+++ b/Mk/Uses/sqlite.mk
@@ -6,17 +6,17 @@
 .if !defined(_INCLUDE_USES_SQLITE_MK)
 _INCLUDE_USES_SQLITE_MK=	yes
 
-.if !empty(sqlite_ARGS)
+.  if !empty(sqlite_ARGS)
 SQLITE_VER=	${sqlite_ARGS}
-.endif
+.  endif
 SQLITE_VER?=	3
 
-.if ${SQLITE_VER} == 3
+.  if ${SQLITE_VER} == 3
 LIB_DEPENDS+=	libsqlite3.so:databases/sqlite${SQLITE_VER}
-.elif ${SQLITE_VER} == 2
+.  elif ${SQLITE_VER} == 2
 LIB_DEPENDS+=	libsqlite.so:databases/sqlite${SQLITE_VER}
-.else
+.  else
 IGNORE=		cannot install: unknown SQLite version: ${SQLITE_VER}
-.endif
+.  endif
 
 .endif
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 1b658ce18101..bec40d7bc99a 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -26,44 +26,44 @@
 .if !defined(_INCLUDE_USES_SSL_MK)
 _INCLUDE_USES_SSL_MK=	yes
 
-.if !empty(ssl_ARGS:Nbuild:Nrun)
+.  if !empty(ssl_ARGS:Nbuild:Nrun)
 IGNORE=	"USES=ssl invalid arguments ${ssl_ARGS}."
-.endif
+.  endif
 
-.if empty(ssl_ARGS) || (!empty(ssl_ARGS:Mbuild) && !empty(ssl_ARGS:Mrun))
+.  if empty(ssl_ARGS) || (!empty(ssl_ARGS:Mbuild) && !empty(ssl_ARGS:Mrun))
 _SSL_BUILD_DEP=	1
 _SSL_RUN_DEP=	1
-.elif !empty(ssl_ARGS:Mbuild)
+.  elif !empty(ssl_ARGS:Mbuild)
 _SSL_BUILD_DEP=	1
-.elif !empty(ssl_ARGS:Mrun)
+.  elif !empty(ssl_ARGS:Mrun)
 _SSL_RUN_DEP=	1
-.endif
+.  endif
 
-.if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}}
-.  if defined(BROKEN_SSL_REASON_${SSL_DEFAULT})
+.  if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}}
+.    if defined(BROKEN_SSL_REASON_${SSL_DEFAULT})
 BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON_${SSL_DEFAULT}}
-.  elif defined(BROKEN_SSL_REASON)
+.    elif defined(BROKEN_SSL_REASON)
 BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON}
-.  else
+.    else
 BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
+.    endif
 .  endif
-.endif
 
-.if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}}
-.  if defined(IGNORE_SSL_REASON_${SSL_DEFAULT})
+.  if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}}
+.    if defined(IGNORE_SSL_REASON_${SSL_DEFAULT})
 IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON_${SSL_DEFAULT}}
-.  elif defined(IGNORE_SSL_REASON)
+.    elif defined(IGNORE_SSL_REASON)
 IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON}
-.  else
+.    else
 IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
+.    endif
 .  endif
-.endif
 
-.if ${SSL_DEFAULT} == base
+.  if ${SSL_DEFAULT} == base
 OPENSSLBASE=		/usr
 OPENSSLDIR?=		/etc/ssl
 
-.  if !exists(${DESTDIR}/usr/lib/libcrypto.so)
+.    if !exists(${DESTDIR}/usr/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of"
 	@${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your"
@@ -72,17 +72,17 @@ check-depends::
 	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
 	@${ECHO_CMD} "OpenSSL distribution."
 	@${FALSE}
-.  endif
-.  if exists(${LOCALBASE}/lib/libcrypto.so)
+.    endif
+.    if exists(${LOCALBASE}/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
 	@${ECHO_CMD} "base system. You can't build against it, while a newer"
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
 	@${FALSE}
-.  endif
+.    endif
 
-.else # ${SSL_DEFAULT} != base
+.  else # ${SSL_DEFAULT} != base
 
 OPENSSLBASE=		${LOCALBASE}
 
@@ -91,20 +91,20 @@ OPENSSL_PORT=		security/${SSL_DEFAULT}
 # Get OPENSSL_SHLIBVER from the port
 .sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>
 
-.  if !defined(OPENSSL_SHLIBVER)
+.    if !defined(OPENSSL_SHLIBVER)
 .error You are using an unsupported SSL provider ${SSL_DEFAULT}
-.  endif
+.    endif
 
 OPENSSLDIR?=		${OPENSSLBASE}/openssl
-.  if defined(_SSL_BUILD_DEP)
+.    if defined(_SSL_BUILD_DEP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
-.  endif
-.  if defined(_SSL_RUN_DEP)
+.    endif
+.    if defined(_SSL_RUN_DEP)
 RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
-.  endif
+.    endif
 OPENSSLRPATH=		${LOCALBASE}/lib
 
-.endif
+.  endif
 
 OPENSSLLIB=		${OPENSSLBASE}/lib
 OPENSSLINC=		${OPENSSLBASE}/include
@@ -114,13 +114,13 @@ MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
 MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
 MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
 
-.if defined(OPENSSLRPATH)
-.  if defined(USE_OPENSSL_RPATH)
+.  if defined(OPENSSLRPATH)
+.    if defined(USE_OPENSSL_RPATH)
 CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
-.  endif
+.    endif
 MAKE_ENV+=		OPENSSLRPATH=${OPENSSLRPATH}
 OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
-.endif
+.  endif
 
 LDFLAGS+=		${OPENSSL_LDFLAGS}
 
diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk
index 5146c66b8e09..a847cb540616 100644
--- a/Mk/Uses/tar.mk
+++ b/Mk/Uses/tar.mk
@@ -8,27 +8,27 @@
 .if !defined(_INCLUDE_USES_TAR_MK)
 _INCLUDE_USES_TAR_MK=	yes
 
-.if ${tar_ARGS} == xz
+.  if ${tar_ARGS} == xz
 EXTRACT_SUFX?=	.tar.xz
-.elif ${tar_ARGS} == lz
+.  elif ${tar_ARGS} == lz
 EXTRACT_SUFX?=	.tar.lz
-.elif ${tar_ARGS} == lzma
+.  elif ${tar_ARGS} == lzma
 EXTRACT_SUFX?=	.tar.lzma
-.elif ${tar_ARGS} == txz
+.  elif ${tar_ARGS} == txz
 EXTRACT_SUFX?=	.txz
-.elif ${tar_ARGS} == bzip2 || ${tar_ARGS} == bz2
+.  elif ${tar_ARGS} == bzip2 || ${tar_ARGS} == bz2
 EXTRACT_SUFX?=	.tar.bz2
-.elif ${tar_ARGS} == tgz
+.  elif ${tar_ARGS} == tgz
 EXTRACT_SUFX?=	.tgz
-.elif ${tar_ARGS} == tbz
+.  elif ${tar_ARGS} == tbz
 EXTRACT_SUFX?=	.tbz
-.elif ${tar_ARGS} == tbz2
+.  elif ${tar_ARGS} == tbz2
 EXTRACT_SUFX?=	.tbz2
-.elif ${tar_ARGS} == Z
+.  elif ${tar_ARGS} == Z
 EXTRACT_SUFX?=	.tar.Z
-.elif empty(tar_ARGS)
+.  elif empty(tar_ARGS)
 EXTRACT_SUFX?=	.tar
-.else
+.  else
 IGNORE=	Incorrect 'USES+=tar:${tar_ARGS}'
-.endif
+.  endif
 .endif
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 4ff56439b635..e9dc233fd889 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -57,9 +57,9 @@
 # MAINTAINER: tcltk@FreeBSD.org
 
 .if ${USES:Mtk} || ${USES:Mtk\:*}
-.if !defined(_TCLTK_PORT)
+.  if !defined(_TCLTK_PORT)
 _TCLTK_IGNORE=	yes
-.endif
+.  endif
 .endif
 
 .if !defined(_INCLUDE_USES_TCL_MK) && !defined(_TCLTK_IGNORE)
@@ -77,9 +77,9 @@ _TCLTK_VALID_VERSIONS=	85 86 87
 # valid versions.
 #
 _TCLTK_DEFAULT_VERSION=	${TCLTK_DEFAULT:S/.//}
-.if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
+.  if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
 IGNORE=	Invalid tcltk version ${TCLTK_DEFAULT}
-.endif
+.  endif
 
 #
 # _TCLTK_PORT tells us whether we're depending on Tcl or Tk. When using
@@ -90,75 +90,75 @@ _TCLTK_PORT?=	tcl
 #
 # Parse a ver+ argument.
 #
-.if ${tcl_ARGS:M*+}
+.  if ${tcl_ARGS:M*+}
 _TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
 _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
-.if ${_TCLTK_MIN_VERSION} == "85"
+.    if ${_TCLTK_MIN_VERSION} == "85"
 IGNORE=	Minimum tcltk version 85+ is meaningless
-.endif
-.endif
+.    endif
+.  endif
 
 #
 # Parse one or more ver arguments.
 #
-.if ${tcl_ARGS:M8[5-7]}
+.  if ${tcl_ARGS:M8[5-7]}
 _TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[5-7]}
-.endif
+.  endif
 
 #
 # It makes little sense to specify both the wrapper and a specific version.
 #
-.if ${tcl_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS)
+.  if ${tcl_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS)
 IGNORE=	USES=${_TCLTK_PORT}: it is not possible to specify both a version and the wrapper: ${tcl_ARGS}
-.endif
+.  endif
 
 #
 # If no version was specified with any of the ver or ver+ arguments, set the
 # default version.
 #
-.if !defined(_TCLTK_WANTED_VERSIONS)
+.  if !defined(_TCLTK_WANTED_VERSIONS)
 _TCLTK_WANTED_VERSIONS=	${_TCLTK_DEFAULT_VERSION}
-.endif
+.  endif
 
 # 
 # Resolve minimum versions (ver+). Append anything greater or equal than the
 # specified minimum version to the list of wanted versions.
 #
-.if defined(_TCLTK_MIN_VERSION)
-.  for _v in ${_TCLTK_VALID_VERSIONS}
-.    if ${_TCLTK_MIN_VERSION} <= ${_v}
+.  if defined(_TCLTK_MIN_VERSION)
+.    for _v in ${_TCLTK_VALID_VERSIONS}
+.      if ${_TCLTK_MIN_VERSION} <= ${_v}
 _TCLTK_WANTED_VERSIONS+=${_v}
-.    endif
-.  endfor
-.endif
+.      endif
+.    endfor
+.  endif
 
 #
 # Right now we have built a list of potential versions that we may depend on.
 # Let's sort them and remove any duplicates. We then locate the highest one
 # already installed, if any.
 #
-.for _v in ${_TCLTK_WANTED_VERSIONS:O:u}
+.  for _v in ${_TCLTK_WANTED_VERSIONS:O:u}
 _TCLTK_HIGHEST_VERSION:=${_v}
-.  if exists(${LOCALBASE}/lib/lib${_TCLTK_PORT}${_v}.so)
+.    if exists(${LOCALBASE}/lib/lib${_TCLTK_PORT}${_v}.so)
 _TCLTK_WANTED_VERSION:=	${_v}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 #
 # If we couldn't find any wanted version installed, depend on the default or the highest one.
-.if !defined(_TCLTK_WANTED_VERSION)
-.  if ${_TCLTK_WANTED_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
+.  if !defined(_TCLTK_WANTED_VERSION)
+.    if ${_TCLTK_WANTED_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
 _TCLTK_WANTED_VERSION:=	${_TCLTK_DEFAULT_VERSION}
-.  else
+.    else
 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION}
+.    endif
 .  endif
-.endif
 
 #
 # Deprecate by default all ports depending on 8.5
-.if ${_TCLTK_WANTED_VERSION} == "85"
+.  if ${_TCLTK_WANTED_VERSION} == "85"
 DEPRECATED=	Tcl/Tk 8.5 is nearing EOL, please consider porting to Tcl/Tk 8.6
-.endif
+.  endif
 
 #
 # Exported variables
@@ -169,13 +169,13 @@ TCLSH:=		${LOCALBASE}/bin/tclsh${TCL_VER}
 TCL_LIBDIR:=	${LOCALBASE}/lib/tcl${TCL_VER}
 TCL_INCLUDEDIR:=${LOCALBASE}/include/tcl${TCL_VER}
 
-.if ${_TCLTK_PORT} == "tk"
+.  if ${_TCLTK_PORT} == "tk"
 TK_VER:=	${_TCLTK_WANTED_VERSION:S/8/8./}
 TK_SHLIB_VER:=	${_TCLTK_WANTED_VERSION}
 WISH:=		${LOCALBASE}/bin/wish${TCL_VER}
 TK_LIBDIR:=	${LOCALBASE}/lib/tk${TK_VER}
 TK_INCLUDEDIR:=	${LOCALBASE}/include/tk${TK_VER}
-.endif
+.  endif
 
 #
 # Dependencies
@@ -185,47 +185,47 @@ _TCLTK_RUN_DEPENDS=
 _TCLTK_LIB_DEPENDS=
 
 # Construct the correct dependency lines (wrapper)
-.if ${tcl_ARGS:Mwrapper}
-.  if ${_TCLTK_PORT} == "tcl"
+.  if ${tcl_ARGS:Mwrapper}
+.    if ${_TCLTK_PORT} == "tcl"
 _TCLTK_WRAPPER_PORT=	tclsh:lang/tcl-wrapper
-.  elif ${_TCLTK_PORT} == "tk"
+.    elif ${_TCLTK_PORT} == "tk"
 _TCLTK_WRAPPER_PORT=	wish:x11-toolkits/tk-wrapper
+.    endif
 .  endif
-.endif
 
 # Construct the correct dependency lines (Tcl/Tk)
-.if ${_TCLTK_PORT} == "tcl"
+.  if ${_TCLTK_PORT} == "tcl"
 _TCLTK_EXE_LINE=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
 _TCLTK_LIB_LINE=	libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
-.elif ${_TCLTK_PORT} == "tk"
+.  elif ${_TCLTK_PORT} == "tk"
 _TCLTK_EXE_LINE=	wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
 _TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION} \
 			libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
-.endif
+.  endif
 
-.if ${tcl_ARGS:Mbuild}
+.  if ${tcl_ARGS:Mbuild}
 BUILD_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
-.elif ${tcl_ARGS:Mrun}
+.  elif ${tcl_ARGS:Mrun}
 RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
-.else
+.  else
 RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT}
 LIB_DEPENDS+=	${_TCLTK_LIB_LINE}
-.endif
+.  endif
 
 # Setup TEA stuff
-.if ${tcl_ARGS:Mtea}
+.  if ${tcl_ARGS:Mtea}
 GNU_CONFIGURE=	yes
 TCL_PKG?=	${PORTNAME:C/^tcl(-?)//:C/(-?)tcl\$//}${PORTVERSION}
 PLIST_SUB+=	TCL_PKG=${TCL_PKG}
 CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
 		--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR}
-.  if ${_TCLTK_PORT} == "tk"
+.    if ${_TCLTK_PORT} == "tk"
 CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR}
+.    endif
 .  endif
-.endif
 
 .endif # defined(_INCLUDE_USES_TCL_MK)
 
diff --git a/Mk/Uses/terminfo.mk b/Mk/Uses/terminfo.mk
index 02d496a8f0ae..67efd0e295f8 100644
--- a/Mk/Uses/terminfo.mk
+++ b/Mk/Uses/terminfo.mk
@@ -7,9 +7,9 @@
 .if !defined(_INCLUDE_USES_TERMINFO_MK)
 _INCLUDE_USES_TERMINFO_MK=	yes
 
-.if !empty(terminfo_ARGS)
+.  if !empty(terminfo_ARGS)
 IGNORE=	USES=terminfo does not require args
-.endif
+.  endif
 
 PLIST_FILES+=	@terminfo
 
diff --git a/Mk/Uses/trigger.mk b/Mk/Uses/trigger.mk
index bd83691418b6..c43fba595a1b 100644
--- a/Mk/Uses/trigger.mk
+++ b/Mk/Uses/trigger.mk
@@ -10,20 +10,20 @@
 .if !defined(_INCLUDE_USES_TRIGGER_MK)
 _INCLUDE_USES_TRIGGER_MK=	yes
 
-.if !empty(trigger_ARGS)
+.  if !empty(trigger_ARGS)
 IGNORE=	Incorrect 'USES+= trigger:${trigger_ARGS}' trigger takes no arguments
-.endif
+.  endif
 
 TRIGGERS?=	${PORTNAME}
-.for t in ${TRIGGERS}
+.  for t in ${TRIGGERS}
 SUB_FILES+=	${t}.ucl
 PLIST_FILES+=	${LOCALBASE}/share/pkg/triggers/$t.ucl
-.endfor
+.  endfor
 
 _USES_install+=	601:trigger-post-install
 trigger-post-install:
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pkg/triggers
-.for t in ${TRIGGERS}
+.  for t in ${TRIGGERS}
 	${INSTALL_DATA} ${WRKDIR}/$t.ucl ${STAGEDIR}${LOCALBASE}/share/pkg/triggers/
-.endfor
+.  endfor
 .endif
diff --git a/Mk/Uses/uidfix.mk b/Mk/Uses/uidfix.mk
index 2c35530c94f8..b8828d4a8a29 100644
--- a/Mk/Uses/uidfix.mk
+++ b/Mk/Uses/uidfix.mk
@@ -8,10 +8,10 @@
 
 .if !defined(_INCLUDE_USES_UIDFIX_MK)
 _INCLUDE_USES_UIDFIX_MK=	yes
-.if !defined(GID)
+.  if !defined(GID)
 GID!=	id -g
-.endif
-.if ${UID} != 0
+.  endif
+.  if ${UID} != 0
 MAKE_ENV+=	BINOWN=${UID} SHAREOWN=${UID} CONFOWN=${UID} LIBOWN=${UID}
 MAKE_ENV+=	BINGRP=${GID} SHAREGRP=${GID} CONFGRP=${GID} LIBGRP=${GID}
 MAKE_ENV+=	INCSOWN=${UID} INCSGRP=${GID}
@@ -25,5 +25,5 @@ SHAREGRP=	${GID}
 WWWGRP=	${GID}
 INCSOWN=	${UID}
 INCSGRP=	${GID}
-.endif
+.  endif
 .endif
diff --git a/Mk/Uses/uniquefiles.mk b/Mk/Uses/uniquefiles.mk
index d99c4ebbca41..18b7f35adfb9 100644
--- a/Mk/Uses/uniquefiles.mk
+++ b/Mk/Uses/uniquefiles.mk
@@ -82,13 +82,13 @@ UNIQUE_SUFFIX_FILES?=	# empty
 
 UNIQUE_SUFFIX_TYPES+=	SUFFIX
 
-.if ${uniquefiles_ARGS:Mdirs}
+.  if ${uniquefiles_ARGS:Mdirs}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUE_PREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUE_PREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${UNIQUE_PREFIX}${PORTNAME}
 WWWDIR=		${PREFIX}/www/${UNIQUE_PREFIX}${PORTNAME}
 ETCDIR=		${PREFIX}/etc/${UNIQUE_PREFIX}${PORTNAME}
-.endif
+.  endif
 
 UNIQUE_DEFAULT_LINKS?=		no
 UNIQUE_FIND_PREFIX_FILES?=	# empty
@@ -102,24 +102,24 @@ _INCLUDE_USES_UNIQUEFILES_POST_MK=     yes
 
 _UNIQUEPKGLIST=		${WRKDIR}/.PLIST.uniquefiles
 
-.if ${UNIQUE_DEFAULT_LINKS} == yes
+.  if ${UNIQUE_DEFAULT_LINKS} == yes
 _DO_CONDITIONAL_SYMLINK=	\
 	if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} -a ! -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 		${ECHO_MSG} "Link: @$${fname} --> $${newf}"; \
 		${RLN} ${STAGEDIR}${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \
 		${ECHO_CMD} LINKED:$${newf}%%EXTRA_EXT%%:$${fname}%%EXTRA_EXT%% >> ${_UNIQUEPKGLIST}; \
 	fi
-.else
+.  else
 # We are not symlinking the renamed binary.
 _DO_CONDITIONAL_SYMLINK=	${DO_NADA}
-.endif
+.  endif
 
 _USES_stage+=	775:move-uniquefiles
 move-uniquefiles:
-.if ${UNIQUE_PREFIX_FILES} || ${UNIQUE_FIND_PREFIX_FILES}
+.  if ${UNIQUE_PREFIX_FILES} || ${UNIQUE_FIND_PREFIX_FILES}
 	@${ECHO_MSG} "===> Creating unique files: Move files needing PREFIX";
-.endif
-.for entry in ${UNIQUE_PREFIX_FILES}
+.  endif
+.  for entry in ${UNIQUE_PREFIX_FILES}
 	@fname=${entry}; \
 	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 		newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \
@@ -131,8 +131,8 @@ move-uniquefiles:
 		${ECHO_MSG} "Makefile error: UNIQUE (prefix): $${fname} not found"; \
 		${FALSE}; \
 	fi;
-.endfor
-.if ${UNIQUE_FIND_PREFIX_FILES}
+.  endfor
+.  if ${UNIQUE_FIND_PREFIX_FILES}
 	@for fname in `${UNIQUE_FIND_PREFIX_FILES}`; do \
 		if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 			newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \
@@ -145,18 +145,18 @@ move-uniquefiles:
 			${FALSE}; \
 		fi; \
 	done;
-.endif
+.  endif
 
-.for sufxtype in ${UNIQUE_SUFFIX_TYPES}
-.  if (defined(UNIQUE_${sufxtype}_FILES) && ${UNIQUE_${sufxtype}_FILES}) || \
+.  for sufxtype in ${UNIQUE_SUFFIX_TYPES}
+.    if (defined(UNIQUE_${sufxtype}_FILES) && ${UNIQUE_${sufxtype}_FILES}) || \
      (defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES})
-.    if defined(UNIQUE_${sufxtype}_WITH_EXT) && ${UNIQUE_${sufxtype}_WITH_EXT}
+.      if defined(UNIQUE_${sufxtype}_WITH_EXT) && ${UNIQUE_${sufxtype}_WITH_EXT}
 	@${ECHO_MSG} "===> Creating unique files: Move ${sufxtype:S|SUFFIX_||} files needing SUFFIX";
-.    else
+.      else
 	@${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX";
+.      endif
 .    endif
-.  endif
-.  for entry in ${UNIQUE_${sufxtype}_FILES}
+.    for entry in ${UNIQUE_${sufxtype}_FILES}
 	@fname=${entry}; \
 	if [ -n "${UNIQUE_${sufxtype}_EXTRA_EXT}" ]; then \
 		fname=$${fname%${UNIQUE_${sufxtype}_EXTRA_EXT}}; \
@@ -172,8 +172,8 @@ move-uniquefiles:
 		${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \
 		${FALSE}; \
 	fi;
-.  endfor
-.  if defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES}
+.    endfor
+.    if defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES}
 	@for fname in `${UNIQUE_FIND_${sufxtype}_FILES}`; do \
 		if [ -n "${UNIQUE_${sufxtype}_EXTRA_EXT}" ]; then \
 			fname=$${fname%${UNIQUE_${sufxtype}_EXTRA_EXT}}; \
@@ -190,8 +190,8 @@ move-uniquefiles:
 			${FALSE}; \
 		fi; \
 	done;
-.  endif
-.endfor
+.    endif
+.  endfor
 
 # Using .if exists(${_UNIQUEPKGPLIST} below instead of the sh test
 # does not work in poudriere. It works fine on the CLI, though...
diff --git a/Mk/Uses/varnish.mk b/Mk/Uses/varnish.mk
index a19b0d0666e2..495aa1161446 100644
--- a/Mk/Uses/varnish.mk
+++ b/Mk/Uses/varnish.mk
@@ -11,14 +11,14 @@ _INCLUDE_USES_VARNISH_MK=    yes
 
 VARNISH_VERSION=	${VARNISH_DEFAULT}
 
-. if ${varnish_ARGS:M4}
+.  if ${varnish_ARGS:M4}
 VARNISH_VERSION=	4
-. elif ${varnish_ARGS:M6}
+.  elif ${varnish_ARGS:M6}
 VARNISH_VERSION=	6
-. elif ${varnish_ARGS:M7}
+.  elif ${varnish_ARGS:M7}
 VARNISH_VERSION=	7
-. elif defined(VARNISH_DEFAULT)
-. endif
+.  elif defined(VARNISH_DEFAULT)
+.  endif
 
 RUN_DEPENDS+=	varnish${VARNISH_VERSION}>=${VARNISH_VERSION}:www/varnish${VARNISH_VERSION}
 BUILD_DEPENDS+=	varnish${VARNISH_VERSION}>=${VARNISH_VERSION}:www/varnish${VARNISH_VERSION}
diff --git a/Mk/Uses/waf.mk b/Mk/Uses/waf.mk
index 8c18b2585772..06b41c02304e 100644
--- a/Mk/Uses/waf.mk
+++ b/Mk/Uses/waf.mk
@@ -15,14 +15,14 @@
 .if !defined(_INCLUDE_USES_WAF_MK)
 _INCLUDE_USES_WAF_MK=	yes
 
-.if !empty(waf_ARGS)
+.  if !empty(waf_ARGS)
 IGNORE=	Incorrect 'USES+= waf:${waf_ARGS}' waf takes no arguments
-.endif
+.  endif
 
-.if !${USES:Mpython*}
+.  if !${USES:Mpython*}
 python_ARGS=	build
 .include "${USESDIR}/python.mk"
-.endif
+.  endif
 
 MAKEFILE=	#
 MAKE_FLAGS=	#
diff --git a/Mk/Uses/webplugin.mk b/Mk/Uses/webplugin.mk
index c34371ca947d..ff276cb27f0b 100644
--- a/Mk/Uses/webplugin.mk
+++ b/Mk/Uses/webplugin.mk
@@ -112,41 +112,41 @@ _WEBPLUGIN_APPS_ALL=		${_WEBPLUGIN_APPS_ALL_LINUX} \
 				${_WEBPLUGIN_APPS_ALL_NATIVE}
 
 _WEBPLUGIN_TEST=	${_WEBPLUGIN_APPS_ALL}
-.if ${webplugin_ARGS} == all || empty(webplugin_ARGS)
+.  if ${webplugin_ARGS} == all || empty(webplugin_ARGS)
 _WEBPLUGIN_PATTERN=	*
-.elif ${webplugin_ARGS} == native
+.  elif ${webplugin_ARGS} == native
 _WEBPLUGIN_PATTERN=	*
 _WEBPLUGIN_TEST=	${_WEBPLUGIN_APPS_ALL_NATIVE}
-.elif ${webplugin_ARGS} == linux
+.  elif ${webplugin_ARGS} == linux
 _WEBPLUGIN_PATTERN=	*
 _WEBPLUGIN_TEST=	${_WEBPLUGIN_APPS_ALL_LINUX}
-.else
+.  else
 _WEBPLUGIN_PATTERN=	${webplugin_ARGS}
-.endif
+.  endif
 
-.if !defined(WEBPLUGIN_FILES)
+.  if !defined(WEBPLUGIN_FILES)
 IGNORE=	Cannot be installed: WEBPLUGIN_FILES is empty. Please, add plug-in files to it
-.endif
+.  endif
 
-.for _TEMP_APP__ in ${_WEBPLUGIN_APPS_ALL}
+.  for _TEMP_APP__ in ${_WEBPLUGIN_APPS_ALL}
 _TEMP_APP_=${_TEMP_APP__}
 _TEMP_FLAG_=0
-.	for _TEMP_USE__ in ${USE_webplugin}
+.    for _TEMP_USE__ in ${USE_webplugin}
 _TEMP_USE_=${_TEMP_USE__}
-.		if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \
+.      if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \
 		( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \
 		( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} )
 _TEMP_FLAG_=1
-.		endif
-.	endfor
-.	if	${_TEMP_FLAG_}
+.      endif
+.    endfor
+.    if	${_TEMP_FLAG_}
 USE_WEBPLUGIN_EXP+=	${_TEMP_APP__}
-.	endif
-.endfor
+.    endif
+.  endfor
 
-.for p in ${_WEBPLUGIN_PATTERN}
+.  for p in ${_WEBPLUGIN_PATTERN}
 _WEBPLUGIN_MATCHED+=	${_WEBPLUGIN_TEST:M${p}}
-.endfor
+.  endfor
 
 _WEBPLUGIN_LIBDIR=		${LOCALBASE}/lib/browser_plugins
 _WEBPLUGIN_SLDIR=		${_WEBPLUGIN_LIBDIR}/symlinks
@@ -159,18 +159,18 @@ _WEBPLUGIN_LINKFARMS=	${_WEBPLUGIN_APPS} ${_WEBPLUGIN_SLDIRS}
 WEBPLUGIN_DIR?=		${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
 
 PLIST_SUB+=		WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}"
-.for d in ${_WEBPLUGIN_LINKFARMS}
-.for l in ${WEBPLUGIN_FILES}
+.  for d in ${_WEBPLUGIN_LINKFARMS}
+.    for l in ${WEBPLUGIN_FILES}
 PLIST_FILES+=	${d}/${l}
-.endfor
-.endfor
+.    endfor
+.  endfor
 
 _USES_install+=	600:webplugin-post-install
 webplugin-post-install:
-.for d in ${_WEBPLUGIN_LINKFARMS}
+.  for d in ${_WEBPLUGIN_LINKFARMS}
 	${MKDIR} ${STAGEDIR}${d}
-.for l in ${WEBPLUGIN_FILES}
+.    for l in ${WEBPLUGIN_FILES}
 	${LN} -sf ${l:S,^,${WEBPLUGIN_DIR}/,} ${STAGEDIR}${d}/
-.endfor
-.endfor
+.    endfor
+.  endfor
 .endif
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index 15243f343de6..b23ab076ef76 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -42,40 +42,40 @@ thunar_USE_XFCE_REQ=	xfconf libmenu
 xfconf_LIB_DEPENDS=	libxfconf-0.so:x11/xfce4-conf
 xfconf_USE_XFCE_REQ=	libutil
 
-.if defined(USE_XFCE)
+.  if defined(USE_XFCE)
 # First, expand all USE_XFCE_REQ recursively.
-.for comp in ${_USE_XFCE_ALL}
-. for subcomp in ${${comp}_USE_XFCE_REQ}
+.    for comp in ${_USE_XFCE_ALL}
+.      for subcomp in ${${comp}_USE_XFCE_REQ}
 ${comp}_USE_XFCE_REQ+=${${subcomp}_USE_XFCE_REQ}
-. endfor
-.endfor
+.      endfor
+.    endfor
 
 # Then, use already expanded USE_XFCE_REQ to expand USE_XFCE.
-.for comp in ${USE_XFCE}
-. if ${_USE_XFCE_ALL:M${comp}} == ""
+.    for comp in ${USE_XFCE}
+.      if ${_USE_XFCE_ALL:M${comp}} == ""
 IGNORE=	cannot install: Unknown component ${comp}
-. endif
+.      endif
 _USE_XFCE+=	${${comp}_USE_XFCE_REQ} ${comp}
-.endfor
+.    endfor
 
 # Remove duplicate components
 USE_XFCE=	${_USE_XFCE:O:u}
 
-.for comp in ${USE_XFCE}
-. if defined(${comp}_BUILD_DEPENDS)
+.    for comp in ${USE_XFCE}
+.      if defined(${comp}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
-. endif
+.      endif
 
-. if defined(${comp}_LIB_DEPENDS)
+.      if defined(${comp}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
-. endif
+.      endif
 
-. if defined(${comp}_RUN_DEPENDS)
+.      if defined(${comp}_RUN_DEPENDS)
 RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
-. endif
-.endfor
+.      endif
+.    endfor
 
-.endif # end of defined(USE_XFCE)
+.  endif # end of defined(USE_XFCE)
 
 .endif
 
diff --git a/Mk/Uses/zip.mk b/Mk/Uses/zip.mk
index 4f5bbdb78eef..b137fa0b2688 100644
--- a/Mk/Uses/zip.mk
+++ b/Mk/Uses/zip.mk
@@ -13,13 +13,13 @@ EXTRACT_SUFX?=	.zip
 EXTRACT_BEFORE_ARGS?=	-qo
 EXTRACT_AFTER_ARGS?=	-d ${EXTRACT_WRKDIR}
 
-.if empty(zip_ARGS)
+.  if empty(zip_ARGS)
 EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
-.elif ${zip_ARGS} == "infozip"
+.  elif ${zip_ARGS} == "infozip"
 EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 EXTRACT_CMD?=		${UNZIP_CMD}
-.else
+.  else
 IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
-.endif
+.  endif
 
 .endif
diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk
index fa1b32ca8cfd..036d83720f5b 100644
--- a/Mk/bsd.ccache.mk
+++ b/Mk/bsd.ccache.mk
@@ -38,56 +38,56 @@ COMMANDS_Include_MAINTAINER=	portmgr@FreeBSD.org
 
 _CCACHEMKINCLUDED=	yes
 
-.if defined(NOCCACHE)
+.  if defined(NOCCACHE)
 NO_CCACHE=	t
-.endif
+.  endif
 
 # HOME is always set to ${WRKDIR} now. Try to use /root/.ccache as default.
-.if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR)
-.  if defined(USER) && ${USER} == root
+.  if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR)
+.    if defined(USER) && ${USER} == root
 CCACHE_DIR=	/root/.ccache
-.  else
+.    else
 NO_CCACHE=	yes
 WARNING+=	WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR.
+.    endif
 .  endif
-.endif
 
 # Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and
 # don't use if ccache already set in CC
-.if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \
+.  if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \
   !defined(NO_BUILD)
 
 # Poudriere will only define CCACHE_WRAPPER_PATH for using a host-static ccache
 # binary.
-.if defined(CCACHE_WRAPPER_PATH)
+.    if defined(CCACHE_WRAPPER_PATH)
 CCACHE_PKG_PREFIX=		${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}
-.endif
+.    endif
 CCACHE_PKG_PREFIX?=		${LOCALBASE}
 CCACHE_WRAPPER_PATH?=	${CCACHE_PKG_PREFIX}/libexec/ccache
 CCACHE_BIN?=			${CCACHE_PKG_PREFIX}/bin/ccache
 
 # Avoid depends loops between ccache and pkg
-.	if !defined(NO_CCACHE_DEPEND) && \
+.    if !defined(NO_CCACHE_DEPEND) && \
     ${PKGORIGIN} != ${PKG_ORIGIN}
 BUILD_DEPENDS+=		${CCACHE_BIN}:devel/ccache
-.	endif
+.    endif
 
-.if exists(${CCACHE_WRAPPER_PATH})
+.    if exists(${CCACHE_WRAPPER_PATH})
 # Prepend the ccache dir into the PATH and setup ccache env
 PATH:=	${CCACHE_WRAPPER_PATH}:${PATH}
 #.MAKEFLAGS:		PATH=${PATH}
-.if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
+.      if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
 MAKE_ENV+=			PATH=${PATH}
 CONFIGURE_ENV+=		PATH=${PATH}
-.endif
+.      endif
 
 # Ensure this is always in subchild environments
-.	if defined(CCACHE_DIR)
+.      if defined(CCACHE_DIR)
 #.MAKEFLAGS:		CCACHE_DIR=${CCACHE_DIR}
 MAKE_ENV+=		CCACHE_DIR="${CCACHE_DIR}"
 CONFIGURE_ENV+=	CCACHE_DIR="${CCACHE_DIR}"
-.	endif
-.endif
+.      endif
+.    endif
 
 # Some ports will truncate CCACHE_DIR from the env and due to HOME=${WRKDIR}
 # will incorrectly use ${WRKDIR}/.ccache.  Symlink to the proper place.
@@ -95,6 +95,6 @@ ${WRKDIR}/.ccache: ${WRKDIR}
 	@${LN} -sf ${CCACHE_DIR} ${WRKDIR}/.ccache
 ccache-wrkdir-link: ${WRKDIR}/.ccache .PHONY
 post-extract: ccache-wrkdir-link
-.endif
+.  endif
 
 .endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 4365b31ef1c4..362af08693e0 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -17,19 +17,19 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
-.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT GL \
+.  for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT GL \
 	IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL NINJA NODEJS PERL5 \
 	PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
-.if defined(${lang}_DEFAULT)
+.    if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
-.endif
+.    endif
 #.undef ${lang}_DEFAULT
-.endfor
+.  endfor
 
-.for lang in ${DEFAULT_VERSIONS}
+.  for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
-.endfor
+.  endfor
 
 # Possible values: 2.4
 APACHE_DEFAULT?=	2.4
@@ -47,11 +47,11 @@ FORTRAN_DEFAULT?=	gfortran
 FPC_DEFAULT?=		3.2.2
 # Possible values: 8 (last to support powerpcspe), 9, 10, 11
 # (Any other version is completely unsupported and not meant for general use.)
-.if ${ARCH} == "powerpcspe"
+.  if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
-.else
+.  else
 GCC_DEFAULT?=		10
-.endif
+.  endif
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
 # Possible values: 7, 8, 9, agpl
@@ -61,27 +61,27 @@ IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 7, 8, 11, 12, 13, 14, 15, 16
 JAVA_DEFAULT?=		8
 # Possible values: 2.2.0, 2.3.0
-.if !defined(WANT_LAZARUS_DEVEL)
+.  if !defined(WANT_LAZARUS_DEVEL)
 LAZARUS_DEFAULT?=       2.2.0
-.else
+.  else
 LAZARUS_DEFAULT?=       2.3.0
-.endif
+.  endif
 # Possible values: rust, legacy
-.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le:Npowerpc)
+.  if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le:Npowerpc)
 LIBRSVG2_DEFAULT?=	rust
-.else
+.  else
 LIBRSVG2_DEFAULT?=	legacy
-.endif
+.  endif
 # Possible values: c7
 LINUX_DEFAULT?=		c7
 # Possible values: 70, 80, 90, 10, 11, 12, 13, -devel (to be used when non-base compiler is required)
 # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before
 # bumping the LLVM version.
-.if ${ARCH} == powerpc
+.  if ${ARCH} == powerpc
 LLVM_DEFAULT?=		10
-.else
+.  else
 LLVM_DEFAULT?=		90
-.endif
+.  endif
 # Possible values: 5.1, 5.2, 5.3, 5.4
 LUA_DEFAULT?=		5.2
 # Possible values: 5.10, 5.20, 6.8
@@ -91,20 +91,20 @@ MYSQL_DEFAULT?=		5.7
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
 # Possible values: 5.30, 5.32, 5.34, devel
-.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
+.  if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.32
-.elif !defined(PERL5_DEFAULT)
+.  elif !defined(PERL5_DEFAULT)
 # There's no need to replace development versions, like "5.23" with "devel"
 # because 1) nobody is supposed to use it outside of poudriere, and 2) it must
 # be set manually in /etc/make.conf in the first place, and we're never getting
 # in here.
-.if !defined(_PERL5_FROM_BIN)
+.    if !defined(_PERL5_FROM_BIN)
 _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
-.endif
+.    endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
-.endif
+.  endif
 # Possible values: 10, 11, 12, 13, 14
 PGSQL_DEFAULT?=		13
 # Possible values: 7.4, 8.0, 8.1
@@ -122,41 +122,41 @@ RUST_DEFAULT?=		rust
 # Possible values: 4.12, 4.13
 SAMBA_DEFAULT?=		4.12
 # Possible values: base, openssl, libressl, libressl-devel
-.if !defined(SSL_DEFAULT)
+.  if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
-.  if	!defined(SSL_DEFAULT) && \
+.    if	!defined(SSL_DEFAULT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
-.  else
-.    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
-.      if defined(PKG_BIN)
+.    else
+.      if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
+.        if defined(PKG_BIN)
 # find installed port and use it for dependency
-.        if !defined(OPENSSL_INSTALLED)
-.          if defined(DESTDIR)
+.          if !defined(OPENSSL_INSTALLED)
+.            if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
-.          else
+.            else
 PKGARGS=
-.          endif
+.            endif
 OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
-.        endif
-.        if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
+.          endif
+.          if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
 SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
 WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf"
-.        endif
-.      else
+.          endif
+.        else
 check-makevars::
 	@${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable"
 	@${ECHO_MSG} "to determine what port it comes from."
 	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl=<openssl package name> to your /etc/make.conf and try again."
 	@${FALSE}
+.        endif
 .      endif
 .    endif
-.  endif
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
-.endif
+.  endif
 # Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
diff --git a/Mk/bsd.destdir.mk b/Mk/bsd.destdir.mk
index d7782d4544fe..df69f7e68a88 100644
--- a/Mk/bsd.destdir.mk
+++ b/Mk/bsd.destdir.mk
@@ -67,17 +67,17 @@ DESTDIR_Include_MAINTAINER=		portmgr@FreeBSD.org
 
 _DESTDIRMKINCLUDED=	yes
 
-.if defined(WITH_DESTDIR_DEBUG)
+.  if defined(WITH_DESTDIR_DEBUG)
 DEBUG_MSG=	${ECHO_MSG} "DEBUG:"
-.else
+.  else
 DEBUG_MSG=	${TRUE}
-.endif
+.  endif
 
 DESTDIR_ENV_LIST?=
 DESTDIR_ENV=	CHROOTED=yes PATH=${PATH} TERM=${TERM}
-.for _var in ${DESTDIR_ENV_LIST:NDESTDIR:NCHROOTED:NPORTSDIR}
+.  for _var in ${DESTDIR_ENV_LIST:NDESTDIR:NCHROOTED:NPORTSDIR}
 DESTDIR_ENV+=	${_var}="${${_var}}"
-.endfor
+.  endfor
 
 # Processing DESTDIR_MOUNT_LIST into something more machine-readable
 # VAR:HOST_PATH:DEST_PATH
@@ -85,31 +85,31 @@ DESTDIR_ENV+=	${_var}="${${_var}}"
 # VAR:HOST_PATH -> VAR:HOST_PATH:TMP
 DESTDIR_MOUNT_LIST?=	PORTSDIR DISTDIR
 _DESTDIR_MOUNT_LIST=
-.for _entry in ${DESTDIR_MOUNT_LIST}
+.  for _entry in ${DESTDIR_MOUNT_LIST}
 __entry=${_entry}
-.if ${__entry:M*\:*\:*}
+.    if ${__entry:M*\:*\:*}
 _DESTDIR_MOUNT_LIST+=	${_entry}
-.elif ${__entry:M*\:*}
+.    elif ${__entry:M*\:*}
 _DESTDIR_MOUNT_LIST+=	${_entry}:___temp___
-.else
-.if defined(${_entry}) && !empty(${_entry})
+.    else
+.      if defined(${_entry}) && !empty(${_entry})
 _DESTDIR_MOUNT_LIST+=	${_entry}:${${_entry}}:___temp___
-.endif
-.endif
-.endfor
+.      endif
+.    endif
+.  endfor
 
 .MAIN:	all
-.for _target in ${.TARGETS}
+.  for _target in ${.TARGETS}
 ${_target}: pre-chroot do-chroot
 	@${TRUE}
-.endfor
+.  endfor
 
-.if !target(pre-chroot)
+.  if !target(pre-chroot)
 pre-chroot:
 	@${TRUE}
-.endif
+.  endif
 
-.if !target(do-chroot)
+.  if !target(do-chroot)
 do-chroot:
 	@if [ ! -d ${DESTDIR} ]; then \
 		${ECHO_MSG} "===>  Directory ${DESTDIR} does not exist"; \
@@ -216,5 +216,5 @@ do-chroot:
 		${RMDIR} $${_entry} || ${TRUE}; \
 	done; \
 	exit $$status
-.endif	# !target(do-chroot)
+.  endif	# !target(do-chroot)
 .endif	# !defined(_DESTDIRMKINCLUDED)
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index b0d01006f68b..6d8edfc5cacb 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -66,77 +66,77 @@ IGNORE=	bad target specification in USE_GCC; only "build" is supported
 .if defined(USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
 
 # Handle USE_GCC=yes.
-.if ${USE_GCC} == yes
+.  if ${USE_GCC} == yes
 USE_GCC=	${GCC_DEFAULT}+
-.endif
+.  endif
 
 # See if we can use a later version or exclusively the one specified.
 _USE_GCC:=	${USE_GCC:S/+//}
-.if ${USE_GCC} != ${_USE_GCC}
+.  if ${USE_GCC} != ${_USE_GCC}
 _GCC_ORLATER:=	true
-.endif
+.  endif
 
 # See whether we have the specific version requested installed already
 # and save that into _GCC_FOUND.  In parallel, check if USE_GCC refers
 # to a valid version to begin with.
-.for v in ${GCCVERSIONS}
-. if ${_USE_GCC} == ${v}
+.  for v in ${GCCVERSIONS}
+.    if ${_USE_GCC} == ${v}
 _GCCVERSION_OKAY=	true
-.  if exists(${LOCALBASE}/bin/gcc${v:S/.//})
+.      if exists(${LOCALBASE}/bin/gcc${v:S/.//})
 _GCC_FOUND:=		${_USE_GCC}
-.  endif
-. endif
-.endfor
+.      endif
+.    endif
+.  endfor
 
-.if !defined(_GCCVERSION_OKAY)
+.  if !defined(_GCCVERSION_OKAY)
 IGNORE=	Unknown version of GCC specified (USE_GCC=${USE_GCC})
-.endif
+.  endif
 
 # If the GCC package defined in USE_GCC does not exist, but a later
 # version is allowed (for example 8+), go and use the default.
-.if defined(_GCC_ORLATER)
-. if !defined(_GCC_FOUND) && ${_USE_GCC} < ${GCC_DEFAULT}
+.  if defined(_GCC_ORLATER)
+.    if !defined(_GCC_FOUND) && ${_USE_GCC} < ${GCC_DEFAULT}
 _USE_GCC:=	${GCC_DEFAULT}
-. endif
-.endif # defined(_GCC_ORLATER)
+.    endif
+.  endif # defined(_GCC_ORLATER)
 
 # A concrete version has been selected. Set proper ports dependencies,
 # CC, CXX, CPP, and flags.
 V:=			${_USE_GCC:S/.//}
-. if ${V} == 12
+.  if ${V} == 12
 _GCC_PORT:=		gcc${V}-devel
-. else
+.  else
 _GCC_PORT:=		gcc${V}
-. endif
+.  endif
 CC:=			gcc${V}
 CXX:=			g++${V}
 CPP:=			cpp${V}
 _GCC_RUNTIME:=		${LOCALBASE}/lib/gcc${V}
-. if ${PORTNAME} == gcc
+.  if ${PORTNAME} == gcc
 # We don't want the rpath stuff while building GCC itself
 # so we do not set the FLAGS as done in the else part.
 # When building a GCC, we want the target libraries to be used and not the
 # host GCC libraries.
-. else
+.  else
 CFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 CXXFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 LDFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME}
-. endif
+.  endif
 .undef V
 
 # Now filter unsupported flags for CC and CXX.
 CFLAGS:=		${CFLAGS:N-mretpoline}
 CXXFLAGS:=		${CXXFLAGS:N-mretpoline}
 
-.if defined(_GCC_PORT)
+.  if defined(_GCC_PORT)
 BUILD_DEPENDS+=	${CC}:lang/${_GCC_PORT}
-. if defined(_USE_GCC_RUN_DEPENDS)
+.    if defined(_USE_GCC_RUN_DEPENDS)
 RUN_DEPENDS+=	${CC}:lang/${_GCC_PORT}
-. endif
+.    endif
 # GCC ports already depend on binutils; make sure whatever we build
 # leverages this as well.
 USE_BINUTILS=	yes
-.endif
+.  endif
 
 .endif # defined(_USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
 
@@ -146,14 +146,14 @@ test-gcc:
 .if defined(IGNORE)
 	@echo "IGNORE: ${IGNORE}"
 .else
-.if defined(USE_GCC)
-.if defined(_GCC_ORLATER)
+.  if defined(USE_GCC)
+.    if defined(_GCC_ORLATER)
 	@echo Port can use later versions.
-.else
+.    else
 	@echo Port cannot use later versions.
-.endif
+.    endif
 	@echo Using GCC version ${_USE_GCC}
-.endif
+.  endif
 	@echo CC=${CC} - CXX=${CXX} - CPP=${CPP}
 	@echo CFLAGS=\"${CFLAGS}\"
 	@echo CXXFLAGS=\"${CXXFLAGS}\"
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index acd930def68c..eef9db747685 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -14,7 +14,7 @@
 # system.
 
 .if defined(USE_GECKO)
-.if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include)
+.  if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include)
 Gecko_Pre_Include=	bsd.gecko.mk
 
 # This file contains some reusable components for mozilla ports. It's of
@@ -67,9 +67,9 @@ USE_GL=		gl
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrender xt
-.if ${MOZILLA_VER:R:R} >= 96
+.    if ${MOZILLA_VER:R:R} >= 96
 USE_XORG+=	xrandr xtst
-.endif
+.    endif
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 LDFLAGS+=		-Wl,--as-needed
@@ -92,22 +92,22 @@ MOZ_OPTIONS+=	--prefix="${PREFIX}"
 MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"
 
 MOZ_OPTIONS+=	--with-libclang-path="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib"
-.if !exists(/usr/bin/llvm-objdump)
+.    if !exists(/usr/bin/llvm-objdump)
 MOZ_EXPORT+=	LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}"
-.endif
+.    endif
 # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled
-.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO}
+.    if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO}
 LLVM_DEFAULT=	13 # chase bundled LLVM in lang/rust for LTO
 LLVM_VERSION=	13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT}
-.endif
+.    endif
 # Require newer Clang than what's in base system unless user opted out
-. if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.    if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CPP=			${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=				${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CXX=			${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 USES:=			${USES:Ncompiler\:*} # XXX avoid warnings
-. endif
+.    endif
 
 MOZSRC?=	${WRKSRC}
 PLISTF?=	${WRKDIR}/plist_files
@@ -116,21 +116,21 @@ MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin lib share/pixmaps share/applications
 
 # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.    if ${ARCH} == amd64 || ${ARCH} == i386
 RUSTFLAGS+=	${CFLAGS:M-march=*:S/-march=/-C target-cpu=/}
-.elif ${ARCH:Mpowerpc64*}
+.    elif ${ARCH:Mpowerpc64*}
 RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/:S/power/pwr/}
-.else
+.    else
 RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
-.endif
+.    endif
 
 # Standard depends
 _ALL_DEPENDS=	av1 event ffi graphite harfbuzz icu jpeg nspr nss png pixman sqlite vpx webp
 
-.if exists(${FILESDIR}/patch-bug1559213)
+.    if exists(${FILESDIR}/patch-bug1559213)
 av1_LIB_DEPENDS=	libaom.so:multimedia/aom libdav1d.so:multimedia/dav1d
 av1_MOZ_OPTIONS=	--with-system-av1
-.endif
+.    endif
 
 event_LIB_DEPENDS=	libevent.so:devel/libevent
 event_MOZ_OPTIONS=	--with-system-libevent
@@ -138,13 +138,13 @@ event_MOZ_OPTIONS=	--with-system-libevent
 ffi_LIB_DEPENDS=	libffi.so:devel/libffi
 ffi_MOZ_OPTIONS=	--enable-system-ffi
 
-.if exists(${FILESDIR}/patch-bug847568)
+.    if exists(${FILESDIR}/patch-bug847568)
 graphite_LIB_DEPENDS=	libgraphite2.so:graphics/graphite2
 graphite_MOZ_OPTIONS=	--with-system-graphite2
 
 harfbuzz_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 harfbuzz_MOZ_OPTIONS=	--with-system-harfbuzz
-.endif
+.    endif
 
 icu_LIB_DEPENDS=		libicui18n.so:devel/icu
 icu_MOZ_OPTIONS=		--with-system-icu --with-intl-api
@@ -164,9 +164,9 @@ pixman_MOZ_OPTIONS=	--enable-system-pixman
 
 png_LIB_DEPENDS=	libpng.so:graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
-.if ${MOZILLA_VER:R:R} >= 97
+.    if ${MOZILLA_VER:R:R} >= 97
 png_MOZ_OPTIONS=	--with-system-png
-.endif
+.    endif
 
 sqlite_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 sqlite_MOZ_OPTIONS=	--enable-system-sqlite
@@ -178,24 +178,24 @@ vpx_MOZ_OPTIONS=	--with-system-libvpx
 webp_LIB_DEPENDS=	libwebp.so:graphics/webp
 webp_MOZ_OPTIONS=	--with-system-webp
 
-.for use in ${USE_MOZILLA}
+.    for use in ${USE_MOZILLA}
 ${use:S/-/_WITHOUT_/}=	${TRUE}
-.endfor
+.    endfor
 
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-.for dep in ${_ALL_DEPENDS} ${USE_MOZILLA:M+*:S/+//}
-.if !defined(_WITHOUT_${dep})
+.    for dep in ${_ALL_DEPENDS} ${USE_MOZILLA:M+*:S/+//}
+.      if !defined(_WITHOUT_${dep})
 BUILD_DEPENDS+=	${${dep}_BUILD_DEPENDS}
 LIB_DEPENDS+=	${${dep}_LIB_DEPENDS}
 RUN_DEPENDS+=	${${dep}_RUN_DEPENDS}
 USES+=		${${dep}_USES}
 MOZ_OPTIONS+=	${${dep}_MOZ_OPTIONS}
-.else
+.      else
 BUILD_DEPENDS+=	${-${dep}_BUILD_DEPENDS}
-.endif
-.endfor
+.      endif
+.    endfor
 
 # Standard options
 MOZ_OPTIONS+=	\
@@ -210,158 +210,158 @@ MOZ_OPTIONS+=	\
 MOZ_EXPORT+=	MOZ_GOOGLE_LOCATION_SERVICE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8
 MOZ_EXPORT+=	MOZ_GOOGLE_SAFEBROWSING_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+.    if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=		-O3
 MOZ_EXPORT+=	MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
 MOZ_OPTIONS+=	--enable-optimize
-.else
+.    else
 MOZ_OPTIONS+=	--disable-optimize
-.  if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
+.      if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # ld 2.17 barfs on Stylo built with -C opt-level=0
 USE_BINUTILS=	yes
 LDFLAGS+=		-B${LOCALBASE}/bin
-.  endif
-.endif
+.      endif
+.    endif
 
-.if ${PORT_OPTIONS:MCANBERRA}
+.    if ${PORT_OPTIONS:MCANBERRA}
 RUN_DEPENDS+=	libcanberra>0:audio/libcanberra
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MDBUS}
+.    if ${PORT_OPTIONS:MDBUS}
 BUILD_DEPENDS+=	libnotify>0:devel/libnotify
 LIB_DEPENDS+=	libdbus-1.so:devel/dbus \
 				libdbus-glib-1.so:devel/dbus-glib
-.else
+.    else
 MOZ_OPTIONS+=	--disable-dbus
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MFFMPEG}
+.    if ${PORT_OPTIONS:MFFMPEG}
 # dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
 RUN_DEPENDS+=	ffmpeg>=0.8,1:multimedia/ffmpeg
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MLIBPROXY}
+.    if ${PORT_OPTIONS:MLIBPROXY}
 LIB_DEPENDS+=	libproxy.so:net/libproxy
 MOZ_OPTIONS+=	--enable-libproxy
-.else
+.    else
 MOZ_OPTIONS+=	--disable-libproxy
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MLTO}
+.    if ${PORT_OPTIONS:MLTO}
 MOZ_OPTIONS+=	--enable-lto=cross
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MALSA}
+.    if ${PORT_OPTIONS:MALSA}
 BUILD_DEPENDS+=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
 MOZ_OPTIONS+=	--enable-alsa
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MJACK}
+.    if ${PORT_OPTIONS:MJACK}
 BUILD_DEPENDS+=	${LOCALBASE}/include/jack/jack.h:audio/jack
 MOZ_OPTIONS+=	--enable-jack
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MPULSEAUDIO}
+.    if ${PORT_OPTIONS:MPULSEAUDIO}
 BUILD_DEPENDS+=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
 MOZ_OPTIONS+=	--enable-pulseaudio
-.else
+.    else
 MOZ_OPTIONS+=	--disable-pulseaudio
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MSNDIO}
+.    if ${PORT_OPTIONS:MSNDIO}
 BUILD_DEPENDS+=	${LOCALBASE}/include/sndio.h:audio/sndio
 post-patch-SNDIO-on:
 	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
 		-e '/DISABLE_LIBSNDIO_DLOPEN/d' \
 		${MOZSRC}/media/libcubeb/src/moz.build
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MDEBUG}
+.    if ${PORT_OPTIONS:MDEBUG}
 MOZ_OPTIONS+=	--enable-debug --disable-release
 STRIP=	# ports/184285
-.else
+.    else
 MOZ_OPTIONS+=	--disable-debug --disable-debug-symbols --enable-release
-. if ${ARCH:Maarch64} || (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
+.      if ${ARCH:Maarch64} || (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
 MOZ_OPTIONS+=	--enable-rust-simd
-. endif
-.endif
+.      endif
+.    endif
 
-.if ${PORT_OPTIONS:MPROFILE}
+.    if ${PORT_OPTIONS:MPROFILE}
 MOZ_OPTIONS+=	--enable-profiling
 STRIP=
-.else
+.    else
 MOZ_OPTIONS+=	--disable-profiling
-.endif
+.    endif
 
-.if ${PORT_OPTIONS:MTEST}
+.    if ${PORT_OPTIONS:MTEST}
 USE_XORG+=		xscrnsaver
 MOZ_OPTIONS+=	--enable-tests
-.else
+.    else
 MOZ_OPTIONS+=	--disable-tests
-.endif
+.    endif
 
-.if !defined(STRIP) || ${STRIP} == ""
+.    if !defined(STRIP) || ${STRIP} == ""
 MOZ_OPTIONS+=	--disable-strip --disable-install-strip
-.else
+.    else
 MOZ_OPTIONS+=	--enable-strip --enable-install-strip
-.endif
+.    endif
 
 # _MAKE_JOBS is only available after bsd.port.post.mk, thus cannot be
 # used in .mozconfig. And client.mk automatically uses -jN where N
 # is what multiprocessing.cpu_count() returns.
-.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
+.    if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
 MAKE_JOBS_NUMBER=	1
-.endif
-.if defined(MAKE_JOBS_NUMBER)
+.    endif
+.    if defined(MAKE_JOBS_NUMBER)
 MOZ_MAKE_FLAGS+=-j${MAKE_JOBS_NUMBER}
-.endif
+.    endif
 
-.if defined(MOZ_MAKE_FLAGS)
+.    if defined(MOZ_MAKE_FLAGS)
 MOZ_MK_OPTIONS+=MOZ_MAKE_FLAGS="${MOZ_MAKE_FLAGS}"
-.endif
+.    endif
 
-.if ${ARCH} == amd64
-. if ${USE_MOZILLA:M-nss}
+.    if ${ARCH} == amd64
+.      if ${USE_MOZILLA:M-nss}
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/bin
 LDFLAGS+=	-B${LOCALBASE}/bin
-. endif
-.elif ${ARCH:Mpowerpc*}
+.      endif
+.    elif ${ARCH:Mpowerpc*}
 BUILD_DEPENDS+=	as:devel/binutils
-. if ${ARCH} == "powerpc64"
+.      if ${ARCH} == "powerpc64"
 MOZ_EXPORT+=	UNAME_m="${ARCH}"
-. endif
-.endif
+.      endif
+.    endif
 
-.else # bsd.port.post.mk
+.  else # bsd.port.post.mk
 
 post-patch: gecko-post-patch
 
 gecko-post-patch:
 	@${RM} ${MOZCONFIG}
-.if !defined(NOMOZCONFIG)
-.for arg in ${MOZ_OPTIONS}
+.    if !defined(NOMOZCONFIG)
+.      for arg in ${MOZ_OPTIONS}
 	@${ECHO_CMD} ac_add_options ${arg:Q} >> ${MOZCONFIG}
-.endfor
-.for arg in ${MOZ_MK_OPTIONS}
+.      endfor
+.      for arg in ${MOZ_MK_OPTIONS}
 	@${ECHO_CMD} mk_add_options ${arg:Q} >> ${MOZCONFIG}
-.endfor
-.for var in ${MOZ_EXPORT}
+.      endfor
+.      for var in ${MOZ_EXPORT}
 	@${ECHO_CMD} export ${var:Q} >> ${MOZCONFIG}
-.endfor
-.endif # .if !defined(NOMOZCONFIG)
-.if ${USE_MOZILLA:M-nspr}
+.      endfor
+.    endif # .if !defined(NOMOZCONFIG)
+.    if ${USE_MOZILLA:M-nspr}
 	@${ECHO_MSG} "===>  Applying NSPR patches"
 	@for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \
 		${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub < $$i; \
 	done
-.endif
-.if ${USE_MOZILLA:M-nss}
+.    endif
+.    if ${USE_MOZILLA:M-nss}
 	@${ECHO_MSG} "===>  Applying NSS patches"
 	@for i in ${.CURDIR}/../../security/nss/files/patch-*; do \
 		${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \
 	done
-.endif
+.    endif
 	@if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \
 		${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 			${WRKSRC}/config/baseconfig.mk; \
@@ -392,12 +392,12 @@ post-install-script: gecko-create-plist
 gecko-create-plist:
 # Create the plist
 	${RM} ${PLISTF}
-.for dir in ${MOZILLA_PLIST_DIRS}
+.    for dir in ${MOZILLA_PLIST_DIRS}
 	@cd ${STAGEDIR}${PREFIX}/${dir} && ${FIND} -H -s * ! -type d | \
 		${SED} -e 's|^|${dir}/|' >> ${PLISTF}
-.endfor
+.    endfor
 	${CAT} ${PLISTF} | ${SORT} >> ${TMPPLIST}
 
-.endif
+.  endif
 .endif
 # HERE THERE BE TACOS -- adamw
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index c6009f416a50..7e7b7d85d9e5 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -488,75 +488,75 @@ pango_IMPL=	#
 .if defined(_POSTMKINCLUDED) && !defined(Gstreamer_Post_Include)
 Gstreamer_Post_Include=	bsd.gstreamer.mk
 
-.if (defined (USE_GSTREAMER) && defined(USE_GSTREAMER1))
+.  if (defined (USE_GSTREAMER) && defined(USE_GSTREAMER1))
 IGNORE=	USE_GSTREAMER and USE_GSTREAMER1 can't be used together
-.endif
+.  endif
 
 _GST_IMPL_LIST:=	#
 
-.if defined(USE_GSTREAMER)
+.  if defined(USE_GSTREAMER)
 # update this with the gst 1.0 version below
-. for ext in ${USE_GSTREAMER}
+.    for ext in ${USE_GSTREAMER}
 ${ext}_GST_PREFIX?=	gstreamer-plugins-
 ${ext}_GST_VERSION?=	${GST_VERSION}${GST_MINOR_VERSION}
 ${ext}_NAME?=		${ext}
-.  if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS})
+.      if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS})
 _GST_BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${${ext}_DEPENDS}
 _GST_RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${${ext}_DEPENDS}
 _GST_GST_IMPL_LIST+=	${${ext}_IMPL}
-.  else
+.      else
 IGNORE=	cannot install: unknown gstreamer ${GST_VERSION} plugin -- ${ext}
-.  endif
-. endfor
+.      endif
+.    endfor
 
 # everything wants this
 _GST_BUILD_DEPENDS+= gstreamer-plugins>=0:multimedia/gstreamer-plugins
 _GST_LIB_DEPENDS+=   libgstreamer-0.10.so:multimedia/gstreamer
 _GST_RUN_DEPENDS+=   gstreamer-plugins>=0:multimedia/gstreamer-plugins
 
-. for plugin in ${_GST_IMPL_LIST:O:u}
+.    for plugin in ${_GST_IMPL_LIST:O:u}
 _GST_BUILD_DEPENDS+=	gstreamer-plugins-${plugin}>=0:multimedia/gstreamer-plugins-${plugin}
 _GST_RUN_DEPENDS+=	gstreamer-plugins-${plugin}>=0:multimedia/gstreamer-plugins-${plugin}
-. endfor
+.    endfor
 
 BUILD_DEPENDS+= ${_GST_BUILD_DEPENDS:O:u}
 LIB_DEPENDS+=   ${_GST_LIB_DEPENDS:O:u}
 RUN_DEPENDS+=   ${_GST_RUN_DEPENDS:O:u}
-.endif
+.  endif
 
-.if defined(USE_GSTREAMER1)
-. for ext in ${USE_GSTREAMER1}
+.  if defined(USE_GSTREAMER1)
+.    for ext in ${USE_GSTREAMER1}
 ${ext}_GST_PREFIX?=	gstreamer1-plugins-
 ${ext}_GST_VERSION?=	${GST1_VERSION}
 ${ext}_NAME10?=		${ext}
 ${ext}_GST_DEPENDS?=	${${ext}_DEPENDS:S,gstreamer-,gstreamer1-,}
-.  if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_GST_DEPENDS})
+.      if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_GST_DEPENDS})
 _GST_BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${${ext}_GST_DEPENDS}
 _GST_RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${${ext}_GST_DEPENDS}
-.   if defined(${ext}1_IMPL)
+.        if defined(${ext}1_IMPL)
 _GST_IMPL_LIST+=	${${ext}1_IMPL}
-.   else
+.        else
 _GST_IMPL_LIST+=	${${ext}_IMPL}
-.   endif
-.  else
+.        endif
+.      else
 IGNORE=	cannot install: unknown gstreamer ${GST1_VERSION} plugin -- ${ext}
-.  endif
-. endfor
+.      endif
+.    endfor
 
 # everything wants this
 _GST_BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}:multimedia/gstreamer1-plugins
 _GST_LIB_DEPENDS+=	libgstreamer-1.0.so:multimedia/gstreamer1
 _GST_RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}:multimedia/gstreamer1-plugins
 
-. for plugin in ${_GST_IMPL_LIST:O:u}
+.    for plugin in ${_GST_IMPL_LIST:O:u}
 _GST_BUILD_DEPENDS+=	gstreamer1-plugins-${plugin}>=${GST1_VERSION}:multimedia/gstreamer1-plugins-${plugin}
 _GST_RUN_DEPENDS+=	gstreamer1-plugins-${plugin}>=${GST1_VERSION}:multimedia/gstreamer1-plugins-${plugin}
-. endfor
+.    endfor
 
 BUILD_DEPENDS+=	${_GST_BUILD_DEPENDS:O:u}
 LIB_DEPENDS+=	${_GST_LIB_DEPENDS:O:u}
 RUN_DEPENDS+=	${_GST_RUN_DEPENDS:O:u}
-.endif
+.  endif
 
 # The End
 .endif
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index f7eb3fe6192b..4833fab43c8a 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -127,11 +127,11 @@ Java_Include_MAINTAINER=	java@FreeBSD.org
 # Stage 5: Define all settings for the port to use
 #
 
-.	if defined(USE_JAVA)
+.  if defined(USE_JAVA)
 
-.		if !defined(JAVA_VERSION) && empty(USE_JAVA:C/[0-9]*[\.]*[0-9]*[+]*//)
+.    if !defined(JAVA_VERSION) && empty(USE_JAVA:C/[0-9]*[\.]*[0-9]*[+]*//)
 JAVA_VERSION=${USE_JAVA}
-.		endif
+.    endif
 
 #-------------------------------------------------------------------------------
 # Stage 1: Define constants
@@ -150,15 +150,15 @@ PLIST_SUB+=		JAVASHAREDIR="${JAVASHAREDIR:S,^${PREFIX}/,,}" \
 SUB_LIST+=		JAVASHAREDIR="${JAVASHAREDIR}" \
 				JAVAJARDIR="${JAVAJARDIR}" \
 				JAVALIBDIR="${JAVALIBDIR}"
-.		if defined(JAVA_VERSION)
+.    if defined(JAVA_VERSION)
 SUB_LIST+=		JAVA_VERSION="${JAVA_VERSION}"
-.		endif
-.		if defined(JAVA_VENDOR)
+.    endif
+.    if defined(JAVA_VENDOR)
 SUB_LIST+=		JAVA_VENDOR="${JAVA_VENDOR}"
-.		endif
-.		if defined(JAVA_OS)
+.    endif
+.    if defined(JAVA_OS)
 SUB_LIST+=		JAVA_OS="${JAVA_OS}"
-.		endif
+.    endif
 
 # The complete list of Java versions, os and vendors supported.
 __JAVA_VERSION_LIST=	7 8 11 12 13 14 15 16 17 18
@@ -228,106 +228,106 @@ _JDK_FILE=bin/javac
 # From here, the port is using bsd.java.mk v2.0
 
 # Error checking: defined JAVA_{HOME,PORT,PORT_VERSION,PORT_VENDOR,PORT_OS}
-.		for variable in JAVA_HOME JAVA_PORT JAVA_PORT_VERSION JAVA_PORT_VENDOR JAVA_PORT_OS
-.			if defined(${variable})
+.    for variable in JAVA_HOME JAVA_PORT JAVA_PORT_VERSION JAVA_PORT_VENDOR JAVA_PORT_OS
+.      if defined(${variable})
 check-makevars::
 	@${ECHO_CMD} "${PKGNAME}: Environment error: \"${variable}\" should not be defined -- clearing."
 .undef				${variable}
-.			endif
-.		endfor
+.      endif
+.    endfor
 
 # Error checking: JAVA_VERSION
-.if defined(JAVA_VERSION)
-.if !defined(_JAVA_VERSION_LIST_REGEXP)
+.    if defined(JAVA_VERSION)
+.      if !defined(_JAVA_VERSION_LIST_REGEXP)
 _JAVA_VERSION_LIST_REGEXP=	${_JAVA_VERSION_LIST:C/\+/\\+/:ts|}
-.endif
+.      endif
 
 check-makevars::
 	@( test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VERSION_LIST_REGEXP}")) || \
 	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})
-.endif
+.    endif
 
 # Error checking: JAVA_VENDOR
-.if defined(JAVA_VENDOR)
-.if !defined(_JAVA_VENDOR_LIST_REGEXP)
+.    if defined(JAVA_VENDOR)
+.      if !defined(_JAVA_VENDOR_LIST_REGEXP)
 _JAVA_VENDOR_LIST_REGEXP=	${_JAVA_VENDOR_LIST:ts|}
-.endif
+.      endif
 
 check-makevars::
 	@( test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VENDOR_LIST_REGEXP}" )) || \
 	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \
 	${FALSE})
-.endif
+.    endif
 
 # Error checking: JAVA_OS
-.if defined(JAVA_OS)
-.if !defined(_JAVA_OS_LIST_REGEXP)
+.    if defined(JAVA_OS)
+.      if !defined(_JAVA_OS_LIST_REGEXP)
 _JAVA_OS_LIST_REGEXP=	${_JAVA_OS_LIST:ts|}
-.endif
+.      endif
 
 check-makevars::
 	@( test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_OS_LIST_REGEXP}")) || \
 	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \
 	${FALSE})
-.endif
+.    endif
 
 # Set default values for JAVA_BUILD and JAVA_RUN
 # When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre
 # (unless NO_BUILD is set)
-.		if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN)
-.			if !defined(NO_BUILD)
+.    if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN)
+.      if !defined(NO_BUILD)
 JAVA_BUILD=	jdk
-.			endif
+.      endif
 JAVA_RUN=	jre
-.		endif
+.    endif
 
 # JDK dependency setting
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
-.		if defined(JAVA_VERSION)
+.    if defined(JAVA_VERSION)
 _JAVA_VERSION=	${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13 14+/:S/14+/14 15+/:S/15+/15 16+/:S/16+/16 17+/:S/17+/17 18+/:S/18+/18/}
-.		else
+.    else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
-.		endif
-.		if defined(JAVA_OS)
+.    endif
+.    if defined(JAVA_OS)
 _JAVA_OS=	${JAVA_OS}
-.		else
+.    else
 _JAVA_OS=	${_JAVA_OS_LIST}
-.		endif
-.		if defined(JAVA_VENDOR)
+.    endif
+.    if defined(JAVA_VENDOR)
 _JAVA_VENDOR=	${JAVA_VENDOR}
-.		else
+.    else
 _JAVA_VENDOR=	${_JAVA_VENDOR_LIST}
-.		endif
+.    endif
 
-.		for A_JAVA_PORT in ${_JAVA_PORTS_ALL}
+.    for A_JAVA_PORT in ${_JAVA_PORTS_ALL}
 A_JAVA_PORT_INFO:=			${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
 A_JAVA_PORT_HOME=			${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,}
 A_JAVA_PORT_VERSION=		${A_JAVA_PORT_INFO:MVERSION=*:S,VERSION=,,}
 A_JAVA_PORT_OS=				${A_JAVA_PORT_INFO:MOS=*:S,OS=,,}
 A_JAVA_PORT_VENDOR=			${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,}
-.if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})
+.      if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})
 __JAVA_PORTS_INSTALLED+=	${A_JAVA_PORT}
-.endif
+.      endif
 
 # Because variables inside for loops are special (directly replaced as strings),
 # we are allowed to use them inside modifiers, where normally ${FOO:M${BAR}} is
 # not allowed.
 #
-.for ver in ${A_JAVA_PORT_VERSION}
-.for os in ${A_JAVA_PORT_OS}
-.for vendor in ${A_JAVA_PORT_VENDOR}
-.if ${_JAVA_VERSION:M${ver}} && ${_JAVA_OS:M${os}} && ${_JAVA_VENDOR:M${vendor}}
+.      for ver in ${A_JAVA_PORT_VERSION}
+.        for os in ${A_JAVA_PORT_OS}
+.          for vendor in ${A_JAVA_PORT_VENDOR}
+.            if ${_JAVA_VERSION:M${ver}} && ${_JAVA_OS:M${os}} && ${_JAVA_VENDOR:M${vendor}}
 __JAVA_PORTS_POSSIBLE+=		${A_JAVA_PORT}
-.endif
-.endfor
-.endfor
-.endfor
+.            endif
+.          endfor
+.        endfor
+.      endfor
 
-.		endfor
-.if !defined(_JAVA_PORTS_INSTALLED)
+.    endfor
+.    if !defined(_JAVA_PORTS_INSTALLED)
 _JAVA_PORTS_INSTALLED=		${__JAVA_PORTS_INSTALLED:C/ [ ]+/ /g}
-.endif
+.    endif
 _JAVA_PORTS_POSSIBLE=		${__JAVA_PORTS_POSSIBLE:C/ [ ]+/ /g}
 
 
@@ -339,27 +339,27 @@ _JAVA_PORTS_POSSIBLE=		${__JAVA_PORTS_POSSIBLE:C/ [ ]+/ /g}
 
 .		undef _JAVA_PORTS_INSTALLED_POSSIBLE
 
-.		for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE}
+.    for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE}
 __JAVA_PORTS_INSTALLED_POSSIBLE+=	${_JAVA_PORTS_INSTALLED:M${A_JAVA_PORT}}
-.		endfor
+.    endfor
 _JAVA_PORTS_INSTALLED_POSSIBLE=		${__JAVA_PORTS_INSTALLED_POSSIBLE:C/[ ]+//g}
 
-.		if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
-.                 for i in ${_JAVA_PORTS_INSTALLED_POSSIBLE}
-.                   if !defined(_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit)
+.    if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
+.      for i in ${_JAVA_PORTS_INSTALLED_POSSIBLE}
+.        if !defined(_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit)
 _JAVA_PORT=	$i
 _JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit=	1
-.                   endif
-.                 endfor
+.        endif
+.      endfor
 # If no installed JDK port fits, then pick one from the list of possible ones
-.		else
-.                 for i in ${_JAVA_PORTS_POSSIBLE}
-.                   if !defined(_JAVA_PORTS_POSSIBLE_shortcircuit)
+.    else
+.      for i in ${_JAVA_PORTS_POSSIBLE}
+.        if !defined(_JAVA_PORTS_POSSIBLE_shortcircuit)
 _JAVA_PORT=	$i
 _JAVA_PORTS_POSSIBLE_shortcircuit=	1
-.                   endif
-.                 endfor
-.		endif
+.        endif
+.      endfor
+.    endif
 
 _JAVA_PORT_INFO:=		${_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
 JAVA_PORT=				${_JAVA_PORT_INFO:MPORT=*:S,PORT=,,}
@@ -376,47 +376,47 @@ JAVA_PORT_OS_DESCRIPTION:=		${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
 #
 
 # Ant Support: USE_ANT --> JAVA_BUILD=jdk
-.		if defined(USE_ANT)
+.    if defined(USE_ANT)
 JAVA_BUILD=		jdk
-.		endif
+.    endif
 
 # Add the JDK port to the dependencies
 DEPEND_JAVA=	${JAVA}:${JAVA_PORT}
-.		if defined(JAVA_EXTRACT)
+.    if defined(JAVA_EXTRACT)
 EXTRACT_DEPENDS+=	${DEPEND_JAVA}
-.		endif
-.		if defined(JAVA_BUILD)
-.			if defined(NO_BUILD)
+.    endif
+.    if defined(JAVA_BUILD)
+.      if defined(NO_BUILD)
 check-makevars::
 	@${ECHO_CMD} "${PKGNAME}: Makefile error: JAVA_BUILD and NO_BUILD cannot be set at the same time.";
 	@${FALSE}
-.			endif
+.      endif
 BUILD_DEPENDS+=		${DEPEND_JAVA}
-.		endif
-.		if defined(JAVA_RUN)
+.    endif
+.    if defined(JAVA_RUN)
 RUN_DEPENDS+=		${DEPEND_JAVA}
-.		endif
+.    endif
 
 # Ant support: default do-build target
-.		if defined(USE_ANT)
+.    if defined(USE_ANT)
 DESTDIRNAME?=		-Dfreebsd.ports.destdir
 ANT?=				${LOCALBASE}/bin/ant
 MAKE_ENV+=			JAVA_HOME=${JAVA_HOME}
 BUILD_DEPENDS+=		${ANT}:devel/apache-ant
 ALL_TARGET?=
-.			if !target(do-build)
+.      if !target(do-build)
 do-build:
 					@(cd ${BUILD_WRKSRC}; \
 						${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
-.			endif
-.			if !target(do-test) && defined(TEST_TARGET)
+.      endif
+.      if !target(do-test) && defined(TEST_TARGET)
 TEST_DEPENDS+=		${DEPEND_JAVA}
 TEST_DEPENDS+=		${ANT}:devel/apache-ant
 do-test:
 					@(cd ${TEST_WRKSRC}; \
 						${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${TEST_TARGET})
-.			endif
-.		endif
+.      endif
+.    endif
 
 #-----------------------------------------------------------------------------
 # Stage 5: Define all settings for the port to use
@@ -429,11 +429,11 @@ do-test:
 .		undef JAVAC
 
 # Then test if a JAVAC has to be set (JAVA_BUILD==jdk)
-.		if defined(JAVA_BUILD)
-.			if (${JAVA_BUILD:tu} == "JDK") && !defined(JAVAC)
+.    if defined(JAVA_BUILD)
+.      if (${JAVA_BUILD:tu} == "JDK") && !defined(JAVAC)
 JAVAC?=			${JAVA_HOME}/bin/javac
-.			endif
-.		endif
+.      endif
+.    endif
 
 # Define the location of some more executables.
 APPLETVIEWER?=	${JAVA_HOME}/bin/appletviewer
@@ -487,5 +487,5 @@ java-debug:
 	@${ECHO_CMD} "JAVAC=                          ${JAVAC}"
 	@${ECHO_CMD} "JAVA_CLASSES=                   ${JAVA_CLASSES}"
 
-.	endif
+.  endif
 .endif
diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
index 755506c16864..fecddc0b8c77 100644
--- a/Mk/bsd.ldap.mk
+++ b/Mk/bsd.ldap.mk
@@ -28,60 +28,60 @@ Database_Include_MAINTAINER=		ports@FreeBSD.org
 # OPENLDAP_VER
 #				- Detected OpenLDAP version.
 
-.if defined(USE_OPENLDAP)
+.  if defined(USE_OPENLDAP)
 DEFAULT_OPENLDAP_VER?=	24
 # OpenLDAP client versions currently supported
 OPENLDAP24_LIB=		libldap-2.4.so.2
 OPENLDAP25_LIB=		libldap-2.5.so.0
 OPENLDAP26_LIB=		libldap.so.2
 
-.if exists(${LOCALBASE}/bin/ldapwhoami)
+.    if exists(${LOCALBASE}/bin/ldapwhoami)
 _OPENLDAP_VER!=	${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.([0-9]).*/\1\2/'
-.endif
+.    endif
 
-.if defined(WANT_OPENLDAP_VER)
-.if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER} != ${WANT_OPENLDAP_VER}
+.    if defined(WANT_OPENLDAP_VER)
+.      if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER} != ${WANT_OPENLDAP_VER}
 IGNORE=		cannot install: the port wants openldap${WANT_OPENLDAP_VER}-client and you try to install openldap${WITH_OPENLDAP_VER}-client
-.endif
+.      endif
 OPENLDAP_VER=	${WANT_OPENLDAP_VER}
-.elif defined(WITH_OPENLDAP_VER)
+.    elif defined(WITH_OPENLDAP_VER)
 OPENLDAP_VER=	${WITH_OPENLDAP_VER}
-.else
-.if defined(_OPENLDAP_VER)
+.    else
+.      if defined(_OPENLDAP_VER)
 OPENLDAP_VER=	${_OPENLDAP_VER}
-.else
+.      else
 OPENLDAP_VER=	${DEFAULT_OPENLDAP_VER}
-.endif
-.endif # WANT_OPENLDAP_VER
+.      endif
+.    endif # WANT_OPENLDAP_VER
 
-.if defined(_OPENLDAP_VER)
-.if ${_OPENLDAP_VER} != ${OPENLDAP_VER}
+.    if defined(_OPENLDAP_VER)
+.      if ${_OPENLDAP_VER} != ${OPENLDAP_VER}
 IGNORE=	cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-client is installed and wanted version is openldap${OPENLDAP_VER}-client
-.endif
-.endif
+.      endif
+.    endif
 
 CFLAGS+=	-DLDAP_DEPRECATED
 
 _OPENLDAP_CLIENT_PKG!=	${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD}
 
 # And now we are checking if we can use it
-.if defined(OPENLDAP${OPENLDAP_VER}_LIB)
+.    if defined(OPENLDAP${OPENLDAP_VER}_LIB)
 # compatability shim
-.if defined(BROKEN_WITH_OPENLDAP)
+.      if defined(BROKEN_WITH_OPENLDAP)
 IGNORE_WITH_OPENLDAP=${BROKEN_WITH_OPENLDAP}
-.endif
-.if defined(IGNORE_WITH_OPENLDAP)
-.	for VER in ${IGNORE_WITH_OPENLDAP}
-.		if (${OPENLDAP_VER} == "${VER}")
+.      endif
+.      if defined(IGNORE_WITH_OPENLDAP)
+.        for VER in ${IGNORE_WITH_OPENLDAP}
+.          if (${OPENLDAP_VER} == "${VER}")
 IGNORE=		cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Doesn't support OpenLDAP ${IGNORE_WITH_OPENLDAP})
-.		endif
-.	endfor
-.endif # IGNORE_WITH_OPENLDAP
+.          endif
+.        endfor
+.      endif # IGNORE_WITH_OPENLDAP
 LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}-client
-.else
+.    else
 IGNORE=		cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
-.endif # Check for correct libs
+.    endif # Check for correct libs
 
-.endif # defined(USE_OPENLDAP)
+.  endif # defined(USE_OPENLDAP)
 
 .endif # defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include)
diff --git a/Mk/bsd.licenses.db.mk b/Mk/bsd.licenses.db.mk
index 52906b71cad5..82aed96f3e9c 100644
--- a/Mk/bsd.licenses.db.mk
+++ b/Mk/bsd.licenses.db.mk
@@ -421,7 +421,7 @@ _LICENSE_GROUPS_ZPL21=	GPL OSI
 # Set default permissions if not defined
 
 .for lic in ${_LICENSE_LIST}
-.	if !defined(_LICENSE_PERMS_${lic})
+.  if !defined(_LICENSE_PERMS_${lic})
 _LICENSE_PERMS_${lic}=	${_LICENSE_PERMS_DEFAULT}
-.	endif
+.  endif
 .endfor
diff --git a/Mk/bsd.licenses.mk b/Mk/bsd.licenses.mk
index 343be5c2cd07..94137816cd86 100644
--- a/Mk/bsd.licenses.mk
+++ b/Mk/bsd.licenses.mk
@@ -127,7 +127,7 @@ Licenses_Include_MAINTAINER=         portmgr@FreeBSD.org
 
 .if defined(_POSTMKINCLUDED) && !defined(BEFOREPORTMK)
 
-.if defined(LICENSE)
+.  if defined(LICENSE)
 
 # Include known licenses from database
 
@@ -167,37 +167,37 @@ _LICENSE_COOKIE?=	${WRKDIR}/.license_done.${PORTNAME}.${PREFIX:S/\//_/g}
 # _LICENSE_COMB		- Copy of LICENSE_COMB (but "single" instead of empty)
 
 _LICENSE?=			${LICENSE}
-.if !defined(LICENSE_COMB)
+.    if !defined(LICENSE_COMB)
 _LICENSE_COMB=		single
-.else
+.    else
 _LICENSE_COMB=		${LICENSE_COMB}
-.endif
+.    endif
 
 # Check if single or dual/multiple license
 #
 # Make sure LICENSE_COMB is only used with more than one license.
 
-.if ${_LICENSE_COMB} != "single" && ${_LICENSE_COMB} != "dual" && ${_LICENSE_COMB} != "multi"
+.    if ${_LICENSE_COMB} != "single" && ${_LICENSE_COMB} != "dual" && ${_LICENSE_COMB} != "multi"
 _LICENSE_ERROR?=	invalid value for LICENSE_COMB: "${_LICENSE_COMB}" (should be "single", "dual" or "multi")
-.endif
+.    endif
 
-.for lic in ${_LICENSE}
-.	if defined(_LICENSE_DEFINED)
-.		if ${_LICENSE_COMB} == "single"
+.    for lic in ${_LICENSE}
+.      if defined(_LICENSE_DEFINED)
+.        if ${_LICENSE_COMB} == "single"
 _LICENSE_ERROR?=	multiple licenses in LICENSE, but LICENSE_COMB is set to "single" (or undefined)
-.		else
+.        else
 _LICENSE_MULTI=		yes
-.		endif
-.	else
+.        endif
+.      else
 _LICENSE_DEFINED=	yes
-.	endif
-.endfor
-.if ${_LICENSE_COMB} != "single" && !defined(_LICENSE_MULTI)
+.      endif
+.    endfor
+.    if ${_LICENSE_COMB} != "single" && !defined(_LICENSE_MULTI)
 _LICENSE_ERROR?=	single license in LICENSE, but LICENSE_COMB is set to "${_LICENSE_COMB}" (requires more than one)
-.endif
-.if !defined(_LICENSE_DEFINED)
+.    endif
+.    if !defined(_LICENSE_DEFINED)
 _LICENSE_ERROR?=	no licenses present in LICENSE (empty string)
-.endif
+.    endif
 .undef _LICENSE_DEFINED
 .undef _LICENSE_MULTI
 
@@ -211,174 +211,174 @@ _LICENSE_ERROR?=	no licenses present in LICENSE (empty string)
 # Make sure required variables are defined, and remove conflicting (positive
 # and negative) duplicated components.
 
-.if ${_LICENSE_COMB} == "single"
+.    if ${_LICENSE_COMB} == "single"
 # Defaults to empty
 _LICENSE_GROUPS?=	#
 # Start
-.	for lic in ${_LICENSE}
-.		if ${_LICENSE_LIST:M${lic}} != ""
+.      for lic in ${_LICENSE}
+.        if ${_LICENSE_LIST:M${lic}} != ""
 # Case 1: license defined in the framework.
 _LICENSE_TYPE=		known
-.			for var in ${_LICENSE_LIST_PORT_VARS}
-.				if defined(LICENSE_${var})
+.          for var in ${_LICENSE_LIST_PORT_VARS}
+.            if defined(LICENSE_${var})
 _LICENSE_ERROR?=	redefining LICENSE_${var} is not allowed for known licenses, to define a custom license try another LICENSE name like ${_LICENSE}-variant
-.				endif
-.				if !defined(_LICENSE_${var}_${lic})
+.            endif
+.            if !defined(_LICENSE_${var}_${lic})
 _LICENSE_ERROR?=	ERROR: missing _LICENSE_${var}_${lic} in bsd.licenses.db.mk
-.				else
+.            else
 _LICENSE_${var}=	${_LICENSE_${var}_${lic}}
-.				endif
-.			endfor
+.            endif
+.          endfor
 # Check for LICENSE_FILE or at least LICENSE_TEXT (which simulates it)
-.			if !defined(LICENSE_FILE)
-.				if !defined(LICENSE_TEXT)
-.					if exists(${_LICENSE_STORE}/${lic})
+.          if !defined(LICENSE_FILE)
+.            if !defined(LICENSE_TEXT)
+.              if exists(${_LICENSE_STORE}/${lic})
 _LICENSE_FILE=		${_LICENSE_STORE}/${lic}
-.					else
+.              else
 # No license file in /usr/ports/Templates/Licenses
 _LICENSE_TEXT=		The license: ${_LICENSE} (${_LICENSE_NAME}) is standard, please read from the web.
 _LICENSE_FILE=		${WRKDIR}/${lic}
-.					endif
-.				else
+.              endif
+.            else
 _LICENSE_ERROR?=	defining LICENSE_TEXT is not allowed for known licenses
-.				endif
-.			else
+.            endif
+.          else
 _LICENSE_FILE=		${LICENSE_FILE}
-.			endif
+.          endif
 
-.		else
+.        else
 # Case 2: license only known by the port.
 _LICENSE_TYPE=		unknown
-.			for var in ${_LICENSE_LIST_PORT_VARS}
-.				if defined(LICENSE_${var})
+.          for var in ${_LICENSE_LIST_PORT_VARS}
+.            if defined(LICENSE_${var})
 _LICENSE_${var}=	${LICENSE_${var}}
-.				elif !defined(_LICENSE_${var})
+.            elif !defined(_LICENSE_${var})
 _LICENSE_ERROR?=	for unknown licenses, defining LICENSE_${var} is mandatory (otherwise use a known LICENSE)
-.				endif
-.			endfor
+.            endif
+.          endfor
 # Check LICENSE_PERMS for invalid, ambiguous and duplicate components
 __LICENSE_PERMS:=	#
-.			for comp in ${_LICENSE_PERMS}
-.				if ${_LICENSE_LIST_PERMS:M${comp:C/^no-//}} == ""
+.          for comp in ${_LICENSE_PERMS}
+.            if ${_LICENSE_LIST_PERMS:M${comp:C/^no-//}} == ""
 _LICENSE_ERROR?=	invalid LICENSE_PERMS component "${comp}"
-.				elif ${__LICENSE_PERMS:M${comp}} == "" && \
+.            elif ${__LICENSE_PERMS:M${comp}} == "" && \
 					 ${_LICENSE_PERMS:Mno-${comp:C/^no-//}} == ""
 __LICENSE_PERMS+=	${comp}
-.				endif
-.			endfor
+.            endif
+.          endfor
 _LICENSE_PERMS:=	${__LICENSE_PERMS}
 .			undef __LICENSE_PERMS
 # Check for LICENSE_FILE or at least LICENSE_TEXT (which simulates it)
-.			if !defined(LICENSE_FILE)
-.				if !defined(LICENSE_TEXT)
+.          if !defined(LICENSE_FILE)
+.            if !defined(LICENSE_TEXT)
 _LICENSE_ERROR?=	either LICENSE_FILE or LICENSE_TEXT must be defined
-.				else
+.            else
 _LICENSE_TEXT=		${LICENSE_TEXT}
 _LICENSE_FILE=		${WRKDIR}/${lic}
-.				endif
-.			else
+.            endif
+.          else
 _LICENSE_FILE=		${LICENSE_FILE}
-.			endif
-.		endif
+.          endif
+.        endif
 
 # Only one is allowed
-.		if defined(LICENSE_FILE) && defined(LICENSE_TEXT)
+.        if defined(LICENSE_FILE) && defined(LICENSE_TEXT)
 _LICENSE_ERROR?=	defining both LICENSE_FILE and LICENSE_TEXT is not allowed
-.		endif
+.        endif
 # Distfiles
-.		if !defined(LICENSE_DISTFILES)
+.        if !defined(LICENSE_DISTFILES)
 _LICENSE_DISTFILES=	${_DISTFILES}
-.		else
+.        else
 _LICENSE_DISTFILES=	${LICENSE_DISTFILES}
-.		endif
-.	endfor
+.        endif
+.      endfor
 
-.else
+.    else
 
-.	if defined(LICENSE_FILE)
-.		for lic in ${_LICENSE}
+.      if defined(LICENSE_FILE)
+.        for lic in ${_LICENSE}
 LICENSE_FILE_${lic}?=	${LICENSE_FILE}
-.		endfor
-.	endif
+.        endfor
+.      endif
 
-.	for lic in ${_LICENSE}
+.      for lic in ${_LICENSE}
 # Defaults to empty
 _LICENSE_GROUPS_${lic}?=#
-.		if ${_LICENSE_LIST:M${lic}} != ""
+.        if ${_LICENSE_LIST:M${lic}} != ""
 # Case 1: license defined in the framework.
 _LICENSE_TYPE_${lic}=	known
-.			for var in ${_LICENSE_LIST_PORT_VARS}
-.				if defined(LICENSE_${var}_${lic})
+.          for var in ${_LICENSE_LIST_PORT_VARS}
+.            if defined(LICENSE_${var}_${lic})
 _LICENSE_ERROR?=	redefining LICENSE_${var}_${lic} is not allowed for known licenses, to define a custom license try another LICENSE name for ${lic} like ${lic}-variant
-.				endif
-.				if !defined(_LICENSE_${var}_${lic})
+.            endif
+.            if !defined(_LICENSE_${var}_${lic})
 _LICENSE_ERROR?=	ERROR: missing _LICENSE_${var}_${lic} in bsd.licenses.db.mk
-.				endif
-.			endfor
+.            endif
+.          endfor
 # Check for LICENSE_FILE or at least LICENSE_TEXT (which simulates it)
-.			if !defined(LICENSE_FILE_${lic})
-.				if !defined(LICENSE_TEXT_${lic})
-.					if exists(${_LICENSE_STORE}/${lic})
+.          if !defined(LICENSE_FILE_${lic})
+.            if !defined(LICENSE_TEXT_${lic})
+.              if exists(${_LICENSE_STORE}/${lic})
 _LICENSE_FILE_${lic}=		${_LICENSE_STORE}/${lic}
-.					else
+.              else
 #  No license file in /usr/ports/Templates/Licenses
 _LICENSE_TEXT_${lic}=	The license: ${lic} (${_LICENSE_NAME_${lic}}) is standard, please read from the web.
 _LICENSE_FILE_${lic}=	${WRKDIR}/${lic}
-.					endif
-.				else
+.              endif
+.            else
 _LICENSE_ERROR?=	defining LICENSE_TEXT_${lic} is not allowed for known licenses
-.				endif
-.			else
+.            endif
+.          else
 _LICENSE_FILE_${lic}=	${LICENSE_FILE_${lic}}
-.			endif
+.          endif
 
-.		else
+.        else
 # Case 2: license only known by the port.
 _LICENSE_TYPE_${lic}=	unknown
-.			for var in ${_LICENSE_LIST_PORT_VARS}
-.				if defined(LICENSE_${var}_${lic})
+.          for var in ${_LICENSE_LIST_PORT_VARS}
+.            if defined(LICENSE_${var}_${lic})
 _LICENSE_${var}_${lic}=	${LICENSE_${var}_${lic}}
-.				elif !defined(_LICENSE_${var}_${lic})
+.            elif !defined(_LICENSE_${var}_${lic})
 _LICENSE_ERROR?=	for unknown licenses, defining LICENSE_${var}_${lic} is mandatory (otherwise use a known LICENSE)
-.				endif
-.			endfor
+.            endif
+.          endfor
 # Check LICENSE_PERMS for invalid, ambiguous and duplicate components
 __LICENSE_PERMS:=	#
-.			for comp in ${_LICENSE_PERMS_${lic}}
-.				if ${_LICENSE_LIST_PERMS:M${comp:C/^no-//}} == ""
+.          for comp in ${_LICENSE_PERMS_${lic}}
+.            if ${_LICENSE_LIST_PERMS:M${comp:C/^no-//}} == ""
 _LICENSE_ERROR?=		invalid LICENSE_PERMS_${var} component "${comp}"
-.				elif ${__LICENSE_PERMS:M${comp}} == "" && \
+.            elif ${__LICENSE_PERMS:M${comp}} == "" && \
 					 ${_LICENSE_PERMS_${lic}:Mno-${comp:C/^no-//}} == ""
 __LICENSE_PERMS+=		${comp}
-.				endif
-.			endfor
+.            endif
+.          endfor
 _LICENSE_PERMS_${lic}:=	${__LICENSE_PERMS}
 .			undef __LICENSE_PERMS
 # Check for LICENSE_FILE or at least LICENSE_TEXT (which simulates it)
-.			if !defined(LICENSE_FILE_${lic})
-.				if !defined(LICENSE_TEXT_${lic})
+.          if !defined(LICENSE_FILE_${lic})
+.            if !defined(LICENSE_TEXT_${lic})
 _LICENSE_ERROR?=		either LICENSE_FILE_${lic} or LICENSE_TEXT_${lic} must be defined
-.				else
+.            else
 _LICENSE_TEXT_${lic}=	${LICENSE_TEXT_${lic}}
 _LICENSE_FILE_${lic}=	${WRKDIR}/${lic}
-.				endif
-.			else
+.            endif
+.          else
 _LICENSE_FILE_${lic}=	${LICENSE_FILE_${lic}}
-.			endif
-.		endif
+.          endif
+.        endif
 
 # Only one is allowed
-.		if defined(LICENSE_FILE_${lic}) && defined(LICENSE_TEXT_${lic})
+.        if defined(LICENSE_FILE_${lic}) && defined(LICENSE_TEXT_${lic})
 _LICENSE_ERROR?=		defining both LICENSE_FILE_${lic} and LICENSE_TEXT_${lic}is not allowed
-.		endif
+.        endif
 # Distfiles
-.		if !defined(LICENSE_DISTFILES_${lic})
+.        if !defined(LICENSE_DISTFILES_${lic})
 _LICENSE_DISTFILES_${lic}=	${_DISTFILES}
-.		else
+.        else
 _LICENSE_DISTFILES_${lic}=	${LICENSE_DISTFILES_${lic}}
-.		endif
-.	endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
 # Check if the user agrees with the license
 
@@ -391,129 +391,129 @@ LICENSES_GROUPS_REJECTED?=	#
 
 # Evaluate per-license status
 
-.if ${_LICENSE_COMB} == "single"
-.	for lic in ${_LICENSE}
-.		if ${LICENSES_REJECTED:M${lic}} != ""
+.    if ${_LICENSE_COMB} == "single"
+.      for lic in ${_LICENSE}
+.        if ${LICENSES_REJECTED:M${lic}} != ""
 _LICENSE_STATUS?=	rejected
-.		endif
-.		for group in ${_LICENSE_GROUPS}
-.			if ${LICENSES_GROUPS_REJECTED:M${group}} != ""
+.        endif
+.        for group in ${_LICENSE_GROUPS}
+.          if ${LICENSES_GROUPS_REJECTED:M${group}} != ""
 _LICENSE_STATUS?=	rejected
-.			endif
-.			if ${LICENSES_GROUPS_ACCEPTED:M${group}} != ""
+.          endif
+.          if ${LICENSES_GROUPS_ACCEPTED:M${group}} != ""
 _LICENSE_STATUS?=	accepted
-.			endif
-.		endfor
-.		if ${LICENSES_ACCEPTED:M${lic}} != ""
+.          endif
+.        endfor
+.        if ${LICENSES_ACCEPTED:M${lic}} != ""
 _LICENSE_STATUS?=	accepted
-.		endif
-.		if ${_LICENSE_PERMS:Mauto-accept} != "" && !defined(LICENSES_ASK)
+.        endif
+.        if ${_LICENSE_PERMS:Mauto-accept} != "" && !defined(LICENSES_ASK)
 _LICENSE_STATUS?=	accepted
-.		endif
+.        endif
 _LICENSE_STATUS?=	ask
-.	endfor
+.      endfor
 
-.else
-.	for lic in ${_LICENSE}
-.		if ${LICENSES_REJECTED:M${lic}} != ""
+.    else
+.      for lic in ${_LICENSE}
+.        if ${LICENSES_REJECTED:M${lic}} != ""
 _LICENSE_STATUS_${lic}?=	rejected
-.		endif
-.		for group in ${_LICENSE_GROUPS_${lic}}
-.			if ${LICENSES_GROUPS_REJECTED:M${group}} != ""
+.        endif
+.        for group in ${_LICENSE_GROUPS_${lic}}
+.          if ${LICENSES_GROUPS_REJECTED:M${group}} != ""
 _LICENSE_STATUS_${lic}?=	rejected
-.			endif
-.			if ${LICENSES_GROUPS_ACCEPTED:M${group}} != ""
+.          endif
+.          if ${LICENSES_GROUPS_ACCEPTED:M${group}} != ""
 _LICENSE_STATUS_${lic}?=	accepted
-.			endif
-.		endfor
-.		if ${LICENSES_ACCEPTED:M${lic}} != ""
+.          endif
+.        endfor
+.        if ${LICENSES_ACCEPTED:M${lic}} != ""
 _LICENSE_STATUS_${lic}?=	accepted
-.		endif
-.		if ${_LICENSE_PERMS_${lic}:Mauto-accept} != "" && !defined(LICENSES_ASK)
+.        endif
+.        if ${_LICENSE_PERMS_${lic}:Mauto-accept} != "" && !defined(LICENSES_ASK)
 _LICENSE_STATUS_${lic}?=	accepted
-.		endif
+.        endif
 _LICENSE_STATUS_${lic}?=	ask
-.	endfor
-.endif
+.      endfor
+.    endif
 
 # Evaluate general status
 
-.if ${_LICENSE_COMB} == "dual"
-.	for lic in ${_LICENSE}
-.		if ${_LICENSE_STATUS_${lic}} == "accepted"
+.    if ${_LICENSE_COMB} == "dual"
+.      for lic in ${_LICENSE}
+.        if ${_LICENSE_STATUS_${lic}} == "accepted"
 _LICENSE_STATUS=	accepted
-.		elif ${_LICENSE_STATUS_${lic}} == "ask"
+.        elif ${_LICENSE_STATUS_${lic}} == "ask"
 _LICENSE_STATUS?=	ask
 _LICENSE_TO_ASK+=	${lic}
-.		endif
+.        endif
 _LICENSE_STATUS?=	rejected
-.	endfor
+.      endfor
 
-.elif ${_LICENSE_COMB} == "multi"
-.	for lic in ${_LICENSE}
-.		if ${_LICENSE_STATUS_${lic}} == "rejected"
+.    elif ${_LICENSE_COMB} == "multi"
+.      for lic in ${_LICENSE}
+.        if ${_LICENSE_STATUS_${lic}} == "rejected"
 _LICENSE_STATUS=	rejected
-.		elif ${_LICENSE_STATUS_${lic}} == "ask"
+.        elif ${_LICENSE_STATUS_${lic}} == "ask"
 _LICENSE_STATUS?=	ask
 _LICENSE_TO_ASK+=	${lic}
-.		endif
-.	endfor
+.        endif
+.      endfor
 _LICENSE_STATUS?=	accepted
-.endif
+.    endif
 
 # For dual/multi licenses, after processing all sub-licenses, the following
 # must be determined: _LICENSE_NAME, _LICENSE_PERMS and _LICENSE_GROUPS.
 
-.if ${_LICENSE_COMB} == "dual"
+.    if ${_LICENSE_COMB} == "dual"
 _LICENSE_NAME=		Dual (any of): ${_LICENSE}
 # Calculate least restrictive permissions (union)
 _LICENSE_PERMS:=	#
-.	for lic in ${_LICENSE}
-.		for comp in ${_LICENSE_LIST_PERMS}
-.			if ${_LICENSE_PERMS_${lic}:M${comp}} != "" && \
+.      for lic in ${_LICENSE}
+.        for comp in ${_LICENSE_LIST_PERMS}
+.          if ${_LICENSE_PERMS_${lic}:M${comp}} != "" && \
 			   ${_LICENSE_PERMS:M${comp}} == ""
 _LICENSE_PERMS+=	${comp}
-.			endif
-.		endfor
-.	endfor
+.          endif
+.        endfor
+.      endfor
 # Calculate least restrictive groups (union)
 _LICENSE_GROUPS:=	#
-.	for lic in ${_LICENSE}
-.		for comp in ${_LICENSE_LIST_GROUPS}
-.			if ${_LICENSE_GROUPS_${lic}:M${comp}} != "" && \
+.      for lic in ${_LICENSE}
+.        for comp in ${_LICENSE_LIST_GROUPS}
+.          if ${_LICENSE_GROUPS_${lic}:M${comp}} != "" && \
 			   ${_LICENSE_GROUPS:M${comp}} == ""
 _LICENSE_GROUPS+=	${comp}
-.			endif
-.		endfor
-.	endfor
+.          endif
+.        endfor
+.      endfor
 
-.elif ${_LICENSE_COMB} == "multi"
+.    elif ${_LICENSE_COMB} == "multi"
 _LICENSE_NAME=		Multiple (all of): ${_LICENSE}
 # Calculate most restrictive permissions (intersection)
 _LICENSE_PERMS:=	${_LICENSE_LIST_PERMS}
-.	for lic in ${_LICENSE}
-.		for comp in ${_LICENSE_LIST_PERMS}
-.			if ${_LICENSE_PERMS_${lic}:M${comp}} == ""
+.      for lic in ${_LICENSE}
+.        for comp in ${_LICENSE_LIST_PERMS}
+.          if ${_LICENSE_PERMS_${lic}:M${comp}} == ""
 _LICENSE_PERMS:=	${_LICENSE_PERMS:N${comp}}
-.			endif
-.		endfor
-.	endfor
+.          endif
+.        endfor
+.      endfor
 # Calculate most restrictive groups (intersection)
 _LICENSE_GROUPS:=	${_LICENSE_LIST_GROUPS}
-.	for lic in ${_LICENSE}
-.		for comp in ${_LICENSE_LIST_GROUPS}
-.			if ${_LICENSE_GROUPS_${lic}:M${comp}} == ""
+.      for lic in ${_LICENSE}
+.        for comp in ${_LICENSE_LIST_GROUPS}
+.          if ${_LICENSE_GROUPS_${lic}:M${comp}} == ""
 _LICENSE_GROUPS:=	${_LICENSE_GROUPS:N${comp}}
-.			endif
-.		endfor
-.	endfor
-.endif
+.          endif
+.        endfor
+.      endfor
+.    endif
 
 # Prepare information for asking license to the user
 
-.if ${_LICENSE_STATUS} == "ask" && ${_LICENSE_COMB} != "single"
+.    if ${_LICENSE_STATUS} == "ask" && ${_LICENSE_COMB} != "single"
 _LICENSE_ASK_DATA!=	mktemp -ut portslicense
-.endif
+.    endif
 
 # Calculate restrictions and set RESTRICTED_FILES when
 # appropiate, together with cleaning targets.
@@ -522,103 +522,103 @@ _LICENSE_ASK_DATA!=	mktemp -ut portslicense
 # CDROM and FTP, but the current framework supports separating them (would
 # require better/new delete-package and delete-distfiles targets)
 
-.if ${_LICENSE_PERMS:Mpkg-mirror} == ""
+.    if ${_LICENSE_PERMS:Mpkg-mirror} == ""
 _LICENSE_RESTRICTED+=	delete-package
-.elif ${_LICENSE_PERMS:Mpkg-sell} == ""
+.    elif ${_LICENSE_PERMS:Mpkg-sell} == ""
 _LICENSE_CDROM+=		delete-package
-.endif
+.    endif
 
-.if ${_LICENSE_COMB} == "multi"
-.	for lic in ${_LICENSE}
-.		if ${_LICENSE_PERMS_${lic}:Mdist-mirror} == "" || ${_LICENSE_PERMS_${lic}:Mdist-sell} == ""
+.    if ${_LICENSE_COMB} == "multi"
+.      for lic in ${_LICENSE}
+.        if ${_LICENSE_PERMS_${lic}:Mdist-mirror} == "" || ${_LICENSE_PERMS_${lic}:Mdist-sell} == ""
 RESTRICTED_FILES+=		${_LICENSE_DISTFILES_${lic}}
-.		endif
-.	endfor
-.	if defined(RESTRICTED_FILES)
+.        endif
+.      endfor
+.      if defined(RESTRICTED_FILES)
 RESTRICTED_FILES+=		${_PATCHFILES}
 _LICENSE_RESTRICTED+=	delete-distfiles
 _LICENSE_CDROM+=		delete-distfiles
-.	endif
-.else
-.	if ${_LICENSE_PERMS:Mdist-mirror} == ""
+.      endif
+.    else
+.      if ${_LICENSE_PERMS:Mdist-mirror} == ""
 _LICENSE_RESTRICTED+=	delete-distfiles
 RESTRICTED_FILES=		${_PATCHFILES} ${_DISTFILES}
-.	elif ${_LICENSE_PERMS:Mdist-sell} == ""
+.      elif ${_LICENSE_PERMS:Mdist-sell} == ""
 _LICENSE_CDROM+=		delete-distfiles
 RESTRICTED_FILES=		${_PATCHFILES} ${_DISTFILES}
-.	endif
-.endif
+.      endif
+.    endif
 
-.if defined(_LICENSE_RESTRICTED)
+.    if defined(_LICENSE_RESTRICTED)
 # _LICENSE_RESTRICTED contains 'delete-distfiles' and 'delete-package' if
 # needed with RESTRICTED_FILES filled from above.
 clean-restricted:	${_LICENSE_RESTRICTED}
 clean-restricted-list: ${_LICENSE_RESTRICTED:C/$/-list/}
-.else
+.    else
 clean-restricted:
 clean-restricted-list:
-.endif
+.    endif
 
-.if defined(_LICENSE_CDROM)
+.    if defined(_LICENSE_CDROM)
 clean-for-cdrom:	${_LICENSE_CDROM}
 clean-for-cdrom-list: ${_LICENSE_CDROM:C/$/-list/}
-.else
+.    else
 clean-for-cdrom:
 clean-for-cdrom-list:
-.endif
+.    endif
 
 # Check variables are correctly defined and print status up to here
 
-.if ${_LICENSE_STATUS} == "ask" && defined(BATCH)
+.    if ${_LICENSE_STATUS} == "ask" && defined(BATCH)
 IGNORE=		License ${_LICENSE} needs confirmation, but BATCH is defined
-.endif
+.    endif
 
 # This should probably be incrementally done while parsing all the license
 # possibilities.
 debug-license: check-license
-.if ${_LICENSE_PERMS:Mdist-mirror}
+.    if ${_LICENSE_PERMS:Mdist-mirror}
 	@${ECHO_MSG} "===>  License allows mirroring distribution files"
-.else
+.    else
 	@${ECHO_MSG} "===>  License does not allow mirroring distribution files"
-.endif
-.if ${_LICENSE_PERMS:Mdist-sell}
+.    endif
+.    if ${_LICENSE_PERMS:Mdist-sell}
 	@${ECHO_MSG} "===>  License allows selling distribution files"
-.else
+.    else
 	@${ECHO_MSG} "===>  License does not allow selling distribution files"
-.endif
-.if ${_LICENSE_PERMS:Mpkg-mirror}
+.    endif
+.    if ${_LICENSE_PERMS:Mpkg-mirror}
 	@${ECHO_MSG} "===>  License allows mirroring pre-built packages"
-.else
+.    else
 	@${ECHO_MSG} "===>  License does not allow mirroring pre-build packages"
-.endif
-.if ${_LICENSE_PERMS:Mpkg-sell}
+.    endif
+.    if ${_LICENSE_PERMS:Mpkg-sell}
 	@${ECHO_MSG} "===>  License allows selling pre-build packages"
-.else
+.    else
 	@${ECHO_MSG} "===>  License does not allow selling pre-build packages"
-.endif
-.if ${_LICENSE_PERMS:Mauto-accept}
+.    endif
+.    if ${_LICENSE_PERMS:Mauto-accept}
 	@${ECHO_MSG} "===>  License allows being auto-accepted"
-.else
+.    else
 	@${ECHO_MSG} "===>  License requires manual intervention by the user to accept its terms"
-.endif
+.    endif
 
 
 check-license:
-.if defined(_LICENSE_ERROR)
+.    if defined(_LICENSE_ERROR)
 		@${ECHO_MSG} "===>  License not correctly defined: ${_LICENSE_ERROR}"
 		@exit 1
-.endif
-.if ${_LICENSE_STATUS} == "rejected"
+.    endif
+.    if ${_LICENSE_STATUS} == "rejected"
 		@${ECHO_MSG} "===>  License ${_LICENSE} rejected by the user"
 		@${ECHO_MSG}
 		@${ECHO_MSG} "If you want to install this port make sure the following license(s) are not present in LICENSES_REJECTED, either in make arguments or /etc/make.conf: ${_LICENSE}. Also check LICENSES_GROUPS_REJECTED in case they contain a group this license(s) belong to." | ${FMT}
 		@${ECHO_MSG}
 		@exit 1
-.elif ${_LICENSE_STATUS} == "accepted"
+.    elif ${_LICENSE_STATUS} == "accepted"
 		@${ECHO_MSG} "===>  License ${_LICENSE} accepted by the user"
-.elif ${_LICENSE_STATUS} == "ask"
+.    elif ${_LICENSE_STATUS} == "ask"
 		@${ECHO_MSG} "===>  License ${_LICENSE} needs confirmation, will ask later"
-.endif
+.    endif
 
 # Display, ask and save preference if requested
 
@@ -626,35 +626,35 @@ ask-license: ${_LICENSE_COOKIE}
 
 ${_LICENSE_COOKIE}:
 # Make sure all required license files exist
-.if ${_LICENSE_COMB} == "single"
-.	if !defined(LICENSE_FILE) && defined(_LICENSE_TEXT)
+.    if ${_LICENSE_COMB} == "single"
+.      if !defined(LICENSE_FILE) && defined(_LICENSE_TEXT)
 	@test -f ${_LICENSE_FILE} || ${ECHO_CMD} "${_LICENSE_TEXT}" | ${FMT} > ${_LICENSE_FILE}
-.	endif
+.      endif
 	@test -f ${_LICENSE_FILE} || \
 		(${ECHO_MSG} "===>  Missing license file for ${_LICENSE} in ${_LICENSE_FILE}"; exit 1)
-.else
-.	for lic in ${_LICENSE}
-.		if !defined(LICENSE_FILE_${lic}) && defined(_LICENSE_TEXT_${lic})
+.    else
+.      for lic in ${_LICENSE}
+.        if !defined(LICENSE_FILE_${lic}) && defined(_LICENSE_TEXT_${lic})
 	@test -f ${_LICENSE_FILE_${lic}} || ${ECHO_CMD} "${_LICENSE_TEXT_${lic}}" | ${FMT} > ${_LICENSE_FILE_${lic}}
-.		endif
+.        endif
 	@test -f ${_LICENSE_FILE_${lic}} || \
 		(${ECHO_MSG} "===>  Missing license file for ${lic} in ${_LICENSE_FILE_${lic}}"; exit 1)
-.	endfor
-.endif
+.      endfor
+.    endif
 
-.if ${_LICENSE_STATUS} == "ask"
-.	if !defined(NO_LICENSES_DIALOGS)
+.    if ${_LICENSE_STATUS} == "ask"
+.      if !defined(NO_LICENSES_DIALOGS)
 # Dialog interface
-.		if ${_LICENSE_COMB} == "single"
+.        if ${_LICENSE_COMB} == "single"
 	@${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \
 		--yes-label Accept --no-label Reject --yesno \
 		"$$(${CAT} ${_LICENSE_FILE})" 21 76
 
-.		elif ${_LICENSE_COMB} == "dual"
+.        elif ${_LICENSE_COMB} == "dual"
 	@${RM} ${_LICENSE_ASK_DATA}
-.			for lic in ${_LICENSE_TO_ASK}
+.          for lic in ${_LICENSE_TO_ASK}
 	@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
-.			endfor
+.          endfor
 	@menu_cmd="${DIALOG} --hline \"This port requires you to accept at least one license\" --menu \"License for ${PKGNAME} (dual)\" 21 70 15"; \
 	trap '${RM} $$tmpfile' EXIT INT TERM; \
 	tmpfile=$$(mktemp -t portlicenses); \
@@ -676,11 +676,11 @@ ${_LICENSE_COOKIE}:
 		esac; \
 	done
 
-.		elif ${_LICENSE_COMB} == "multi"
+.        elif ${_LICENSE_COMB} == "multi"
 	@${RM} ${_LICENSE_ASK_DATA}
-.			for lic in ${_LICENSE_TO_ASK}
+.          for lic in ${_LICENSE_TO_ASK}
 	@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
-.			endfor
+.          endfor
 	@menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \
 	trap '${RM} $$tmpfile' EXIT INT TERM; \
 	tmpfile=$$(mktemp -t portlicenses); \
@@ -699,117 +699,117 @@ ${_LICENSE_COOKIE}:
 				${DIALOG} --textbox "$${file}" 21 75 ;; \
 		esac; \
 	done
-.		endif
+.        endif
 
-.	else
+.      else
 # Text interface
 	@${ECHO_MSG}
-.		if ${_LICENSE_COMB} == "single"
+.        if ${_LICENSE_COMB} == "single"
 	@${ECHO_MSG} "To install the port you must agree to the license: ${_LICENSE} (${_LICENSE_NAME})." | ${FMT}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can view the license at ${_LICENSE_FILE:S/${WRKDIR}\//${WRKDIR:T}\//}."
-.		elif ${_LICENSE_COMB} == "dual"
+.        elif ${_LICENSE_COMB} == "dual"
 	@${ECHO_MSG} "To install the port you must agree to any of the following licenses:"
-.		elif ${_LICENSE_COMB} == "multi"
+.        elif ${_LICENSE_COMB} == "multi"
 	@${ECHO_MSG} "To install the port you must agree to all of the following licenses:"
-.		endif
+.        endif
 	@${ECHO_MSG}
-.		if ${_LICENSE_COMB} != "single"
-.			for lic in ${_LICENSE_TO_ASK}
-.				if defined(WRKDIRPREFIX)
+.        if ${_LICENSE_COMB} != "single"
+.          for lic in ${_LICENSE_TO_ASK}
+.            if defined(WRKDIRPREFIX)
 	@${ECHO_MSG} "- ${lic} (${_LICENSE_NAME_${lic}}), available at ${_LICENSE_FILE_${lic}}"
-.				else
+.            else
 	@${ECHO_MSG} "- ${lic} (${_LICENSE_NAME_${lic}}), available at ${_LICENSE_FILE_${lic}:S/${WRKDIR}\//${WRKDIR:T}\//}"
-.				endif
-.			endfor
+.            endif
+.          endfor
 	@${ECHO_MSG}
-.		endif
+.        endif
 	@${ECHO_MSG} "If you agree with the corresponding license(s), add them to LICENSES_ACCEPTED either in make arguments or /etc/make.conf." | ${FMT}
 	@${ECHO_MSG}
 	@exit 1
-.	endif
+.      endif
 	@${RM} ${_LICENSE_ASK_DATA}
-.endif
+.    endif
 
 # Create report and catalog
-.if !defined(NO_LICENSES_INSTALL)
+.    if !defined(NO_LICENSES_INSTALL)
 	@${RM} ${_LICENSE_CATALOG_TMP} ${_LICENSE_REPORT_TMP}
-.	if ${_LICENSE_COMB} == "single"
+.      if ${_LICENSE_COMB} == "single"
 # Catalog
-.		for var in _LICENSE _LICENSE_NAME _LICENSE_PERMS _LICENSE_GROUPS _LICENSE_DISTFILES
+.        for var in _LICENSE _LICENSE_NAME _LICENSE_PERMS _LICENSE_GROUPS _LICENSE_DISTFILES
 	@${ECHO_CMD} "${var}=${${var}:C/^[[:blank:]]*//}" >> ${_LICENSE_CATALOG_TMP}
-.		endfor
+.        endfor
 # Report
 	@${ECHO_CMD} "This package has a single license: ${_LICENSE} (${_LICENSE_NAME})." > ${_LICENSE_REPORT_TMP}
-.	else
+.      else
 # Catalog
-.		for var in _LICENSE _LICENSE_COMB _LICENSE_NAME _LICENSE_PERMS _LICENSE_GROUPS
+.        for var in _LICENSE _LICENSE_COMB _LICENSE_NAME _LICENSE_PERMS _LICENSE_GROUPS
 	@${ECHO_CMD} "${var}=${${var}:C/^[[:blank:]]*//}" >> ${_LICENSE_CATALOG_TMP}
-.		endfor
-.		if ${_LICENSE_COMB} == "dual" && ${_LICENSE_STATUS} == "ask"
+.        endfor
+.        if ${_LICENSE_COMB} == "dual" && ${_LICENSE_STATUS} == "ask"
 	@${SED} -e 's/^/_LICENSE_SELECTED=/' ${_LICENSE_COOKIE} >> ${_LICENSE_CATALOG_TMP}
-.		endif
-.		for lic in ${_LICENSE}
-.			for var in NAME PERMS GROUPS DISTFILES
+.        endif
+.        for lic in ${_LICENSE}
+.          for var in NAME PERMS GROUPS DISTFILES
 	@${ECHO_CMD} "_LICENSE_${var}_${lic} =${_LICENSE_${var}_${lic}:C/^[[:blank:]]*//}" >> ${_LICENSE_CATALOG_TMP}
-.			endfor
-.		endfor
+.          endfor
+.        endfor
 # Report
-.		if ${_LICENSE_COMB} == "dual"
+.        if ${_LICENSE_COMB} == "dual"
 	@${ECHO_CMD} "This package has dual licenses (any of):"  >> ${_LICENSE_REPORT_TMP}
-.		elif ${_LICENSE_COMB} == "multi"
+.        elif ${_LICENSE_COMB} == "multi"
 	@${ECHO_CMD} "This package has multiple licenses (all of):"  >> ${_LICENSE_REPORT_TMP}
-.		endif
-.		for lic in ${_LICENSE}
+.        endif
+.        for lic in ${_LICENSE}
 	@${ECHO_CMD} "- ${lic} (${_LICENSE_NAME_${lic}})"  >> ${_LICENSE_REPORT_TMP}
-.		endfor
-.	endif
-.endif
+.        endfor
+.      endif
+.    endif
 
 # Cookie (done here)
 	@${TOUCH} ${_LICENSE_COOKIE}
 
 # Package list entries, and installation
 
-.if !defined(NO_LICENSES_INSTALL)
+.    if !defined(NO_LICENSES_INSTALL)
 PLIST_FILES+=	${_LICENSE_CATALOG} \
 				${_LICENSE_REPORT}
 
-.if ${_LICENSE_COMB} == "single"
+.      if ${_LICENSE_COMB} == "single"
 PLIST_FILES+=	${_LICENSE_DIR}/${_LICENSE}
-.else
-.	for lic in ${_LICENSE}
-.		if defined(_LICENSE_FILE_${lic})
+.      else
+.        for lic in ${_LICENSE}
+.          if defined(_LICENSE_FILE_${lic})
 PLIST_FILES+=	${_LICENSE_DIR}/${lic}
-.		endif
-.	endfor
-.endif
+.          endif
+.        endfor
+.      endif
 
 install-license:
 	@${MKDIR} ${STAGEDIR}${_LICENSE_DIR}
 	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG}
 	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${STAGEDIR}${_LICENSE_REPORT}
-.if ${_LICENSE_COMB} == "single"
+.      if ${_LICENSE_COMB} == "single"
 	@${INSTALL_DATA} ${_LICENSE_FILE} ${STAGEDIR}${_LICENSE_DIR}/${_LICENSE}
-.else
-.	for lic in ${_LICENSE}
+.      else
+.        for lic in ${_LICENSE}
 	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR}/${lic}
-.	endfor
-.endif
-.endif
+.        endfor
+.      endif
+.    endif
 
-.else	# !LICENSE
+.  else	# !LICENSE
 
 debug-license:
-.	if defined(LICENSE_VERBOSE)
+.    if defined(LICENSE_VERBOSE)
 	@${ECHO_MSG} "===>  License debug empty, port has not defined LICENSE"
-.	endif
+.    endif
 
 check-license:
-.	if defined(LICENSE_VERBOSE)
+.    if defined(LICENSE_VERBOSE)
 	@${ECHO_MSG} "===>  License check disabled, port has not defined LICENSE"
-.	endif
+.    endif
 
-.endif	# LICENSE
+.  endif	# LICENSE
 
 .endif
diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk
index cb88998b89e6..1dc29209e785 100644
--- a/Mk/bsd.ocaml.mk
+++ b/Mk/bsd.ocaml.mk
@@ -97,28 +97,28 @@ OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
 
 # ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
 # work well with staging.
-.if defined(USE_OCAML_LDCONFIG)
-. if !target(ocaml-ldconfig)
+.  if defined(USE_OCAML_LDCONFIG)
+.    if !target(ocaml-ldconfig)
 OCAMLFIND_LDCONF?=	/dev/null
-. endif
-.endif
+.    endif
+.  endif
 
 OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
 OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
 
-.if defined(USE_OCAML)
-. if !defined(NO_OCAML_BUILDDEPENDS)
+.  if defined(USE_OCAML)
+.    if !defined(NO_OCAML_BUILDDEPENDS)
 EXTRACT_DEPENDS+=	${OCAMLC_DEPEND}
 PATCH_DEPENDS+=		${OCAMLC_DEPEND}
 BUILD_DEPENDS+=		${OCAMLC_DEPEND}
-. endif
-. if !defined(NO_OCAML_RUNDEPENDS)
+.    endif
+.    if !defined(NO_OCAML_RUNDEPENDS)
 RUN_DEPENDS+=		${OCAMLC_DEPEND}
-. endif
+.    endif
 PLIST_SUB+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
-.endif
+.  endif
 
-.if defined(USE_OCAML_FINDLIB)
+.  if defined(USE_OCAML_FINDLIB)
 #
 # We'll additionally add ocamlfind to RUN_DEPENDS, since
 # if the port requires ocamlfind to install - it requires
@@ -135,64 +135,64 @@ MAKE_ENV+=	OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \
 #
 OCAML_PKGDIRS?=	${PORTNAME}
 _USES_install+=	735:ocaml-findlib
-. if !target(ocaml-findlib)
+.    if !target(ocaml-findlib)
 ocaml-findlib:
-.  for DIR in ${OCAML_PKGDIRS}
-.   if defined(USE_OCAMLFIND_PLIST)
+.      for DIR in ${OCAML_PKGDIRS}
+.        if defined(USE_OCAMLFIND_PLIST)
 	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \
 		's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-.   endif
+.        endif
 	@${ECHO_CMD} "@postunexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
 		>> ${TMPPLIST}
-.  endfor
-. endif
-.endif
+.      endfor
+.    endif
+.  endif
 
-.if defined(USE_OCAML_CAMLP4)
+.  if defined(USE_OCAML_CAMLP4)
 BUILD_DEPENDS+=		${CAMLP4_DEPEND}
-.endif
+.  endif
 
-.if defined(USE_OCAML_TK)
-. if !defined(NO_OCAMLTK_BUILDDEPENDS)
+.  if defined(USE_OCAML_TK)
+.    if !defined(NO_OCAMLTK_BUILDDEPENDS)
 EXTRACT_DEPENDS+=	${OCAMLTK_DEPENDS}
 PATCH_DEPENDS+=		${OCAMLTK_DEPENDS}
 BUILD_DEPENDS+=		${OCAMLTK_DEPENDS}
-. endif
-. if !defined(NO_OCAMLTK_RUNDEPENDS)
+.    endif
+.    if !defined(NO_OCAMLTK_RUNDEPENDS)
 RUN_DEPENDS+=		${OCAMLTK_DEPENDS}
-. endif
-.endif
+.    endif
+.  endif
 
-.if defined(USE_OCAML_LDCONFIG)
+.  if defined(USE_OCAML_LDCONFIG)
 #
 # Directories under PREFIX for appending to ld.conf
 #
 OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${PORTNAME}
 _USES_install+=	740:ocaml-ldconfig
-. if !target(ocaml-ldconfig)
+.    if !target(ocaml-ldconfig)
 ocaml-ldconfig:
-.  for LIB in ${OCAML_LDLIBS}
+.      for LIB in ${OCAML_LDLIBS}
 	@${ECHO_CMD} "@postexec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "@postunexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
-.  endfor
-. endif
-.endif
+.      endfor
+.    endif
+.  endif
 
-.if defined(USE_OCAML_WASH)
+.  if defined(USE_OCAML_WASH)
 PLIST_FILES+=	"@rmempty ${OCAML_LDCONF}"
-.endif
+.  endif
 
 .endif #!defined(OCAML_include)
 
 .if defined(_POSTMKINCLUDED)
 
-.if defined(USE_OCAML_FINDLIB)
+.  if defined(USE_OCAML_FINDLIB)
 
 pre-install: ${STAGEDIR}${OCAMLFIND_DESTDIR}
 ${STAGEDIR}${OCAMLFIND_DESTDIR}:
 	@${MKDIR} ${.TARGET}
 
-.endif
+.  endif
 
 .endif # _POSTMKINCLUDED
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 99a3275b05eb..a1934d5f19f3 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -212,11 +212,11 @@ _OPTIONS_TARGETS=	fetch:300:pre fetch:500:do fetch:700:post \
 			stage:800:post
 
 # Add per arch options
-.for opt in ${OPTIONS_DEFINE_${ARCH}}
-.if empty(OPTIONS_DEFINE:M${opt})
+.  for opt in ${OPTIONS_DEFINE_${ARCH}}
+.    if empty(OPTIONS_DEFINE:M${opt})
 OPTIONS_DEFINE+=	${opt}
-.endif
-.endfor
+.    endif
+.  endfor
 
 # Add per arch defaults
 OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${ARCH}}
@@ -225,36 +225,36 @@ _ALL_EXCLUDE=	${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} \
 		${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${OPSYS}} \
 		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
 
-.for opt in ${OPTIONS_DEFINE:O:u}
-.  if !${_ALL_EXCLUDE:M${opt}}
-.    for opt_implied in ${${opt}_IMPLIES}
-.       if ${_ALL_EXCLUDE:M${opt_implied}}
+.  for opt in ${OPTIONS_DEFINE:O:u}
+.    if !${_ALL_EXCLUDE:M${opt}}
+.      for opt_implied in ${${opt}_IMPLIES}
+.        if ${_ALL_EXCLUDE:M${opt_implied}}
 _ALL_EXCLUDE+=	${opt}
-.       endif
-.    endfor
-.  endif
-.endfor
+.        endif
+.      endfor
+.    endif
+.  endfor
 
 # Remove options the port maintainer doesn't want, part 1
-.for opt in ${_ALL_EXCLUDE:O:u}
+.  for opt in ${_ALL_EXCLUDE:O:u}
 OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:N${opt}}
 OPTIONS_DEFINE:=	${OPTIONS_DEFINE:N${opt}}
-.  for otype in SINGLE RADIO MULTI GROUP
-.    for m in ${OPTIONS_${otype}}
+.    for otype in SINGLE RADIO MULTI GROUP
+.      for m in ${OPTIONS_${otype}}
 OPTIONS_${otype}_${m}:=	${OPTIONS_${otype}_${m}:N${opt}}
+.      endfor
 .    endfor
 .  endfor
-.endfor
 
 # Remove empty SINGLE/GROUP/RADIO/MULTI
 # Can be empty because of exclude/slaves
-.for otype in SINGLE RADIO MULTI GROUP
-.  for m in ${OPTIONS_${otype}}
-.    if empty(OPTIONS_${otype}_${m})
+.  for otype in SINGLE RADIO MULTI GROUP
+.    for m in ${OPTIONS_${otype}}
+.      if empty(OPTIONS_${otype}_${m})
 OPTIONS_${otype}:=	${OPTIONS_${otype}:N${m}}
-.    endif
+.      endif
+.    endfor
 .  endfor
-.endfor
 
 # Sort options
 ALL_OPTIONS:=	${OPTIONS_DEFINE:O:u}
@@ -262,92 +262,92 @@ OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:O:u}
 
 # complete list
 COMPLETE_OPTIONS_LIST=	${ALL_OPTIONS}
-.for otype in SINGLE RADIO MULTI GROUP
-.  for m in ${OPTIONS_${otype}}
+.  for otype in SINGLE RADIO MULTI GROUP
+.    for m in ${OPTIONS_${otype}}
 COMPLETE_OPTIONS_LIST+=	${OPTIONS_${otype}_${m}}
+.    endfor
 .  endfor
-.endfor
 
 # Some options are always enabled by default.
-.for _opt in DOCS NLS EXAMPLES IPV6
-.if ${COMPLETE_OPTIONS_LIST:M${_opt}}
+.  for _opt in DOCS NLS EXAMPLES IPV6
+.    if ${COMPLETE_OPTIONS_LIST:M${_opt}}
 PORT_OPTIONS+=	${_opt}
-.endif
-.endfor
+.    endif
+.  endfor
 
 # Remove options the port maintainer doesn't want, part 2
-.for opt in ${_ALL_EXCLUDE:O:u}
+.  for opt in ${_ALL_EXCLUDE:O:u}
 PORT_OPTIONS:=		${PORT_OPTIONS:N${opt}}
-.endfor
+.  endfor
 
 ## Now create the list of activated options
-.if defined(OPTIONS_OVERRIDE)
+.  if defined(OPTIONS_OVERRIDE)
 # Special case $OPTIONS_OVERRIDE; if it is defined forget about anything done
 # before
 NEW_OPTIONS=
 PORT_OPTIONS:=	${OPTIONS_OVERRIDE}
-.else
+.  else
 NEW_OPTIONS=	${COMPLETE_OPTIONS_LIST}
 
 ## Set default options defined by the port maintainer
 PORT_OPTIONS+=	${OPTIONS_DEFAULT}
 
 ## Set system-wide defined options (set by user in make.conf)
-.  for opt in ${OPTIONS_SET}
-.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
+.    for opt in ${OPTIONS_SET}
+.      if !empty(COMPLETE_OPTIONS_LIST:M${opt})
 PORT_OPTIONS+=	${opt}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.    endif
-.  endfor
+.      endif
+.    endfor
 
 ## Remove the options excluded system-wide (set by user in make.conf)
-.  for opt in ${OPTIONS_UNSET}
+.    for opt in ${OPTIONS_UNSET}
 PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.  endfor
+.    endfor
 
 ## Set the options specified per-port (set by user in make.conf)
-.  for opt in ${${OPTIONS_NAME}_SET}
-.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
+.    for opt in ${${OPTIONS_NAME}_SET}
+.      if !empty(COMPLETE_OPTIONS_LIST:M${opt})
 PORT_OPTIONS+=	${opt}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.    endif
-.  endfor
+.      endif
+.    endfor
 
 ## Unset the options excluded per-port (set by user in make.conf)
-.  for opt in ${${OPTIONS_NAME}_UNSET}
+.    for opt in ${${OPTIONS_NAME}_UNSET}
 PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.  endfor
+.    endfor
 
 ## options files (from dialog)
-.  if exists(${OPTIONS_FILE}) && !make(rmconfig)
+.    if exists(${OPTIONS_FILE}) && !make(rmconfig)
 .  include "${OPTIONS_FILE}"
-.  endif
+.    endif
 .  sinclude "${OPTIONS_FILE}.local"
 
 _OPTIONS_UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
-.for _k in SET UNSET SET_FORCE UNSET_FORCE
-.if defined(${_OPTIONS_UNIQUENAME}_${_k})
+.    for _k in SET UNSET SET_FORCE UNSET_FORCE
+.      if defined(${_OPTIONS_UNIQUENAME}_${_k})
 WARNING+=	"You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:"
 WARNING+=	"${OPTIONS_NAME}_${_k}=	${${_OPTIONS_UNIQUENAME}_${_k}}"
-.endif
-.endfor
+.      endif
+.    endfor
 
 ## Finish by using the options set by the port config dialog, if any
-.  for opt in ${OPTIONS_FILE_SET}
-.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
+.    for opt in ${OPTIONS_FILE_SET}
+.      if !empty(COMPLETE_OPTIONS_LIST:M${opt})
 PORT_OPTIONS+=	${opt}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.    endif
-.  endfor
+.      endif
+.    endfor
 
-.for opt in ${OPTIONS_FILE_UNSET}
+.    for opt in ${OPTIONS_FILE_UNSET}
 PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.endfor
+.    endfor
 
-.endif
+.  endif
 
 ## FORCE
 ## Set system-wide defined options (set by user in make.conf)
@@ -380,52 +380,52 @@ NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
 
 
 ## Cmdline always win over the rest
-.for opt in ${WITH}
-.  if !empty(COMPLETE_OPTIONS_LIST:M${opt})
+.  for opt in ${WITH}
+.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
 PORT_OPTIONS+=	${opt}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.  endif
-.endfor
+.    endif
+.  endfor
 
-.for opt in ${WITHOUT}
+.  for opt in ${WITHOUT}
 PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.endfor
+.  endfor
 
 ## Enable options implied by other options
 # _PREVENTS is handled in bsd.port.mk:pre-check-config
 ## 1) Build dependency chain in A.B format:
 _DEPCHAIN=
-.for opt in ${COMPLETE_OPTIONS_LIST}
-.  for o in ${${opt}_IMPLIES}
+.  for opt in ${COMPLETE_OPTIONS_LIST}
+.    for o in ${${opt}_IMPLIES}
 _DEPCHAIN+=	${opt}.$o
+.    endfor
 .  endfor
-.endfor
 ## 2) Check each dependency pair and if LHS is in PORT_OPTIONS then add RHS.
 ##    All of RHS of "RHS.*" (i.e. indirect dependency) are also added for
 ##    fast convergence.
 _PORT_OPTIONS:=	${PORT_OPTIONS}
-.for _count in _0 ${COMPLETE_OPTIONS_LIST}
+.  for _count in _0 ${COMPLETE_OPTIONS_LIST}
 count=	${_count}
 ### Check if all of the nested dependency are resolved already.
-.  if ${count} == _0 || ${_PORT_OPTIONS} != ${PORT_OPTIONS}
+.    if ${count} == _0 || ${_PORT_OPTIONS} != ${PORT_OPTIONS}
 PORT_OPTIONS:=	${_PORT_OPTIONS}
-.    for dc in ${_DEPCHAIN}
-.      for opt in ${_PORT_OPTIONS}
+.      for dc in ${_DEPCHAIN}
+.        for opt in ${_PORT_OPTIONS}
 _opt=${opt}
 ### Add all of direct and indirect dependency only if
 ### they are not in ${PORT_OPTIONS}.
-.        if !empty(_opt:M${dc:R})
-.          for d in ${dc:E} ${_DEPCHAIN:M${dc:E}.*:E}
-.            if empty(_PORT_OPTIONS:M$d)
+.          if !empty(_opt:M${dc:R})
+.            for d in ${dc:E} ${_DEPCHAIN:M${dc:E}.*:E}
+.              if empty(_PORT_OPTIONS:M$d)
 _PORT_OPTIONS+=	$d
-.            endif
-.          endfor
-.        endif
+.              endif
+.            endfor
+.          endif
+.        endfor
 .      endfor
-.    endfor
-.  endif
-.endfor
+.    endif
+.  endfor
 
 # Finally, add options required by slave ports
 PORT_OPTIONS+=	${OPTIONS_SLAVE}
@@ -437,201 +437,201 @@ _REALLY_ALL_POSSIBLE_OPTIONS:=	${COMPLETE_OPTIONS_LIST} ${_ALL_EXCLUDE}
 _REALLY_ALL_POSSIBLE_OPTIONS:=	${_REALLY_ALL_POSSIBLE_OPTIONS:O:u}
 
 # Handle PORTDOCS and PORTEXAMPLES
-.for _type in DOCS EXAMPLES
-. if !empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type})
-.  if empty(PORT_OPTIONS:M${_type})
+.  for _type in DOCS EXAMPLES
+.    if !empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type})
+.      if empty(PORT_OPTIONS:M${_type})
 PLIST_SUB+=		PORT${_type}="@comment "
-.  else
+.      else
 PLIST_SUB+=		PORT${_type}=""
-.  endif
-. endif
-.endfor
+.      endif
+.    endif
+.  endfor
 
-.if defined(NO_OPTIONS_SORT)
+.  if defined(NO_OPTIONS_SORT)
 ALL_OPTIONS=	${OPTIONS_DEFINE}
-.endif
+.  endif
 
-.for target in ${_OPTIONS_TARGETS:C/:.*//:u}
+.  for target in ${_OPTIONS_TARGETS:C/:.*//:u}
 _OPTIONS_${target}?=
-.endfor
+.  endfor
 
-.for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
+.  for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
 # PLIST_SUB
 PLIST_SUB?=
 SUB_LIST?=
-.  if defined(OPTIONS_SUB)
-.    if ! ${PLIST_SUB:M${opt}=*}
-.      if ${PORT_OPTIONS:M${opt}}
+.    if defined(OPTIONS_SUB)
+.      if ! ${PLIST_SUB:M${opt}=*}
+.        if ${PORT_OPTIONS:M${opt}}
 PLIST_SUB:=	${PLIST_SUB} ${opt}="" NO_${opt}="@comment "
-.      else
+.        else
 PLIST_SUB:=	${PLIST_SUB} ${opt}="@comment " NO_${opt}=""
+.        endif
 .      endif
-.    endif
-.    if ! ${SUB_LIST:M${opt}=*}
-.      if ${PORT_OPTIONS:M${opt}}
+.      if ! ${SUB_LIST:M${opt}=*}
+.        if ${PORT_OPTIONS:M${opt}}
 SUB_LIST:=	${SUB_LIST} ${opt}="" NO_${opt}="@comment "
-.      else
+.        else
 SUB_LIST:=	${SUB_LIST} ${opt}="@comment " NO_${opt}=""
+.        endif
 .      endif
 .    endif
-.  endif
 
-.  if ${PORT_OPTIONS:M${opt}}
-.    if defined(${opt}_USE)
-.      for option in ${${opt}_USE:C/=.*//:O:u}
+.    if ${PORT_OPTIONS:M${opt}}
+.      if defined(${opt}_USE)
+.        for option in ${${opt}_USE:C/=.*//:O:u}
 _u=		${option}
 USE_${_u:tu}+=	${${opt}_USE:M${option}=*:C/.*=//g:C/,/ /g}
-.      endfor
-.    endif
-.    if defined(${opt}_VARS)
-.      for var in ${${opt}_VARS:C/=.*//:O:u}
+.        endfor
+.      endif
+.      if defined(${opt}_VARS)
+.        for var in ${${opt}_VARS:C/=.*//:O:u}
 _u=			${var}
-.        if ${_u:M*+}
+.          if ${_u:M*+}
 ${_u:C/.$//:tu}+=	${${opt}_VARS:M${var}=*:C/[^+]*\+=//:C/^"(.*)"$$/\1/}
-.        else
+.          else
 ${_u:tu}=		${${opt}_VARS:M${var}=*:C/[^=]*=//:C/^"(.*)"$$/\1/}
-.        endif
-.      endfor
-.    endif
-.    if defined(${opt}_CONFIGURE_ENABLE)
+.          endif
+.        endfor
+.      endif
+.      if defined(${opt}_CONFIGURE_ENABLE)
 CONFIGURE_ARGS+=	${${opt}_CONFIGURE_ENABLE:S/^/--enable-/}
-.    endif
-.    if defined(${opt}_CONFIGURE_WITH)
+.      endif
+.      if defined(${opt}_CONFIGURE_WITH)
 CONFIGURE_ARGS+=	${${opt}_CONFIGURE_WITH:S/^/--with-/}
-.    endif
-.    if defined(${opt}_CMAKE_BOOL)
+.      endif
+.      if defined(${opt}_CMAKE_BOOL)
 CMAKE_ARGS+=		${${opt}_CMAKE_BOOL:C/.*/-D&:BOOL=true/}
-.    endif
-.    if defined(${opt}_CMAKE_BOOL_OFF)
+.      endif
+.      if defined(${opt}_CMAKE_BOOL_OFF)
 CMAKE_ARGS+=		${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=false/}
-.    endif
-.    if defined(${opt}_MESON_TRUE)
+.      endif
+.      if defined(${opt}_MESON_TRUE)
 MESON_ARGS+=		${${opt}_MESON_TRUE:C/.*/-D&=true/}
-.    endif
-.    if defined(${opt}_MESON_FALSE)
+.      endif
+.      if defined(${opt}_MESON_FALSE)
 MESON_ARGS+=		${${opt}_MESON_FALSE:C/.*/-D&=false/}
-.    endif
-.    if defined(${opt}_MESON_YES)
+.      endif
+.      if defined(${opt}_MESON_YES)
 MESON_ARGS+=		${${opt}_MESON_YES:C/.*/-D&=yes/}
-.    endif
-.    if defined(${opt}_MESON_NO)
+.      endif
+.      if defined(${opt}_MESON_NO)
 MESON_ARGS+=		${${opt}_MESON_NO:C/.*/-D&=no/}
-.    endif
-.    if defined(${opt}_MESON_ENABLED)
+.      endif
+.      if defined(${opt}_MESON_ENABLED)
 MESON_ARGS+=		${${opt}_MESON_ENABLED:C/.*/-D&=enabled/}
-.    endif
-.    if defined(${opt}_MESON_DISABLED)
+.      endif
+.      if defined(${opt}_MESON_DISABLED)
 MESON_ARGS+=		${${opt}_MESON_DISABLED:C/.*/-D&=disabled/}
-.    endif
-.    if defined(${opt}_CABAL_FLAGS)
+.      endif
+.      if defined(${opt}_CABAL_FLAGS)
 CABAL_FLAGS+=	${${opt}_CABAL_FLAGS}
-.    endif
-.    for configure in CONFIGURE CMAKE MESON QMAKE
-.      if defined(${opt}_${configure}_ON)
-${configure}_ARGS+=	${${opt}_${configure}_ON}
 .      endif
-.    endfor
-.    for flags in ${_OPTIONS_FLAGS}
-.      if defined(${opt}_${flags})
+.      for configure in CONFIGURE CMAKE MESON QMAKE
+.        if defined(${opt}_${configure}_ON)
+${configure}_ARGS+=	${${opt}_${configure}_ON}
+.        endif
+.      endfor
+.      for flags in ${_OPTIONS_FLAGS}
+.        if defined(${opt}_${flags})
 ${flags}+=	${${opt}_${flags}}
-.      endif
-.    endfor
-.    for deptype in ${_OPTIONS_DEPENDS}
-.      if defined(${opt}_${deptype}_DEPENDS)
+.        endif
+.      endfor
+.      for deptype in ${_OPTIONS_DEPENDS}
+.        if defined(${opt}_${deptype}_DEPENDS)
 ${deptype}_DEPENDS+=	${${opt}_${deptype}_DEPENDS}
-.      endif
-.    endfor
-.    for target in ${_OPTIONS_TARGETS}
+.        endif
+.      endfor
+.      for target in ${_OPTIONS_TARGETS}
 _target=	${target:C/:.*//}
 _prio=		${target:C/.*:(.*):.*/\1/}
 _type=		${target:C/.*://}
 _OPTIONS_${_target}:=	${_OPTIONS_${_target}} ${_prio}:${_type}-${_target}-${opt}-on
-.    endfor
-.  else
-.    if defined(${opt}_USE_OFF)
-.      for option in ${${opt}_USE_OFF:C/=.*//:O:u}
+.      endfor
+.    else
+.      if defined(${opt}_USE_OFF)
+.        for option in ${${opt}_USE_OFF:C/=.*//:O:u}
 _u=		${option}
 USE_${_u:tu}+=	${${opt}_USE_OFF:M${option}=*:C/.*=//g:C/,/ /g}
-.      endfor
-.    endif
-.    if defined(${opt}_VARS_OFF)
-.      for var in ${${opt}_VARS_OFF:C/=.*//:O:u}
+.        endfor
+.      endif
+.      if defined(${opt}_VARS_OFF)
+.        for var in ${${opt}_VARS_OFF:C/=.*//:O:u}
 _u=			${var}
-.        if ${_u:M*+}
+.          if ${_u:M*+}
 ${_u:C/.$//:tu}+=	${${opt}_VARS_OFF:M${var}=*:C/[^+]*\+=//:C/^"(.*)"$$/\1/}
-.        else
+.          else
 ${_u:tu}=		${${opt}_VARS_OFF:M${var}=*:C/[^=]*=//:C/^"(.*)"$$/\1/}
-.        endif
-.      endfor
-.    endif
-.    if defined(${opt}_CONFIGURE_ENABLE)
+.          endif
+.        endfor
+.      endif
+.      if defined(${opt}_CONFIGURE_ENABLE)
 CONFIGURE_ARGS+=	${${opt}_CONFIGURE_ENABLE:S/^/--disable-/:C/=.*//}
-.    endif
-.    if defined(${opt}_CONFIGURE_WITH)
+.      endif
+.      if defined(${opt}_CONFIGURE_WITH)
 CONFIGURE_ARGS+=	${${opt}_CONFIGURE_WITH:S/^/--without-/:C/=.*//}
-.    endif
-.    if defined(${opt}_CMAKE_BOOL)
+.      endif
+.      if defined(${opt}_CMAKE_BOOL)
 CMAKE_ARGS+=		${${opt}_CMAKE_BOOL:C/.*/-D&:BOOL=false/}
-.    endif
-.    if defined(${opt}_CMAKE_BOOL_OFF)
+.      endif
+.      if defined(${opt}_CMAKE_BOOL_OFF)
 CMAKE_ARGS+=		${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/}
-.    endif
-.    if defined(${opt}_MESON_TRUE)
+.      endif
+.      if defined(${opt}_MESON_TRUE)
 MESON_ARGS+=		${${opt}_MESON_TRUE:C/.*/-D&=false/}
-.    endif
-.    if defined(${opt}_MESON_FALSE)
+.      endif
+.      if defined(${opt}_MESON_FALSE)
 MESON_ARGS+=            ${${opt}_MESON_FALSE:C/.*/-D&=true/}
-.    endif
-.    if defined(${opt}_MESON_YES)
+.      endif
+.      if defined(${opt}_MESON_YES)
 MESON_ARGS+=		${${opt}_MESON_YES:C/.*/-D&=no/}
-.    endif
-.    if defined(${opt}_MESON_NO)
+.      endif
+.      if defined(${opt}_MESON_NO)
 MESON_ARGS+=		${${opt}_MESON_NO:C/.*/-D&=yes/}
-.    endif
-.    if defined(${opt}_MESON_ENABLED)
+.      endif
+.      if defined(${opt}_MESON_ENABLED)
 MESON_ARGS+=		${${opt}_MESON_ENABLED:C/.*/-D&=disabled/}
-.    endif
-.    if defined(${opt}_MESON_DISABLED)
+.      endif
+.      if defined(${opt}_MESON_DISABLED)
 MESON_ARGS+=		${${opt}_MESON_DISABLED:C/.*/-D&=enabled/}
-.    endif
-.    if defined(${opt}_CABAL_FLAGS)
+.      endif
+.      if defined(${opt}_CABAL_FLAGS)
 CABAL_FLAGS+=	-${${opt}_CABAL_FLAGS}
-.    endif
-.    for configure in CONFIGURE CMAKE MESON QMAKE
-.      if defined(${opt}_${configure}_OFF)
-${configure}_ARGS+=	${${opt}_${configure}_OFF}
 .      endif
-.    endfor
-.    for flags in ${_OPTIONS_FLAGS}
-.      if defined(${opt}_${flags}_OFF)
+.      for configure in CONFIGURE CMAKE MESON QMAKE
+.        if defined(${opt}_${configure}_OFF)
+${configure}_ARGS+=	${${opt}_${configure}_OFF}
+.        endif
+.      endfor
+.      for flags in ${_OPTIONS_FLAGS}
+.        if defined(${opt}_${flags}_OFF)
 ${flags}+=	${${opt}_${flags}_OFF}
-.      endif
-.    endfor
-.    for deptype in ${_OPTIONS_DEPENDS}
-.      if defined(${opt}_${deptype}_DEPENDS_OFF)
+.        endif
+.      endfor
+.      for deptype in ${_OPTIONS_DEPENDS}
+.        if defined(${opt}_${deptype}_DEPENDS_OFF)
 ${deptype}_DEPENDS+=	${${opt}_${deptype}_DEPENDS_OFF}
-.      endif
-.    endfor
-.    for target in ${_OPTIONS_TARGETS}
+.        endif
+.      endfor
+.      for target in ${_OPTIONS_TARGETS}
 _target=	${target:C/:.*//}
 _prio=		${target:C/.*:(.*):.*/\1/}
 _type=		${target:C/.*://}
 _OPTIONS_${_target}:=	${_OPTIONS_${_target}} ${_prio}:${_type}-${_target}-${opt}-off
-.    endfor
-.  endif
-.endfor
+.      endfor
+.    endif
+.  endfor
 
 # Collect which options helpers are defined at this point for
 # bsd.sanity.mk later to make sure no other options helper is
 # defined after bsd.port.options.mk.
 _OPTIONS_HELPERS_SEEN=
-.for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
-.  for helper in ${_ALL_OPTIONS_HELPERS}
-.    if defined(${opt}_${helper})
+.  for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
+.    for helper in ${_ALL_OPTIONS_HELPERS}
+.      if defined(${opt}_${helper})
 _OPTIONS_HELPERS_SEEN+=	${opt}_${helper}
-.    endif
+.      endif
+.    endfor
 .  endfor
-.endfor
 
 .undef (SELECTED_OPTIONS)
 .undef (DESELECTED_OPTIONS)
@@ -640,12 +640,12 @@ _OPTIONS_HELPERS_SEEN+=	${opt}_${helper}
 # bmake's :@ for loop.
 _SELECTED_OPTIONS=	${ALL_OPTIONS:@opt@${PORT_OPTIONS:M${opt}}@}
 _DESELECTED_OPTIONS=	${ALL_OPTIONS:@opt@${"${PORT_OPTIONS:M${opt}}":?:${opt}}@}
-.for otype in MULTI GROUP SINGLE RADIO
-.  for m in ${OPTIONS_${otype}}
+.  for otype in MULTI GROUP SINGLE RADIO
+.    for m in ${OPTIONS_${otype}}
 _SELECTED_OPTIONS+=	${OPTIONS_${otype}_${m}:@opt@${PORT_OPTIONS:M${opt}}@}
 _DESELECTED_OPTIONS+=	${OPTIONS_${otype}_${m}:@opt@${"${PORT_OPTIONS:M${opt}}":?:${opt}}@}
+.    endfor
 .  endfor
-.endfor
 SELECTED_OPTIONS=	${_SELECTED_OPTIONS:O:u}
 DESELECTED_OPTIONS=	${_DESELECTED_OPTIONS:O:u}
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 30f0677660ae..a7f4e7edf099 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1066,27 +1066,27 @@ _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
 .MAKEOVERRIDES:=	${.MAKEOVERRIDES:NFLAVOR}
 
 .if defined(CROSS_TOOLCHAIN)
-.if !defined(CROSS_SYSROOT)
+.  if !defined(CROSS_SYSROOT)
 IGNORE=	CROSS_SYSROOT should be defined
-.endif
+.  endif
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 # Do not define CPP on purpose
-.if !defined(HOSTCC)
+.  if !defined(HOSTCC)
 HOSTCC:=	${CC}
 HOSTCXX:=	${CXX}
-.endif
-.if !defined(CC_FOR_BUILD)
+.  endif
+.  if !defined(CC_FOR_BUILD)
 CC_FOR_BUILD:=	${HOSTCC}
 CXX_FOR_BUILD:=	${HOSTCXX}
-.endif
+.  endif
 CONFIGURE_ENV+= HOSTCC="${HOSTCC}" HOSTCXX="${HOSTCXX}" CC_FOR_BUILD="${CC_FOR_BUILD}" CXX_FOR_BUILD="${CXX_FOR_BUILD}"
 
 CC=		${XCC} --sysroot=${CROSS_SYSROOT}
 CXX=		${XCXX} --sysroot=${CROSS_SYSROOT}
 CPP=		${XCPP} --sysroot=${CROSS_SYSROOT}
-.for _tool in AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
+.  for _tool in AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
 ${_tool}=	${CROSS_BINUTILS_PREFIX}${_tool:tl}
-.endfor
+.  endfor
 LD+=		--sysroot=${CROSS_SYSROOT}
 STRIP_CMD=	${CROSS_BINUTILS_PREFIX}strip
 # only bmake support the below
@@ -1105,60 +1105,60 @@ STRIPBIN=	${STRIP_CMD}
 
 .else
 
-.if !target(makepatch)
+.  if !target(makepatch)
 makepatch:
 	@${SETENV} WRKDIR=${WRKDIR} PATCHDIR=${PATCHDIR} \
 		PATCH_WRKSRC=${PATCH_WRKSRC} \
 		STRIP_COMPONENTS="${PATCH_STRIP:S/-p//}" \
 		${SH} ${SCRIPTSDIR}/smart_makepatch.sh
-.endif
+.  endif
 
 
 # Start of options section
-.if defined(INOPTIONSMK) || ( !defined(USEOPTIONSMK) && !defined(AFTERPORTMK) )
+.  if defined(INOPTIONSMK) || ( !defined(USEOPTIONSMK) && !defined(AFTERPORTMK) )
 
 
 # Get the default maintainer
 MAINTAINER?=	ports@FreeBSD.org
 
 # Get the architecture
-.if !defined(ARCH)
+.    if !defined(ARCH)
 ARCH!=	${UNAME} -p
-.endif
+.    endif
 HOSTARCH:=	${ARCH}
-.if defined(CROSS_TOOLCHAIN)
+.    if defined(CROSS_TOOLCHAIN)
 ARCH=	${CROSS_TOOLCHAIN:C,-.*$,,}
-.endif
+.    endif
 _EXPORTED_VARS+=	ARCH
 
-.if ${ARCH} == powerpc64
-.  if !defined(PPC_ABI)
+.    if ${ARCH} == powerpc64
+.      if !defined(PPC_ABI)
 PPC_ABI!=	${CC} -dM -E - < /dev/null | ${AWK} '/_CALL_ELF/{print "ELFv"$$3}'
-.    if ${PPC_ABI} != ELFv2
+.        if ${PPC_ABI} != ELFv2
 PPC_ABI=	ELFv1
-.    endif
-.  endif
+.        endif
+.      endif
 _EXPORTED_VARS+=	PPC_ABI
-.endif
+.    endif
 
 # Get operating system versions for a cross build
-.if defined(CROSS_SYSROOT)
-.if !exists(${CROSS_SYSROOT}/usr/include/sys/param.h)
+.    if defined(CROSS_SYSROOT)
+.      if !exists(${CROSS_SYSROOT}/usr/include/sys/param.h)
 .error CROSS_SYSROOT does not include /usr/include/sys/param.h.
-.endif
+.      endif
 OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${CROSS_SYSROOT}/usr/include/sys/param.h
 _OSRELEASE!= ${AWK} -v version=${OSVERSION} 'END { printf("%d.%d-CROSS", version / 100000, version / 1000 % 100) }' < /dev/null
-.endif
+.    endif
 
 # Get the operating system type
-.if !defined(OPSYS)
+.    if !defined(OPSYS)
 OPSYS!=	${UNAME} -s
-.endif
+.    endif
 _EXPORTED_VARS+=	OPSYS
 
-.if !defined(_OSRELEASE)
+.    if !defined(_OSRELEASE)
 _OSRELEASE!=	${UNAME} -r
-.endif
+.    endif
 _EXPORTED_VARS+=	_OSRELEASE
 
 # Get the operating system revision
@@ -1166,23 +1166,23 @@ OSREL?=	${_OSRELEASE:C/-.*//}
 _EXPORTED_VARS+=	OSREL
 
 # Get __FreeBSD_version
-.if !defined(OSVERSION)
-.if exists(/usr/include/sys/param.h)
+.    if !defined(OSVERSION)
+.      if exists(/usr/include/sys/param.h)
 OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
-.elif exists(${SRC_BASE}/sys/sys/param.h)
+.      elif exists(${SRC_BASE}/sys/sys/param.h)
 OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h
-.else
+.      else
 .error Unable to determine OS version.  Either define OSVERSION, install /usr/include/sys/param.h or define SRC_BASE.
-.endif
-.endif
+.      endif
+.    endif
 _EXPORTED_VARS+=	OSVERSION
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1203000
+.    if ${OPSYS} == FreeBSD && ${OSVERSION} < 1203000
 _UNSUPPORTED_SYSTEM_MESSAGE=	Ports Collection support for your ${OPSYS} version has ended, and no ports\
 								are guaranteed to build on this system. Please upgrade to a supported release.
-. if defined(ALLOW_UNSUPPORTED_SYSTEM)
+.      if defined(ALLOW_UNSUPPORTED_SYSTEM)
 WARNING+=			"${_UNSUPPORTED_SYSTEM_MESSAGE}"
-. else
+.      else
 show-unsupported-system-error:
 	@${ECHO_MSG} "/!\\ ERROR: /!\\"
 	@${ECHO_MSG}
@@ -1191,91 +1191,91 @@ show-unsupported-system-error:
 	@${ECHO_MSG} "No support will be provided if you silence this message by defining ALLOW_UNSUPPORTED_SYSTEM." | ${FMT_80}
 	@${ECHO_MSG}
 	@${FALSE}
-. endif
-.endif
+.      endif
+.    endif
 
 # Convert OSVERSION to major release number
 _OSVERSION_MAJOR=	${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/}
 # Sanity checks for chroot/jail building.
 # Skip if OSVERSION specified on cmdline for testing. Only works for bmake.
-.if !defined(.MAKEOVERRIDES) || !${.MAKEOVERRIDES:MOSVERSION}
-.if ${_OSVERSION_MAJOR} != ${_OSRELEASE:R}
-.if !defined(I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE)
+.    if !defined(.MAKEOVERRIDES) || !${.MAKEOVERRIDES:MOSVERSION}
+.      if ${_OSVERSION_MAJOR} != ${_OSRELEASE:R}
+.        if !defined(I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE)
 .error UNAME_r (${_OSRELEASE}) and OSVERSION (${OSVERSION}) do not agree on major version number.
-.endif
-.elif ${_OSVERSION_MAJOR} != ${OSREL:R}
+.        endif
+.      elif ${_OSVERSION_MAJOR} != ${OSREL:R}
 .error OSREL (${OSREL}) and OSVERSION (${OSVERSION}) do not agree on major version number.
-.endif
-.endif
+.      endif
+.    endif
 
 # Only define tools here (for transition period with between pkg tools)
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
-.if !defined(_PKG_CHECKED) && !defined(PACKAGE_BUILDING) && exists(${PKG_BIN})
-.if !defined(_PKG_VERSION)
+.    if !defined(_PKG_CHECKED) && !defined(PACKAGE_BUILDING) && exists(${PKG_BIN})
+.      if !defined(_PKG_VERSION)
 _PKG_VERSION!=	${PKG_BIN} -v
-.endif
+.      endif
 # XXX hack for smooth transition towards pkg 1.17
 _PKG_BEFORE_PKGEXT!= ${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} 1.17.0
-.if ${_PKG_BEFORE_PKGEXT} == "<"
+.      if ${_PKG_BEFORE_PKGEXT} == "<"
 _PKG_TRANSITIONING_TO_NEW_EXT=	yes
 _EXPORTED_VARS+=	_PKG_TRANSITIONING_TO_NEW_EXT
 WARNING+=	"It is strongly recommended to upgrade to a newer version of pkg first"
-.endif
+.      endif
 # XXX End of hack
 _PKG_STATUS!=	${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} ${MINIMAL_PKG_VERSION}
-.if ${_PKG_STATUS} == "<"
+.      if ${_PKG_STATUS} == "<"
 IGNORE=		pkg(8) must be version ${MINIMAL_PKG_VERSION} or greater, but you have ${_PKG_VERSION}. You must upgrade the ${PKG_ORIGIN} port first
-.endif
+.      endif
 _PKG_CHECKED=	1
-.endif
+.    endif
 _EXPORTED_VARS+=	_PKG_CHECKED
 
 MASTERDIR?=	${.CURDIR}
 
-.if ${MASTERDIR} != ${.CURDIR}
+.    if ${MASTERDIR} != ${.CURDIR}
 SLAVE_PORT?=	yes
 MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)$/\\1/}
-.else
+.    else
 SLAVE_PORT?=	no
 MASTER_PORT?=
-.endif
+.    endif
 
 # If they exist, include Makefile.inc, then architecture/operating
 # system specific Makefiles, then local Makefile.local.
 
-.if ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/../Makefile.inc)
+.    if ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 USE_SUBMAKE=	yes
-.endif
+.    endif
 
-.if exists(${MASTERDIR}/../Makefile.inc)
+.    if exists(${MASTERDIR}/../Makefile.inc)
 .include "${MASTERDIR}/../Makefile.inc"
 USE_SUBMAKE=	yes
-.endif
+.    endif
 
-.if exists(${MASTERDIR}/Makefile.${ARCH}-${OPSYS})
+.    if exists(${MASTERDIR}/Makefile.${ARCH}-${OPSYS})
 .include "${MASTERDIR}/Makefile.${ARCH}-${OPSYS}"
 USE_SUBMAKE=	yes
-.elif exists(${MASTERDIR}/Makefile.${OPSYS})
+.    elif exists(${MASTERDIR}/Makefile.${OPSYS})
 .include "${MASTERDIR}/Makefile.${OPSYS}"
 USE_SUBMAKE=	yes
-.elif exists(${MASTERDIR}/Makefile.${ARCH})
+.    elif exists(${MASTERDIR}/Makefile.${ARCH})
 .include "${MASTERDIR}/Makefile.${ARCH}"
 USE_SUBMAKE=	yes
-.endif
+.    endif
 
-.if exists(${MASTERDIR}/Makefile.local)
+.    if exists(${MASTERDIR}/Makefile.local)
 .include "${MASTERDIR}/Makefile.local"
 USE_SUBMAKE=	yes
-.elif ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/Makefile.local)
+.    elif ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
 USE_SUBMAKE=	yes
-.endif
+.    endif
 
-.for _CATEGORY in ${CATEGORIES}
+.    for _CATEGORY in ${CATEGORIES}
 PKGCATEGORY?=	${_CATEGORY}
-.endfor
+.    endfor
 _PORTDIRNAME=	${.CURDIR:T}
 PORTDIRNAME?=	${_PORTDIRNAME}
 PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
@@ -1301,52 +1301,52 @@ LDCONFIG32_DIR=	libdata/ldconfig32
 
 # At least KDE needs TMPDIR for the package building,
 # so we're setting it to the known default value.
-.if defined(PACKAGE_BUILDING)
+.    if defined(PACKAGE_BUILDING)
 TMPDIR?=	/tmp
-.endif # defined(PACKAGE_BUILDING)
+.    endif # defined(PACKAGE_BUILDING)
 
-.if defined(WITH_DEBUG_PORTS)
-.if ${WITH_DEBUG_PORTS:M${PKGORIGIN}}
+.    if defined(WITH_DEBUG_PORTS)
+.      if ${WITH_DEBUG_PORTS:M${PKGORIGIN}}
 WITH_DEBUG=	yes
-.endif
-.endif
+.      endif
+.    endif
 
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 .include "${PORTSDIR}/Mk/bsd.options.mk"
 
-.endif
+.  endif
 # End of options section.
 
 # Start of pre-makefile section.
-.if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
+.  if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
 
-.if defined(_PREMKINCLUDED)
+.    if defined(_PREMKINCLUDED)
 DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
-.endif
+.    endif
 
 _PREMKINCLUDED=	yes
 
-.if defined(PORTVERSION)
-.if ${PORTVERSION:M*[-_,]*}x != x
+.    if defined(PORTVERSION)
+.      if ${PORTVERSION:M*[-_,]*}x != x
 IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
-.endif
-.if defined(DISTVERSION)
+.      endif
+.      if defined(DISTVERSION)
 DEV_ERROR+=	"Defining both PORTVERSION and DISTVERSION is wrong, only set one, if necessary, set DISTNAME"
-.endif
+.      endif
 DISTVERSION?=	${PORTVERSION:S/:/::/g}
-.elif defined(DISTVERSION)
+.    elif defined(DISTVERSION)
 PORTVERSION=	${DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
-.endif
+.    endif
 
 PORTREVISION?=	0
-.if ${PORTREVISION} != 0
+.    if ${PORTREVISION} != 0
 _SUF1=	_${PORTREVISION}
-.endif
+.    endif
 
 PORTEPOCH?=		0
-.if ${PORTEPOCH} != 0
+.    if ${PORTEPOCH} != 0
 _SUF2=	,${PORTEPOCH}
-.endif
+.    endif
 
 PKGVERSION=	${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
 PKGNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
@@ -1369,126 +1369,126 @@ PREFIX?=		${LOCALBASE}
 
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
-.if defined(USE_LOCAL_MK)
+.    if defined(USE_LOCAL_MK)
 .include "${PORTSDIR}/Mk/bsd.local.mk"
-.endif
-.for odir in ${OVERLAYS}
+.    endif
+.    for odir in ${OVERLAYS}
 .sinclude "${odir}/Mk/bsd.overlay.mk"
-.endfor
+.    endfor
 
-.if defined(USE_JAVA)
+.    if defined(USE_JAVA)
 .include "${PORTSDIR}/Mk/bsd.java.mk"
-.endif
+.    endif
 
-.if defined(USE_RUBY)
+.    if defined(USE_RUBY)
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.endif
+.    endif
 
-.if defined(USE_OCAML)
+.    if defined(USE_OCAML)
 .include "${PORTSDIR}/Mk/bsd.ocaml.mk"
-.endif
+.    endif
 
-.if defined(USE_APACHE_BUILD)
+.    if defined(USE_APACHE_BUILD)
 USES+=	apache:build,${USE_APACHE_BUILD:C/2([0-9])/2.\1/g}
-.elif defined(USE_APACHE_RUN)
+.    elif defined(USE_APACHE_RUN)
 USES+=	apache:run,${USE_APACHE_RUN:C/2([0-9])/2.\1/g}
-.elif defined(USE_APACHE)
+.    elif defined(USE_APACHE)
 USE_APACHE:=	${USE_APACHE:S/common/server,/}
 USES+=	apache:${USE_APACHE:C/2([0-9])/2.\1/g}
-.endif
+.    endif
 
-.if defined(USE_TEX)
+.    if defined(USE_TEX)
 .include "${PORTSDIR}/Mk/bsd.tex.mk"
-.endif
+.    endif
 
-.if defined(USE_GECKO)
+.    if defined(USE_GECKO)
 .include "${PORTSDIR}/Mk/bsd.gecko.mk"
-.endif
+.    endif
 
-.if defined(USE_MYSQL)
+.    if defined(USE_MYSQL)
 USE_MYSQL:=		${USE_MYSQL:N[yY][eE][sS]:Nclient}
-.if defined(WANT_MYSQL_VER)
-.if empty(USE_MYSQL)
+.      if defined(WANT_MYSQL_VER)
+.        if empty(USE_MYSQL)
 USE_MYSQL:=${WANT_MYSQL_VER}
-.else
+.        else
 USE_MYSQL:=${USE_MYSQL},${WANT_MYSQL_VER}
-.endif
-.endif
+.        endif
+.      endif
 USES+=mysql:${USE_MYSQL}
-.endif
+.    endif
 
-.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
+.    if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
 .include "${PORTSDIR}/Mk/bsd.wx.mk"
-.endif
+.    endif
 
-.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)
+.    if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)
 .include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
-.endif
+.    endif
 
-.if !defined(UID)
+.    if !defined(UID)
 UID!=	${ID} -u
-.endif
+.    endif
 
 DESTDIRNAME?=	DESTDIR
 
 # setup empty variables for USES targets
-.for target in sanity fetch extract patch configure build install test package stage
+.    for target in sanity fetch extract patch configure build install test package stage
 _USES_${target}?=
-.endfor
+.    endfor
 
 # Loading features
-.for f in ${USES}
+.    for f in ${USES}
 _f:=		${f:C/\:.*//}
-.if !defined(${_f}_ARGS)
+.      if !defined(${_f}_ARGS)
 ${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
-.endif
-.endfor
-.for f in ${USES}
+.      endif
+.    endfor
+.    for f in ${USES}
 .undef _usefound
-.for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
+.      for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
 _usefile=	${udir}/${f:C/\:.*//}.mk
-.if exists(${_usefile}) && !defined(_usefound)
+.        if exists(${_usefile}) && !defined(_usefound)
 _usefound=
 .include "${_usefile}"
-.endif
-.endfor
-.if !defined(_usefound)
+.        endif
+.      endfor
+.      if !defined(_usefound)
 ERROR+=	"Unknown USES=${f:C/\:.*//}"
-.endif
-.endfor
+.      endif
+.    endfor
 
-.if !empty(FLAVORS)
-.  if ${FLAVORS:Mall}
+.    if !empty(FLAVORS)
+.      if ${FLAVORS:Mall}
 DEV_ERROR+=		"FLAVORS cannot contain 'all', it is a reserved value"
-.  endif
-.  for f in ${FLAVORS}
-.    if ${f:C/[[:lower:][:digit:]_]//g}
+.      endif
+.      for f in ${FLAVORS}
+.        if ${f:C/[[:lower:][:digit:]_]//g}
 _BAD_FLAVOR_NAMES+=		${f}
-.    endif
-.  endfor
-.  if !empty(_BAD_FLAVOR_NAMES)
+.        endif
+.      endfor
+.      if !empty(_BAD_FLAVOR_NAMES)
 DEV_ERROR+=		"FLAVORS contains flavors that are not all [a-z0-9_]: ${_BAD_FLAVOR_NAMES}"
-.  endif
-.endif
+.      endif
+.    endif
 
-.if !empty(FLAVOR)
-.  if empty(FLAVORS)
+.    if !empty(FLAVOR)
+.      if empty(FLAVORS)
 IGNORE=	FLAVOR is defined (to ${FLAVOR}) while this port does not have FLAVORS
-.  elif ! ${FLAVORS:M${FLAVOR}}
+.      elif ! ${FLAVORS:M${FLAVOR}}
 IGNORE=	Unknown flavor '${FLAVOR}', possible flavors: ${FLAVORS}
-.  endif
-.endif
+.      endif
+.    endif
 
-.if !empty(FLAVORS) && empty(FLAVOR)
+.    if !empty(FLAVORS) && empty(FLAVOR)
 FLAVOR=	${FLAVORS:[1]}
-.endif
+.    endif
 
 # Reorder FLAVORS so the default is first if set by the port.
-.if empty(_FLAVOR) && !empty(FLAVORS) && !empty(FLAVOR)
+.    if empty(_FLAVOR) && !empty(FLAVORS) && !empty(FLAVOR)
 FLAVORS:=	${FLAVOR} ${FLAVORS:N${FLAVOR}}
-.endif
+.    endif
 
-.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
+.    if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
 _DID_FLAVORS_HELPERS=	yes
 _FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
 _FLAVOR_HELPERS_APPEND=	 	CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
@@ -1496,52 +1496,52 @@ _FLAVOR_HELPERS_APPEND=	 	CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
 							FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \
 							RUN_DEPENDS TEST_DEPENDS
 # These overwrite the current value
-.for v in ${_FLAVOR_HELPERS_OVERRIDE}
-.if defined(${FLAVOR}_${v})
+.      for v in ${_FLAVOR_HELPERS_OVERRIDE}
+.        if defined(${FLAVOR}_${v})
 ${v}=	${${FLAVOR}_${v}}
-.endif
-.endfor
+.        endif
+.      endfor
 
 # These append to the current value
-.for v in ${_FLAVOR_HELPERS_APPEND}
-.if defined(${FLAVOR}_${v})
+.      for v in ${_FLAVOR_HELPERS_APPEND}
+.        if defined(${FLAVOR}_${v})
 ${v}+=	${${FLAVOR}_${v}}
-.endif
-.endfor
+.        endif
+.      endfor
 
-.for v in BROKEN IGNORE
-.if defined(${FLAVOR}_${v})
+.      for v in BROKEN IGNORE
+.        if defined(${FLAVOR}_${v})
 ${v}=	flavor "${FLAVOR}" ${${FLAVOR}_${v}}
-.endif
-.endfor
-.if defined(FLAVORS_SUB)
+.        endif
+.      endfor
+.      if defined(FLAVORS_SUB)
 PLIST_SUB+=	${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment " NO_${v:tu}=""@}
 PLIST_SUB+=	${FLAVOR:tu}="" NO_${FLAVOR:tu}="@comment "
 SUB_LIST+=	${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment " NO_${v:tu}=""@}
 SUB_LIST+=	${FLAVOR:tu}="" NO_${FLAVOR:tu}="@comment "
-.endif
-.endif # defined(${FLAVOR})
+.      endif
+.    endif # defined(${FLAVOR})
 
 
 EXTRACT_SUFX?=			.tar.gz
 
-.if defined(USE_LINUX_PREFIX)
+.    if defined(USE_LINUX_PREFIX)
 PREFIX=					${LINUXBASE}
 DATADIR?=				${PREFIX}/usr/share/${PORTNAME}
 DOCSDIR?=				${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 NO_LICENSES_INSTALL=	yes
 NO_MTREE=				yes
-.endif
+.    endif
 
 # You can force skipping these test by defining IGNORE_PATH_CHECKS
-.if !defined(IGNORE_PATH_CHECKS)
-.if ! ${PREFIX:M/*}
+.    if !defined(IGNORE_PATH_CHECKS)
+.      if ! ${PREFIX:M/*}
 .BEGIN:
 	@${ECHO_MSG} "PREFIX must be defined as an absolute path so that when 'make'"
 	@${ECHO_MSG} "is invoked in the work area PREFIX points to the right place."
 	@${FALSE}
-.endif
-.endif
+.      endif
+.    endif
 
 DATADIR?=		${PREFIX}/share/${PORTNAME}
 DOCSDIR?=		${PREFIX}/share/doc/${PORTNAME}
@@ -1559,38 +1559,38 @@ PKGNG_ORIGIN=	${PKG_ORIGIN}
 WITH_PKGNG?=	yes
 WITH_PKG?=	${WITH_PKGNG}
 
-.endif
+.  endif
 # End of pre-makefile section.
 
 # Start of post-makefile section.
-.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
+.  if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
 
-.if defined(_POSTMKINCLUDED)
+.    if defined(_POSTMKINCLUDED)
 DEV_ERROR+=	"${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice"
 	@${FALSE}
-.endif
+.    endif
 
 _POSTMKINCLUDED=	yes
 
-.if defined(BUNDLE_LIBS)
+.    if defined(BUNDLE_LIBS)
 PKG_NOTES+=	no_provide_shlib
 PKG_NOTE_no_provide_shlib=	yes
-.endif
+.    endif
 
-.if defined(DEPRECATED)
+.    if defined(DEPRECATED)
 PKG_NOTES+=	deprecated
 PKG_NOTE_deprecated=${DEPRECATED}
-.endif
+.    endif
 
-.if defined(EXPIRATION_DATE)
+.    if defined(EXPIRATION_DATE)
 PKG_NOTES+=	expiration_date
 PKG_NOTE_expiration_date=	${EXPIRATION_DATE}
-.endif
+.    endif
 
-.if !empty(FLAVOR)
+.    if !empty(FLAVOR)
 PKG_NOTES+=	flavor
 PKG_NOTE_flavor=	${FLAVOR}
-.endif
+.    endif
 
 TEST_ARGS?=		${MAKE_ARGS}
 TEST_ENV?=		${MAKE_ENV}
@@ -1606,10 +1606,10 @@ MAKE_ENV+=		XDG_DATA_HOME=${WRKDIR} \
 				HOME=${WRKDIR}
 # Respect TMPDIR passed via make.conf or similar and pass it down
 # to configure and make.
-.if defined(TMPDIR)
+.    if defined(TMPDIR)
 MAKE_ENV+=		TMPDIR="${TMPDIR}"
 CONFIGURE_ENV+=	TMPDIR="${TMPDIR}"
-.endif # defined(TMPDIR)
+.    endif # defined(TMPDIR)
 
 QA_ENV+=		STAGEDIR=${STAGEDIR} \
 				PREFIX=${PREFIX} \
@@ -1635,21 +1635,21 @@ QA_ENV+=		STAGEDIR=${STAGEDIR} \
 				NO_ARCH=${NO_ARCH} \
 				"NO_ARCH_IGNORE=${NO_ARCH_IGNORE}" \
 				USE_RUBY=${USE_RUBY}
-.if !empty(USES:Mssl)
+.    if !empty(USES:Mssl)
 QA_ENV+=		USESSSL=yes
-.endif
-.if !empty(USES:Mdesktop-file-utils)
+.    endif
+.    if !empty(USES:Mdesktop-file-utils)
 QA_ENV+=		USESDESKTOPFILEUTILS=yes
-.endif
-.if !empty(USES:Mlibtool*)
+.    endif
+.    if !empty(USES:Mlibtool*)
 QA_ENV+=		USESLIBTOOL=yes
-.endif
-.if !empty(USES:Mshared-mime-info)
+.    endif
+.    if !empty(USES:Mshared-mime-info)
 QA_ENV+=		USESSHAREDMIMEINFO=yes
-.endif
-.if !empty(USES:Mterminfo)
+.    endif
+.    if !empty(USES:Mterminfo)
 QA_ENV+=		USESTERMINFO=yes
-.endif
+.    endif
 
 CO_ENV+=		STAGEDIR=${STAGEDIR} \
 				PREFIX=${PREFIX} \
@@ -1663,66 +1663,66 @@ CO_ENV+=		STAGEDIR=${STAGEDIR} \
 				PORT_OPTIONS="${PORT_OPTIONS}" \
 				PORTSDIR="${PORTSDIR}"
 
-.if defined(CROSS_SYSROOT)
+.    if defined(CROSS_SYSROOT)
 PKG_ENV+=		ABI_FILE=${CROSS_SYSROOT}/bin/sh
 MAKE_ENV+=		NM=${NM} \
 				STRIPBIN=${STRIPBIN} \
 				PKG_CONFIG_SYSROOT_DIR="${CROSS_SYSROOT}"
 CONFIGURE_ENV+=	PKG_CONFIG_SYSROOT_DIR="${CROSS_SYSROOT}"
-.endif
+.    endif
 
-.if empty(FLAVOR)
+.    if empty(FLAVOR)
 _WRKDIR=	work
-.else
+.    else
 _WRKDIR=	work-${FLAVOR}
-.endif
+.    endif
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}
 BINARY_LINKDIR=	${WRKDIR}/.bin
 PATH:=			${BINARY_LINKDIR}:${PATH}
-.if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
+.    if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
 MAKE_ENV+=			PATH=${PATH}
 CONFIGURE_ENV+=		PATH=${PATH}
-.endif
+.    endif
 
-.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
-.if defined(WRKSRC)
+.    if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
+.      if defined(WRKSRC)
 DEV_WARNING+=	"You are using USE_GITHUB and WRKSRC is set which is wrong.  Set GH_PROJECT correctly or set WRKSRC_SUBDIR and remove WRKSRC entirely."
-.endif
+.      endif
 WRKSRC?=		${WRKDIR}/${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}
-.endif
+.    endif
 
-.if !default(IGNORE_MASTER_SITE_GITLAB) && defined(USE_GITLAB) && empty(USE_GITLAB:Mnodefault)
-.if defined(WRKSRC)
+.    if !default(IGNORE_MASTER_SITE_GITLAB) && defined(USE_GITLAB) && empty(USE_GITLAB:Mnodefault)
+.      if defined(WRKSRC)
 DEV_WARNING+=	"You are using USE_GITLAB and WRKSRC is set which is wrong.  Set GL_PROJECT, GL_ACCOUNT correctly, and/or set WRKSRC_SUBDIR and remove WRKSRC entirely."
-.endif
+.      endif
 WRKSRC?=		${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}
-.endif
+.    endif
 
 # If the distname is not extracting into a specific subdirectory, have the
 # ports framework force extract into a subdirectory so that metadata files
 # do not get in the way of the build, and vice-versa.
-.if defined(NO_WRKSUBDIR)
+.    if defined(NO_WRKSUBDIR)
 # Some ports have DISTNAME=PORTNAME, and USE_RC_SUBR=PORTNAME, in those case,
 # the rc file will conflict with WRKSRC, as WRKSRC is artificial, make it the
 # most unlikely to conflict as we can.
 WRKSRC?=			${WRKDIR}/${PKGNAME}
 EXTRACT_WRKDIR:=		${WRKSRC}
-.else
+.    else
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 EXTRACT_WRKDIR:=		${WRKDIR}
-.endif
-.if defined(WRKSRC_SUBDIR)
+.    endif
+.    if defined(WRKSRC_SUBDIR)
 WRKSRC:=		${WRKSRC}/${WRKSRC_SUBDIR}
-.endif
+.    endif
 
-.if defined(CONFIGURE_OUTSOURCE)
+.    if defined(CONFIGURE_OUTSOURCE)
 CONFIGURE_CMD?=		${WRKSRC}/${CONFIGURE_SCRIPT}
 CONFIGURE_WRKSRC?=	${WRKDIR}/.build
 BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
 TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
-.endif
+.    endif
 
 PATCH_WRKSRC?=	${WRKSRC}
 CONFIGURE_WRKSRC?=	${WRKSRC}
@@ -1754,35 +1754,35 @@ PLIST_SUB_SED?= ${PLIST_SUB_SED_tmp3:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\.
 # sub-configure will not # survive double space
 CFLAGS:=	${CFLAGS:C/ $//}
 
-.if defined(WITHOUT_CPU_CFLAGS)
-.if defined(_CPUCFLAGS)
-.if !empty(_CPUCFLAGS)
+.    if defined(WITHOUT_CPU_CFLAGS)
+.      if defined(_CPUCFLAGS)
+.        if !empty(_CPUCFLAGS)
 CFLAGS:=	${CFLAGS:C/${_CPUCFLAGS}//}
-.endif
-.endif
-.endif
+.        endif
+.      endif
+.    endif
 
 # Reset value from bsd.own.mk.
-.if defined(WITH_DEBUG)
-.if !defined(INSTALL_STRIPPED)
+.    if defined(WITH_DEBUG)
+.      if !defined(INSTALL_STRIPPED)
 STRIP=	#none
 MAKE_ENV+=	DONTSTRIP=yes
 STRIP_CMD=	${TRUE}
-.endif
+.      endif
 DEBUG_FLAGS?=	-g
 CFLAGS:=		${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS}
-.if defined(INSTALL_TARGET)
+.      if defined(INSTALL_TARGET)
 INSTALL_TARGET:=	${INSTALL_TARGET:S/^install-strip$/install/g}
-.endif
-.endif
+.      endif
+.    endif
 
-.if defined(USE_LTO)
+.    if defined(USE_LTO)
 .include "${PORTSDIR}/Mk/bsd.lto.mk"
-.endif
+.    endif
 
-.if !defined(WITHOUT_SSP)
+.    if !defined(WITHOUT_SSP)
 .include "${PORTSDIR}/Mk/bsd.ssp.mk"
-.endif
+.    endif
 
 # XXX PIE support to be added here
 MAKE_ENV+=	NO_PIE=yes
@@ -1797,120 +1797,120 @@ MAKE_SHELL?=	${SH}
 CONFIGURE_ENV+=	SHELL=${CONFIGURE_SHELL} CONFIG_SHELL=${CONFIGURE_SHELL}
 MAKE_ENV+=		SHELL=${MAKE_SHELL} NO_LINT=YES
 
-.if defined(PATCHFILES) && ${PATCHFILES:M*.zip}
+.    if defined(PATCHFILES) && ${PATCHFILES:M*.zip}
 PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:archivers/unzip
-.endif
+.    endif
 
 # Check the compatibility layer for amd64
 
-.if ${ARCH} == "amd64"
-.if exists(/usr/lib32)
+.    if ${ARCH} == "amd64"
+.      if exists(/usr/lib32)
 HAVE_COMPAT_IA32_LIBS?=  YES
-.endif
-.if !defined(HAVE_COMPAT_IA32_KERN)
+.      endif
+.      if !defined(HAVE_COMPAT_IA32_KERN)
 HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi; echo
-.if empty(HAVE_COMPAT_IA32_KERN)
+.        if empty(HAVE_COMPAT_IA32_KERN)
 .undef HAVE_COMPAT_IA32_KERN
-.endif
-.endif
-.endif
+.        endif
+.      endif
+.    endif
 _EXPORTED_VARS+=	HAVE_COMPAT_IA32_KERN
 
-.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386"
-.if ${ARCH} == "amd64"
-.if !defined(HAVE_COMPAT_IA32_KERN)
+.    if defined(IA32_BINARY_PORT) && ${ARCH} != "i386"
+.      if ${ARCH} == "amd64"
+.        if !defined(HAVE_COMPAT_IA32_KERN)
 IGNORE=		requires a kernel with compiled-in IA32 compatibility
-.elif !defined(HAVE_COMPAT_IA32_LIBS)
+.        elif !defined(HAVE_COMPAT_IA32_LIBS)
 IGNORE=		requires 32-bit libraries installed under /usr/lib32
-.endif
+.        endif
 _LDCONFIG_FLAGS=-32
 LIB32DIR=	lib32
-.else
+.      else
 IGNORE=		requires i386 (or compatible) platform to run
-.endif
-.else
+.      endif
+.    else
 LIB32DIR=	lib
-.endif
+.    endif
 PLIST_SUB+=	LIB32DIR=${LIB32DIR}
 
-.if ${WITH_PKG} == devel
+.    if ${WITH_PKG} == devel
 PKG_ORIGIN=		ports-mgmt/pkg-devel
-.endif
+.    endif
 
-.if !defined(PKG_DEPENDS) && !defined(CLEAN_FETCH_ENV)
+.    if !defined(PKG_DEPENDS) && !defined(CLEAN_FETCH_ENV)
 PKG_DEPENDS+=	${LOCALBASE}/sbin/pkg:${PKG_ORIGIN}
-.endif
+.    endif
 
-.if defined(USE_GCC)
+.    if defined(USE_GCC)
 .include "${PORTSDIR}/Mk/bsd.gcc.mk"
-.endif
+.    endif
 
-.if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
+.    if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 LDFLAGS+=	-fuse-ld=bfd
 BINARY_ALIAS+=	ld=${LD}
-.  if !defined(USE_BINUTILS)
-.    if exists(/usr/bin/ld.bfd)
+.      if !defined(USE_BINUTILS)
+.        if exists(/usr/bin/ld.bfd)
 LD=	/usr/bin/ld.bfd
 CONFIGURE_ENV+=	LD=${LD}
 MAKE_ENV+=	LD=${LD}
-.    else
+.        else
 USE_BINUTILS=	yes
+.        endif
+.      endif
 .    endif
-.  endif
-.endif
 
-.if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS)
+.    if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 BINUTILS?=	ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \
 	READELF SIZE STRINGS
 BINUTILS_NO_MAKE_ENV?=
-. for b in ${BINUTILS}
+.      for b in ${BINUTILS}
 ${b}=	${LOCALBASE}/bin/${b:C/PP/++/:tl}
-.  if defined(GNU_CONFIGURE) || defined(BINUTILS_CONFIGURE)
+.        if defined(GNU_CONFIGURE) || defined(BINUTILS_CONFIGURE)
 CONFIGURE_ENV+=	${b}="${${b}}"
-.  endif
-.  if ${BINUTILS_NO_MAKE_ENV:M${b}} == ""
+.        endif
+.        if ${BINUTILS_NO_MAKE_ENV:M${b}} == ""
 MAKE_ENV+=	${b}="${${b}}"
-.  endif
-. endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
-.if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER)
+.    if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER)
 .include "${PORTSDIR}/Mk/bsd.ldap.mk"
-.endif
+.    endif
 
-.if defined(USE_RC_SUBR)
+.    if defined(USE_RC_SUBR)
 SUB_FILES+=	${USE_RC_SUBR}
-.endif
+.    endif
 
-.if defined(USE_LDCONFIG) && ${USE_LDCONFIG:tl} == "yes"
+.    if defined(USE_LDCONFIG) && ${USE_LDCONFIG:tl} == "yes"
 USE_LDCONFIG=	${PREFIX}/lib
-.endif
-.if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:tl} == "yes"
+.    endif
+.    if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:tl} == "yes"
 IGNORE=			has USE_LDCONFIG32 set to yes, which is not correct
-.endif
+.    endif
 
-.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
-.if defined(USE_LINUX_PREFIX)
+.    if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
+.      if defined(USE_LINUX_PREFIX)
 PLIST_FILES+=	"@ldconfig-linux ${LINUXBASE}"
-.else
+.      else
 PLIST_FILES+=	"@ldconfig"
-.endif
-.endif
+.      endif
+.    endif
 
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 
-.if defined(_DESTDIR_VIA_ENV)
+.    if defined(_DESTDIR_VIA_ENV)
 MAKE_ENV+=	${DESTDIRNAME}=${STAGEDIR}
-.else
+.    else
 MAKE_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
-.endif
+.    endif
 
-.if defined(NO_PREFIX_RMDIR)
+.    if defined(NO_PREFIX_RMDIR)
 CO_ENV+=	NO_PREFIX_RMDIR=1
-.else
+.    else
 CO_ENV+=	NO_PREFIX_RMDIR=0
-.endif
+.    endif
 
 
 METADIR=		${WRKDIR}/.metadir
@@ -1930,77 +1930,77 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 						catalog.ports \
 						ccache-update-links
 
-.if defined(USE_LOCAL_MK)
+.    if defined(USE_LOCAL_MK)
 .include "${PORTSDIR}/Mk/bsd.local.mk"
-.endif
-.for odir in ${OVERLAYS}
+.    endif
+.    for odir in ${OVERLAYS}
 .sinclude "${odir}/Mk/bsd.overlay.mk"
-.endfor
+.    endfor
 
-.if defined(USE_GSTREAMER1)
+.    if defined(USE_GSTREAMER1)
 .include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
-.endif
+.    endif
 
-.if defined(USE_JAVA)
+.    if defined(USE_JAVA)
 .include "${PORTSDIR}/Mk/bsd.java.mk"
-.endif
+.    endif
 
-.if defined(USE_OCAML)
+.    if defined(USE_OCAML)
 .include "${PORTSDIR}/Mk/bsd.ocaml.mk"
-.endif
+.    endif
 
-.if defined(USE_WX) || defined(USE_WX_NOT)
+.    if defined(USE_WX) || defined(USE_WX_NOT)
 .include "${PORTSDIR}/Mk/bsd.wx.mk"
-.endif
+.    endif
 
-.if defined(USE_GECKO)
+.    if defined(USE_GECKO)
 .include "${PORTSDIR}/Mk/bsd.gecko.mk"
-.endif
+.    endif
 
-.if exists(${PORTSDIR}/Makefile.inc)
+.    if exists(${PORTSDIR}/Makefile.inc)
 .include "${PORTSDIR}/Makefile.inc"
 USE_SUBMAKE=	yes
-.endif
+.    endif
 
 # Loading features
-.for f in ${_USES_POST}
+.    for f in ${_USES_POST}
 _f:=		${f:C/\:.*//}
-.if !defined(${_f}_ARGS)
+.      if !defined(${_f}_ARGS)
 ${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
-.endif
-.endfor
-.for f in ${_USES_POST}
+.      endif
+.    endfor
+.    for f in ${_USES_POST}
 .undef _usefound
-.for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
+.      for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
 _usefile=	${udir}/${f:C/\:.*//}.mk
-.if exists(${_usefile}) && !defined(_usefound)
+.        if exists(${_usefile}) && !defined(_usefound)
 _usefound=
 .include "${_usefile}"
-.endif
-.endfor
-.if !defined(_usefound)
+.        endif
+.      endfor
+.      if !defined(_usefound)
 ERROR+=	"Unknown USES=${f:C/\:.*//}"
-.endif
-.endfor
+.      endif
+.    endfor
 
-.if defined(PORTNAME)
+.    if defined(PORTNAME)
 .include "${PORTSDIR}/Mk/bsd.sanity.mk"
-.endif
+.    endif
 
-.if defined(USE_LOCALE)
+.    if defined(USE_LOCALE)
 CONFIGURE_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 MAKE_ENV+=		LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
-.endif
+.    endif
 
 # Macro for doing in-place file editing using regexps.  REINPLACE_ARGS may only
 # be used to set or override the -i argument.  Any other use is considered
 # invalid.
 REINPLACE_ARGS?=	-i.bak
-.if defined(DEVELOPER)
+.    if defined(DEVELOPER)
 REINPLACE_CMD?=	${SETENV} WRKSRC=${WRKSRC} REWARNFILE=${REWARNFILE} ${SH} ${SCRIPTSDIR}/sed_checked.sh
-.else
+.    else
 REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
-.endif
+.    endif
 FRAMEWORK_REINPLACE_CMD?=	${SED} -i.bak
 
 # Names of cookies used to skip already completed stages
@@ -2041,68 +2041,68 @@ MAKE_ENV+=		PREFIX=${PREFIX} \
 # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
 # gcc 4.x enable strict aliasing optimization with -O2 which is known to break
 # a lot of ports.
-.if !defined(WITHOUT_NO_STRICT_ALIASING)
-.if ${CC} != "icc"
-.if empty(CFLAGS:M-fno-strict-aliasing)
+.    if !defined(WITHOUT_NO_STRICT_ALIASING)
+.      if ${CC} != "icc"
+.        if empty(CFLAGS:M-fno-strict-aliasing)
 CFLAGS+=       -fno-strict-aliasing
-.endif
-.endif
-.endif
+.        endif
+.      endif
+.    endif
 
-.for lang in C CXX
-.if defined(USE_${lang}STD)
+.    for lang in C CXX
+.      if defined(USE_${lang}STD)
 ${lang}FLAGS:=	${${lang}FLAGS:N-std=*} -std=${USE_${lang}STD}
-.endif
+.      endif
 
 ${lang}FLAGS+=	${${lang}FLAGS_${ARCH}}
-.endfor
+.    endfor
 
 LDFLAGS+=	${LDFLAGS_${ARCH}}
 
 # Multiple make jobs support
-.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
+.    if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
 _MAKE_JOBS?=		#
 MAKE_JOBS_NUMBER=	1
-.else
-.if defined(MAKE_JOBS_NUMBER)
+.    else
+.      if defined(MAKE_JOBS_NUMBER)
 _MAKE_JOBS_NUMBER:=	${MAKE_JOBS_NUMBER}
-.else
-.if !defined(_SMP_CPUS)
+.      else
+.        if !defined(_SMP_CPUS)
 _SMP_CPUS!=		${SYSCTL} -n kern.smp.cpus
-.endif
+.        endif
 _EXPORTED_VARS+=	_SMP_CPUS
 _MAKE_JOBS_NUMBER=	${_SMP_CPUS}
-.endif
-.if defined(MAKE_JOBS_NUMBER_LIMIT) && ( ${MAKE_JOBS_NUMBER_LIMIT} < ${_MAKE_JOBS_NUMBER} )
+.      endif
+.      if defined(MAKE_JOBS_NUMBER_LIMIT) && ( ${MAKE_JOBS_NUMBER_LIMIT} < ${_MAKE_JOBS_NUMBER} )
 MAKE_JOBS_NUMBER=	${MAKE_JOBS_NUMBER_LIMIT}
-.else
+.      else
 MAKE_JOBS_NUMBER=	${_MAKE_JOBS_NUMBER}
-.endif
+.      endif
 _MAKE_JOBS?=		-j${MAKE_JOBS_NUMBER}
 BUILD_FAIL_MESSAGE+=	Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to the maintainer.
-.endif
+.    endif
 
 .include "${PORTSDIR}/Mk/bsd.ccache.mk"
 
-.if !make(makesum)
+.    if !make(makesum)
 FETCH_ENV?=		SSL_NO_VERIFY_PEER=1 SSL_NO_VERIFY_HOSTNAME=1
-.endif
+.    endif
 FETCH_BINARY?=	/usr/bin/fetch
 FETCH_ARGS?=	-Fpr
 FETCH_REGET?=	1
 FETCH_CMD?=		${FETCH_BINARY} ${FETCH_ARGS}
 
-.if defined(RANDOMIZE_MASTER_SITES)
-.if exists(/usr/games/random)
+.    if defined(RANDOMIZE_MASTER_SITES)
+.      if exists(/usr/games/random)
 RANDOM_CMD?=	/usr/games/random
-.elif exists(/usr/bin/random)
+.      elif exists(/usr/bin/random)
 RANDOM_CMD?=	/usr/bin/random
-.endif
-.if defined(RANDOM_CMD) && !empty(RANDOM_CMD)
+.      endif
+.      if defined(RANDOM_CMD) && !empty(RANDOM_CMD)
 RANDOM_ARGS?=	-w -f -
 _RANDOMIZE_SITES=	 ${RANDOM_CMD} ${RANDOM_ARGS}
-.endif
-.endif
+.      endif
+.    endif
 
 TOUCH?=			/usr/bin/touch
 TOUCH_FLAGS?=	-f
@@ -2111,35 +2111,35 @@ DISTORIG?=	.bak.orig
 PATCH?=			/usr/bin/patch
 PATCH_STRIP?=	-p0
 PATCH_DIST_STRIP?=	-p0
-.if defined(PATCH_DEBUG)
+.    if defined(PATCH_DEBUG)
 PATCH_DEBUG_TMP=	yes
 PATCH_ARGS?=	--forward -E ${PATCH_STRIP}
 PATCH_DIST_ARGS?=	--suffix ${DISTORIG} --forward -E ${PATCH_DIST_STRIP}
-.else
+.    else
 PATCH_ARGS?=	--forward --quiet -E ${PATCH_STRIP}
 PATCH_DIST_ARGS?=	--suffix ${DISTORIG} --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
-.if !defined(QUIET)
+.    endif
+.    if !defined(QUIET)
 PATCH_SILENT=		PATCH_SILENT=yes
-.endif
-.if defined(BATCH)
+.    endif
+.    if defined(BATCH)
 PATCH_ARGS+=		--batch
 PATCH_DIST_ARGS+=	--batch
-.endif
+.    endif
 
 # Prevent breakage with VERSION_CONTROL=numbered
 PATCH_ARGS+=	-V simple
 PATCH_DIST_ARGS+=		-V simple
 
-.if defined(PATCH_CHECK_ONLY)
+.    if defined(PATCH_CHECK_ONLY)
 PATCH_ARGS+=	-C
 PATCH_DIST_ARGS+=	-C
-.endif
+.    endif
 
-.if ${PATCH} == "/usr/bin/patch"
+.    if ${PATCH} == "/usr/bin/patch"
 PATCH_ARGS+=	--suffix .orig
 PATCH_DIST_ARGS+=	--suffix .orig
-.endif
+.    endif
 
 TAR?=	/usr/bin/tar
 
@@ -2149,13 +2149,13 @@ EXTRACT_BEFORE_ARGS?=	-xf
 EXTRACT_AFTER_ARGS?=	--no-same-owner --no-same-permissions
 
 # Figure out where the local mtree file is
-.if !defined(MTREE_FILE) && !defined(NO_MTREE)
-.if ${PREFIX} == /usr
+.    if !defined(MTREE_FILE) && !defined(NO_MTREE)
+.      if ${PREFIX} == /usr
 MTREE_FILE=	/etc/mtree/BSD.usr.dist
-.else
+.      else
 MTREE_FILE=	${PORTSDIR}/Templates/BSD.local.dist
-.endif
-.endif
+.      endif
+.    endif
 MTREE_CMD?=	/usr/sbin/mtree
 MTREE_ARGS?=	-U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p
 
@@ -2190,9 +2190,9 @@ COPYTREE_SHARE=	${SH} -c '(${FIND} -Ed $$1 $$3 | ${CPIO} -dumpl $$2 >/dev/null 2
 
 # The user can override the NO_PACKAGE by specifying this from
 # the make command line
-.if defined(FORCE_PACKAGE)
+.    if defined(FORCE_PACKAGE)
 .undef NO_PACKAGE
-.endif
+.    endif
 
 DESCR?=			${PKGDIR}/pkg-descr
 PLIST?=			${PKGDIR}/pkg-plist
@@ -2205,29 +2205,29 @@ _PKGMESSAGES+=	${PKGMESSAGE}
 TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
 
 # backward compatibility for users
-.if defined(_PKG_TRANSITIONING_TO_NEW_EXT)
-.if defined(PKG_NOCOMPRESS)
+.    if defined(_PKG_TRANSITIONING_TO_NEW_EXT)
+.      if defined(PKG_NOCOMPRESS)
 PKG_SUFX?=	.tar
-.else
+.      else
 PKG_SUFX?=	.txz
-.endif
+.      endif
 PKG_COMPRESSION_FORMAT?=	${PKG_SUFX:S/.//}
-.else
-.if defined(PKG_SUFX)
+.    else
+.      if defined(PKG_SUFX)
 PKG_COMPRESSION_FORMAT?=	${PKG_SUFX:S/.//}
 WARNING+= "PKG_SUFX is defined, it should be replaced with PKG_COMPRESSION_FORMAT"
-.endif
+.      endif
 PKG_SUFX=	.pkg
-.endif
-.if defined(PKG_NOCOMPRESS)
+.    endif
+.    if defined(PKG_NOCOMPRESS)
 PKG_COMPRESSION_FORMAT?=	tar
-.else
+.    else
 #.if ${OSVERSION} > 1400000
 #PKG_COMPRESSION_FORMAT?=	tzst
 #.else
 PKG_COMPRESSION_FORMAT?=	txz
 #.endif
-.endif
+.    endif
 
 # where pkg(8) stores its data
 PKG_DBDIR?=		/var/db/pkg
@@ -2237,9 +2237,9 @@ INSTALL_TARGET?=	install
 INSTALL_TARGET+=	${LATE_INSTALL_ARGS}
 
 # Integrate with the license auditing framework
-.if !defined (DISABLE_LICENSES)
+.    if !defined (DISABLE_LICENSES)
 .include "${PORTSDIR}/Mk/bsd.licenses.mk"
-.endif
+.    endif
 
 # Popular master sites
 .include "${PORTSDIR}/Mk/bsd.sites.mk"
@@ -2254,200 +2254,200 @@ _PATCH_SITES_DEFAULT?=
 # as per grouping rules (:something)
 # Organize _{MASTER,PATCH}_SITES_{DEFAULT,[^/:]+} according to grouping
 # rules (:something)
-.for _S in ${MASTER_SITES}
+.    for _S in ${MASTER_SITES}
 _S_TEMP=	${_S:S/^${_S:C@/?:[^/:]+$@/@}//:S/^://}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/,/ /g}
+.      if !empty(_S_TEMP)
+.        for _group in ${_S_TEMP:S/,/ /g}
 _G_TEMP=	${_group}
-.			if ${_G_TEMP:C/[a-zA-Z0-9_]//g}
+.          if ${_G_TEMP:C/[a-zA-Z0-9_]//g}
 check-makevars::
 				@${ECHO_MSG} "The ${_S} MASTER_SITES line has"
 				@${ECHO_MSG} "a group with invalid characters, only use [a-zA-Z0-9_]"
 				@${FALSE}
-.			endif
-.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+.          endif
+.          if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
 				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
 				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"
 				@${FALSE}
-.			endif
+.          endif
 _MASTER_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
-.		endfor
-.	else
+.        endfor
+.      else
 _MASTER_SITES_DEFAULT+=	${_S:C@^(.*/):[^/:]+$@\1@}
-.	endif
-.endfor
-.for _S in ${PATCH_SITES}
+.      endif
+.    endfor
+.    for _S in ${PATCH_SITES}
 _S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/,/ /g}
+.      if !empty(_S_TEMP)
+.        for _group in ${_S_TEMP:S/,/ /g}
 _G_TEMP=	${_group}
-.			if ${_G_TEMP:C/[a-zA-Z0-9_]//g}
+.          if ${_G_TEMP:C/[a-zA-Z0-9_]//g}
 check-makevars::
 				@${ECHO_MSG} "The ${_S} PATCH_SITES line has"
 				@${ECHO_MSG} "a group with invalid characters, only use [a-zA-Z0-9_]"
 				@${FALSE}
-.			endif
-.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+.          endif
+.          if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
 				@${ECHO_MSG} "The words all, ALL and default are reserved and cannot be"
 				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
 				@${FALSE}
-.			endif
+.          endif
 _PATCH_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
-.		endfor
-.	else
+.        endfor
+.      else
 _PATCH_SITES_DEFAULT+=	${_S:C@^(.*/):[^/:]+$@\1@}
-.	endif
-.endfor
+.      endif
+.    endfor
 
 # Feed internal _{MASTER,PATCH}_SITE_SUBDIR_n where n is a group designation
 # as per grouping rules (:something)
 # Organize _{MASTER,PATCH}_SITE_SUBDIR_{DEFAULT,[^/:]+} according to grouping
 # rules (:something)
-.for _S in ${MASTER_SITE_SUBDIR}
+.    for _S in ${MASTER_SITE_SUBDIR}
 _S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/,/ /g}
+.      if !empty(_S_TEMP)
+.        for _group in ${_S_TEMP:S/,/ /g}
 _G_TEMP=	${_group}
-.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+.          if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
 				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
 				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
 				@${FALSE}
-.			endif
-.			if defined(_MASTER_SITES_${_group})
+.          endif
+.          if defined(_MASTER_SITES_${_group})
 _MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
-.			endif
-.		endfor
-.	else
-.		if defined(_MASTER_SITES_DEFAULT)
+.          endif
+.        endfor
+.      else
+.        if defined(_MASTER_SITES_DEFAULT)
 _MASTER_SITE_SUBDIR_DEFAULT+=	${_S:C@^(.*)/:[^/:]+$@\1@}
-.		endif
-.	endif
-.endfor
-.for _S in ${PATCH_SITE_SUBDIR}
+.        endif
+.      endif
+.    endfor
+.    for _S in ${PATCH_SITE_SUBDIR}
 _S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/,/ /g}
+.      if !empty(_S_TEMP)
+.        for _group in ${_S_TEMP:S/,/ /g}
 _G_TEMP=	${_group}
-.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+.          if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
 				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
 				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
 				@${FALSE}
-.			endif
-.			if defined(_PATCH_SITES_${_group})
+.          endif
+.          if defined(_PATCH_SITES_${_group})
 _PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
-.			endif
-.		endfor
-.	else
-.		if defined(_PATCH_SITES_DEFAULT)
+.          endif
+.        endfor
+.      else
+.        if defined(_PATCH_SITES_DEFAULT)
 _PATCH_SITE_SUBDIR_DEFAULT+=	${_S:C@^(.*)/:[^/:]+$@\1@}
-.		endif
-.	endif
-.endfor
+.        endif
+.      endif
+.    endfor
 
 # Substitute subdirectory names
 # XXX simpler/faster solution but not the best space wise, suggestions please
-.for _S in ${MASTER_SITES}
+.    for _S in ${MASTER_SITES}
 _S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/,/ /g}
-.			if !defined(_MASTER_SITE_SUBDIR_${_group})
+.      if !empty(_S_TEMP)
+.        for _group in ${_S_TEMP:S/,/ /g}
+.          if !defined(_MASTER_SITE_SUBDIR_${_group})
 MASTER_SITES_TMP=	${_MASTER_SITES_${_group}:S^%SUBDIR%/^^}
-.			else
+.          else
 _S_TEMP_TEMP=		${_MASTER_SITES_${_group}:M*%SUBDIR%/*}
-.				if empty(_S_TEMP_TEMP)
+.            if empty(_S_TEMP_TEMP)
 MASTER_SITES_TMP=	${_MASTER_SITES_${_group}}
-.				else
+.            else
 MASTER_SITES_TMP=
-.					for site in ${_MASTER_SITES_${_group}}
+.              for site in ${_MASTER_SITES_${_group}}
 _S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
-.						if empty(_S_TEMP_TEMP)
+.                if empty(_S_TEMP_TEMP)
 MASTER_SITES_TMP+=	${site}
-.						else
-.							for dir in ${_MASTER_SITE_SUBDIR_${_group}}
+.                else
+.                  for dir in ${_MASTER_SITE_SUBDIR_${_group}}
 MASTER_SITES_TMP+=	${site:S^%SUBDIR%^\${dir}^}
-.							endfor
-.						endif
-.					endfor
-.				endif
-.			endif
+.                  endfor
+.                endif
+.              endfor
+.            endif
+.          endif
 _MASTER_SITES_${_group}:=	${MASTER_SITES_TMP}
-.		endfor
-.	endif
-.endfor
-.if defined(_MASTER_SITE_SUBDIR_DEFAULT)
+.        endfor
+.      endif
+.    endfor
+.    if defined(_MASTER_SITE_SUBDIR_DEFAULT)
 _S_TEMP=	${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*}
-.	if empty(_S_TEMP)
+.      if empty(_S_TEMP)
 MASTER_SITES_TMP=	${_MASTER_SITES_DEFAULT}
-.	else
+.      else
 MASTER_SITES_TMP=
-.		for site in ${_MASTER_SITES_DEFAULT}
+.        for site in ${_MASTER_SITES_DEFAULT}
 _S_TEMP_TEMP=		${site:M*%SUBDIR%/*}
-.			if empty(_S_TEMP_TEMP)
+.          if empty(_S_TEMP_TEMP)
 MASTER_SITES_TMP+=	${site}
-.			else
-.				for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}
+.          else
+.            for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}
 MASTER_SITES_TMP+=	${site:S^%SUBDIR%^\${dir}^}
-.				endfor
-.			endif
-.		endfor
-.	endif
-.else
+.            endfor
+.          endif
+.        endfor
+.      endif
+.    else
 MASTER_SITES_TMP=	${_MASTER_SITES_DEFAULT:S^%SUBDIR%/^^}
-.endif
+.    endif
 _MASTER_SITES_DEFAULT:=	${MASTER_SITES_TMP}
 MASTER_SITES_TMP=
-.for _S in ${PATCH_SITES}
+.    for _S in ${PATCH_SITES}
 _S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/,/ /g}
-.			if !defined(_PATCH_SITE_SUBDIR_${_group})
+.      if !empty(_S_TEMP)
+.        for _group in ${_S_TEMP:S/,/ /g}
+.          if !defined(_PATCH_SITE_SUBDIR_${_group})
 PATCH_SITES_TMP=	${_PATCH_SITES_${_group}:S^%SUBDIR%/^^}
-.			else
+.          else
 _S_TEMP_TEMP=		${_PATCH_SITES_${_group}:M*%SUBDIR%/*}
-.				if empty(_S_TEMP_TEMP)
+.            if empty(_S_TEMP_TEMP)
 PATCH_SITES_TMP=	${_PATCH_SITES_${_group}}
-.				else
+.            else
 PATCH_SITES_TMP=
-.					for site in ${_PATCH_SITES_${_group}}
+.              for site in ${_PATCH_SITES_${_group}}
 _S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
-.						if empty(_S_TEMP_TEMP)
+.                if empty(_S_TEMP_TEMP)
 PATCH_SITES_TMP+=	${site}
-.						else
-.							for dir in ${_PATCH_SITE_SUBDIR_${_group}}
+.                else
+.                  for dir in ${_PATCH_SITE_SUBDIR_${_group}}
 PATCH_SITES_TMP+=	${site:S^%SUBDIR%^\${dir}^}
-.							endfor
-.						endif
-.					endfor
-.				endif
-.			endif
+.                  endfor
+.                endif
+.              endfor
+.            endif
+.          endif
 _PATCH_SITES_${_group}:=	${PATCH_SITES_TMP}
-.		endfor
-.	endif
-.endfor
-.if defined(_PATCH_SITE_SUBDIR_DEFAULT)
+.        endfor
+.      endif
+.    endfor
+.    if defined(_PATCH_SITE_SUBDIR_DEFAULT)
 _S_TEMP=	${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*}
-.	if empty(_S_TEMP)
+.      if empty(_S_TEMP)
 PATCH_SITES_TMP=	${_PATCH_SITES_DEFAULT}
-.	else
+.      else
 PATCH_SITES_TMP=
-.		for site in ${_PATCH_SITES_DEFAULT}
+.        for site in ${_PATCH_SITES_DEFAULT}
 _S_TEMP_TEMP=		${site:M*%SUBDIR%/*}
-.			if empty(_S_TEMP_TEMP)
+.          if empty(_S_TEMP_TEMP)
 PATCH_SITES_TMP+=	${site}
-.			else
-.				for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}
+.          else
+.            for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}
 PATCH_SITES_TMP+=	${site:S^%SUBDIR%^\${dir}^}
-.				endfor
-.			endif
-.		endfor
-.	endif
-.else
+.            endfor
+.          endif
+.        endfor
+.      endif
+.    else
 PATCH_SITES_TMP=	${_PATCH_SITES_DEFAULT:S^%SUBDIR%/^^}
-.endif
+.    endif
 _PATCH_SITES_DEFAULT:=	${PATCH_SITES_TMP}
 PATCH_SITES_TMP=
 
@@ -2458,13 +2458,13 @@ MASTER_SITE_BACKUP:=	${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^}
 
 # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository
 # for everything, but don't search it twice by appending it to the end.
-.if defined(MASTER_SITE_FREEBSD)
+.    if defined(MASTER_SITE_FREEBSD)
 _MASTER_SITE_OVERRIDE:=	${MASTER_SITE_BACKUP}
 _MASTER_SITE_BACKUP:=	# empty
-.else
+.    else
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE}
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP}
-.endif
+.    endif
 
 # Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL
 # according to grouping rules (:something)
@@ -2472,47 +2472,47 @@ DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
 _MASTER_SITES_ALL=	${_MASTER_SITES_DEFAULT}
 _PATCH_SITES_ALL=	${_PATCH_SITES_DEFAULT}
 _G_TEMP=	DEFAULT
-.for _D in ${DISTFILES}
+.    for _D in ${DISTFILES}
 _D_TEMP=	${_D:S/^${_D:C/:[^:]+$//}//}
-.	if !empty(_D_TEMP)
-.		for _group in ${_D_TEMP:S/^://:S/,/ /g}
-.			if !defined(_MASTER_SITES_${_group})
+.      if !empty(_D_TEMP)
+.        for _group in ${_D_TEMP:S/^://:S/,/ /g}
+.          if !defined(_MASTER_SITES_${_group})
 _G_TEMP_TEMP=	${_G_TEMP:M/${_group}/}
-.				if empty(_G_TEMP_TEMP)
+.            if empty(_G_TEMP_TEMP)
 _G_TEMP+=	${_group}
 _MASTER_SITES_ALL+=	${_MASTER_SITES_${_group}}
-.				endif
-.			endif
-.		endfor
+.            endif
+.          endif
+.        endfor
 _DISTFILES+=	${_D:C/:[^:]+$//}
-.	else
+.      else
 _DISTFILES+=	${_D}
-.	endif
-.endfor
+.      endif
+.    endfor
 _G_TEMP=	DEFAULT
-.for _P in ${PATCHFILES}
+.    for _P in ${PATCHFILES}
 _P_TEMP=	${_P:C/:[^-:][^:]*$//}
 _P_groups=	${_P:S/^${_P:C/:[^:]+$//}//:S/^://}
 _P_file=	${_P_TEMP:C/:-[^:]+$//}
 _P_strip=	${_P_TEMP:S/^${_P_TEMP:C/:-[^:]*$//}//:S/^://}
-.	if !empty(_P_groups)
-.		for _group in ${_P_groups:S/,/ /g}
-.			if !defined(_PATCH_SITES_${_group})
+.      if !empty(_P_groups)
+.        for _group in ${_P_groups:S/,/ /g}
+.          if !defined(_PATCH_SITES_${_group})
 _G_TEMP_TEMP=	${_G_TEMP:M/${_group}/}
-.				if empty(_G_TEMP_TEMP)
+.            if empty(_G_TEMP_TEMP)
 _G_TEMP+=	${_group}
 _PATCH_SITES_ALL+=	${_PATCH_SITES_${_group}}
-.				endif
-.			endif
-.		endfor
-.	endif
+.            endif
+.          endif
+.        endfor
+.      endif
 _PATCHFILES:=	${_PATCHFILES} ${_P_file}
-.	if empty(_P_strip)
+.      if empty(_P_strip)
 _PATCHFILES2:=	${_PATCHFILES2} ${_P_file}
-.	else
+.      else
 _PATCHFILES2:=	${_PATCHFILES2} ${_P_file}:${_P_strip}
-.	endif
-.endfor
+.      endif
+.    endfor
 _P_groups=
 _P_file=
 _P_strip=
@@ -2528,62 +2528,62 @@ MASTER_SORT_REGEX?=
 MASTER_SORT_REGEX+=	${MASTER_SORT:S|.|\\.|g:S|^|://[^/]*|:S|$|/|}
 
 MASTER_SORT_AWK=	BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; }
-.for srt in ${MASTER_SORT_REGEX}
+.    for srt in ${MASTER_SORT_REGEX}
 MASTER_SORT_AWK+=	/${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; }
-.endfor
+.    endfor
 MASTER_SORT_AWK+=	{ rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
 
 #
 # Hackery to enable simple fetch targets with several dynamic MASTER_SITES
 #
 _MASTER_SITES_ENV=	_MASTER_SITES_DEFAULT=${_MASTER_SITES_DEFAULT:Q}
-.for _F in ${DISTFILES}
+.    for _F in ${DISTFILES}
 _F_TEMP=	${_F:S/^${_F:C/:[^:]+$//}//:S/^://}
-.	if !empty(_F_TEMP)
-.		for _group in ${_F_TEMP:S/,/ /g}
-.			if defined(_MASTER_SITES_${_group})
+.      if !empty(_F_TEMP)
+.        for _group in ${_F_TEMP:S/,/ /g}
+.          if defined(_MASTER_SITES_${_group})
 _MASTER_SITES_ENV+=	_MASTER_SITES_${_group}=${_MASTER_SITES_${_group}:Q}
-.			endif
-.		endfor
-.	endif
-.endfor
+.          endif
+.        endfor
+.      endif
+.    endfor
 _PATCH_SITES_ENV=	_PATCH_SITES_DEFAULT=${_PATCH_SITES_DEFAULT:Q}
-.for _F in ${PATCHFILES}
+.    for _F in ${PATCHFILES}
 _F_TEMP=	${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}
-.	if !empty(_F_TEMP)
-.		for _group in ${_F_TEMP:S/,/ /g}
-.			if defined(_PATCH_SITES_${_group})
+.      if !empty(_F_TEMP)
+.        for _group in ${_F_TEMP:S/,/ /g}
+.          if defined(_PATCH_SITES_${_group})
 _PATCH_SITES_ENV+=	_PATCH_SITES_${_group}=${_PATCH_SITES_${_group}:Q}
-.			endif
-.		endfor
-.	endif
-.endfor
+.          endif
+.        endfor
+.      endif
+.    endfor
 
 CKSUMFILES=		${ALLFILES}
 
 # List of all files, with ${DIST_SUBDIR} in front.  Used for checksum.
-.if defined(DIST_SUBDIR)
-.if defined(CKSUMFILES) && ${CKSUMFILES}!=""
+.    if defined(DIST_SUBDIR)
+.      if defined(CKSUMFILES) && ${CKSUMFILES}!=""
 _CKSUMFILES?=	${CKSUMFILES:S/^/${DIST_SUBDIR}\//}
-.endif
-.else
+.      endif
+.    else
 _CKSUMFILES?=	${CKSUMFILES}
-.endif
+.    endif
 
 # This is what is actually going to be extracted, and is overridable
 #  by user.
 EXTRACT_ONLY?=	${_DISTFILES}
 
-.if !target(maintainer)
+.    if !target(maintainer)
 maintainer:
 	@${ECHO_CMD} "${MAINTAINER}"
-.endif
+.    endif
 
-.if !defined(CATEGORIES)
+.    if !defined(CATEGORIES)
 check-categories:
 	@${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
 	@${FALSE}
-.else
+.    else
 
 VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	benchmarks biology cad chinese comms converters \
@@ -2604,24 +2604,24 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	x11-toolkits x11-wm xfce zope base
 
 check-categories:
-.for cat in ${CATEGORIES}
-.	if empty(VALID_CATEGORIES:M${cat})
+.      for cat in ${CATEGORIES}
+.        if empty(VALID_CATEGORIES:M${cat})
 		@${ECHO_MSG} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \
 		${FALSE};
-.	endif
-.endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
 PKGREPOSITORYSUBDIR?=	All
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
-.if exists(${PACKAGES})
+.    if exists(${PACKAGES})
 PACKAGES:=	${PACKAGES:S/:/\:/g}
 _HAVE_PACKAGES=	yes
 PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
 PKGOLDFILE?=		${PKGREPOSITORY}/${PKGNAME}.${PKG_COMPRESSION_FORMAT}
-.else
+.    else
 PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
-.endif
+.    endif
 WRKDIR_PKGFILE=	${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
 
 # The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
@@ -2643,19 +2643,19 @@ CONFIGURE_LOG?=		config.log
 CONFIGURE_FAIL_MESSAGE?=	"Please report the problem to ${MAINTAINER} [maintainer] and attach the \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\" including the output of the failure of your make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. a ${PKG_INFO} -Ea)."
 
 CONFIG_SITE?=		${PORTSDIR}/Templates/config.site
-.if defined(GNU_CONFIGURE)
+.    if defined(GNU_CONFIGURE)
 # Maximum command line length
-.if !defined(CONFIGURE_MAX_CMD_LEN)
+.      if !defined(CONFIGURE_MAX_CMD_LEN)
 CONFIGURE_MAX_CMD_LEN!=	${SYSCTL} -n kern.argmax
-.endif
+.      endif
 _EXPORTED_VARS+=	CONFIGURE_MAX_CMD_LEN
 GNU_CONFIGURE_PREFIX?=	${PREFIX}
 GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
 CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
-.if defined(CROSS_TOOLCHAIN)
+.      if defined(CROSS_TOOLCHAIN)
 CROSS_HOST=		${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 CONFIGURE_ARGS+=	--host=${CROSS_HOST}
-.endif
+.      endif
 CONFIGURE_ENV+=		CONFIG_SITE=${CONFIG_SITE} lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
 HAS_CONFIGURE=		yes
 
@@ -2682,7 +2682,7 @@ SET_LATE_CONFIGURE_ARGS= \
 	else \
 		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \
 	fi ;
-.endif
+.    endif
 
 # Passed to most of script invocations
 SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
@@ -2690,40 +2690,40 @@ SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
 		  SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
 		  PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 
-.if defined(BATCH)
+.    if defined(BATCH)
 SCRIPTS_ENV+=	BATCH=yes
-.endif
+.    endif
 
-.if ${PREFIX} == /usr
+.    if ${PREFIX} == /usr
 MANPREFIX?=	/usr/share
-.else
+.    else
 MANPREFIX?=	${PREFIX}
 MANDIRS+=	${PREFIX}/share/man
-.endif
+.    endif
 
 MANDIRS+=	${MANPREFIX}/man
-.for sect in 1 2 3 4 5 6 7 8 9
+.    for sect in 1 2 3 4 5 6 7 8 9
 MAN${sect}PREFIX?=	${MANPREFIX}
-.endfor
+.    endfor
 MANLPREFIX?=	${MANPREFIX}
 MANNPREFIX?=	${MANPREFIX}
 INFO_PATH?=	share/info
 
-.if defined(INFO)
+.    if defined(INFO)
 RUN_DEPENDS+=	indexinfo:print/indexinfo
 
-. for D in ${INFO:H}
+.      for D in ${INFO:H}
 RD:=	${D}
-.  if ${RD} != "."
-.   if !defined(INFO_SUBDIR)
+.        if ${RD} != "."
+.          if !defined(INFO_SUBDIR)
 INFO_SUBDIR:=	${RD}
-.   elif ${INFO_SUBDIR} != ${RD}
+.          elif ${INFO_SUBDIR} != ${RD}
 BROKEN=		only one subdirectory in INFO is allowed
-.   endif
-.  endif
+.          endif
+.        endif
 .undef RD
-. endfor
-.endif
+.      endfor
+.    endif
 
 DOCSDIR_REL?=	${DOCSDIR:S,^${PREFIX}/,,}
 EXAMPLESDIR_REL?=	${EXAMPLESDIR:S,^${PREFIX}/,,}
@@ -2765,170 +2765,170 @@ DESKTOPDIR?=		${PREFIX}/share/applications
 ################################################################
 
 # Check the machine architectures
-.if defined(ONLY_FOR_ARCHS)
-.for __ARCH in ${ONLY_FOR_ARCHS}
-.if ${ARCH:M${__ARCH}} != ""
+.    if defined(ONLY_FOR_ARCHS)
+.      for __ARCH in ${ONLY_FOR_ARCHS}
+.        if ${ARCH:M${__ARCH}} != ""
 __ARCH_OK?=		1
-.endif
-.endfor
-.else
+.        endif
+.      endfor
+.    else
 __ARCH_OK?=		1
-.endif
+.    endif
 
-.if defined(NOT_FOR_ARCHS)
-.for __NARCH in ${NOT_FOR_ARCHS}
-.if ${ARCH:M${__NARCH}} != ""
+.    if defined(NOT_FOR_ARCHS)
+.      for __NARCH in ${NOT_FOR_ARCHS}
+.        if ${ARCH:M${__NARCH}} != ""
 .undef __ARCH_OK
-.endif
-.endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
-.if !defined(__ARCH_OK)
-.if defined(ONLY_FOR_ARCHS)
+.    if !defined(__ARCH_OK)
+.      if defined(ONLY_FOR_ARCHS)
 IGNORE=		is only for ${ONLY_FOR_ARCHS:O},
-.else # defined(NOT_FOR_ARCHS)
+.      else # defined(NOT_FOR_ARCHS)
 IGNORE=		does not run on ${NOT_FOR_ARCHS:O},
-.endif
+.      endif
 IGNORE+=	while you are running ${ARCH}
 
-.if defined(ONLY_FOR_ARCHS_REASON_${ARCH})
+.      if defined(ONLY_FOR_ARCHS_REASON_${ARCH})
 IGNORE+=	(reason: ${ONLY_FOR_ARCHS_REASON_${ARCH}})
-.elif defined(ONLY_FOR_ARCHS_REASON)
+.      elif defined(ONLY_FOR_ARCHS_REASON)
 IGNORE+=	(reason: ${ONLY_FOR_ARCHS_REASON})
-.endif
+.      endif
 
-.if defined(NOT_FOR_ARCHS_REASON_${ARCH})
+.      if defined(NOT_FOR_ARCHS_REASON_${ARCH})
 IGNORE+=	(reason: ${NOT_FOR_ARCHS_REASON_${ARCH}})
-.elif defined(NOT_FOR_ARCHS_REASON)
+.      elif defined(NOT_FOR_ARCHS_REASON)
 IGNORE+=	(reason: ${NOT_FOR_ARCHS_REASON})
-.endif
+.      endif
 
-.endif
+.    endif
 
 # Check the user interaction and legal issues
-.if !defined(NO_IGNORE)
-.if (defined(IS_INTERACTIVE) && defined(BATCH))
+.    if !defined(NO_IGNORE)
+.      if (defined(IS_INTERACTIVE) && defined(BATCH))
 IGNORE=		is an interactive port
-.elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE))
+.      elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE))
 IGNORE=		is not an interactive port
-.elif (defined(NO_CDROM) && defined(FOR_CDROM))
+.      elif (defined(NO_CDROM) && defined(FOR_CDROM))
 IGNORE=		may not be placed on a CDROM: ${NO_CDROM}
-.elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
+.      elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
 IGNORE=		is restricted: ${RESTRICTED}
-.elif (defined(NO_PACKAGE) && defined(PACKAGE_BUILDING))
+.      elif (defined(NO_PACKAGE) && defined(PACKAGE_BUILDING))
 IGNORE=		may not be packaged: ${NO_PACKAGE}
-.elif defined(IGNORE_${ARCH})
+.      elif defined(IGNORE_${ARCH})
 IGNORE=		${IGNORE_${ARCH}}
-.elif defined(IGNORE_${OPSYS}_${OSREL:R}_${ARCH})
+.      elif defined(IGNORE_${OPSYS}_${OSREL:R}_${ARCH})
 IGNORE=		${IGNORE_${OPSYS}_${OSREL:R}_${ARCH}}
-.elif defined(IGNORE_${OPSYS}_${OSREL:R})
+.      elif defined(IGNORE_${OPSYS}_${OSREL:R})
 IGNORE=		${IGNORE_${OPSYS}_${OSREL:R}}
-.elif defined(IGNORE_${OPSYS})
+.      elif defined(IGNORE_${OPSYS})
 IGNORE=		${IGNORE_${OPSYS}}
-.elif defined(BROKEN)
-.if !defined(TRYBROKEN)
+.      elif defined(BROKEN)
+.        if !defined(TRYBROKEN)
 IGNORE=		is marked as broken: ${BROKEN}
-.endif
-.elif defined(BROKEN_${ARCH})
-.if !defined(TRYBROKEN)
+.        endif
+.      elif defined(BROKEN_${ARCH})
+.        if !defined(TRYBROKEN)
 IGNORE=		is marked as broken on ${ARCH}: ${BROKEN_${ARCH}}
-.endif
-.elif defined(BROKEN_${OPSYS}_${OSREL:R}_${ARCH})
-.if !defined(TRYBROKEN)
+.        endif
+.      elif defined(BROKEN_${OPSYS}_${OSREL:R}_${ARCH})
+.        if !defined(TRYBROKEN)
 IGNORE=		is marked as broken on ${OPSYS} ${OSREL} ${ARCH}: ${BROKEN_${OPSYS}_${OSREL:R}_${ARCH}}
-.endif
-.elif defined(BROKEN_${OPSYS}_${OSREL:R})
-.if !defined(TRYBROKEN)
+.        endif
+.      elif defined(BROKEN_${OPSYS}_${OSREL:R})
+.        if !defined(TRYBROKEN)
 IGNORE=		is marked as broken on ${OPSYS} ${OSREL}: ${BROKEN_${OPSYS}_${OSREL:R}}
-.endif
-.elif defined(BROKEN_${OPSYS})
-.if !defined(TRYBROKEN)
+.        endif
+.      elif defined(BROKEN_${OPSYS})
+.        if !defined(TRYBROKEN)
 IGNORE=		is marked as broken on ${OPSYS}: ${BROKEN_${OPSYS}}
-.endif
-.elif defined(FORBIDDEN)
+.        endif
+.      elif defined(FORBIDDEN)
 IGNORE=		is forbidden: ${FORBIDDEN}
-.endif
+.      endif
 
 # Define the text to be output to LEGAL
-.if defined(LEGAL_TEXT)
+.      if defined(LEGAL_TEXT)
 LEGAL= ${LEGAL_TEXT}
-.elif defined(RESTRICTED)
+.      elif defined(RESTRICTED)
 LEGAL= ${RESTRICTED}
-.elif defined(NO_CDROM)
+.      elif defined(NO_CDROM)
 LEGAL= ${NO_CDROM}
-.elif defined(NO_PACKAGE) && ! defined(LEGAL_PACKAGE)
+.      elif defined(NO_PACKAGE) && ! defined(LEGAL_PACKAGE)
 LEGAL= ${NO_PACKAGE}
-.endif
+.      endif
 
-.if (defined(MANUAL_PACKAGE_BUILD) && defined(PACKAGE_BUILDING))
+.      if (defined(MANUAL_PACKAGE_BUILD) && defined(PACKAGE_BUILDING))
 IGNORE=		has to be built manually: ${MANUAL_PACKAGE_BUILD}
 clean:
 	@${IGNORECMD}
-.endif
+.      endif
 
-.if defined(IGNORE)
-.if defined(IGNORE_SILENT)
+.      if defined(IGNORE)
+.        if defined(IGNORE_SILENT)
 IGNORECMD=	${DO_NADA}
-.else
+.        else
 IGNORECMD=	${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE:Q}. | ${FMT_80} ; exit 1
-.endif
+.        endif
 
 _TARGETS=	check-sanity fetch checksum extract patch configure all build \
 			install reinstall test package stage restage
 
-.for target in ${_TARGETS}
-.if !target(${target})
+.        for target in ${_TARGETS}
+.          if !target(${target})
 ${target}:
 	@${IGNORECMD}
-.if defined(INSTALLS_DEPENDS)
+.            if defined(INSTALLS_DEPENDS)
 	@${FALSE}
-.endif
-.endif
-.endfor
+.            endif
+.          endif
+.        endfor
 
-.endif
+.      endif
 
-.endif # !defined(NO_IGNORE)
+.    endif # !defined(NO_IGNORE)
 
 ignorelist:
-.if defined(IGNORE) || defined(NO_PACKAGE)
+.    if defined(IGNORE) || defined(NO_PACKAGE)
 ignorelist: package-name
-.endif
+.    endif
 
 ignorelist-verbose:
-.if defined(IGNORE)
+.    if defined(IGNORE)
 	@${ECHO_CMD} "${PKGNAME}|IGNORE: "${IGNORE:Q}
-.elif defined(NO_PACKAGE)
+.    elif defined(NO_PACKAGE)
 	@${ECHO_CMD} "${PKGNAME}|NO_PACKAGE: "${NO_PACKAGE:Q}
-.endif
+.    endif
 
 ################################################################
 # Clean directories for ftp or CDROM.
 ################################################################
 
-.if !defined(LICENSE)
+.    if !defined(LICENSE)
 
-.if defined(RESTRICTED)
+.      if defined(RESTRICTED)
 clean-restricted:	delete-distfiles delete-package
 clean-restricted-list: delete-distfiles-list delete-package-list
 RESTRICTED_FILES?=	${_DISTFILES} ${_PATCHFILES}
-.else
+.      else
 clean-restricted:
 clean-restricted-list:
-.endif
+.      endif
 
-.if defined(NO_CDROM)
+.      if defined(NO_CDROM)
 clean-for-cdrom:	delete-distfiles delete-package
 clean-for-cdrom-list:	delete-distfiles-list delete-package-list
 RESTRICTED_FILES?=	${_DISTFILES} ${_PATCHFILES}
-.else
+.      else
 clean-for-cdrom:
 clean-for-cdrom-list:
-.endif
+.      endif
 
-.endif # !defined(LICENSE)
+.    endif # !defined(LICENSE)
 
-.if defined(ALL_HOOK)
+.    if defined(ALL_HOOK)
 all:
 	@cd ${.CURDIR} && ${SETENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \
 	  DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
@@ -2937,33 +2937,33 @@ all:
 	  BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" \
 	  CONFLICTS="${CONFLICTS}" \
 	${ALL_HOOK}
-.endif
+.    endif
 
-.if !target(all)
+.    if !target(all)
 all: stage
-.endif
+.    endif
 
-.if !defined(DEPENDS_TARGET)
-.if defined(DEPENDS_PRECLEAN)
+.    if !defined(DEPENDS_TARGET)
+.      if defined(DEPENDS_PRECLEAN)
 DEPENDS_TARGET=	clean
 DEPENDS_ARGS=	NOCLEANDEPENDS=yes
-.endif
-.if make(reinstall)
+.      endif
+.      if make(reinstall)
 DEPENDS_TARGET+=	reinstall
-.else
+.      else
 DEPENDS_TARGET+=	install
-.endif
-.if defined(DEPENDS_CLEAN)
+.      endif
+.      if defined(DEPENDS_CLEAN)
 DEPENDS_TARGET+=	clean
 DEPENDS_ARGS+=	NOCLEANDEPENDS=yes
-.endif
-.endif
+.      endif
+.    endif
 
-.if defined(USE_GITLAB) && !${USE_GITLAB:Mnodefault} && empty(GL_COMMIT_DEFAULT)
+.    if defined(USE_GITLAB) && !${USE_GITLAB:Mnodefault} && empty(GL_COMMIT_DEFAULT)
 check-makevars::
 	@${ECHO_MSG} "GL_COMMIT is a required 40 character hash for use USE_GITLAB"
 	@${FALSE}
-.endif
+.    endif
 
 ################################################################
 #
@@ -2971,12 +2971,12 @@ check-makevars::
 # target or not.
 #
 ################################################################
-.if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
+.    if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
 	&& !defined(OPTIONS_GROUP) && !defined(OPTIONS_RADIO) \
 	|| defined(CONFIG_DONE_${PKGBASE:tu}) || \
 	defined(PACKAGE_BUILDING) || defined(BATCH))
 _OPTIONS_OK=yes
-.endif
+.    endif
 
 ################################################################
 # The following are used to create easy dummy targets for
@@ -2988,18 +2988,18 @@ _OPTIONS_OK=yes
 ################################################################
 
 # Disable build
-.if defined(NO_BUILD) && !target(build)
+.    if defined(NO_BUILD) && !target(build)
 build: configure
 	@${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE}
-.endif
+.    endif
 
 # Disable package
-.if defined(NO_PACKAGE) && !target(package)
+.    if defined(NO_PACKAGE) && !target(package)
 package:
-.if !defined(IGNORE_SILENT)
+.      if !defined(IGNORE_SILENT)
 	@${ECHO_MSG} "===>  ${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}.
-.endif
-.endif
+.      endif
+.    endif
 
 ################################################################
 # More standard targets start here.
@@ -3009,17 +3009,17 @@ package:
 # adding pre-* or post-* targets/scripts, override these.
 ################################################################
 
-.if defined(TRYBROKEN) && defined(BROKEN)
+.    if defined(TRYBROKEN) && defined(BROKEN)
 buildanyway-message:
 	@${ECHO_MSG} "Trying build of ${PKGNAME} even though it is marked BROKEN."
-.endif
+.    endif
 
 # Warn user about deprecated packages.  Advisory only.
 
-.if !target(check-deprecated)
+.    if !target(check-deprecated)
 # Try and keep these messages in sync with the ones in Mk/Scripts/create-manifest.sh
 check-deprecated:
-.if ${MAINTAINER} == "ports@FreeBSD.org"
+.      if ${MAINTAINER} == "ports@FreeBSD.org"
 	@${ECHO_MSG} "===>   NOTICE:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "The ${PORTNAME} port currently does not have a maintainer. As a result, it is"
@@ -3032,27 +3032,27 @@ check-deprecated:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "https://docs.freebsd.org/en/articles/contributing/#ports-contributing"
 	@${ECHO_MSG}
-.endif
-.if defined(DEPRECATED)
+.      endif
+.      if defined(DEPRECATED)
 	@${ECHO_MSG} "===>   NOTICE:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "This port is deprecated; you may wish to reconsider installing it:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} ${DEPRECATED:Q}.
 	@${ECHO_MSG}
-.if defined(EXPIRATION_DATE)
+.        if defined(EXPIRATION_DATE)
 	@${ECHO_MSG} "It is scheduled to be removed on or after ${EXPIRATION_DATE}."
 	@${ECHO_MSG}
-.endif
-.endif
-.endif
+.        endif
+.      endif
+.    endif
 
 # Check if the port is listed in the vulnerability database
 
 AUDITFILE?=		${PKG_DBDIR}/vuln.xml
 
 check-vulnerable:
-.if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING) \
+.    if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING) \
 		&& exists(${AUDITFILE})
 	@${SETENV} \
 			dp_ECHO_MSG="${ECHO_MSG}" \
@@ -3061,7 +3061,7 @@ check-vulnerable:
 			dp_PKGNAME="${PKGNAME}" \
 			dp_SCRIPTSDIR="${SCRIPTSDIR}" \
 			${SH} ${SCRIPTSDIR}/check-vulnerable.sh
-.endif
+.    endif
 
 # Quote simply quote all variables, except FETCH_ENV, some ports are creative
 # with it, and it needs to be quoted twice to pass through the echo/eval in
@@ -3085,78 +3085,78 @@ _DO_FETCH_ENV= \
 			dp_RANDOMIZE_SITES='${_RANDOMIZE_SITES}' \
 			dp_SCRIPTSDIR='${SCRIPTSDIR}' \
 			dp_TARGET='${.TARGET}'
-.if defined(DEVELOPER)
+.    if defined(DEVELOPER)
 _DO_FETCH_ENV+= dp_DEVELOPER=yes
-.else
+.    else
 _DO_FETCH_ENV+= dp_DEVELOPER=
-.endif
+.    endif
 
 # Fetch
 
-.if !target(do-fetch)
+.    if !target(do-fetch)
 do-fetch:
-.if !empty(DISTFILES)
+.      if !empty(DISTFILES)
 	@${SETENV} \
 			${_DO_FETCH_ENV} ${_MASTER_SITES_ENV} \
 			dp_SITE_FLAVOR=MASTER \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:C/.*/'&'/}
-.endif
-.if defined(PATCHFILES) && !empty(PATCHFILES)
+.      endif
+.      if defined(PATCHFILES) && !empty(PATCHFILES)
 	@${SETENV} \
 			${_DO_FETCH_ENV} ${_PATCH_SITES_ENV} \
 			dp_SITE_FLAVOR=PATCH \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh ${PATCHFILES:C/:-p[0-9]//:C/.*/'&'/}
-.endif
-.endif
+.      endif
+.    endif
 #
 # Prints out a list of files to fetch (useful to do a batch fetch)
 
-.if !target(fetch-list)
+.    if !target(fetch-list)
 fetch-list:
-.if !empty(DISTFILES)
+.      if !empty(DISTFILES)
 	@${SETENV} \
 			${_DO_FETCH_ENV} ${_MASTER_SITES_ENV} \
 			dp_SITE_FLAVOR=MASTER \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:C/.*/'&'/}
-.endif
-.if defined(PATCHFILES) && !empty(PATCHFILES)
+.      endif
+.      if defined(PATCHFILES) && !empty(PATCHFILES)
 	@${SETENV} \
 			${_DO_FETCH_ENV} ${_PATCH_SITES_ENV} \
 			dp_SITE_FLAVOR=PATCH \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh ${PATCHFILES:C/:-p[0-9]//:C/.*/'&'/}
-.endif
-.endif
+.      endif
+.    endif
 
 # Used by fetch-urlall-list and fetch-url-list
 
-.if !target(fetch-url-list-int)
+.    if !target(fetch-url-list-int)
 fetch-url-list-int:
-.if !empty(DISTFILES)
+.      if !empty(DISTFILES)
 	@${SETENV} \
 			${_DO_FETCH_ENV} ${_MASTER_SITES_ENV} \
 			dp_SITE_FLAVOR=MASTER \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:C/.*/'&'/}
-.endif
-.if defined(PATCHFILES) && !empty(PATCHFILES)
+.      endif
+.      if defined(PATCHFILES) && !empty(PATCHFILES)
 	@${SETENV} \
 			${_DO_FETCH_ENV} ${_PATCH_SITES_ENV} \
 			dp_SITE_FLAVOR=PATCH \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh ${PATCHFILES:C/:-p[0-9]//:C/.*/'&'/}
-.endif
-.endif
+.      endif
+.    endif
 
 # Prints out all the URL for all the DISTFILES and PATCHFILES.
 
-.if !target(fetch-urlall-list)
+.    if !target(fetch-urlall-list)
 fetch-urlall-list:
 	@cd ${.CURDIR} && ${SETENV} FORCE_FETCH_ALL=yes ${MAKE} fetch-url-list-int
-.endif
+.    endif
 
 # Prints the URL for all the DISTFILES and PATCHFILES that are not here
 
-.if !target(fetch-url-list)
+.    if !target(fetch-url-list)
 fetch-url-list: fetch-url-list-int
-.endif
+.    endif
 
 
 # Extract
@@ -3164,7 +3164,7 @@ fetch-url-list: fetch-url-list-int
 clean-wrkdir:
 	@${RM} -r ${WRKDIR}
 
-.if !target(do-extract)
+.    if !target(do-extract)
 do-extract: ${EXTRACT_WRKDIR}
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
@@ -3177,11 +3177,11 @@ do-extract: ${EXTRACT_WRKDIR}
 		${CHMOD} -R ug-s ${WRKDIR}; \
 		${CHOWN} -R 0:0 ${WRKDIR}; \
 	fi
-.endif
+.    endif
 
 # Patch
 
-.if !target(do-patch)
+.    if !target(do-patch)
 do-patch:
 	@${SETENV} \
 			dp_BZCAT="${BZCAT}" \
@@ -3207,12 +3207,12 @@ do-patch:
 			dp_UNZIP_NATIVE_CMD="${UNZIP_NATIVE_CMD}" \
 			dp_XZCAT="${XZCAT}" \
 			${SH} ${SCRIPTSDIR}/do-patch.sh
-.endif
+.    endif
 
-.if !target(run-autotools-fixup)
+.    if !target(run-autotools-fixup)
 run-autotools-fixup:
 # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
-.if !defined(WITHOUT_FBSD10_FIX)
+.      if !defined(WITHOUT_FBSD10_FIX)
 	-@for f in `${FIND} ${WRKDIR} -type f \( -name config.libpath -o \
 		-name config.rpath -o -name configure -o -name libtool.m4 -o \
 		-name ltconfig -o -name libtool -o -name aclocal.m4 -o \
@@ -3229,18 +3229,18 @@ run-autotools-fixup:
 			${TOUCH} ${TOUCH_FLAGS} -mr $${f}.fbsd10bak $${f} ; \
 			${RM} $${f}.fbsd10bak ; \
 		done
-.endif
-.endif
+.      endif
+.    endif
 
 # Configure
 
-.if !target(do-configure)
+.    if !target(do-configure)
 do-configure:
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		  ${SCRIPTDIR}/configure; \
 	fi
-.if defined(GNU_CONFIGURE)
+.      if defined(GNU_CONFIGURE)
 	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
 		| ${XARGS} -n 1 ${DIRNAME}); \
 	for _D in $${CONFIG_GUESS_DIRS}; do \
@@ -3251,8 +3251,8 @@ do-configure:
 		${CP} ${TEMPLATES}/config.sub $${_D}/config.sub; \
 		${CHMOD} a+rx $${_D}/config.sub; \
 	done
-.endif
-.if defined(HAS_CONFIGURE)
+.      endif
+.      if defined(HAS_CONFIGURE)
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@(cd ${CONFIGURE_WRKSRC} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
@@ -3269,12 +3269,12 @@ do-configure:
 			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \
 			 ${FALSE}; \
 		fi)
-.endif
-.endif
+.      endif
+.    endif
 
 # Build
 DO_MAKE_BUILD?=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
-.if !target(do-build)
+.    if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
@@ -3283,17 +3283,17 @@ do-build:
 			fi; \
 		${FALSE}; \
 		fi)
-.endif
+.    endif
 
 # Check conflicts
 
-.if !target(check-conflicts)
+.    if !target(check-conflicts)
 check-conflicts: check-build-conflicts check-install-conflicts
-.endif
+.    endif
 
-.if !target(check-build-conflicts)
+.    if !target(check-build-conflicts)
 check-build-conflicts:
-.if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK)
+.      if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK)
 	@conflicts_with=$$( \
 	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \
 		| while read pkgname prfx orgn; do \
@@ -3312,13 +3312,13 @@ check-build-conflicts:
 		${ECHO_MSG} "      Please remove them first with pkg delete."; \
 		exit 1;\
 	fi
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(identify-install-conflicts)
+.    if !target(identify-install-conflicts)
 CONFLICT_WARNING_WAIT?=	10
 identify-install-conflicts:
-.if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS)
+.      if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS)
 	@conflicts_with=$$( \
 	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
 		| while read pkgname prfx orgn; do \
@@ -3337,13 +3337,13 @@ identify-install-conflicts:
 		${ECHO_MSG} "      You may want to stop build with Ctrl + C."; \
 		sleep ${CONFLICT_WARNING_WAIT}; \
 	fi
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(check-install-conflicts)
+.    if !target(check-install-conflicts)
 check-install-conflicts:
-.if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS)
-.if defined(DEFER_CONFLICTS_CHECK)
+.      if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS)
+.        if defined(DEFER_CONFLICTS_CHECK)
 	@conflicts_with=$$( \
 	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
 			| while read pkgname prfx orgn; do \
@@ -3361,7 +3361,7 @@ check-install-conflicts:
 		${ECHO_MSG} "      Please remove them first with pkg delete."; \
 		exit 1; \
 	fi
-.else
+.        else
 	@conflicts_with=$$( \
 	{ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \
 			| while read pkgname prfx orgn; do \
@@ -3380,20 +3380,20 @@ check-install-conflicts:
 		${ECHO_MSG} "      Please remove them first with pkg delete."; \
 		exit 1; \
 	fi
-.endif # defined(DEFER_CONFLICTS_CHECK)
-.endif
-.endif
+.        endif # defined(DEFER_CONFLICTS_CHECK)
+.      endif
+.    endif
 
 # Install
 
-.if !target(do-install) && !defined(NO_INSTALL)
+.    if !target(do-install) && !defined(NO_INSTALL)
 do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endif
+.    endif
 
 # Test
 
-.if !target(do-test) && defined(TEST_TARGET)
+.    if !target(do-test) && defined(TEST_TARGET)
 DO_MAKE_TEST?=	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
 do-test:
 	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
@@ -3403,11 +3403,11 @@ do-test:
 			fi; \
 		${FALSE}; \
 		fi)
-.endif
+.    endif
 
 # Package
 
-.if defined(_HAVE_PACKAGES)
+.    if defined(_HAVE_PACKAGES)
 _EXTRA_PACKAGE_TARGET_DEP+= ${PKGFILE}
 _PORTS_DIRECTORIES+=	${PKGREPOSITORY}
 
@@ -3415,13 +3415,13 @@ ${PKGFILE}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY}
 	@${LN} -f ${WRKDIR_PKGFILE} ${PKGFILE} 2>/dev/null \
 			|| ${CP} -f ${WRKDIR_PKGFILE} ${PKGFILE}
 
-.if !defined(_PKG_TRANSITIONING_TO_NEW_EXT)
+.      if !defined(_PKG_TRANSITIONING_TO_NEW_EXT)
 _EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDFILE}
 ${PKGOLDFILE}: ${PKGFILE}
 	${INSTALL} -l rs ${PKGFILE} ${PKGOLDFILE}
-.endif
+.      endif
 
-.  if ${PKGORIGIN} == "ports-mgmt/pkg" || ${PKGORIGIN} == "ports-mgmt/pkg-devel"
+.      if ${PKGORIGIN} == "ports-mgmt/pkg" || ${PKGORIGIN} == "ports-mgmt/pkg-devel"
 _EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTREPOSITORY}
 _PORTS_DIRECTORIES+=	${PKGLATESTREPOSITORY}
 _EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE}
@@ -3430,7 +3430,7 @@ _EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE}
 ${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
 	${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE}
 
-.if !defined(_PKG_TRANSITIONING_TO_NEW_EXT)
+.        if !defined(_PKG_TRANSITIONING_TO_NEW_EXT)
 _EXTRA_PACKAGE_TARGET_DEP+=	${PKGOLDLATESTFILE} ${PKGOLDSIGFILE}
 
 ${PKGOLDLATESTFILE}: ${PKGOLDFILE} ${PKGLATESTREPOSITORY}
@@ -3441,10 +3441,10 @@ ${PKGOLDLATESTFILE}: ${PKGOLDFILE} ${PKGLATESTREPOSITORY}
 
 ${PKGOLDSIGFILE}: ${PKGLATESTREPOSITORY}
 	${INSTALL} -l rs pkg.pkg.sig ${PKGOLDSIGFILE}
-.endif
-.  endif
+.        endif
+.      endif
 
-.endif
+.    endif
 
 # from here this will become a loop for subpackages
 ${WRKDIR_PKGFILE}: ${TMPPLIST} create-manifest ${WRKDIR}/pkg
@@ -3457,39 +3457,39 @@ ${WRKDIR_PKGFILE}: ${TMPPLIST} create-manifest ${WRKDIR}/pkg
 _EXTRA_PACKAGE_TARGET_DEP+=	${WRKDIR_PKGFILE}
 # This will be the end of the loop
 
-.if !target(do-package)
+.    if !target(do-package)
 PKG_CREATE_ARGS+= -f ${PKG_COMPRESSION_FORMAT}
-.if defined(PKG_COMPRESSION_LEVEL)
+.      if defined(PKG_COMPRESSION_LEVEL)
 PKG_CREATE_ARGS+= -l ${PKG_COMPRESSION_LEVEL}
-.endif
+.      endif
 PKG_CREATE_ARGS+=	-r ${STAGEDIR}
-.  if defined(PKG_CREATE_VERBOSE)
+.      if defined(PKG_CREATE_VERBOSE)
 PKG_CREATE_ARGS+=	-v
-.  endif
+.      endif
 do-package: ${_EXTRA_PACKAGE_TARGET_DEP} ${WRKDIR}/pkg
-.endif
+.    endif
 
-.if !target(delete-package)
+.    if !target(delete-package)
 delete-package:
 	@${ECHO_MSG} "===>  Deleting package for ${PKGNAME}"
 # When staging, the package may only be in the workdir if not root
 	@${RM} ${PKGFILE} ${WRKDIR_PKGFILE} 2>/dev/null || :
-.endif
+.    endif
 
-.if !target(delete-package-list)
+.    if !target(delete-package-list)
 delete-package-list:
 	@${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; ${RM} ${PKGFILE})"
-.endif
+.    endif
 
 # Used by scripts and users to install a package from local repository.
 # Poudriere -i uses this, please keep.
-.if !target(install-package)
-.if defined(FORCE_PKG_REGISTER)
+.    if !target(install-package)
+.      if defined(FORCE_PKG_REGISTER)
 _INSTALL_PKG_ARGS=	-f
-.endif
-.if defined(INSTALLS_DEPENDS)
+.      endif
+.      if defined(INSTALLS_DEPENDS)
 _INSTALL_PKG_ARGS+=	-A
-.endif
+.      endif
 install-package:
 	@if [ -f "${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}" ]; then \
 	    _pkgfile="${WRKDIR_PKGFILE}"; \
@@ -3497,13 +3497,13 @@ install-package:
 	    _pkgfile="${PKGFILE}"; \
 	fi; \
 	${PKG_ADD} ${_INSTALL_PKG_ARGS} $${_pkgfile}
-.endif
+.    endif
 
 
 # Utility targets follow
 
-.if !target(check-already-installed)
-.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
+.    if !target(check-already-installed)
+.      if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 check-already-installed:
 		@${ECHO_MSG} "===>  Checking if ${PKGBASE} is already installed"; \
 		pkgname=`${PKG_INFO} -q -O ${PKGBASE}`; \
@@ -3521,62 +3521,62 @@ check-already-installed:
 			${ECHO_MSG} "      in your environment or the \"make install\" command line."; \
 			exit 1; \
 		fi
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(check-umask)
+.    if !target(check-umask)
 check-umask:
 	@if [ `${SH} -c umask` != 0022 ]; then \
 		${ECHO_MSG} "===>  Warning: your umask is \"`${SH} -c umask`"\".; \
 		${ECHO_MSG} "      If this is not desired, set it to an appropriate value"; \
 		${ECHO_MSG} "      and install this port again by \`\`make reinstall''."; \
 	fi
-.endif
+.    endif
 
 # Needed for poudriere wait for at least a year before removing
 # XXX 2017-04-09
-.if !target(install-mtree)
+.    if !target(install-mtree)
 install-mtree:
-.endif
+.    endif
 
-.if !target(install-ldconfig-file)
+.    if !target(install-ldconfig-file)
 install-ldconfig-file:
-.  if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
-.    if defined(USE_LDCONFIG)
-.      if !defined(USE_LINUX_PREFIX)
-.        if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER)
+.      if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
+.        if defined(USE_LDCONFIG)
+.          if !defined(USE_LINUX_PREFIX)
+.            if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Installing ldconfig configuration file"
-.          if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
+.              if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}
-.          endif
+.              endif
 	@${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \
 		> ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE}
 	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST}
-.          if ${PREFIX} != ${LOCALBASE}
+.              if ${PREFIX} != ${LOCALBASE}
 	@${ECHO_CMD} "@dir ${LOCALBASE}/${LDCONFIG_DIR}" >> ${TMPPLIST}
+.              endif
+.            endif
 .          endif
 .        endif
-.      endif
-.    endif
-.    if defined(USE_LDCONFIG32)
-.      if !defined(INSTALL_AS_USER)
+.        if defined(USE_LDCONFIG32)
+.          if !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Installing 32-bit ldconfig configuration file"
-.        if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
+.            if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}
-.        endif
+.            endif
 	@${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
 		> ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE}
 	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST}
-.        if ${PREFIX} != ${LOCALBASE}
+.            if ${PREFIX} != ${LOCALBASE}
 	@${ECHO_CMD} "@dir ${LOCALBASE}/${LDCONFIG32_DIR}" >> ${TMPPLIST}
+.            endif
+.          endif
 .        endif
 .      endif
 .    endif
-.  endif
-.endif
 
-.if !defined(USE_LINUX_PREFIX)
-.  if !target(fixup-lib-pkgconfig)
+.    if !defined(USE_LINUX_PREFIX)
+.      if !target(fixup-lib-pkgconfig)
 fixup-lib-pkgconfig:
 	@if [ -d ${STAGEDIR}${PREFIX}/lib/pkgconfig ]; then \
 		if [ -z "$$(${FIND} ${STAGEDIR}${PREFIX}/lib/pkgconfig -maxdepth 0 -empty)" ]; then \
@@ -3585,11 +3585,11 @@ fixup-lib-pkgconfig:
 		fi; \
 		${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig; \
 	fi
-.  endif
-.endif
+.      endif
+.    endif
 
-.if !target(create-users-groups)
-.if defined(GROUPS) || defined(USERS)
+.    if !target(create-users-groups)
+.      if defined(GROUPS) || defined(USERS)
 _UG_INSTALL=	${WRKDIR}/users-groups-install.sh
 _UG_DEINSTALL=	${WRKDIR}/users-groups-deinstall.sh
 PKGPREINSTALL+=	${_UG_INSTALL}
@@ -3612,11 +3612,11 @@ create-users-groups:
 			dp_UID_OFFSET="${UID_OFFSET}" \
 			dp_USERS_BLACKLIST="${USERS_BLACKLIST}" \
 			${SH} ${SCRIPTSDIR}/do-users-groups.sh "${USERS}" "${GROUPS}"
-.endif
-.endif
+.      endif
+.    endif
 
-.if !defined(DISABLE_SECURITY_CHECK)
-.if !target(security-check)
+.    if !defined(DISABLE_SECURITY_CHECK)
+.      if !target(security-check)
 security-check: ${TMPPLIST}
 # Scan PLIST for:
 #   1.  setugid files
@@ -3655,11 +3655,11 @@ security-check: ${TMPPLIST}
 			${ECHO_MSG} "$${www_site}"; \
 		fi; \
 	fi
-.endif
-.else # i.e. defined(DISABLE_SECURITY_CHECK)
+.      endif
+.    else # i.e. defined(DISABLE_SECURITY_CHECK)
 security-check:
 	@${ECHO_MSG} "      WARNING: Security check has been disabled."
-.endif # !defined(DISABLE_SECURITY_CHECK)
+.    endif # !defined(DISABLE_SECURITY_CHECK)
 
 ################################################################
 # Skeleton targets start here
@@ -3689,23 +3689,23 @@ package-message:
 
 # Empty pre-* and post-* targets
 
-.if exists(${SCRIPTDIR})
-.for stage in pre post
-.for name in pkg check-sanity fetch extract patch configure build stage install package
+.    if exists(${SCRIPTDIR})
+.      for stage in pre post
+.        for name in pkg check-sanity fetch extract patch configure build stage install package
 
-.if !target(${stage}-${name}-script)
-.if exists(${SCRIPTDIR}/${stage}-${name})
+.          if !target(${stage}-${name}-script)
+.            if exists(${SCRIPTDIR}/${stage}-${name})
 ${stage}-${name}-script:
 	@ cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 			${SCRIPTDIR}/${.TARGET:S/-script$//}
-.endif
-.endif
+.            endif
+.          endif
 
-.endfor
-.endfor
-.endif
+.        endfor
+.      endfor
+.    endif
 
-.if !target(pretty-print-www-site)
+.    if !target(pretty-print-www-site)
 pretty-print-www-site:
 	@www_site=$$(cd ${.CURDIR} && ${MAKE} www-site); \
 	if [ -n "$${www_site}" ]; then \
@@ -3713,7 +3713,7 @@ pretty-print-www-site:
 		${ECHO_MSG} -n "<a href=\"$${www_site}\">web site</a>"; \
 		${ECHO_MSG} " for further information"; \
 	fi
-.endif
+.    endif
 
 ################################################################
 # Some more targets supplied for users' convenience
@@ -3723,39 +3723,39 @@ pretty-print-www-site:
 #
 # Special target to verify patches
 
-.if !target(checkpatch)
+.    if !target(checkpatch)
 checkpatch:
 	@cd ${.CURDIR} && ${MAKE} ${PATCH_SILENT} PATCH_CHECK_ONLY=yes ${_PATCH_DEP} ${_PATCH_REAL_SEQ}
-.endif
+.    endif
 
 # Reinstall
 #
 # Special target to re-run install
 
-.if !target(reinstall)
+.    if !target(reinstall)
 reinstall:
 	@${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 	@cd ${.CURDIR} && DEPENDS_TARGET="${DEPENDS_TARGET}" ${MAKE} deinstall install
-.endif
+.    endif
 
-.if !target(restage)
+.    if !target(restage)
 restage:
 	@${RM} -r ${STAGEDIR} ${STAGE_COOKIE} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 	@cd ${.CURDIR} && ${MAKE} stage
-.endif
+.    endif
 
 # Deinstall
 #
 # Special target to remove installation
 
-.if !target(deinstall)
+.    if !target(deinstall)
 deinstall:
-.if defined(UID) && ${UID} != 0 && !defined(INSTALL_AS_USER)
+.      if defined(UID) && ${UID} != 0 && !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>  Switching to root credentials for '${.TARGET}' target"
 	@cd ${.CURDIR} && \
 		${SU_CMD} "${MAKE} ${.TARGET}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
-.else
+.      else
 	@${ECHO_MSG} "===>  Deinstalling for ${PKGBASE}"
 	@if ${PKG_INFO} -e ${PKGBASE}; then \
 		p=`${PKG_INFO} -q -O ${PKGBASE}`; \
@@ -3765,21 +3765,21 @@ deinstall:
 		${ECHO_MSG} "===>   ${PKGBASE} not installed, skipping"; \
 	fi
 	@${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
-.endif
-.endif
+.      endif
+.    endif
 
 # Deinstall-all
 #
 # Special target to remove installation of all ports of the same origin
 
-.if !target(deinstall-all)
+.    if !target(deinstall-all)
 deinstall-all:
-.if ${UID} != 0 && !defined(INSTALL_AS_USER)
+.      if ${UID} != 0 && !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>  Switching to root credentials for '${.TARGET}' target"
 	@cd ${.CURDIR} && \
 		${SU_CMD} "${MAKE} ${.TARGET}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
-.else
+.      else
 	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN}"
 	@deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 	for oldpkgorigin in $$(${GREP} "|${PKGORIGIN}|" ${PORTSDIR}/MOVED | ${CUT} -f 1 -d '|' | ${SORT} -u); do \
@@ -3794,12 +3794,12 @@ deinstall-all:
 		${ECHO_MSG} "===>   ${PKGORIGIN} not installed, skipping"; \
 	fi; \
 	${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
-.endif
-.endif
+.      endif
+.    endif
 
 # Cleaning up
 
-.if !target(do-clean)
+.    if !target(do-clean)
 do-clean:
 	@if [ -d ${WRKDIR} ]; then \
 		if [ -w ${WRKDIR} ]; then \
@@ -3808,73 +3808,73 @@ do-clean:
 			${ECHO_MSG} "===>   ${WRKDIR} not writable, skipping"; \
 		fi; \
 	fi
-.endif
+.    endif
 
-.if !target(clean)
+.    if !target(clean)
 pre-clean: clean-msg
 clean-msg:
 	@${ECHO_MSG} "===>  Cleaning for ${PKGNAME}"
 
-.if empty(FLAVORS)
+.      if empty(FLAVORS)
 CLEAN_DEPENDENCIES=
-.if !defined(NOCLEANDEPENDS)
+.        if !defined(NOCLEANDEPENDS)
 CLEAN_DEPENDENCIES+=	limited-clean-depends-noflavor
 limited-clean-depends-noflavor:
 	@cd ${.CURDIR} && ${MAKE} limited-clean-depends
-.endif
-.if target(pre-clean)
+.        endif
+.        if target(pre-clean)
 CLEAN_DEPENDENCIES+=	pre-clean-noflavor
 pre-clean-noflavor:
 	@cd ${.CURDIR} && ${SETENV} ${MAKE} pre-clean
-.endif
+.        endif
 CLEAN_DEPENDENCIES+=	do-clean-noflavor
 do-clean-noflavor:
 	@cd ${.CURDIR} && ${SETENV} ${MAKE} do-clean
-.if target(post-clean)
+.        if target(post-clean)
 CLEAN_DEPENDENCIES+=	post-clean-noflavor
 post-clean-noflavor:
 	@cd ${.CURDIR} &&  ${SETENV} ${MAKE} post-clean
-.endif
+.        endif
 .ORDER: ${CLEAN_DEPENDENCIES}
 clean: ${CLEAN_DEPENDENCIES}
-.endif
+.      endif
 
-.if !empty(_FLAVOR)
+.      if !empty(_FLAVOR)
 _CLEANFLAVORS=	${_FLAVOR}
-.else
+.      else
 _CLEANFLAVORS=	${FLAVORS}
-.endif
-.for _f in ${_CLEANFLAVORS}
+.      endif
+.      for _f in ${_CLEANFLAVORS}
 CLEAN_DEPENDENCIES=
-.if !defined(NOCLEANDEPENDS)
+.        if !defined(NOCLEANDEPENDS)
 CLEAN_DEPENDENCIES+=	limited-clean-depends-${_f}
 limited-clean-depends-${_f}:
 	@cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} limited-clean-depends
-.endif
-.if target(pre-clean)
+.        endif
+.        if target(pre-clean)
 CLEAN_DEPENDENCIES+=	pre-clean-${_f}
 pre-clean-${_f}:
 	@cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} pre-clean
-.endif
+.        endif
 CLEAN_DEPENDENCIES+=	do-clean-${_f}
 do-clean-${_f}:
 	@cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} do-clean
-.if target(post-clean)
+.        if target(post-clean)
 CLEAN_DEPENDENCIES+=	post-clean-${_f}
 post-clean-${_f}:
 	@cd ${.CURDIR} &&  ${SETENV} FLAVOR=${_f} ${MAKE} post-clean
-.endif
+.        endif
 .ORDER: ${CLEAN_DEPENDENCIES}
 clean: ${CLEAN_DEPENDENCIES}
-.endfor
-.endif
+.      endfor
+.    endif
 
-.if !target(distclean)
+.    if !target(distclean)
 distclean: clean
 	@cd ${.CURDIR} && ${MAKE} delete-distfiles RESTRICTED_FILES="${_DISTFILES:Q} ${_PATCHFILES:Q}"
-.endif
+.    endif
 
-.if !target(delete-distfiles)
+.    if !target(delete-distfiles)
 delete-distfiles:
 	@${ECHO_MSG} "===>  Deleting distfiles for ${PKGNAME}"
 	@(if [ "X${RESTRICTED_FILES}" != "X" -a -d ${_DISTDIR} ]; then \
@@ -3887,12 +3887,12 @@ delete-distfiles:
 			fi; \
 		done; \
 	fi)
-.if defined(DIST_SUBDIR)
+.      if defined(DIST_SUBDIR)
 	-@${RMDIR} ${_DISTDIR} >/dev/null 2>&1 || ${TRUE}
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(delete-distfiles-list)
+.    if !target(delete-distfiles-list)
 delete-distfiles-list:
 	@${ECHO_CMD} "# ${PKGNAME}"
 	@if [ "X${RESTRICTED_FILES}" != "X" ]; then \
@@ -3904,10 +3904,10 @@ delete-distfiles-list:
 			fi; \
 		done; \
 	fi
-.if defined(DIST_SUBDIR)
+.      if defined(DIST_SUBDIR)
 	@${ECHO_CMD} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}"
-.endif
-.endif
+.      endif
+.    endif
 
 # Generates patches.
 
@@ -3928,7 +3928,7 @@ update-patches:
 _CHECKSUM_INIT_ENV= \
 	dp_SHA256=${SHA256}
 
-.if !target(makesum)
+.    if !target(makesum)
 # Some port change the options with OPTIONS_*_FORCE when make(makesum) to be
 # able to add all distfiles in one go.
 # For this to work, we need to call the do-fetch script directly here so that
@@ -3949,11 +3949,11 @@ makesum: check-sanity
 			dp_ECHO_MSG='${ECHO_MSG}' \
 			dp_SCRIPTSDIR='${SCRIPTSDIR}' \
 			${SH} ${SCRIPTSDIR}/makesum.sh ${DISTFILES:C/.*/'&'/}
-.endif
+.    endif
 
-.if !target(checksum)
+.    if !target(checksum)
 checksum: fetch
-.if !empty(_CKSUMFILES) && !defined(NO_CHECKSUM)
+.      if !empty(_CKSUMFILES) && !defined(NO_CHECKSUM)
 	@${SETENV} \
 			${_CHECKSUM_INIT_ENV} \
 			dp_CHECKSUM_ALGORITHMS='${CHECKSUM_ALGORITHMS:tu}' \
@@ -3969,8 +3969,8 @@ checksum: fetch
 			dp_DISABLE_SIZE='${DISABLE_SIZE}' \
 			dp_NO_CHECKSUM='${NO_CHECKSUM}' \
 			${SH} ${SCRIPTSDIR}/checksum.sh ${_CKSUMFILES:C/.*/'&'/}
-.endif
-.endif
+.      endif
+.    endif
 
 # Some port's archives contains files modes that are a bit too restrictive for
 # some usage.  For example:
@@ -3990,37 +3990,37 @@ extract-fixup-modes:
 
 # Nobody should want to override this unless PKGNAME is simply bogus.
 
-.if !target(package-name)
+.    if !target(package-name)
 package-name:
 	@${ECHO_CMD} ${PKGNAME}
-.endif
+.    endif
 
 # Build a package but don't check the package cookie
 
-.if !target(repackage)
+.    if !target(repackage)
 repackage: pre-repackage package
 
 pre-repackage:
 	@${RM} ${PACKAGE_COOKIE}
-.endif
+.    endif
 
 # Build a package but don't check the cookie for installation, also don't
 # install package cookie
 
-.if !target(package-noinstall)
+.    if !target(package-noinstall)
 package-noinstall: package
-.endif
+.    endif
 
 ################################################################
 # Dependency checking
 ################################################################
 
-.if !target(depends)
+.    if !target(depends)
 depends: pkg-depends extract-depends patch-depends lib-depends fetch-depends build-depends run-depends
 
-.for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST
+.      for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST
 ${deptype:tl}-depends:
-.if defined(${deptype}_DEPENDS) && !defined(NO_DEPENDS)
+.        if defined(${deptype}_DEPENDS) && !defined(NO_DEPENDS)
 	@${SETENV} \
 		dp_RAWDEPENDS="${${deptype}_DEPENDS}" \
 		dp_DEPTYPE="${deptype}_DEPENDS" \
@@ -4044,20 +4044,20 @@ ${deptype:tl}-depends:
 		dp_MAKE="${MAKE}" \
 		dp_MAKEFLAGS='${.MAKEFLAGS}' \
 		${SH} ${SCRIPTSDIR}/do-depends.sh
-.endif
-.endfor
+.        endif
+.      endfor
 
-.endif
+.    endif
 
 # Dependency lists: both build and runtime, recursive.  Print out directory names.
 
 _UNIFIED_DEPENDS=${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} ${TEST_DEPENDS}
 _DEPEND_SPECIALS=	${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,}
 
-.for d in ${_UNIFIED_DEPENDS:M*\:/*}
+.    for d in ${_UNIFIED_DEPENDS:M*\:/*}
 _PORTSDIR_STR=	$${PORTSDIR}/
 DEV_WARNING+=	"It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it."
-.endfor
+.    endfor
 
 all-depends-list:
 	@${ALL-DEPENDS-LIST}
@@ -4110,49 +4110,49 @@ TEST-DEPENDS-LIST=			${DEPENDS-LIST} ${TEST_DEPENDS:Q}
 CLEAN-DEPENDS-LIST=			${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q}
 CLEAN-DEPENDS-LIMITED-LIST=	${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q}
 
-.if !target(clean-depends)
+.    if !target(clean-depends)
 clean-depends:
 	@for dir in $$(${CLEAN-DEPENDS-LIST}); do \
 		(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \
 	done
-.endif
+.    endif
 
-.if !target(limited-clean-depends)
+.    if !target(limited-clean-depends)
 limited-clean-depends:
 	@for dir in $$(${CLEAN-DEPENDS-LIMITED-LIST}); do \
 		(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \
 	done
-.endif
+.    endif
 
-.if !target(deinstall-depends)
+.    if !target(deinstall-depends)
 deinstall-depends:
 	@recursive_cmd="deinstall"; \
 		recursive_dirs="$$(${DEINSTALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif
+.    endif
 
-.if !target(fetch-specials)
+.    if !target(fetch-specials)
 fetch-specials:
 	@${ECHO_MSG} "===> Fetching all distfiles required by ${PKGNAME} for building"
 	@recursive_cmd="fetch"; \
 	    recursive_dirs="${_DEPEND_SPECIALS}"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif
+.    endif
 
-.if !target(fetch-recursive)
+.    if !target(fetch-recursive)
 fetch-recursive:
 	@${ECHO_MSG} "===> Fetching all distfiles for ${PKGNAME} and dependencies"
 	@recursive_cmd="fetch"; \
 	    recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif
+.    endif
 
-.if !target(fetch-recursive-list)
+.    if !target(fetch-recursive-list)
 fetch-recursive-list:
 	@recursive_cmd="fetch-list"; \
 	    recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif
+.    endif
 
 # Used by fetch-required and fetch-required list, this script looks
 # at each of the dependencies. If 3 items are specified in the tuple,
@@ -4187,64 +4187,64 @@ FETCH_LIST?=	for i in $$deps; do \
 		echo cd $$dir; cd $$dir; ${MAKE} $$targ; \
 	done
 
-.if !target(fetch-required)
+.    if !target(fetch-required)
 fetch-required: fetch
-.if defined(NO_DEPENDS)
+.      if defined(NO_DEPENDS)
 	@${ECHO_MSG} "===> NO_DEPENDS is set, not fetching any other distfiles for ${PKGNAME}"
-.else
+.      else
 	@${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies"
-.for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
-.if defined(${deptype}_DEPENDS)
+.        for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
+.          if defined(${deptype}_DEPENDS)
 	@targ=fetch; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST}
-.endif
-.endfor
-.endif
+.          endif
+.        endfor
+.      endif
 
-.endif
+.    endif
 
-.if !target(fetch-required-list)
+.    if !target(fetch-required-list)
 fetch-required-list: fetch-list
-.if !defined(NO_DEPENDS)
-.for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
-.if defined(${deptype}_DEPENDS)
+.      if !defined(NO_DEPENDS)
+.        for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
+.          if defined(${deptype}_DEPENDS)
 	@targ=fetch-list; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST}
-.endif
-.endfor
-.endif
-.endif
+.          endif
+.        endfor
+.      endif
+.    endif
 
-.if !target(checksum-recursive)
+.    if !target(checksum-recursive)
 checksum-recursive:
 	@${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies"
 	@recursive_cmd="checksum"; \
 	    recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif
+.    endif
 
 # Dependency lists: build and runtime.  Print out directory names.
 
 build-depends-list:
-.if defined(PKG_DEPENDS) || defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS)
+.    if defined(PKG_DEPENDS) || defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS)
 	@${BUILD-DEPENDS-LIST}
-.endif
+.    endif
 
 run-depends-list:
-.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS)
+.    if defined(LIB_DEPENDS) || defined(RUN_DEPENDS)
 	@${RUN-DEPENDS-LIST}
-.endif
+.    endif
 
 test-depends-list:
-.if defined(TEST_DEPENDS)
+.    if defined(TEST_DEPENDS)
 	@${TEST-DEPENDS-LIST}
-.endif
+.    endif
 
 # Package (recursive runtime) dependency list.  Print out both directory names
 # and package names.
 
 package-depends-list:
-.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS)
+.    if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS)
 	@${PACKAGE-DEPENDS-LIST}
-.endif
+.    endif
 
 _LIB_RUN_DEPENDS=	${LIB_DEPENDS} ${RUN_DEPENDS}
 PACKAGE-DEPENDS-LIST?= \
@@ -4301,9 +4301,9 @@ ACTUAL-PACKAGE-DEPENDS?= \
 	${SETENV} PKG_BIN="${PKG_BIN}" ${SH} ${SCRIPTSDIR}/actual-package-depends.sh $${depfiles} ${RUN_DEPENDS:C/(.*)\:.*/"\1"/}
 
 PKG_NOTES_ENV?=
-.for note in ${PKG_NOTES}
+.    for note in ${PKG_NOTES}
 PKG_NOTES_ENV+=	dp_PKG_NOTE_${note}=${PKG_NOTE_${note}:Q}
-.endfor
+.    endfor
 
 create-manifest:
 	@${SETENV} \
@@ -4394,26 +4394,26 @@ install-missing-packages:
 # If this ever changes, portmgr should contact the portsnap maintainer
 # first to avoid gratuitous breakage.
 
-. if !target(describe)
+.    if !target(describe)
 _EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
 _PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
 _FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
 _LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
 _BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
 _RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
-. if exists(${DESCR})
+.      if exists(${DESCR})
 _DESCR=${DESCR}
-. else
+.      else
 _DESCR=/dev/null
-. endif
+.      endif
 
-.  if defined(BUILDING_INDEX) && defined(INDEX_PORTS)
+.      if defined(BUILDING_INDEX) && defined(INDEX_PORTS)
 INDEX_OUT=${INDEX_TMPDIR}/${INDEXFILE}.desc.aggr
-.  else
+.      else
 INDEX_OUT=/dev/stdout
-.  endif
+.      endif
 
-.  if empty(FLAVORS) || defined(_DESCRIBE_WITH_FLAVOR)
+.      if empty(FLAVORS) || defined(_DESCRIBE_WITH_FLAVOR)
 describe:
 	@(${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|"; \
 	${ECHO_CMD} -n ${COMMENT:Q}; \
@@ -4428,31 +4428,31 @@ describe:
 			;; \
 		esac; \
 	done < ${DESCR}; ${ECHO_CMD}) >>${INDEX_OUT}
-.  else # empty(FLAVORS)
+.      else # empty(FLAVORS)
 describe: ${FLAVORS:S/^/describe-/}
-.   for f in ${FLAVORS}
+.        for f in ${FLAVORS}
 describe-${f}:
 	@cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -D_DESCRIBE_WITH_FLAVOR describe
-.   endfor
-.  endif # empty(FLAVORS)
-. endif
+.        endfor
+.      endif # empty(FLAVORS)
+.    endif
 
 www-site:
-.if exists(${DESCR})
+.    if exists(${DESCR})
 	@${AWK} '$$1 ~ /^WWW:/ {print $$2}' ${DESCR} | ${HEAD} -1
-.else
+.    else
 	@${ECHO_CMD}
-.endif
+.    endif
 
-.if !target(readmes)
+.    if !target(readmes)
 readmes:	readme
-.endif
+.    endif
 
-.if !target(readme)
+.    if !target(readme)
 readme:
 	@${RM} ${.CURDIR}/README.html
 	@cd ${.CURDIR} && ${MAKE} ${.CURDIR}/README.html
-.endif
+.    endif
 
 ${.CURDIR}/README.html:
 	@${ECHO_MSG} "===>   Creating README.html for ${PKGNAME}"
@@ -4487,44 +4487,44 @@ _PRETTY_PRINT_DEPENDS_LIST=\
 	fi;
 
 
-.if !target(pretty-print-build-depends-list)
+.    if !target(pretty-print-build-depends-list)
 pretty-print-build-depends-list:
-.if defined(PKG_DEPENDS) || defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || \
+.      if defined(PKG_DEPENDS) || defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || \
 	defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS)
 	@${_PRETTY_PRINT_DEPENDS_LIST}
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(pretty-print-run-depends-list)
+.    if !target(pretty-print-run-depends-list)
 pretty-print-run-depends-list:
-.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS)
+.      if defined(RUN_DEPENDS) || defined(LIB_DEPENDS)
 	@${_PRETTY_PRINT_DEPENDS_LIST}
-.endif
-.endif
+.      endif
+.    endif
 
 _SUB_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
-.if !target(apply-slist) && defined(SUB_FILES)
+.    if !target(apply-slist) && defined(SUB_FILES)
 apply-slist:
-.for file in ${SUB_FILES}
-.if !exists(${FILESDIR}/${file}.in)
+.      for file in ${SUB_FILES}
+.        if !exists(${FILESDIR}/${file}.in)
 	@${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1
-.else
+.        else
 	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file}
-.endif
-.endfor
-.for i in pkg-message pkg-install pkg-deinstall pkg-req
-.if ${SUB_FILES:M${i}*}!=""
+.        endif
+.      endfor
+.      for i in pkg-message pkg-install pkg-deinstall pkg-req
+.        if ${SUB_FILES:M${i}*}!=""
 ${i:S/-//:tu}=	${WRKDIR}/${SUB_FILES:M${i}*}
-.endif
-.endfor
-.endif
+.        endif
+.      endfor
+.    endif
 
 # Generate packing list.  Also tests to make sure all required package
 # files exist.
 
 PLIST_SUB_SANITIZED=	${PLIST_SUB:N*_regex=*}
 
-.if !target(generate-plist)
+.    if !target(generate-plist)
 generate-plist: ${WRKDIR}
 	@${ECHO_MSG} "===>   Generating temporary packing list"
 	@${MKDIR} ${TMPPLIST:H}
@@ -4533,77 +4533,77 @@ generate-plist: ${WRKDIR}
 	@for file in ${PLIST_FILES}; do \
 		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
 	done
-.if !empty(PLIST)
-.for f in ${PLIST}
+.      if !empty(PLIST)
+.        for f in ${PLIST}
 	@if [ -f "${f}" ]; then \
 		${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${f} >> ${TMPPLIST}; \
 		for i in owner group mode; do ${ECHO_CMD} "@$$i"; done >> ${TMPPLIST}; \
 	fi
-.endfor
-.endif
+.        endfor
+.      endif
 
-.for dir in ${PLIST_DIRS}
+.      for dir in ${PLIST_DIRS}
 	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}
-.endfor
+.      endfor
 
-.endif
+.    endif
 
 ${TMPPLIST}:
 	@cd ${.CURDIR} && ${MAKE} generate-plist
 
-.for _type in EXAMPLES DOCS
-.if !empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type})
-.if !target(add-plist-${_type:tl})
-.if defined(PORT${_type}) && !empty(PORT_OPTIONS:M${_type})
+.    for _type in EXAMPLES DOCS
+.      if !empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type})
+.        if !target(add-plist-${_type:tl})
+.          if defined(PORT${_type}) && !empty(PORT_OPTIONS:M${_type})
 add-plist-${_type:tl}:
-.for x in ${PORT${_type}}
+.            for x in ${PORT${_type}}
 	@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \
 		if [ ! -e ${STAGEDIR}${${_type}DIR}/${x} ]; then \
 		${ECHO_CMD} ${${_type}DIR}/${x} >> ${TMPPLIST}; \
 	fi;fi
-.endfor
+.            endfor
 	@${FIND} -P ${PORT${_type}:S/^/${STAGEDIR}${${_type}DIR}\//} ! -type d 2>/dev/null | \
 		${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST}
-.endif
-.endif
-.endif
-.endfor
+.          endif
+.        endif
+.      endif
+.    endfor
 
-.if !target(add-plist-data)
-.if defined(PORTDATA)
+.    if !target(add-plist-data)
+.      if defined(PORTDATA)
 add-plist-data:
-.for x in ${PORTDATA}
+.        for x in ${PORTDATA}
 	@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \
 		if [ ! -e ${STAGEDIR}${DATADIR}/${x} ]; then \
 		${ECHO_CMD} ${DATADIR}/${x} >> ${TMPPLIST}; \
 	fi;fi
-.endfor
+.        endfor
 	@${FIND} -P ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} ! -type d 2>/dev/null | \
 		${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST}
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(add-plist-info)
-.if defined(INFO)
+.    if !target(add-plist-info)
+.      if defined(INFO)
 add-plist-info:
-.for i in ${INFO}
+.        for i in ${INFO}
 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}:@info\ :g >> ${TMPPLIST}
-.endfor
-.endif
-.endif
+.        endfor
+.      endif
+.    endif
 
 # If we're installing into a non-standard PREFIX, we need to remove that directory at
 # deinstall-time
-.if !target(add-plist-post)
-.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && \
+.    if !target(add-plist-post)
+.      if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && \
     ${PREFIX} != "/usr" && ${PREFIX} != "/" && !defined(NO_PREFIX_RMDIR))
 add-plist-post:
 	@${ECHO_CMD} "@dir ${PREFIX}" >> ${TMPPLIST}
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(install-rc-script)
-.if defined(USE_RC_SUBR)
+.    if !target(install-rc-script)
+.      if defined(USE_RC_SUBR)
 install-rc-script:
 	@${ECHO_MSG} "===> Staging rc.d startup script(s)"
 	@for i in ${USE_RC_SUBR}; do \
@@ -4612,10 +4612,10 @@ install-rc-script:
 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
 		${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
 	done
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(check-man)
+.    if !target(check-man)
 check-man: stage
 	@${ECHO_MSG} "====> Checking man pages (check-man)"
 	@mdirs= ; \
@@ -4631,12 +4631,12 @@ check-man: stage
 		done ; \
 	done ; \
 	exit $$err
-.endif
+.    endif
 
 # Compress all manpage not already compressed which are not hardlinks
 # Find all manpages which are not compressed and are hardlinks, and only get the list of inodes concerned, for each of them compress the first one found and recreate the hardlinks for the others
 # Fixes all dead symlinks left by the previous round
-.if !target(compress-man)
+.    if !target(compress-man)
 compress-man:
 	@${ECHO_MSG} "====> Compressing man pages (compress-man)"
 	@mdirs= ; \
@@ -4663,102 +4663,102 @@ compress-man:
 				${RM} $$link ; \
 		done; \
 	done
-.endif
+.    endif
 
-.if !target(stage-dir)
+.    if !target(stage-dir)
 stage-dir: ${STAGEDIR}${PREFIX}
-.if !defined(NO_MTREE)
+.      if !defined(NO_MTREE)
 	@${MTREE_CMD} ${MTREE_ARGS} ${STAGEDIR}${PREFIX} > /dev/null
-.endif
-.endif
+.      endif
+.    endif
 
-.if !target(makeplist)
+.    if !target(makeplist)
 makeplist: stage
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist
-.endif
+.    endif
 
-.if !target(check-plist)
+.    if !target(check-plist)
 check-plist: stage
 	@${ECHO_MSG} "====> Checking for pkg-plist issues (check-plist)"
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh checkplist
 	@${ECHO_MSG} "===> No pkg-plist issues found (check-plist)"
-.endif
+.    endif
 
-.if !target(check-orphans)
+.    if !target(check-orphans)
 check-orphans: check-plist
-.endif
+.    endif
 
-.if !target(stage-qa)
+.    if !target(stage-qa)
 stage-qa:
 	@${ECHO_MSG} "====> Running Q/A tests (stage-qa)"
 	@${SETENV} ${QA_ENV} ${SH} ${SCRIPTSDIR}/qa.sh
-.if !defined(DEVELOPER)
+.      if !defined(DEVELOPER)
 	@${ECHO_MSG} "/!\\ To run stage-qa automatically add DEVELOPER=yes to your environment /!\\"
-.endif
-.endif
+.      endif
+.    endif
 
 pretty-flavors-package-names: .PHONY
-.if empty(FLAVORS)
+.    if empty(FLAVORS)
 	@${ECHO_CMD} "no flavor: ${PKGNAME}"
-.else
-.for f in ${FLAVORS}
+.    else
+.      for f in ${FLAVORS}
 	@${ECHO_CMD} -n "${f}: "
 	@cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -V PKGNAME
-.endfor
-.endif
+.      endfor
+.    endif
 
 flavors-package-names: .PHONY
-.if empty(FLAVORS)
+.    if empty(FLAVORS)
 	@${ECHO_CMD} "${PKGNAME}"
-.else
-.for f in ${FLAVORS}
+.    else
+.      for f in ${FLAVORS}
 	@cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -V PKGNAME
-.endfor
-.endif
+.      endfor
+.    endif
 
 # Fake installation of package so that user can pkg delete it later.
-.if !target(fake-pkg)
+.    if !target(fake-pkg)
 STAGE_ARGS=		-i ${STAGEDIR}
-.if defined(NO_PKG_REGISTER)
+.      if defined(NO_PKG_REGISTER)
 STAGE_ARGS=	-N
-.endif
+.      endif
 
 fake-pkg:
-.if defined(INSTALLS_DEPENDS)
-.if !defined(NO_PKG_REGISTER)
+.      if defined(INSTALLS_DEPENDS)
+.        if !defined(NO_PKG_REGISTER)
 	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME} as automatic"
-.endif
+.        endif
 	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
-.else
-.if !defined(NO_PKG_REGISTER)
+.      else
+.        if !defined(NO_PKG_REGISTER)
 	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
-.endif
+.        endif
 	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
-.endif
+.      endif
 	@${RM} -r ${METADIR}
-.endif
+.    endif
 
 # Depend is generally meaningless for arbitrary ports, but if someone wants
 # one they can override this.  This is just to catch people who've gotten into
 # the habit of typing `make depend all install' as a matter of course.
 # Same goes for tags
-.for _t in depend tags
-.if !target(${_t})
+.    for _t in depend tags
+.      if !target(${_t})
 ${_t}:
-.endif
-.endfor
+.      endif
+.    endfor
 
-.if !defined(NOPRECIOUSMAKEVARS)
+.    if !defined(NOPRECIOUSMAKEVARS)
 # These won't change, so we can pass them through the environment
-.for var in ${_EXPORTED_VARS}
-.if empty(.MAKEFLAGS:M${var}=*) && !empty(${var})
+.      for var in ${_EXPORTED_VARS}
+.        if empty(.MAKEFLAGS:M${var}=*) && !empty(${var})
 .MAKEFLAGS:	${var}=${${var}:Q}
-.endif
-.endfor
-.endif
+.        endif
+.      endfor
+.    endif
 PORTS_ENV_VARS+=	${_EXPORTED_VARS}
 
-.if !target(pre-check-config)
+.    if !target(pre-check-config)
 pre-check-config:
 _CHECK_OPTIONS_NAMES=	OPTIONS_DEFINE OPTIONS_GROUP OPTIONS_MULTI \
 			OPTIONS_RADIO OPTIONS_SINGLE
@@ -4766,135 +4766,135 @@ _CHECK_OPTIONS_NAMES+=	${OPTIONS_GROUP:S/^/OPTIONS_GROUP_/}
 _CHECK_OPTIONS_NAMES+=	${OPTIONS_MULTI:S/^/OPTIONS_MULTI_/}
 _CHECK_OPTIONS_NAMES+=	${OPTIONS_RADIO:S/^/OPTIONS_RADIO_/}
 _CHECK_OPTIONS_NAMES+=	${OPTIONS_SINGLE:S/^/OPTIONS_SINGLE_/}
-.for var in ${_CHECK_OPTIONS_NAMES}
-.  if defined(${var})
-.    for o in ${${var}}
-.      if ${o:C/[-_[:upper:][:digit:]]//g}
+.      for var in ${_CHECK_OPTIONS_NAMES}
+.        if defined(${var})
+.          for o in ${${var}}
+.            if ${o:C/[-_[:upper:][:digit:]]//g}
 OPTIONS_BAD_NAMES+=	${o}
-.      endif
-.    endfor
-.  endif
-.endfor
-.if defined(OPTIONS_BAD_NAMES) && !empty(OPTIONS_BAD_NAMES)
+.            endif
+.          endfor
+.        endif
+.      endfor
+.      if defined(OPTIONS_BAD_NAMES) && !empty(OPTIONS_BAD_NAMES)
 DEV_WARNING+=	"These options name have characters outside of [-_A-Z0-9]:"
 DEV_WARNING+=	"${OPTIONS_BAD_NAMES:O:u}"
-.endif
-.for single in ${OPTIONS_SINGLE}
-.  for opt in ${OPTIONS_SINGLE_${single}}
-.    if empty(ALL_OPTIONS:M${single}) || !empty(PORT_OPTIONS:M${single})
-.      if !empty(PORT_OPTIONS:M${opt})
+.      endif
+.      for single in ${OPTIONS_SINGLE}
+.        for opt in ${OPTIONS_SINGLE_${single}}
+.          if empty(ALL_OPTIONS:M${single}) || !empty(PORT_OPTIONS:M${single})
+.            if !empty(PORT_OPTIONS:M${opt})
 OPTIONS_WRONG_SINGLE_${single}+=	${opt}
-.        if defined(OPTFOUND)
+.              if defined(OPTFOUND)
 OPTIONS_WRONG_SINGLE+=	${single}
-.        else
+.              else
 OPTFOUND=	true
-.        endif
-.      endif
-.    else
+.              endif
+.            endif
+.          else
 # if conditional and if the condition is unchecked, remove opt from the list of
 # set options
 PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 OPTNOCHECK=	true
-.    endif
-.  endfor
-.  if !defined(OPTFOUND) && !defined(OPTNOCHECK)
+.          endif
+.        endfor
+.        if !defined(OPTFOUND) && !defined(OPTNOCHECK)
 OPTIONS_WRONG_SINGLE+=	${single}
-.  endif
+.        endif
 .  undef OPTFOUND
 .  undef OPTNOCHECK
-.endfor
+.      endfor
 .undef single
 
-.for radio in ${OPTIONS_RADIO}
-.  for opt in ${OPTIONS_RADIO_${radio}}
-.    if !empty(PORT_OPTIONS:M${opt})
+.      for radio in ${OPTIONS_RADIO}
+.        for opt in ${OPTIONS_RADIO_${radio}}
+.          if !empty(PORT_OPTIONS:M${opt})
 OPTIONS_WRONG_RADIO_${radio}+=	${opt}
-.      if defined(OPTFOUND)
+.            if defined(OPTFOUND)
 OPTIONS_WRONG_RADIO+=	${radio}
-.      else
+.            else
 OPTFOUND=	true
-.      endif
-.    endif
-.  endfor
+.            endif
+.          endif
+.        endfor
 .  undef OPTFOUND
-.endfor
+.      endfor
 
-.for multi in ${OPTIONS_MULTI}
-.  for opt in ${OPTIONS_MULTI_${multi}}
-.    if empty(ALL_OPTIONS:M${multi}) || !empty(PORT_OPTIONS:M${multi})
-.      if !empty(PORT_OPTIONS:M${opt})
+.      for multi in ${OPTIONS_MULTI}
+.        for opt in ${OPTIONS_MULTI_${multi}}
+.          if empty(ALL_OPTIONS:M${multi}) || !empty(PORT_OPTIONS:M${multi})
+.            if !empty(PORT_OPTIONS:M${opt})
 OPTFOUND=	true
-.      endif
-.    else
+.            endif
+.          else
 # if conditional and if the condition is unchecked, remove opt from the list of
 # set options
 PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 OPTNOCHECK=	true
-.    endif
-.  endfor
-.  if !defined(OPTFOUND) && !defined(OPTNOCHECK)
+.          endif
+.        endfor
+.        if !defined(OPTFOUND) && !defined(OPTNOCHECK)
 OPTIONS_WRONG_MULTI+=	${multi}
-.  endif
+.        endif
 .  undef OPTFOUND
 .  undef OPTNOCHECK
-.endfor
+.      endfor
 .undef multi
 
-.for opt in ${PORT_OPTIONS}
-.  for conflict in ${${opt}_PREVENTS}
-.    if ${PORT_OPTIONS:M${conflict}}
-.      if empty(OPTIONS_WRONG_PREVENTS:M${opt})
+.      for opt in ${PORT_OPTIONS}
+.        for conflict in ${${opt}_PREVENTS}
+.          if ${PORT_OPTIONS:M${conflict}}
+.            if empty(OPTIONS_WRONG_PREVENTS:M${opt})
 OPTIONS_WRONG_PREVENTS+=	${opt}
-.      endif
+.            endif
 OPTIONS_WRONG_PREVENTS_${opt}+=	${conflict}
-.    endif
-.  endfor
-.endfor
+.          endif
+.        endfor
+.      endfor
 .undef conflict
 .undef opt
-.endif #pre-check-config
+.    endif #pre-check-config
 
-.if !target(_check-config)
+.    if !target(_check-config)
 _check-config: pre-check-config
-.for multi in ${OPTIONS_WRONG_MULTI}
+.      for multi in ${OPTIONS_WRONG_MULTI}
 	@${ECHO_MSG} "====> You must check at least one option in the ${multi} multi"
-.endfor
-.for single in ${OPTIONS_WRONG_SINGLE}
+.      endfor
+.      for single in ${OPTIONS_WRONG_SINGLE}
 	@${ECHO_MSG} "====> You must select one and only one option from the ${single} single"
-.if defined(OPTIONS_WRONG_SINGLE_${single})
+.        if defined(OPTIONS_WRONG_SINGLE_${single})
 	@${ECHO_MSG} "=====> Only one of these must be defined: ${OPTIONS_WRONG_SINGLE_${single}}"
-.else
+.        else
 	@${ECHO_MSG} "=====> No option was selected (and one must be)"
-.endif
-.endfor
-.for radio in ${OPTIONS_WRONG_RADIO}
+.        endif
+.      endfor
+.      for radio in ${OPTIONS_WRONG_RADIO}
 	@${ECHO_MSG} "====> You cannot select multiple options from the ${radio} radio"
 	@${ECHO_MSG} "=====> Only one of these must be defined: ${OPTIONS_WRONG_RADIO_${radio}}"
-.endfor
-.if defined(OPTIONS_WRONG_PREVENTS)
+.      endfor
+.      if defined(OPTIONS_WRONG_PREVENTS)
 	@${ECHO_MSG} "====> Two or more enabled options conflict with each other"
-.  for prevents in ${OPTIONS_WRONG_PREVENTS}
+.        for prevents in ${OPTIONS_WRONG_PREVENTS}
 	@${ECHO_MSG} "=====> Option ${prevents} conflicts with ${OPTIONS_WRONG_PREVENTS_${prevents}} (select only one)"
-.    if defined(${prevents}_PREVENTS_MSG)
+.          if defined(${prevents}_PREVENTS_MSG)
 	@${ECHO_MSG} "======> ${${prevents}_PREVENTS_MSG}"
-.    endif
-.  endfor
-.endif
-.if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE) || !empty(OPTIONS_WRONG_RADIO) || !empty(OPTIONS_WRONG_PREVENTS)
+.          endif
+.        endfor
+.      endif
+.      if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE) || !empty(OPTIONS_WRONG_RADIO) || !empty(OPTIONS_WRONG_PREVENTS)
 _CHECK_CONFIG_ERROR=	true
-.endif
-.endif # _check-config
+.      endif
+.    endif # _check-config
 
-.if !target(check-config)
+.    if !target(check-config)
 check-config: _check-config
-.if !empty(_CHECK_CONFIG_ERROR)
+.      if !empty(_CHECK_CONFIG_ERROR)
 	@${FALSE}
-.endif
-.endif # check-config
+.      endif
+.    endif # check-config
 
-.if !target(sanity-config)
+.    if !target(sanity-config)
 sanity-config: _check-config
-.if !empty(_CHECK_CONFIG_ERROR)
+.      if !empty(_CHECK_CONFIG_ERROR)
 	@echo -n "Config is invalid. Re-edit? [Y/n] "; \
 	read answer; \
 	case $$answer in \
@@ -4902,10 +4902,10 @@ sanity-config: _check-config
 		exit 0; \
 	esac; \
 	cd ${.CURDIR} && ${MAKE} config
-.endif
-.endif # sanity-config
+.      endif
+.    endif # sanity-config
 
-.if !target(pre-config)
+.    if !target(pre-config)
 pre-config:
 D4P_ENV=	PKGNAME="${PKGNAME}" \
 		PORT_OPTIONS="${PORT_OPTIONS}" \
@@ -4926,31 +4926,31 @@ D4P_ENV=	PKGNAME="${PKGNAME}" \
 		D4PFULLSCREEN="${D4PFULLSCREEN}" \
 		D4PALIGNCENTER="${D4PALIGNCENTER}" \
 		D4PASCIILINES="${D4PASCIILINES}"
-.if exists(${PKGHELP})
+.      if exists(${PKGHELP})
 D4P_ENV+=	PKGHELP="${PKGHELP}"
-.endif
-.for opt in ${ALL_OPTIONS}
+.      endif
+.      for opt in ${ALL_OPTIONS}
 D4P_ENV+=	 ${opt}_DESC=""${${opt}_DESC:Q}""
-.endfor
-.for otype in MULTI GROUP SINGLE RADIO
-.  for m in ${OPTIONS_${otype}}
+.      endfor
+.      for otype in MULTI GROUP SINGLE RADIO
+.        for m in ${OPTIONS_${otype}}
 D4P_ENV+=	OPTIONS_${otype}_${m}="${OPTIONS_${otype}_${m}}" \
 		${m}_DESC=""${${m}_DESC:Q}""
-.    for opt in ${OPTIONS_${otype}_${m}}
+.          for opt in ${OPTIONS_${otype}_${m}}
 D4P_ENV+=	 ${opt}_DESC=""${${opt}_DESC:Q}""
-.    endfor
-.  endfor
-.endfor
+.          endfor
+.        endfor
+.      endfor
 .undef m
 .undef otype
 .undef opt
-.endif # pre-config
+.    endif # pre-config
 
-.if !target(do-config)
+.    if !target(do-config)
 do-config:
-.if empty(ALL_OPTIONS) && empty(OPTIONS_SINGLE) && empty(OPTIONS_MULTI) && empty(OPTIONS_RADIO) && empty(OPTIONS_GROUP)
+.      if empty(ALL_OPTIONS) && empty(OPTIONS_SINGLE) && empty(OPTIONS_MULTI) && empty(OPTIONS_RADIO) && empty(OPTIONS_GROUP)
 	@${ECHO_MSG} "===> No options to configure"
-.else
+.      else
 	@optionsdir=${OPTIONS_FILE:H}; \
 	if [ ! -w "${PORT_DBDIR}" -a "`stat -f %u ${PORT_DBDIR:H}`" = 0 ]; \
 	then \
@@ -4999,85 +4999,85 @@ do-config:
 	fi; \
 	${RM} $${TMPOPTIONSFILE}
 	@cd ${.CURDIR} && ${MAKE} sanity-config
-.endif
-.endif # do-config
+.      endif
+.    endif # do-config
 
-.if !target(config)
-.if !defined(NO_DIALOG)
+.    if !target(config)
+.      if !defined(NO_DIALOG)
 config: pre-config do-config
-.else
+.      else
 config:
 	@${ECHO_MSG} "===> Skipping 'config' as NO_DIALOG is defined"
-.endif
-.endif # config
+.      endif
+.    endif # config
 
-.if !target(config-recursive)
+.    if !target(config-recursive)
 config-recursive:
 	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
 	@recursive_cmd="config-conditional"; \
 	    recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif # config-recursive
+.    endif # config-recursive
 
-.if !target(config-conditional)
+.    if !target(config-conditional)
 config-conditional:
-.if !empty(NEW_OPTIONS)
+.      if !empty(NEW_OPTIONS)
 	@cd ${.CURDIR} && ${MAKE} config;
-.endif
-.endif # config-conditional
+.      endif
+.    endif # config-conditional
 
-.if !target(showconfig) && (make(*config*) || (!empty(.MAKEFLAGS:M-V) && !empty(.MAKEFLAGS:M*_DESC)))
+.    if !target(showconfig) && (make(*config*) || (!empty(.MAKEFLAGS:M-V) && !empty(.MAKEFLAGS:M*_DESC)))
 .include "${PORTSDIR}/Mk/bsd.options.desc.mk"
 MULTI_EOL=	: you have to choose at least one of them
 SINGLE_EOL=	: you have to select exactly one of them
 RADIO_EOL=	: you can only select none or one of them
 showconfig: check-config
-.if !empty(COMPLETE_OPTIONS_LIST)
+.      if !empty(COMPLETE_OPTIONS_LIST)
 	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}":
-.for opt in ${ALL_OPTIONS}
+.        for opt in ${ALL_OPTIONS}
 	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="on" ; ${ECHO_MSG} -n "     ${opt}=$${match:-off}"
-.  if !empty(${opt}_DESC)
+.          if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
-.  endif
+.          endif
 	@${ECHO_MSG} ""
-.endfor
+.        endfor
 
 #multi and conditional multis
-.for otype in MULTI GROUP SINGLE RADIO
-.  for m in ${OPTIONS_${otype}}
-.    if empty(${m}_DESC)
+.        for otype in MULTI GROUP SINGLE RADIO
+.          for m in ${OPTIONS_${otype}}
+.            if empty(${m}_DESC)
 		@${ECHO_MSG} "====> Options available for the ${otype:tl} ${m}${${otype}_EOL}"
-.    else
+.            else
 		@${ECHO_MSG} "====> ${${m}_DESC}${${otype}_EOL}"
-.    endif
-.    for opt in ${OPTIONS_${otype}_${m}}
+.            endif
+.            for opt in ${OPTIONS_${otype}_${m}}
 	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="on" ; ${ECHO_MSG} -n "     ${opt}=$${match:-off}"
-.      if !empty(${opt}_DESC)
+.              if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
-.      endif
+.              endif
 	@${ECHO_MSG} ""
-.    endfor
-.  endfor
-.endfor
+.            endfor
+.          endfor
+.        endfor
 
 .undef otype
 .undef m
 .undef opt
 	@${ECHO_MSG} "===> Use 'make config' to modify these settings"
-.endif
-.endif # showconfig
+.      endif
+.    endif # showconfig
 
-.if !target(showconfig-recursive)
+.    if !target(showconfig-recursive)
 showconfig-recursive:
 	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME} and its dependencies";
 	@recursive_cmd="showconfig"; \
 	    recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif # showconfig-recursive
+.    endif # showconfig-recursive
 
-.if !target(rmconfig)
+.    if !target(rmconfig)
 rmconfig:
-.if exists(${OPTIONS_FILE})
+.      if exists(${OPTIONS_FILE})
 	-@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \
 	optionsdir=${OPTIONS_FILE:H}; \
 	if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONS_FILE}" ]; then \
@@ -5089,20 +5089,20 @@ rmconfig:
 		${RM} ${OPTIONS_FILE}; \
 		${RMDIR} $${optionsdir} 2>/dev/null || return 0; \
 	fi
-.else
+.      else
 	@${ECHO_MSG} "===> No user-specified options configured for ${PKGNAME}"
-.endif
-.endif # rmconfig
+.      endif
+.    endif # rmconfig
 
-.if !target(rmconfig-recursive)
+.    if !target(rmconfig-recursive)
 rmconfig-recursive:
 	@${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and its dependencies";
 	@recursive_cmd="rmconfig"; \
 	    recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
-.endif # rmconfig-recursive
+.    endif # rmconfig-recursive
 
-.if !target(pretty-print-config)
+.    if !target(pretty-print-config)
 MULTI_START=	[
 MULTI_END=	]
 GROUP_START=	[
@@ -5112,23 +5112,23 @@ SINGLE_END=	)
 RADIO_START=	(
 RADIO_END=	)
 pretty-print-config:
-.for opt in ${ALL_OPTIONS}
+.      for opt in ${ALL_OPTIONS}
 	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="+" ; ${ECHO_MSG} -n "$${match:--}${opt} "
-.endfor
-.for otype in MULTI GROUP SINGLE RADIO
-.  for m in ${OPTIONS_${otype}}
+.      endfor
+.      for otype in MULTI GROUP SINGLE RADIO
+.        for m in ${OPTIONS_${otype}}
 	@${ECHO_MSG} -n "${m}${${otype}_START} "
-.    for opt in ${OPTIONS_${otype}_${m}}
+.          for opt in ${OPTIONS_${otype}_${m}}
 		@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="+" ; ${ECHO_MSG} -n "$${match:--}${opt} "
-.    endfor
+.          endfor
 	@${ECHO_MSG} -n "${${otype}_END} "
-.  endfor
-.endfor
+.        endfor
+.      endfor
 .undef otype
 .undef m
 .undef opt
 	@${ECHO_MSG} ""
-.endif # pretty-print-config
+.    endif # pretty-print-config
 
 desktop-categories:
 	@${SETENV} \
@@ -5139,7 +5139,7 @@ desktop-categories:
 			dp_TR="${TR}" \
 			${SH} ${SCRIPTSDIR}/desktop-categories.sh
 
-.if defined(DESKTOP_ENTRIES)
+.    if defined(DESKTOP_ENTRIES)
 check-desktop-entries:
 	@${SETENV} \
 			dp_CURDIR="${.CURDIR}" \
@@ -5154,10 +5154,10 @@ check-desktop-entries:
 			dp_VALID_DESKTOP_CATEGORIES="${VALID_DESKTOP_CATEGORIES}" \
 			dp_TR="${TR}" \
 			${SH} ${SCRIPTSDIR}/check-desktop-entries.sh ${DESKTOP_ENTRIES}
-.endif
+.    endif
 
-.if !target(install-desktop-entries)
-.if defined(DESKTOP_ENTRIES)
+.    if !target(install-desktop-entries)
+.      if defined(DESKTOP_ENTRIES)
 install-desktop-entries:
 	@${SETENV} \
 			dp_CURDIR="${.CURDIR}" \
@@ -5169,83 +5169,83 @@ install-desktop-entries:
 			dp_MAKE="${MAKE}" \
 			dp_SED="${SED}" \
 			${SH} ${SCRIPTSDIR}/install-desktop-entries.sh ${DESKTOP_ENTRIES}
-.endif
-.endif
+.      endif
+.    endif
 
-.if !empty(BINARY_ALIAS)
-.if !target(create-binary-alias)
+.    if !empty(BINARY_ALIAS)
+.      if !target(create-binary-alias)
 create-binary-alias: ${BINARY_LINKDIR}
-.for target src in ${BINARY_ALIAS:C/=/ /}
+.        for target src in ${BINARY_ALIAS:C/=/ /}
 	@if srcpath=`which -- ${src}`; then \
 		${RLN} $${srcpath} ${BINARY_LINKDIR}/${target}; \
 	else \
 		${ECHO_MSG} "===>  Missing \"${src}\" to create a binary alias at \"${BINARY_LINKDIR}/${target}\""; \
 		${FALSE}; \
 	fi
-.endfor
-.endif
-.endif
+.        endfor
+.      endif
+.    endif
 
-.if !empty(BINARY_WRAPPERS)
-.if !target(create-binary-wrappers)
+.    if !empty(BINARY_WRAPPERS)
+.      if !target(create-binary-wrappers)
 create-binary-wrappers: ${BINARY_LINKDIR}
-.for bin in ${BINARY_WRAPPERS}
+.        for bin in ${BINARY_WRAPPERS}
 	@${INSTALL_SCRIPT} ${WRAPPERSDIR}/${bin} ${BINARY_LINKDIR}
-.endfor
-.endif
-.endif
+.        endfor
+.      endif
+.    endif
 
-.if defined(WARNING)
+.    if defined(WARNING)
 WARNING_WAIT?=	10
 show-warnings:
 	@${ECHO_MSG} "/!\\ WARNING /!\\"
 	@${ECHO_MSG}
-.for m in ${WARNING}
+.      for m in ${WARNING}
 	@${ECHO_MSG} "${m}" | ${FMT_80}
 	@${ECHO_MSG}
-.endfor
+.      endfor
 	@sleep ${WARNING_WAIT}
-.endif
+.    endif
 
-.if defined(ERROR)
+.    if defined(ERROR)
 show-errors:
 	@${ECHO_MSG} "/!\\ ERRORS /!\\"
 	@${ECHO_MSG}
-.for m in ${ERROR}
+.      for m in ${ERROR}
 	@${ECHO_MSG} "${m}" | ${FMT_80}
 	@${ECHO_MSG}
-.endfor
+.      endfor
 	@${FALSE}
-.endif
+.    endif
 
-.if defined(DEVELOPER)
-.if defined(DEV_WARNING)
+.    if defined(DEVELOPER)
+.      if defined(DEV_WARNING)
 DEV_WARNING_WAIT?=	10
 show-dev-warnings:
 	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\"
 	@${ECHO_MSG}
-.for m in ${DEV_WARNING}
+.        for m in ${DEV_WARNING}
 	@${ECHO_MSG} ${m} | ${FMT_80}
 	@${ECHO_MSG}
-.endfor
-.if defined(DEV_WARNING_FATAL)
+.        endfor
+.        if defined(DEV_WARNING_FATAL)
 	@${FALSE}
-.else
+.        else
 	@sleep ${DEV_WARNING_WAIT}
-.endif
-.endif
+.        endif
+.      endif
 
-.if defined(DEV_ERROR)
+.      if defined(DEV_ERROR)
 show-dev-errors:
 	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile errors /!\\"
 	@${ECHO_MSG}
-.for m in ${DEV_ERROR}
+.        for m in ${DEV_ERROR}
 	@${ECHO_MSG} "${m}" | ${FMT_80}
 	@${ECHO_MSG}
-.endfor
+.        endfor
 	@${FALSE}
-.endif
-.endif #DEVELOPER
+.      endif
+.    endif #DEVELOPER
 
 ${_PORTS_DIRECTORIES}:
 	@${MKDIR} ${.TARGET}
@@ -5319,11 +5319,11 @@ _STAGE_SEQ=		050:stage-message 100:stage-dir 150:run-depends \
 				930:add-plist-data 940:add-plist-post ${POST_PLIST:C/^/990:/} \
 				${_OPTIONS_install} ${_USES_install} \
 				${_OPTIONS_stage} ${_USES_stage}
-.if defined(DEVELOPER)
+.    if defined(DEVELOPER)
 _STAGE_SEQ+=	995:stage-qa
-.else
+.    else
 stage-qa: stage
-.endif
+.    endif
 _TEST_DEP=		stage
 _TEST_SEQ=		100:test-message 150:test-depends 300:pre-test 500:do-test \
 				800:post-test \
@@ -5340,120 +5340,120 @@ _PACKAGE_SEQ=	100:package-message 300:pre-package 450:pre-package-script \
 				${_OPTIONS_package} ${_USES_package}
 
 # Enforce order for -jN builds
-.for _t in ${_TARGETS_STAGES}
+.    for _t in ${_TARGETS_STAGES}
 # Check if the port need to change the default order of some targets...
-.  if defined(TARGET_ORDER_OVERRIDE)
+.      if defined(TARGET_ORDER_OVERRIDE)
 _tmp_seq:=
-.    for _entry in ${_${_t}_SEQ}
+.        for _entry in ${_${_t}_SEQ}
 # for _target because :M${_target} does not work with fmake
-.      for _target in ${_entry:C/^[0-9]+://}
-.        if ${TARGET_ORDER_OVERRIDE:M*\:${_target}}
+.          for _target in ${_entry:C/^[0-9]+://}
+.            if ${TARGET_ORDER_OVERRIDE:M*\:${_target}}
 _tmp_seq:=	${_tmp_seq} ${TARGET_ORDER_OVERRIDE:M*\:${_target}}
-.        else
+.            else
 _tmp_seq:=	${_tmp_seq} ${_entry}
-.        endif
-.      endfor
-.    endfor
+.            endif
+.          endfor
+.        endfor
 _${_t}_SEQ:=	${_tmp_seq}
-.  endif
-.  for s in ${_${_t}_SEQ:O:C/^[0-9]+://}
-.    if target(${s})
-.      if ! ${NOTPHONY:M${s}}
-_PHONY_TARGETS+= ${s}
 .      endif
+.      for s in ${_${_t}_SEQ:O:C/^[0-9]+://}
+.        if target(${s})
+.          if ! ${NOTPHONY:M${s}}
+_PHONY_TARGETS+= ${s}
+.          endif
 _${_t}_REAL_SEQ+=	${s}
-.    endif
-.  endfor
-.  for s in ${_${_t}_SUSEQ:O:C/^[0-9]+://}
-.    if target(${s})
-.      if ! ${NOTPHONY:M${s}}
+.        endif
+.      endfor
+.      for s in ${_${_t}_SUSEQ:O:C/^[0-9]+://}
+.        if target(${s})
+.          if ! ${NOTPHONY:M${s}}
 _PHONY_TARGETS+= ${s}
-.       endif
+.          endif
 _${_t}_REAL_SUSEQ+=	${s}
-.    endif
-.  endfor
+.        endif
+.      endfor
 .ORDER: ${_${_t}_DEP} ${_${_t}_REAL_SEQ}
-.endfor
+.    endfor
 
 # Define all of the main targets which depend on a sequence of other targets.
 # See above *_SEQ and *_DEP. The _DEP will run before this defined target is
 # ran. The _SEQ will run as this target once _DEP is satisfied.
 
-.for target in extract patch configure build stage install package
+.    for target in extract patch configure build stage install package
 
 # Check if config dialog needs to show and execute it if needed. If is it not
 # needed (_OPTIONS_OK), then just depend on the cookie which is defined later
 # to depend on the *_DEP and execute the *_SEQ.
 # If options are required, execute config-conditional and then re-execute the
 # target noting that config is no longer needed.
-.if !target(${target}) && defined(_OPTIONS_OK)
+.      if !target(${target}) && defined(_OPTIONS_OK)
 _PHONY_TARGETS+= ${target}
 ${target}: ${${target:tu}_COOKIE}
-.elif !target(${target})
+.      elif !target(${target})
 ${target}: config-conditional
 	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${PKGBASE:tu}=1 ${${target:tu}_COOKIE}
-.elif target(${target}) && defined(IGNORE)
-.endif
+.      elif target(${target}) && defined(IGNORE)
+.      endif
 
-.if !exists(${${target:tu}_COOKIE})
+.      if !exists(${${target:tu}_COOKIE})
 
 # Define the real target behavior. Depend on the target's *_DEP. Execute
 # the target's *_SEQ. Also handle su and USE_SUBMAKE needs.
-.if ${UID} != 0 && defined(_${target:tu}_REAL_SUSEQ) && !defined(INSTALL_AS_USER)
-.  if defined(USE_SUBMAKE)
+.        if ${UID} != 0 && defined(_${target:tu}_REAL_SUSEQ) && !defined(INSTALL_AS_USER)
+.          if defined(USE_SUBMAKE)
 ${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
 	@cd ${.CURDIR} && ${MAKE} ${_${target:tu}_REAL_SEQ}
-.  else  # !USE_SUBMAKE
+.          else  # !USE_SUBMAKE
 ${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_REAL_SEQ}
-.  endif # USE_SUBMAKE
+.          endif # USE_SUBMAKE
 	@${ECHO_MSG} "===>  Switching to root credentials for '${target}' target"
 	@cd ${.CURDIR} && \
 		${SU_CMD} "${MAKE} ${_${target:tu}_REAL_SUSEQ}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
 	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
-.else # No SU needed
-.  if defined(USE_SUBMAKE)
+.        else # No SU needed
+.          if defined(USE_SUBMAKE)
 ${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
 	@cd ${.CURDIR} && \
 		${MAKE} ${_${target:tu}_REAL_SEQ} ${_${target:tu}_REAL_SUSEQ}
 	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
-.  else # !USE_SUBMAKE
+.          else # !USE_SUBMAKE
 ${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_REAL_SEQ} ${_${target:tu}_REAL_SUSEQ}
 	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
-.  endif # USE_SUBMAKE
-.endif # SU needed
+.          endif # USE_SUBMAKE
+.        endif # SU needed
 
-.else # exists(cookie)
+.      else # exists(cookie)
 ${${target:tu}_COOKIE}::
 	@if [ ! -e ${.TARGET} ]; then \
 		cd ${.CURDIR} && ${MAKE} ${.TARGET}; \
 	fi
-.endif # !exists(cookie)
+.      endif # !exists(cookie)
 
-.endfor # foreach(targets)
+.    endfor # foreach(targets)
 
 .PHONY: ${_PHONY_TARGETS} check-sanity fetch pkg
 
-.if !target(check-sanity)
+.    if !target(check-sanity)
 check-sanity: ${_SANITY_REAL_SEQ}
-.endif
+.    endif
 
-.if !target(fetch)
+.    if !target(fetch)
 fetch: ${_FETCH_DEP} ${_FETCH_REAL_SEQ}
-.endif
+.    endif
 
-.if !target(pkg)
+.    if !target(pkg)
 pkg: ${_PKG_DEP} ${_PKG_REAL_SEQ}
-.endif
+.    endif
 
-.if !target(test)
+.    if !target(test)
 test: ${_TEST_DEP}
-.if !defined(NO_TEST)
+.      if !defined(NO_TEST)
 test: ${_TEST_REAL_SEQ}
-.endif
-.endif
+.      endif
+.    endif
 
-.endif
+.  endif
 # End of post-makefile section.
 
 .endif
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index dbeea2d27cdb..426c64520f1d 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -64,77 +64,77 @@ STRIP?=	-s
 # to child makes explicitly, instead of recomputing them tens of thousands of times.
 
 .if !defined(NOPRECIOUSMAKEVARS)
-.if !defined(ARCH)
+.  if !defined(ARCH)
 ARCH!=	${UNAME} -p
-.endif
+.  endif
 _EXPORTED_VARS+=	ARCH
 
-.if !defined(OSVERSION)
-.if exists(/usr/include/sys/param.h)
+.  if !defined(OSVERSION)
+.    if exists(/usr/include/sys/param.h)
 OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
-.elif exists(${SRC_BASE}/sys/sys/param.h)
+.    elif exists(${SRC_BASE}/sys/sys/param.h)
 OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h
-.else
+.    else
 OSVERSION!=	${SYSCTL} -n kern.osreldate
-.endif
-.endif
+.    endif
+.  endif
 _EXPORTED_VARS+=	OSVERSION
 
 WITH_PKG=	yes
 WITH_PKGNG=	yes
 
-.if !defined(_OSRELEASE)
+.  if !defined(_OSRELEASE)
 _OSRELEASE!=		${UNAME} -r
-.endif
+.  endif
 _EXPORTED_VARS+=	_OSRELEASE
-.if !defined(OSREL)
+.  if !defined(OSREL)
 OSREL=	${_OSRELEASE:C/[-(].*//}
-.endif
+.  endif
 _EXPORTED_VARS+=	OSREL
 
-.if !defined(OPSYS)
+.  if !defined(OPSYS)
 OPSYS!=	${UNAME} -s
-.endif
+.  endif
 _EXPORTED_VARS+=	OPSYS
 
-.if ${ARCH} == "amd64"
-.if !defined(HAVE_COMPAT_IA32_KERN)
+.  if ${ARCH} == "amd64"
+.    if !defined(HAVE_COMPAT_IA32_KERN)
 HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi; echo
-.if empty(HAVE_COMPAT_IA32_KERN)
+.      if empty(HAVE_COMPAT_IA32_KERN)
 .undef HAVE_COMPAT_IA32_KERN
-.endif
-.endif
-.endif
+.      endif
+.    endif
+.  endif
 _EXPORTED_VARS+=	HAVE_COMPAT_IA32_KERN
 
-.if !defined(CONFIGURE_MAX_CMD_LEN)
+.  if !defined(CONFIGURE_MAX_CMD_LEN)
 CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax
-.endif
+.  endif
 _EXPORTED_VARS+=	CONFIGURE_MAX_CMD_LEN
 
-.if !defined(_JAVA_VERSION_LIST_REGEXP)
+.  if !defined(_JAVA_VERSION_LIST_REGEXP)
 _JAVA_VERSION_LIST_REGEXP!=	${MAKE} -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
-.endif
+.  endif
 _EXPORTED_VARS+=	_JAVA_VERSION_LIST_REGEXP
 
-.if !defined(_JAVA_VENDOR_LIST_REGEXP)
+.  if !defined(_JAVA_VENDOR_LIST_REGEXP)
 _JAVA_VENDOR_LIST_REGEXP!=	${MAKE} -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
-.endif
+.  endif
 _EXPORTED_VARS+=	_JAVA_VENDOR_LIST_REGEXP
 
-.if !defined(_JAVA_OS_LIST_REGEXP)
+.  if !defined(_JAVA_OS_LIST_REGEXP)
 _JAVA_OS_LIST_REGEXP!=		${MAKE} -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
-.endif
+.  endif
 _EXPORTED_VARS+=	_JAVA_OS_LIST_REGEXP
 
-.if !defined(_JAVA_PORTS_INSTALLED)
+.  if !defined(_JAVA_PORTS_INSTALLED)
 _JAVA_PORTS_INSTALLED!=		${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
-.endif
+.  endif
 _EXPORTED_VARS+=	_JAVA_PORTS_INSTALLED
 
-.if !defined(UID)
+.  if !defined(UID)
 UID!=	${ID} -u
-.endif
+.  endif
 _EXPORTED_VARS+=	UID
 
 .endif
@@ -172,20 +172,20 @@ TARGETS+=	reinstall
 TARGETS+=	tags
 
 .for __target in ${TARGETS}
-.if !target(${__target})
-.if defined(SUBDIR) && !empty(SUBDIR)
+.  if !target(${__target})
+.    if defined(SUBDIR) && !empty(SUBDIR)
 ${__target}: ${SUBDIR:S/^/_/:S/$/.${__target}/}
-.else
+.    else
 ${__target}:
-.endif
-.endif
+.    endif
+.  endif
 .endfor
 
 .if defined(SUBDIR) && !empty(SUBDIR)
 
-.for __target in ${TARGETS} checksubdirs describe readmes
+.  for __target in ${TARGETS} checksubdirs describe readmes
 ${SUBDIR:S/^/_/:S/$/.${__target}/}: _SUBDIRUSE
-.endfor
+.  endfor
 
 _SUBDIRUSE: .USE
 	@OK=""; sub=${.TARGET:S/^_//:R}; \
@@ -210,19 +210,19 @@ _SUBDIRUSE: .USE
 			DIRPRFX=${DIRPRFX}$$edir/; \
 	fi
 
-.for _subdir in ${SUBDIR:S/^/_/}
+.  for _subdir in ${SUBDIR:S/^/_/}
 ${_subdir}::   ${_subdir:S/$/.all/}
-.endfor
+.  endfor
 
 .endif
 
 .if !target(install)
-.if !target(beforeinstall)
+.  if !target(beforeinstall)
 beforeinstall:
-.endif
-.if !target(afterinstall)
+.  endif
+.  if !target(afterinstall)
 afterinstall:
-.endif
+.  endif
 install: afterinstall
 afterinstall: realinstall
 realinstall: beforeinstall ${SUBDIR:S/^/_/:S/$/.realinstall/}
@@ -231,11 +231,11 @@ realinstall: beforeinstall ${SUBDIR:S/^/_/:S/$/.realinstall/}
 IGNOREDIR=	Mk Templates Tools distfiles packages pkg Keywords
 
 .if !target(checksubdirs)
-.if defined(PORTSTOP)
+.  if defined(PORTSTOP)
 checksubdirs: checksubdir ${SUBDIR:S/^/_/:S/$/.checksubdirs/}
-.else
+.  else
 checksubdirs: checksubdir
-.endif
+.  endif
 .endif
 
 .if !target(checksubdir)
@@ -262,24 +262,24 @@ checksubdir:
 .endif
 
 .if !target(describe)
-.if defined(PORTSTOP)
+.  if defined(PORTSTOP)
 # This is a bit convoluted to deal with the fact that make will overlap I/O from child make processes
 # if they write more than 2k: this will corrupt the INDEX file.  make -P does not do this, but it adds
 # extraneous output and redirects stderr, so we lose error reporting from child makes.  Instead we have
 # to roll our own implementation of make -P and make sure that each child make writes to their own file,
 # which we will combine at the end.  This gives substantial performance benefits over doing a make -j1
 
-.if defined(BUILDING_INDEX)
+.    if defined(BUILDING_INDEX)
 describe: ${SUBDIR:S/^/describe./}
 
-.for i in ${SUBDIR}
+.      for i in ${SUBDIR}
 describe.$i:
 	@cd ${.CURDIR}; ${MAKE} -B ${i:S/^/_/:S/$/.describe/} > ${INDEX_TMPDIR}/${INDEXFILE}.desc.${i}
-.endfor
-.else
+.      endfor
+.    else
 describe: ${SUBDIR:S/^/_/:S/$/.describe/}
-.endif
-.else
+.    endif
+.  else
 describe:
 	@for sub in ${SUBDIR}; do \
 	if ${TEST} -d ${.CURDIR}/$${sub}; then \
@@ -292,17 +292,17 @@ describe:
 		${ECHO_MSG} "===> ${DIRPRFX}$${sub} non-existent"; \
 	fi; \
 	done
-.endif
+.  endif
 .endif
 
 .if !target(readmes)
-.if defined(PORTSTOP)
+.  if defined(PORTSTOP)
 readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/}
 	@${ECHO_MSG} "===>   Creating README.html for all ports"
 	@perl ${PORTSDIR}/Tools/make_readmes < ${INDEXDIR}/${INDEXFILE}
-.else
+.  else
 readmes: readme
-.endif
+.  endif
 .endif
 
 .if !target(readme)
@@ -320,14 +320,14 @@ README.html:
 	@${ECHO_CMD} "===>  Creating README.html"
 	@> $@.tmp
 .for entry in ${SUBDIR}
-.if exists(${entry})
-.if defined(PORTSTOP)
+.  if exists(${entry})
+.    if defined(PORTSTOP)
 	@${ECHO_CMD} -n '<a href="'${entry}/README.html'">'"`${ECHO_CMD} ${entry} | ${HTMLIFY}`"'</a>: ' >> $@.tmp
-.else
+.    else
 	@${ECHO_CMD} -n '<a href="'${entry}/README.html'">'"`cd ${entry}; ${MAKE} package-name | ${HTMLIFY}`</a>: " >> $@.tmp
-.endif
+.    endif
 	@${ECHO_CMD} `cd ${entry}; ${MAKE} -V COMMENT` | ${HTMLIFY} >> $@.tmp
-.endif
+.  endif
 .endfor
 	@${SORT} -t '>' +1 -2 $@.tmp > $@.tmp2
 .if exists(${DESCR})
@@ -353,11 +353,11 @@ README.html:
 
 # Pass in the cached invariant variables to child makes.
 .if !defined(NOPRECIOUSMAKEVARS)
-.for var in ${_EXPORTED_VARS}
-.if empty(.MAKEFLAGS:M${var}=*) && !empty(${var})
+.  for var in ${_EXPORTED_VARS}
+.    if empty(.MAKEFLAGS:M${var}=*) && !empty(${var})
 .MAKEFLAGS:	${var}=${${var}:Q}
-.endif
-.endfor
+.    endif
+.  endfor
 .endif
 
 PORTSEARCH_DISPLAY_FIELDS?=name,path,info,maint,index,bdeps,rdeps,www
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 38c118fbdd8e..406f127ed967 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -97,23 +97,23 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.org
 # RUBY_MODEXAMPLESDIR	- Installation path for the module's examples.
 #
 
-.if defined(RUBY_DEFAULT_VER)
+.  if defined(RUBY_DEFAULT_VER)
 WARNING+=	"RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead"
-.endif
+.  endif
 
 RUBY_DEFAULT_VER?=	${RUBY_DEFAULT}
 
 RUBY_VER?=		${RUBY_DEFAULT_VER}
 
-.if defined(RUBY)
-.if !exists(${RUBY})
+.  if defined(RUBY)
+.    if !exists(${RUBY})
 IGNORE=	cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist.  Please specify an already installed ruby executable
-.endif
+.    endif
 
 _RUBY_TEST!=		${RUBY} -e 'begin; require "rbconfig"; puts "ok" ; rescue LoadError; puts "error"; end'
-.if !empty(_RUBY_TEST) && ${_RUBY_TEST} != "ok"
+.    if !empty(_RUBY_TEST) && ${_RUBY_TEST} != "ok"
 IGNORE=	cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig.  Please specify a properly installed ruby executable
-.endif
+.    endif
 
 _RUBY_CONFIG=		${RUBY} -r rbconfig -e 'C = RbConfig::CONFIG' -e
 
@@ -125,13 +125,13 @@ RUBY_ARCH!=		${_RUBY_CONFIG} 'puts C["target"]'
 _RUBY_SYSLIBDIR!=	${_RUBY_CONFIG} 'puts C["libdir"]'
 _RUBY_SITEDIR!=		${_RUBY_CONFIG} 'puts C["sitedir"]'
 _RUBY_VENDORDIR!=	${_RUBY_CONFIG} 'puts C["vendordir"]'
-.else
+.  else
 RUBY?=			${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
 
-.if defined(RUBY_VER)
+.    if defined(RUBY_VER)
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-. if ${RUBY_VER} == 2.7
+.      if ${RUBY_VER} == 2.7
 #
 # Ruby 2.7
 #
@@ -140,7 +140,7 @@ RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY27=			""	# PLIST_SUB helpers
 
-. elif ${RUBY_VER} == 3.0
+.      elif ${RUBY_VER} == 3.0
 #
 # Ruby 3.0
 #
@@ -148,7 +148,7 @@ RUBY_DISTVERSION=	3.0.4
 RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY30=			""	# PLIST_SUB helpers
-. elif ${RUBY_VER} == 3.1
+.      elif ${RUBY_VER} == 3.1
 #
 # Ruby 3.1
 #
@@ -157,7 +157,7 @@ RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
 RUBY31=			""	# PLIST_SUB helpers
 
-. elif ${RUBY_VER} == 3.2
+.      elif ${RUBY_VER} == 3.2
 #
 # Ruby 3.2
 #
@@ -168,30 +168,30 @@ RUBY32=			""	# PLIST_SUB helpers
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-. else
+.      else
 #
 # Other versions
 #
 IGNORE=	Only ruby 2.7, 3.0, 3.1 and 3.2 are supported
 _INVALID_RUBY_VER=	1
-. endif
+.      endif
 RUBY_VERSION=	${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
-.endif # defined(RUBY_VER)
+.    endif # defined(RUBY_VER)
 
-.if !defined(_INVALID_RUBY_VER)
+.    if !defined(_INVALID_RUBY_VER)
 
 RUBY27?=		"@comment "
 RUBY30?=		"@comment "
 RUBY31?=		"@comment "
 RUBY32?=		"@comment "
 
-.if defined(BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E})
-.if ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} == "yes"
+.      if defined(BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E})
+.        if ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} == "yes"
 BROKEN=			does not build with Ruby ${RUBY_VER}
-.else
+.        else
 BROKEN=			${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}}
-.endif
-.endif
+.        endif
+.      endif
 
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
 
@@ -207,11 +207,11 @@ RUBY_ARCH?=		${ARCH}-${OPSYS:tl}${OSREL:C/\..*//}
 _RUBY_SYSLIBDIR?=	${PREFIX}/lib
 _RUBY_SITEDIR?=		${_RUBY_SYSLIBDIR}/ruby/site_ruby
 _RUBY_VENDORDIR?=	${_RUBY_SYSLIBDIR}/ruby/vendor_ruby
-.endif
-.endif
+.    endif
+.  endif
 #      defined(RUBY)
 
-.if !defined(_INVALID_RUBY_VER)
+.  if !defined(_INVALID_RUBY_VER)
 
 RUBY_DEFAULT_SUFFIX?=	${RUBY_DEFAULT_VER:S/.//}
 
@@ -234,9 +234,9 @@ RUBY_SHLIBVER?=		${RUBY_VER:S/.//}
 
 RUBY_CONFIGURE_ARGS+=	--program-prefix=""
 
-.if ${RUBY_VER} != ${RUBY_DEFAULT_VER}
+.    if ${RUBY_VER} != ${RUBY_DEFAULT_VER}
 DEPENDS_ARGS+=		RUBY_VER=${RUBY_VER}
-.endif
+.    endif
 
 RUBY_CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
 
@@ -292,14 +292,14 @@ PLIST_SUB+=		${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
 			RUBY31=${RUBY31} \
 			RUBY32=${RUBY32}
 
-.if ${PORT_OPTIONS:MDEBUG}
+.    if ${PORT_OPTIONS:MDEBUG}
 RUBY_FLAGS+=	-d
-.endif
+.    endif
 
 #
 # extconf.rb support
 #
-.if defined(USE_RUBY_EXTCONF)
+.    if defined(USE_RUBY_EXTCONF)
 USE_RUBY=		yes
 
 RUBY_EXTCONF?=		extconf.rb
@@ -309,23 +309,23 @@ CONFIGURE_ENV+=		RB_USER_INSTALL=yes
 do-configure:	ruby-extconf-configure
 
 ruby-extconf-configure:
-.if defined(RUBY_EXTCONF_SUBDIRS)
-.for d in ${RUBY_EXTCONF_SUBDIRS}
+.      if defined(RUBY_EXTCONF_SUBDIRS)
+.        for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} in ${d} to configure"
 	@cd ${CONFIGURE_WRKSRC}/${d}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
-.endfor
-.else
+.        endfor
+.      else
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} to configure"
 	@cd ${CONFIGURE_WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
-.endif
-.endif
+.      endif
+.    endif
 
 #
 # setup.rb support
 #
-.if defined(USE_RUBY_SETUP)
+.    if defined(USE_RUBY_SETUP)
 RUBY_SETUP?=		setup.rb
 
 do-configure:	ruby-setup-configure
@@ -348,18 +348,18 @@ ruby-setup-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to install"
 	@cd ${INSTALL_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR}
-.endif
+.    endif
 
-.if defined(USE_RUBY)
-.if !defined(RUBY_NO_BUILD_DEPENDS)
+.    if defined(USE_RUBY)
+.      if !defined(RUBY_NO_BUILD_DEPENDS)
 EXTRACT_DEPENDS+=	${DEPEND_RUBY}
 PATCH_DEPENDS+=		${DEPEND_RUBY}
 BUILD_DEPENDS+=		${DEPEND_RUBY}
-.endif
-.if !defined(RUBY_NO_RUN_DEPENDS)
+.      endif
+.      if !defined(RUBY_NO_RUN_DEPENDS)
 RUN_DEPENDS+=		${DEPEND_RUBY}
-.endif
-.endif
+.      endif
+.    endif
 
-.endif # _INVALID_RUBY_VER
+.  endif # _INVALID_RUBY_VER
 .endif
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 1e7578ed2c3c..ac76013ef80b 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -4,12 +4,12 @@
 # Warnings for everyone
 
 .for opt in ${ALL_OPTIONS:NDEBUG}
-.if defined(WITH_${opt})
+.  if defined(WITH_${opt})
 WARNING+=     "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port."
-.endif
-.if defined(WITHOUT_${opt})
+.  endif
+.  if defined(WITHOUT_${opt})
 WARNING+=     "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port."
-.endif
+.  endif
 .endfor
 
 ALL_UNSUPPORTED=	WITHOUT_NLS NOPORTDOCS NOPORTEXAMPLES WITH_BDB_VER \
@@ -35,21 +35,21 @@ PYTHON2_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python2=${PYTHON2_DEFAULT_VERSION
 PYTHON3_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//}"
 
 .for a in ${ALL_DEPRECATED}
-.if defined(${a})
+.  if defined(${a})
 WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
-.endif
+.  endif
 .endfor
 
 .for a in ${ALL_NOTNEEDED}
-.if defined(${a})
+.  if defined(${a})
 WARNING+=	"${a} is not needed: ${${a}_REASON}"
-.endif
+.  endif
 .endfor
 
 .for a in ${ALL_UNSUPPORTED}
-.if defined(${a})
+.  if defined(${a})
 ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
-.endif
+.  endif
 .endfor
 
 
@@ -57,9 +57,9 @@ ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 # Warnings only when DEVELOPER=yes
 
 .if exists(${.CURDIR}/../../Mk/bsd.port.mk) || ${OVERLAYS:tA:M${.CURDIR:H:H}} == ${.CURDIR:H:H}
-.if ${.CURDIR:H:T} != ${PKGCATEGORY}
+.  if ${.CURDIR:H:T} != ${PKGCATEGORY}
 DEV_ERROR+=	"The first entry in CATEGORIES should be the directory where the port lives"
-.endif
+.  endif
 .else
 DEV_WARNING+=	"Not validating first entry in CATEGORIES due to being outside of PORTSDIR. Please ensure this is proper when committing."
 .endif
@@ -105,9 +105,9 @@ DEV_ERROR+=	"All LIB_DEPENDS should use the new format and start out with lib.
 .endif
 
 .if defined(LICENSE)
-.if ${LICENSE:MBSD}
+.  if ${LICENSE:MBSD}
 DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
-.endif
+.  endif
 .elif !defined(DISABLE_LICENSES)
 .  if empty(USES:Mmetaport)
 DEV_WARNING+=	"Please set LICENSE for this port"
@@ -115,9 +115,9 @@ DEV_WARNING+=	"Please set LICENSE for this port"
 .endif
 
 .for _a in ${ONLY_FOR_ARCHS}
-.if defined(ONLY_FOR_ARCHS_REASON_${_a})
+.  if defined(ONLY_FOR_ARCHS_REASON_${_a})
 DEV_WARNING+=	"ONLY_FOR_ARCHS_${_a} is defined and ${_a} is in ONLY_FOR_ARCHS, the message will never be used."
-.endif
+.  endif
 .endfor
 
 .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
@@ -126,25 +126,25 @@ DEV_ERROR+=	"USE_PYDISTUTILS=easy_install is no longer supported, please use USE
 
 .if defined(USE_PYTHON) && (${USE_PYTHON} == "yes" || ${USE_PYTHON:C/[-0-9.+]*//} == "")
 _PYTHON_VAL := ${USE_PYTHON}
-.if ${_PYTHON_VAL} != "yes"
+.  if ${_PYTHON_VAL} != "yes"
 DEV_ERROR+=	"USE_PYTHON=${_PYTHON_VAL} is no longer supported, please use USES=python:${_PYTHON_VAL}"
-.else
+.  else
 DEV_ERROR+=	"USE_PYTHON=yes is no longer supported, please use USES=python"
-.endif
+.  endif
 .endif
 .if defined(USE_PYTHON_RUN)
-.if ${USE_PYTHON_RUN} != "yes"
+.  if ${USE_PYTHON_RUN} != "yes"
 DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:${USE_PYTHON_RUN},run"
-.else
+.  else
 DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:run"
-.endif
+.  endif
 .endif
 .if defined(USE_PYTHON_BUILD)
-.if ${USE_PYTHON_BUILD} != "yes"
+.  if ${USE_PYTHON_BUILD} != "yes"
 DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:${USE_PYTHON_BUILD},build"
-.else
+.  else
 DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:build"
-.endif
+.  endif
 .endif
 
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} == YES
@@ -295,19 +295,19 @@ CARGO_USE_GITLAB_ALT=	CARGO_CRATES \(regenerate it with make cargo-crates\)
 CARGO_GIT_SUBDIR_ALT=	CARGO_CRATES \(regenerate it with make cargo-crates\)
 
 .for a in ${SANITY_DEPRECATED}
-.if defined(${a})
+.  if defined(${a})
 DEV_WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
-.endif
+.  endif
 .endfor
 
 .for a in ${SANITY_NOTNEEDED}
-.if defined(${a})
+.  if defined(${a})
 DEV_WARNING+=	"${a} is not needed: ${${a}_REASON}"
-.endif
+.  endif
 .endfor
 
 .for a in ${SANITY_UNSUPPORTED}
-.if defined(${a})
+.  if defined(${a})
 DEV_ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
-.endif
+.  endif
 .endfor
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 1ec0300fd5c0..b9fd5b555882 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -365,35 +365,35 @@ DEV_WARNING+=	"MASTER_SITES contains ${MASTER_SITES:M*/github.com/*/archive/*},
 #
 # GH_TUPLE      - above shortened to account:project:tagname[:group][/subdir]
 #
-.if defined(USE_GITHUB)
-.  if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
+.  if defined(USE_GITHUB)
+.    if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
 IGNORE?=	Using master as GH_TAGNAME is invalid. \
 		Must use a tag or commit hash so the upstream does \
 		not "reroll" as soon as the branch is updated
-.  endif
-.  if defined(GH_TUPLE)
-.    for _tuple in ${GH_TUPLE}
+.    endif
+.    if defined(GH_TUPLE)
+.      for _tuple in ${GH_TUPLE}
 _t_tmp=${_tuple}
-.      if ${_t_tmp:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\4@:S/://:C/[a-zA-Z0-9_]//g}
+.        if ${_t_tmp:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\4@:S/://:C/[a-zA-Z0-9_]//g}
 check-makevars::
 	@${ECHO_MSG} "The ${_tuple} GH_TUPLE line has"
 	@${ECHO_MSG} "a tag containing something else than [a-zA-Z0-9_]"
 	@${FALSE}
-.      endif
-.    endfor
+.        endif
+.      endfor
 GH_ACCOUNT+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\1\4@}
 GH_PROJECT+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\2\4@}
 GH_TAGNAME+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\3\4@}
 GH_SUBDIR+=	${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\6\4@:M/*:S/^\///}
-.  endif
+.    endif
 # We are cheating and using backend URLS for GitHub here. See ports/194898
 # comment #15 for explanation as to why and how to deal with it if it breaks.
 MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR%
 MASTER_SITE_GITHUB_CLOUD+=	https://cloud.github.com/downloads/%SUBDIR%
 
-.  if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault}
+.    if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault}
 MASTER_SITES+=	GH
-.  endif
+.    endif
 GH_ACCOUNT_DEFAULT=	${PORTNAME}
 GH_ACCOUNT?=	${GH_ACCOUNT_DEFAULT}
 GH_PROJECT_DEFAULT=	${PORTNAME}
@@ -403,41 +403,41 @@ GH_TAGNAME_DEFAULT=	${DISTVERSIONFULL}
 GH_TAGNAME?=	${GH_TAGNAME_DEFAULT}
 # Iterate over GH_ACCOUNT, GH_PROJECT, GH_TAGNAME and GH_SUBDIR to extract groups
 _GITHUB_GROUPS= DEFAULT
-.  for _gh_v in GH_ACCOUNT GH_PROJECT GH_TAGNAME GH_SUBDIR
-.    for _v_ex in ${${_gh_v}}
+.    for _gh_v in GH_ACCOUNT GH_PROJECT GH_TAGNAME GH_SUBDIR
+.      for _v_ex in ${${_gh_v}}
 _GH_GROUPS=	${_v_ex:S/^${_v_ex:C@:[^/:]+$@@}//:S/^://}
-.      if !empty(_GH_GROUPS)
-.        for _group in ${_GH_GROUPS:S/,/ /g}
-.          if ${_group} == all || ${_group} == ALL || ${_group} == default
+.        if !empty(_GH_GROUPS)
+.          for _group in ${_GH_GROUPS:S/,/ /g}
+.            if ${_group} == all || ${_group} == ALL || ${_group} == default
 check-makevars::
 		@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
 		@${ECHO_MSG} "used in group definitions. Please fix your ${_gh_v}"
 		@${FALSE}
-.          endif
-.          if !${_GITHUB_GROUPS:M${_group}}
+.            endif
+.            if !${_GITHUB_GROUPS:M${_group}}
 _GITHUB_GROUPS+=	${_group}
-.          endif
+.            endif
 ${_gh_v}_${_group}=	${_v_ex:C@^(.*):[^/:]+$@\1@}
-.        endfor
-.      else
+.          endfor
+.        else
 ${_gh_v}_DEFAULT=	${_v_ex:C@^(.*):[^/:]+$@\1@}
-.      endif
+.        endif
+.      endfor
 .    endfor
-.  endfor
 # Put the default values back into the variables so that the *default* behavior
 # is not changed.
 GH_ACCOUNT:=	${GH_ACCOUNT_DEFAULT}
 GH_PROJECT:=	${GH_PROJECT_DEFAULT}
 GH_TAGNAME:=	${GH_TAGNAME_DEFAULT}
 GH_SUBDIR:=	${GH_SUBDIR_DEFAULT}
-.  if defined(GH_TAGNAME)
+.    if defined(GH_TAGNAME)
 # If you change either of the _SANITIZED or _EXTRACT variables, please keep the
 # changes in sync with the GH_TAGNAME_${_group}_* variables 50 lines below.
 GH_TAGNAME_SANITIZED=	${GH_TAGNAME:S,/,-,g}
 # GitHub silently converts tags starting with v to not have v in the filename
 # and extraction directory.  It also replaces + with -.
 GH_TAGNAME_EXTRACT=	${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g:C/--*/-/g}
-.  endif
+.    endif
 # This new scheme rerolls distfiles. Also ensure they are renamed to avoid
 # conflicts. Use _GITHUB_REV in case github changes their zipping or structure
 # which has happened before.
@@ -446,13 +446,13 @@ _GITHUB_EXTRACT_SUFX=	.tar.gz
 # Put the DEFAULT distfile first
 _GITHUB_CLONE_DIR?=	${WRKDIR}/git-clone
 _PORTS_DIRECTORIES+=	${_GITHUB_CLONE_DIR}
-.  if !${USE_GITHUB:Mnodefault} && empty(MASTER_SITES:MGHC)
+.    if !${USE_GITHUB:Mnodefault} && empty(MASTER_SITES:MGHC)
 # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice
-.    if ${GH_TAGNAME} != ${DISTVERSIONFULL}
+.      if ${GH_TAGNAME} != ${DISTVERSIONFULL}
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
-.    else
+.      else
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
-.    endif
+.      endif
 DISTNAME_DEFAULT:=	${DISTNAME}_GH${_GITHUB_REV}
 DISTFILE_DEFAULT=	${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX}
 DISTNAME:=	${DISTNAME_DEFAULT}
@@ -461,20 +461,20 @@ git-clone: git-clone-DEFAULT
 git-clone-DEFAULT: ${_GITHUB_CLONE_DIR}
 	@git clone https://github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT}.git ${_GITHUB_CLONE_DIR}/${GH_PROJECT_DEFAULT}
 	@${ECHO_MSG} "Cloned the default github repository into ${_GITHUB_CLONE_DIR}/${GH_PROJECT_DEFAULT}" | ${FMT_80}
-.  endif
-.  if !empty(GH_SUBDIR)
+.    endif
+.    if !empty(GH_SUBDIR)
 _SITES_extract:=	690:post-extract-gh-DEFAULT
 post-extract-gh-DEFAULT:
 	@${RMDIR} ${WRKSRC}/${GH_SUBDIR_DEFAULT} 2>/dev/null || :
 	@${MKDIR} ${WRKSRC}/${GH_SUBDIR_DEFAULT:H} 2>/dev/null || :
 	@${LN} -s ${GH_SUBDIR_DEFAULT:C/[^\/]//g:C/\//..\//g:S/^$/./} ${WRKSRC}/${GH_SUBDIR_DEFAULT}
-.  endif
+.    endif
 # If there are non default groups
-.  if !empty(_GITHUB_GROUPS:NDEFAULT)
+.    if !empty(_GITHUB_GROUPS:NDEFAULT)
 # Then for each of the remaining groups, add DISTFILES and MASTER_SITES
 # entries with the correct group and create {WRKSRC,DISTNAME,DISTFILES}_group
 # helper variables.
-.    for _group in ${_GITHUB_GROUPS:NDEFAULT}
+.      for _group in ${_GITHUB_GROUPS:NDEFAULT}
 GH_ACCOUNT_${_group}?=	${GH_ACCOUNT_DEFAULT}
 GH_PROJECT_${_group}?=	${GH_PROJECT_DEFAULT}
 GH_TAGNAME_${_group}?=	${GH_TAGNAME_DEFAULT}
@@ -488,7 +488,7 @@ DISTFILE_${_group}:=	${DISTNAME_${_group}}_GH${_GITHUB_REV}${_GITHUB_EXTRACT_SUF
 DISTFILES:=	${DISTFILES} ${DISTFILE_${_group}}:${_group}
 MASTER_SITES:=	${MASTER_SITES} ${MASTER_SITE_GITHUB:S@%SUBDIR%@${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}/tar.gz/${GH_TAGNAME_${_group}}?dummy=/:${_group}@}
 WRKSRC_${_group}:=	${WRKDIR}/${GH_PROJECT_${_group}}-${GH_TAGNAME_${_group}_EXTRACT}
-.      if !empty(GH_SUBDIR_${_group})
+.        if !empty(GH_SUBDIR_${_group})
 # In order to sort the subdir extraction so that foo/bar is moved in before
 # foo/bar/baz, we count the number of / in the path and use it to order the
 # targets.  This handles up to 9 levels.  The max as of r463123 is 4.
@@ -498,16 +498,16 @@ post-extract-gh-${_group}:
 	@${MKDIR} ${WRKSRC}/${GH_SUBDIR_${_group}:H} 2>/dev/null || :
 	@${MV} ${WRKSRC_${_group}} ${WRKSRC}/${GH_SUBDIR_${_group}}
 	@${LN} -s ${WRKSRC:T}/${GH_SUBDIR_${_group}} ${WRKSRC_${_group}}
-.      endif
+.        endif
 git-clone: git-clone-${_group}
 git-clone-${_group}: ${_GITHUB_CLONE_DIR}
 	@git clone https://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}.git ${_GITHUB_CLONE_DIR}/${GH_PROJECT_${_group}}
 	@${ECHO_MSG} "Cloned the ${_group} github repository into ${_GITHUB_CLONE_DIR}/${GH_PROJECT_${_group}}" | ${FMT_80}
-.    endfor
-.  endif
+.      endfor
+.    endif
 convert-to-gh-tuple:
 	@${ECHO_MSG} ${GH_ACCOUNT}:${GH_PROJECT}:${GH_TAGNAME} ${_GH_TUPLE_OUT:S/\/$//}
-.endif # defined(USE_GITHUB)
+.  endif # defined(USE_GITHUB)
 .endif # !defined(IGNORE_MASTER_SITE_GITHUB)
 
 .if !defined(IGNORE_MASTER_SITE_GITLAB)
@@ -532,27 +532,27 @@ convert-to-gh-tuple:
 #
 # GL_TUPLE      - above shortened to [site[:port][/webroot]:]account:project:commit:group[/subdir]
 #
-.if defined(USE_GITLAB)
-.  if defined(GL_TUPLE)
-.    for _tuple in ${GL_TUPLE}
-.      if ${_tuple:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7@:S/^://:C/[a-f0-9]{40}//g}
+.  if defined(USE_GITLAB)
+.    if defined(GL_TUPLE)
+.      for _tuple in ${GL_TUPLE}
+.        if ${_tuple:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7@:S/^://:C/[a-f0-9]{40}//g}
 check-makevars::
 	@${ECHO_MSG} "The ${_tuple}"
 	@${ECHO_MSG} "GL_TUPLE is improperly formatted or, the commit"
 	@${ECHO_MSG} "section contains something other than [a-f0-9]"
 	@${FALSE}
-.      endif
-.    endfor
+.        endif
+.      endfor
 GL_SITE+=	${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\1\8@:S@::@:@}
 GL_ACCOUNT+=	${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\5\8@}
 GL_PROJECT+=	${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\6\8@}
 GL_COMMIT+=	${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7\8@}
 GL_SUBDIR+=	${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\9\8@:M/*:S/^\///}
-.  endif
+.    endif
 
-.  if empty(USE_GITLAB:Mnodefault)
+.    if empty(USE_GITLAB:Mnodefault)
 MASTER_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_COMMIT}.tar.gz?dummy=/
-.  endif
+.    endif
 GL_SITE_DEFAULT=	https://gitlab.com
 GL_SITE?=	${GL_SITE_DEFAULT}
 GL_ACCOUNT_DEFAULT=	${PORTNAME}
@@ -560,27 +560,27 @@ GL_ACCOUNT?=	${GL_ACCOUNT_DEFAULT}
 GL_PROJECT_DEFAULT=	${PORTNAME}
 GL_PROJECT?=	${GL_PROJECT_DEFAULT}
 _GITLAB_GROUPS=	DEFAULT
-.  for _gl_v in GL_SITE GL_ACCOUNT GL_PROJECT GL_COMMIT GL_SUBDIR
-.    for _v_ex in ${${_gl_v}}
+.    for _gl_v in GL_SITE GL_ACCOUNT GL_PROJECT GL_COMMIT GL_SUBDIR
+.      for _v_ex in ${${_gl_v}}
 _GL_GROUPS=	${_v_ex:S/^${_v_ex:C@:[^/:]+$@@}//:S/^://}
-.      if !empty(_GL_GROUPS)
-.        for _group in ${_GL_GROUPS:S/,/ /g}
-.          if ${_group} == all || ${_group} == ALL || ${_group} == default
+.        if !empty(_GL_GROUPS)
+.          for _group in ${_GL_GROUPS:S/,/ /g}
+.            if ${_group} == all || ${_group} == ALL || ${_group} == default
 check-makevars::
 		@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
 		@${ECHO_MSG} "used in group definitions. Please fix your ${_gl_v}"
 		@${FALSE}
-.          endif
-.          if !${_GITLAB_GROUPS:M${_group}}
+.            endif
+.            if !${_GITLAB_GROUPS:M${_group}}
 _GITLAB_GROUPS+=	${_group}
-.          endif
+.            endif
 ${_gl_v}_${_group}=	${_v_ex:C@^(.*):[^/:]+$@\1@}
-.        endfor
-.      else
+.          endfor
+.        else
 ${_gl_v}_DEFAULT=	${_v_ex:C@^(.*):[^/:]+$@\1@}
-.      endif
+.        endif
+.      endfor
 .    endfor
-.  endfor
 GL_SITE:=	${GL_SITE_DEFAULT}
 GL_ACCOUNT:=	${GL_ACCOUNT_DEFAULT}
 GL_PROJECT:=	${GL_PROJECT_DEFAULT}
@@ -593,27 +593,27 @@ _GITLAB_EXTRACT_SUFX=	.tar.gz
 
 _GITLAB_CLONE_DIR?=	${WRKDIR}/git-clone
 _PORTS_DIRECTORIES+=	${_GITLAB_CLONE_DIR}
-.  if !${USE_GITLAB:Mnodefault}
+.    if !${USE_GITLAB:Mnodefault}
 DISTNAME:=	${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV}
 DISTFILES+=	${DISTNAME}${_GITLAB_EXTRACT_SUFX}
 git-clone: git-clone-DEFAULT
 git-clone-DEFAULT: ${_GITLAB_CLONE_DIR}
 	@git clone ${GL_SITE_DEFAULT}/${GL_ACCOUNT_DEFAULT}/${GL_PROJECT_DEFAULT}.git ${_GITLAB_CLONE_DIR}/${GL_PROJECT_DEFAULT}
 	@${ECHO_MSG} "Cloned the default GitLab repository into ${_GITLAB_CLONE_DIR}/${GL_PROJECT_DEFAULT}" | ${FMT_80}
-.  endif
-.  if !empty(GL_SUBDIR)
+.    endif
+.    if !empty(GL_SUBDIR)
 _SITES_extract:=	69${GL_SUBDIR_${_group}:C=[^/]+= =g:[#]}:post-extract-gl-DEFAULT
 post-extract-gl-DEFAULT:
 	@${RMDIR} ${WRKSRC}/${GL_SUBDIR_DEFAULT} 2>/dev/null || :
 	@${MKDIR} ${WRKSRC}/${GL_SUBDIR_DEFAULT:H} 2>/dev/null || :
 	@${LN} -s ${GL_SUBDIR_DEFAULT:C/[^\/]//g:C/\//..\//g:S/^$/./} ${WRKSRC}/${GL_SUBDIR_DEFAULT}
-.  endif
-.  if !empty(_GITLAB_GROUPS:NDEFAULT)
-.    for _group in ${_GITLAB_GROUPS:NDEFAULT}
+.    endif
+.    if !empty(_GITLAB_GROUPS:NDEFAULT)
+.      for _group in ${_GITLAB_GROUPS:NDEFAULT}
 # We set GL_SITE earlier, we need to verify it's not empty
-.      if empty(GL_SITE_${_group})
+.        if empty(GL_SITE_${_group})
 GL_SITE_${_group}=	${GL_SITE_DEFAULT}
-.      endif
+.        endif
 GL_ACCOUNT_${_group}?=	${GL_ACCOUNT_DEFAULT}
 GL_PROJECT_${_group}?=	${GL_PROJECT_DEFAULT}
 
@@ -623,21 +623,21 @@ DISTFILE_${_group}:=	${DISTNAME_${_group}}${_GITLAB_EXTRACT_SUFX}
 DISTFILES:=	${DISTFILES} ${DISTFILE_${_group}}:${_group}
 MASTER_SITES:=	${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/-/archive/${GL_COMMIT_${_group}}.tar.gz?dummy=/:${_group}
 WRKSRC_${_group}:=	${WRKDIR}/${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}
-.      if !empty(GL_SUBDIR_${_group})
+.        if !empty(GL_SUBDIR_${_group})
 _SITES_extract:=	${_SITES_extract} 690:post-extract-gl-${_group}
 post-extract-gl-${_group}:
 	@${RMDIR} ${WRKSRC}/${GL_SUBDIR_${_group}} 2>/dev/null || :
 	@${MKDIR} ${WRKSRC}/${GL_SUBDIR_${_group}:H} 2>/dev/null || :
 	@${MV} ${WRKSRC_${_group}} ${WRKSRC}/${GL_SUBDIR_${_group}}
 	@${LN} -s ${WRKSRC:T}/${GL_SUBDIR_${_group}} ${WRKSRC_${_group}}
-.      endif
+.        endif
 git-clone: git-clone-${_group}
 git-clone-${_group}: ${_GITLAB_CLONE_DIR}
 	@git clone ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}.git ${_GITLAB_CLONE_DIR}/${GL_PROJECT_${_group}}
 	@${ECHO_MSG} "Cloned the ${_group} GitLab repository into ${_GITLAB_CLONE_DIR}/${GL_PROJECT_${_group}}" | ${FMT_80}
-.    endfor
-.  endif
-.endif # defined(USE_GITLAB)
+.      endfor
+.    endif
+.  endif # defined(USE_GITLAB)
 .endif # !defined(IGNORE_MASTER_SITE_GITLAB)
 
 .if !defined(IGNORE_MASTER_SITE_GNOME)
@@ -955,12 +955,12 @@ MASTER_SITE_PERL_CPAN_BY+= \
 _PERL_CPAN_FLAG=${MASTER_SITE_SUBDIR:C/(CPAN):.*$/\1/}
 _PERL_CPAN_ID=	${MASTER_SITE_SUBDIR:C/^CPAN:(.)(.)(.*)$/\1\/\1\2\/\1\2\3/}
 
-.if !empty(_PERL_CPAN_ID) && ${_PERL_CPAN_FLAG:tl} == "cpan"
+.  if !empty(_PERL_CPAN_ID) && ${_PERL_CPAN_FLAG:tl} == "cpan"
     _PERL_CPAN_SORT=authors/id/${_PERL_CPAN_ID}
     MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIR%\///:S/%SUBDIRPLUS%\//${PORTNAME:C/-.*//}\//}
-.else
+.  else
     MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIRPLUS%\///}
-.endif
+.  endif
 
 .endif
 
@@ -1052,13 +1052,13 @@ MASTER_SITE_SAVANNAH+= \
 # List:		https://sourceforge.net/p/forge/documentation/Mirrors/
 # Updated:	2017-03-13
 .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE)
-.for p in https http
+.  for p in https http
 MASTER_SITE_SOURCEFORGE+= ${p}://downloads.sourceforge.net/project/%SUBDIR%/
-.for m in excellmedia freefr jaist nchc \
+.    for m in excellmedia freefr jaist nchc \
 	netcologne netix superb-dca2 superb-sea2 ufpr vorboss
 MASTER_SITE_SOURCEFORGE+= ${p}://${m}.dl.sourceforge.net/project/%SUBDIR%/
-.endfor
-.endfor
+.    endfor
+.  endfor
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_SOURCEWARE)
@@ -1271,86 +1271,86 @@ MASTER_SITES_SUBDIRS=	APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
 
 .if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*}
 
-.for _site__ in ${MASTER_SITES}
+.  for _site__ in ${MASTER_SITES}
 _site_=${_site__}
-.	if ${_site_:M*\:/*}
+.    if ${_site_:M*\:/*}
 MASTER_SITES_EXP+=	${_site_}
 MASTER_SITES_EXP:=	${MASTER_SITES_EXP}
-.	else
+.    else
 _site_urlpath_=	${_site_:C@^(.*):[^/:]+$@\1@}
-.		if ${_site_urlpath_:M*/*}
+.      if ${_site_urlpath_:M*/*}
 _site_url_=		${_site_urlpath_:C@^([^/]+)/.*$@\1@}
 _site_subdir_=	${_site_urlpath_:S/^${_site_urlpath_:C@^([^/]+)/.*$@\1@}//:S!^/!!:S!/$!!}
-.		else
+.      else
 _site_url_=		${_site_urlpath_}
 .undef _site_subdir_
-.		endif
+.      endif
 _site_group_=	${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
-.		for _abbrev_ in ${MASTER_SITES_ABBREVS}
-.			if ${_site_url_} == ${_abbrev_:C/:.*//}
+.      for _abbrev_ in ${MASTER_SITES_ABBREVS}
+.        if ${_site_url_} == ${_abbrev_:C/:.*//}
 _site_url_=	${_abbrev_:C/.*://}
-.			endif
-.		endfor
-.		if !defined(MASTER_SITE_SUBDIR)
-.			for _subdir_ in ${MASTER_SITES_SUBDIRS}
-.				if ${_site_url_} == ${_subdir_:C/:.*//}
+.        endif
+.      endfor
+.      if !defined(MASTER_SITE_SUBDIR)
+.        for _subdir_ in ${MASTER_SITES_SUBDIRS}
+.          if ${_site_url_} == ${_subdir_:C/:.*//}
 _site_subdir_?=	${_subdir_:C/.*://}
-.				endif
-.			endfor
-.		endif
-.		ifdef MASTER_SITE_${_site_url_}
-.			ifdef _site_subdir_
+.          endif
+.        endfor
+.      endif
+.      ifdef MASTER_SITE_${_site_url_}
+.        ifdef _site_subdir_
 MASTER_SITES_EXP+=	${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
-.			else
+.        else
 MASTER_SITES_EXP+=	${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//}
-.			endif
+.        endif
 MASTER_SITES_EXP:=	${MASTER_SITES_EXP}
-.		endif
-.	endif
-.endfor
+.      endif
+.    endif
+.  endfor
 MASTER_SITES=	${MASTER_SITES_EXP}
 
 .endif
 
 .if defined(PATCH_SITES) && ${PATCH_SITES:N*\:/*}
 
-.for _site__ in ${PATCH_SITES}
+.  for _site__ in ${PATCH_SITES}
 _site_=${_site__}
-.	if ${_site_:M*\:/*}
+.    if ${_site_:M*\:/*}
 PATCH_SITES_EXP+=	${_site_}
 PATCH_SITES_EXP:=	${PATCH_SITES_EXP}
-.	else
+.    else
 _site_urlpath_=	${_site_:C@^(.*):[^/:]+$@\1@}
-.		if ${_site_urlpath_:M*/*}
+.      if ${_site_urlpath_:M*/*}
 _site_url_=		${_site_urlpath_:C@^([^/]+)/.*$@\1@}
 _site_subdir_=	${_site_urlpath_:S/^${_site_urlpath_:C@^([^/]+)/.*$@\1@}//:S!^/!!:S!/$!!}
-.		else
+.      else
 _site_url_=		${_site_urlpath_}
 .undef _site_subdir_
-.		endif
+.      endif
 _site_group_=	${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
-.		for _abbrev_ in ${MASTER_SITES_ABBREVS}
-.			if ${_site_url_} == ${_abbrev_:C/:.*//}
+.      for _abbrev_ in ${MASTER_SITES_ABBREVS}
+.        if ${_site_url_} == ${_abbrev_:C/:.*//}
 _site_url_=	${_abbrev_:C/.*://}
-.			endif
-.		endfor
-.		if !defined(MASTER_SITE_SUBDIR)
-.			for _subdir_ in ${MASTER_SITES_SUBDIRS}
-.				if ${_site_url_} == ${_subdir_:C/:.*//}
+.        endif
+.      endfor
+.      if !defined(MASTER_SITE_SUBDIR)
+.        for _subdir_ in ${MASTER_SITES_SUBDIRS}
+.          if ${_site_url_} == ${_subdir_:C/:.*//}
 _site_subdir_?=	${_subdir_:C/.*://}
-.				endif
-.			endfor
-.		endif
-.		ifdef MASTER_SITE_${_site_url_}
-.			ifdef _site_subdir_
+.          endif
+.        endfor
+.      endif
+.      ifdef MASTER_SITE_${_site_url_}
+.        ifdef _site_subdir_
 PATCH_SITES_EXP+=	${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
-.			else
+.        else
 PATCH_SITES_EXP+=	${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//}
-.			endif
+.        endif
 PATCH_SITES_EXP:=	${PATCH_SITES_EXP}
-.		endif
-.	endif
-.endfor
+.      endif
+.    endif
+.  endfor
 PATCH_SITES=	${PATCH_SITES_EXP}
 
 .endif
diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index 3a7725958ede..ce8efc912194 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -165,42 +165,42 @@ USE_TEX:=	${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu}
 .for _UU in ${USE_TEX:tu}
 _U:=	${_UU}	# ugly but necessary in for loop
 _VOP:=
-. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*)
+.  if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*)
 _U:=	${_U}>=${TEXLIVE_VERSION}
-. endif
-. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*)
+.  endif
+.  if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*)
 _U:=	${_U}>=${TEXLIVE_VERSION}
-. endif
-. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \
+.  endif
+.  if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \
      !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \
      !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUA) || \
      !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUAJIT) || \
      !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MSYNCTEX)
 _U:=	${_U}:lib
-. endif
-. if !empty(_U:M*[<>=]*)
+.  endif
+.  if !empty(_U:M*[<>=]*)
 _VOP:=	${_U:C/^[^<>=]*//:C/\:.*$//}
-. endif
-. if empty(_U:M*\:*)
+.  endif
+.  if empty(_U:M*\:*)
 _C:=	BUILD RUN
-. else
+.  else
 _C:=	${_U:C/.*://:S/,/ /g:C/[<>=][^\:]*//g}
-. endif
+.  endif
 #. warning DEBUG: ${_U}: _VOP=${_VOP}, _C=${_C}
-. for _CC in ${_C:tu}
+.  for _CC in ${_C:tu}
 _V:=${_UU:C/[<>=][^\:]*//:C/\:.*$//}
-.  if defined(_USE_TEX_${_V}_PORT)
-.   if !empty(_VOP)
-.    for _T in ${_USE_TEX_${_V}_PKGNAME}${_VOP}:${_USE_TEX_${_V}_PORT}
+.    if defined(_USE_TEX_${_V}_PORT)
+.      if !empty(_VOP)
+.        for _T in ${_USE_TEX_${_V}_PKGNAME}${_VOP}:${_USE_TEX_${_V}_PORT}
 TEX_${_CC}_DEPENDS+=	${_T}
-.    endfor
-.   else
-.    for _T in ${_USE_TEX_${_V}_DEP}:${_USE_TEX_${_V}_PORT}
+.        endfor
+.      else
+.        for _T in ${_USE_TEX_${_V}_DEP}:${_USE_TEX_${_V}_PORT}
 TEX_${_CC}_DEPENDS+=	${_T}
-.    endfor
-.   endif
-.  endif
-. endfor
+.        endfor
+.      endif
+.    endif
+.  endfor
 .endfor
 
 .for _C in EXTRACT BUILD LIB RUN
@@ -215,14 +215,14 @@ ${_C}_DEPENDS+=	${TEX_${_C}_DEPENDS:O:u}
     !empty(USE_TEX:Mupdmap)
 .PHONY:	do-texhash
 do-texhash:
-. if !empty(USE_TEX:Mtexhash-bootstrap)
+.  if !empty(USE_TEX:Mtexhash-bootstrap)
 	@${ECHO_CMD} "@postexec ${LOCALBASE}/bin/mktexlsr " \
 		"${TEXHASHDIRS:S,^,%D/,}" >> ${TMPPLIST}
 	@for D in ${TEXHASHDIRS}; do \
 		${ECHO_CMD} "@rmtry $$D/ls-R"; \
 		${ECHO_CMD} "@dir $$D"; \
 	done >> ${TMPPLIST}
-. else
+.  else
 	@${ECHO_CMD} "@postexec for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do " \
 		"if [ -r \$$D/ls-R ]; then " \
 			"${LOCALBASE}/bin/mktexlsr \$$D; " \
@@ -231,14 +231,14 @@ do-texhash:
 		"if [ -r \$$D/ls-R ]; then " \
 			"${LOCALBASE}/bin/mktexlsr \$$D; " \
 		"fi; done" >> ${TMPPLIST}
-. endif
+.  endif
 
 post-install-script: do-texhash
 .endif
 
 .if !empty(USE_TEX:Mfmtutil)
 .PHONY:	do-fmtutil
-. for F in ${TEX_FORMATS}
+.  for F in ${TEX_FORMATS}
 do-fmtutil: post-install-$F do-fmtutil-$F
 do-fmtutil-$F:
 	${TEST} -n '${TEX_FORMAT_${F:tu}}'
@@ -269,7 +269,7 @@ do-fmtutil-$F:
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_FILES}
 _PLIST_DIRS+=${TEX_FORMAT_${F:tu}_DIRS}
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_BIN}
-. endfor
+.  endfor
 post-install-script: do-fmtutil
 PLIST_FILES=	${_PLIST_FILES:O:u}
 PLIST_DIRS=	${_PLIST_DIRS:O:u} ${TEXMFVARDIR}/web2c
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index e4d389e36622..9269867d22fe 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -147,20 +147,20 @@ _WX_LIB_wx_3.1=		wx_baseu-3.1
 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropriately.
 # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
 
-.	for comp in ${_WX_COMPS_ALL}
+.  for comp in ${_WX_COMPS_ALL}
 _WX_COMP=		${comp}
-.		for ver in ${_WX_VERS_ALL}
-.			if defined(_WX_LIB_${comp}_${ver})
+.    for ver in ${_WX_VERS_ALL}
+.      if defined(_WX_LIB_${comp}_${ver})
 _WX_SHVER_${comp}_${ver}=	0
 _WX_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
-.			endif
-.			if ${_WX_COMP} == "python"
+.      endif
+.      if ${_WX_COMP} == "python"
 _WX_DEPTYPE_${comp}_${ver}=	run
-.			else
+.      else
 _WX_DEPTYPE_${comp}_${ver}=	lib
-.			endif
-.		endfor
-.	endfor
+.      endif
+.    endfor
+.  endfor
 .endif		# !_WX_Defined_Done
 
 #
@@ -200,33 +200,33 @@ _WX_PYSUFX=		-unicode
 # Fill _HAVE_WX with the installed components.
 
 .	undef _HAVE_WX
-.	for __WANT_WX in ${_WANT_WX}
+.  for __WANT_WX in ${_WANT_WX}
 # Check if _WANT_WX contains more than one word.
-.		if defined(_HAVE_WX)
+.    if defined(_HAVE_WX)
 IGNORE?=		selected multiple values for WANT_WX: ${_WANT_WX}
-.		endif
+.    endif
 _HAVE_WX=		#
 # Check for all versions.
-.		if ${_WANT_WX:tl} == "yes"
-.			for comp in ${_WX_COMPS_ALL}
-.				for ver in ${_WX_VER_FINAL}
+.    if ${_WANT_WX:tl} == "yes"
+.      for comp in ${_WX_COMPS_ALL}
+.        for ver in ${_WX_VER_FINAL}
 _WX_COMP=		_WX_FILE_${comp}_${ver}
-.					if defined(${_WX_COMP}) && exists(${${_WX_COMP}})
+.          if defined(${_WX_COMP}) && exists(${${_WX_COMP}})
 _HAVE_WX+=		${comp}-${ver}
-.					endif
-.				endfor
-.			endfor
+.          endif
+.        endfor
+.      endfor
 # Check for a specific version.
-.		elif ${_WX_VERS_ALL:M${__WANT_WX}}
-.			for comp in ${_WX_COMPS_ALL}
-.				if exists(${_WX_FILE_${comp}_${__WANT_WX}})
+.    elif ${_WX_VERS_ALL:M${__WANT_WX}}
+.      for comp in ${_WX_COMPS_ALL}
+.        if exists(${_WX_FILE_${comp}_${__WANT_WX}})
 _HAVE_WX+=		${comp}
-.				endif
-.			endfor
-.		else
+.        endif
+.      endfor
+.    else
 IGNORE?=		selected an invalid value for WANT_WX: ${__WANT_WX}
-.		endif
-.	endfor
+.    endif
+.  endfor
 .endif		# _WANT_WX
 
 # Requested by the user.
@@ -259,19 +259,19 @@ _WX_Version_Done=	yes
 # Detect duplicated components.
 
 _WX_COMPS_FINAL=	#
-.for comp in ${WX_COMPS}
+.  for comp in ${WX_COMPS}
 _WX_COMP=		${comp:C/:([[:alpha:]]+)$//}
-.	for __WX_COMP in ${_WX_COMP}
-.		if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
+.    for __WX_COMP in ${_WX_COMP}
+.      if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
 IGNORE?=		selected an invalid wxWidgets component: ${__WX_COMP}
-.		endif
-.	endfor
-.	for newcomp in ${_WX_COMP}
-.		if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
+.      endif
+.    endfor
+.    for newcomp in ${_WX_COMP}
+.      if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
 _WX_COMPS_FINAL+=	${newcomp}
-.		endif
-.	endfor
-.endfor
+.      endif
+.    endfor
+.  endfor
 
 # Set defaults (if one isn't present).
 
@@ -290,69 +290,69 @@ USE_WX_NOT?=		#
 # _WX_VER_MERGED	- List of requested version without disallowed ones.
 #
 
-.for list in VER VER_NOT
+.  for list in VER VER_NOT
 _WX_${list}_LIST=	#
-.	for ver in ${USE_WX${list:C/VER//}}
+.    for ver in ${USE_WX${list:C/VER//}}
 _WX_VER_CHECK:=		${ver:C/^([[:digit:]]+(\.[[:digit:]]+)*)$/\1-\1/}
 _WX_VER_MIN:=		${_WX_VER_CHECK:C/([[:digit:]]+(\.[[:digit:]]+)*)[-+].*/\1/}
 _WX_VER_MAX:=		${_WX_VER_CHECK:C/.*-([[:digit:]]+(\.[[:digit:]]+)*)/\1/}
 # Minimum version not specified.
-.		if ${_WX_VER_MIN} == ${_WX_VER_CHECK}
+.      if ${_WX_VER_MIN} == ${_WX_VER_CHECK}
 .			undef _WX_VER_MIN
-.			for v in ${_WX_VERS_ALL}
-.				if ${_WX_VER_CHECK:C/[-+]//} == ${v} || ${_WX_VERS_SKIP:M${v}} == ""
+.        for v in ${_WX_VERS_ALL}
+.          if ${_WX_VER_CHECK:C/[-+]//} == ${v} || ${_WX_VERS_SKIP:M${v}} == ""
 _WX_VER_MIN?=		${v}
-.				endif
-.			endfor
-.		endif
+.          endif
+.        endfor
+.      endif
 # Maximum version not specified.
-.		if ${_WX_VER_MAX} == ${_WX_VER_CHECK}
-.			for v in ${_WX_VERS_ALL}
-.				if ${_WX_VER_CHECK:C/[-+]//} == ${v} || ${_WX_VERS_SKIP:M${v}} == ""
+.      if ${_WX_VER_MAX} == ${_WX_VER_CHECK}
+.        for v in ${_WX_VERS_ALL}
+.          if ${_WX_VER_CHECK:C/[-+]//} == ${v} || ${_WX_VERS_SKIP:M${v}} == ""
 _WX_VER_MAX=		${v}
-.				endif
-.			endfor
-.		endif
+.          endif
+.        endfor
+.      endif
 # Expand versions and add valid ones to each list.
-.		for v in ${_WX_VERS_ALL}
-.			if ${_WX_VER_MIN} <= ${v} && ${_WX_VER_MAX} >= ${v} && \
+.      for v in ${_WX_VERS_ALL}
+.        if ${_WX_VER_MIN} <= ${v} && ${_WX_VER_MAX} >= ${v} && \
 			   ${_WX_${list}_LIST:M${v}} == ""
 _WX_${list}_LIST+=	${v}
-.			endif
-.		endfor
-.	endfor
-.endfor
+.        endif
+.      endfor
+.    endfor
+.  endfor
 
 # Merge the lists into a single list of valid versions.
 
 _WX_VER_MERGED=		#
-.for ver in ${_WX_VER_LIST}
-.	if ${_WX_VER_NOT_LIST:M${ver}} == ""
+.  for ver in ${_WX_VER_LIST}
+.    if ${_WX_VER_NOT_LIST:M${ver}} == ""
 _WX_VER_MERGED+=	${ver}
-.	endif
-.endfor
+.    endif
+.  endfor
 
 # Check for a null version.
 
-.if empty(_WX_VER_MERGED)
+.  if empty(_WX_VER_MERGED)
 IGNORE?=		selected a null or invalid wxWidgets version
-.endif
+.  endif
 
 # Avoid versions which have unavailable components.
 
-.for ver in ${_WX_VER_MERGED}
-.	for comp in ${_WX_COMPS_FINAL}
-.		if !defined(_WX_PORT_${comp}_${ver})
+.  for ver in ${_WX_VER_MERGED}
+.    for comp in ${_WX_COMPS_FINAL}
+.      if !defined(_WX_PORT_${comp}_${ver})
 _WX_WRONG_COMPS+=	${comp}
 _WX_WRONG_VERS+=	${ver}
 _WX_VER_MERGED:=	${_WX_VER_MERGED:N${ver}}
-.		endif
-.	endfor
-.endfor
+.      endif
+.    endfor
+.  endfor
 
-.if empty(_WX_VER_MERGED)
+.  if empty(_WX_VER_MERGED)
 IGNORE?=		selected wxWidgets versions (${_WX_WRONG_VERS}) which do not have the selected components (${_WX_WRONG_COMPS})
-.endif
+.  endif
 
 #
 # Unicode support.
@@ -361,11 +361,11 @@ IGNORE?=		selected wxWidgets versions (${_WX_WRONG_VERS}) which do not have the
 # Create a list of capable versions.
 
 _WX_VER_UC=		#
-.for ver in ${_WX_VER_MERGED}
-.	if ${_WX_VERS_UC_ALL:M${ver}} != ""
+.  for ver in ${_WX_VER_MERGED}
+.    if ${_WX_VERS_UC_ALL:M${ver}} != ""
 _WX_VER_UC+=		${ver}
-.	endif
-.endfor
+.    endif
+.  endfor
 
 # Set Unicode variables.
 
@@ -375,11 +375,11 @@ _WX_PYSUFX=		-unicode
 
 # Remove unusable installed versions.
 
-.for ver in ${_WX_VER_INSTALLED}
-.	if ${_WX_VER_FINAL:M${ver}} == ""
+.  for ver in ${_WX_VER_INSTALLED}
+.    if ${_WX_VER_FINAL:M${ver}} == ""
 _WX_VER_INSTALLED:=	${_WX_VER_INSTALLED:N${ver}}
-.	endif
-.endfor
+.    endif
+.  endfor
 
 #
 # Choose final version.
@@ -393,28 +393,28 @@ _WX_VER_INSTALLED:=	${_WX_VER_INSTALLED:N${ver}}
 # 4) _WX_VER_FINAL	- Available versions.
 
 
-.for list in _WX_VER_FINAL ${_WX_VERS_LISTS}
-.	if defined(${list})
-.		for ver in ${${list}}
-.			if ${_WX_VER_FINAL:M${ver}} != ""
+.  for list in _WX_VER_FINAL ${_WX_VERS_LISTS}
+.    if defined(${list})
+.      for ver in ${${list}}
+.        if ${_WX_VER_FINAL:M${ver}} != ""
 _WX_VER=		${ver}
-.			endif
-.		endfor
-.	endif
-.endfor
+.        endif
+.      endfor
+.    endif
+.  endfor
 
 #
 # Set variables.
 #
 
-.if ${_WX_VER} == 3.1
+.  if ${_WX_VER} == 3.1
 _GTKVER=	3
-.elif ${_WX_VER} == 3.0
+.  elif ${_WX_VER} == 3.0
 _GTKVER=	${WANT_WXGTK_VER:U3}
 _GTKFLAVOR=	gtk${_GTKVER}
-.else
+.  else
 _GTKVER=	2
-.endif
+.  endif
 
 WX_CONFIG?=		${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config
 WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk${_GTKVER}${_WX_UC}-${_WX_VER}
@@ -445,33 +445,33 @@ WX_COMPS?=		wx
 # Detect invalid and duplicated components.
 
 _WX_COMPS_FINAL=	#
-.for comp in ${WX_COMPS}
+.  for comp in ${WX_COMPS}
 _WX_COMP=		${comp:C/:([[:alpha:]]+)$//}
-.	if ${_WX_COMP} == ${comp}
+.    if ${_WX_COMP} == ${comp}
 _WX_DEP_TYPE=		${_WX_DEPTYPE_${comp}_${_WX_VER}}
-.	else
+.    else
 _WX_DEP_TYPE=		${comp:C/.+:([[:alpha:]]+)$/\1/}
-.	endif
+.    endif
 _WX_COMP_NEW=		${_WX_COMP}_${_WX_DEP_TYPE}
-.	for __WX_COMP in ${_WX_COMP}
-.		if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
+.    for __WX_COMP in ${_WX_COMP}
+.      if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
 IGNORE?=		selected an invalid wxWidgets component: ${__WX_COMP}
-.		endif
-.	endfor
-.	for __WX_DEP_TYPE in ${_WX_DEP_TYPE}
-.		if ${_WX_DEP_TYPES_ALL:M${__WX_DEP_TYPE}} == ""
+.      endif
+.    endfor
+.    for __WX_DEP_TYPE in ${_WX_DEP_TYPE}
+.      if ${_WX_DEP_TYPES_ALL:M${__WX_DEP_TYPE}} == ""
 IGNORE?=		selected an invalid wxWidgets dependency type: ${__WX_DEP_TYPE}
-.		endif
-.	endfor
-.	if !defined(_WX_PORT_${_WX_COMP}_${_WX_VER})
+.      endif
+.    endfor
+.    if !defined(_WX_PORT_${_WX_COMP}_${_WX_VER})
 IGNORE?=		selected a wxWidgets component (${_WX_COMP}) which is not available for the selected version (${_WX_VER})
-.	endif
-.	for newcomp in ${_WX_COMP_NEW}
-.		if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
+.    endif
+.    for newcomp in ${_WX_COMP_NEW}
+.      if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
 _WX_COMPS_FINAL+=	${newcomp}
-.		endif
-.	endfor
-.endfor
+.      endif
+.    endfor
+.  endfor
 
 # Add dependencies.
 #
@@ -479,23 +479,23 @@ _WX_COMPS_FINAL+=	${newcomp}
 # _WX_COMP		- Component part.
 # _WX_DEP_TYPE		- Dependency type part.
 
-.for comp in ${_WX_COMPS_FINAL}
+.  for comp in ${_WX_COMPS_FINAL}
 _WX_COMP=		${comp:C/_([[:alpha:]]+)$//}
 _WX_DEP_TYPE=		${comp:C/.+_([[:alpha:]]+)$/\1/}
 # XXX Need a .for loop here so the variable is expanded before the assignment.
-.	for comp_part in ${_WX_COMP}
-.		if ${_WX_DEP_TYPE} == "lib"
-.			if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
+.    for comp_part in ${_WX_COMP}
+.      if ${_WX_DEP_TYPE} == "lib"
+.        if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
 LIB_DEPENDS+=		lib${_WX_LIB_${comp_part}_${_WX_VER}}.so:${_WX_PORT_${comp_part}_${_WX_VER}}
-.			else
+.        else
 BUILD_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
 RUN_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
-.			endif
-.		else
+.        endif
+.      else
 ${_WX_DEP_TYPE:tu}_DEPENDS+=	${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
-.		endif
-.	endfor
-.endfor
+.      endif
+.    endfor
+.  endfor
 
 #
 # Set build related variables.
@@ -504,15 +504,15 @@ ${_WX_DEP_TYPE:tu}_DEPENDS+=	${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${co
 MAKE_ENV+=		WX_CONFIG=${WX_CONFIG}
 CONFIGURE_ENV+=		WX_CONFIG=${WX_CONFIG}
 
-.if defined(WX_CONF_ARGS)
-.	if ${WX_CONF_ARGS:tl} == "absolute"
+.  if defined(WX_CONF_ARGS)
+.    if ${WX_CONF_ARGS:tl} == "absolute"
 CONFIGURE_ARGS+=	--with-wx-config=${WX_CONFIG}
-.	elif ${WX_CONF_ARGS:tl} == "relative"
+.    elif ${WX_CONF_ARGS:tl} == "relative"
 CONFIGURE_ARGS+=	--with-wx=${LOCALBASE} \
 			--with-wx-config=${WX_CONFIG:T}
-.	else
+.    else
 IGNORE?=		selected an invalid wxWidgets configure argument type: ${WX_CONF_ARGS}
-.	endif
-.endif
+.    endif
+.  endif
 
 .endif		# _POSTMKINCLUDED