wip/b*: fix pkglint indentation warnings

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

Modified Files:
	bakery/Makefile
	bamtools/buildlink3.mk
	banshee/options.mk
	baresip/PLIST
	basepkg/Makefile
	beads/Makefile
	bedtools2/PLIST
	bfgminer/Makefile
	bigdft/Makefile
	bindgraph/Makefile
	binutils-gold-git/Makefile
	bird/Makefile.common
	bitcoin/Makefile
	bitkeeper/Makefile
	bkchem/Makefile
	blad/Makefile
	blad/options.mk
	blasr_libcpp/PLIST
	bleachbit/Makefile
	blink/Makefile
	bluez-libs/Makefile
	bluez-libs/Makefile.common
	bluez-utils/Makefile
	bmp-docklet/Makefile
	boa/Makefile
	bogomips/Makefile
	boinc-git/Makefile
	boost-threadpool/Makefile
	boringssl/buildlink3.mk
	bowtie2/PLIST
	breeze-kde4/Makefile
	breeze/hacks.mk
	brlcad/Makefile
	bsdbuild/Makefile
	bsh/Makefile
	bss/Makefile
	btscanner/PLIST
	bugzilla/Makefile
	bugzilla/options.mk
	bullet/Makefile
	bup-git/Makefile

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

pkglint -Wall -F -o aligned b*/

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

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

diffstat:
 bakery/Makefile            |  2 +-
 bamtools/buildlink3.mk     |  2 +-
 banshee/options.mk         |  2 +-
 baresip/PLIST              |  2 +-
 basepkg/Makefile           |  2 +-
 beads/Makefile             |  2 +-
 bedtools2/PLIST            |  2 +-
 bfgminer/Makefile          |  6 ++---
 bigdft/Makefile            | 10 ++++----
 bindgraph/Makefile         | 22 ++++++++--------
 binutils-gold-git/Makefile | 24 +++++++++---------
 bird/Makefile.common       |  4 +--
 bitcoin/Makefile           | 30 +++++++++++-----------
 bitkeeper/Makefile         |  2 +-
 bkchem/Makefile            |  6 ++---
 blad/Makefile              |  2 +-
 blad/options.mk            | 10 ++++----
 blasr_libcpp/PLIST         | 62 +++++++++++++++++++++++-----------------------
 bleachbit/Makefile         |  4 +--
 blink/Makefile             |  6 ++---
 bluez-libs/Makefile        |  4 +--
 bluez-libs/Makefile.common |  2 +-
 bluez-utils/Makefile       | 14 +++++------
 bmp-docklet/Makefile       |  6 ++---
 boa/Makefile               |  8 +++---
 bogomips/Makefile          | 14 +++++------
 boinc-git/Makefile         |  2 +-
 boost-threadpool/Makefile  |  4 +--
 boringssl/buildlink3.mk    |  4 +--
 bowtie2/PLIST              | 12 ++++-----
 breeze-kde4/Makefile       |  2 +-
 breeze/hacks.mk            |  2 +-
 brlcad/Makefile            |  2 +-
 bsdbuild/Makefile          |  4 +--
 bsh/Makefile               |  6 ++---
 bss/Makefile               | 10 ++++----
 btscanner/PLIST            |  2 +-
 bugzilla/Makefile          |  2 +-
 bugzilla/options.mk        |  2 +-
 bullet/Makefile            |  6 ++---
 bup-git/Makefile           |  2 +-
 41 files changed, 156 insertions(+), 156 deletions(-)

diffs:
diff --git a/bakery/Makefile b/bakery/Makefile
index 0307415d30..d32f0090a7 100644
--- a/bakery/Makefile
+++ b/bakery/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	http://bakery.sourceforge.net/
 COMMENT=	C++ Framework for creating GNOME applications using gtkmm
 LICENSE=	gnu-lgpl-v2
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/bamtools/buildlink3.mk b/bamtools/buildlink3.mk
index 673e18ff83..da3756afe8 100644
--- a/bamtools/buildlink3.mk
+++ b/bamtools/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	bamtools
 BAMTOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.bamtools+=	bamtools>=2.4.0
-BUILDLINK_PKGSRCDIR.bamtools?=	../../wip/bamtools
+BUILDLINK_PKGSRCDIR.bamtools?=		../../wip/bamtools
 .endif	# BAMTOOLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-bamtools
diff --git a/banshee/options.mk b/banshee/options.mk
index b585f37bee..fcafc20d2a 100644
--- a/banshee/options.mk
+++ b/banshee/options.mk
@@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+=		gnome daap
 PLIST_VARS+=			${PKG_SUPPORTED_OPTIONS}
 
 .if !empty(PKG_OPTIONS:Mgnome)
-PLIST.gnome=	yes
+PLIST.gnome=		yes
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
diff --git a/baresip/PLIST b/baresip/PLIST
index bbf1b5c4c4..a34f33e21f 100644
--- a/baresip/PLIST
+++ b/baresip/PLIST
@@ -17,8 +17,8 @@ lib/baresip/modules/g711.so
 lib/baresip/modules/g722.so
 lib/baresip/modules/g726.so
 lib/baresip/modules/gsm.so
-${PLIST.gstreamer}lib/baresip/modules/gst_video1.so
 ${PLIST.gstreamer}lib/baresip/modules/gst1.so
+${PLIST.gstreamer}lib/baresip/modules/gst_video1.so
 ${PLIST.gtk}lib/baresip/modules/gtk.so
 ${PLIST.x265}lib/baresip/modules/h265.so
 lib/baresip/modules/httpd.so
diff --git a/basepkg/Makefile b/basepkg/Makefile
index c8cee04dd0..e15f6bde7a 100644
--- a/basepkg/Makefile
+++ b/basepkg/Makefile
@@ -17,7 +17,7 @@ AUTO_MKDIRS=	yes
 
 WRKSRC=		${WRKDIR}/basepkg-1.2
 USE_LANGUAGES=	# none
-USE_TOOLS+= pax
+USE_TOOLS+=	pax
 
 INSTALLATION_DIRS+=	share/basepkg
 
diff --git a/beads/Makefile b/beads/Makefile
index a8d82e7716..cec78735ac 100644
--- a/beads/Makefile
+++ b/beads/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://pappso.inra.fr/bioinfo/beads/
 COMMENT=	BEADS is a program for spot detection on 2-D gel images
 
-USE_CMAKE= yes
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 SUBST_CLASSES+=		paths
diff --git a/bedtools2/PLIST b/bedtools2/PLIST
index 78eafde02d..785ac67498 100644
--- a/bedtools2/PLIST
+++ b/bedtools2/PLIST
@@ -3,9 +3,9 @@ bin/annotateBed
 bin/bamToBed
 bin/bamToFastq
 bin/bed12ToBed6
