wip/a*: fix pkglint indentation warnings

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/a*: fix pkglint indentation warnings
From: Roland Illig <roland.illig%gmx.de@localhost>
Date: Sat, 27 Jan 2018 19:18:43 +0000
Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 19:18:43 2018 +0000
Changeset:	6ff6a519b9e2089c258f7df4f742492cb877dcd1

Modified Files:
	acpiclient/Makefile
	aegis-devel/Makefile
	afflib/Makefile
	afl-cov/Makefile
	agfl/Makefile
	agfl/PLIST
	agile/Makefile
	alsa-lib-git/buildlink3.mk
	alsa-lib-git/builtin.mk
	am-utils-git/Makefile
	analizo/Makefile
	android-tools-adb8/Makefile
	angelscript/Makefile
	angelscript/PLIST
	ansible/Makefile
	anthy-dic-jis34/Makefile
	antlr/PLIST
	antlr3-c/Makefile
	antlr3-c/buildlink3.mk
	aoeui/Makefile
	aokell/Makefile
	aols-postgres/Makefile
	aolserver4/Makefile
	apache-commons-beanutils/Makefile
	apache-commons-codec/Makefile
	apache-commons-configuration/Makefile
	apache-commons-dbcp/Makefile
	apache-commons-digester/Makefile
	apache-commons-lang/Makefile
	apel-git/Makefile
	apinger/Makefile
	apstget/Makefile
	ar7/Makefile
	arabeyes-qr-ttf/Makefile
	arachne-pnr-git/Makefile
	argouml/Makefile
	argtable2/Makefile
	argtable2/buildlink3.mk
	ariamaestosa/PLIST
	arista/Makefile
	arm-eabi-gcc5/Makefile
	arm-elf-gcc47/Makefile
	armadillo/Makefile
	armadillo/buildlink3.mk
	aslc86k/Makefile
	aspell-dictionaries/options.mk
	asql/Makefile
	asterisk11-vicidial/Makefile
	atlas/Makefile
	atompaw/Makefile
	audiere/Makefile
	audio-mml/buildlink3.mk
	audit-system/Makefile
	audit-system/PLIST
	auto-complete-mode/Makefile
	autoproject/PLIST
	autopsy/Makefile
	autoq3d/PLIST
	avida2/PLIST
	avr-binutils/PLIST
	avr-binutils/buildlink3.mk
	avr-libc/Makefile

Log Message:
wip/a*: fix pkglint indentation warnings

pkglint -Wall -F -o aligned a*/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6ff6a519b9e2089c258f7df4f742492cb877dcd1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 acpiclient/Makefile                   |   4 +-
 aegis-devel/Makefile                  |   4 +-
 afflib/Makefile                       |   2 +-
 afl-cov/Makefile                      |   2 +-
 agfl/Makefile                         |  16 ++---
 agfl/PLIST                            |   2 +-
 agile/Makefile                        |   4 +-
 alsa-lib-git/buildlink3.mk            |   2 +-
 alsa-lib-git/builtin.mk               |   6 +-
 am-utils-git/Makefile                 |   2 +-
 analizo/Makefile                      |   2 +-
 android-tools-adb8/Makefile           |   2 +-
 angelscript/Makefile                  |   6 +-
 angelscript/PLIST                     |   2 +-
 ansible/Makefile                      |  96 +++++++++++++++---------------
 anthy-dic-jis34/Makefile              |   4 +-
 antlr/PLIST                           |  14 ++---
 antlr3-c/Makefile                     |   2 +-
 antlr3-c/buildlink3.mk                |   2 +-
 aoeui/Makefile                        |   2 +-
 aokell/Makefile                       |   4 +-
 aols-postgres/Makefile                |   2 +-
 aolserver4/Makefile                   |   2 +-
 apache-commons-beanutils/Makefile     |   6 +-
 apache-commons-codec/Makefile         |   4 +-
 apache-commons-configuration/Makefile |   4 +-
 apache-commons-dbcp/Makefile          |   6 +-
 apache-commons-digester/Makefile      |   4 +-
 apache-commons-lang/Makefile          |   4 +-
 apel-git/Makefile                     |   2 +-
 apinger/Makefile                      |   2 +-
 apstget/Makefile                      |   2 +-
 ar7/Makefile                          |   2 +-
 arabeyes-qr-ttf/Makefile              |   6 +-
 arachne-pnr-git/Makefile              |  10 ++--
 argouml/Makefile                      |   4 +-
 argtable2/Makefile                    |   2 +-
 argtable2/buildlink3.mk               |   2 +-
 ariamaestosa/PLIST                    |   2 +-
 arista/Makefile                       |   2 +-
 arm-eabi-gcc5/Makefile                |   6 +-
 arm-elf-gcc47/Makefile                |   6 +-
 armadillo/Makefile                    |   4 +-
 armadillo/buildlink3.mk               |   2 +-
 aslc86k/Makefile                      |  12 ++--
 aspell-dictionaries/options.mk        |   6 +-
 asql/Makefile                         |  16 ++---
 asterisk11-vicidial/Makefile          |   4 +-
 atlas/Makefile                        |   2 +-
 atompaw/Makefile                      |   4 +-
 audiere/Makefile                      |   2 +-
 audio-mml/buildlink3.mk               |   2 +-
 audit-system/Makefile                 |   8 +--
 audit-system/PLIST                    |   4 +-
 auto-complete-mode/Makefile           |   2 +-
 autoproject/PLIST                     | 108 +++++++++++++++++-----------------
 autopsy/Makefile                      |   2 +-
 autoq3d/PLIST                         |   8 +--
 avida2/PLIST                          |  16 ++---
 avr-binutils/PLIST                    |   2 +-
 avr-binutils/buildlink3.mk            |   2 +-
 avr-libc/Makefile                     |   2 +-
 62 files changed, 234 insertions(+), 234 deletions(-)

diffs:
diff --git a/acpiclient/Makefile b/acpiclient/Makefile
index a7fe563078..47fbc43f09 100644
--- a/acpiclient/Makefile
+++ b/acpiclient/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE=	http://acpiclient.sourceforge.net/
 COMMENT=	This is an acpi client for Linux
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=     gmake
+USE_TOOLS+=	gmake
 
-ONLY_FOR_PLATFORM= Linux-*-*
+ONLY_FOR_PLATFORM=	Linux-*-*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/aegis-devel/Makefile b/aegis-devel/Makefile
index 662c94ce00..cf790c36cf 100644
--- a/aegis-devel/Makefile
+++ b/aegis-devel/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://aegis.sourceforge.net/
 COMMENT=	Infrastructure meta-package to develop on Aegis
 
-META_PACKAGE=   	yes
+META_PACKAGE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -38,7 +38,7 @@ DEPENDS+=		psutils>=1.17:../../print/psutils
 # on NetBSD rcs is in the base set. others?
 DEPENDS+=		rcs>=5.7:../../devel/rcs
 .endif
-DEPENDS+= 		rx>=1.5:../../devel/rx
+DEPENDS+=		rx>=1.5:../../devel/rx
 DEPENDS+=		sudo>=1.7.0:../../security/sudo
 DEPENDS+=		tardy>=1.17:../../wip/tardy
 .if ${OPSYS} != "NetBSD"
diff --git a/afflib/Makefile b/afflib/Makefile
index 7a74ccbb4b..4c2e1af34c 100644
--- a/afflib/Makefile
+++ b/afflib/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		https://sourceforge.net/projects/afflib/
 COMMENT=		Advanced Forensic Format library
 
-USE_LANGUAGES= c++
+USE_LANGUAGES=	c++
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aimage/aimage ${DESTDIR}${PREFIX}/bin
diff --git a/afl-cov/Makefile b/afl-cov/Makefile
index 6929f1d765..0bab3b973d 100644
--- a/afl-cov/Makefile
+++ b/afl-cov/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	afl-[0-9]*:../../devel/afl
 
 USE_LANGUAGES=	# none
 
-REPLACE_PYTHON+=	afl-cov
+REPLACE_PYTHON+=		afl-cov
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.6
 
 INSTALLATION_DIRS+=	bin share/doc/afl-cov
