pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/l*: fix pkglint indentation warnings



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 21:23:08 2018 +0000
Changeset:	74271372051ab3a5ed2d5c4b7fbce34c096743e6

Modified Files:
	l2tpd/Makefile
	labyrinth/Makefile
	last-exit/Makefile
	last.fm/PLIST
	lcalc/Makefile
	lcdis/Makefile
	lcrack/Makefile
	ldapuseradd/Makefile
	ldapuseradd/PLIST
	ldc-git/Makefile
	lde/Makefile
	ldtp/Makefile
	leo/Makefile
	lfe/Makefile
	lgogdownloader-git/Makefile
	lhapdf/Makefile
	libGenome/buildlink3.mk
	libLLVM38/Makefile
	libLLVM38/buildlink3.mk
	libanimal/buildlink3.mk
	libbfio/options.mk
	libbpg/Makefile
	libbtctl/Makefile
	libbtctl/buildlink3.mk
	libc++/Makefile
	libcdata/buildlink3.mk
	libcdata/options.mk
	libcerror/buildlink3.mk
	libcerror/options.mk
	libcfile/buildlink3.mk
	libcgi/Makefile
	libcli/Makefile
	libclocale/Makefile
	libclocale/options.mk
	libcnotify/Makefile
	libcpath/buildlink3.mk
	libcpath/options.mk
	libcsplit/buildlink3.mk
	libcstring/options.mk
	libcthreads/options.mk
	libcuba/Makefile
	libdbglog/Makefile
	libdbglog/buildlink3.mk
	libdbh2/buildlink3.mk
	libdoozer/buildlink3.mk
	libdrm-dfbsd/Makefile
	libdrm-dfbsd/PLIST
	libdrm-dfbsd/builtin.mk
	libdssialsacompat/Makefile
	libdssialsacompat/buildlink3.mk
	libecc/Makefile
	libechonest/Makefile
	libeio-cvs/Makefile
	libeio/Makefile
	libepoll-shim/Makefile
	libevhtp/buildlink3.mk
	libfolks/Makefile
	libfolks/buildlink3.mk
	libfplll/buildlink3.mk
	libftdi1/Makefile
	libftdi1/buildlink3.mk
	libgadu/Makefile
	libgda-bdb/Makefile
	libgda-odbc/options.mk
	libgda4/Makefile
	libgda4/PLIST
	libgda4/options.mk
	libginac/Makefile
	libginac/buildlink3.mk
	libgme/Makefile
	libgraphqlparser/buildlink3.mk
	libgrass5/buildlink3.mk
	libgzstream/Makefile
	libical2/Makefile
	libifstat/options.mk
	libimobiledevice/buildlink3.mk
	libitl/Makefile
	libjingle/buildlink3.mk
	libksysguard/hacks.mk
	libmobi-git/Makefile
	libmpg123/buildlink3.mk
	libncl/Makefile
	libneural/Makefile
	libneural/PLIST
	libnfo/Makefile
	libode/Makefile
	libowl-av/buildlink3.mk
	libpar2/Makefile
	libpar2/buildlink3.mk
	libpsurface/Makefile
	libpthread-stubs-dfbsd/buildlink3.mk
	libpthread-stubs/buildlink3.mk
	libqtxdg/buildlink3.mk
	libreoffice-git/Makefile
	libreoffice-git/options.mk
	libretro-parallel-n64/options.mk
	libretro-ppsspp/options.mk
	libscscp/Makefile
	libscscp/buildlink3.mk
	libsearpc/buildlink3.mk
	libsocialweb/Makefile
	libsocialweb/PLIST
	libsocialweb/options.mk
	libspt/Makefile
	libtermkey/options.mk
	libtextcat/Makefile
	libtextcat/PLIST
	libtlen2/buildlink3.mk
	libtogl/Makefile
	libtorrent-rasterbar/Makefile.common
	libtxc_dxtn/Makefile
	libuna/Makefile
	libuna/options.mk
	libunwind-git/buildlink3.mk
	libvalhalla/Makefile
	libvg/Makefile
	libvips/Makefile
	libvterm/buildlink3.mk
	libxdiff/buildlink3.mk
	libzn-poly/Makefile
	lilypond-git/Makefile
	lilyterm/Makefile
	linphone/Makefile
	linux-acl/buildlink3.mk
	linux-ch/Makefile
	linux-kbd/Makefile
	linux-kernel/options.mk
	linux-nfs-utils/PLIST
	linuxtv-dvb-apps/Makefile
	lissac/Makefile
	litecoin/Makefile
	litecoin/PLIST
	litehtml/buildlink3.mk
	lives/Makefile
	llilc-git/Makefile
	llvm-all-in-one/options.mk
	logwatch/Makefile
	lrslib/Makefile
	lscpu/Makefile
	lsw/Makefile
	ltp-git/PLIST
	lua-MessagePack/Makefile
	lua-lbn/Makefile
	lumberjack/buildlink3.mk
	lumina/options.mk
	lwc/Makefile
	lxqt/Makefile
	lxqt/options.mk

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

pkglint -Wall -F -o aligned l*/

In libftdi1, the CMAKE_ARGS have been fixed manually since they
were syntactically wrong.

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

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

diffstat:
 l2tpd/Makefile                       |   8 +-
 labyrinth/Makefile                   |  10 +-
 last-exit/Makefile                   |   8 +-
 last.fm/PLIST                        |   2 +-
 lcalc/Makefile                       |   4 +-
 lcdis/Makefile                       |  10 +-
 lcrack/Makefile                      |   2 +-
 ldapuseradd/Makefile                 |  10 +-
 ldapuseradd/PLIST                    |  30 ++--
 ldc-git/Makefile                     |   4 +-
 lde/Makefile                         |  10 +-
 ldtp/Makefile                        |   2 +-
 leo/Makefile                         |   2 +-
 lfe/Makefile                         |   4 +-
 lgogdownloader-git/Makefile          |   2 +-
 lhapdf/Makefile                      |   2 +-
 libGenome/buildlink3.mk              |   2 +-
 libLLVM38/Makefile                   |   2 +-
 libLLVM38/buildlink3.mk              |   2 +-
 libanimal/buildlink3.mk              |   2 +-
 libbfio/options.mk                   |   2 +-
 libbpg/Makefile                      |   8 +-
 libbtctl/Makefile                    |   2 +-
 libbtctl/buildlink3.mk               |   2 +-
 libc++/Makefile                      |   2 +-
 libcdata/buildlink3.mk               |   2 +-
 libcdata/options.mk                  |   2 +-
 libcerror/buildlink3.mk              |   2 +-
 libcerror/options.mk                 |   2 +-
 libcfile/buildlink3.mk               |   2 +-
 libcgi/Makefile                      |  10 +-
 libcli/Makefile                      |   2 +-
 libclocale/Makefile                  |  12 +-
 libclocale/options.mk                |   2 +-
 libcnotify/Makefile                  |  12 +-
 libcpath/buildlink3.mk               |   2 +-
 libcpath/options.mk                  |   2 +-
 libcsplit/buildlink3.mk              |   2 +-
 libcstring/options.mk                |   2 +-
 libcthreads/options.mk               |   2 +-
 libcuba/Makefile                     |   2 +-
 libdbglog/Makefile                   |   2 +-
 libdbglog/buildlink3.mk              |   2 +-
 libdbh2/buildlink3.mk                |   2 +-
 libdoozer/buildlink3.mk              |   2 +-
 libdrm-dfbsd/Makefile                |   4 +-
 libdrm-dfbsd/PLIST                   |   2 +-
 libdrm-dfbsd/builtin.mk              |   2 +-
 libdssialsacompat/Makefile           |   2 +-
 libdssialsacompat/buildlink3.mk      |   4 +-
 libecc/Makefile                      |   2 +-
 libechonest/Makefile                 |   4 +-
 libeio-cvs/Makefile                  |   4 +-
 libeio/Makefile                      |   4 +-
 libepoll-shim/Makefile               |   2 +-
 libevhtp/buildlink3.mk               |   2 +-
 libfolks/Makefile                    |   8 +-
 libfolks/buildlink3.mk               |   2 +-
 libfplll/buildlink3.mk               |   2 +-
 libftdi1/Makefile                    |  16 +--
 libftdi1/buildlink3.mk               |   2 +-
 libgadu/Makefile                     |   2 +-
 libgda-bdb/Makefile                  |   4 +-
 libgda-odbc/options.mk               |   6 +-
 libgda4/Makefile                     |   6 +-
 libgda4/PLIST                        | 116 +++++++--------
 libgda4/options.mk                   |  14 +-
 libginac/Makefile                    |   4 +-
 libginac/buildlink3.mk               |   2 +-
 libgme/Makefile                      |   4 +-
 libgraphqlparser/buildlink3.mk       |   2 +-
 libgrass5/buildlink3.mk              |   2 +-
 libgzstream/Makefile                 |   6 +-
 libical2/Makefile                    |   2 +-
 libifstat/options.mk                 |  40 +++---
 libimobiledevice/buildlink3.mk       |   6 +-
 libitl/Makefile                      |   2 +-
 libjingle/buildlink3.mk              |   2 +-
 libksysguard/hacks.mk                |   2 +-
 libmobi-git/Makefile                 |   2 +-
 libmpg123/buildlink3.mk              |   2 +-
 libncl/Makefile                      |   4 +-
 libneural/Makefile                   |  10 +-
 libneural/PLIST                      |  42 +++---
 libnfo/Makefile                      |   4 +-
 libode/Makefile                      |   2 +-
 libowl-av/buildlink3.mk              |   2 +-
 libpar2/Makefile                     |   2 +-
 libpar2/buildlink3.mk                |   2 +-
 libpsurface/Makefile                 |   4 +-
 libpthread-stubs-dfbsd/buildlink3.mk |   2 +-
 libpthread-stubs/buildlink3.mk       |   2 +-
 libqtxdg/buildlink3.mk               |   2 +-
 libreoffice-git/Makefile             |   8 +-
 libreoffice-git/options.mk           |   2 +-
 libretro-parallel-n64/options.mk     |  22 +--
 libretro-ppsspp/options.mk           |   2 +-
 libscscp/Makefile                    |   2 +-
 libscscp/buildlink3.mk               |   2 +-
 libsearpc/buildlink3.mk              |   2 +-
 libsocialweb/Makefile                |  10 +-
 libsocialweb/PLIST                   |  14 +-
 libsocialweb/options.mk              |   2 +-
 libspt/Makefile                      |   6 +-
 libtermkey/options.mk                |   2 +-
 libtextcat/Makefile                  |   2 +-
 libtextcat/PLIST                     |   2 +-
 libtlen2/buildlink3.mk               |   2 +-
 libtogl/Makefile                     |   2 +-
 libtorrent-rasterbar/Makefile.common |   2 +-
 libtxc_dxtn/Makefile                 |   2 +-
 libuna/Makefile                      |   4 +-
 libuna/options.mk                    |   2 +-
 libunwind-git/buildlink3.mk          |   2 +-
 libvalhalla/Makefile                 |   2 +-
 libvg/Makefile                       |   6 +-
 libvips/Makefile                     |  10 +-
 libvterm/buildlink3.mk               |   2 +-
 libxdiff/buildlink3.mk               |   2 +-
 libzn-poly/Makefile                  |   2 +-
 lilypond-git/Makefile                |   4 +-
 lilyterm/Makefile                    |   6 +-
 linphone/Makefile                    |   8 +-
 linux-acl/buildlink3.mk              |   2 +-
 linux-ch/Makefile                    |   2 +-
 linux-kbd/Makefile                   |   4 +-
 linux-kernel/options.mk              |   2 +-
 linux-nfs-utils/PLIST                |   4 +-
 linuxtv-dvb-apps/Makefile            |   2 +-
 lissac/Makefile                      |   4 +-
 litecoin/Makefile                    |  34 ++---
 litecoin/PLIST                       |   4 +-
 litehtml/buildlink3.mk               |   4 +-
 lives/Makefile                       |   2 +-
 llilc-git/Makefile                   |   6 +-
 llvm-all-in-one/options.mk           |   2 +-
 logwatch/Makefile                    |   2 +-
 lrslib/Makefile                      |   2 +-
 lscpu/Makefile                       |   2 +-
 lsw/Makefile                         |  20 +--
 ltp-git/PLIST                        | 270 +++++++++++++++++------------------
 lua-MessagePack/Makefile             |   4 +-
 lua-lbn/Makefile                     |   2 +-
 lumberjack/buildlink3.mk             |   2 +-
 lumina/options.mk                    |   2 +-
 lwc/Makefile                         |  10 +-
 lxqt/Makefile                        |  50 +++----
 lxqt/options.mk                      |   4 +-
 148 files changed, 573 insertions(+), 573 deletions(-)

diffs:
diff --git a/l2tpd/Makefile b/l2tpd/Makefile
index aa2e81ebf3..09569c7550 100644
--- a/l2tpd/Makefile
+++ b/l2tpd/Makefile
@@ -14,10 +14,10 @@ NO_CONFIGURE=	YES
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR?=	l2tpd
-DOCDIR=		${PREFIX}/share/doc/l2tpd
-EGDIR=		${PREFIX}/share/examples/l2tpd
-CONF_FILES=	${EGDIR:Q}/l2tpd.conf.sample ${PKG_SYSCONFDIR:Q}/l2tpd.conf
-CONF_FILES+=	${EGDIR:Q}/l2tp-secrets.sample ${PKG_SYSCONFDIR:Q}/l2tpd-secrets
+DOCDIR=			${PREFIX}/share/doc/l2tpd
+EGDIR=			${PREFIX}/share/examples/l2tpd
+CONF_FILES=		${EGDIR:Q}/l2tpd.conf.sample ${PKG_SYSCONFDIR:Q}/l2tpd.conf
+CONF_FILES+=		${EGDIR:Q}/l2tp-secrets.sample ${PKG_SYSCONFDIR:Q}/l2tpd-secrets
 
 CFLAGS+=	-DPREFIX=\"${PREFIX:Q}\" -DSANITY
 
diff --git a/labyrinth/Makefile b/labyrinth/Makefile
index e3ddf769f3..fd7a81b540 100644
--- a/labyrinth/Makefile
+++ b/labyrinth/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Labyrinth is a lightweight mind-mapping tool for GNOME
 
 DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
-WRKSRC=		${WRKDIR}/labyrinth-0.4.0
-GNU_CONFIGURE=	yes
+WRKSRC=			${WRKDIR}/labyrinth-0.4.0
+GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool gmake
-USE_LANGUAGES=	c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config intltool gmake
+USE_LANGUAGES=		c c++
 
 PY_PATCHPLIST=		yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gobject
diff --git a/last-exit/Makefile b/last-exit/Makefile
index cbbadf713d..420d18fc78 100644
--- a/last-exit/Makefile
+++ b/last-exit/Makefile
@@ -12,11 +12,11 @@ HOMEPAGE=	http://lastexit-player.org/index.php/Main_Page
 COMMENT=	Last Exit is streaming media player for GNOME
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=	pkg-config perl intltool msgfmt gmake bash:run
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
+USE_TOOLS+=		pkg-config perl intltool msgfmt gmake bash:run
+USE_LIBTOOL=		yes
+USE_LANGUAGES=		c c++
 
 CONFIGURE_ENV+=	GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 MAKE_ENV+=	GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
diff --git a/last.fm/PLIST b/last.fm/PLIST
index 1129d0d54a..c826977f40 100644
--- a/last.fm/PLIST
+++ b/last.fm/PLIST
@@ -10,6 +10,7 @@ share/last.fm/.libs/libLastFmTools.la
 share/last.fm/.libs/libLastFmTools.so
 share/last.fm/.libs/libLastFmTools.so.1
 share/last.fm/.libs/libLastFmTools.so.1.0.0
+share/last.fm/LastFMHelper
 share/last.fm/data/about.png
 share/last.fm/data/about_generic.png
 share/last.fm/data/about_mac.png
@@ -107,7 +108,6 @@ share/last.fm/data/watermark.png
 share/last.fm/data/wizard.png
 share/last.fm/data/wizard_generic.png
 share/last.fm/data/wizard_mac.png
-share/last.fm/LastFMHelper
 share/last.fm/last.fm
 share/last.fm/last.fm.app
 share/last.fm/libLastFmTools.la
diff --git a/lcalc/Makefile b/lcalc/Makefile
index e8c197323d..ce9814e8f3 100644
--- a/lcalc/Makefile
+++ b/lcalc/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://pmmac03.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://pmmac03.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/
 COMMENT=	Lcalc is a program for calculating with L-functions