-bin/bedpeToBam
 bin/bedToBam
 bin/bedToIgv
+bin/bedpeToBam
 bin/bedtools
 bin/closestBed
 bin/clusterBed
diff --git a/bfgminer/Makefile b/bfgminer/Makefile
index 5b440dfe2c..aeacb90473 100644
--- a/bfgminer/Makefile
+++ b/bfgminer/Makefile
@@ -11,9 +11,9 @@ HOMEPAGE=	http://bfgminer.org/
 COMMENT=	Modular ASIC/FPGA Bitcoin miner
 LICENSE=	gnu-gpl-v3
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config bash
-HAS_CONFIGURE=	yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config bash
+HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--enable-cpumining
 CONFIGURE_ARGS+=	--enable-scrypt
diff --git a/bigdft/Makefile b/bigdft/Makefile
index 494e3c2450..41c9ce6ac7 100644
--- a/bigdft/Makefile
+++ b/bigdft/Makefile
@@ -7,13 +7,13 @@ MASTER_SITES=	http://inac.cea.fr/L_Sim/BigDFT/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://inac.cea.fr/L_Sim/BigDFT/
-COMMENT=Massively parallel electronic structure code using a wavelet basis set
+COMMENT=	Massively parallel electronic structure code using a wavelet basis set
 LICENSE=	gnu-gpl-v2
 
-CHECK_PORTABILITY_SKIP=  configure
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	bash pkg-config gmake
-USE_LANGUAGES=	c c++ fortran
+CHECK_PORTABILITY_SKIP=	configure
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		bash pkg-config gmake
+USE_LANGUAGES=		c c++ fortran
 
 PKGCONFIG_OVERRIDE+=	bigdft.pc.in
 PKGCONFIG_OVERRIDE+=	libxc-1.1.0/build/libxc.pc.in
diff --git a/bindgraph/Makefile b/bindgraph/Makefile
index 644ddaa9d6..e1438eb5c6 100644
--- a/bindgraph/Makefile
+++ b/bindgraph/Makefile
@@ -8,30 +8,30 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	frederic%fauberteau.org@localhost
 HOMEPAGE=	http://www.linux.it/~md/software/
-COMMENT= Tool that makes graphs from BIND queries
-LICENSE= gnu-gpl-v2
+COMMENT=	Tool that makes graphs from BIND queries
+LICENSE=	gnu-gpl-v2
 
-DEPENDS+= p5-Time-Local-[0-9]*:../../time/p5-Time-Local
+DEPENDS+=	p5-Time-Local-[0-9]*:../../time/p5-Time-Local
 
 .include "../../databases/rrdtool/buildlink3.mk"
 
-USE_TOOLS+= perl
+USE_TOOLS+=	perl
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+= VARBASE
+BUILD_DEFS+=	VARBASE
 
 DBDIR?=	${VARBASE}/db/${PKGBASE}
 
-OWN_DIRS+= ${DBDIR}
+OWN_DIRS+=	${DBDIR}
 
-BG_SCRIPTS= bindgraph.cgi bindgraph.pl
+BG_SCRIPTS=	bindgraph.cgi bindgraph.pl
 
-REPLACE_PERL+= ${BG_SCRIPTS}
+REPLACE_PERL+=	${BG_SCRIPTS}
 
-RCD_SCRIPTS= bindgraph
+RCD_SCRIPTS=	bindgraph
 
-SUBST_CLASSES+= defs
+SUBST_CLASSES+=		defs
 SUBST_STAGE.defs=	pre-build
 SUBST_FILES.defs=	${BG_SCRIPTS}
 SUBST_SED.defs+=	-e 's,@RRDDIR@,${DBDIR},g'
@@ -39,7 +39,7 @@ SUBST_SED.defs+=	-e 's,@RRDDIR@,${DBDIR},g'
 SUBST_MESSAGE.defs=	Fixing defaults.
 
 INSTALLATION_DIRS+=	libexec/cgi-bin
-INSTALLATION_DIRS+= share/doc/bindgraph
+INSTALLATION_DIRS+=	share/doc/bindgraph
 
 do-build:
 
diff --git a/binutils-gold-git/Makefile b/binutils-gold-git/Makefile
index b5ff2944d3..9ff462bbcc 100644
--- a/binutils-gold-git/Makefile
+++ b/binutils-gold-git/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD: Makefile,v 1.11 2015/03/15 14:22:19 bsiegert Exp $
 #
 
-DISTNAME=	binutils-gold-8.0
-CATEGORIES=	devel
+DISTNAME=		binutils-gold-8.0
+CATEGORIES=		devel
 GIT_REPOSITORIES=	binutils-gold
 #GIT_REPO.binutils-gold=		git://sourceware.org/git/binutils-gdb.git # broken?
 #GIT_REPO.binutils-gold=		http://sourceware.org/git/binutils-gdb.git # broken?
-GIT_REPO.binutils-gold=		https://github.com/wallento/binutils-gdb.git
+GIT_REPO.binutils-gold=	https://github.com/wallento/binutils-gdb.git
 #GIT_DEEP_CLONE.binutils-gold=	yes # server dies on shallow clones
-WRKSRC=         ${WRKDIR}/binutils-gold
+WRKSRC=			${WRKDIR}/binutils-gold
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.gnu.org/software/binutils/
@@ -19,15 +19,15 @@ NOT_FOR_PLATFORM+=	DragonFly-*-*
 
 USE_LANGUAGES=		c c++11
 
-GNU_CONFIGURE=		YES
-USE_PKGLOCALEDIR=	YES
-USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake msgfmt makeinfo perl:build
+GNU_CONFIGURE=			YES
+USE_PKGLOCALEDIR=		YES
+USE_LIBTOOL=			YES
+USE_TOOLS+=			gmake msgfmt makeinfo perl:build
 REPLACE_LOCALEDIR_PATTERNS+=	Make-in
-INSTALL_TARGET=		install install-info
-TEST_TARGET=		check
-INFO_FILES=		yes
-CONFIGURE_ENV+=		CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
+INSTALL_TARGET=			install install-info
+TEST_TARGET=			check
+INFO_FILES=			yes
+CONFIGURE_ENV+=			CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
 
 CONFIGURE_ARGS+=	--disable-binutils
 CONFIGURE_ARGS+=	--disable-gprof
diff --git a/bird/Makefile.common b/bird/Makefile.common
index 1313f93f15..8e3c9e2e6e 100644
--- a/bird/Makefile.common
+++ b/bird/Makefile.common
@@ -23,8 +23,8 @@ CONFIGURE_ARGS+=	--localstatedir=/var
 BIRD6?=			# empty
 PLIST_SUBST+=		BIRD6=${BIRD6}
 