diff --git a/agfl/Makefile b/agfl/Makefile
index 329aea8789..ccc1174a86 100644
--- a/agfl/Makefile
+++ b/agfl/Makefile
@@ -11,21 +11,21 @@ COMMENT=	Formalism for the syntactic description of Natural Languages
 
 DIST_SUBDIR=	agfl-${AGFL_VERSION}
 
-AGFL_VERSION=	3.2
-CONFIGURE_ARGS += --with-cdl3=${BUILDLINK_PREFIX.cdl3}
-MAKE_JOBS_SAFE=NO
-LICENSE=	gnu-gpl-v3
+AGFL_VERSION=		3.2
+CONFIGURE_ARGS +=	--with-cdl3=${BUILDLINK_PREFIX.cdl3}
+MAKE_JOBS_SAFE=		NO
+LICENSE=		gnu-gpl-v3
 
-INSTALLATION_DIRS+= share/doc/agfl
-INSTALLATION_DIRS+= share/agfl
+INSTALLATION_DIRS+=	share/doc/agfl
+INSTALLATION_DIRS+=	share/agfl
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_TOOLS+=		perl
 
-BUILD_DEPENDS+=             tex-epsf-[0-9]*:../../print/tex-epsf
-BUILD_DEPENDS+=             tex-boxedminipage-[0-9]*:../../print/tex-boxedminipage
+BUILD_DEPENDS+=	tex-epsf-[0-9]*:../../print/tex-epsf
+BUILD_DEPENDS+=	tex-boxedminipage-[0-9]*:../../print/tex-boxedminipage
 
 .include "../../lang/cdl3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/agfl/PLIST b/agfl/PLIST
index b0be9d953d..f7dfb73a94 100644
--- a/agfl/PLIST
+++ b/agfl/PLIST
@@ -30,7 +30,6 @@ bin/tripcover.pl
 bin/unnest
 bin/untype
 bin/variant.pl
-share/doc/agfl/agfl-manual-3.2.ps
 include/abase_debug.h
 include/abase_dstring.h
 include/abase_error.h
@@ -61,3 +60,4 @@ man/man1/agfl.1
 man/man1/agflintro.1
 share/agfl/abbrev.txt
 share/agfl/latin1-translate.dat
+share/doc/agfl/agfl-manual-3.2.ps
diff --git a/agile/Makefile b/agile/Makefile
index 51afbe13a0..ed1a2485bb 100644
--- a/agile/Makefile
+++ b/agile/Makefile
@@ -17,8 +17,8 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	bash:run
 USE_LANGUAGES=	c c++ fortran
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.agile
-PKG_SUPPORTED_OPTIONS=          pyext
+PKG_OPTIONS_VAR=		PKG_OPTIONS.agile
+PKG_SUPPORTED_OPTIONS=		pyext
 #PKG_SUGGESTED_OPTIONS=      pyext
 
 .include "../../mk/bsd.options.mk"
diff --git a/alsa-lib-git/buildlink3.mk b/alsa-lib-git/buildlink3.mk
index 4a15421312..9c177a8f43 100644
--- a/alsa-lib-git/buildlink3.mk
+++ b/alsa-lib-git/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	alsa-lib
 ALSA_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.alsa-lib+=	alsa-lib>=1.0.18
-BUILDLINK_PKGSRCDIR.alsa-lib?=	../../audio/alsa-lib
+BUILDLINK_PKGSRCDIR.alsa-lib?=		../../audio/alsa-lib
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/alsa-lib-git/builtin.mk b/alsa-lib-git/builtin.mk
index 96d3196cda..090f10822f 100644
--- a/alsa-lib-git/builtin.mk
+++ b/alsa-lib-git/builtin.mk
@@ -12,12 +12,12 @@ PKGCONFIG_BASE.alsa-lib=	/usr
 ### solely to determine whether a built-in implementation exists.
 ###
 
-CHECK_BUILTIN.alsa-lib?=      no
+CHECK_BUILTIN.alsa-lib?=	no
 .if !empty(CHECK_BUILTIN.alsa-lib:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.alsa-lib:M[yY][eE][sS])
-BUILDLINK_PREFIX.alsa-lib=    /usr
-BUILDLINK_FILES.alsa-lib+=    lib/pkgconfig/alsa.pc
+BUILDLINK_PREFIX.alsa-lib=	/usr
+BUILDLINK_FILES.alsa-lib+=	lib/pkgconfig/alsa.pc
 .  endif
 
 .endif  # CHECK_BUILTIN.alsa-lib
diff --git a/am-utils-git/Makefile b/am-utils-git/Makefile
index aee414da7f..6808992ff9 100644
--- a/am-utils-git/Makefile
+++ b/am-utils-git/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.am-utils.org/
 COMMENT=		Berkeley automounter suite of utilities
 LICENSE=		original-bsd
 
-GIT_REPOSITORIES=       am-utils
+GIT_REPOSITORIES=	am-utils
 GIT_REPO.am-utils=	git://git.fsl.cs.sunysb.edu/am-utils-6.2.git
 GIT_MODULE.am-utils=	am-utils-6.2
 
diff --git a/analizo/Makefile b/analizo/Makefile
index d5d4658e13..aa6830aec7 100644
--- a/analizo/Makefile
+++ b/analizo/Makefile
@@ -23,7 +23,7 @@ DEPENDS+=	p5-YAML>=0.72:../../textproc/p5-YAML
 WRKSRC=		${WRKDIR}/analizo
 
 #PERL5_PACKLIST=	auto/analizo_1.16.0/
-USE_TOOLS+= perl
+USE_TOOLS+=	perl
 USE_LANGUAGES=	c c++
 
 REPLACE_PERL+=	Makefile.PL analizo lib/Analizo/scripts/analizo-metrics 	\
diff --git a/android-tools-adb8/Makefile b/android-tools-adb8/Makefile
index cc96bf5307..6a521479c0 100644
--- a/android-tools-adb8/Makefile
+++ b/android-tools-adb8/Makefile
@@ -20,7 +20,7 @@ USE_LANGUAGES=	c gnu++14
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.boringssl}/bssl/include
 CPPFLAGS+=	-L${BUILDLINK_PREFIX.boringssl}/bssl
 
-CFLAGS=-DADB_REVISION=${PKGNAME_NOREV}
+CFLAGS=	-DADB_REVISION=${PKGNAME_NOREV}
 
 INSTALLATION_DIRS+=	bin
 
diff --git a/angelscript/Makefile b/angelscript/Makefile
index b7330362fb..e3174c4dbc 100644
--- a/angelscript/Makefile
+++ b/angelscript/Makefile
@@ -19,11 +19,11 @@ NO_CONFIGURE=	yes
 AUTO_MKDIRS=	yes
 
 REAL_SOURCE_DIR=	${WRKSRC}/angelscript/projects/gnuc
-BUILD_DIRS+=	${REAL_SOURCE_DIR}
-INSTALL_DIRS+=	${REAL_SOURCE_DIR}
+BUILD_DIRS+=		${REAL_SOURCE_DIR}
+INSTALL_DIRS+=		${REAL_SOURCE_DIR}
 
 INSTALL_MAKE_FLAGS+=	PREFIX=${LOCALBASE}
 INSTALL_MAKE_FLAGS+=	DESTDIR=${DESTDIR}
-INSTALL_TARGET=	install install_shared
+INSTALL_TARGET=		install install_shared
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/angelscript/PLIST b/angelscript/PLIST
index 459640d675..89d1b20e7f 100644
--- a/angelscript/PLIST
+++ b/angelscript/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
+include/angelscript.h
 lib/libangelscript.a
 lib/libangelscript_s-2.30.2.so
 lib/libangelscript_s.so
 lib/libangelscript_s.so.2.30.2
-include/angelscript.h
diff --git a/ansible/Makefile b/ansible/Makefile
index 92752b1a92..a03ee3633d 100644
--- a/ansible/Makefile
+++ b/ansible/Makefile
@@ -58,59 +58,59 @@ SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},"
 SUBST_SED.prefix+=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
 SUBST_SED.prefix+=	-e "s,@PYSITELIB@,${PYSITELIB},"
 