-LICENSE=		gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
-WRKSRC=	${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
diff --git a/lcdis/Makefile b/lcdis/Makefile
index 2f61b69cc9..0f55c9dce6 100644
--- a/lcdis/Makefile
+++ b/lcdis/Makefile
@@ -6,11 +6,11 @@ CATEGORIES=	devel
 MASTER_SITES=	https://travispaul.me/distfiles/
 EXTRACT_SUFX=	.ZIP
 
-MAINTAINER=	tr%vispaul.me@localhost
-HOMEPAGE=	https://web.archive.org/web/20110927100411/http://www.maushammer.com/vmu.html
-COMMENT=	Disassembler for the Sega VMU/VMS
-LICENSE=	gnu-gpl-v2
-WRKSRC=		${WRKDIR}
+MAINTAINER=		tr%vispaul.me@localhost
+HOMEPAGE=		https://web.archive.org/web/20110927100411/http://www.maushammer.com/vmu.html
+COMMENT=		Disassembler for the Sega VMU/VMS
+LICENSE=		gnu-gpl-v2
+WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin
 
 do-build:
diff --git a/lcrack/Makefile b/lcrack/Makefile
index c7231b01e6..3d0fb4f4d8 100644
--- a/lcrack/Makefile
+++ b/lcrack/Makefile
@@ -12,7 +12,7 @@ COMMENT=		Generic password hash cracker
 WRKSRC=		${WRKDIR}/
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=unknown  # talking with authors to solve this :)
+CONFIGURE_ARGS+=	unknown  # talking with authors to solve this :)
 
 INSTALLATION_DIRS=	bin
 
diff --git a/ldapuseradd/Makefile b/ldapuseradd/Makefile
index 75a5c56924..bbc4fa9f23 100644
--- a/ldapuseradd/Makefile
+++ b/ldapuseradd/Makefile
@@ -5,18 +5,18 @@ CATEGORIES=	databases
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	inittab%unixdev.net@localhost
-MASTER_SITES=   http://ftp.unixdev.net/pub/unixdev/ldapuseradd/0.9.2/
+MASTER_SITES=	http://ftp.unixdev.net/pub/unixdev/ldapuseradd/0.9.2/
 
-HOMEPAGE=       http://www.unixdev.net/projects/ldapuseradd/
-COMMENT=        LDAP User/Group Management Toolset
+HOMEPAGE=	http://www.unixdev.net/projects/ldapuseradd/
+COMMENT=	LDAP User/Group Management Toolset
 
 
-USE_TOOLS+=             gmake
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 BROKEN_GETTEXT_DETECTION=	yes
 CFLAGS=		-fPIC
 
-INSTALLATION_DIRS=      sbin lib/ldapuseradd ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS=	sbin lib/ldapuseradd ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
diff --git a/ldapuseradd/PLIST b/ldapuseradd/PLIST
index 120e584ac8..ddb6d252d2 100644
--- a/ldapuseradd/PLIST
+++ b/ldapuseradd/PLIST
@@ -1,25 +1,25 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 04:59:22 gregschenzel Exp $
-sbin/ldapuseradd
-sbin/ldapusermod
-sbin/ldapuserdel
-sbin/ldapgroupadd
-sbin/ldapgroupmod
-sbin/ldapgroupdel
-etc/ldapuseradd/ldapuseradd.conf
+etc/ldapuseradd/groups.ldap
 etc/ldapuseradd/ldapuseradd-large.conf
+etc/ldapuseradd/ldapuseradd.conf
 etc/ldapuseradd/users.ldap
-etc/ldapuseradd/groups.ldap
 lib/ldapuseradd/hook_home.so
 lib/ldapuseradd/hook_mail.so
-lib/ldapuseradd/hook_web.so
-lib/ldapuseradd/hook_sql.so
 lib/ldapuseradd/hook_script.so
+lib/ldapuseradd/hook_sql.so
+lib/ldapuseradd/hook_web.so
+man/man5/groups.ldap.5
 man/man5/ldapuseradd.conf.5
 man/man5/users.ldap.5
-man/man5/groups.ldap.5
-man/man8/ldapuseradd.8
-man/man8/ldapusermod.8
-man/man8/ldapuserdel.8
 man/man8/ldapgroupadd.8
-man/man8/ldapgroupmod.8
 man/man8/ldapgroupdel.8
+man/man8/ldapgroupmod.8
+man/man8/ldapuseradd.8
+man/man8/ldapuserdel.8
+man/man8/ldapusermod.8
+sbin/ldapgroupadd
+sbin/ldapgroupdel
+sbin/ldapgroupmod
+sbin/ldapuseradd
+sbin/ldapuserdel
+sbin/ldapusermod
diff --git a/ldc-git/Makefile b/ldc-git/Makefile
index d4dbd522e3..1db4e46d47 100644
--- a/ldc-git/Makefile
+++ b/ldc-git/Makefile
@@ -4,8 +4,8 @@ PKGNAME=	ldc-0.17.0
 CATEGORIES=	lang
 
 GIT_REPOSITORIES=	ldc
-GIT_REPO.ldc=	https://github.com/ldc-developers/ldc.git
-WRKSRC=	${WRKDIR}/ldc
+GIT_REPO.ldc=		https://github.com/ldc-developers/ldc.git
+WRKSRC=			${WRKDIR}/ldc
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://wiki.dlang.org/LDC
diff --git a/lde/Makefile b/lde/Makefile
index 5e8c20aeb7..2f906a349b 100644
--- a/lde/Makefile
+++ b/lde/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE=	http://lde.sourceforge.net
 COMMENT=	Curses based file system viewer/editor for Linux
 
 
-USE_NCURSES=	YES # missing function termname
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-CONFIGURE_ARGS+=--with-ncurses=${PREFIX:Q} \
-		--disable-root-sbin
+USE_NCURSES=		YES # missing function termname
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		gmake
+CONFIGURE_ARGS+=	--with-ncurses=${PREFIX:Q} \
+			--disable-root-sbin
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/ldtp/Makefile b/ldtp/Makefile
index a197861a79..5a47bd1777 100644
--- a/ldtp/Makefile
+++ b/ldtp/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-at-spi-[0-9]*:../../devel/py-at-spi
 
 USE_LANGUAGES=	# none
 
-REPLACE_PYTHON+=	bin/ldtp
+REPLACE_PYTHON+=		bin/ldtp
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit and py-gnome2 via py-at-spi, py-gobject
 
 .include "../../devel/py-gobject/buildlink3.mk"
diff --git a/leo/Makefile b/leo/Makefile
index 59e77b2cfe..eb90c1fc80 100644
--- a/leo/Makefile
+++ b/leo/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=		${PYPKGPREFIX}-docutils>=0.3.9:../../textproc/py-docutils
 DEPENDS+=		${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 
-NO_BUILD=		yes
+NO_BUILD=	yes
 REPLACE_PYTHON=	src/leo.py scripts/LinixInstall.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-docutils
 
diff --git a/lfe/Makefile b/lfe/Makefile
index 24e44b5d8f..51a5bb5b25 100644
--- a/lfe/Makefile
+++ b/lfe/Makefile
@@ -22,9 +22,9 @@ SUBST_FILES.lfe=		bin/lfec
 SUBST_FILES.lfe+=		bin/lfedoc
 CHECK_INTERPRETER=		no
 
-NO_CONFIGURE=	yes
+NO_CONFIGURE=		yes
 BUILD_MAKE_FLAGS=	compile
-LICENSE=	apache-2.0
+LICENSE=		apache-2.0
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lgogdownloader-git/Makefile b/lgogdownloader-git/Makefile
index c36a221f4e..33fa29878e 100644
--- a/lgogdownloader-git/Makefile
+++ b/lgogdownloader-git/Makefile
@@ -25,7 +25,7 @@ CMAKE_ARGS+=	-DPC_JSONCPP_LIBRARY_DIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/lib
 CMAKE_ARGS+=	-DINSTALL_SHARE_DIR:PATH=${PREFIX}
 
 # https://github.com/Sude-/lgogdownloader/issues/128
-PKGSRC_USE_STACK_CHECK=no
+PKGSRC_USE_STACK_CHECK=	no
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../security/liboauth/buildlink3.mk"
diff --git a/lhapdf/Makefile b/lhapdf/Makefile
index 82a4715a14..d442e4437e 100644
--- a/lhapdf/Makefile
+++ b/lhapdf/Makefile
@@ -16,7 +16,7 @@ USE_LANGUAGES=	c c++ fortran
 
 PKGCONFIG_OVERRIDE+=	lhapdf.pc.in
 
-REPLACE_BASH+=  lhapdf-config.in
+REPLACE_BASH+=	lhapdf-config.in
 
 .include "options.mk"
 
diff --git a/libGenome/buildlink3.mk b/libGenome/buildlink3.mk
index 50e64b132f..55b89990f5 100644
--- a/libGenome/buildlink3.mk
+++ b/libGenome/buildlink3.mk
@@ -16,7 +16,7 @@ BUILDLINK_TREE+=	libGenome
 LIBGENOME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libGenome+=	libGenome>=0.5.2
-BUILDLINK_PKGSRCDIR.libGenome?=	../../wip/libGenome
+BUILDLINK_PKGSRCDIR.libGenome?=		../../wip/libGenome
 .endif # LIBGENOME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libGenome
diff --git a/libLLVM38/Makefile b/libLLVM38/Makefile
index e153c496a0..9cf2992459 100644
--- a/libLLVM38/Makefile
+++ b/libLLVM38/Makefile
@@ -23,7 +23,7 @@ USE_CMAKE=		yes
 GCC_REQD+=		4.8
 PYTHON_FOR_BUILD_ONLY=	yes
 
-CONFIGURE_DIRS=         ${WRKDIR}/build
+CONFIGURE_DIRS=		${WRKDIR}/build
 CMAKE_ARG_PATH=		${WRKSRC}
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
diff --git a/libLLVM38/buildlink3.mk b/libLLVM38/buildlink3.mk
index fcc3d22d17..52725b00bd 100644
--- a/libLLVM38/buildlink3.mk
+++ b/libLLVM38/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libLLVM38
 LIBLLVM38_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libLLVM38+=	libLLVM38>=3.8.0
-BUILDLINK_PKGSRCDIR.libLLVM38?=	../../wip/libLLVM38
+BUILDLINK_PKGSRCDIR.libLLVM38?=		../../wip/libLLVM38
 
 LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.libLLVM38}/libexec/libLLVM38/llvm-config
 
diff --git a/libanimal/buildlink3.mk b/libanimal/buildlink3.mk
index 183faa70ba..a41bb796ec 100644
--- a/libanimal/buildlink3.mk
+++ b/libanimal/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libanimal
 LIBANIMAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libanimal+=	libanimal>=0.15.0
-BUILDLINK_PKGSRCDIR.libanimal?=	../../wip/libanimal
+BUILDLINK_PKGSRCDIR.libanimal?=		../../wip/libanimal
 .endif # LIBANIMAL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libanimal
diff --git a/libbfio/options.mk b/libbfio/options.mk
index ac54cdbea3..57c6bf81e4 100644
--- a/libbfio/options.mk
+++ b/libbfio/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libbpg/Makefile b/libbpg/Makefile
index 19635c7b5b..1662e69af1 100644
--- a/libbpg/Makefile
+++ b/libbpg/Makefile
@@ -9,10 +9,10 @@ HOMEPAGE=	https://bellard.org/bpg/
 COMMENT=	Library for BGP (Better Portable Graphics)
 #LICENSE=	# TODO: (see mk/license.mk)
 
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
-MAKE_FLAGS+=	prefix=${PREFIX}
-MAKE_FLAGS+=	DESTDIR=${DESTDIR}
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
+MAKE_FLAGS+=		prefix=${PREFIX}
+MAKE_FLAGS+=		DESTDIR=${DESTDIR}
 INSTALLATION_DIRS=	bin
 
 post-install:
diff --git a/libbtctl/Makefile b/libbtctl/Makefile
index 0294c94ddd..f3a7ff34c2 100644
--- a/libbtctl/Makefile
+++ b/libbtctl/Makefile
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/mono/libbtctl/libbtctl-sharp.pc.in
 
 GNU_CONFIGURE=		yes
 
-ONLY_FOR_PLATFORM=Linux-*-*
+ONLY_FOR_PLATFORM=	Linux-*-*
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/libbtctl/buildlink3.mk b/libbtctl/buildlink3.mk
index bb43cd4060..a53de0707d 100644
--- a/libbtctl/buildlink3.mk
+++ b/libbtctl/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libbtctl
 LIBBTCTL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libbtctl+=	libbtctl>=0.4.1
-BUILDLINK_PKGSRCDIR.libbtctl?=	../../wip/libbtctl
+BUILDLINK_PKGSRCDIR.libbtctl?=		../../wip/libbtctl
 
 .include "../../wip/bluez-libs/buildlink3.mk"
 .include "../../comms/openobex/buildlink3.mk"
diff --git a/libc++/Makefile b/libc++/Makefile
index 10ff5810d1..e340b9aef4 100644
--- a/libc++/Makefile
+++ b/libc++/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES=		c c++ c++11
 USE_CMAKE=		yes
 GCC_REQD+=		4.8
 
-CONFIGURE_DIRS=         ${WRKDIR}/build
+CONFIGURE_DIRS=		${WRKDIR}/build
 CMAKE_ARG_PATH=		${WRKSRC}
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
diff --git a/libcdata/buildlink3.mk b/libcdata/buildlink3.mk
index 2dec6c75dc..4cfe37ff44 100644
--- a/libcdata/buildlink3.mk
+++ b/libcdata/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcdata
 LIBCDATA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcdata+=	libcdata>=20130407
-BUILDLINK_PKGSRCDIR.libcdata?=	../../wip/libcdata
+BUILDLINK_PKGSRCDIR.libcdata?=		../../wip/libcdata
 
 .include "../../wip/libcerror/buildlink3.mk"
 .endif	# LIBCDATA_BUILDLINK3_MK
diff --git a/libcdata/options.mk b/libcdata/options.mk
index cc6cab8ec9..046acba874 100644
--- a/libcdata/options.mk
+++ b/libcdata/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libcerror/buildlink3.mk b/libcerror/buildlink3.mk
index 6b5d61a324..2e54b2073e 100644
--- a/libcerror/buildlink3.mk
+++ b/libcerror/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcerror
 LIBCERROR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcerror+=	libcerror>=20121222
-BUILDLINK_PKGSRCDIR.libcerror?=	../../wip/libcerror
+BUILDLINK_PKGSRCDIR.libcerror?=		../../wip/libcerror
 
 .endif	# LIBCERROR_BUILDLINK3_MK
 
diff --git a/libcerror/options.mk b/libcerror/options.mk
index 9b1caf369a..c574d3b4bb 100644
--- a/libcerror/options.mk
+++ b/libcerror/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libcfile/buildlink3.mk b/libcfile/buildlink3.mk
index 341966c4de..6716b14189 100644
--- a/libcfile/buildlink3.mk
+++ b/libcfile/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcfile
 LIBCFILE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcfile+=	libcfile>=20130509
-BUILDLINK_PKGSRCDIR.libcfile?=	../../wip/libcfile
+BUILDLINK_PKGSRCDIR.libcfile?=		../../wip/libcfile
 
 .include "../../wip/libuna/buildlink3.mk"
 .include "../../wip/libcnotify/buildlink3.mk"
diff --git a/libcgi/Makefile b/libcgi/Makefile
index c74fbc3e48..9efbcb6358 100644
--- a/libcgi/Makefile
+++ b/libcgi/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.1 2013/03/08 12:36:39 makoto Exp $
 DISTNAME=	libcgi-1.0
-CATEGORIES=     www
-MASTER_SITES=   http://prdownloads.sourceforge.net/libcgi/
+CATEGORIES=	www
+MASTER_SITES=	http://prdownloads.sourceforge.net/libcgi/
 LICENSE=	generic-nonlicense
 
-MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=       http://libcgi.sourceforge.net/
-COMMENT=        Library for authoring cgi
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://libcgi.sourceforge.net/
+COMMENT=	Library for authoring cgi
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
diff --git a/libcli/Makefile b/libcli/Makefile
index 0e6bc7569e..50748fd1d2 100644
--- a/libcli/Makefile
+++ b/libcli/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libcli/}
 MAINTAINER=	haaaad%gmail.com@localhost
 HOMEPAGE=	http://libcli.sourceforge.net/
 
-COMMENT="Provides a shared library for including a Cisco-like CLI."
+COMMENT=	"Provides a shared library for including a Cisco-like CLI."
 
 
 USE_LANGUAGES+=	c
diff --git a/libclocale/Makefile b/libclocale/Makefile
index 26e5d38b74..d67fbcb5ec 100644
--- a/libclocale/Makefile
+++ b/libclocale/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.5 2014/02/03 09:15:52 othyro Exp $
 