-FILESDIR=               ${.CURDIR}/../bird/files
-PATCHDIR=               ${.CURDIR}/../bird/patches
+FILESDIR=		${.CURDIR}/../bird/files
+PATCHDIR=		${.CURDIR}/../bird/patches
 DISTINFO_FILE=		${.CURDIR}/../bird/distinfo
 PLIST_SRC=		${.CURDIR}/../bird/PLIST
 DESCR_SRC=		${.CURDIR}/../bird/DESCR
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 3e410e99f5..014df76f2b 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
 # TODO: update to latest release
-DISTNAME=       bitcoin-0.13.1
+DISTNAME=	bitcoin-0.13.1
 CATEGORIES=	finance
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=bitcoin/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=bitcoin/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	http://bitcoin.sourceforge.net/
@@ -14,38 +14,38 @@ LICENSE=	mit
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config autoconf aclocal autoheader automake
 AUTO_MKDIRS=	yes
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 
 USE_LANGUAGES=	c c++
 # bitcoin-core requires c++11 (but does not need manual --std=c++11).
 
 # TODO: File bug upstream - configure should add this where it is
 # needed.  Without -fPIC, linking of test_bitcoin fails.
-CFLAGS+=        -fPIC
+CFLAGS+=	-fPIC
 
 # configure does not look in PREFIX for boost unless instructed.
-CONFIGURE_ARGS+=  --with-boost=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
 
-CONFIGURE_ARGS+=  --enable-hardening
+CONFIGURE_ARGS+=	--enable-hardening
 
 # pkgsrc's db4 package installs as db4_, but bitcoin looks for db_.
-BUILDLINK_TRANSFORM+=   l:db_cxx:db4_cxx
+BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
 
 TEST_TARGET=	check
 
 PLIST_VARS+=	qt4
 
-RCD_SCRIPTS=	bitcoind
-BUILD_DEFS+=	VARBASE
-OWN_DIRS=	${VARBASE}/bitcoin
-EGDIR=		${PREFIX}/share/examples/bitcoin
-CONF_FILES=	${EGDIR}/bitcoin.conf ${PKG_SYSCONFDIR}/bitcoin.conf
+RCD_SCRIPTS=		bitcoind
+BUILD_DEFS+=		VARBASE
+OWN_DIRS=		${VARBASE}/bitcoin
+EGDIR=			${PREFIX}/share/examples/bitcoin
+CONF_FILES=		${EGDIR}/bitcoin.conf ${PKG_SYSCONFDIR}/bitcoin.conf
 CONF_FILES_PERMS=	${EGDIR}/bitcoin.conf ${PKG_SYSCONFDIR}/bitcoin.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
 
 # This is currently unnecessary, but it seems likely we will find a
 # file that references /usr when ${PREFIX} is appropriate.
-SUBST_CLASSES+= 	pkg
-SUBST_STAGE.pkg= 	post-patch
+SUBST_CLASSES+=		pkg
+SUBST_STAGE.pkg=	post-patch
 SUBST_SED.pkg=		-e "s|/usr/|${PREFIX}/|g"
 SUBST_MESSAGE.pkg=	Fixing /usr references to ${PREFIX}.
 
diff --git a/bitkeeper/Makefile b/bitkeeper/Makefile
index 517e3f480d..e69082df2b 100644
--- a/bitkeeper/Makefile
+++ b/bitkeeper/Makefile
@@ -13,7 +13,7 @@ LICENSE=	apache-2.0
 
 USE_TOOLS+=	gmake bison lex groff perl bash pkg-config
 
-BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+BUILD_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
 
 BUILD_DIRS=	src
 
diff --git a/bkchem/Makefile b/bkchem/Makefile
index f06067e2b5..009ee80ff0 100644
--- a/bkchem/Makefile
+++ b/bkchem/Makefile
@@ -15,13 +15,13 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 PYTHON_VERSIONED_DEPENDENCIES=	Pmw
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=	intltool msgfmt
+USE_TOOLS+=		intltool msgfmt
 USE_LANGUAGES=		# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.13.0
 
-PY_EXEC=${PREFIX}/bin/python${PYVERSSUFFIX}
-PY_APPAPATH=${PREFIX}/${PYSITELIB}/bkchem/bkchem.py
+PY_EXEC=	${PREFIX}/bin/python${PYVERSSUFFIX}
+PY_APPAPATH=	${PREFIX}/${PYSITELIB}/bkchem/bkchem.py
 
 post-extract:
 	    ${CP} ${FILESDIR}/bkchem.desktop ${WRKSRC}
diff --git a/blad/Makefile b/blad/Makefile
index 66e2d95771..92e23f8877 100644
--- a/blad/Makefile
+++ b/blad/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake:run
 USE_LANGUAGES=	c c++
 
-INFO_FILES=     yes
+INFO_FILES=	yes
 
 .include "options.mk"
 
diff --git a/blad/options.mk b/blad/options.mk
index f0cf98715f..ac705b6aa7 100644
--- a/blad/options.mk
+++ b/blad/options.mk
@@ -1,10 +1,10 @@
 # $NetBSD: options.mk,v 1.6 2013/08/01 18:44:06 riastradh Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.blad
-PKG_SUPPORTED_OPTIONS=	gmp mpfr sage gsl
-PKG_SUGGESTED_OPTIONS=	gmp
-PKG_OPTIONS_OPTIONAL_GROUPS=    math
-PKG_OPTIONS_GROUP.math=     gmp
+PKG_OPTIONS_VAR=		PKG_OPTIONS.blad
+PKG_SUPPORTED_OPTIONS=		gmp mpfr sage gsl
+PKG_SUGGESTED_OPTIONS=		gmp
+PKG_OPTIONS_OPTIONAL_GROUPS=	math
+PKG_OPTIONS_GROUP.math=		gmp
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/blasr_libcpp/PLIST b/blasr_libcpp/PLIST
index ff60e8ab26..2b0a85e6ad 100644
--- a/blasr_libcpp/PLIST
+++ b/blasr_libcpp/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD: PLIST,v 1.2 2015/09/11 16:48:33 outpaddling Exp $
+include/blasr_libcpp/alignment/MappingMetrics.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/AffineGuidedAlign.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/AffineKBandAlign.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/AlignmentFormats.hpp
@@ -16,9 +17,12 @@ include/blasr_libcpp/alignment/algorithms/alignment/IDSScoreFunction.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/KBandAlign.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/OneGapAlignment.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/QualityValueScoreFunction.hpp
-include/blasr_libcpp/alignment/algorithms/alignment/ScoreMatrices.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/SDPAlign.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/SDPAlignImpl.hpp
+include/blasr_libcpp/alignment/algorithms/alignment/SWAlign.hpp
+include/blasr_libcpp/alignment/algorithms/alignment/SWAlignImpl.hpp
+include/blasr_libcpp/alignment/algorithms/alignment/ScoreMatrices.hpp
+include/blasr_libcpp/alignment/algorithms/alignment/StringToScoreMatrix.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/sdp/FragmentSort.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/sdp/FragmentSortImpl.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/sdp/NonoverlappingSparseDynamicProgramming.h
@@ -29,13 +33,10 @@ include/blasr_libcpp/alignment/algorithms/alignment/sdp/SDPSetImpl.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/sdp/SparseDynamicProgramming.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/sdp/SparseDynamicProgrammingImpl.hpp
 include/blasr_libcpp/alignment/algorithms/alignment/sdp/VariableLengthSDPFragment.h