-SUBST_CLASSES+=		subprocess
-SUBST_STAGE.subprocess=	pre-configure
-SUBST_FILES.subprocess+= contrib/inventory/fleet.py
-SUBST_FILES.subprocess+= contrib/inventory/spacewalk.py
-SUBST_FILES.subprocess+= contrib/inventory/vagrant.py
-SUBST_FILES.subprocess+= lib/ansible/cli/__init__.py
-SUBST_FILES.subprocess+= lib/ansible/cli/config.py
-SUBST_FILES.subprocess+= lib/ansible/executor/module_common.py
-SUBST_FILES.subprocess+= lib/ansible/module_utils/basic.py
-SUBST_FILES.subprocess+= lib/ansible/module_utils/service.py
-SUBST_FILES.subprocess+= lib/ansible/modules/cloud/lxc/lxc_container.py
-SUBST_FILES.subprocess+= lib/ansible/modules/crypto/openssl_certificate.py
-SUBST_FILES.subprocess+= lib/ansible/modules/database/mysql/mysql_db.py
-SUBST_FILES.subprocess+= lib/ansible/modules/system/alternatives.py
-SUBST_FILES.subprocess+= lib/ansible/modules/system/service.py
-SUBST_FILES.subprocess+= lib/ansible/modules/utilities/logic/async_wrapper.py
-SUBST_FILES.subprocess+= lib/ansible/parsing/vault/__init__.py
-SUBST_FILES.subprocess+= lib/ansible/playbook/role/requirement.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/callback/osx_say.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/buildah.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/chroot.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/docker.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/iocage.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/jail.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/libvirt_lxc.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/local.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/persistent.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/saltstack.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/ssh.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/winrm.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/connection/zone.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/inventory/script.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/lookup/cyberarkpassword.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/lookup/lines.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/lookup/passwordstore.py
-SUBST_FILES.subprocess+= lib/ansible/plugins/lookup/pipe.py
-SUBST_FILES.subprocess+= lib/ansible/utils/cmd_functions.py
-SUBST_FILES.subprocess+= lib/ansible/utils/display.py
-SUBST_FILES.subprocess+= lib/ansible/utils/ssh_functions.py
-SUBST_FILES.subprocess+= test/runner/import/lib/ansible/module_utils/basic.py
-SUBST_FILES.subprocess+= test/runner/import/lib/ansible/module_utils/service.py
-SUBST_FILES.subprocess+= test/runner/lib/util.py
-SUBST_FILES.subprocess+= test/runner/units/test_diff.py
-SUBST_FILES.subprocess+= test/sanity/code-smell/ansible-var-precedence-check.py
-SUBST_FILES.subprocess+= test/sanity/validate-modules/main.py
-SUBST_FILES.subprocess+= test/utils/docker/vcenter-simulator/flask_control.py
+SUBST_CLASSES+=			subprocess
+SUBST_STAGE.subprocess=		pre-configure
+SUBST_FILES.subprocess+=	contrib/inventory/fleet.py
+SUBST_FILES.subprocess+=	contrib/inventory/spacewalk.py
+SUBST_FILES.subprocess+=	contrib/inventory/vagrant.py
+SUBST_FILES.subprocess+=	lib/ansible/cli/__init__.py
+SUBST_FILES.subprocess+=	lib/ansible/cli/config.py
+SUBST_FILES.subprocess+=	lib/ansible/executor/module_common.py
+SUBST_FILES.subprocess+=	lib/ansible/module_utils/basic.py
+SUBST_FILES.subprocess+=	lib/ansible/module_utils/service.py
+SUBST_FILES.subprocess+=	lib/ansible/modules/cloud/lxc/lxc_container.py
+SUBST_FILES.subprocess+=	lib/ansible/modules/crypto/openssl_certificate.py
+SUBST_FILES.subprocess+=	lib/ansible/modules/database/mysql/mysql_db.py
+SUBST_FILES.subprocess+=	lib/ansible/modules/system/alternatives.py
+SUBST_FILES.subprocess+=	lib/ansible/modules/system/service.py
+SUBST_FILES.subprocess+=	lib/ansible/modules/utilities/logic/async_wrapper.py
+SUBST_FILES.subprocess+=	lib/ansible/parsing/vault/__init__.py
+SUBST_FILES.subprocess+=	lib/ansible/playbook/role/requirement.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/callback/osx_say.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/buildah.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/chroot.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/docker.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/iocage.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/jail.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/libvirt_lxc.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/local.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/persistent.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/saltstack.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/ssh.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/winrm.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/connection/zone.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/inventory/script.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/lookup/cyberarkpassword.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/lookup/lines.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/lookup/passwordstore.py
+SUBST_FILES.subprocess+=	lib/ansible/plugins/lookup/pipe.py
+SUBST_FILES.subprocess+=	lib/ansible/utils/cmd_functions.py
+SUBST_FILES.subprocess+=	lib/ansible/utils/display.py
+SUBST_FILES.subprocess+=	lib/ansible/utils/ssh_functions.py
+SUBST_FILES.subprocess+=	test/runner/import/lib/ansible/module_utils/basic.py
+SUBST_FILES.subprocess+=	test/runner/import/lib/ansible/module_utils/service.py
+SUBST_FILES.subprocess+=	test/runner/lib/util.py
+SUBST_FILES.subprocess+=	test/runner/units/test_diff.py
+SUBST_FILES.subprocess+=	test/sanity/code-smell/ansible-var-precedence-check.py
+SUBST_FILES.subprocess+=	test/sanity/validate-modules/main.py
+SUBST_FILES.subprocess+=	test/utils/docker/vcenter-simulator/flask_control.py
 SUBST_MESSAGE.subprocess=	Fix subprocess to subprocess32 import
-SUBST_SED.subprocess=	-e "/^import subprocess/{i\\$(.newline)import os, sys$(.newline)i\\$(.newline)if os.name == 'posix' and sys.version_info[0] < 3:$(.newline)i\\$(.newline)\\    import subprocess32 as subprocess$(.newline)i\\$(.newline)else:$(.newline)i\\$(.newline)\\    import subprocess$(.newline)d$(.newline)}"
+SUBST_SED.subprocess=		-e "/^import subprocess/{i\\$(.newline)import os, sys$(.newline)i\\$(.newline)if os.name == 'posix' and sys.version_info[0] < 3:$(.newline)i\\$(.newline)\\    import subprocess32 as subprocess$(.newline)i\\$(.newline)else:$(.newline)i\\$(.newline)\\    import subprocess$(.newline)d$(.newline)}"
 
 PY_DIRS=	lib/ansible
 PY_DIRS+=	contrib/inventory
 
-REPLACE_PYTHON= `find ${PY_DIRS} -name \*.py`
+REPLACE_PYTHON=	`find ${PY_DIRS} -name \*.py`
 
 MANPAGES=	ansible-doc.1 ansible-pull.1 ansible-galaxy.1 ansible-vault.1
 MANPAGES+=	ansible-playbook.1 ansible.1
diff --git a/anthy-dic-jis34/Makefile b/anthy-dic-jis34/Makefile
index 6f9b66e29c..e49fa0aeed 100644
--- a/anthy-dic-jis34/Makefile
+++ b/anthy-dic-jis34/Makefile
@@ -14,9 +14,9 @@ BUILD_DEFS+=	ANTHYDIC_DIR
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-ANTHYDIC_DIR=	${PREFIX}/share/${PKGBASE}
+ANTHYDIC_DIR=		${PREFIX}/share/${PKGBASE}
 INSTALLATION_DIRS=	share/${PKGBASE}
-AUTO_MKDIRS=	YES
+AUTO_MKDIRS=		YES
 
 INSTALL_FILES=	README COPYING jis3_4.t ChangeLog
 
diff --git a/antlr/PLIST b/antlr/PLIST
index 63d4200846..195825e514 100644
--- a/antlr/PLIST
+++ b/antlr/PLIST
@@ -2,9 +2,9 @@
 bin/antlr
 include/antlr/ANTLRException.hpp
 include/antlr/ANTLRUtil.hpp