-DISTNAME=       libclocale-alpha-20150101
-GITHUB_PROJECT= libclocale
-GITHUB_RELEASE= ${PKGVERSION_NOREV}
-PKGNAME=        ${DISTNAME:S/-alpha//1}
-CATEGORIES=     devel
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=libyal/}
+DISTNAME=	libclocale-alpha-20150101
+GITHUB_PROJECT=	libclocale
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
+PKGNAME=	${DISTNAME:S/-alpha//1}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libyal/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/libyal/libclocale
diff --git a/libclocale/options.mk b/libclocale/options.mk
index b348fd136f..83a643180a 100644
--- a/libclocale/options.mk
+++ b/libclocale/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libcnotify/Makefile b/libcnotify/Makefile
index 3e23ca8a5b..33a9061eb7 100644
--- a/libcnotify/Makefile
+++ b/libcnotify/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.4 2014/02/03 09:23:21 othyro Exp $
 
-DISTNAME=       libcnotify-alpha-20150101
-GITHUB_PROJECT= libcnotify
-GITHUB_RELEASE= ${PKGVERSION_NOREV}
-PKGNAME=        ${DISTNAME:S/-alpha//1}
-CATEGORIES=     devel
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=libyal/}
+DISTNAME=	libcnotify-alpha-20150101
+GITHUB_PROJECT=	libcnotify
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
+PKGNAME=	${DISTNAME:S/-alpha//1}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libyal/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/libyal/libcnotify
diff --git a/libcpath/buildlink3.mk b/libcpath/buildlink3.mk
index 66fdcf0974..fa29b1c089 100644
--- a/libcpath/buildlink3.mk
+++ b/libcpath/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcpath
 LIBCPATH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcpath+=	libcpath>=20121225
-BUILDLINK_PKGSRCDIR.libcpath?=	../../wip/libcpath
+BUILDLINK_PKGSRCDIR.libcpath?=		../../wip/libcpath
 
 .include "../../wip/libuna/buildlink3.mk"
 .include "../../wip/libcsplit/buildlink3.mk"
diff --git a/libcpath/options.mk b/libcpath/options.mk
index bc4ba56015..4f0589865a 100644
--- a/libcpath/options.mk
+++ b/libcpath/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libcsplit/buildlink3.mk b/libcsplit/buildlink3.mk
index f64fdb499e..a221a7591d 100644
--- a/libcsplit/buildlink3.mk
+++ b/libcsplit/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcsplit
 LIBCSPLIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcsplit+=	libcsplit>=20121224
-BUILDLINK_PKGSRCDIR.libcsplit?=	../../wip/libcsplit
+BUILDLINK_PKGSRCDIR.libcsplit?=		../../wip/libcsplit
 
 .include "../../wip/libcerror/buildlink3.mk"
 .endif	# LIBCSPLIT_BUILDLINK3_MK
diff --git a/libcstring/options.mk b/libcstring/options.mk
index e58f573c5b..3c82e9c6a0 100644
--- a/libcstring/options.mk
+++ b/libcstring/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libcthreads/options.mk b/libcthreads/options.mk
index 980fd6ca77..0f6d578b3e 100644
--- a/libcthreads/options.mk
+++ b/libcthreads/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libcuba/Makefile b/libcuba/Makefile
index 2eed978e77..e2fc173566 100644
--- a/libcuba/Makefile
+++ b/libcuba/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.feynarts.de/cuba/
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.feynarts.de/cuba/
 COMMENT=	Library for multidimensional numerical integration
-LICENSE= 	gnu-gpl-v3
+LICENSE=	gnu-gpl-v3
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/libdbglog/Makefile b/libdbglog/Makefile
index 268f4a7dbe..499af01d4d 100644
--- a/libdbglog/Makefile
+++ b/libdbglog/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
-USE_TOOLS+=     aclocal autoconf automake
+USE_TOOLS+=	aclocal autoconf automake
 
 pre-configure:
 	cd ${WRKSRC} && aclocal && libtoolize --force && automake --foreign --add-missing && autoconf
diff --git a/libdbglog/buildlink3.mk b/libdbglog/buildlink3.mk
index 25f653493c..28ce2e8d3a 100644
--- a/libdbglog/buildlink3.mk
+++ b/libdbglog/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libdbglog
 LIBDBGLOG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdbglog+=	libdbglog>=1.5.1
-BUILDLINK_PKGSRCDIR.libdbglog?=	../../wip/libdbglog
+BUILDLINK_PKGSRCDIR.libdbglog?=		../../wip/libdbglog
 .endif	# LIBDBGLOG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libdbglog
diff --git a/libdbh2/buildlink3.mk b/libdbh2/buildlink3.mk
index b4e67590ba..3976bfacd3 100644
--- a/libdbh2/buildlink3.mk
+++ b/libdbh2/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libdbh2
 .if !defined(LIBDBH2_BUILDLINK3_MK)
 LIBDBH2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libdbh2+=		libdbh2>=5.0.16
+BUILDLINK_API_DEPENDS.libdbh2+=	libdbh2>=5.0.16
 BUILDLINK_PKGSRCDIR.libdbh2?=	../../wip/libdbh2
 .endif # LIBDBH2_BUILDLINK3_MK
 
diff --git a/libdoozer/buildlink3.mk b/libdoozer/buildlink3.mk
index e101dccfcb..95ff5f720d 100644
--- a/libdoozer/buildlink3.mk
+++ b/libdoozer/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libdoozer
 LIBDOOZER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdoozer+=	libdoozer>=0.1
-BUILDLINK_PKGSRCDIR.libdoozer?=	../../wip/libdoozer
+BUILDLINK_PKGSRCDIR.libdoozer?=		../../wip/libdoozer
 .endif	# LIBDOOZER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libdoozer
diff --git a/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index ea35a179f5..82be8525da 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -67,9 +67,9 @@ CONFIGURE_ARGS+=	PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
 			PTHREADSTUBS_LIBS=-L${PREFIX}/lib
 .endif
 
-PLIST_VARS+=	libkms	
+PLIST_VARS+=		libkms	
 .if !empty(PKG_OPTIONS:Mlibkms)
-PLIST.libkms=	yes
+PLIST.libkms=		yes
 CONFIGURE_ARGS+=	--enable-libkms
 .else
 CONFIGURE_ARGS+=	--disable-libkms
diff --git a/libdrm-dfbsd/PLIST b/libdrm-dfbsd/PLIST
index d49ebf1ffb..b83036426e 100644
--- a/libdrm-dfbsd/PLIST
+++ b/libdrm-dfbsd/PLIST
@@ -37,12 +37,12 @@ include/libdrm/savage_drm.h
 include/libdrm/sis_drm.h
 include/libdrm/tegra_drm.h
 include/libdrm/vc4_drm.h
-${PLIST.libkms}include/libkms/libkms.h
 ${PLIST.arm}include/libdrm/vc4_packet.h
 ${PLIST.arm}include/libdrm/vc4_qpu_defines.h
 include/libdrm/via_drm.h
 include/libdrm/virtgpu_drm.h
 include/libdrm/vmwgfx_drm.h
+${PLIST.libkms}include/libkms/libkms.h
 include/libsync.h
 include/xf86drm.h
 include/xf86drmMode.h
diff --git a/libdrm-dfbsd/builtin.mk b/libdrm-dfbsd/builtin.mk
index d9fe1b4f32..1b52d9b25e 100644
--- a/libdrm-dfbsd/builtin.mk
+++ b/libdrm-dfbsd/builtin.mk
@@ -1,6 +1,6 @@
 # $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
-BUILTIN_PKG:=	libdrm
+BUILTIN_PKG:=		libdrm
 PKGCONFIG_FILE.libdrm=	${X11BASE}/lib/pkgconfig/libdrm.pc
 PKGCONFIG_FILE.libdrm+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/libdrm.pc
 
diff --git a/libdssialsacompat/Makefile b/libdssialsacompat/Makefile
index 889757424b..7de2498fc5 100644
--- a/libdssialsacompat/Makefile
+++ b/libdssialsacompat/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v2.1
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES+= c
+USE_LANGUAGES+=	c
 
 INSTALLATION_DIRS=	include/dssi/alsa/sound
 PKGCONFIG_OVERRIDE+=	libdssialsacompat.pc.in
diff --git a/libdssialsacompat/buildlink3.mk b/libdssialsacompat/buildlink3.mk
index 921608de91..faa9b60ae1 100644
--- a/libdssialsacompat/buildlink3.mk
+++ b/libdssialsacompat/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	libdssialsacompat
 LIBDSSIALSACOMPAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdssialsacompat+=	libdssialsacompat>=1.0.8a
-BUILDLINK_PKGSRCDIR.libdssialsacompat?=	../../wip/libdssialsacompat
-BUILDLINK_DEPMETHOD.libdssialsacompat?=	build
+BUILDLINK_PKGSRCDIR.libdssialsacompat?=		../../wip/libdssialsacompat
+BUILDLINK_DEPMETHOD.libdssialsacompat?=		build
 .endif # LIBDSSIALSACOMPAT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libdssialsacompat
diff --git a/libecc/Makefile b/libecc/Makefile
index 10d885cb26..faeca98335 100644
--- a/libecc/Makefile
+++ b/libecc/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://libecc.sourceforge.net/
 COMMENT=	C++ elliptic curve library
 #LICENSE=	# TODO: (see mk/license.mk)
 
-MAKE_JOBS_SAFE=NO
+MAKE_JOBS_SAFE=	NO
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/libechonest/Makefile b/libechonest/Makefile
index 054223828e..c6f2202825 100644
--- a/libechonest/Makefile
+++ b/libechonest/Makefile
@@ -10,14 +10,14 @@ HOMEPAGE=	https://github.com/lfranchi/libechonest
 COMMENT=	Libechonest is a collection of C++/Qt classes for The Echo Nest APIs
 LICENSE=	gnu-gpl-v2
 
-CMAKE_FLAGS+= DBUILD_WITH_QT4=ON
+CMAKE_FLAGS+=	DBUILD_WITH_QT4=ON
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake \
+BUILD_DEPENDS+=	cmake-[0-9]*:../../devel/cmake \
 		pkgconf>=0.9.10:../../devel/pkgconf
 
 .include "../../devel/qjson/buildlink3.mk"
diff --git a/libeio-cvs/Makefile b/libeio-cvs/Makefile
index f7a5f2707c..e1d316a0ab 100644
--- a/libeio-cvs/Makefile
+++ b/libeio-cvs/Makefile
@@ -17,8 +17,8 @@ USE_TOOLS+=	autoconf automake
 
 WRKSRC=		${WRKDIR}/libeio
 
-GNU_CONFIGURE_LIBSUBDIR=eio
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/eio
+GNU_CONFIGURE_LIBSUBDIR=	eio
+CONFIGURE_ARGS+=		--includedir=${PREFIX}/include/eio
 
 # password = anoncvs
 CVS_ROOT.libeio=	:pserver:anonymous%cvs.schmorp.de@localhost/schmorpforge
diff --git a/libeio/Makefile b/libeio/Makefile
index 206f20c5f0..0f062f0316 100644
--- a/libeio/Makefile
+++ b/libeio/Makefile
@@ -17,8 +17,8 @@ USE_TOOLS+=	autoconf automake
 
 WRKSRC=	${WRKDIR}/${PKGBASE}-${DISTNAME}
 
-GNU_CONFIGURE_LIBSUBDIR=eio
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/eio
+GNU_CONFIGURE_LIBSUBDIR=	eio
+CONFIGURE_ARGS+=		--includedir=${PREFIX}/include/eio
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} ./autogen.sh
diff --git a/libepoll-shim/Makefile b/libepoll-shim/Makefile
index 674ccf2ae9..f21f7f11ba 100644
--- a/libepoll-shim/Makefile
+++ b/libepoll-shim/Makefile
@@ -28,7 +28,7 @@ BUILDLINK_TRANSFORM+=	opt:-Wno-missing-variable-declarations:-Wno-missing-declar
 BUILDLINK_TRANSFORM+=	rm:-Wno-thread-safety-analysis
 .endif
 
-INSTALLATION_DIRS= lib include/libepoll-shim/sys
+INSTALLATION_DIRS=	lib include/libepoll-shim/sys
 
 post-install:
 	cp ${WRKSRC}/include/sys/*.h ${DESTDIR}${PREFIX}/include/libepoll-shim/sys
diff --git a/libevhtp/buildlink3.mk b/libevhtp/buildlink3.mk
index c064ae9a4e..ea65a6fc03 100644
--- a/libevhtp/buildlink3.mk
+++ b/libevhtp/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libevhtp
 LIBEVHTP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libevhtp+=	libevhtp>=1.2.11
-BUILDLINK_PKGSRCDIR.libevhtp?=	../../wip/libevhtp
+BUILDLINK_PKGSRCDIR.libevhtp?=		../../wip/libevhtp
 .endif	# LIBEVHTP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libevhtp
diff --git a/libfolks/Makefile b/libfolks/Makefile
index 9680189be3..1be70a8078 100644
--- a/libfolks/Makefile
+++ b/libfolks/Makefile
@@ -12,10 +12,10 @@ HOMEPAGE=	https://wiki.gnome.org/Projects/Folks
 COMMENT=	Library to manage contacts
 LICENSE=	gnu-lgpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool gmake msgfmt
-USE_PKGLOCALEDIR= yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config intltool gmake msgfmt
+USE_PKGLOCALEDIR=	yes
 
 
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/folks-dummy.pc
diff --git a/libfolks/buildlink3.mk b/libfolks/buildlink3.mk
index ff11aeb2c6..49af85aa3f 100644
--- a/libfolks/buildlink3.mk
+++ b/libfolks/buildlink3.mk
@@ -7,7 +7,7 @@ LIBFOLKS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libfolks+=	libfolks>=0.3.6
 BUILDLINK_ABI_DEPENDS.libfolks+=	libfolks>=0.4.2nb4
-BUILDLINK_PKGSRCDIR.libfolks?=	../../wip/libfolks
+BUILDLINK_PKGSRCDIR.libfolks?=		../../wip/libfolks
 
 .include "../../devel/glib2/buildlink3.mk"
 #.include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/libfplll/buildlink3.mk b/libfplll/buildlink3.mk
index e3196305b2..bb51dd87d7 100644
--- a/libfplll/buildlink3.mk
+++ b/libfplll/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libfplll
 LIBFPLLL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libfplll+=	libfplll>=3.0.12
-BUILDLINK_PKGSRCDIR.libfplll?=	../../wip/libfplll
+BUILDLINK_PKGSRCDIR.libfplll?=		../../wip/libfplll
 
 
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/libftdi1/Makefile b/libftdi1/Makefile
index cddbb72965..a47c6cd1f7 100644
--- a/libftdi1/Makefile
+++ b/libftdi1/Makefile
@@ -16,7 +16,7 @@ USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config #cmake
 USE_LANGUAGES=	c c++
 
-BUILD_DEPENDS+=libusb1-[0-9]*:../../devel/libusb1
+BUILD_DEPENDS+=	libusb1-[0-9]*:../../devel/libusb1
 # It is better off to have doxygen, but
 # clang segfaults while packaging print/luatex
 #BUILD_DEPENDS+=doxygen-[0-9]*:../../devel/doxygen
@@ -27,15 +27,15 @@ BUILD_DEPENDS+=libusb1-[0-9]*:../../devel/libusb1
 PKGCONFIG_OVERRIDE+=	libftdi1.pc.in
 PKGCONFIG_OVERRIDE+=	libftdipp1.pc.in
 
-PLIST_SUBST+=   PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
-CMAKE_USE_GNU_INSTALL_DIRS=no
+CMAKE_USE_GNU_INSTALL_DIRS=	no
 
-CMAKE_ARGS+=		-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
-CMAKE_ARGS+=		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-CMAKE_ARGS+=		-DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
-#CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
-CMAKE_ARGS+=		-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
+CMAKE_ARGS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib
+#CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
+CMAKE_ARGS+=	-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
 
 REPLACE_PYTHON=		python/examples/*.py
 
diff --git a/libftdi1/buildlink3.mk b/libftdi1/buildlink3.mk
index 189af3b401..c6fdff8410 100644
--- a/libftdi1/buildlink3.mk
+++ b/libftdi1/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libftdi1
 LIBFTDI1_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libftdi1+=	libftdi1>=1.2
-BUILDLINK_PKGSRCDIR.libftdi1?=	../../wip/libftdi1
+BUILDLINK_PKGSRCDIR.libftdi1?=		../../wip/libftdi1
 
 .include "../../devel/libusb/buildlink3.mk"
 .endif	# LIBFTDI1_BUILDLINK3_MK
diff --git a/libgadu/Makefile b/libgadu/Makefile
index 4c0f565c61..c8d8fa8803 100644
--- a/libgadu/Makefile
+++ b/libgadu/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	libgadu-1.12.1
 CATEGORIES=	chat
-MASTER_SITES= 	${MASTER_SITE_GITHUB:=wojtekka/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=wojtekka/}
 
 MAINTAINER=	mjl%luckie.org.nz@localhost
 HOMEPAGE=	http://libgadu.net/
diff --git a/libgda-bdb/Makefile b/libgda-bdb/Makefile
index c7590f35ba..3a975de150 100644
--- a/libgda-bdb/Makefile
+++ b/libgda-bdb/Makefile
@@ -10,8 +10,8 @@ LIBGDA_PROVIDER=	bdb
 BDB_ACCEPTED=	db4
 
 SUBST_CLASSES+=		bdb
-SUBST_STAGE.bdb= 	post-patch
-SUBST_FILES.bdb= 	providers/bdb/Makefile.in
+SUBST_STAGE.bdb=	post-patch
+SUBST_FILES.bdb=	providers/bdb/Makefile.in
 SUBST_SED.bdb=		-e "s|@BDB_LIBS@|${BDB_LIBS}|"
 SUBST_MESSAGE.bdb=	Fixing bdb.
 
diff --git a/libgda-odbc/options.mk b/libgda-odbc/options.mk
index 7855308ca6..199154eeca 100644
--- a/libgda-odbc/options.mk
+++ b/libgda-odbc/options.mk
@@ -1,10 +1,10 @@
 # $NetBSD: options.mk,v 1.1.1.1 2012/01/16 14:13:41 noud4 Exp $
 #
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.libgda-odbc
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libgda-odbc
 PKG_OPTIONS_REQUIRED_GROUPS=	db
-PKG_OPTIONS_GROUP.db=	iodbc unixodbc
-PKG_SUGGESTED_OPTIONS=	unixodbc
+PKG_OPTIONS_GROUP.db=		iodbc unixodbc
+PKG_SUGGESTED_OPTIONS=		unixodbc
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/libgda4/Makefile b/libgda4/Makefile
index 29b715eb09..ecf70ebad1 100644
--- a/libgda4/Makefile
+++ b/libgda4/Makefile
@@ -19,11 +19,11 @@ CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
 
 CONFIGURE_ARGS+=	--disable-crypto
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIG_SHELL=	bash
+CONFIG_SHELL=		bash
 
 SUBST_CLASSES+=		local
-SUBST_STAGE.local= 	post-patch
-SUBST_FILES.local= 	configure
+SUBST_STAGE.local=	post-patch
+SUBST_FILES.local=	configure
 SUBST_SED.local+=	-e "s|@LOCAL@|${PREFIX}|g"
 SUBST_MESSAGE.local=	"Fixing configure prefix."
 
diff --git a/libgda4/PLIST b/libgda4/PLIST
index a30f20117c..15e121fd49 100644
--- a/libgda4/PLIST
+++ b/libgda4/PLIST
@@ -1,65 +1,9 @@
 @comment $NetBSD: PLIST,v 1.7 2013/06/25 14:19:41 noud4 Exp $
-${PLIST.bdb}include/libgda-4.0/libgda/gda-data-model-bdb.h
-${PLIST.bdb}lib/libgda-4.0/providers/libgda-bdb.la
-${PLIST.bdb}lib/pkgconfig/libgda-bdb-4.0.pc
-${PLIST.bdb}share/libgda-4.0/bdb_specs_dsn.xml
-${PLIST.jdbc}bin/gda-list-jdbc-providers-4.0
-${PLIST.jdbc}lib/libgda-4.0/providers/gdaprovider-4.0.jar
-${PLIST.jdbc}lib/libgda-4.0/providers/libgda-jdbc.la
-${PLIST.jdbc}lib/pkgconfig/libgda-jdbc-4.0.pc
-${PLIST.jdbc}share/libgda-4.0/jdbc_specs_create_table.xml
-${PLIST.jdbc}share/libgda-4.0/jdbc_specs_dsn.xml
-${PLIST.ldap}include/libgda-4.0/libgda/gda-data-model-ldap.h
-${PLIST.ldap}include/libgda-4.0/libgda/gda-tree-mgr-ldap.h
-${PLIST.ldap}lib/libgda-4.0/providers/libgda-ldap.la
-${PLIST.ldap}lib/pkgconfig/libgda-ldap-4.0.pc
-${PLIST.ldap}share/libgda-4.0/ldap_specs_dsn.xml
-${PLIST.mdb}lib/libgda-4.0/providers/libgda-mdb.la
-${PLIST.mdb}lib/pkgconfig/libgda-mdb-4.0.pc
-${PLIST.mysql}lib/libgda-4.0/providers/libgda-mysql.la
-${PLIST.mysql}lib/pkgconfig/libgda-mysql-4.0.pc
-${PLIST.mdb}share/libgda-4.0/mdb_specs_dsn.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_add_column.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_comment_column.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_comment_table.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_create_db.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_create_index.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_create_table.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_create_view.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_view.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_column.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_db.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_index.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_table.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_dsn.xml
-${PLIST.mysql}share/libgda-4.0/mysql_specs_rename_table.xml
-${PLIST.postgres}lib/libgda-4.0/providers/libgda-postgres.la
-${PLIST.postgres}lib/pkgconfig/libgda-postgres-4.0.pc
-${PLIST.postgres}share/libgda-4.0/postgres_specs_add_column.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_create_db.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_create_index.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_create_role.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_create_table.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_create_user.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_create_view.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_column.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_db.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_index.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_role.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_table.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_user.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_view.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_dsn.xml
-${PLIST.postgres}share/libgda-4.0/postgres_specs_rename_table.xml
-${PLIST.web}lib/libgda-4.0/providers/libgda-web.la
-${PLIST.web}lib/pkgconfig/libgda-web-4.0.pc
-${PLIST.xslt}include/libgda-4.0/libgda-xslt/libgda-xslt.h
-${PLIST.xslt}lib/libgda-xslt-4.0.la
-${PLIST.xslt}lib/pkgconfig/libgda-xslt-4.0.pc
 bin/gda-browser-4.0
 bin/gda-control-center-4.0
 bin/gda-list-config
 bin/gda-list-config-4.0
+${PLIST.jdbc}bin/gda-list-jdbc-providers-4.0
 bin/gda-list-server-op
 bin/gda-list-server-op-4.0
 bin/gda-sql
@@ -98,6 +42,7 @@ include/libgda-4.0/libgda-ui/gdaui-rt-editor.h
 include/libgda-4.0/libgda-ui/gdaui-server-operation.h
 include/libgda-4.0/libgda-ui/gdaui-tree-store.h
 include/libgda-4.0/libgda-ui/libgda-ui.h
+${PLIST.xslt}include/libgda-4.0/libgda-xslt/libgda-xslt.h
 include/libgda-4.0/libgda/gda-attributes-manager.h
 include/libgda-4.0/libgda/gda-batch.h
 include/libgda-4.0/libgda/gda-binreloc.h
@@ -111,11 +56,13 @@ include/libgda-4.0/libgda/gda-data-access-wrapper.h
 include/libgda-4.0/libgda/gda-data-comparator.h
 include/libgda-4.0/libgda/gda-data-handler.h
 include/libgda-4.0/libgda/gda-data-model-array.h
+${PLIST.bdb}include/libgda-4.0/libgda/gda-data-model-bdb.h
 include/libgda-4.0/libgda/gda-data-model-dir.h
 include/libgda-4.0/libgda/gda-data-model-extra.h
 include/libgda-4.0/libgda/gda-data-model-import.h
 include/libgda-4.0/libgda/gda-data-model-iter-extra.h
 include/libgda-4.0/libgda/gda-data-model-iter.h
+${PLIST.ldap}include/libgda-4.0/libgda/gda-data-model-ldap.h
 include/libgda-4.0/libgda/gda-data-model-private.h
 include/libgda-4.0/libgda/gda-data-model.h
 include/libgda-4.0/libgda/gda-data-proxy.h
@@ -148,6 +95,7 @@ include/libgda-4.0/libgda/gda-transaction-status.h
 include/libgda-4.0/libgda/gda-tree-manager.h
 include/libgda-4.0/libgda/gda-tree-mgr-columns.h
 include/libgda-4.0/libgda/gda-tree-mgr-label.h
+${PLIST.ldap}include/libgda-4.0/libgda/gda-tree-mgr-ldap.h
 include/libgda-4.0/libgda/gda-tree-mgr-schemas.h
 include/libgda-4.0/libgda/gda-tree-mgr-select.h
 include/libgda-4.0/libgda/gda-tree-mgr-tables.h
@@ -184,9 +132,9 @@ include/libgda-4.0/libgda/sql-parser/gda-statement-struct-util.h
 include/libgda-4.0/libgda/sql-parser/gda-statement-struct.h
 include/libgda-4.0/libgda/sqlite/gda-sqlite-provider.h
 include/libgda-4.0/libgda/thread-wrapper/gda-thread-wrapper.h
+${PLIST.ldap}include/libgda-4.0/libgda/virtual/gda-ldap-connection.h
 include/libgda-4.0/libgda/virtual/gda-vconnection-data-model.h
 include/libgda-4.0/libgda/virtual/gda-vconnection-hub.h
-${PLIST.ldap}include/libgda-4.0/libgda/virtual/gda-ldap-connection.h
 include/libgda-4.0/libgda/virtual/gda-virtual-connection.h
 include/libgda-4.0/libgda/virtual/gda-virtual-provider.h
 include/libgda-4.0/libgda/virtual/gda-vprovider-data-model.h
@@ -200,15 +148,32 @@ lib/libgda-4.0/plugins/gdaui-entry-pict-spec.xml
 lib/libgda-4.0/plugins/gdaui-entry-pict-spec_string.xml
 lib/libgda-4.0/plugins/gdaui-entry-text-spec.xml
 lib/libgda-4.0/plugins/libgda-ui-plugins.la
+${PLIST.jdbc}lib/libgda-4.0/providers/gdaprovider-4.0.jar
+${PLIST.bdb}lib/libgda-4.0/providers/libgda-bdb.la
+${PLIST.jdbc}lib/libgda-4.0/providers/libgda-jdbc.la
+${PLIST.ldap}lib/libgda-4.0/providers/libgda-ldap.la
+${PLIST.mdb}lib/libgda-4.0/providers/libgda-mdb.la
+${PLIST.mysql}lib/libgda-4.0/providers/libgda-mysql.la
+${PLIST.postgres}lib/libgda-4.0/providers/libgda-postgres.la
 lib/libgda-4.0/providers/libgda-sqlite.la
+${PLIST.web}lib/libgda-4.0/providers/libgda-web.la
 lib/libgda-4.0/providers/libgda-web.la
 lib/libgda-report-4.0.la
 lib/libgda-ui-4.0.la
+${PLIST.xslt}lib/libgda-xslt-4.0.la
 lib/pkgconfig/libgda-4.0.pc
+${PLIST.bdb}lib/pkgconfig/libgda-bdb-4.0.pc
+${PLIST.jdbc}lib/pkgconfig/libgda-jdbc-4.0.pc
+${PLIST.ldap}lib/pkgconfig/libgda-ldap-4.0.pc
+${PLIST.mdb}lib/pkgconfig/libgda-mdb-4.0.pc
+${PLIST.mysql}lib/pkgconfig/libgda-mysql-4.0.pc
+${PLIST.postgres}lib/pkgconfig/libgda-postgres-4.0.pc
 lib/pkgconfig/libgda-report-4.0.pc
 lib/pkgconfig/libgda-sqlite-4.0.pc
 lib/pkgconfig/libgda-ui-4.0.pc
+${PLIST.web}lib/pkgconfig/libgda-web-4.0.pc
 lib/pkgconfig/libgda-web-4.0.pc
+${PLIST.xslt}lib/pkgconfig/libgda-xslt-4.0.pc
 man/man1/gda-sql-4.0.1
 man/man1/gda-sql.1
 share/applications/gda-browser-4.0.desktop
@@ -887,6 +852,7 @@ share/icons/hicolor/24x24/apps/gda-control-center.png
 share/icons/hicolor/256x256/apps/gda-control-center.png
 share/icons/hicolor/32x32/apps/gda-control-center.png
 share/icons/hicolor/48x48/apps/gda-control-center.png
+${PLIST.bdb}share/libgda-4.0/bdb_specs_dsn.xml
 share/libgda-4.0/demo/basic_form.c
 share/libgda-4.0/demo/cloud.c
 share/libgda-4.0/demo/combo.c
@@ -943,8 +909,26 @@ share/libgda-4.0/icons/hicolor/scalable/actions/glade.svg
 share/libgda-4.0/icons/hicolor/scalable/actions/history-view.svg
 share/libgda-4.0/import_encodings.xml
 share/libgda-4.0/information_schema.xml
+${PLIST.jdbc}share/libgda-4.0/jdbc_specs_create_table.xml
+${PLIST.jdbc}share/libgda-4.0/jdbc_specs_dsn.xml
 share/libgda-4.0/language-specs/gda-sql.lang
 ${PLIST.ldap}share/libgda-4.0/ldap_specs_auth.xml
+${PLIST.ldap}share/libgda-4.0/ldap_specs_dsn.xml
+${PLIST.mdb}share/libgda-4.0/mdb_specs_dsn.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_add_column.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_comment_column.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_comment_table.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_create_db.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_create_index.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_create_table.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_create_view.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_column.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_db.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_index.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_table.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_drop_view.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_dsn.xml
+${PLIST.mysql}share/libgda-4.0/mysql_specs_rename_table.xml
 share/libgda-4.0/php/README
 share/libgda-4.0/php/gda-clean.php
 share/libgda-4.0/php/gda-config.php
@@ -988,6 +972,22 @@ share/libgda-4.0/pixmaps/gda-browser.png
 share/libgda-4.0/pixmaps/gda-control-center-newcnc.png
 share/libgda-4.0/pixmaps/gda-control-center.png
 share/libgda-4.0/pixmaps/gdaui-generic.png
+${PLIST.postgres}share/libgda-4.0/postgres_specs_add_column.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_create_db.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_create_index.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_create_role.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_create_table.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_create_user.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_create_view.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_column.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_db.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_index.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_role.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_table.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_user.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_drop_view.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_dsn.xml
+${PLIST.postgres}share/libgda-4.0/postgres_specs_rename_table.xml
 share/libgda-4.0/server_operation.glade
 share/libgda-4.0/sqlite_specs_add_column.xml
 share/libgda-4.0/sqlite_specs_create_db.xml
diff --git a/libgda4/options.mk b/libgda4/options.mk
index 1d5cd1d09f..bdafd6ec89 100644
--- a/libgda4/options.mk
+++ b/libgda4/options.mk
@@ -22,8 +22,8 @@ BUILD_DIRS+=		providers/bdb
 CONFIGURE_ARGS+=	--with-bdb=${PREFIX}				# XXX BDBBASE
 
 SUBST_CLASSES+=		bdb
-SUBST_STAGE.bdb= 	post-patch
-SUBST_FILES.bdb= 	providers/bdb/Makefile.in
+SUBST_STAGE.bdb=	post-patch
+SUBST_FILES.bdb=	providers/bdb/Makefile.in
 SUBST_SED.bdb=		-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.bdb=	"Fixing BDB prefix."
 
@@ -33,14 +33,14 @@ PLIST.bdb=		yes
 
 .if !empty(PKG_OPTIONS:Mjdbc)
 PKGCONFIG_OVERRIDE+=	libgda-jdbc-4.0.pc.in
-PKG_JVMS_ACCEPTED= 	openjdk7					# XXX openjdk7-bin sun-jdk6 a.o. (patch-ad and patch-fb)
+PKG_JVMS_ACCEPTED=	openjdk7					# XXX openjdk7-bin sun-jdk6 a.o. (patch-ad and patch-fb)
 BUILD_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 BUILD_DIRS+=		providers/jdbc
 CONFIGURE_ARGS+=	--with-java=yes
 
 SUBST_CLASSES+=		java
-SUBST_STAGE.java= 	post-patch
-SUBST_FILES.java= 	configure providers/jdbc/Makefile.in
+SUBST_STAGE.java=	post-patch
+SUBST_FILES.java=	configure providers/jdbc/Makefile.in
 SUBST_SED.java+=	-e "s|@JAVA_HOME@|${PKG_JAVA_HOME}|g"
 SUBST_MESSAGE.java=	"Fixing configure and Java provider Makefile.in."
 
@@ -67,8 +67,8 @@ CONFIGURE_ARGS+=	--with-mdb=${PREFIX}
 CFLAGS+=		-DMDB_WITH_WRITE_SUPPORT
 
 SUBST_CLASSES+=		mdb
-SUBST_STAGE.mdb= 	post-patch
-SUBST_FILES.mdb= 	providers/mdb/Makefile.in
+SUBST_STAGE.mdb=	post-patch
+SUBST_FILES.mdb=	providers/mdb/Makefile.in
 SUBST_SED.mdb=		-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.mdb=	"Fixing MDB provider Makefile.in."
 
diff --git a/libginac/Makefile b/libginac/Makefile
index b611b79ae3..a4e8a62111 100644
--- a/libginac/Makefile
+++ b/libginac/Makefile
@@ -13,9 +13,9 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_CMAKE=	yes
-INFO_FILES= YES
+INFO_FILES=	YES
 USE_TOOLS+=	bison flex pkg-config makeinfo
-USE_LANGUAGES=c 	c++
+USE_LANGUAGES=	c 	c++
 
 PKGCONFIG_OVERRIDE+=	ginac.pc.in
 
diff --git a/libginac/buildlink3.mk b/libginac/buildlink3.mk
index 4f2471f25f..095b11cb1b 100644
--- a/libginac/buildlink3.mk
+++ b/libginac/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libginac
 LIBGINAC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libginac+=	libginac>=1.5.8
-BUILDLINK_PKGSRCDIR.libginac?=	../../wip/libginac
+BUILDLINK_PKGSRCDIR.libginac?=		../../wip/libginac
 
 .include "../../mk/readline.buildlink3.mk"
 .include "../../math/cln/buildlink3.mk"
diff --git a/libgme/Makefile b/libgme/Makefile
index 60690f44de..2f3e4c8c1c 100644
--- a/libgme/Makefile
+++ b/libgme/Makefile
@@ -16,8 +16,8 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
 INSTALLATION_DIRS+=	lib/pkgconfig
-BUILD_DIRS=	gme
-MAKE_ENV+=	MKDIR="${MKDIR}"
+BUILD_DIRS=		gme
+MAKE_ENV+=		MKDIR="${MKDIR}"
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/gme/
diff --git a/libgraphqlparser/buildlink3.mk b/libgraphqlparser/buildlink3.mk
index 6842ece509..860abdf1e8 100644
--- a/libgraphqlparser/buildlink3.mk
+++ b/libgraphqlparser/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgraphqlparser
 LIBGRAPHQLPARSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgraphqlparser+=	libgraphqlparser>=0.4.1
-BUILDLINK_PKGSRCDIR.libgraphqlparser?=	../../wip/libgraphqlparser
+BUILDLINK_PKGSRCDIR.libgraphqlparser?=		../../wip/libgraphqlparser
 .endif	# LIBGRAPHQLPARSER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libgraphqlparser
diff --git a/libgrass5/buildlink3.mk b/libgrass5/buildlink3.mk
index a3ed90878d..214aca9022 100644
--- a/libgrass5/buildlink3.mk
+++ b/libgrass5/buildlink3.mk
@@ -16,7 +16,7 @@ BUILDLINK_TREE+=	libgrass5
 LIBGRASS5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgrass5+=	libgrass5>=1.0.0
-BUILDLINK_PKGSRCDIR.libgrass5?=	../../wip/libgrass5
+BUILDLINK_PKGSRCDIR.libgrass5?=		../../wip/libgrass5
 .endif # LIBGRASS5_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libgrass5
diff --git a/libgzstream/Makefile b/libgzstream/Makefile
index 6de0263a8b..c4d0fc21cf 100644
--- a/libgzstream/Makefile
+++ b/libgzstream/Makefile
@@ -13,16 +13,16 @@ HOMEPAGE=	http://www.cs.unc.edu/Research/compgeom/gzstream/#src
 COMMENT=	Gzstream is a small C++ library, basically just a wrapper
 LICENSE=	gnu-lgpl-v2.1
 
-USE_LIBTOOL=	 yes
+USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 
-INSTALLATION_DIRS+= lib
+INSTALLATION_DIRS+=	lib
 
 do-build:
 	cd ${WRKSRC} && ${GMAKE}
 
-TEST_TARGET= check
+TEST_TARGET=	check
 
 do-install:
 	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
diff --git a/libical2/Makefile b/libical2/Makefile
index e676ac851c..ba699c4a11 100644
--- a/libical2/Makefile
+++ b/libical2/Makefile
@@ -15,7 +15,7 @@ LICENSE=	gnu-lgpl-v2.1 OR mpl-1.0
 USE_TOOLS+=	perl
 USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
-CMAKE_ARGS+= -DUSE_BUILTIN_TZDATA=false
+CMAKE_ARGS+=	-DUSE_BUILTIN_TZDATA=false
 MAKE_JOBS_SAFE=	no
 
 PKGCONFIG_OVERRIDE+=	libical.pc.in
diff --git a/libifstat/options.mk b/libifstat/options.mk
index 97a7f818f7..d35d550961 100644
--- a/libifstat/options.mk
+++ b/libifstat/options.mk
@@ -12,86 +12,86 @@ PKG_SUGGESTED_OPTIONS=
 # Debug build
 #
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 #
 # Optimized build
 #
 .if !empty(PKG_OPTIONS:Moptimization)
-CONFIGURE_ARGS+=        --enable-optim
+CONFIGURE_ARGS+=	--enable-optim
 .endif
 
 #
 # /proc/net/dev driver
 #
 .if !empty(PKG_OPTIONS:Mproc)
-CONFIGURE_ARGS+=        --with-proc
+CONFIGURE_ARGS+=	--with-proc
 .else
-CONFIGURE_ARGS+=        --without-proc
+CONFIGURE_ARGS+=	--without-proc
 .endif
 
 #
 # kstat(3K) driver
 #
 .if !empty(PKG_OPTIONS:Mkstat)
-CONFIGURE_ARGS+=        --with-kstat
+CONFIGURE_ARGS+=	--with-kstat
 .else
-CONFIGURE_ARGS+=        --without-kstat
+CONFIGURE_ARGS+=	--without-kstat
 .endif
 
 #
 # ifmib(4) driver
 #
 .if !empty(PKG_OPTIONS:Mifmib)
-CONFIGURE_ARGS+=        --with-ifmib
+CONFIGURE_ARGS+=	--with-ifmib
 .else
-CONFIGURE_ARGS+=        --without-ifmib
+CONFIGURE_ARGS+=	--without-ifmib
 .endif
 
 #
 # ifdata ioctl driver
 #
 .if !empty(PKG_OPTIONS:Mifdata)
-CONFIGURE_ARGS+=        --with-ifdata
+CONFIGURE_ARGS+=	--with-ifdata
 .else
-CONFIGURE_ARGS+=        --without-ifdata
+CONFIGURE_ARGS+=	--without-ifdata
 .endif
 
 #
 # route(4) sysctl driver
 #
 .if !empty(PKG_OPTIONS:Mroute)
-CONFIGURE_ARGS+=        --with-route
+CONFIGURE_ARGS+=	--with-route
 .else
-CONFIGURE_ARGS+=        --without-route
+CONFIGURE_ARGS+=	--without-route
 .endif
 
 #
 # kvm(3) driver
 #
 .if !empty(PKG_OPTIONS:Mkvm)
-CONFIGURE_ARGS+=        --with-kvm
+CONFIGURE_ARGS+=	--with-kvm
 .else
-CONFIGURE_ARGS+=        --without-kvm
+CONFIGURE_ARGS+=	--without-kvm
 .endif
 
 #
 # HP DLPI driver
 #
 .if !empty(PKG_OPTIONS:Mdlpi)
-CONFIGURE_ARGS+=        --with-dlpi
+CONFIGURE_ARGS+=	--with-dlpi
 .else
-CONFIGURE_ARGS+=        --without-dlpi
+CONFIGURE_ARGS+=	--without-dlpi
 .endif
 
 #
 # Win32 driver
 #
 .if !empty(PKG_OPTIONS:Mwin32)
-CONFIGURE_ARGS+=        --with-win32
+CONFIGURE_ARGS+=	--with-win32
 .else
-CONFIGURE_ARGS+=        --without-win32
+CONFIGURE_ARGS+=	--without-win32
 .endif
 
 #
@@ -108,7 +108,7 @@ CONFIGURE_ARGS+=        --without-snmp
 # force -lcrypto linking for UCD-SNMP
 #
 .if !empty(PKG_OPTIONS:Msnmp-crypto)
-CONFIGURE_ARGS+=        --with-libcrypto
+CONFIGURE_ARGS+=	--with-libcrypto
 .else
-CONFIGURE_ARGS+=        --without-libcrypto
+CONFIGURE_ARGS+=	--without-libcrypto
 .endif
diff --git a/libimobiledevice/buildlink3.mk b/libimobiledevice/buildlink3.mk
index dce66456a8..c2985a9da3 100644
--- a/libimobiledevice/buildlink3.mk
+++ b/libimobiledevice/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	libimobiledevice
 .if !defined(LIBIMOBILEDEVICE_BUILDLINK3_MK)
 LIBIMOBILEDEVICE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libimobiledevice+=libimobiledevice>=1.2.0
-BUILDLINK_ABI_DEPENDS.libimobiledevice+=libimobiledevice>=1.2.0
-BUILDLINK_PKGSRCDIR.libimobiledevice?=	../../wip/libimobiledevice
+BUILDLINK_API_DEPENDS.libimobiledevice+=	libimobiledevice>=1.2.0
+BUILDLINK_ABI_DEPENDS.libimobiledevice+=	libimobiledevice>=1.2.0
+BUILDLINK_PKGSRCDIR.libimobiledevice?=		../../wip/libimobiledevice
 
 .endif # LIBIMOBILEDEVICE_BUILDLINK3_MK
 
diff --git a/libitl/Makefile b/libitl/Makefile
index 66e022a9bc..4f06f2fbd8 100644
--- a/libitl/Makefile
+++ b/libitl/Makefile
@@ -21,7 +21,7 @@ INSTALL_MAKE_FLAGS+=	includedir=${DESTDIR}${PREFIX}/include/itl \
 
 DOCDIR=	${PREFIX}/share/doc/libitl
 
-INSTALLATION_DIRS=  ${DOCDIR}
+INSTALLATION_DIRS=	${DOCDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/prayertime/doc/method-info.txt \
diff --git a/libjingle/buildlink3.mk b/libjingle/buildlink3.mk
index 685945740e..6326eb8dc4 100644
--- a/libjingle/buildlink3.mk
+++ b/libjingle/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libjingle
 LIBJINGLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libjingle+=	libjingle>=0.3.12
-BUILDLINK_PKGSRCDIR.libjingle?=	../../wip/libjingle
+BUILDLINK_PKGSRCDIR.libjingle?=		../../wip/libjingle
 .endif	# LIBJINGLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libjingle
diff --git a/libksysguard/hacks.mk b/libksysguard/hacks.mk
index 6a89854605..9c686b8489 100644
--- a/libksysguard/hacks.mk
+++ b/libksysguard/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/libmobi-git/Makefile b/libmobi-git/Makefile
index 18f53a93ac..59dc9ecd88 100644
--- a/libmobi-git/Makefile
+++ b/libmobi-git/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/libmobi
 
 USE_LANGUAGES=	c
 
-USE_TOOLS+= automake aclocal autoheader autoconf
+USE_TOOLS+=	automake aclocal autoheader autoconf
 GNU_CONFIGURE=	yes
 
 INSTALLATION_DIRS+=	share/doc/${PKGBASE}
diff --git a/libmpg123/buildlink3.mk b/libmpg123/buildlink3.mk
index b8dfdb5a4d..b9bcde7c80 100644
--- a/libmpg123/buildlink3.mk
+++ b/libmpg123/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libmpg123
 LIBMPG123_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmpg123+=	libmpg123>=1.12.3
-BUILDLINK_PKGSRCDIR.libmpg123?=	../../wip/libmpg123
+BUILDLINK_PKGSRCDIR.libmpg123?=		../../wip/libmpg123
 .endif # LIBMPG123_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libmpg123
diff --git a/libncl/Makefile b/libncl/Makefile
index cbbd5eb30a..9b43994c4c 100644
--- a/libncl/Makefile
+++ b/libncl/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	ncl-2.1.18
-PKGNAME=lib${DISTNAME}
+PKGNAME=	lib${DISTNAME}
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ncl/}
 
@@ -12,7 +12,7 @@ COMMENT=	The NEXUS Class Library is a C++ library for parsing NEXUS files
 LICENSE=	gnu-gpl-v2 AND 2-clause-bsd
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL= yes
+USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
diff --git a/libneural/Makefile b/libneural/Makefile
index 282864485b..56f62467bd 100644
--- a/libneural/Makefile
+++ b/libneural/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.6 2012/11/13 19:33:45 othyro Exp $
 
-DISTNAME= libneural-1.0.3
+DISTNAME=	libneural-1.0.3
 CATEGORIES=	devel
-MASTER_SITES= http://ieee.uow.edu.au/~daniel/software/libneural/
+MASTER_SITES=	http://ieee.uow.edu.au/~daniel/software/libneural/
 
 MAINTAINER=	rasputnik%hellooperator.net@localhost
-HOMEPAGE= http://ieee.uow.edu.au/~daniel/software/libneural/
+HOMEPAGE=	http://ieee.uow.edu.au/~daniel/software/libneural/
 COMMENT=	C++ library for creating 3-layer backpropagation neural networks
 
 
-CONFIGURE_PREFIX+= ${PREFIX}
-MAKE_FLAGS+= prefix=${PREFIX:Q}
+CONFIGURE_PREFIX+=	${PREFIX}
+MAKE_FLAGS+=		prefix=${PREFIX:Q}
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
diff --git a/libneural/PLIST b/libneural/PLIST
index a613279ca9..f37688fbcd 100644
--- a/libneural/PLIST
+++ b/libneural/PLIST
@@ -1,34 +1,34 @@
 @comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:53 thomasklausner Exp $
-lib/libneural.la
 include/neuron.h
 include/nnwork.h
+lib/libneural.la
+share/libneural-1.0.3/README
 share/libneural-1.0.3/examples/.libs/char_recognition
 share/libneural-1.0.3/examples/.libs/char_stats
 share/libneural-1.0.3/examples/.libs/odd_even
-share/libneural-1.0.3/examples/OX/src/ox.cxx
+share/libneural-1.0.3/examples/Makefile
+share/libneural-1.0.3/examples/Makefile.am
+share/libneural-1.0.3/examples/Makefile.in
 share/libneural-1.0.3/examples/OX/Makefile
-share/libneural-1.0.3/examples/OX/ox.net
 share/libneural-1.0.3/examples/OX/README
-share/libneural-1.0.3/examples/Makefile.in
-share/libneural-1.0.3/examples/char_recognition.cc
-share/libneural-1.0.3/examples/char_data.cc
-share/libneural-1.0.3/examples/char_stats.cc
-share/libneural-1.0.3/examples/char_cov.cc
-share/libneural-1.0.3/examples/odd_even.cc
-share/libneural-1.0.3/examples/char_recognition.nnw
-share/libneural-1.0.3/examples/odd_even.nnw
-share/libneural-1.0.3/examples/build_nnstats
+share/libneural-1.0.3/examples/OX/ox.net
+share/libneural-1.0.3/examples/OX/src/ox.cxx
+share/libneural-1.0.3/examples/README
 share/libneural-1.0.3/examples/build_covstats
-share/libneural-1.0.3/examples/Makefile
-share/libneural-1.0.3/examples/char_recognition.o
+share/libneural-1.0.3/examples/build_nnstats
+share/libneural-1.0.3/examples/char_cov
+share/libneural-1.0.3/examples/char_cov.cc
+share/libneural-1.0.3/examples/char_cov.o
+share/libneural-1.0.3/examples/char_data.cc
 share/libneural-1.0.3/examples/char_data.o
 share/libneural-1.0.3/examples/char_recognition
-share/libneural-1.0.3/examples/char_stats.o
+share/libneural-1.0.3/examples/char_recognition.cc
+share/libneural-1.0.3/examples/char_recognition.nnw
+share/libneural-1.0.3/examples/char_recognition.o
 share/libneural-1.0.3/examples/char_stats
-share/libneural-1.0.3/examples/char_cov.o
-share/libneural-1.0.3/examples/char_cov
-share/libneural-1.0.3/examples/odd_even.o
-share/libneural-1.0.3/examples/README
+share/libneural-1.0.3/examples/char_stats.cc
+share/libneural-1.0.3/examples/char_stats.o
 share/libneural-1.0.3/examples/odd_even
-share/libneural-1.0.3/examples/Makefile.am
-share/libneural-1.0.3/README
+share/libneural-1.0.3/examples/odd_even.cc
+share/libneural-1.0.3/examples/odd_even.nnw
+share/libneural-1.0.3/examples/odd_even.o
diff --git a/libnfo/Makefile b/libnfo/Makefile
index fd73cab896..5c7a3e9ceb 100644
--- a/libnfo/Makefile
+++ b/libnfo/Makefile
@@ -12,9 +12,9 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake pkg-config
 
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
-HAS_CONFIGURE=yes
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libode/Makefile b/libode/Makefile
index 43537df064..bdd56c4f80 100644
--- a/libode/Makefile
+++ b/libode/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	ode-0.11.1
-PKGNAME= 	lib${DISTNAME}
+PKGNAME=	lib${DISTNAME}
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opende/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/libowl-av/buildlink3.mk b/libowl-av/buildlink3.mk
index 5a1aad97f4..506524b7d6 100644
--- a/libowl-av/buildlink3.mk
+++ b/libowl-av/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libowl-av
 LIBOWL_AV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libowl-av+=	libowl-av>=0.1
-BUILDLINK_PKGSRCDIR.libowl-av?=	../../wip/libowl-av
+BUILDLINK_PKGSRCDIR.libowl-av?=		../../wip/libowl-av
 
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff --git a/libpar2/Makefile b/libpar2/Makefile
index 34d4cc7414..cf9032120f 100644
--- a/libpar2/Makefile
+++ b/libpar2/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://parchive.sourceforge.net/
 COMMENT=	Create or use PAR2 parity volumes
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=yes
+GNU_CONFIGURE=	yes
 
 USE_LANGUAGES=		c c++
 CXXFLAGS+=		-std=c++11
diff --git a/libpar2/buildlink3.mk b/libpar2/buildlink3.mk
index 19293651eb..bc27c0440b 100644
--- a/libpar2/buildlink3.mk
+++ b/libpar2/buildlink3.mk
@@ -8,7 +8,7 @@ LIBPAR2_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libpar2+=	libpar2>=0.2
 BUILDLINK_PKGSRCDIR.libpar2?=	../../wip/libpar2
 
-BUILDLINK_INCDIRS.libpar2+= include/libpar2
+BUILDLINK_INCDIRS.libpar2+=	include/libpar2
 
 .include "../../devel/libsigc++/buildlink3.mk"
 .endif	# LIBPAR2_BUILDLINK3_MK
diff --git a/libpsurface/Makefile b/libpsurface/Makefile
index 6eba457162..c42a3c5dc9 100644
--- a/libpsurface/Makefile
+++ b/libpsurface/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	http://numerik.mi.fu-berlin.de/dune/psurface/index.php
 COMMENT=	Library that handles piecewise linear bijections
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake m4 aclocal \
 		autoconf automake autoreconf
 USE_LANGUAGES=	c c++
diff --git a/libpthread-stubs-dfbsd/buildlink3.mk b/libpthread-stubs-dfbsd/buildlink3.mk
index 9767e10f45..bbce5d9ce5 100644
--- a/libpthread-stubs-dfbsd/buildlink3.mk
+++ b/libpthread-stubs-dfbsd/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libpthread-stubs
 LIBPTHREAD_STUBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpthread-stubs+=	libpthread-stubs>=0.3
-BUILDLINK_PKGSRCDIR.libpthread-stubs?=	../../devel/libpthread-stubs
+BUILDLINK_PKGSRCDIR.libpthread-stubs?=		../../devel/libpthread-stubs
 .endif	# LIBPTHREAD_STUBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libpthread-stubs
diff --git a/libpthread-stubs/buildlink3.mk b/libpthread-stubs/buildlink3.mk
index a2fe280ea4..62c637bfb9 100644
--- a/libpthread-stubs/buildlink3.mk
+++ b/libpthread-stubs/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libpthread-stubs
 LIBPTHREAD_STUBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpthread-stubs+=	libpthread-stubs>=0.3
-BUILDLINK_PKGSRCDIR.libpthread-stubs?=	../../wip/libpthread-stubs
+BUILDLINK_PKGSRCDIR.libpthread-stubs?=		../../wip/libpthread-stubs
 .endif	# LIBPTHREAD_STUBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libpthread-stubs
diff --git a/libqtxdg/buildlink3.mk b/libqtxdg/buildlink3.mk
index 8c67d622fd..9638502097 100644
--- a/libqtxdg/buildlink3.mk
+++ b/libqtxdg/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libqtxdg
 LIBQTXDG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libqtxdg+=	libqtxdg>=1.2.0
-BUILDLINK_PKGSRCDIR.libqtxdg?=	../../wip/libqtxdg
+BUILDLINK_PKGSRCDIR.libqtxdg?=		../../wip/libqtxdg
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# LIBQTXDG_BUILDLINK3_MK
diff --git a/libreoffice-git/Makefile b/libreoffice-git/Makefile
index 1e24dbea25..2dba63c1ef 100644
--- a/libreoffice-git/Makefile
+++ b/libreoffice-git/Makefile
@@ -4,8 +4,8 @@ DISTNAME=	libreoffice
 PKGREVISION=	1
 CATEGORIES=	misc
 
-GIT_REPOSITORIES= core
-GIT_REPO.core=    git://gerrit.libreoffice.org/core.git
+GIT_REPOSITORIES=	core
+GIT_REPO.core=		git://gerrit.libreoffice.org/core.git
 
 #MASTER_SITES=	http://dev-www.libreoffice.org/bundles/
 
@@ -25,7 +25,7 @@ GCC_REQD+=	4.6
 
 CHECK_SHLIBS_SUPPORTED=	no
 # configure will be regenerated.
-CHECK_PORTABILITY_SKIP=configure
+CHECK_PORTABILITY_SKIP=	configure
 
 DIST_SUBDIR=	libreoffice
 
@@ -108,7 +108,7 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 # is a no-go with normal pkgsrc wrappers.
 # dmake is slowly beeing removed from the LibreOffice build process
 # and this option will hopefully become unneeded in the future
-WRAPPER_SKIP_TRANSFORM=yes
+WRAPPER_SKIP_TRANSFORM=	yes
 
 USE_LANGUAGES+=		c c++
 
diff --git a/libreoffice-git/options.mk b/libreoffice-git/options.mk
index 6bffbb518f..70f7561005 100644
--- a/libreoffice-git/options.mk
+++ b/libreoffice-git/options.mk
@@ -20,7 +20,7 @@ USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 CONFIGURE_ARGS+=	--with-ant-home=${LOCALBASE}
 
-DEPENDS+=	hsqldb18-[0-9]*:../../databases/hsqldb18
+DEPENDS+=		hsqldb18-[0-9]*:../../databases/hsqldb18
 CONFIGURE_ARGS+=	--with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
 CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-java \
diff --git a/libretro-parallel-n64/options.mk b/libretro-parallel-n64/options.mk
index a7e44346a8..2557648e46 100644
--- a/libretro-parallel-n64/options.mk
+++ b/libretro-parallel-n64/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD: options.mk,v 1.4 2015/02/05 21:02:37 wiz Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.libretro-parallel-n64
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libretro-parallel-n64
 PKG_OPTIONS_REQUIRED_GROUPS=	graphics
 PKG_OPTIONS_GROUP.graphics=	opengl
 
@@ -8,19 +8,19 @@ PKG_OPTIONS_GROUP.graphics=	opengl
 
 .if !empty(MACHINE_ARCH:M*arm*)
 PKG_OPTIONS_GROUP.graphics+=	rpi
-PKG_SUPPORTED_OPTIONS+=	dynarec
-PKG_SUGGESTED_OPTIONS+=	dynarec
-N64_DYNAREC_ARCH=	arm
+PKG_SUPPORTED_OPTIONS+=		dynarec
+PKG_SUGGESTED_OPTIONS+=		dynarec
+N64_DYNAREC_ARCH=		arm
 .elif !empty(MACHINE_ARCH:Mi386)
-PKG_SUPPORTED_OPTIONS+=	dynarec
-PKG_SUGGESTED_OPTIONS+=	dynarec opengl
-N64_DYNAREC_ARCH=	x86
+PKG_SUPPORTED_OPTIONS+=		dynarec
+PKG_SUGGESTED_OPTIONS+=		dynarec opengl
+N64_DYNAREC_ARCH=		x86
 .elif !empty(MACHINE_ARCH:Mx86_64)
-PKG_SUPPORTED_OPTIONS+=	dynarec
-PKG_SUGGESTED_OPTIONS+=	dynarec opengl
-N64_DYNAREC_ARCH=	x86_64
+PKG_SUPPORTED_OPTIONS+=		dynarec
+PKG_SUGGESTED_OPTIONS+=		dynarec opengl
+N64_DYNAREC_ARCH=		x86_64
 .else
-PKG_SUGGESTED_OPTIONS+=	opengl
+PKG_SUGGESTED_OPTIONS+=		opengl
 .endif
 
 .if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
diff --git a/libretro-ppsspp/options.mk b/libretro-ppsspp/options.mk
index 1eee180f4c..ac1c00a966 100644
--- a/libretro-ppsspp/options.mk
+++ b/libretro-ppsspp/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.libretro-ppsspp
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libretro-ppsspp
 PKG_OPTIONS_REQUIRED_GROUPS=	graphics
 PKG_OPTIONS_GROUP.graphics=	opengl
 
diff --git a/libscscp/Makefile b/libscscp/Makefile
index 590e1b120c..55b5183193 100644
--- a/libscscp/Makefile
+++ b/libscscp/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.imcce.fr/trip/scscp/download/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.imcce.fr/trip/scscp/
-COMMENT=  Library of the Symbolic Computation Software Composibility Protocol
+COMMENT=	Library of the Symbolic Computation Software Composibility Protocol
 
 GNU_CONFIGURE=	yes
 INFO_FILES=	yes
diff --git a/libscscp/buildlink3.mk b/libscscp/buildlink3.mk
index 9496fa8fda..542a6b0962 100644
--- a/libscscp/buildlink3.mk
+++ b/libscscp/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libscscp
 LIBSCSCP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libscscp+=	libscscp>=0.6.1
-BUILDLINK_PKGSRCDIR.libscscp?=	../../wip/libscscp
+BUILDLINK_PKGSRCDIR.libscscp?=		../../wip/libscscp
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif	# LIBSCSCP_BUILDLINK3_MK
diff --git a/libsearpc/buildlink3.mk b/libsearpc/buildlink3.mk
index 3563670c8f..133056c9e9 100644
--- a/libsearpc/buildlink3.mk
+++ b/libsearpc/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libsearpc
 LIBSEARPC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsearpc+=	libsearpc>=3.0
-BUILDLINK_PKGSRCDIR.libsearpc?=	../../wip/libsearpc
+BUILDLINK_PKGSRCDIR.libsearpc?=		../../wip/libsearpc
 .endif	# LIBSEARPC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libsearpc
diff --git a/libsocialweb/Makefile b/libsocialweb/Makefile
index 01bff74e1f..47f3d99267 100644
--- a/libsocialweb/Makefile
+++ b/libsocialweb/Makefile
@@ -12,11 +12,11 @@ LICENSE=	gnu-lgpl-v2.1
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool msgfmt
-USE_TOOLS+=	gmake
-USE_TOOLS+=	perl
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config intltool msgfmt
+USE_TOOLS+=		gmake
+USE_TOOLS+=		perl
 USE_PKGLOCALEDIR=	yes
 
 PKGCONFIG_OVERRIDE+=	libsocialweb-client.pc.in libsocialweb-keyfob.pc.in \
diff --git a/libsocialweb/PLIST b/libsocialweb/PLIST
index 862ad194de..a465f9cd10 100644
--- a/libsocialweb/PLIST
+++ b/libsocialweb/PLIST
@@ -41,14 +41,14 @@ lib/libsocialweb.la
 ${PLIST.facebook}lib/libsocialweb/services/libfacebook.la
 ${PLIST.flickr}lib/libsocialweb/services/libflickr.la
 ${PLIST.lastfm}lib/libsocialweb/services/liblastfm.la
+${PLIST.myspace}lib/libsocialweb/services/libmyspace.la
 ${PLIST.photobucket}lib/libsocialweb/services/libphotobucket.la
 ${PLIST.plurk}lib/libsocialweb/services/libplurk.la
+${PLIST.sina}lib/libsocialweb/services/libsina.la
 ${PLIST.smugmug}lib/libsocialweb/services/libsmugmug.la
 ${PLIST.twitter}lib/libsocialweb/services/libtwitter.la
 ${PLIST.vimeo}lib/libsocialweb/services/libvimeo.la
 ${PLIST.youtube}lib/libsocialweb/services/libyoutube.la
-${PLIST.sina}lib/libsocialweb/services/libsina.la
-${PLIST.myspace}lib/libsocialweb/services/libmyspace.la
 lib/pkgconfig/libsocialweb-client.pc
 lib/pkgconfig/libsocialweb-keyfob.pc
 lib/pkgconfig/libsocialweb-keystore.pc
@@ -128,12 +128,16 @@ share/gtk-doc/html/libsocialweb/right.png
 share/gtk-doc/html/libsocialweb/style.css
 share/gtk-doc/html/libsocialweb/up.png
 ${PLIST.facebook}share/libsocialweb/services/facebook.keys
+${PLIST.flickr}share/libsocialweb/services/flickr.keys
 ${PLIST.lastfm}share/libsocialweb/services/lastfm.keys
 ${PLIST.lastfm}share/libsocialweb/services/lastfm.png
-${PLIST.flickr}share/libsocialweb/services/flickr.keys
+${PLIST.myspace}share/libsocialweb/services/myspace.keys
+${PLIST.myspace}share/libsocialweb/services/myspace.png
 ${PLIST.photobucket}share/libsocialweb/services/photobucket.keys
 ${PLIST.plurk}share/libsocialweb/services/plurk.keys
 ${PLIST.plurk}share/libsocialweb/services/plurk.png
+${PLIST.sina}share/libsocialweb/services/sina.keys
+${PLIST.sina}share/libsocialweb/services/sina.png
 ${PLIST.smugmug}share/libsocialweb/services/smugmug.keys
 ${PLIST.twitter}share/libsocialweb/services/twitter.keys
 ${PLIST.twitter}share/libsocialweb/services/twitter.png
@@ -141,10 +145,6 @@ ${PLIST.vimeo}share/libsocialweb/services/vimeo.keys
 ${PLIST.vimeo}share/libsocialweb/services/vimeo.png
 ${PLIST.youtube}share/libsocialweb/services/youtube.keys
 ${PLIST.youtube}share/libsocialweb/services/youtube.png
-${PLIST.sina}share/libsocialweb/services/sina.keys
-${PLIST.sina}share/libsocialweb/services/sina.png
-${PLIST.myspace}share/libsocialweb/services/myspace.keys
-${PLIST.myspace}share/libsocialweb/services/myspace.png
 share/locale/ar/LC_MESSAGES/libsocialweb.mo
 share/locale/ast/LC_MESSAGES/libsocialweb.mo
 share/locale/bn_IN/LC_MESSAGES/libsocialweb.mo
diff --git a/libsocialweb/options.mk b/libsocialweb/options.mk
index bd4af785c9..d2429411d9 100644
--- a/libsocialweb/options.mk
+++ b/libsocialweb/options.mk
@@ -33,7 +33,7 @@ PLIST.lastfm=		yes
 
 .if !empty(PKG_OPTIONS:Mphotobucket)
 CONFIGURE_ARGS+=	--enable-photobucket
-PLIST.photobucket=		yes
+PLIST.photobucket=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mplurk)
diff --git a/libspt/Makefile b/libspt/Makefile
index c1304395f7..3c8fb739af 100644
--- a/libspt/Makefile
+++ b/libspt/Makefile
@@ -2,8 +2,8 @@
 
 DISTNAME=	libspt-1.1
 
-CATEGORIES=     devel
-MASTER_SITES=   http://www.j10n.org/libspt/
+CATEGORIES=	devel
+MASTER_SITES=	http://www.j10n.org/libspt/
 
 EXTRACT_SUFX=	.tar.bz2
 
@@ -13,7 +13,7 @@ COMMENT=	Provide unpriviliged secure pty
 LICENSE=	2-clause-bsd
 
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 
 MAKE_ENV+=	SHELL=${SH}
 
diff --git a/libtermkey/options.mk b/libtermkey/options.mk
index 53fd3c3943..2c90d6cf58 100644
--- a/libtermkey/options.mk
+++ b/libtermkey/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.1 2015/02/21 16:22:20 jonthn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libtermkey
-PKG_OPTIONS_OPTIONAL_GROUPS=    terminfo
+PKG_OPTIONS_OPTIONAL_GROUPS=	terminfo
 PKG_OPTIONS_GROUP.terminfo=	ncurses unibilium
 PKG_SUGGESTED_OPTIONS=		unibilium
 
diff --git a/libtextcat/Makefile b/libtextcat/Makefile
index 22ad3ce3db..81a4171ccb 100644
--- a/libtextcat/Makefile
+++ b/libtextcat/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	libtextcat-2.2
-PKGREVISION=    1
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://software.wise-guys.nl/download/
 
diff --git a/libtextcat/PLIST b/libtextcat/PLIST
index a21abc8125..524d16255f 100644
--- a/libtextcat/PLIST
+++ b/libtextcat/PLIST
@@ -1,10 +1,10 @@
 @comment $NetBSD: PLIST,v 1.5 2011/02/17 13:19:17 ftigeot Exp $
 bin/createfp
-include/libtextcat/textcat.h
 include/libtextcat/common.h
 include/libtextcat/config.h
 include/libtextcat/constants.h
 include/libtextcat/fingerprint.h
+include/libtextcat/textcat.h
 include/libtextcat/utf8misc.h
 include/libtextcat/wg_mempool.h
 lib/libtextcat.la
diff --git a/libtlen2/buildlink3.mk b/libtlen2/buildlink3.mk
index 2a392b1279..17e08cbf68 100644
--- a/libtlen2/buildlink3.mk
+++ b/libtlen2/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libtlen2
 LIBTLEN2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libtlen2+=	libtlen2>=20040301
-BUILDLINK_PKGSRCDIR.libtlen2?=	../../wip/libtlen2
+BUILDLINK_PKGSRCDIR.libtlen2?=		../../wip/libtlen2
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/gnet/buildlink3.mk"
diff --git a/libtogl/Makefile b/libtogl/Makefile
index fab066ce46..e98d233f8a 100644
--- a/libtogl/Makefile
+++ b/libtogl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tk OpenGL widget
 WRKSRC=		${WRKDIR}/Togl2.0
 
 GNU_CONFIGURE=	yes
-USE_LANGUAGES= c
+USE_LANGUAGES=	c
 
 INSTALLATION_DIRS=	share/doc/libtogl
 
diff --git a/libtorrent-rasterbar/Makefile.common b/libtorrent-rasterbar/Makefile.common
index fb8d6af387..b023595814 100644
--- a/libtorrent-rasterbar/Makefile.common
+++ b/libtorrent-rasterbar/Makefile.common
@@ -14,7 +14,7 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-boost-system=boost_system
 CONFIGURE_ARGS+=	--with-boost-filesystem=boost_filesystem
 CONFIGURE_ARGS+=	--with-boost-thread=boost_thread
diff --git a/libtxc_dxtn/Makefile b/libtxc_dxtn/Makefile
index a61f556a26..def5c8eb1c 100644
--- a/libtxc_dxtn/Makefile
+++ b/libtxc_dxtn/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://people.freedesktop.org/~cbrill/libtxc_dxtn/
 COMMENT=	S3 texture compression support for MesaLib
 LICENSE=	mit
 
-RESTRICTED=	Need a valid license for s3tc
+RESTRICTED=		Need a valid license for s3tc
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/libuna/Makefile b/libuna/Makefile
index 64fb1cc538..c375ac8431 100644
--- a/libuna/Makefile
+++ b/libuna/Makefile
@@ -2,8 +2,8 @@
 #
 
 DISTNAME=	libuna-alpha-20150927
-GITHUB_PROJECT= libuna
-GITHUB_RELEASE= ${PKGVERSION_NOREV}
+GITHUB_PROJECT=	libuna
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 PKGNAME=	${DISTNAME:S/-alpha//1}
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libyal/}
diff --git a/libuna/options.mk b/libuna/options.mk
index 4918d0baa3..27a8a00004 100644
--- a/libuna/options.mk
+++ b/libuna/options.mk
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--enable-static=yes --enable-static-executables=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no --enable-static-executables=no
+CONFIGURE_ARGS+=	--enable-static=no --enable-static-executables=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
diff --git a/libunwind-git/buildlink3.mk b/libunwind-git/buildlink3.mk
index 7747fe967a..5ad7bb91ef 100644
--- a/libunwind-git/buildlink3.mk
+++ b/libunwind-git/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libunwind
 LIBUNWIND_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=3.9.0nb20151127
-BUILDLINK_PKGSRCDIR.libunwind?=	../../wip/libunwind-git
+BUILDLINK_PKGSRCDIR.libunwind?=		../../wip/libunwind-git
 
 .include "../../wip/llvm-git/buildlink3.mk"
 .endif	# LIBUNWIND_BUILDLINK3_MK
diff --git a/libvalhalla/Makefile b/libvalhalla/Makefile
index 3971c82606..08c1e1cff4 100644
--- a/libvalhalla/Makefile
+++ b/libvalhalla/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake
 
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 HAS_CONFIGURE=	yes
 
diff --git a/libvg/Makefile b/libvg/Makefile
index 57050de4f7..f802c8ded9 100644
--- a/libvg/Makefile
+++ b/libvg/Makefile
@@ -9,9 +9,9 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.7a69ezine.org/project/libvg/
 COMMENT=		High-level ptrace library
 
-WRKSRC=		${WRKDIR}/libvg/src
-BUILD_TARGET= ${LOWER_OPSYS}
-ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* Linux-*-*
+WRKSRC=			${WRKDIR}/libvg/src
+BUILD_TARGET=		${LOWER_OPSYS}
+ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* OpenBSD-*-* Linux-*-*
 
 INSTALLATION_DIRS=	lib include
 
diff --git a/libvips/Makefile b/libvips/Makefile
index 4c63eb98ca..0c836afcab 100644
--- a/libvips/Makefile
+++ b/libvips/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME= vips-8.6.1
-PKGNAME= lib${DISTNAME}
+DISTNAME=	vips-8.6.1
+PKGNAME=	lib${DISTNAME}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jcupitt/}
 
@@ -10,12 +10,12 @@ HOMEPAGE=	http://jcupitt.github.io/libvips/
 COMMENT=	Libvips is a demand-driven, horizontally threaded image processing lib
 LICENSE=	gnu-lgpl-v2.1
 
-GITHUB_PROJECT= libvips
-GITHUB_RELEASE= v${PKGVERSION_NOREV}
+GITHUB_PROJECT=	libvips
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=			pkg-config gmake
+USE_TOOLS+=		pkg-config gmake
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 
diff --git a/libvterm/buildlink3.mk b/libvterm/buildlink3.mk
index 2b5d629e2c..630097e435 100644
--- a/libvterm/buildlink3.mk
+++ b/libvterm/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libvterm
 LIBVTERM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libvterm+=	libvterm>=0.0.0
-BUILDLINK_PKGSRCDIR.libvterm?=	../../wip/libvterm
+BUILDLINK_PKGSRCDIR.libvterm?=		../../wip/libvterm
 .endif	# LIBVTERM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libvterm
diff --git a/libxdiff/buildlink3.mk b/libxdiff/buildlink3.mk
index 6d0c04989b..2fe066565e 100644
--- a/libxdiff/buildlink3.mk
+++ b/libxdiff/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libxdiff
 LIBXDIFF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxdiff+=	libxdiff>=0.23
-BUILDLINK_PKGSRCDIR.libxdiff?=	../../wip/libxdiff
+BUILDLINK_PKGSRCDIR.libxdiff?=		../../wip/libxdiff
 .endif	# LIBXDIFF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libxdiff
diff --git a/libzn-poly/Makefile b/libzn-poly/Makefile
index c76b9a2ef7..9f4257cd80 100644
--- a/libzn-poly/Makefile
+++ b/libzn-poly/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://cims.nyu.edu/~harvey/zn_poly/releases/
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://cims.nyu.edu/~harvey/code/zn_poly/
 COMMENT=	Libzn_poly is a C library for polynomial arithmetic in Z/nZ[x]
-LICENSE=		gnu-gpl-v2 AND gnu-gpl-v3
+LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3
 
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
diff --git a/lilypond-git/Makefile b/lilypond-git/Makefile
index 62dd0efcfd..d6af72a667 100644
--- a/lilypond-git/Makefile
+++ b/lilypond-git/Makefile
@@ -67,8 +67,8 @@ CONFIGURE_ARGS+=	--disable-optimising
 CONFIGURE_ARGS+=	--with-ncsb-dir=${PREFIX}/share/fonts/urw
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 
-REPLACE_PYTHON+= scripts/build/yyout2grammar.py
-PLIST_SUBST+=	PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//}
+REPLACE_PYTHON+=		scripts/build/yyout2grammar.py
+PLIST_SUBST+=			PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//}
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2014/01/28
 
 pre-configure:
diff --git a/lilyterm/Makefile b/lilyterm/Makefile
index d6e0475bf9..2cb38c925a 100644
--- a/lilyterm/Makefile
+++ b/lilyterm/Makefile
@@ -18,9 +18,9 @@ USE_TOOLS+=		gawk gmake msgfmt pkg-config printf
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-EGDIR=		${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=	${EGDIR}/lilyterm.conf ${PKG_SYSCONFDIR}/${PKGBASE}/lilyterm.conf
-INSTALLATION_DIRS+=     ${PKG_SYSCONFDIR}/${PKGBASE} ${EGDIR}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+=		${EGDIR}/lilyterm.conf ${PKG_SYSCONFDIR}/${PKGBASE}/lilyterm.conf
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/${PKGBASE} ${EGDIR}
 
 .include "options.mk"
 
diff --git a/linphone/Makefile b/linphone/Makefile
index c227d9f41b..825afd1096 100644
--- a/linphone/Makefile
+++ b/linphone/Makefile
@@ -9,10 +9,10 @@ HOMEPAGE=	http://www.linphone.org/
 COMMENT=	SIP-based IP telephony client
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake intltool perl pkg-config
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	YES
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		gmake intltool perl pkg-config
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--with-osip=${BUILDLINK_PREFIX.libosip2}
diff --git a/linux-acl/buildlink3.mk b/linux-acl/buildlink3.mk
index 8cb68b4fc1..2eda8a560a 100644
--- a/linux-acl/buildlink3.mk
+++ b/linux-acl/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	linux-acl
 LINUX_ACL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.linux-acl+=	linux-acl>=2.2.52
-BUILDLINK_PKGSRCDIR.linux-acl?=	../../wip/linux-acl
+BUILDLINK_PKGSRCDIR.linux-acl?=		../../wip/linux-acl
 
 .include "../../wip/linux-attr/buildlink3.mk"
 .endif	# LINUX_ACL_BUILDLINK3_MK
diff --git a/linux-ch/Makefile b/linux-ch/Makefile
index 2921a472c7..a8035ac5b7 100644
--- a/linux-ch/Makefile
+++ b/linux-ch/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ch is an interactive C development environment
 # I have included chstandard-license for pkgsrc-wip purposes as
 # linux-ch/licenses/chstandard-license. Basically,
 # this tool is free for personal and commercial use.
-LICENSE=		chstandard-license
+LICENSE=	chstandard-license
 
 LINUX_BINPKG_FMT=	plain
 LINUX_USE_X11=		yes
diff --git a/linux-kbd/Makefile b/linux-kbd/Makefile
index a872319852..a9b7a191fa 100644
--- a/linux-kbd/Makefile
+++ b/linux-kbd/Makefile
@@ -30,8 +30,8 @@ MAKE_ENV+=		LEX=${LEX:Q}
 
 .if !exists(/usr/bin/yacc)
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-YACC=			${LOCALBASE}/bin/bison -y
-MAKE_ENV+=		YACC=${YACC:Q}
+YACC=		${LOCALBASE}/bin/bison -y
+MAKE_ENV+=	YACC=${YACC:Q}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/linux-kernel/options.mk b/linux-kernel/options.mk
index 914e0e24a3..b49823e5f2 100644
--- a/linux-kernel/options.mk
+++ b/linux-kernel/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD: options.mk,v 1.2 2008/05/24 15:34:11 tnn2 Exp $
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.linux-kernel
+PKG_OPTIONS_VAR=	PKG_OPTIONS.linux-kernel
 PKG_SUPPORTED_OPTIONS=	inet6
 PKG_SUGGESTED_OPTIONS=	inet6
 
diff --git a/linux-nfs-utils/PLIST b/linux-nfs-utils/PLIST
index 0d83de19cc..39c77fdb2a 100644
--- a/linux-nfs-utils/PLIST
+++ b/linux-nfs-utils/PLIST
@@ -30,6 +30,6 @@ sbin/rpc.nfsd
 sbin/rpc.rquotad
 sbin/rpc.statd
 sbin/showmount
-share/examples/rc.d/nfslocking
-share/examples/rc.d/nfsd
 share/examples/rc.d/mountd
+share/examples/rc.d/nfsd
+share/examples/rc.d/nfslocking
diff --git a/linuxtv-dvb-apps/Makefile b/linuxtv-dvb-apps/Makefile
index 85b4140811..07fcd84c94 100644
--- a/linuxtv-dvb-apps/Makefile
+++ b/linuxtv-dvb-apps/Makefile
@@ -12,7 +12,7 @@ COMMENT=		DVB applications from LinuxTV project
 
 USE_TOOLS+=		gmake
 
-ONLY_FOR_PLATFORM= Linux-*-*
+ONLY_FOR_PLATFORM=	Linux-*-*
 
 do-build:
 	cd ${WRKSRC} && ${GMAKE}
diff --git a/lissac/Makefile b/lissac/Makefile
index fba8caad0e..6a56f6dbef 100644
--- a/lissac/Makefile
+++ b/lissac/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Lisaac is the first compiled POO based on prototype concepts
 #LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	gmake
-USE_LANGUAGES=  c c++
+USE_LANGUAGES=	c c++
 
 ONLY_FOR_COMPILER=	gcc
-ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
 
 PLIST_SRC+=	PLIST
 PLIST_SRC+=	${PKGDIR}/PLIST.doc ${PKGDIR}/PLIST.li
diff --git a/litecoin/Makefile b/litecoin/Makefile
index a0d345c643..bb3165753d 100644
--- a/litecoin/Makefile
+++ b/litecoin/Makefile
@@ -19,23 +19,23 @@ AUTO_MKDIRS=	yes
 HAS_CONFIGURE=	yes
 GNU_CONFIGURE=	yes
 
-CXXFLAGS+=	-I${BUILDLINK_PREFIX.boost-libs}/include/boost
-CFLAGS+=        -fPIC
-CXXFLAGS+= -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/litecoin -L${BUILDLINK_PREFIX.boost-libs}/lib/litecoin
+CXXFLAGS+=		-I${BUILDLINK_PREFIX.boost-libs}/include/boost
+CFLAGS+=		-fPIC
+CXXFLAGS+=		-Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/litecoin -L${BUILDLINK_PREFIX.boost-libs}/lib/litecoin
 BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
-BOOST_LDFLAGS=	-Wl,-R${BUILDLINK_TRANSFORM.boost-libs}/lib -Wl,-L${BUILDLINK_PREFIX.boost-libs}/lib
-#LDFLAGS+=	${BOOST_LDFLAGS:Q}
-#LDFLAGS+=	${PREFIX}/qt4/lib
-#CPPFLAGS+=      -I${PREFIX}/qt4/include/
+BOOST_LDFLAGS=		-Wl,-R${BUILDLINK_TRANSFORM.boost-libs}/lib -Wl,-L${BUILDLINK_PREFIX.boost-libs}/lib
+#LDFLAGS+=		${BOOST_LDFLAGS:Q}
+#LDFLAGS+=		${PREFIX}/qt4/lib
+#CPPFLAGS+=     	-I${PREFIX}/qt4/include/
 
-CONFIGURE_ARGS+=  --with-boost=${BUILDLINK_PREFIX.boost-libs}
-CONFIGURE_ARGS+=  --enable-hardening
-CONFIGURE_ARGS+=  ${PREFIX}/include/db4 
-#CONFIGURE_ARGS+=  --without-gui
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=	--enable-hardening
+CONFIGURE_ARGS+=	${PREFIX}/include/db4 
+#CONFIGURE_ARGS+=	--without-gui
 
-LIBTOOLIZE=     ${PREFIX}/bin/libtoolize
+LIBTOOLIZE=	${PREFIX}/bin/libtoolize
 
-QMAKE_CXXFLAGS+= -stdlib=libstdc++
+QMAKE_CXXFLAGS+=	-stdlib=libstdc++
 
 QMAKE_OPTIONS+=	BOOST_INCLUDE_PATH=${PREFIX}/include/boost
 QMAKE_OPTIONS+=	BDB_INCLUDE_PATH=${PREFIX}/include/db4
@@ -47,10 +47,10 @@ QMAKE_OPTIONS+=	OPENSSL_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	LIB_RPATH=${PREFIX}/lib
 
 
-RCD_SCRIPTS=	litecoind
-OWN_DIRS=	${VARBASE}/litecoin
-EGDIR=		${PREFIX}/share/examples/litecoin
-CONF_FILES=	${EGDIR}/litecoin.conf ${PKG_SYSCONFDIR}/litecoin.conf
+RCD_SCRIPTS=		litecoind
+OWN_DIRS=		${VARBASE}/litecoin
+EGDIR=			${PREFIX}/share/examples/litecoin
+CONF_FILES=		${EGDIR}/litecoin.conf ${PKG_SYSCONFDIR}/litecoin.conf
 CONF_FILES_PERMS=	${EGDIR}/litecoin.conf ${PKG_SYSCONFDIR}/litecoin.conf ${ROOT_USER} ${ROOT_GROUP} 0600
 INSTALLATION_DIRS+=	lib share/examples/litecoin
 
diff --git a/litecoin/PLIST b/litecoin/PLIST
index 929adf952e..c2c774f258 100644
--- a/litecoin/PLIST
+++ b/litecoin/PLIST
@@ -1,9 +1,9 @@
 @comment $NetBSD$
+bin/litecoin-cli
+bin/litecoin-tx
 lib/litecoin/libsecp256k1.la
 lib/litecoin/libsecp256k1.so
 lib/litecoin/libsecp256k1.so.0
 sbin/litecoind
-bin/litecoin-cli
-bin/litecoin-tx
 share/examples/litecoin/litecoin.conf
 share/examples/rc.d/litecoind
diff --git a/litehtml/buildlink3.mk b/litehtml/buildlink3.mk
index 5750d05a49..b672431d92 100644
--- a/litehtml/buildlink3.mk
+++ b/litehtml/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	litehtml
 LITEHTML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.litehtml+=	litehtml>=0.4.0.20170407
-BUILDLINK_PKGSRCDIR.litehtml?=	../../wip/litehtml
-BUILDLINK_DEPMETHOD.litehtml?=	build
+BUILDLINK_PKGSRCDIR.litehtml?=		../../wip/litehtml
+BUILDLINK_DEPMETHOD.litehtml?=		build
 .endif	# LITEHTML_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-litehtml
diff --git a/lives/Makefile b/lives/Makefile
index 8fb23588a0..3a8020c920 100644
--- a/lives/Makefile
+++ b/lives/Makefile
@@ -22,7 +22,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=	pkg-config perl gmake intltool msgfmt
+USE_TOOLS+=		pkg-config perl gmake intltool msgfmt
 
 REPLACE_PERL+=	build-lives-rfx-plugin-multi build-lives-rfx-plugin \
 		tools/autolives.pl \
diff --git a/llilc-git/Makefile b/llilc-git/Makefile
index 15d3622724..a9b4116e7c 100644
--- a/llilc-git/Makefile
+++ b/llilc-git/Makefile
@@ -21,9 +21,9 @@ CMAKE_ARG_PATH=	${WRKSRC}
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-PYTHON_FOR_BUILD_ONLY=  yes
+PYTHON_FOR_BUILD_ONLY=	yes
 
-BUILDLINK_TRANSFORM+=        rm:-Werror
+BUILDLINK_TRANSFORM+=	rm:-Werror
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 
@@ -32,7 +32,7 @@ PKGSRC_COMPILER=	clang
 PKG_CC=			clang
 PKG_CXX=		clang++
 
-CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
+CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 
 # XXX perl is not added as a tool as it does not seem to be required
 REPLACE_PERL+=		utils/GenLibDeps.pl
diff --git a/llvm-all-in-one/options.mk b/llvm-all-in-one/options.mk
index aa3a5cc59f..412370c6c7 100644
--- a/llvm-all-in-one/options.mk
+++ b/llvm-all-in-one/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.3 2017/05/09 12:23:42 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.llvm
-PKG_SUPPORTED_OPTIONS+=		terminfo
+PKG_SUPPORTED_OPTIONS+=	terminfo
 
 # Terminfo is used for colour output, only enable it by default if terminfo
 # is builtin to avoid unnecessary dependencies which could cause bootstrap
diff --git a/logwatch/Makefile b/logwatch/Makefile
index db07a2eafc..bfde3b516a 100644
--- a/logwatch/Makefile
+++ b/logwatch/Makefile
@@ -25,7 +25,7 @@ REPLACE_PERL+=		lib/Logwatch.pm scripts/logwatch.pl \
 			scripts/services/spamassassin
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path= 	post-patch
+SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	logwatch.8 scripts/logwatch.pl \
 			HOWTO-Customize-LogWatch README \
 			scripts/services/clam-update
diff --git a/lrslib/Makefile b/lrslib/Makefile
index b01a70c1fd..0c17f93b5a 100644
--- a/lrslib/Makefile
+++ b/lrslib/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://cgm.cs.mcgill.ca/~avis/C/lrs.html
 COMMENT=	Enumerate vertices and extreme rays of a convex polyhedron
 LICENSE=	gnu-gpl-v2
 
-MAKE_FILE=   makefile
+MAKE_FILE=	makefile
 
 INSTALLATION_DIRS=	bin
 
diff --git a/lscpu/Makefile b/lscpu/Makefile
index b57c3af6b1..a28ac0c869 100644
--- a/lscpu/Makefile
+++ b/lscpu/Makefile
@@ -14,7 +14,7 @@ LICENSE=	modified-bsd
 
 WRKSRC=	${WRKDIR}/lscpu-1.0.0
 
-INSTALLATION_DIRS+=bin
+INSTALLATION_DIRS+=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lscpu   ${DESTDIR}${PREFIX}/bin/lscpu
diff --git a/lsw/Makefile b/lsw/Makefile
index 99f3f445bb..a8b6ba0f4d 100644
--- a/lsw/Makefile
+++ b/lsw/Makefile
@@ -10,18 +10,18 @@ HOMEPAGE=	http://tools.suckless.org/lsw/
 COMMENT=	Lists the titles of all running X windows to stdout
 LICENSE=	mit
 
-NO_CONFIGURE=   yes
+NO_CONFIGURE=	yes
 
 # Adjust config.mk
-SUBST_CLASSES+=         makefile
-SUBST_STAGE.makefile=   pre-build
-SUBST_MESSAGE.makefile= Fixing config.mk
-SUBST_FILES.makefile=   config.mk
-SUBST_SED.makefile+=    -e 's,/usr/local,${PREFIX},g'
-SUBST_SED.makefile+=    -e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.makefile+=    -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+=    -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+=    -e 's/cc/${CC:Q}/'
+SUBST_CLASSES+=		makefile
+SUBST_STAGE.makefile=	pre-build
+SUBST_MESSAGE.makefile=	Fixing config.mk
+SUBST_FILES.makefile=	config.mk
+SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.makefile+=	-e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+=	-e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ltp-git/PLIST b/ltp-git/PLIST
index 25d9d26859..e3c5cddf7b 100644
--- a/ltp-git/PLIST
+++ b/ltp-git/PLIST
@@ -1,4 +1,7 @@
 @comment $NetBSD: PLIST,v 1.2 2014/12/17 22:04:53 krytarowski Exp $
+IDcheck.sh
+Version
+bin/STPfailure_report.pl
 bin/create_dmesg_entries_for_each_test.awk
 bin/create_kernel_faults_in_loops_and_probability.awk
 bin/create_valgrind_check.awk
@@ -12,8 +15,6 @@ bin/ltp-pan
 bin/make-file.sh
 bin/rand_lines
 bin/restore_kernel_faults_default.sh
-bin/STPfailure_report.pl
-IDcheck.sh
 man/man1/doio.1
 man/man1/iogen.1
 man/man1/ltp-bump.1
@@ -68,12 +69,12 @@ runtest/ipc
 runtest/ipv6
 runtest/ipv6_lib
 runtest/kernel_misc
+runtest/ltp-aio-stress.part1
+runtest/ltp-aio-stress.part2
 runtest/ltp-aiodio.part1
 runtest/ltp-aiodio.part2
 runtest/ltp-aiodio.part3
 runtest/ltp-aiodio.part4
-runtest/ltp-aio-stress.part1
-runtest/ltp-aio-stress.part2
 runtest/ltplite
 runtest/lvm.part1
 runtest/lvm.part2
@@ -175,15 +176,15 @@ testcases/bin/broken_ip4-checksum
 testcases/bin/broken_ip4-dstaddr
 testcases/bin/broken_ip4-fragment
 testcases/bin/broken_ip4-ihl
-testcases/bin/broken_ip4_lib.sh
 testcases/bin/broken_ip4-protcol
 testcases/bin/broken_ip4-totlen
 testcases/bin/broken_ip4-version
+testcases/bin/broken_ip4_lib.sh
 testcases/bin/broken_ip6-dstaddr
-testcases/bin/broken_ip6_lib.sh
 testcases/bin/broken_ip6-nexthdr
 testcases/bin/broken_ip6-plen
 testcases/bin/broken_ip6-version
+testcases/bin/broken_ip6_lib.sh
 testcases/bin/c
 testcases/bin/cacheflush01
 testcases/bin/can_filter
@@ -196,8 +197,8 @@ testcases/bin/capget01
 testcases/bin/capget02
 testcases/bin/capset01
 testcases/bin/capset02
-testcases/bin/cgroup_fj_function2.sh
 testcases/bin/cgroup_fj_function.sh
+testcases/bin/cgroup_fj_function2.sh
 testcases/bin/cgroup_fj_proc
 testcases/bin/cgroup_fj_release_agent
 testcases/bin/cgroup_fj_stress.sh
@@ -262,8 +263,8 @@ testcases/bin/cmdlib.sh
 testcases/bin/confstr01
 testcases/bin/connect01
 testcases/bin/connector_test.sh
-testcases/bin/cpio_tests.sh
 testcases/bin/cp_tests.sh
+testcases/bin/cpio_tests.sh
 testcases/bin/cpuacct_setup.sh
 testcases/bin/cpuacct_task01
 testcases/bin/cpuctl_def_task01
@@ -323,12 +324,12 @@ testcases/bin/creat07
 testcases/bin/creat07_child
 testcases/bin/creat08
 testcases/bin/creat09
+testcases/bin/create-files
 testcases/bin/create_datafile
-testcases/bin/createfile
 testcases/bin/create_file
-testcases/bin/create-files
 testcases/bin/create_long_dirs
 testcases/bin/create_short_dirs
+testcases/bin/createfile
 testcases/bin/cron02
 testcases/bin/cron03
 testcases/bin/cron_allow01
@@ -342,6 +343,7 @@ testcases/bin/cron_tests.sh
 testcases/bin/d1.obj
 testcases/bin/daemonlib.sh
 testcases/bin/data
+testcases/bin/data_space
 testcases/bin/datafiles/ascii.jmb
 testcases/bin/datafiles/ascii.lg
 testcases/bin/datafiles/ascii.med
@@ -350,7 +352,6 @@ testcases/bin/datafiles/bin.jmb
 testcases/bin/datafiles/bin.lg
 testcases/bin/datafiles/bin.med
 testcases/bin/datafiles/bin.sm
-testcases/bin/data_space
 testcases/bin/delete_module01
 testcases/bin/delete_module02
 testcases/bin/delete_module03
@@ -363,10 +364,10 @@ testcases/bin/diotest5
 testcases/bin/diotest6
 testcases/bin/disktest
 testcases/bin/dma_thread_diotest
-testcases/bin/dns4-stress
-testcases/bin/dns6-stress
 testcases/bin/dns-stress01-rmt
 testcases/bin/dns-stress02-rmt
+testcases/bin/dns4-stress
+testcases/bin/dns6-stress
 testcases/bin/doio
 testcases/bin/dup01
 testcases/bin/dup02
@@ -388,13 +389,15 @@ testcases/bin/echoes
 testcases/bin/echoes6
 testcases/bin/eject-tests.sh
 testcases/bin/endian_switch01
-testcases/bin/epoll_create1_01
 testcases/bin/epoll-ltp
+testcases/bin/epoll_create1_01
+testcases/bin/event_generator
 testcases/bin/eventfd01
 testcases/bin/eventfd2_01
 testcases/bin/eventfd2_02
 testcases/bin/eventfd2_03
-testcases/bin/event_generator
+testcases/bin/exec_with_inh
+testcases/bin/exec_without_inh
 testcases/bin/execl01
 testcases/bin/execle01
 testcases/bin/execlp01
@@ -405,8 +408,6 @@ testcases/bin/execve03
 testcases/bin/execve04
 testcases/bin/execve05
 testcases/bin/execvp01
-testcases/bin/exec_with_inh
-testcases/bin/exec_without_inh
 testcases/bin/exit01
 testcases/bin/exit02
 testcases/bin/exit_group01
@@ -522,8 +523,8 @@ testcases/bin/fcntl31_64
 testcases/bin/fdatasync01
 testcases/bin/fdatasync02
 testcases/bin/file0.in
-testcases/bin/file10.in
 testcases/bin/file1.in
+testcases/bin/file10.in
 testcases/bin/file2.in
 testcases/bin/file3.in
 testcases/bin/file4.in
@@ -532,8 +533,8 @@ testcases/bin/file6.in
 testcases/bin/file7.in
 testcases/bin/file8.in
 testcases/bin/file9.in
-testcases/bin/filecapstest.sh
 testcases/bin/file_test.sh
+testcases/bin/filecapstest.sh
 testcases/bin/find_portbundle
 testcases/bin/finger01
 testcases/bin/float_bessel
@@ -577,9 +578,15 @@ testcases/bin/freeze_self_thaw.sh
 testcases/bin/freeze_sleep_thaw.sh
 testcases/bin/freeze_thaw.sh
 testcases/bin/freeze_write_freezing.sh
-testcases/bin/fs-bench-test2.sh
 testcases/bin/fs-bench-test.sh
+testcases/bin/fs-bench-test2.sh
 testcases/bin/fs_bind/bin/check_prop
+testcases/bin/fs_bind/bin/lockfile
+testcases/bin/fs_bind/bin/makedir
+testcases/bin/fs_bind/bin/nsclone
+testcases/bin/fs_bind/bin/setup
+testcases/bin/fs_bind/bin/setupnslock
+testcases/bin/fs_bind/bin/smount
 testcases/bin/fs_bind/bind/test01
 testcases/bin/fs_bind/bind/test02
 testcases/bin/fs_bind/bind/test03
@@ -605,12 +612,6 @@ testcases/bin/fs_bind/bind/test21
 testcases/bin/fs_bind/bind/test22
 testcases/bin/fs_bind/bind/test23
 testcases/bin/fs_bind/bind/test24
-testcases/bin/fs_bind/bin/lockfile
-testcases/bin/fs_bind/bin/makedir
-testcases/bin/fs_bind/bin/nsclone
-testcases/bin/fs_bind/bin/setup
-testcases/bin/fs_bind/bin/setupnslock
-testcases/bin/fs_bind/bin/smount
 testcases/bin/fs_bind/cloneNS/test01
 testcases/bin/fs_bind/cloneNS/test02
 testcases/bin/fs_bind/cloneNS/test03
@@ -686,6 +687,7 @@ testcases/bin/fs_bind/regression/test03
 testcases/bin/fs_di
 testcases/bin/fs_inod
 testcases/bin/fs_perms
+testcases/bin/fs_racer.sh
 testcases/bin/fs_racer_dir_create.sh
 testcases/bin/fs_racer_dir_test.sh
 testcases/bin/fs_racer_file_concat.sh
@@ -695,7 +697,6 @@ testcases/bin/fs_racer_file_list.sh
 testcases/bin/fs_racer_file_rename.sh
 testcases/bin/fs_racer_file_rm.sh
 testcases/bin/fs_racer_file_symlink.sh
-testcases/bin/fs_racer.sh
 testcases/bin/fsstress
 testcases/bin/fstat01
 testcases/bin/fstat01_64
@@ -728,6 +729,10 @@ testcases/bin/ftest05
 testcases/bin/ftest06
 testcases/bin/ftest07
 testcases/bin/ftest08
+testcases/bin/ftp-download-stress01-rmt
+testcases/bin/ftp-download-stress02-rmt
+testcases/bin/ftp-upload-stress01-rmt
+testcases/bin/ftp-upload-stress02-rmt
 testcases/bin/ftp01
 testcases/bin/ftp02
 testcases/bin/ftp03
@@ -737,11 +742,7 @@ testcases/bin/ftp4-download-stress
 testcases/bin/ftp4-upload-stress
 testcases/bin/ftp6-download-stress
 testcases/bin/ftp6-upload-stress
-testcases/bin/ftp-download-stress01-rmt
-testcases/bin/ftp-download-stress02-rmt
 testcases/bin/ftp_setup
-testcases/bin/ftp-upload-stress01-rmt
-testcases/bin/ftp-upload-stress02-rmt
 testcases/bin/ftrace_get_page_size
 testcases/bin/ftrace_stress/ftrace_buffer_size.sh
 testcases/bin/ftrace_stress/ftrace_current_tracer.sh
@@ -751,10 +752,10 @@ testcases/bin/ftrace_stress/ftrace_set_event.sh
 testcases/bin/ftrace_stress/ftrace_set_ftrace_pid.sh
 testcases/bin/ftrace_stress/ftrace_stack_max_size.sh
 testcases/bin/ftrace_stress/ftrace_stack_trace.sh
+testcases/bin/ftrace_stress/ftrace_trace.sh
 testcases/bin/ftrace_stress/ftrace_trace_clock.sh
 testcases/bin/ftrace_stress/ftrace_trace_options.sh
 testcases/bin/ftrace_stress/ftrace_trace_pipe.sh
-testcases/bin/ftrace_stress/ftrace_trace.sh
 testcases/bin/ftrace_stress/ftrace_trace_stat.sh
 testcases/bin/ftrace_stress/ftrace_tracing_enabled.sh
 testcases/bin/ftrace_stress/ftrace_tracing_max_latency.sh
@@ -767,8 +768,8 @@ testcases/bin/ftruncate02_64
 testcases/bin/ftruncate03
 testcases/bin/ftruncate03_64
 testcases/bin/ftruncate04
-testcases/bin/ftruncate04_64
 testcases/bin/ftruncate04.sh
+testcases/bin/ftruncate04_64
 testcases/bin/futimesat01
 testcases/bin/fw_load
 testcases/bin/genacos
@@ -805,6 +806,9 @@ testcases/bin/gentanh
 testcases/bin/gentrigo
 testcases/bin/geny0
 testcases/bin/geny1
+testcases/bin/get_ifname
+testcases/bin/get_mempolicy01
+testcases/bin/get_robust_list01
 testcases/bin/getaddrinfo_01
 testcases/bin/getcontext01
 testcases/bin/getcpu01
@@ -835,11 +839,9 @@ testcases/bin/getgroups03
 testcases/bin/getgroups03_16
 testcases/bin/gethostid01
 testcases/bin/gethostname01
-testcases/bin/get_ifname
 testcases/bin/getitimer01
 testcases/bin/getitimer02
 testcases/bin/getitimer03
-testcases/bin/get_mempolicy01
 testcases/bin/getpagesize01
 testcases/bin/getpeername01
 testcases/bin/getpgid01
@@ -859,7 +861,6 @@ testcases/bin/getresuid02
 testcases/bin/getresuid03
 testcases/bin/getrlimit01
 testcases/bin/getrlimit02
-testcases/bin/get_robust_list01
 testcases/bin/getrusage01
 testcases/bin/getrusage02
 testcases/bin/getrusage03
@@ -887,10 +888,10 @@ testcases/bin/host01
 testcases/bin/ht_affinity
 testcases/bin/ht_enabled
 testcases/bin/ht_interrupt
-testcases/bin/http4-stress
-testcases/bin/http6-stress
 testcases/bin/http-stress01-rmt
 testcases/bin/http-stress02-rmt
+testcases/bin/http4-stress
+testcases/bin/http6-stress
 testcases/bin/hugemmap01
 testcases/bin/hugemmap02
 testcases/bin/hugemmap04
@@ -982,22 +983,22 @@ testcases/bin/inotify04
 testcases/bin/inotify05
 testcases/bin/inotify_init1_01
 testcases/bin/inotify_init1_02
-testcases/bin/iobw
 testcases/bin/io_cancel01
+testcases/bin/io_destroy01
+testcases/bin/io_getevents01
+testcases/bin/io_setup01
+testcases/bin/io_submit01
+testcases/bin/iobw
 testcases/bin/ioctl01
 testcases/bin/ioctl02
 testcases/bin/ioctl03
-testcases/bin/io_destroy01
 testcases/bin/iogen
-testcases/bin/io_getevents01
 testcases/bin/ioperm01
 testcases/bin/ioperm02
 testcases/bin/iopl01
 testcases/bin/iopl02
-testcases/bin/io_setup01
-testcases/bin/io_submit01
-testcases/bin/iptables_tests.sh
 testcases/bin/ip_tests.sh
+testcases/bin/iptables_tests.sh
 testcases/bin/isofs.sh
 testcases/bin/kernbench
 testcases/bin/keyctl01
@@ -1068,10 +1069,10 @@ testcases/bin/lstat02
 testcases/bin/lstat02_64
 testcases/bin/lstat03
 testcases/bin/lstat03_64
-testcases/bin/ltp_acpi
 testcases/bin/ltpClient
 testcases/bin/ltpServer
 testcases/bin/ltpSockets.sh
+testcases/bin/ltp_acpi
 testcases/bin/madvise01
 testcases/bin/madvise02
 testcases/bin/madvise03
@@ -1083,6 +1084,16 @@ testcases/bin/mallocstress
 testcases/bin/mallopt01
 testcases/bin/max_map_count
 testcases/bin/mbind01
+testcases/bin/mc_cmds
+testcases/bin/mc_commo
+testcases/bin/mc_gethost
+testcases/bin/mc_member
+testcases/bin/mc_member_test
+testcases/bin/mc_opts
+testcases/bin/mc_recv
+testcases/bin/mc_send
+testcases/bin/mc_verify_opts
+testcases/bin/mc_verify_opts_error
 testcases/bin/mcast4-grpope01
 testcases/bin/mcast4-grpope02
 testcases/bin/mcast4-grpope03
@@ -1107,19 +1118,10 @@ testcases/bin/mcast6-queryfld03
 testcases/bin/mcast6-queryfld04
 testcases/bin/mcast6-queryfld05
 testcases/bin/mcast6-queryfld06
-testcases/bin/mc_cmds
-testcases/bin/mc_commo
-testcases/bin/mc_gethost
-testcases/bin/mc_member
-testcases/bin/mc_member_test
-testcases/bin/mc_opts
-testcases/bin/mc_recv
-testcases/bin/mc_send
-testcases/bin/mc_verify_opts
-testcases/bin/mc_verify_opts_error
 testcases/bin/mem01
 testcases/bin/mem02
 testcases/bin/mem03
+testcases/bin/mem_process
 testcases/bin/memcg_control_test.sh
 testcases/bin/memcg_function_test.sh
 testcases/bin/memcg_getpagesize
@@ -1141,7 +1143,6 @@ testcases/bin/memcg_use_hierarchy_test.sh
 testcases/bin/memcmp01
 testcases/bin/memcpy01
 testcases/bin/memctl_test01
-testcases/bin/mem_process
 testcases/bin/memset01
 testcases/bin/memtoy
 testcases/bin/mesgq_nstest
@@ -1154,9 +1155,9 @@ testcases/bin/message_queue_test_04
 testcases/bin/message_queue_test_05
 testcases/bin/migrate_pages01
 testcases/bin/migrate_pages02
+testcases/bin/min_free_kbytes
 testcases/bin/mincore01
 testcases/bin/mincore02
-testcases/bin/min_free_kbytes
 testcases/bin/mkdir01
 testcases/bin/mkdir02
 testcases/bin/mkdir03
@@ -1164,9 +1165,9 @@ testcases/bin/mkdir04
 testcases/bin/mkdir05
 testcases/bin/mkdir08
 testcases/bin/mkdir09
+testcases/bin/mkdir_tests.sh
 testcases/bin/mkdirat01
 testcases/bin/mkdirat02
-testcases/bin/mkdir_tests.sh
 testcases/bin/mknod01
 testcases/bin/mknod02
 testcases/bin/mknod03
@@ -1185,6 +1186,7 @@ testcases/bin/mlock04
 testcases/bin/mlockall01
 testcases/bin/mlockall02
 testcases/bin/mlockall03
+testcases/bin/mmap-corruption01
 testcases/bin/mmap001
 testcases/bin/mmap01
 testcases/bin/mmap02
@@ -1204,7 +1206,6 @@ testcases/bin/mmap14
 testcases/bin/mmap15
 testcases/bin/mmap2
 testcases/bin/mmap3
-testcases/bin/mmap-corruption01
 testcases/bin/mmapstress01
 testcases/bin/mmapstress02
 testcases/bin/mmapstress03
@@ -1231,6 +1232,7 @@ testcases/bin/mountns01
 testcases/bin/mountns02
 testcases/bin/mountns03
 testcases/bin/mountns04
+testcases/bin/move_pages.sh
 testcases/bin/move_pages01
 testcases/bin/move_pages02
 testcases/bin/move_pages03
@@ -1242,21 +1244,20 @@ testcases/bin/move_pages08
 testcases/bin/move_pages09
 testcases/bin/move_pages10
 testcases/bin/move_pages11
-testcases/bin/move_pages.sh
 testcases/bin/mprotect01
 testcases/bin/mprotect02
 testcases/bin/mprotect03
 testcases/bin/mprotect04
 testcases/bin/mq_notify01
 testcases/bin/mq_notify02
-testcases/bin/mqns_01
-testcases/bin/mqns_02
-testcases/bin/mqns_03
-testcases/bin/mqns_04
 testcases/bin/mq_open01
 testcases/bin/mq_timedreceive01
 testcases/bin/mq_timedsend01
 testcases/bin/mq_unlink01
+testcases/bin/mqns_01
+testcases/bin/mqns_02
+testcases/bin/mqns_03
+testcases/bin/mqns_04
 testcases/bin/mremap01
 testcases/bin/mremap02
 testcases/bin/mremap03
@@ -1313,32 +1314,32 @@ testcases/bin/nanosleep03
 testcases/bin/nanosleep04
 testcases/bin/net_cmdlib.sh
 testcases/bin/netns_ch_ftp.sh
+testcases/bin/netns_child.sh
 testcases/bin/netns_child_1.sh
 testcases/bin/netns_child_2.sh
+testcases/bin/netns_child_propagate.sh
 testcases/bin/netns_childipv6.sh
 testcases/bin/netns_childns.sh
-testcases/bin/netns_child_propagate.sh
-testcases/bin/netns_child.sh
 testcases/bin/netns_container_ftp.pl
 testcases/bin/netns_create_container
 testcases/bin/netns_crtchild
 testcases/bin/netns_crtchild_delchild
 testcases/bin/netns_delchild.sh
-testcases/bin/netns_devices2.sh
 testcases/bin/netns_devices.sh
+testcases/bin/netns_devices2.sh
 testcases/bin/netns_initialize.sh
 testcases/bin/netns_isolation.sh
 testcases/bin/netns_netlink
 testcases/bin/netns_par_chld_ftp
 testcases/bin/netns_par_chld_ftp.sh
 testcases/bin/netns_par_chld_ipv6
+testcases/bin/netns_par_ftp.sh
+testcases/bin/netns_parent.sh
 testcases/bin/netns_parent_1.sh
 testcases/bin/netns_parent_2.sh
-testcases/bin/netns_parentns.sh
-testcases/bin/netns_parent.sh
 testcases/bin/netns_parent_share.sh
 testcases/bin/netns_parent_view.sh
-testcases/bin/netns_par_ftp.sh
+testcases/bin/netns_parentns.sh
 testcases/bin/netns_paripv6.sh
 testcases/bin/netns_rename_net.sh
 testcases/bin/netns_sysfsview
@@ -1367,14 +1368,14 @@ testcases/bin/nice03
 testcases/bin/nice04
 testcases/bin/nice05
 testcases/bin/nm01
+testcases/bin/nmfile.c
+testcases/bin/nmfile.obj
 testcases/bin/nmfile1.c
 testcases/bin/nmfile1.obj
 testcases/bin/nmfile2.c
 testcases/bin/nmfile2.obj
 testcases/bin/nmfile3.c
 testcases/bin/nmfile3.obj
-testcases/bin/nmfile.c
-testcases/bin/nmfile.obj
 testcases/bin/notroot
 testcases/bin/nptl01
 testcases/bin/ns-echoclient
@@ -1411,11 +1412,11 @@ testcases/bin/open10
 testcases/bin/open11
 testcases/bin/open12
 testcases/bin/open12_child
+testcases/bin/open_files
 testcases/bin/openat01
 testcases/bin/openat02
 testcases/bin/openat02_child
 testcases/bin/openfile
-testcases/bin/open_files
 testcases/bin/output_ipsec_conf
 testcases/bin/overcommit_memory
 testcases/bin/page01
@@ -1461,9 +1462,9 @@ testcases/bin/pipe10
 testcases/bin/pipe11
 testcases/bin/pipe2_01
 testcases/bin/pipe2_02
-testcases/bin/pipeio
 testcases/bin/pipe_test_01
 testcases/bin/pipe_test_02
+testcases/bin/pipeio
 testcases/bin/policy/measure.policy
 testcases/bin/policy/measure.policy-invalid
 testcases/bin/poll01
@@ -1498,11 +1499,11 @@ testcases/bin/pselect01_64
 testcases/bin/pselect02
 testcases/bin/pselect02_64
 testcases/bin/ptem01
-testcases/bin/pthcli
-testcases/bin/pthserv
 testcases/bin/pth_str01
 testcases/bin/pth_str02
 testcases/bin/pth_str03
+testcases/bin/pthcli
+testcases/bin/pthserv
 testcases/bin/ptrace01
 testcases/bin/ptrace02
 testcases/bin/ptrace03
@@ -1515,9 +1516,9 @@ testcases/bin/pwrite02
 testcases/bin/pwrite02_64
 testcases/bin/pwrite04
 testcases/bin/pwrite04_64
+testcases/bin/quota_remount_test01.sh
 testcases/bin/quotactl01
 testcases/bin/quotactl02
-testcases/bin/quota_remount_test01.sh
 testcases/bin/random-access
 testcases/bin/random-access-del-create
 testcases/bin/rcp01
@@ -1586,10 +1587,9 @@ testcases/bin/route6-redirect
 testcases/bin/route6-rmmod
 testcases/bin/rpc01
 testcases/bin/rpc1
-testcases/bin/rpcinfo01
 testcases/bin/rpc_server
+testcases/bin/rpcinfo01
 testcases/bin/rsh01
-testcases/bin/rtc01
 testcases/bin/rt_sigaction01
 testcases/bin/rt_sigaction02
 testcases/bin/rt_sigaction03
@@ -1598,21 +1598,22 @@ testcases/bin/rt_sigprocmask02
 testcases/bin/rt_sigqueueinfo01
 testcases/bin/rt_sigsuspend01
 testcases/bin/rt_sigtimedwait01
-testcases/bin/runallnetworktests_child.sh
-testcases/bin/runallnetworktests_parent.sh
+testcases/bin/rtc01
 testcases/bin/run_capbounds.sh
 testcases/bin/run_cgroup_test_fj.sh
 testcases/bin/run_cpuacct_test.sh
 testcases/bin/run_cpuctl_latency_test.sh
 testcases/bin/run_cpuctl_stress_test.sh
-testcases/bin/run_cpuctl_test_fj.sh
 testcases/bin/run_cpuctl_test.sh
+testcases/bin/run_cpuctl_test_fj.sh
 testcases/bin/run_freezer.sh
 testcases/bin/run_io_throttle_test.sh
 testcases/bin/run_memctl_test.sh
 testcases/bin/run_pec_test
 testcases/bin/run_sched_cliserv.sh
 testcases/bin/run_semaphore_test_01.sh
+testcases/bin/runallnetworktests_child.sh
+testcases/bin/runallnetworktests_parent.sh
 testcases/bin/runtests_noltp.sh
 testcases/bin/rup01
 testcases/bin/rusers01
@@ -1622,14 +1623,14 @@ testcases/bin/sbrk01
 testcases/bin/sbrk02
 testcases/bin/sched_datafile
 testcases/bin/sched_driver
-testcases/bin/sched_getaffinity01
-testcases/bin/sched_getparam01
-testcases/bin/sched_getparam02
-testcases/bin/sched_getparam03
 testcases/bin/sched_get_priority_max01
 testcases/bin/sched_get_priority_max02
 testcases/bin/sched_get_priority_min01
 testcases/bin/sched_get_priority_min02
+testcases/bin/sched_getaffinity01
+testcases/bin/sched_getparam01
+testcases/bin/sched_getparam02
+testcases/bin/sched_getparam03
 testcases/bin/sched_getscheduler01
 testcases/bin/sched_getscheduler02
 testcases/bin/sched_rr_get_interval01
@@ -1657,10 +1658,11 @@ testcases/bin/select02
 testcases/bin/select03
 testcases/bin/sem01
 testcases/bin/sem02
+testcases/bin/sem_comm
+testcases/bin/sem_nstest
 testcases/bin/semaphore_test_01
 testcases/bin/semaphore_test_02
 testcases/bin/semaphore_test_03
-testcases/bin/sem_comm
 testcases/bin/semctl01
 testcases/bin/semctl02
 testcases/bin/semctl03
@@ -1673,7 +1675,6 @@ testcases/bin/semget02
 testcases/bin/semget03
 testcases/bin/semget05
 testcases/bin/semget06
-testcases/bin/sem_nstest
 testcases/bin/semop01
 testcases/bin/semop02
 testcases/bin/semop03
@@ -1701,6 +1702,10 @@ testcases/bin/sendfile09_64
 testcases/bin/sendmsg01
 testcases/bin/sendmsg02
 testcases/bin/sendto01
+testcases/bin/set_ipv4addr
+testcases/bin/set_robust_list01
+testcases/bin/set_thread_area01
+testcases/bin/set_tid_address01
 testcases/bin/setdomainname01
 testcases/bin/setdomainname02
 testcases/bin/setdomainname03
@@ -1737,7 +1742,6 @@ testcases/bin/setgroups04_16
 testcases/bin/sethostname01
 testcases/bin/sethostname02
 testcases/bin/sethostname03
-testcases/bin/set_ipv4addr
 testcases/bin/setitimer01
 testcases/bin/setitimer02
 testcases/bin/setitimer03
@@ -1797,11 +1801,8 @@ testcases/bin/setreuid07_16
 testcases/bin/setrlimit01
 testcases/bin/setrlimit02
 testcases/bin/setrlimit03
-testcases/bin/set_robust_list01
 testcases/bin/setsid01
 testcases/bin/setsockopt01
-testcases/bin/set_thread_area01
-testcases/bin/set_tid_address01
 testcases/bin/settimeofday01
 testcases/bin/settimeofday02
 testcases/bin/setuid01
@@ -1817,11 +1818,12 @@ testcases/bin/setxattr01
 testcases/bin/setxattr02
 testcases/bin/setxattr03
 testcases/bin/sgetmask01
+testcases/bin/shm_comm
+testcases/bin/shm_test
 testcases/bin/shmat01
 testcases/bin/shmat02
 testcases/bin/shmat03
 testcases/bin/shmat1
-testcases/bin/shm_comm
 testcases/bin/shmctl01
 testcases/bin/shmctl02
 testcases/bin/shmctl03
@@ -1851,7 +1853,6 @@ testcases/bin/shmt07
 testcases/bin/shmt08
 testcases/bin/shmt09
 testcases/bin/shmt10
-testcases/bin/shm_test
 testcases/bin/sigaction01
 testcases/bin/sigaction02
 testcases/bin/sigaltstack01
@@ -1862,9 +1863,6 @@ testcases/bin/signal02
 testcases/bin/signal03
 testcases/bin/signal04
 testcases/bin/signal05
-testcases/bin/signalfd01
-testcases/bin/signalfd4_01
-testcases/bin/signalfd4_02
 testcases/bin/signal_test_01
 testcases/bin/signal_test_02
 testcases/bin/signal_test_03
@@ -1872,6 +1870,9 @@ testcases/bin/signal_test_04
 testcases/bin/signal_test_05
 testcases/bin/signal_test_06
 testcases/bin/signal_test_07
+testcases/bin/signalfd01
+testcases/bin/signalfd4_01
+testcases/bin/signalfd4_02
 testcases/bin/sigpending02
 testcases/bin/sigprocmask01
 testcases/bin/sigrelse01
@@ -1907,6 +1908,10 @@ testcases/bin/splice01
 testcases/bin/splice02
 testcases/bin/splice03
 testcases/bin/ssetmask01
+testcases/bin/ssh-stress01-rmt
+testcases/bin/ssh-stress02-rmt
+testcases/bin/ssh-stress02-rmt.orig
+testcases/bin/ssh-stress03-rmt
 testcases/bin/ssh01
 testcases/bin/ssh01_s1
 testcases/bin/ssh02
@@ -1916,14 +1921,10 @@ testcases/bin/ssh03_s1
 testcases/bin/ssh4-stress
 testcases/bin/ssh6-stress
 testcases/bin/ssh_setup
-testcases/bin/ssh-stress01-rmt
-testcases/bin/ssh-stress02-rmt
-testcases/bin/ssh-stress02-rmt.orig
-testcases/bin/ssh-stress03-rmt
+testcases/bin/sssd-lib.sh
 testcases/bin/sssd01
 testcases/bin/sssd02
 testcases/bin/sssd03
-testcases/bin/sssd-lib.sh
 testcases/bin/stack_space
 testcases/bin/stat01
 testcases/bin/stat01_64
@@ -1958,8 +1959,8 @@ testcases/bin/stress_floppy
 testcases/bin/string01
 testcases/bin/su01
 testcases/bin/su01_s1
-testcases/bin/support_numa
 testcases/bin/su_set_passwd
+testcases/bin/support_numa
 testcases/bin/swapoff01
 testcases/bin/swapoff02
 testcases/bin/swapon01
@@ -1989,6 +1990,7 @@ testcases/bin/sysfs05
 testcases/bin/sysfs06
 testcases/bin/sysinfo01
 testcases/bin/sysinfo02
+testcases/bin/syslog-lib.sh
 testcases/bin/syslog01
 testcases/bin/syslog02
 testcases/bin/syslog03
@@ -2001,7 +2003,6 @@ testcases/bin/syslog09
 testcases/bin/syslog10
 testcases/bin/syslog11
 testcases/bin/syslog12
-testcases/bin/syslog-lib.sh
 testcases/bin/syslogtst
 testcases/bin/tar_tests.sh
 testcases/bin/tbio
@@ -2313,13 +2314,15 @@ testcases/bin/tcp6-uni-winscale11
 testcases/bin/tcp6-uni-winscale12
 testcases/bin/tcp6-uni-winscale13
 testcases/bin/tcp6-uni-winscale14
-testcases/bin/tcpdump01
 testcases/bin/tcp_fastopen
 testcases/bin/tcp_fastopen_run.sh
+testcases/bin/tcpdump01
 testcases/bin/tee01
 testcases/bin/tee02
 testcases/bin/telnet01
 testcases/bin/test
+testcases/bin/test.sh
+testcases/bin/test3
 testcases/bin/test_10_1.sh
 testcases/bin/test_10_2.sh
 testcases/bin/test_1_to_1_accept_close
@@ -2339,16 +2342,14 @@ testcases/bin/test_1_to_1_shutdown
 testcases/bin/test_1_to_1_socket_bind_listen
 testcases/bin/test_1_to_1_sockopt
 testcases/bin/test_1_to_1_threads
-testcases/bin/test3
 testcases/bin/test_3_1.sh
 testcases/bin/test_3_2.sh
 testcases/bin/test_6_1.sh
 testcases/bin/test_6_2
 testcases/bin/test_9_1.sh
 testcases/bin/test_9_2.sh
-testcases/bin/testall.sh
-testcases/bin/test_arch_debug
 testcases/bin/test_arch.obj
+testcases/bin/test_arch_debug
 testcases/bin/test_arch_stripped
 testcases/bin/test_assoc_abort
 testcases/bin/test_assoc_shutdown
@@ -2372,22 +2373,23 @@ testcases/bin/test_recvmsg
 testcases/bin/test_robind.sh
 testcases/bin/test_sctp_sendrecvmsg
 testcases/bin/test_sctp_sendrecvmsg_v6
-testcases/bin/testsf_c
-testcases/bin/testsf_c6
-testcases/bin/testsf_s
-testcases/bin/testsf_s6
-testcases/bin/test.sh
 testcases/bin/test_sockopt
 testcases/bin/test_sockopt_v6
 testcases/bin/test_tcp_style
 testcases/bin/test_tcp_style_v6
 testcases/bin/test_timetolive
 testcases/bin/test_timetolive_v6
+testcases/bin/testall.sh
+testcases/bin/testsf_c
+testcases/bin/testsf_c6
+testcases/bin/testsf_s
+testcases/bin/testsf_s6
 testcases/bin/thp01
 testcases/bin/thp02
 testcases/bin/thp03
 testcases/bin/thp04
 testcases/bin/thp05
+testcases/bin/time-schedule
 testcases/bin/time01
 testcases/bin/time02
 testcases/bin/timed_forkbomb
@@ -2396,45 +2398,46 @@ testcases/bin/timer_create03
 testcases/bin/timer_create04
 testcases/bin/timer_delete02
 testcases/bin/timer_delete03
+testcases/bin/timer_getoverrun01
+testcases/bin/timer_gettime01
+testcases/bin/timer_settime02
+testcases/bin/timer_settime03
 testcases/bin/timerfd01
 testcases/bin/timerfd02
 testcases/bin/timerfd03
 testcases/bin/timerfd_create01
 testcases/bin/timerfd_gettime01
 testcases/bin/timerfd_settime01
-testcases/bin/timer_getoverrun01
-testcases/bin/timer_gettime01
-testcases/bin/timer_settime02
-testcases/bin/timer_settime03
 testcases/bin/times01
 testcases/bin/times03
-testcases/bin/time-schedule
 testcases/bin/tkill01
 testcases/bin/tkill02
 testcases/bin/tomoyo_accept_test
-testcases/bin/tomoyo_filesystem_test
 testcases/bin/tomoyo_file_test
+testcases/bin/tomoyo_filesystem_test
 testcases/bin/tomoyo_new_file_test
 testcases/bin/tomoyo_new_test
 testcases/bin/tomoyo_policy_io_test
 testcases/bin/tomoyo_policy_memory_test
 testcases/bin/tomoyo_rewrite_test
 testcases/bin/tpci
+testcases/bin/tpm_changeauth_tests.sh
 testcases/bin/tpm_changeauth_tests_exp01.sh
 testcases/bin/tpm_changeauth_tests_exp02.sh
 testcases/bin/tpm_changeauth_tests_exp03.sh
-testcases/bin/tpm_changeauth_tests.sh
-testcases/bin/tpm_clear_tests_exp01.sh
 testcases/bin/tpm_clear_tests.sh
-testcases/bin/tpm_getpubek_tests_exp01.sh
+testcases/bin/tpm_clear_tests_exp01.sh
 testcases/bin/tpm_getpubek_tests.sh
+testcases/bin/tpm_getpubek_tests_exp01.sh
+testcases/bin/tpm_restrictpubek_tests.sh
 testcases/bin/tpm_restrictpubek_tests_exp01.sh
 testcases/bin/tpm_restrictpubek_tests_exp02.sh
 testcases/bin/tpm_restrictpubek_tests_exp03.sh
-testcases/bin/tpm_restrictpubek_tests.sh
 testcases/bin/tpm_selftest_tests.sh
-testcases/bin/tpm_takeownership_tests_exp01.sh
 testcases/bin/tpm_takeownership_tests.sh
+testcases/bin/tpm_takeownership_tests_exp01.sh
+testcases/bin/tpm_version_tests.sh
+testcases/bin/tpmtoken_import_tests.sh
 testcases/bin/tpmtoken_import_tests_exp01.sh
 testcases/bin/tpmtoken_import_tests_exp02.sh
 testcases/bin/tpmtoken_import_tests_exp03.sh
@@ -2443,25 +2446,23 @@ testcases/bin/tpmtoken_import_tests_exp05.sh
 testcases/bin/tpmtoken_import_tests_exp06.sh
 testcases/bin/tpmtoken_import_tests_exp07.sh
 testcases/bin/tpmtoken_import_tests_exp08.sh
-testcases/bin/tpmtoken_import_tests.sh
+testcases/bin/tpmtoken_init_tests.sh
 testcases/bin/tpmtoken_init_tests_exp00.sh
 testcases/bin/tpmtoken_init_tests_exp01.sh
 testcases/bin/tpmtoken_init_tests_exp02.sh
 testcases/bin/tpmtoken_init_tests_exp03.sh
-testcases/bin/tpmtoken_init_tests.sh
-testcases/bin/tpmtoken_objects_tests_exp01.sh
 testcases/bin/tpmtoken_objects_tests.sh
+testcases/bin/tpmtoken_objects_tests_exp01.sh
+testcases/bin/tpmtoken_protect_tests.sh
 testcases/bin/tpmtoken_protect_tests_exp01.sh
 testcases/bin/tpmtoken_protect_tests_exp02.sh
-testcases/bin/tpmtoken_protect_tests.sh
+testcases/bin/tpmtoken_setpasswd_tests.sh
 testcases/bin/tpmtoken_setpasswd_tests_exp01.sh
 testcases/bin/tpmtoken_setpasswd_tests_exp02.sh
 testcases/bin/tpmtoken_setpasswd_tests_exp03.sh
 testcases/bin/tpmtoken_setpasswd_tests_exp04.sh
-testcases/bin/tpmtoken_setpasswd_tests.sh
-testcases/bin/tpm_version_tests.sh
-testcases/bin/traceroute_tests.sh
 testcases/bin/trace_sched
+testcases/bin/traceroute_tests.sh
 testcases/bin/truncate01
 testcases/bin/truncate01_64
 testcases/bin/truncate02
@@ -2627,19 +2628,19 @@ testcases/data/ext4-ffsb/ffsb-config4
 testcases/data/ext4-ffsb/ffsb-config5
 testcases/data/ext4-ffsb/ffsb-config6
 testcases/data/ext4-ffsb/ffsb-config7
+testcases/data/ldd01/lddfile.out
 testcases/data/ldd01/lddfile1.obj.so
 testcases/data/ldd01/lddfile2.obj.so
 testcases/data/ldd01/lddfile3.obj.so
 testcases/data/ldd01/lddfile4.obj.so
 testcases/data/ldd01/lddfile5.obj.so
-testcases/data/ldd01/lddfile.out
 testcases/data/mc_member/ManyGroups
 testcases/data/mc_member/TooManyGroups
 testcases/data/rpc01/file.1
 testcases/data/rpc01/file.2
 testcases/data/tst_unzip_file.zip
-testscripts/adp_children.sh
 testscripts/adp.sh
+testscripts/adp_children.sh
 testscripts/adp_test.sh
 testscripts/autofs1.sh
 testscripts/autofs4.sh
@@ -2647,10 +2648,10 @@ testscripts/diskio.sh
 testscripts/exportfs.sh
 testscripts/load_stress_all_kernel_modules.sh
 testscripts/ltp-aiodio.sh
+testscripts/ltp-scsi_debug.sh
 testscripts/ltpdmmapper.sh
 testscripts/ltpfslvm.sh
 testscripts/ltpfsnolvm.sh
-testscripts/ltp-scsi_debug.sh
 testscripts/ltpstress.sh
 testscripts/math.sh
 testscripts/network.sh
@@ -2666,4 +2667,3 @@ testscripts/test_fs_bind.sh
 testscripts/test_realtime.sh
 testscripts/tpm_tools.sh
 ver_linux
-Version
diff --git a/lua-MessagePack/Makefile b/lua-MessagePack/Makefile
index 52d45c57f1..9ad39476bc 100644
--- a/lua-MessagePack/Makefile
+++ b/lua-MessagePack/Makefile
@@ -3,13 +3,13 @@
 DISTNAME=	lua-MessagePack-0.3.1
 PKGNAME=	${DISTNAME:S/lua/${LUA_PKGPREFIX}/1}
 CATEGORIES=	devel
-MASTER_SITES=   -https://github.com/fperrad/lua-MessagePack/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
+MASTER_SITES=	-https://github.com/fperrad/lua-MessagePack/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 HOMEPAGE=	http://fperrad.github.io/lua-MessagePack
 COMMENT=	MessagePack library for Lua
 LICENSE=	mit
 
-NO_BUILD=       yes
+NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS+=	${LUA_LDIR}
diff --git a/lua-lbn/Makefile b/lua-lbn/Makefile
index 40c218325e..60f32d0f3f 100644
--- a/lua-lbn/Makefile
+++ b/lua-lbn/Makefile
@@ -24,7 +24,7 @@ TEST_TARGET=	test
 
 WRKSRC=			${WRKDIR}/bn
 MAKEFLAGS+=		G=-fPIC
-LBN_README_DIR=		 share/doc/${PKGBASE}
+LBN_README_DIR=		share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${LUA_CDIR} ${LBN_README_DIR}
 
 .include "../../lang/lua/module.mk"
diff --git a/lumberjack/buildlink3.mk b/lumberjack/buildlink3.mk
index cfb2412aeb..f6b1c30e6a 100644
--- a/lumberjack/buildlink3.mk
+++ b/lumberjack/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	lumberjack
 LUMBERJACK_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.lumberjack=	${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.lumberjack?=		build
+BUILDLINK_DEPMETHOD.lumberjack?=	build
 
 BUILDLINK_API_DEPENDS.lumberjack+=	lumberjack>=2.0
 BUILDLINK_PKGSRCDIR.lumberjack?=	../../wip/lumberjack
diff --git a/lumina/options.mk b/lumina/options.mk
index 4c55d96156..c0d20094cd 100644
--- a/lumina/options.mk
+++ b/lumina/options.mk
@@ -5,7 +5,7 @@ PKG_SUPPORTED_OPTIONS=	noxinput
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKG_OPTIONS:Mnoxinput)
-EXTRA= CONFIG+=NO_XINPUT
+EXTRA=	CONFIG+=NO_XINPUT
 .else
 EXTRA=
 .endif
diff --git a/lwc/Makefile b/lwc/Makefile
index b06ea14c26..6bd40db45d 100644
--- a/lwc/Makefile
+++ b/lwc/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE=		http://students.ceid.upatras.gr/~sxanth/lwc/
 COMMENT=		Lightweight C++
 
 
-BUILD_TARGET= objdir/lwc
-SUBST_CLASSES+=gcc
-SUBST_STAGE.gcc=pre-build
-SUBST_FILES.gcc=Makefile
-SUBST_SED.gcc= -e 's,CCC\ \=,\#,g' -e 's,CC\ =\ ,CC+=-c ${CFLAGS}\#,' \
+BUILD_TARGET=		objdir/lwc
+SUBST_CLASSES+=		gcc
+SUBST_STAGE.gcc=	pre-build
+SUBST_FILES.gcc=	Makefile
+SUBST_SED.gcc=		-e 's,CCC\ \=,\#,g' -e 's,CC\ =\ ,CC+=-c ${CFLAGS}\#,' \
 	-e 's,$$(CCC),${CC},g'
 
 INSTALLATION_DIRS=	bin
diff --git a/lxqt/Makefile b/lxqt/Makefile
index 5b92aa8811..eb54ea10d8 100644
--- a/lxqt/Makefile
+++ b/lxqt/Makefile
@@ -1,13 +1,13 @@
 # $NetBSD: Makefile,v 1.8 2015/05/23 16:07:35 krytarowski Exp $
 
-PKGNAME=        lxqt-0.9.0
-CATEGORIES=     meta-pkgs
+PKGNAME=	lxqt-0.9.0
+CATEGORIES=	meta-pkgs
 
-MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=       https://lxqt.org/
-COMMENT=        Meta-package for LXQt desktop environment
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://lxqt.org/
+COMMENT=	Meta-package for LXQt desktop environment
 
-META_PACKAGE=   yes
+META_PACKAGE=	yes
 
 
 # See https://wiki.lxde.org/en/Build_LXDE-Qt_From_Source
@@ -15,29 +15,29 @@ META_PACKAGE=   yes
 # https://svnweb.mageia.org/packages/cauldron/task-lxqt/current/SPECS/task-lxqt.spec?view=markup
 
 # Set of packages from https://downloads.lxqt.org/lxqt/0.9.0/
-DEPENDS+=       liblxqt>=0.9.0:../../wip/liblxqt
-DEPENDS+=       lximage-qt>=0.4.0:../../wip/lximage-qt
-DEPENDS+=       lxmenu-data>=0.1.4:../../sysutils/lxmenu-data
-DEPENDS+=       lxqt-about>=0.9.0:../../wip/lxqt-about
-DEPENDS+=       lxqt-admin>=0.9.0:../../wip/lxqt-admin
-DEPENDS+=       lxqt-common>=0.9.1:../../wip/lxqt-common
-DEPENDS+=       lxqt-config>=0.9.0:../../wip/lxqt-config
-DEPENDS+=       lxqt-globalkeys>=0.9.0:../../wip/lxqt-globalkeys
-DEPENDS+=       lxqt-notificationd>=0.9.0:../../wip/lxqt-notificationd
-DEPENDS+=       lxqt-openssh-askpass>=0.9.0:../../wip/lxqt-openssh-askpass
-DEPENDS+=       lxqt-panel>=0.9.0:../../wip/lxqt-panel
-DEPENDS+=       lxqt-policykit>=0.9.0:../../wip/lxqt-policykit
-DEPENDS+=       lxqt-powermanagement>=0.9.0:../../wip/lxqt-powermanagement
-DEPENDS+=       lxqt-qtplugin>=0.9.0:../../wip/lxqt-qtplugin
-DEPENDS+=       lxqt-runner>=0.9.0:../../wip/lxqt-runner
-DEPENDS+=       lxqt-session>=0.9.0:../../wip/lxqt-session
-DEPENDS+=       pcmanfm-qt>=0.9.0:../../wip/pcmanfm-qt
+DEPENDS+=	liblxqt>=0.9.0:../../wip/liblxqt
+DEPENDS+=	lximage-qt>=0.4.0:../../wip/lximage-qt
+DEPENDS+=	lxmenu-data>=0.1.4:../../sysutils/lxmenu-data
+DEPENDS+=	lxqt-about>=0.9.0:../../wip/lxqt-about
+DEPENDS+=	lxqt-admin>=0.9.0:../../wip/lxqt-admin
+DEPENDS+=	lxqt-common>=0.9.1:../../wip/lxqt-common
+DEPENDS+=	lxqt-config>=0.9.0:../../wip/lxqt-config
+DEPENDS+=	lxqt-globalkeys>=0.9.0:../../wip/lxqt-globalkeys
+DEPENDS+=	lxqt-notificationd>=0.9.0:../../wip/lxqt-notificationd
+DEPENDS+=	lxqt-openssh-askpass>=0.9.0:../../wip/lxqt-openssh-askpass
+DEPENDS+=	lxqt-panel>=0.9.0:../../wip/lxqt-panel
+DEPENDS+=	lxqt-policykit>=0.9.0:../../wip/lxqt-policykit
+DEPENDS+=	lxqt-powermanagement>=0.9.0:../../wip/lxqt-powermanagement
+DEPENDS+=	lxqt-qtplugin>=0.9.0:../../wip/lxqt-qtplugin
+DEPENDS+=	lxqt-runner>=0.9.0:../../wip/lxqt-runner
+DEPENDS+=	lxqt-session>=0.9.0:../../wip/lxqt-session
+DEPENDS+=	pcmanfm-qt>=0.9.0:../../wip/pcmanfm-qt
 
 # actively used by apps -- are there alternatives?
-DEPENDS+=       oxygen-icons>=0.9.0:../../graphics/oxygen-icons
+DEPENDS+=	oxygen-icons>=0.9.0:../../graphics/oxygen-icons
 
 # to be verified whether we want it, for now just shut the warnings up
-DEPENDS+=       qt5-qttranslations>=5.4.0:../../x11/qt5-qttranslations
+DEPENDS+=	qt5-qttranslations>=5.4.0:../../x11/qt5-qttranslations
 
 .include "options.mk"
 
diff --git a/lxqt/options.mk b/lxqt/options.mk
index 68551d0b65..131509c5da 100644
--- a/lxqt/options.mk
+++ b/lxqt/options.mk
@@ -7,6 +7,6 @@ PKG_SUGGESTED_OPTIONS=	openbox
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mopenbox)
-DEPENDS+=       openbox>=3.5.2:../../wm/openbox
-DEPENDS+=       obconf-qt>=0.1.0:../../wip/obconf-qt
+DEPENDS+=	openbox>=3.5.2:../../wm/openbox
+DEPENDS+=	obconf-qt>=0.1.0:../../wip/obconf-qt
 .endif



Home | Main Index | Thread Index | Old Index