-include/blasr_libcpp/alignment/algorithms/alignment/StringToScoreMatrix.hpp
-include/blasr_libcpp/alignment/algorithms/alignment/SWAlign.hpp
-include/blasr_libcpp/alignment/algorithms/alignment/SWAlignImpl.hpp
-include/blasr_libcpp/alignment/algorithms/anchoring/BasicEndpoint.hpp
-include/blasr_libcpp/alignment/algorithms/anchoring/BasicEndpointImpl.hpp
 include/blasr_libcpp/alignment/algorithms/anchoring/BWTSearch.hpp
 include/blasr_libcpp/alignment/algorithms/anchoring/BWTSearchImpl.hpp
+include/blasr_libcpp/alignment/algorithms/anchoring/BasicEndpoint.hpp
+include/blasr_libcpp/alignment/algorithms/anchoring/BasicEndpointImpl.hpp
 include/blasr_libcpp/alignment/algorithms/anchoring/ClusterProbability.hpp
 include/blasr_libcpp/alignment/algorithms/anchoring/Coordinate.hpp
 include/blasr_libcpp/alignment/algorithms/anchoring/FindMaxInterval.hpp
@@ -69,10 +70,10 @@ include/blasr_libcpp/alignment/bwt/Occ.hpp
 include/blasr_libcpp/alignment/bwt/PackedHash.hpp
 include/blasr_libcpp/alignment/bwt/Pos.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/AlignedPair.h
+include/blasr_libcpp/alignment/datastructures/alignment/Alignment.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/AlignmentCandidate.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/AlignmentContext.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/AlignmentGapList.h
-include/blasr_libcpp/alignment/datastructures/alignment/Alignment.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/AlignmentMap.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/AlignmentStats.hpp
 include/blasr_libcpp/alignment/datastructures/alignment/ByteAlignment.h
@@ -109,7 +110,6 @@ include/blasr_libcpp/alignment/format/SummaryPrinter.hpp
 include/blasr_libcpp/alignment/format/VulgarPrinter.hpp
 include/blasr_libcpp/alignment/format/XMLPrinter.hpp
 include/blasr_libcpp/alignment/ipc/SharedMemoryAllocator.hpp
-include/blasr_libcpp/alignment/MappingMetrics.hpp
 include/blasr_libcpp/alignment/qvs/QualityValueProfile.hpp
 include/blasr_libcpp/alignment/simulator/CDFMap.hpp
 include/blasr_libcpp/alignment/simulator/ContextOutputList.hpp
@@ -122,18 +122,18 @@ include/blasr_libcpp/alignment/simulator/OutputSampleList.hpp
 include/blasr_libcpp/alignment/simulator/OutputSampleListSet.hpp
 include/blasr_libcpp/alignment/simulator/QualitySample.hpp
 include/blasr_libcpp/alignment/statistics/AnchorDistributionTable.hpp
-include/blasr_libcpp/alignment/statistics/cdfs.hpp
 include/blasr_libcpp/alignment/statistics/LookupAnchorDistribution.hpp
-include/blasr_libcpp/alignment/statistics/pdfs.hpp
 include/blasr_libcpp/alignment/statistics/StatUtils.hpp
 include/blasr_libcpp/alignment/statistics/StatUtilsImpl.hpp
 include/blasr_libcpp/alignment/statistics/VarianceAccumulator.hpp
 include/blasr_libcpp/alignment/statistics/VarianceAccumulatorImpl.hpp
+include/blasr_libcpp/alignment/statistics/cdfs.hpp
+include/blasr_libcpp/alignment/statistics/pdfs.hpp
 include/blasr_libcpp/alignment/suffixarray/LCPTable.hpp
 include/blasr_libcpp/alignment/suffixarray/SharedSuffixArray.hpp
-include/blasr_libcpp/alignment/suffixarray/ssort.hpp
 include/blasr_libcpp/alignment/suffixarray/SuffixArray.hpp
 include/blasr_libcpp/alignment/suffixarray/SuffixArrayTypes.hpp
+include/blasr_libcpp/alignment/suffixarray/ssort.hpp
 include/blasr_libcpp/alignment/tuples/BaseTuple.hpp
 include/blasr_libcpp/alignment/tuples/CompressedDNATuple.hpp
 include/blasr_libcpp/alignment/tuples/CountedTuple.h
@@ -144,7 +144,6 @@ include/blasr_libcpp/alignment/tuples/HashedTupleList.hpp
 include/blasr_libcpp/alignment/tuples/HashedTupleListImpl.hpp
 include/blasr_libcpp/alignment/tuples/TupleCountTable.hpp
 include/blasr_libcpp/alignment/tuples/TupleCountTableImpl.hpp
-include/blasr_libcpp/alignment/tuples/tuple.h
 include/blasr_libcpp/alignment/tuples/TupleList.hpp
 include/blasr_libcpp/alignment/tuples/TupleListImpl.hpp
 include/blasr_libcpp/alignment/tuples/TupleMask.h
@@ -153,6 +152,7 @@ include/blasr_libcpp/alignment/tuples/TupleMatchingImpl.hpp
 include/blasr_libcpp/alignment/tuples/TupleMetrics.hpp
 include/blasr_libcpp/alignment/tuples/TupleOperations.h
 include/blasr_libcpp/alignment/tuples/TupleTranslations.h
+include/blasr_libcpp/alignment/tuples/tuple.h
 include/blasr_libcpp/alignment/utils/FileOfFileNames.hpp
 include/blasr_libcpp/alignment/utils/FileUtils.hpp
 include/blasr_libcpp/alignment/utils/LogUtils.hpp