+include/antlr/AST.hpp
 include/antlr/ASTArray.hpp
 include/antlr/ASTFactory.hpp
-include/antlr/AST.hpp
 include/antlr/ASTNULLType.hpp
 include/antlr/ASTPair.hpp
 include/antlr/ASTRefCount.hpp
@@ -20,11 +20,10 @@ include/antlr/CommonAST.hpp
 include/antlr/CommonASTWithHiddenTokens.hpp
 include/antlr/CommonHiddenStreamToken.hpp
 include/antlr/CommonToken.hpp
-include/antlr/config.hpp
-include/antlr/InputBuffer.hpp
 include/antlr/IOException.hpp
-include/antlr/LexerSharedInputState.hpp
+include/antlr/InputBuffer.hpp
 include/antlr/LLkParser.hpp
+include/antlr/LexerSharedInputState.hpp
 include/antlr/MismatchedCharException.hpp
 include/antlr/MismatchedTokenException.hpp
 include/antlr/NoViableAltException.hpp
@@ -35,13 +34,13 @@ include/antlr/RecognitionException.hpp
 include/antlr/RefCount.hpp
 include/antlr/SemanticException.hpp
 include/antlr/String.hpp
-include/antlr/TokenBuffer.hpp
 include/antlr/Token.hpp
+include/antlr/TokenBuffer.hpp
 include/antlr/TokenRefCount.hpp
+include/antlr/TokenStream.hpp
 include/antlr/TokenStreamBasicFilter.hpp
 include/antlr/TokenStreamException.hpp
 include/antlr/TokenStreamHiddenTokenFilter.hpp
-include/antlr/TokenStream.hpp
 include/antlr/TokenStreamIOException.hpp
 include/antlr/TokenStreamRecognitionException.hpp
 include/antlr/TokenStreamRetryException.hpp
@@ -50,6 +49,7 @@ include/antlr/TokenStreamSelector.hpp
 include/antlr/TokenWithIndex.hpp
 include/antlr/TreeParser.hpp
 include/antlr/TreeParserSharedInputState.hpp
+include/antlr/config.hpp
 lib/libantlr.a
 share/doc/antlr/ANTLRException.gif
 share/doc/antlr/closure.gif
@@ -73,8 +73,8 @@ share/doc/antlr/runtime.html
 share/doc/antlr/sor.html
 share/doc/antlr/stream.perspectives.gif
 share/doc/antlr/stream.selector.gif
-share/doc/antlr/streams.html
 share/doc/antlr/stream.splitter.gif
+share/doc/antlr/streams.html
 share/doc/antlr/subrule.gif
 share/doc/antlr/trees.html
 share/doc/antlr/vocab.html
diff --git a/antlr3-c/Makefile b/antlr3-c/Makefile
index 726055a5c5..d67f0f9d28 100644
--- a/antlr3-c/Makefile
+++ b/antlr3-c/Makefile
@@ -17,6 +17,6 @@ USE_TOOLS+=	gmake
 
 # Would enable -m32 on a 64 bit system if it does get the compiler
 # version wrong.
-CONFIGURE_ARGS += --disable-abiflags
+CONFIGURE_ARGS +=	--disable-abiflags
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/antlr3-c/buildlink3.mk b/antlr3-c/buildlink3.mk
index 9dcca4bb9d..a6deeb5339 100644
--- a/antlr3-c/buildlink3.mk
+++ b/antlr3-c/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	antlr3-c
 ANTLR3_C_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.antlr3-c+=	antlr3-c>=3.4
-BUILDLINK_PKGSRCDIR.antlr3-c?=	../../wip/antlr3-c
+BUILDLINK_PKGSRCDIR.antlr3-c?=		../../wip/antlr3-c
 .endif	# ANTLR3_C_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-antlr3-c
diff --git a/aoeui/Makefile b/aoeui/Makefile
index 6578a8978f..a4c03bf118 100644
--- a/aoeui/Makefile
+++ b/aoeui/Makefile
@@ -13,6 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	m4
 
-BUILD_TARGET= default
+BUILD_TARGET=	default
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/aokell/Makefile b/aokell/Makefile
index a88fa2e315..36a008db85 100644
--- a/aokell/Makefile
+++ b/aokell/Makefile
@@ -17,8 +17,8 @@ WRKSRC=		${WRKDIR}/AOKell-2.0
 NO_BUILD=	yes
 USE_TOOLS+=	pax
 
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
-USE_JAVA2= yes
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+USE_JAVA2=		yes
 
 INSTALLATION_DIRS=	share/doc/aokell lib/java/aokell
 
diff --git a/aols-postgres/Makefile b/aols-postgres/Makefile
index be0d9ba898..153ec73856 100644
--- a/aols-postgres/Makefile
+++ b/aols-postgres/Makefile
@@ -15,7 +15,7 @@ MAKE_FLAGS+=	POSTGRES=${PREFIX:Q} INST=/${PREFIX:Q}/include/nsd \
 		TCL_CC=gcc
 CFLAGS+=	-I/usr/pkg/include/nsd/include
 
-USE_TOOLS+=         gmake
+USE_TOOLS+=	gmake
 
 .include "../../wip/aolserver4/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff --git a/aolserver4/Makefile b/aolserver4/Makefile
index c514c564be..45a6a79e28 100644
--- a/aolserver4/Makefile
+++ b/aolserver4/Makefile
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-PTHREAD_OPTS+=	require
+PTHREAD_OPTS+=		require
 
 NSD_LOGDIR=		${VARBASE}/log/nsd
 NSD_PIDDIR=		${VARBASE}/run/nsd
diff --git a/apache-commons-beanutils/Makefile b/apache-commons-beanutils/Makefile
index d07b3816fd..d9186edf6b 100644
--- a/apache-commons-beanutils/Makefile
+++ b/apache-commons-beanutils/Makefile
@@ -13,12 +13,12 @@ LICENSE=	apache-2.0
 
 WRKSRC=		${WRKDIR}/commons-beanutils-1.8.3
 
-NO_BUILD=		yes
+NO_BUILD=	yes
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
-USE_JAVA=	yes
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15 sun-jdk14
+USE_JAVA=		yes
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-beanutils
 
diff --git a/apache-commons-codec/Makefile b/apache-commons-codec/Makefile
index 9ca2731b1c..9e4e8ac409 100644
--- a/apache-commons-codec/Makefile
+++ b/apache-commons-codec/Makefile
@@ -17,8 +17,8 @@ NO_BUILD=	yes
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
-USE_JAVA=	yes
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
+USE_JAVA=		yes
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-codec
 
diff --git a/apache-commons-configuration/Makefile b/apache-commons-configuration/Makefile
index daed26ea7c..0a482c0101 100644
--- a/apache-commons-configuration/Makefile
+++ b/apache-commons-configuration/Makefile
@@ -22,8 +22,8 @@ NO_BUILD=	yes
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
-USE_JAVA=	yes
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15 sun-jdk14
+USE_JAVA=		yes
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-configuration
 
diff --git a/apache-commons-dbcp/Makefile b/apache-commons-dbcp/Makefile
index 54205e10cf..36bf24610c 100644
--- a/apache-commons-dbcp/Makefile
+++ b/apache-commons-dbcp/Makefile
@@ -20,9 +20,9 @@ WRKSRC=		${WRKDIR}/commons-dbcp-1.4
 NO_BUILD=	yes
 USE_TOOLS+=	pax
 
-USE_JAVA=	yes
-USE_JAVA2=	yes
-PKG_JVMS_ACCEPTED= sun-jdk6
+USE_JAVA=		yes
+USE_JAVA2=		yes
+PKG_JVMS_ACCEPTED=	sun-jdk6
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-dbcp
 
diff --git a/apache-commons-digester/Makefile b/apache-commons-digester/Makefile
index f0cede65f2..c32b6c5b81 100644
--- a/apache-commons-digester/Makefile
+++ b/apache-commons-digester/Makefile
@@ -20,8 +20,8 @@ NO_BUILD=	yes
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
-USE_JAVA=	yes
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
+USE_JAVA=		yes
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-digester
 