@@ -169,8 +169,8 @@ include/blasr_libcpp/hdf/BufferedHDFArrayImpl.hpp
 include/blasr_libcpp/hdf/DatasetCollection.hpp
 include/blasr_libcpp/hdf/DatasetCollectionImpl.hpp
 include/blasr_libcpp/hdf/HDF2DArray.hpp
-include/blasr_libcpp/hdf/HDFAlnGroupGroup.hpp
 include/blasr_libcpp/hdf/HDFAlnGroup.hpp
+include/blasr_libcpp/hdf/HDFAlnGroupGroup.hpp
 include/blasr_libcpp/hdf/HDFAlnInfoGroup.hpp
 include/blasr_libcpp/hdf/HDFArray.hpp
 include/blasr_libcpp/hdf/HDFAtom.hpp
@@ -200,17 +200,14 @@ include/blasr_libcpp/hdf/HDFRefGroupGroup.hpp
 include/blasr_libcpp/hdf/HDFRefInfoGroup.hpp
 include/blasr_libcpp/hdf/HDFRegionTableReader.hpp
 include/blasr_libcpp/hdf/HDFRegionTableWriter.hpp
+include/blasr_libcpp/hdf/HDFSMRTSequenceReader.hpp
 include/blasr_libcpp/hdf/HDFScanDataReader.hpp
 include/blasr_libcpp/hdf/HDFScanDataWriter.hpp
 include/blasr_libcpp/hdf/HDFSentinalFile.hpp
-include/blasr_libcpp/hdf/HDFSMRTSequenceReader.hpp
 include/blasr_libcpp/hdf/HDFUtils.hpp
 include/blasr_libcpp/hdf/HDFWriteBuffer.hpp
 include/blasr_libcpp/hdf/HDFZMWReader.hpp
 include/blasr_libcpp/libconfig.h
-include/blasr_libcpp/pbdata/alignment/CmpAlignment.hpp
-include/blasr_libcpp/pbdata/alignment/CmpAlignmentImpl.hpp
-include/blasr_libcpp/pbdata/amos/AfgBasWriter.hpp
 include/blasr_libcpp/pbdata/CCSSequence.hpp
 include/blasr_libcpp/pbdata/ChangeListID.hpp
 include/blasr_libcpp/pbdata/CommandLineParser.hpp
@@ -218,7 +215,6 @@ include/blasr_libcpp/pbdata/Compare4BitCompressed.hpp
 include/blasr_libcpp/pbdata/CompressedDNASequence.hpp
 include/blasr_libcpp/pbdata/CompressedSequence.hpp
 include/blasr_libcpp/pbdata/CompressedSequenceImpl.hpp
-include/blasr_libcpp/pbdata/defs.h
 include/blasr_libcpp/pbdata/DNASequence.hpp
 include/blasr_libcpp/pbdata/Enumerations.h
 include/blasr_libcpp/pbdata/FASTAReader.hpp
@@ -226,20 +222,31 @@ include/blasr_libcpp/pbdata/FASTASequence.hpp
 include/blasr_libcpp/pbdata/FASTQReader.hpp
 include/blasr_libcpp/pbdata/FASTQSequence.hpp
 include/blasr_libcpp/pbdata/GFFFile.hpp
+include/blasr_libcpp/pbdata/MD5Utils.hpp
+include/blasr_libcpp/pbdata/MD5UtilsImpl.hpp
+include/blasr_libcpp/pbdata/NucConversion.hpp
+include/blasr_libcpp/pbdata/PackedDNASequence.hpp
+include/blasr_libcpp/pbdata/ReverseCompressIndex.hpp
+include/blasr_libcpp/pbdata/SMRTSequence.hpp
+include/blasr_libcpp/pbdata/SeqUtils.hpp
+include/blasr_libcpp/pbdata/SeqUtilsImpl.hpp
+include/blasr_libcpp/pbdata/StringUtils.hpp
+include/blasr_libcpp/pbdata/Types.h
+include/blasr_libcpp/pbdata/VectorUtils.hpp
+include/blasr_libcpp/pbdata/alignment/CmpAlignment.hpp
+include/blasr_libcpp/pbdata/alignment/CmpAlignmentImpl.hpp
+include/blasr_libcpp/pbdata/amos/AfgBasWriter.hpp
+include/blasr_libcpp/pbdata/defs.h
 include/blasr_libcpp/pbdata/loadpulses/MetricField.hpp
 include/blasr_libcpp/pbdata/loadpulses/MovieAlnIndexLookupTable.hpp
 include/blasr_libcpp/pbdata/matrix/FlatMatrix.hpp
 include/blasr_libcpp/pbdata/matrix/FlatMatrixImpl.hpp
 include/blasr_libcpp/pbdata/matrix/Matrix.hpp
 include/blasr_libcpp/pbdata/matrix/MatrixImpl.hpp
-include/blasr_libcpp/pbdata/MD5Utils.hpp
-include/blasr_libcpp/pbdata/MD5UtilsImpl.hpp
 include/blasr_libcpp/pbdata/metagenome/FindRandomSequence.hpp
 include/blasr_libcpp/pbdata/metagenome/SequenceIndexDatabase.hpp
 include/blasr_libcpp/pbdata/metagenome/SequenceIndexDatabaseImpl.hpp
 include/blasr_libcpp/pbdata/metagenome/TitleTable.hpp
-include/blasr_libcpp/pbdata/NucConversion.hpp
-include/blasr_libcpp/pbdata/PackedDNASequence.hpp
 include/blasr_libcpp/pbdata/qvs/QualityTransform.hpp
 include/blasr_libcpp/pbdata/qvs/QualityValue.hpp
 include/blasr_libcpp/pbdata/qvs/QualityValueVector.hpp
@@ -255,7 +262,6 @@ include/blasr_libcpp/pbdata/reads/ReadType.hpp
 include/blasr_libcpp/pbdata/reads/RegionTable.hpp
 include/blasr_libcpp/pbdata/reads/ScanData.hpp
 include/blasr_libcpp/pbdata/reads/ZMWGroupEntry.hpp
-include/blasr_libcpp/pbdata/ReverseCompressIndex.hpp
 include/blasr_libcpp/pbdata/saf/AlnGroup.hpp
 include/blasr_libcpp/pbdata/saf/AlnInfo.hpp
 include/blasr_libcpp/pbdata/saf/MovieInfo.hpp
@@ -273,17 +279,11 @@ include/blasr_libcpp/pbdata/sam/SAMKeywordValuePair.hpp
 include/blasr_libcpp/pbdata/sam/SAMKeywordValuePairImpl.hpp
 include/blasr_libcpp/pbdata/sam/SAMReader.hpp
 include/blasr_libcpp/pbdata/sam/SAMReaderImpl.hpp