diff --git a/apache-commons-lang/Makefile b/apache-commons-lang/Makefile
index 3dabe135b1..a7e714f34a 100644
--- a/apache-commons-lang/Makefile
+++ b/apache-commons-lang/Makefile
@@ -16,8 +16,8 @@ WRKSRC=		${WRKDIR}/commons-lang-2.5
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
-USE_JAVA=	yes
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15 sun-jdk14
+USE_JAVA=		yes
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
 
 INSTALLATION_DIRS=	lib/java
 
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 0764e0c119..868a797e41 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -36,7 +36,7 @@ MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	${MAKE_FLAGS.${EMACS_FLAVOR}}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=emacs21 emacs21nox emacs20 emacs25 emacs26 emacs27
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 emacs25 emacs26 emacs27
 
 BUILD_TARGET.emacs=	elc
 BUILD_TARGET.xemacs=	package
diff --git a/apinger/Makefile b/apinger/Makefile
index d508528a48..bb9c935428 100644
--- a/apinger/Makefile
+++ b/apinger/Makefile
@@ -10,7 +10,7 @@ COMMENT=	IP/icmp based device monitoring tool
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=     gmake
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/apstget/Makefile b/apstget/Makefile
index 784b48c402..c5ac33d33b 100644
--- a/apstget/Makefile
+++ b/apstget/Makefile
@@ -25,7 +25,7 @@ INSTALLATION_DIRS+=	bin libexec share/examples/apstget
 
 # AWK compatibilty stuff
 .if ${OPSYS} != "Linux"
-SUBST_SED.etc= -e "s,-W interactive,,"
+SUBST_SED.etc=	-e "s,-W interactive,,"
 .endif
 
 SUBST_CLASSES+=		etc
diff --git a/ar7/Makefile b/ar7/Makefile
index ceee5a12a2..5c915bce1c 100644
--- a/ar7/Makefile
+++ b/ar7/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	${MASTER_SITES}
 COMMENT=	Diagnosis tool for certain ADSL modems
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 INSTALLATION_DIRS=	bin
 
 USE_FEATURES+=	getopt_long
diff --git a/arabeyes-qr-ttf/Makefile b/arabeyes-qr-ttf/Makefile
index 97ae974cdd..b32e6892b5 100644
--- a/arabeyes-qr-ttf/Makefile
+++ b/arabeyes-qr-ttf/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/11/12 15:59:46 othyro Exp $
 #
 
-VERS=	 	20051229
+VERS=		20051229
 DISTNAME=	arabeyes-qr.ttf
 PKGNAME=	arabeyes-qr-ttf-${VERS}
 CATEGORIES=	fonts
@@ -12,11 +12,11 @@ MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://garr.dl.sourceforge.net/project/arabeyes/Quran/Fonts/
 COMMENT=	Fonts to be used to display the Qur\'an text
 
-WRKSRC=	${WRKDIR}
+WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 
 NO_BUILD=	yes
-FONTS_DIRS.ttf=		lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	lib/X11/fonts/TTF
 
 INSTALLATION_DIRS+=	${FONTS_DIRS.ttf}
 
diff --git a/arachne-pnr-git/Makefile b/arachne-pnr-git/Makefile
index 9f1be44f4a..7835afa425 100644
--- a/arachne-pnr-git/Makefile
+++ b/arachne-pnr-git/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	arachne-pnr-e97e35c
 CATEGORIES=	cross
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cseed/}
-GITHUB_TAG= 	e97e35c3de200083b1f420d314df166326fc48e8
+GITHUB_TAG=	e97e35c3de200083b1f420d314df166326fc48e8
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/cseed/
@@ -11,13 +11,13 @@ COMMENT=	Place and route tool for FPGAs
 LICENSE=	mit
 
 USE_LANGUAGES+=		c++
-USE_TOOLS+= 		gmake
-LIBS+= 			-lm
-DEPENDS+= 		icestorm-[0-9]*:../../wip/icestorm-git
+USE_TOOLS+=		gmake
+LIBS+=			-lm
+DEPENDS+=		icestorm-[0-9]*:../../wip/icestorm-git
 
 WRKSRC=			${WRKDIR}/arachne-pnr-${GITHUB_TAG}
 MAKE_ENV+=		ICEBOX=${PREFIX}/share/icebox
 MAKE_ENV+=		DESTDIR=${DESTDIR}
-MAKE_ENV+= 		PREFIX=${PREFIX}
+MAKE_ENV+=		PREFIX=${PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/argouml/Makefile b/argouml/Makefile
index ac989995ad..f5be5f2263 100644
--- a/argouml/Makefile
+++ b/argouml/Makefile
@@ -15,8 +15,8 @@ COMMENT=	UML design tool environment with cognitive support
 DEPENDS+=	xerces-j>=1.2.0:../../textproc/xerces-j
 DEPENDS+=	jakarta-log4j-1.3a>=8:../../wip/jakarta-log4j
 
-USE_JAVA=		run
-NO_BUILD=		yes
+USE_JAVA=	run
+NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 do-configure:
diff --git a/argtable2/Makefile b/argtable2/Makefile
index b5db9317f9..3710b460ff 100644
--- a/argtable2/Makefile
+++ b/argtable2/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 USE_CMAKE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES= c c++
+USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	argtable2.pc.in
 
diff --git a/argtable2/buildlink3.mk b/argtable2/buildlink3.mk
index b254568bb7..ed1346eed4 100644
--- a/argtable2/buildlink3.mk
+++ b/argtable2/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	argtable2
 ARGTABLE2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.argtable2+=	argtable2>=2.13
-BUILDLINK_PKGSRCDIR.argtable2?=	../../wip/argtable2
+BUILDLINK_PKGSRCDIR.argtable2?=		../../wip/argtable2
 .endif	# ARGTABLE2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-argtable2
diff --git a/ariamaestosa/PLIST b/ariamaestosa/PLIST
index 5b43c0530e..b548451498 100644
--- a/ariamaestosa/PLIST
+++ b/ariamaestosa/PLIST
@@ -1,6 +1,5 @@
 @comment $NetBSD: PLIST,v 1.2 2012/10/31 12:55:39 othyro Exp $
 bin/Aria
-share/applications/Aria.desktop
 share/Aria/Documentation/aria120.png
 share/Aria/Documentation/bg.jpg
 share/Aria/Documentation/building.html
@@ -127,6 +126,7 @@ share/Aria/volume_low.png
 share/Aria/volume_medium.png
 share/Aria/white_border.png
 share/Aria/white_corner.png
+share/applications/Aria.desktop
 share/locale/de/LC_MESSAGES/aria_maestosa.mo
 share/locale/es/LC_MESSAGES/aria_maestosa.mo
 share/locale/fr/LC_MESSAGES/aria_maestosa.mo
diff --git a/arista/Makefile b/arista/Makefile
index 82da93b6d5..9d7ef3b309 100644
--- a/arista/Makefile
+++ b/arista/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	gst-plugins0.10-x264-[0-9]*:../../multimedia/gst-plugins0.10-x264
 DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=	intltool msgfmt
+USE_TOOLS+=		intltool msgfmt
 USE_LANGUAGES=		# none
 
 PYDISTUTILSPKG=		yes
diff --git a/arm-eabi-gcc5/Makefile b/arm-eabi-gcc5/Makefile
index aff658e167..5001afb585 100644
--- a/arm-eabi-gcc5/Makefile
+++ b/arm-eabi-gcc5/Makefile
@@ -4,8 +4,8 @@ DISTNAME=		gcc-5.2.0
 PKGNAME=		cross-arm-eabi-${DISTNAME}
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-5.2.0/}
-NEWLIBVER=              2.2.0
-SITES.newlib-${NEWLIBVER}.tar.gz=ftp://sources.redhat.com/pub/newlib/
+NEWLIBVER=		2.2.0
+SITES.newlib-${NEWLIBVER}.tar.gz= ftp://sources.redhat.com/pub/newlib/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			newlib-${NEWLIBVER}.tar.gz
 
@@ -17,7 +17,7 @@ EXTRACT_SUFX=		.tar.bz2
 # for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549
 # use makeinfo from pkgsrc/devel/gtexinfo.
 TOOL_DEPENDS+=		gtexinfo>=5.1:../../devel/gtexinfo
-_TOOLS_USE_PKGSRC.makeinfo=yes
+_TOOLS_USE_PKGSRC.makeinfo= yes
 
 DEPENDS+=	cross-arm-eabi-binutils-[0-9]*:../../wip/arm-eabi-binutils
 
diff --git a/arm-elf-gcc47/Makefile b/arm-elf-gcc47/Makefile
index 44ffd10aa5..7da5bf3c19 100644
--- a/arm-elf-gcc47/Makefile
+++ b/arm-elf-gcc47/Makefile
@@ -4,8 +4,8 @@ DISTNAME=		gcc-4.7.4
 PKGNAME=		cross-arm-elf-${DISTNAME}
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-4.9.3/}
-NEWLIBVER=              2.2.0
-SITES.newlib-${NEWLIBVER}.tar.gz=ftp://sources.redhat.com/pub/newlib/
+NEWLIBVER=		2.2.0
+SITES.newlib-${NEWLIBVER}.tar.gz= ftp://sources.redhat.com/pub/newlib/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			newlib-${NEWLIBVER}.tar.gz
 
@@ -17,7 +17,7 @@ EXTRACT_SUFX=		.tar.bz2
 # for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549
 # use makeinfo from pkgsrc/devel/gtexinfo.
 TOOL_DEPENDS+=		gtexinfo>=5.1:../../devel/gtexinfo
-_TOOLS_USE_PKGSRC.makeinfo=yes
+_TOOLS_USE_PKGSRC.makeinfo= yes
 
 DEPENDS+=	cross-arm-elf-binutils-[0-9]*:../../wip/arm-elf-binutils
 
diff --git a/armadillo/Makefile b/armadillo/Makefile
index 6b379fb7b8..7847e7d4e3 100644
--- a/armadillo/Makefile
+++ b/armadillo/Makefile
@@ -3,14 +3,14 @@
 DISTNAME=	armadillo-4.${DIST_MINOR}.2
 PKGNAME=	armadillo-4.${PKG_MINOR}.2
 CATEGORIES=	math
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=arma/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=arma/}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	http://sourceforge.net/projects/arma/
 COMMENT=	C++ linear algebra library
 LICENSE=	mpl-2.0
 
-USE_LANGUAGES+= c c++
+USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 
 # OS X cannot handle components > 255 in a library version, so strip
diff --git a/armadillo/buildlink3.mk b/armadillo/buildlink3.mk
index b287c02963..b41bb8b47a 100644
--- a/armadillo/buildlink3.mk
+++ b/armadillo/buildlink3.mk
@@ -7,7 +7,7 @@ ARMADILLO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.armadillo+=	armadillo>=4.45.2
 BUILDLINK_ABI_DEPENDS.armadillo?=	armadillo>=4.45.2
-BUILDLINK_PKGSRCDIR.armadillo?=	../../wip/armadillo
+BUILDLINK_PKGSRCDIR.armadillo?=		../../wip/armadillo
 
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
diff --git a/aslc86k/Makefile b/aslc86k/Makefile
index e0d8905e46..b6aefa5703 100644
--- a/aslc86k/Makefile
+++ b/aslc86k/Makefile
@@ -5,12 +5,12 @@ DISTNAME=	aslc86k
 CATEGORIES=	devel
 MASTER_SITES=	http://mc.pp.se/dc/files/
 
-MAINTAINER=	tr%vispaul.me@localhost
-HOMEPAGE=	http://mc.pp.se/dc/files/
-COMMENT=	Macro assembler that can assemble programs of the Visual Memory System
-LICENSE=	mit
-WRKSRC=		${WRKDIR}/as
-USE_TOOLS+=	gmake
+MAINTAINER=		tr%vispaul.me@localhost
+HOMEPAGE=		http://mc.pp.se/dc/files/
+COMMENT=		Macro assembler that can assemble programs of the Visual Memory System
+LICENSE=		mit
+WRKSRC=			${WRKDIR}/as
+USE_TOOLS+=		gmake
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/aspell-dictionaries/options.mk b/aspell-dictionaries/options.mk
index 94a38834cd..7a0a4e6c42 100644
--- a/aspell-dictionaries/options.mk
+++ b/aspell-dictionaries/options.mk
@@ -2,9 +2,9 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.aspell-dictionaries
 PKG_SUPPORTED_OPTIONS=	lang-br lang-ca lang-cs lang-cy lang-da lang-de lang-el
-PKG_SUPPORTED_OPTIONS+= lang-en lang-eo lang-es lang-fi lang-fo lang-fr lang-ga
-PKG_SUPPORTED_OPTIONS+= lang-it lang-nb lang-nl lang-pl lang-pt lang-ro lang-ru
-PKG_SUPPORTED_OPTIONS+= lang-sk lang-sv lang-te lang-uk
+PKG_SUPPORTED_OPTIONS+=	lang-en lang-eo lang-es lang-fi lang-fo lang-fr lang-ga
+PKG_SUPPORTED_OPTIONS+=	lang-it lang-nb lang-nl lang-pl lang-pt lang-ro lang-ru
+PKG_SUPPORTED_OPTIONS+=	lang-sk lang-sv lang-te lang-uk
 PKG_SUGGESTED_OPTIONS=	${PKG_SUPPORTED_OPTIONS}
 
 .include "../../mk/bsd.options.mk"
diff --git a/asql/Makefile b/asql/Makefile
index 1bb0531128..cdd1a30fdf 100644
--- a/asql/Makefile
+++ b/asql/Makefile
@@ -9,15 +9,15 @@ HOMEPAGE=	http://www.steve.org.uk/Software/asql/
 COMMENT=	Query Apache logfiles via SQL
 LICENSE=	gnu-gpl-v2 OR artistic
 
-VERSION=	1.7
-USE_TOOLS+=	perl:run tar:build
-NO_BUILD=	yes
-DEPENDS+=	p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
-DEPENDS+=	p5-Term-ReadLine-Perl-[0-9]*:../../devel/p5-Term-ReadLine-Perl
-DOCDIR=		${PREFIX}/share/doc/asql
+VERSION=		1.7
+USE_TOOLS+=		perl:run tar:build
+NO_BUILD=		yes
+DEPENDS+=		p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
+DEPENDS+=		p5-Term-ReadLine-Perl-[0-9]*:../../devel/p5-Term-ReadLine-Perl
+DOCDIR=			${PREFIX}/share/doc/asql
 INSTALLATION_DIRS+=	bin ${DOCDIR}
-AUTO_MKDIRS=	yes
-WRKSRC=		${WRKDIR}/asql-${VERSION}
+AUTO_MKDIRS=		yes
+WRKSRC=			${WRKDIR}/asql-${VERSION}
 
 REPLACE_PERL+=	bin/asql
 REPLACE_PERL+=	bin/make-cmds
diff --git a/asterisk11-vicidial/Makefile b/asterisk11-vicidial/Makefile
index 6c2f0741e3..489e1b0b5d 100644
--- a/asterisk11-vicidial/Makefile
+++ b/asterisk11-vicidial/Makefile
@@ -7,7 +7,7 @@
 DISTNAME=	asterisk-11.22.0-vici
 PKGNAME=	asterisk-11.22.0
 CATEGORIES=	comms net audio
-MASTER_SITES=   http://download.vicidial.com/required-apps/
+MASTER_SITES=	http://download.vicidial.com/required-apps/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/sounds/releases/
@@ -19,7 +19,7 @@ OWNER=		alberto.m%futurelinkcorporation.com@localhost
 HOMEPAGE=	http://www.asterisk.org/
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=         ${WRKDIR}/asterisk-11.22.0
+WRKSRC=		${WRKDIR}/asterisk-11.22.0
 
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
diff --git a/atlas/Makefile b/atlas/Makefile
index 0834aa7cdd..e505b31a1a 100644
--- a/atlas/Makefile
+++ b/atlas/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	-Ss flapack ${PREFIX}/lib/liblapack.a
 # atlas requires distfiles from lapack
 #.include "../../math/lapack/Makefile.version"
 #CONFIGURE_ARGS+=	--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACK_NAME}-${LAPACK_VERSION}${LAPACK_SUFX}