-include/blasr_libcpp/pbdata/SeqUtils.hpp
-include/blasr_libcpp/pbdata/SeqUtilsImpl.hpp
-include/blasr_libcpp/pbdata/SMRTSequence.hpp
-include/blasr_libcpp/pbdata/StringUtils.hpp
-include/blasr_libcpp/pbdata/Types.h
-include/blasr_libcpp/pbdata/utils/BitUtils.hpp
 include/blasr_libcpp/pbdata/utils.hpp
-include/blasr_libcpp/pbdata/utilsImpl.hpp
+include/blasr_libcpp/pbdata/utils/BitUtils.hpp
 include/blasr_libcpp/pbdata/utils/SMRTReadUtils.hpp
 include/blasr_libcpp/pbdata/utils/SMRTTitle.hpp
-include/blasr_libcpp/pbdata/VectorUtils.hpp
+include/blasr_libcpp/pbdata/utilsImpl.hpp
 include/blasr_libcpp/unittest/pbdata/testdata.h
 lib/libblasr.a
 lib/libpbdata.a
diff --git a/bleachbit/Makefile b/bleachbit/Makefile
index 5e84802333..3412b2adc8 100644
--- a/bleachbit/Makefile
+++ b/bleachbit/Makefile
@@ -17,9 +17,9 @@ DEPENDS+=	${PYPKGPREFIX}-notify>=0.2.1:../../sysutils/py-notify
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
-REPLACE_PYTHON+=	bleachbit.py
+REPLACE_PYTHON+=		bleachbit.py
 
-INSTALLATION_DIRS+=  bin share/applications share/pixmaps
+INSTALLATION_DIRS+=	bin share/applications share/pixmaps
 
 
 post-install:
diff --git a/blink/Makefile b/blink/Makefile
index ea718aea91..069017377c 100644
--- a/blink/Makefile
+++ b/blink/Makefile
@@ -19,9 +19,9 @@ DEPENDS+=	${PYPKGPREFIX}-cjson-[0-9]*:../../textproc/py-cjson
 
 USE_LANGUAGES=	c
 
-REPLACE_PYTHON+=	resources/chat/styles/Smooth\ Operator/test/view.py
-REPLACE_PYTHON+=	resources/chat/styles/Stockholm/test/view.py
-PY_PATCHPLIST=		yes
+REPLACE_PYTHON+=		resources/chat/styles/Smooth\ Operator/test/view.py
+REPLACE_PYTHON+=		resources/chat/styles/Stockholm/test/view.py
+PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-python-application, py-python-gnutls
 
 post-install:
diff --git a/bluez-libs/Makefile b/bluez-libs/Makefile
index eaa8abbb26..4ae28bb9b1 100644
--- a/bluez-libs/Makefile
+++ b/bluez-libs/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=		http://www.bluez.org/
 COMMENT=		Linux Bluetooth Stack libraries
 
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=	c
+USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/bluez.pc.in
 GNU_CONFIGURE=		yes
 
-ONLY_FOR_PLATFORM=Linux-*-*
+ONLY_FOR_PLATFORM=	Linux-*-*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/bluez-libs/Makefile.common b/bluez-libs/Makefile.common
index 29182c58ad..bc96cd61c1 100644
--- a/bluez-libs/Makefile.common
+++ b/bluez-libs/Makefile.common
@@ -5,7 +5,7 @@
 
 ONLY_FOR_PLATFORM=	Linux-*-*
 
-DEPENDS+=		bluez-libs>=3.19:../../wip/bluez-libs
+DEPENDS+=	bluez-libs>=3.19:../../wip/bluez-libs
 USE_TOOLS+=	pkg-config
 
 .include "../../wip/bluez-libs/buildlink3.mk"
diff --git a/bluez-utils/Makefile b/bluez-utils/Makefile
index 8cfc538e08..8d7291189c 100644
--- a/bluez-utils/Makefile
+++ b/bluez-utils/Makefile
@@ -11,15 +11,15 @@ COMMENT=		Linux Bluetooth Stack utilities
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LANGUAGES=	c
+USE_LANGUAGES=		c
 
-EGDIR=${PKG_SYSCONFDIR}/bluetooth/
-CONF_FILES=${EGDIR}/hcid.conf ${EGDIR}/rfcomm.conf
+EGDIR=		${PKG_SYSCONFDIR}/bluetooth/
+CONF_FILES=	${EGDIR}/hcid.conf ${EGDIR}/rfcomm.conf
 
-SUBST_CLASSES+=initd
-SUBST_STAGE.initd=pre-install
-SUBST_FILES.initd=scripts/Makefile
-SUBST_SED.initd=-e 's,install-data-local,,g'
+SUBST_CLASSES+=		initd
+SUBST_STAGE.initd=	pre-install
+SUBST_FILES.initd=	scripts/Makefile
+SUBST_SED.initd=	-e 's,install-data-local,,g'
 
 .include "../../comms/openobex/buildlink3.mk"
 .include "../../wip/bluez-libs/Makefile.common"
diff --git a/bmp-docklet/Makefile b/bmp-docklet/Makefile
index 6f3bc6ec9b..6b3b45a5e8 100644
--- a/bmp-docklet/Makefile
+++ b/bmp-docklet/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 17:14:36 asau Exp $
 #
 
-DISTNAME=		bmp-docklet-1.3
-PKGREVISION=		1
-CATEGORIES=		audio
+DISTNAME=	bmp-docklet-1.3
+PKGREVISION=	1
+CATEGORIES=	audio
 MASTER_SITES=	http://mark.xnull.de/bmp-docklet/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/boa/Makefile b/boa/Makefile
index 0440934362..4b9a2a8aae 100644
--- a/boa/Makefile
+++ b/boa/Makefile
@@ -13,10 +13,10 @@ LICENSE=	gnu-gpl-v2
 PKG_SYSCONFSUBDIR=	boa
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--disable-debug
-EGDIR=		${PREFIX}/share/examples/boa
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake lex
-USE_FEATURES+=	snprintf
+EGDIR=			${PREFIX}/share/examples/boa
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		gmake lex
+USE_FEATURES+=		snprintf
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/bogomips/Makefile b/bogomips/Makefile
index 8c02c7c861..803b36c8be 100644
--- a/bogomips/Makefile
+++ b/bogomips/Makefile
@@ -14,17 +14,17 @@ NO_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${PKGBASE}
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.bogomips
-PKG_SUPPORTED_OPTIONS=	# empty
+PKG_OPTIONS_VAR=		PKG_OPTIONS.bogomips
+PKG_SUPPORTED_OPTIONS=		# empty
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-PKG_SUPPORTED_OPTIONS+=	bogomips-pentium # Version for pentium and above,
-PKG_SUGGESTED_OPTIONS+=	bogomips-pentium # disable for i[34]86.
+PKG_SUPPORTED_OPTIONS+=		bogomips-pentium # Version for pentium and above,
+PKG_SUGGESTED_OPTIONS+=		bogomips-pentium # disable for i[34]86.
 .endif
 .if ${MACHINE_ARCH} == "arm"
 PKG_OPTIONS_OPTIONAL_GROUPS+=	arm
 # Portable bogomips version will be build for ARM, except for ARM IPAQ or ARM
 # Shark architectures, if the corresponding option is set.