-CONFIGURE_ARGS+=       --with-netlib-lapack-tarfile=${DISTDIR}/lapack-3.5.0.tgz
+CONFIGURE_ARGS+=	--with-netlib-lapack-tarfile=${DISTDIR}/lapack-3.5.0.tgz
 
 TEST_TARGET=	check
 BUILD_TARGET=	build shared ptshared
diff --git a/atompaw/Makefile b/atompaw/Makefile
index 6e81e86a1d..d164d3b7d1 100644
--- a/atompaw/Makefile
+++ b/atompaw/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Projector Augmented Wave code for electronic structure calculations
 LICENSE=	gnu-gpl-v3
 
 
-CHECK_PORTABILITY_SKIP= configure
+CHECK_PORTABILITY_SKIP=	configure
 GNU_CONFIGURE=		yes
-USE_LIBTOOL= 		yes
+USE_LIBTOOL=		yes
 USE_TOOLS+=		perl
 USE_LANGUAGES=		c fortran
 
diff --git a/audiere/Makefile b/audiere/Makefile
index 3f5ace2ded..80d6bb4aff 100644
--- a/audiere/Makefile
+++ b/audiere/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
 # XXX
-BUILDLINK_TRANSFORM+=l:ogg:ogg:ossaudio
+BUILDLINK_TRANSFORM+=	l:ogg:ogg:ossaudio
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio-mml/buildlink3.mk b/audio-mml/buildlink3.mk
index 3526ccfaca..86a352a63c 100644
--- a/audio-mml/buildlink3.mk
+++ b/audio-mml/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	audio-mml
 AUDIO_MML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.audio-mml+=	audio-mml>=4.4.01
-BUILDLINK_PKGSRCDIR.audio-mml?=	../../wip/audio-mml
+BUILDLINK_PKGSRCDIR.audio-mml?=		../../wip/audio-mml
 
 .include "../../wip/common-mml/buildlink3.mk"
 .endif # AUDIO_MML_BUILDLINK3_MK
diff --git a/audit-system/Makefile b/audit-system/Makefile
index bd3fb822c8..9ca81470b8 100644
--- a/audit-system/Makefile
+++ b/audit-system/Makefile
@@ -24,10 +24,10 @@ SYSVULNDIR=	${VARBASE}/db
 SCRIPT_DIR=	${PREFIX}/sbin
 FETCH_TOOL=	${FTP}
 
-BUILD_DEFS=	VARBASE
-CONF_FILES+=	${EGDIR}/audit-system.conf ${PKG_SYSCONFDIR}/audit-system.conf
-USE_TOOLS+=	awk cp mv ident chmod mkdir find rm echo
-MAKE_DIRS=	${SYSVULNDIR}
+BUILD_DEFS=		VARBASE
+CONF_FILES+=		${EGDIR}/audit-system.conf ${PKG_SYSCONFDIR}/audit-system.conf
+USE_TOOLS+=		awk cp mv ident chmod mkdir find rm echo
+MAKE_DIRS=		${SYSVULNDIR}
 INSTALLATION_DIRS+=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 ${EGDIR} sbin
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/audit-system/PLIST b/audit-system/PLIST
index 21a462c4f7..1bfdd5468e 100644
--- a/audit-system/PLIST
+++ b/audit-system/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD: PLIST,v 1.4 2009/10/11 10:44:28 thomasklausner Exp $
+man/man5/audit-system.conf.5
+man/man8/audit-system.8
 sbin/audit-get-ident
 sbin/audit-get-mtime
 sbin/audit-get-objdump
 sbin/audit-system
-man/man5/audit-system.conf.5
-man/man8/audit-system.8
 share/examples/audit-system/audit-system.conf
diff --git a/auto-complete-mode/Makefile b/auto-complete-mode/Makefile
index 309132b113..2d9ec7c65d 100644
--- a/auto-complete-mode/Makefile
+++ b/auto-complete-mode/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=		http://cx4a.org/software/auto-complete/index.html
 COMMENT=		The most intelligent auto-completion extension for GNU Emacs
 LICENSE=		gnu-gpl-v3
 
-MESSAGE_SUBST+=         LISPDIR=${EMACS_LISPPREFIX:Q}
+MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX:Q}
 MESSAGE_SUBST+=		PKGBASE=${PKGBASE:Q}
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/${PKGBASE}
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/${PKGBASE}/ac-dict
diff --git a/autoproject/PLIST b/autoproject/PLIST
index 4cd6ce90ef..5f6a104328 100644
--- a/autoproject/PLIST
+++ b/autoproject/PLIST
@@ -1,67 +1,67 @@
 @comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:28 thomasklausner Exp $
 bin/autoproject
 man/man1/autoproject.1
-share/autoproject/cli/c/none/Makefile.am
-share/autoproject/cli/c/none/Makefile.in
-share/autoproject/cli/c/none/configure.in
-share/autoproject/cli/c/none/program.c
-share/autoproject/cli/c/none/xmalloc.c
-share/autoproject/cli/c/none/xmalloc.h
-share/autoproject/cli/c/none/getopt.h
-share/autoproject/cli/c/none/getopt.c
-share/autoproject/cli/c/none/getopt1.c
-share/autoproject/cli/c/none/acinclude.m4
-share/autoproject/cli/c/clig/Makefile.am
-share/autoproject/cli/c/clig/Makefile.in
-share/autoproject/cli/c/clig/program.1
-share/autoproject/cli/c/clig/cmdline.cli.in
-share/autoproject/cli/c/clig/configure.in
-share/autoproject/cli/c/clig/xmalloc.c
-share/autoproject/cli/c/clig/xmalloc.h
-share/autoproject/cli/c/clig/program.c
-share/autoproject/cli/c/clig/acinclude.m4
-share/autoproject/cli/c/autogen/Makefile.am
-share/autoproject/cli/c/autogen/Makefile.in
-share/autoproject/cli/c/autogen/configure.in
-share/autoproject/cli/c/autogen/program.c
-share/autoproject/cli/c/autogen/xmalloc.c
-share/autoproject/cli/c/autogen/xmalloc.h
-share/autoproject/cli/c/autogen/checkopt.def
-share/autoproject/cli/c/autogen/acinclude.m4
+share/autoproject/all/all/all/AUTHORS
+share/autoproject/all/all/all/COPYING
+share/autoproject/all/all/all/ChangeLog
+share/autoproject/all/all/all/NEWS
+share/autoproject/all/all/all/README
+share/autoproject/all/all/all/gpl.texinfo
+share/autoproject/all/all/all/program.lsm.in
+share/autoproject/all/all/all/program.spec.in
+share/autoproject/all/c++/all/system.h
+share/autoproject/all/c/all/system.h
+share/autoproject/cli/all/argp/program.1
+share/autoproject/cli/all/argp/program.texinfo
+share/autoproject/cli/all/autogen/manpage.tpl
+share/autoproject/cli/all/autogen/program.1
+share/autoproject/cli/all/none/program.1
+share/autoproject/cli/all/none/program.texinfo
+share/autoproject/cli/c++/none/Makefile.am
+share/autoproject/cli/c++/none/Makefile.in
+share/autoproject/cli/c++/none/acinclude.m4
+share/autoproject/cli/c++/none/configure.in
+share/autoproject/cli/c++/none/getopt.c
+share/autoproject/cli/c++/none/getopt.h
+share/autoproject/cli/c++/none/getopt1.c
+share/autoproject/cli/c++/none/program.cc
+share/autoproject/cli/c++/none/xmalloc.c
+share/autoproject/cli/c++/none/xmalloc.h
 share/autoproject/cli/c/argp/Makefile.am
 share/autoproject/cli/c/argp/Makefile.in
+share/autoproject/cli/c/argp/acinclude.m4
 share/autoproject/cli/c/argp/configure.in
 share/autoproject/cli/c/argp/program.c
 share/autoproject/cli/c/argp/xmalloc.c
 share/autoproject/cli/c/argp/xmalloc.h
-share/autoproject/cli/c/argp/acinclude.m4
+share/autoproject/cli/c/autogen/Makefile.am
+share/autoproject/cli/c/autogen/Makefile.in
+share/autoproject/cli/c/autogen/acinclude.m4
+share/autoproject/cli/c/autogen/checkopt.def
+share/autoproject/cli/c/autogen/configure.in
+share/autoproject/cli/c/autogen/program.c
+share/autoproject/cli/c/autogen/xmalloc.c
+share/autoproject/cli/c/autogen/xmalloc.h
+share/autoproject/cli/c/clig/Makefile.am
+share/autoproject/cli/c/clig/Makefile.in
+share/autoproject/cli/c/clig/acinclude.m4
+share/autoproject/cli/c/clig/cmdline.cli.in
+share/autoproject/cli/c/clig/configure.in
+share/autoproject/cli/c/clig/program.1
+share/autoproject/cli/c/clig/program.c
+share/autoproject/cli/c/clig/xmalloc.c
+share/autoproject/cli/c/clig/xmalloc.h
+share/autoproject/cli/c/none/Makefile.am
+share/autoproject/cli/c/none/Makefile.in
+share/autoproject/cli/c/none/acinclude.m4
+share/autoproject/cli/c/none/configure.in
+share/autoproject/cli/c/none/getopt.c
+share/autoproject/cli/c/none/getopt.h
+share/autoproject/cli/c/none/getopt1.c
+share/autoproject/cli/c/none/program.c
+share/autoproject/cli/c/none/xmalloc.c
+share/autoproject/cli/c/none/xmalloc.h
 share/autoproject/cli/sh/none/Makefile.am
 share/autoproject/cli/sh/none/Makefile.in
 share/autoproject/cli/sh/none/configure.in
 share/autoproject/cli/sh/none/program.in
-share/autoproject/cli/all/none/program.1
-share/autoproject/cli/all/none/program.texinfo
-share/autoproject/cli/all/autogen/program.1
-share/autoproject/cli/all/autogen/manpage.tpl
-share/autoproject/cli/all/argp/program.1
-share/autoproject/cli/all/argp/program.texinfo
-share/autoproject/cli/c++/none/Makefile.am
-share/autoproject/cli/c++/none/Makefile.in
-share/autoproject/cli/c++/none/configure.in
-share/autoproject/cli/c++/none/xmalloc.c
-share/autoproject/cli/c++/none/xmalloc.h
-share/autoproject/cli/c++/none/program.cc
-share/autoproject/cli/c++/none/getopt.c
-share/autoproject/cli/c++/none/getopt.h
-share/autoproject/cli/c++/none/getopt1.c
-share/autoproject/cli/c++/none/acinclude.m4
-share/autoproject/all/all/all/AUTHORS
-share/autoproject/all/all/all/ChangeLog
-share/autoproject/all/all/all/NEWS
-share/autoproject/all/all/all/README
-share/autoproject/all/all/all/gpl.texinfo
-share/autoproject/all/all/all/program.lsm.in
-share/autoproject/all/all/all/program.spec.in
-share/autoproject/all/all/all/COPYING
-share/autoproject/all/c/all/system.h
-share/autoproject/all/c++/all/system.h
diff --git a/autopsy/Makefile b/autopsy/Makefile
index aec6c28090..707051397d 100644
--- a/autopsy/Makefile
+++ b/autopsy/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2013/09/03 17:40:00 shattered Exp $
 #
 
-VERSION=2.21
+VERSION=		2.21
 DISTNAME=		autopsy-${VERSION}
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=autopsy/}
diff --git a/autoq3d/PLIST b/autoq3d/PLIST
index aed9f4ef54..348378d50c 100644
--- a/autoq3d/PLIST
+++ b/autoq3d/PLIST
@@ -1,9 +1,5 @@
 @comment $NetBSD: PLIST,v 1.2 2012/09/26 23:15:55 othyro Exp $
 bin/autoq3d
-share/autoq3d/lan_sp.qm
-share/autoq3d/lan_sp.ts
-share/autoq3d/qref.htm
-share/autoq3d/qref_sp.htm
 share/autoq3d/images/array.png
 share/autoq3d/images/autoscale.png
 share/autoq3d/images/cascade.png
@@ -54,5 +50,9 @@ share/autoq3d/images/vtop.png
 share/autoq3d/images/vwprop.png
 share/autoq3d/images/zoomi.png
 share/autoq3d/images/zoomim.png
+share/autoq3d/lan_sp.qm
+share/autoq3d/lan_sp.ts
+share/autoq3d/qref.htm
+share/autoq3d/qref_sp.htm
 share/pixmaps/AutoQ3D.ico
 share/pixmaps/AutoQ3D.png
diff --git a/avida2/PLIST b/avida2/PLIST
index 01e3834e41..30bc54663d 100644
--- a/avida2/PLIST
+++ b/avida2/PLIST
@@ -1,4 +1,12 @@
 @comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:28 thomasklausner Exp $
+avida-2.0b1/analyze.cfg
+avida-2.0b1/environment.cfg
+avida-2.0b1/events.cfg
+avida-2.0b1/genesis
+avida-2.0b1/inst_set.default
+avida-2.0b1/organism.default
+avida-2.0b1/preset_organisms/dummy
+avida-2.0b1/primitive
 share/avida/analyze_mode.html
 share/avida/analyze_samples.html
 share/avida/code_c++_intro.html
@@ -71,11 +79,3 @@ share/avida/level_map.html
 share/avida/print_data.html
 share/avida/screen.html
 share/avida/structure.html
-avida-2.0b1/analyze.cfg
-avida-2.0b1/environment.cfg
-avida-2.0b1/events.cfg
-avida-2.0b1/genesis
-avida-2.0b1/inst_set.default
-avida-2.0b1/organism.default
-avida-2.0b1/preset_organisms/dummy
-avida-2.0b1/primitive
diff --git a/avr-binutils/PLIST b/avr-binutils/PLIST
index 5df146c973..e120022486 100644
--- a/avr-binutils/PLIST
+++ b/avr-binutils/PLIST
@@ -8,8 +8,8 @@ avr/bin/objcopy
 avr/bin/objdump
 avr/bin/ranlib
 avr/bin/strip
-avr/include/bfd.h
 avr/include/ansidecl.h
+avr/include/bfd.h
 avr/include/symcat.h
 avr/lib/ldscripts/avr1.x
 avr/lib/ldscripts/avr1.xbn
diff --git a/avr-binutils/buildlink3.mk b/avr-binutils/buildlink3.mk
index 2d133002ad..b0313b4704 100644
--- a/avr-binutils/buildlink3.mk
+++ b/avr-binutils/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	avr-binutils
 AVR_BINUTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.avr-binutils+=	avr-binutils>=2.23
-BUILDLINK_PKGSRCDIR.avr-binutils?=		../../cross/avr-binutils
+BUILDLINK_PKGSRCDIR.avr-binutils?=	../../cross/avr-binutils
 #BUILDLINK_FNAME_TRANSFORM.avr-binutils+=	-e "s,${AVR_TARGET}/lib,lib/,g"
 
 .endif # AVR_BINUTILS_BUILDLINK3_MK
diff --git a/avr-libc/Makefile b/avr-libc/Makefile
index 65a209347b..4125254ac7 100644
--- a/avr-libc/Makefile
+++ b/avr-libc/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS+=		tex-tetex-[0-9]*:../../print/tex-tetex
 
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
-USE_GNU_CONFIGURE_HOST= no
+USE_GNU_CONFIGURE_HOST=	no
 
 CONFIGURE_ARGS+=	--build=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	--host=avr
Prev by Date: wip: adjust Makefile to filesystem
Next by Date: wip/b*: fix pkglint indentation warnings
Previous by Thread: wip: adjust Makefile to filesystem
Next by Thread: wip/b*: fix pkglint indentation warnings
Indexes:
Home | Main Index | Thread Index | Old Index