-PKG_OPTIONS_GROUP.arm=	bogomips-arm-ipaq bogomips-arm-shark
+PKG_OPTIONS_GROUP.arm=		bogomips-arm-ipaq bogomips-arm-shark
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -51,8 +51,8 @@ BUILD_TARGET.arm=	bogoarm-shark
 
 BUILD_TARGET=		${BUILD_TARGET.${MACHINE_ARCH}:Ubogoport}
 
-INSTALLATION_DIRS+= share/doc/bogomips
-INSTALLATION_DIRS+= bin
+INSTALLATION_DIRS+=	share/doc/bogomips
+INSTALLATION_DIRS+=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BUILD_TARGET:Q} ${DESTDIR}${PREFIX}/bin/bogomips
diff --git a/boinc-git/Makefile b/boinc-git/Makefile
index ca47c81fcb..2db6f43610 100644
--- a/boinc-git/Makefile
+++ b/boinc-git/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+=	gmake	# seems to be required only by ${WRKSRC}/_autosetup
 
 USE_LANGUAGES=	c c++ fortran
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-manager
 
 pre-configure:
diff --git a/boost-threadpool/Makefile b/boost-threadpool/Makefile
index 1371b6115a..525dc868aa 100644
--- a/boost-threadpool/Makefile
+++ b/boost-threadpool/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	http://threadpool.sourceforge.net/
 COMMENT=	Cross-platform C++ thread pool library
 LICENSE=	boost-license
 
-EXTRACT_SUFX=	.zip
-WRKSRC=		${WRKDIR}/${DISTNAME}/threadpool
+EXTRACT_SUFX=		.zip
+WRKSRC=			${WRKDIR}/${DISTNAME}/threadpool
 INSTALLATION_DIRS=	include/boost
 INSTALLATION_DIRS+=	include/boost/threadpool
 INSTALLATION_DIRS+=	include/boost/threadpool/detail
diff --git a/boringssl/buildlink3.mk b/boringssl/buildlink3.mk
index 77d7410b68..1784889146 100644
--- a/boringssl/buildlink3.mk
+++ b/boringssl/buildlink3.mk
@@ -1,13 +1,13 @@
 # $NetBSD$
 
 BUILDLINK_DEPMETHOD.boringssl?=	build
-BUILDLINK_TREE+=	boringssl
+BUILDLINK_TREE+=		boringssl
 
 .if !defined(BORINGSSL_BUILDLINK3_MK)
 BORINGSSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.boringssl+=	boringssl>=20151230nb6
-BUILDLINK_PKGSRCDIR.boringssl?=	../../wip/boringssl
+BUILDLINK_PKGSRCDIR.boringssl?=		../../wip/boringssl
 .endif	# BORINGSSL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-boringssl
diff --git a/bowtie2/PLIST b/bowtie2/PLIST
index 585f2bc2be..bf65f71c37 100644
--- a/bowtie2/PLIST
+++ b/bowtie2/PLIST
@@ -16,25 +16,25 @@ share/bowtie2/scripts/gen_solqual_lookup.pl
 share/bowtie2/scripts/infer_fraglen.pl
 share/bowtie2/scripts/make_a_thaliana_tair.sh
 share/bowtie2/scripts/make_b_taurus_UMD3.sh
-share/bowtie2/scripts/make_canFam2.sh
 share/bowtie2/scripts/make_c_elegans.sh
+share/bowtie2/scripts/make_canFam2.sh
 share/bowtie2/scripts/make_d_melanogaster.sh
 share/bowtie2/scripts/make_e_coli.sh
-share/bowtie2/scripts/make_hg18.sh
-share/bowtie2/scripts/make_hg19.sh
 share/bowtie2/scripts/make_h_sapiens_ncbi36.sh
 share/bowtie2/scripts/make_h_sapiens_ncbi37.sh
+share/bowtie2/scripts/make_hg18.sh
+share/bowtie2/scripts/make_hg19.sh
+share/bowtie2/scripts/make_m_musculus_ncbi37.sh
 share/bowtie2/scripts/make_mm10.sh
 share/bowtie2/scripts/make_mm9.sh
-share/bowtie2/scripts/make_m_musculus_ncbi37.sh
 share/bowtie2/scripts/make_rn4.sh
 share/bowtie2/scripts/make_s_cerevisiae.sh
+share/doc/bowtie2/README
 share/doc/bowtie2/images/bowtie_logo.png
 share/doc/bowtie2/images/osi-certified.gif
 share/doc/bowtie2/images/sflogo.png
 share/doc/bowtie2/images/university.small.horizontal.white.png
 share/doc/bowtie2/manual.html
-share/doc/bowtie2/README
 share/doc/bowtie2/release.txt
 share/doc/bowtie2/strip_markdown.pl
 share/doc/bowtie2/style.css
@@ -48,8 +48,8 @@ share/doc/bowtie2/website/manual.ssi
 share/doc/bowtie2/website/news.shtml
 share/doc/bowtie2/website/old_news.ssi
 share/doc/bowtie2/website/other_tools.shtml
-share/doc/bowtie2/website/push_images.sh
 share/doc/bowtie2/website/push.sh
+share/doc/bowtie2/website/push_images.sh
 share/doc/bowtie2/website/recent_news.ssi
 share/doc/bowtie2/website/rhsidebar.ssi
 share/doc/bowtie2/website/top.ssi
diff --git a/breeze-kde4/Makefile b/breeze-kde4/Makefile
index 36ef0fd6b0..708a0a4899 100644
--- a/breeze-kde4/Makefile
+++ b/breeze-kde4/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	automoc4>=0.9.87:../../devel/automoc4
 
 USE_TOOLS+=	pkg-config perl
 
-CMAKE_ARGS+=    -DDATA_INSTALL_DIR=${PREFIX}/share/kde/apps
+CMAKE_ARGS+=	-DDATA_INSTALL_DIR=${PREFIX}/share/kde/apps
 CMAKE_ARGS+=	-DUSE_KDE4=ON
 
 .include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/breeze/hacks.mk b/breeze/hacks.mk
index 6a89854605..9c686b8489 100644
--- a/breeze/hacks.mk
+++ b/breeze/hacks.mk
@@ -4,4 +4,4 @@
 # ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
 # /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
 # unless -lexecinfo preceeds -lQt5Widgets
-BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets
+BUILDLINK_TRANSFORM.NetBSD+=	l:Qt5Widgets:execinfo:Qt5Widgets
diff --git a/brlcad/Makefile b/brlcad/Makefile
index 77a3f66f56..e744af8187 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+=	${COMPILER_RPATH_FLAG}${BRLCAD_PREFIX:Q}/lib/libgcv_plugins
 
 # Allow RPATH out of standard prefix
 BUILDLINK_PASSTHRU_DIRS+=	${BRLCAD_PREFIX:Q}
-BUILDLINK_PASSTHRU_RPATHDIRS+=  ${BRLCAD_PREFIX:Q}
+BUILDLINK_PASSTHRU_RPATHDIRS+=	${BRLCAD_PREFIX:Q}
 
 PKGCONFIG_OVERRIDE+=	misc/pkgconfig/libanalyze.pc.in
 PKGCONFIG_OVERRIDE+=	misc/pkgconfig/librt.pc.in
diff --git a/bsdbuild/Makefile b/bsdbuild/Makefile
index 2bd33011cd..3acc017b6d 100644
--- a/bsdbuild/Makefile
+++ b/bsdbuild/Makefile
@@ -16,8 +16,8 @@ USE_LANGUAGES=	# none
 USE_LIBTOOL=	yes
 USE_TOOLS+=	perl:run
 
-REPLACE_PERL=	*.pl
-REPLACE_SH=	mkdep configure
+REPLACE_PERL=		*.pl
+REPLACE_SH=		mkdep configure
 ###
 ### XXX until we have proper glue, take care to set these when
 ###	using this in a package.
diff --git a/bsh/Makefile b/bsh/Makefile
index 1e74b3665c..e32da61b44 100644
--- a/bsh/Makefile
+++ b/bsh/Makefile
@@ -13,9 +13,9 @@ LICENSE=	spl-1.0 AND gnu-lgpl-v2.1
 
 WRKSRC=		${WRKDIR}
 
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15 sun-jdk14
-USE_JAVA=	yes
-USE_LANGUAGES=	# none
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+USE_JAVA=		yes
+USE_LANGUAGES=		# none
 
 INSTALLATION_DIRS=	bin share/java
 
diff --git a/bss/Makefile b/bss/Makefile
index 13e3fa650f..bd031a523b 100644
--- a/bss/Makefile
+++ b/bss/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.7 2012/11/25 23:32:09 othyro Exp $
 #
 
-DISTNAME=		bss-0.6
-PKGREVISION=   1
-CATEGORIES=		security
-MASTER_SITES=		http://www.secuobs.com/
+DISTNAME=	bss-0.6
+PKGREVISION=	1
+CATEGORIES=	security
+MASTER_SITES=	http://www.secuobs.com/
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.secuobs.com/
@@ -20,7 +20,7 @@ do-build:
 		-o ${WRKSRC:Q}/replay_packet/replay_l2cap_packet
 
 
-DOC_FILES=${WRKSRC}/doc/* ${WRKSRC}/README
+DOC_FILES=	${WRKSRC}/doc/* ${WRKSRC}/README
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/bss ${DESTDIR:Q}${PREFIX:Q}/bin
diff --git a/btscanner/PLIST b/btscanner/PLIST
index b31dba5fee..b20343bfd2 100644
--- a/btscanner/PLIST
+++ b/btscanner/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2005/11/02 02:25:37 poppnk Exp $
+bin/btscanner
 etc/btscanner.dtd
 etc/btscanner.xml
-bin/btscanner
 share/oui.txt
diff --git a/bugzilla/Makefile b/bugzilla/Makefile
index 54b76ed288..fed8fb98ca 100644
--- a/bugzilla/Makefile
+++ b/bugzilla/Makefile
@@ -116,7 +116,7 @@ INSTALLATION_DIRS+=	${BZDIR}/docs/en/html/api/Bugzilla
 INSTALLATION_DIRS+=	${BZDIR}/${i}
 .endfor
 
-FILES_SUBST+=   WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
+FILES_SUBST+=	WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
                 BZDIR=${BZDIR}
 
 do-configure:
diff --git a/bugzilla/options.mk b/bugzilla/options.mk
index f3eefde0d4..71b6a1b041 100644
--- a/bugzilla/options.mk
+++ b/bugzilla/options.mk
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS+=	bugzilla-imagemagick bugzilla-patchviewer
 PKG_SUPPORTED_OPTIONS+=	bugzilla-descriptions bugzilla-xmlrpc
 PKG_SUPPORTED_OPTIONS+=	bugzilla-modperl radius
 PKG_SUPPORTED_OPTIONS+=	mysql pgsql oracle ldap sqlite
-PKG_SUGGESTED_OPTIONS=	                        sqlite
+PKG_SUGGESTED_OPTIONS=	sqlite
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/bullet/Makefile b/bullet/Makefile
index 15f4feadb7..0922169bd8 100644
--- a/bullet/Makefile
+++ b/bullet/Makefile
@@ -18,10 +18,10 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	bullet.pc.in
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release
-CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=on
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE:STRING=Release
+CMAKE_ARGS+=		-DBUILD_SHARED_LIBS:BOOL=on
 # doesn't install anything without this
-CMAKE_ARGS+=	-DINSTALL_LIBS:BOOL=on
+CMAKE_ARGS+=		-DINSTALL_LIBS:BOOL=on
 
 CMAKE_ARGS+=	-DBUILD_BULLET2_DEMOS:BOOL=off
 CMAKE_ARGS+=	-DBUILD_CPU_DEMOS:BOOL=off
diff --git a/bup-git/Makefile b/bup-git/Makefile
index 2fa4945575..e483ba06b6 100644
--- a/bup-git/Makefile
+++ b/bup-git/Makefile
@@ -24,7 +24,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-fuse-bindings
 GIT_REPOSITORIES=	bup
 GIT_REPO.bup=		git://github.com/bup/bup.git
 
-WRKSRC=                 ${WRKDIR}/bup
+WRKSRC=			${WRKDIR}/bup
 
 TEST_TARGET=	test
Prev by Date: wip/a*: fix pkglint indentation warnings
Next by Date: wip/d*: fix pkglint indentation warnings
Previous by Thread: wip/a*: fix pkglint indentation warnings
Next by Thread: wip/d*: fix pkglint indentation warnings
Indexes:
Home | Main Index | Thread Index | Old Index