wip/d*: fix pkglint indentation warnings

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/d*: fix pkglint indentation warnings
From: Roland Illig <roland.illig%gmx.de@localhost>
Date: Sat, 27 Jan 2018 20:28:03 +0000
Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 20:28:03 2018 +0000
Changeset:	e02d0c87917ed858107334327938759647b4d9fd

Modified Files:
	daligner/PLIST
	daligner/buildlink3.mk
	darcs-to-git/Makefile
	darcs/Makefile
	darcs/options.mk
	darkcoin/Makefile
	darkcoin/PLIST
	dart-git/Makefile
	davical-git/Makefile
	db1/buildlink3.mk
	dbf/PLIST
	dbus-dfbsd/Makefile
	dbus-dfbsd/buildlink3.mk
	dbus-dfbsd/options.mk
	dbus-explorer/Makefile
	ddocent/PLIST
	debootstrap/Makefile
	deforaos-browser/buildlink3.mk
	deforaos-init/Makefile
	deforaos-keyboard/buildlink3.mk
	deforaos-libdesktop/PLIST
	deforaos-player/PLIST
	deforaos-probe/Makefile
	delve/Makefile
	depsolver/Makefile
	desktop-data-model/Makefile
	detachtty/Makefile
	detachtty/PLIST
	deviceatlas-enterprise-c/Makefile
	deviceatlas-enterprise-c/PLIST
	deviceatlas-enterprise-c/buildlink3.mk
	dhcpd-snmp/Makefile
	digitemp/Makefile
	dionysus/Makefile
	directfb/buildlink3.mk
	distella/Makefile
	dlt-viewer/Makefile
	dma/Makefile
	dmxproto/buildlink3.mk
	dnscrypt-proxy/Makefile
	docbook2X/Makefile
	dokuwiki/Makefile
	dolfin/Makefile
	dolphin5/hacks.mk
	doorman/Makefile
	dotclear/options.mk
	dragbox-git/Makefile
	drpython/Makefile
	dscan/Makefile
	dspdfviewer/Makefile
	dssi/PLIST
	duali-data/Makefile
	dune-common/Makefile
	dune-common/Makefile.common
	dune-geometry/Makefile
	dune-istl/Makefile
	dwb-gtk2-git/Makefile
	dwb-gtk2-git/Makefile.common
	dwb-gtk2/Makefile
	dwb-gtk3-git/Makefile
	dwb-gtk3/Makefile

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

pkglint -Wall -F -o aligned d*/

The dscan Makefile has been corrected manually.

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

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

diffstat:
 daligner/PLIST                         |  10 +-
 daligner/buildlink3.mk                 |   2 +-
 darcs-to-git/Makefile                  |   4 +-
 darcs/Makefile                         |   4 +-
 darcs/options.mk                       |   4 +-
 darkcoin/Makefile                      |  28 +++---
 darkcoin/PLIST                         |   4 +-
 dart-git/Makefile                      |   4 +-
 davical-git/Makefile                   |  28 +++---
 db1/buildlink3.mk                      |   2 +-
 dbf/PLIST                              |   2 +-
 dbus-dfbsd/Makefile                    |   2 +-
 dbus-dfbsd/buildlink3.mk               |   2 +-
 dbus-dfbsd/options.mk                  |   4 +-
 dbus-explorer/Makefile                 |   2 +-
 ddocent/PLIST                          |   6 +-
 debootstrap/Makefile                   |  14 +--
 deforaos-browser/buildlink3.mk         |   2 +-
 deforaos-init/Makefile                 |   2 +-
 deforaos-keyboard/buildlink3.mk        |   2 +-
 deforaos-libdesktop/PLIST              |   6 +-
 deforaos-player/PLIST                  |   4 +-
 deforaos-probe/Makefile                |   2 +-
 delve/Makefile                         |   8 +-
 depsolver/Makefile                     |   2 +-
 desktop-data-model/Makefile            |   2 +-
 detachtty/Makefile                     |   8 +-
 detachtty/PLIST                        |   4 +-
 deviceatlas-enterprise-c/Makefile      |   8 +-
 deviceatlas-enterprise-c/PLIST         | 174 ++++++++++++++++-----------------
 deviceatlas-enterprise-c/buildlink3.mk |   2 +-
 dhcpd-snmp/Makefile                    |   2 +-
 digitemp/Makefile                      |   2 +-
 dionysus/Makefile                      |   4 +-
 directfb/buildlink3.mk                 |   2 +-
 distella/Makefile                      |   2 +-
 dlt-viewer/Makefile                    |   2 +-
 dma/Makefile                           |  14 +--
 dmxproto/buildlink3.mk                 |   2 +-
 dnscrypt-proxy/Makefile                |  16 +--
 docbook2X/Makefile                     |   8 +-
 dokuwiki/Makefile                      |   2 +-
 dolfin/Makefile                        |   2 +-
 dolphin5/hacks.mk                      |   2 +-
 doorman/Makefile                       |   2 +-
 dotclear/options.mk                    |  12 +--
 dragbox-git/Makefile                   |   6 +-
 drpython/Makefile                      |   4 +-
 dscan/Makefile                         |  22 ++---
 dspdfviewer/Makefile                   |  14 +--
 dssi/PLIST                             |   4 +-
 duali-data/Makefile                    |   4 +-
 dune-common/Makefile                   |   2 +-
 dune-common/Makefile.common            |   4 +-
 dune-geometry/Makefile                 |   2 +-
 dune-istl/Makefile                     |   4 +-
 dwb-gtk2-git/Makefile                  |   2 +-
 dwb-gtk2-git/Makefile.common           |   4 +-
 dwb-gtk2/Makefile                      |   2 +-
 dwb-gtk3-git/Makefile                  |   2 +-
 dwb-gtk3/Makefile                      |   2 +-
 61 files changed, 250 insertions(+), 250 deletions(-)

diffs:
diff --git a/daligner/PLIST b/daligner/PLIST
index 8150b5071f..34feb32a51 100644
--- a/daligner/PLIST
+++ b/daligner/PLIST
@@ -1,21 +1,21 @@
 @comment $NetBSD$
-bin/daligner
-bin/daligner_p
-bin/DAPipe.py
 bin/DAPI.py
+bin/DAPipe.py
 bin/DB2Falcon
 bin/DBLA_to_falcon.py
 bin/HPCdaligner
 bin/HPCmapper
 bin/LA4Falcon
+bin/LAPI.py
+bin/LAPipe.py
 bin/LAcat
 bin/LAcheck
 bin/LAmerge
-bin/LAPipe.py
-bin/LAPI.py
 bin/LAshow
 bin/LAsort
 bin/LAsplit
+bin/daligner
+bin/daligner_p
 include/align.h
 include/filter.h
 lib/libdaligner.a
diff --git a/daligner/buildlink3.mk b/daligner/buildlink3.mk
index 4d8a9da088..6215ee13f5 100644
--- a/daligner/buildlink3.mk
+++ b/daligner/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	daligner
 DALIGNER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.daligner+=	daligner-2015.10.28{,nb*}
-BUILDLINK_PKGSRCDIR.daligner?=	../../wip/daligner
+BUILDLINK_PKGSRCDIR.daligner?=		../../wip/daligner
 .endif	# DALIGNER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-daligner
diff --git a/darcs-to-git/Makefile b/darcs-to-git/Makefile
index 79b05dd930..76a111fd0c 100644
--- a/darcs-to-git/Makefile
+++ b/darcs-to-git/Makefile
@@ -12,8 +12,8 @@ GIT_REPOSITORIES=	master
 GIT_REPO.master=	git://github.com/purcell/${PKGBASE}.git
 GIT_MODULE.master=	darcs-to-git
 
-WRKSRC=			${WRKDIR}/${PKGBASE}
-NO_BUILD=		yes
+WRKSRC=		${WRKDIR}/${PKGBASE}
+NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS=	bin share/doc/${DISTNAME}
diff --git a/darcs/Makefile b/darcs/Makefile
index 9e2c8bf764..4236cbb898 100644
--- a/darcs/Makefile
+++ b/darcs/Makefile
@@ -12,8 +12,8 @@ LICENSE=	gnu-gpl-v2
 CONFIGURE_ARGS+= -fforce-char8-encoding
 .include "options.mk"
 
-CONFIGURE_ARGS+= --extra-include-dirs=${PREFIX:Q}/include
-CONFIGURE_ARGS+= --extra-lib-dirs=${PREFIX:Q}/lib
+CONFIGURE_ARGS+=	--extra-include-dirs=${PREFIX:Q}/include
+CONFIGURE_ARGS+=	--extra-lib-dirs=${PREFIX:Q}/lib
 
 .include "../../wip/mk/haskell.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/darcs/options.mk b/darcs/options.mk
index b5d112b06f..4054b2cadb 100644
--- a/darcs/options.mk
+++ b/darcs/options.mk
@@ -36,9 +36,9 @@ CONFIGURE_ARGS+= -f-terminfo
 # color
 #
 .if !empty(PKG_OPTIONS:Mcolor)
-CONFIGURE_ARGS+= -fcolor
+CONFIGURE_ARGS+=	-fcolor
 .else
-CONFIGURE_ARGS+= -f-color
+CONFIGURE_ARGS+=	-f-color
 .endif
 
 #
diff --git a/darkcoin/Makefile b/darkcoin/Makefile
index 4e78124d28..3219b39c0f 100644
--- a/darkcoin/Makefile
+++ b/darkcoin/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 #DISTNAME=	v0.9.12.32
-DISTNAME=       v0.12.0.55
+DISTNAME=	v0.12.0.55
 #PKGNAME=	darkcoin-${DISTNAME:S/v//1}
 PKGNAME=	dash-${DISTNAME:S/v//1}
 CATEGORIES=	finance
@@ -17,18 +17,18 @@ USE_TOOLS+=	gmake pkg-config autoconf aclocal autoheader automake libtoolize
 USE_LANGUAGES=	c c++
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 AUTO_MKDIRS=	yes
-HAS_CONFIGURE=  yes
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 
 #CXXFLAGS+=	-std=c++0x
-CXXFLAGS+=      -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/dash -L${BUILDLINK_PREFIX.boost-libs}/lib/dash
-CXXFLAGS+=      -I${BUILDLINK_PREFIX.boost-libs}/include/boost
-CFLAGS+=                -fPIC
-BUILDLINK_TRANSFORM+=   l:db_cxx:db4_cxx
+CXXFLAGS+=		-Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/dash -L${BUILDLINK_PREFIX.boost-libs}/lib/dash
+CXXFLAGS+=		-I${BUILDLINK_PREFIX.boost-libs}/include/boost
+CFLAGS+=		-fPIC
+BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
 
-CONFIGURE_ARGS+=  --with-boost=${BUILDLINK_PREFIX.boost-libs}
-CONFIGURE_ARGS+=  --enable-hardening
-CONFIGURE_ARGS+=  ${PREFIX}/include/db4
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=	--enable-hardening
+CONFIGURE_ARGS+=	${PREFIX}/include/db4
 
 QMAKE_OPTIONS+=	BOOST_INCLUDE_PATH=${PREFIX}/include/boost
 QMAKE_OPTIONS+=	BDB_INCLUDE_PATH=${PREFIX}/include/db4
@@ -39,10 +39,10 @@ QMAKE_OPTIONS+=	BDB_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	OPENSSL_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	LIB_RPATH=${PREFIX}/lib
 
-RCD_SCRIPTS=	dashd
-OWN_DIRS=	${VARBASE}/dash
-EGDIR=		${PREFIX}/share/examples/dash
-CONF_FILES=	${EGDIR}/dash.conf ${PKG_SYSCONFDIR}/dash.conf
+RCD_SCRIPTS=		dashd
+OWN_DIRS=		${VARBASE}/dash
+EGDIR=			${PREFIX}/share/examples/dash
+CONF_FILES=		${EGDIR}/dash.conf ${PKG_SYSCONFDIR}/dash.conf
 CONF_FILES_PERMS=	${EGDIR}/dash.conf ${PKG_SYSCONFDIR}/dash.conf ${ROOT_USER} ${ROOT_GROUP} 0600
 INSTALLATION_DIRS+=	share/examples/dash
 
diff --git a/darkcoin/PLIST b/darkcoin/PLIST
index 84a9a27905..3f047312b3 100644
--- a/darkcoin/PLIST
+++ b/darkcoin/PLIST
@@ -1,9 +1,9 @@
 @comment $NetBSD$
+bin/dash-cli
+bin/dash-tx
 lib/dash/libsecp256k1.la
 lib/dash/libsecp256k1.so
 lib/dash/libsecp256k1.so.0
-bin/dash-tx
-bin/dash-cli
 sbin/dashd
 share/examples/dash/dash.conf
 share/examples/rc.d/dashd
diff --git a/dart-git/Makefile b/dart-git/Makefile
index ed150d2341..cf27ec56b2 100644
--- a/dart-git/Makefile
+++ b/dart-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	dart-1.13.0
-CATEGORIES=	lang
+DISTNAME=		dart-1.13.0
+CATEGORIES=		lang
 GIT_REPOSITORIES=	sdk
 GIT_REPO.sdk=		https://github.com/dart-lang/sdk.git
 WRKSRC=			${WRKDIR}/sdk
diff --git a/davical-git/Makefile b/davical-git/Makefile
index f3a7a1b6b6..c95d47deae 100644
--- a/davical-git/Makefile
+++ b/davical-git/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.4 2014/04/10 15:41:17 hfath Exp $
 #
 
-DISTNAME=	davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.4
-PKGREVISION=    ${_GIT_PKGVERSION:S/.//g}
-CATEGORIES=	www
-MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/
+DISTNAME=		davical-${DAVICAL_VERSION}
+DAVICAL_VERSION=	1.1.4
+PKGREVISION=		${_GIT_PKGVERSION:S/.//g}
+CATEGORIES=		www
+MASTER_SITES=		http://debian.mcmillan.net.nz/packages/davical/
 
 MAINTAINER=	hauke%NetBSD.org@localhost
 HOMEPAGE=	https://www.davical.org/
@@ -13,9 +13,9 @@ COMMENT=	Simple CalDAV server using a PostgreSQL backend
 
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3
 
-GIT_REPOSITORIES=       master
-GIT_REPO.master=        https://gitlab.com/davical-project/davical.git
-GIT_MODULE.master=      davical
+GIT_REPOSITORIES=	master
+GIT_REPO.master=	https://gitlab.com/davical-project/davical.git
+GIT_MODULE.master=	davical
 # for "SSL certificate problem: unable to get local issuer certificate"
 GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
 
@@ -81,12 +81,12 @@ REPLACE_FILES.php+=	scripts/refresh-alarms.php
 REPLACE_FILES.php+=	scripts/sync-remote-caldav.php
 REPLACE_FILES.php+=	scripts/tz-update.php
 
-SUBST_CLASSES+=		conf-path
-SUBST_STAGE.conf-path=	pre-configure
-SUBST_FILES.conf-path=	inc/always.php.in dba/update-davical-database
-SUBST_FILES.conf-path+=	inc/davical_configuration_missing.php
-SUBST_SED.conf-path+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.conf-path=Fixing configuration path.
+SUBST_CLASSES+=			conf-path
+SUBST_STAGE.conf-path=		pre-configure
+SUBST_FILES.conf-path=		inc/always.php.in dba/update-davical-database
+SUBST_FILES.conf-path+=		inc/davical_configuration_missing.php
+SUBST_SED.conf-path+=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_MESSAGE.conf-path=	Fixing configuration path.
 
 # See ../../devel/php-libawl/Makefile.common for the LIBAWLDIR value
 SUBST_CLASSES+=		inc-path
diff --git a/db1/buildlink3.mk b/db1/buildlink3.mk
index c66c8b5fec..9e93aa71f8 100644
--- a/db1/buildlink3.mk
+++ b/db1/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	db1
 .if !defined(DB1_BUILDLINK3_MK)
 DB1_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.db1+=		db1>=1.86
+BUILDLINK_API_DEPENDS.db1+=	db1>=1.86
 BUILDLINK_PKGSRCDIR.db1?=	../../wip/db1
 .endif # DB1_BUILDLINK3_MK
 
diff --git a/dbf/PLIST b/dbf/PLIST
index bec6017111..21572ab8cf 100644
--- a/dbf/PLIST
+++ b/dbf/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:32 thomasklausner Exp $
 bin/dbf
 share/doc/dbf/BUGS
-share/doc/dbf/ChangeLog
 share/doc/dbf/CREDITS
+share/doc/dbf/ChangeLog
 share/doc/dbf/FAQ
 share/doc/dbf/INSTALL
 share/doc/dbf/MANIFEST
diff --git a/dbus-dfbsd/Makefile b/dbus-dfbsd/Makefile
index 58fbb44df8..607d935354 100644
--- a/dbus-dfbsd/Makefile
+++ b/dbus-dfbsd/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-apparmor
 CONFIGURE_ARGS+=	--disable-systemd
 .endif
 
-PLIST_VARS+=    	linux launchd
+PLIST_VARS+=		linux launchd
 
 DBUS_CONF_DIR=		${PKG_SYSCONFBASE}/dbus-1
 OWN_DIRS+=		${DBUS_CONF_DIR}/services
diff --git a/dbus-dfbsd/buildlink3.mk b/dbus-dfbsd/buildlink3.mk
index 758438963c..7888e3d1de 100644
--- a/dbus-dfbsd/buildlink3.mk
+++ b/dbus-dfbsd/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
 
 .if defined(USE_DBUS-ARCH-DEPS_H)
 .  if !empty(USE_DBUS-ARCH-DEPS_H:M[yY][eE][sS])
-BUILDLINK_INCDIRS.dbus+=	lib/dbus-1.0/include/dbus
+BUILDLINK_INCDIRS.dbus+=		lib/dbus-1.0/include/dbus
 BUILDLINK_FNAME_TRANSFORM.dbus+=	-e "s|lib/dbus-1.0/||"
 .  endif
 .endif
diff --git a/dbus-dfbsd/options.mk b/dbus-dfbsd/options.mk
index 1e4bd3104b..915c014b17 100644
--- a/dbus-dfbsd/options.mk
+++ b/dbus-dfbsd/options.mk
@@ -5,7 +5,7 @@ PKG_SUPPORTED_OPTIONS+=	debug x11 enable-in-rcvar nonroot
 PKG_SUGGESTED_OPTIONS=	x11
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= enable-in-rcvar	
+PKG_SUGGESTED_OPTIONS+=	enable-in-rcvar	
 .endif
 
 .if (${OPSYS} == "NetBSD"  ||	\
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--disable-verbose-mode
 .endif
 
 .if !empty(PKG_OPTIONS:Mkqueue)
-CONFIGURE_ARGS+= 	--enable-kqueue
+CONFIGURE_ARGS+=	--enable-kqueue
 .else
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
diff --git a/dbus-explorer/Makefile b/dbus-explorer/Makefile
index 1b788a00cc..7abd3212a8 100644
--- a/dbus-explorer/Makefile
+++ b/dbus-explorer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GTK+ interface for viewing D-Bus service APIs written by C\#
 #LICENSE=	# TODO
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=		pkg-config msgfmt gmake
+USE_TOOLS+=	pkg-config msgfmt gmake
 USE_LANGUAGES=	# none
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/ddocent/PLIST b/ddocent/PLIST
index 722b91fc7e..64f3d8ace7 100644
--- a/ddocent/PLIST
+++ b/ddocent/PLIST
@@ -1,11 +1,11 @@
 @comment $NetBSD$
+bin/ErrorCount.sh
+bin/ReferenceOpt.sh
+bin/Rename_SequenceFiles.sh
 bin/dDocent
 bin/dDocent_filters
-bin/ErrorCount.sh
 bin/filter_hwe_by_pop.pl
 bin/filter_missing_ind.sh
 bin/pop_missing_filter.sh
-bin/ReferenceOpt.sh
 bin/remake_reference.sh
 bin/remove.bad.hap.loci.sh
-bin/Rename_SequenceFiles.sh
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index 7645e5fca3..ceee3b4b14 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
-DISTNAME=	debootstrap_1.0.90
-PKGNAME=	${DISTNAME:S/_/-/}
-CATEGORIES=	sysutils emulators
-MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}
-DISTFILES=	${DEFAULT_DISTFILES} ${DEBIAN_KEYRING_DEB} ${UBUNTU_KEYRING_DEB}
-DEBIAN_KEYRING_DEB=	debian-archive-keyring_2014.3_all.deb
-UBUNTU_KEYRING_DEB=	ubuntu-archive-keyring_2012.05.19-1_all.deb
+DISTNAME=			debootstrap_1.0.90
+PKGNAME=			${DISTNAME:S/_/-/}
+CATEGORIES=			sysutils emulators
+MASTER_SITES=			${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}
+DISTFILES=			${DEFAULT_DISTFILES} ${DEBIAN_KEYRING_DEB} ${UBUNTU_KEYRING_DEB}
+DEBIAN_KEYRING_DEB=		debian-archive-keyring_2014.3_all.deb
+UBUNTU_KEYRING_DEB=		ubuntu-archive-keyring_2012.05.19-1_all.deb
 SITES.${DEBIAN_KEYRING_DEB}=	${MASTER_SITE_DEBIAN:=pool/main/d/debian-archive-keyring/}
 SITES.${UBUNTU_KEYRING_DEB}=	${MASTER_SITE_DEBIAN:=pool/main/u/ubuntu-keyring/}
 
diff --git a/deforaos-browser/buildlink3.mk b/deforaos-browser/buildlink3.mk
index cbc3c498ce..34a81e4c0d 100644
--- a/deforaos-browser/buildlink3.mk
+++ b/deforaos-browser/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	deforaos-browser
 DEFORAOS_BROWSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.deforaos-browser+=	deforaos-browser>=0.4.5
-BUILDLINK_PKGSRCDIR.deforaos-browser?=	../../wip/deforaos-browser
+BUILDLINK_PKGSRCDIR.deforaos-browser?=		../../wip/deforaos-browser
 
 .include "../../x11/gtk3/buildlink3.mk"
 .endif	# DEFORAOS_BROWSER_BUILDLINK3_MK
diff --git a/deforaos-init/Makefile b/deforaos-init/Makefile
index 9c3f4584e5..aba12f3b4e 100644
--- a/deforaos-init/Makefile
+++ b/deforaos-init/Makefile
@@ -17,7 +17,7 @@ MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 
 RCD_SCRIPTS+=	Init
 
-SUBST_CLASSES+=	fix-paths
+SUBST_CLASSES+=		fix-paths
 SUBST_STAGE.fix-paths=	pre-install
 SUBST_MESSAGE.fix-path=	Fixing absolute paths.
 SUBST_FILES.fix-paths+=	../Init
diff --git a/deforaos-keyboard/buildlink3.mk b/deforaos-keyboard/buildlink3.mk
index ae2dec075b..34ffe1e8e0 100644
--- a/deforaos-keyboard/buildlink3.mk
+++ b/deforaos-keyboard/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	deforaos-keyboard
 DEFORAOS_KEYBOARD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.deforaos-keyboard+=	deforaos-keyboard>=0.0.2
-BUILDLINK_PKGSRCDIR.deforaos-keyboard?=	../../wip/deforaos-keyboard
+BUILDLINK_PKGSRCDIR.deforaos-keyboard?=		../../wip/deforaos-keyboard
 
 .include "../../x11/gtk3/buildlink3.mk"
 .endif	# DEFORAOS_KEYBOARD_BUILDLINK3_MK
diff --git a/deforaos-libdesktop/PLIST b/deforaos-libdesktop/PLIST
index ff4ec0fd3f..5f08c1d018 100644
--- a/deforaos-libdesktop/PLIST
+++ b/deforaos-libdesktop/PLIST
@@ -20,8 +20,8 @@ share/gtk-doc/html/libDesktop/deprecated-api-index.html
 share/gtk-doc/html/libDesktop/home.png
 share/gtk-doc/html/libDesktop/index.html
 share/gtk-doc/html/libDesktop/index.sgml
-share/gtk-doc/html/libDesktop/left.png
 share/gtk-doc/html/libDesktop/left-insensitive.png
+share/gtk-doc/html/libDesktop/left.png
 share/gtk-doc/html/libDesktop/libDesktop-about.html
 share/gtk-doc/html/libDesktop/libDesktop-accel.html
 share/gtk-doc/html/libDesktop/libDesktop-compat.html
@@ -31,8 +31,8 @@ share/gtk-doc/html/libDesktop/libDesktop-message.html
 share/gtk-doc/html/libDesktop/libDesktop-mime.html
 share/gtk-doc/html/libDesktop/libDesktop-toolbar.html
 share/gtk-doc/html/libDesktop/libDesktop.devhelp2
-share/gtk-doc/html/libDesktop/right.png
 share/gtk-doc/html/libDesktop/right-insensitive.png
+share/gtk-doc/html/libDesktop/right.png
 share/gtk-doc/html/libDesktop/style.css
-share/gtk-doc/html/libDesktop/up.png
 share/gtk-doc/html/libDesktop/up-insensitive.png
+share/gtk-doc/html/libDesktop/up.png
diff --git a/deforaos-player/PLIST b/deforaos-player/PLIST
index 62b4a84750..2b17dca8c5 100644
--- a/deforaos-player/PLIST
+++ b/deforaos-player/PLIST
@@ -2,10 +2,10 @@
 bin/player
 bin/playerctl
 include/Desktop/Player.h
+man/man1/player.1
+man/man1/playerctl.1
 share/Player/splash.png
 share/applications/player.desktop
 share/doc/html/Player/player.html
 share/doc/html/Player/playerctl.html
 share/locale/fr/LC_MESSAGES/Player.mo
-man/man1/player.1
-man/man1/playerctl.1
diff --git a/deforaos-probe/Makefile b/deforaos-probe/Makefile
index b362c538bb..197ce2d337 100644
--- a/deforaos-probe/Makefile
+++ b/deforaos-probe/Makefile
@@ -22,7 +22,7 @@ PKG_HOME.damon=	${VARBASE}/damon
 RCD_SCRIPTS+=	DaMon
 RCD_SCRIPTS+=	Probe
 
-SUBST_CLASSES+=	fix-paths
+SUBST_CLASSES+=		fix-paths
 SUBST_STAGE.fix-paths=	pre-install
 SUBST_MESSAGE.fix-path=	Fixing absolute paths.
 SUBST_FILES.fix-paths+=	../DaMon
diff --git a/delve/Makefile b/delve/Makefile
index b1e3281c9d..a8e6f66541 100644
--- a/delve/Makefile
+++ b/delve/Makefile
@@ -12,12 +12,12 @@ HOMEPAGE=	${MASTER_SITE_GITHUB:=derekparker/delve/}
 COMMENT=	Go debugger
 LICENSE=	mit
 
-GO_SRCPATH=	github.com/derekparker/delve
-GO_BUILD_PATTERN= ${GO_SRCPATH}/cmd/dlv
-GO_DIST_BASE=	${DISTNAME}
+GO_SRCPATH=		github.com/derekparker/delve
+GO_BUILD_PATTERN=	${GO_SRCPATH}/cmd/dlv
+GO_DIST_BASE=		${DISTNAME}
 
 # needs patches for BSD support
-ONLY_FOR_PLATFORM= Linux-*-* Darwin-*-*
+ONLY_FOR_PLATFORM=	Linux-*-* Darwin-*-*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/dlv ${DESTDIR}${PREFIX}/bin/
diff --git a/depsolver/Makefile b/depsolver/Makefile
index fe2869f72a..0653c39244 100644
--- a/depsolver/Makefile
+++ b/depsolver/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
 
-WRKSRC=	${WRKDIR}/depSolver
+WRKSRC=		${WRKDIR}/depSolver
 USE_TOOLS+=	pax
 USE_LANGUAGES=	c c++
 
diff --git a/desktop-data-model/Makefile b/desktop-data-model/Makefile
index 35aad1c6f3..3b8a1e8c2a 100644
--- a/desktop-data-model/Makefile
+++ b/desktop-data-model/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES= c c++
+USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	ddm-1.pc.in
 
diff --git a/detachtty/Makefile b/detachtty/Makefile
index 71c76d3fd8..81be31ef94 100644
--- a/detachtty/Makefile
+++ b/detachtty/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Utility that lets you run interactive programs non-interactively
 LICENSE=	gnu-gpl-v2
 USE_TOOLS=	gmake
 
-WRKSRC=	${WRKDIR}/detachtty-9
-INSTALLATION_DIRS+=bin/
-INSTALLATION_DIRS+=${PKGMANDIR}/man1/
-INSTALLATION_DIRS+=share/doc/${PKGBASE}
+WRKSRC=			${WRKDIR}/detachtty-9
+INSTALLATION_DIRS+=	bin/
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1/
+INSTALLATION_DIRS+=	share/doc/${PKGBASE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/detachtty ${WRKSRC}/attachtty ${DESTDIR}${PREFIX}/bin/
diff --git a/detachtty/PLIST b/detachtty/PLIST
index 6e78bfab52..91581cfa4a 100644
--- a/detachtty/PLIST
+++ b/detachtty/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2011/02/20 20:58:40 ddeus Exp $
-bin/detachtty
 bin/attachtty
-share/doc/detachtty/README
+bin/detachtty
 man/man1/detachtty.1
+share/doc/detachtty/README
diff --git a/deviceatlas-enterprise-c/Makefile b/deviceatlas-enterprise-c/Makefile
index aa3e773795..5a90afd431 100755
--- a/deviceatlas-enterprise-c/Makefile
+++ b/deviceatlas-enterprise-c/Makefile
@@ -27,10 +27,10 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 INSTALLATION_DIRS=	lib include
 
-FETCH_MESSAGE=  "Please fetch ${DISTFILES} manually from"
-FETCH_MESSAGE+= "${HOMEPAGE}"
-FETCH_MESSAGE+= "and put into"
-FETCH_MESSAGE+= "${DISTDIR}"
+FETCH_MESSAGE=	"Please fetch ${DISTFILES} manually from"
+FETCH_MESSAGE+=	"${HOMEPAGE}"
+FETCH_MESSAGE+=	"and put into"
+FETCH_MESSAGE+=	"${DISTDIR}"
 
 pre-build:
 	cd ${WRKSRC} && cmake -DINSTALL_PREFIX=${PREFIX}
diff --git a/deviceatlas-enterprise-c/PLIST b/deviceatlas-enterprise-c/PLIST
index 8169a77669..71d5b693b8 100755
--- a/deviceatlas-enterprise-c/PLIST
+++ b/deviceatlas-enterprise-c/PLIST
@@ -2,101 +2,84 @@
 include/dac.h
 include/dac_json.h
 lib/libda.so
-share/doc/deviceatlas-enterprise-c/README.html
-share/doc/deviceatlas-enterprise-c/README.ClientSide.html
-share/doc/deviceatlas-enterprise-c/README.DeviceApi.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/tabs.css
-share/doc/deviceatlas-enterprise-c/ApiDocs/jquery.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/dynsections.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_a.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_b.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_h.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_s.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/nav_h.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/nav_f.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/bc_s.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/doxygen.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/closed.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/open.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/bdwn.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/sync_on.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/sync_off.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/nav_g.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/doc.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/folderopen.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/folderclosed.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/annotated.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/arrowdown.png
 share/doc/deviceatlas-enterprise-c/ApiDocs/arrowright.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/splitbar.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/doxygen.css
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_source.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/bc_s.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/bdwn.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/classes.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/closed.png
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a019442ae3fde38aa28b254b21bf9e269.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06c2b226ae6b397baeb9aa8b26abb77e.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06d05d2c11a91ee32725d9c2a4763b11.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06fc87d81c62e9abb8790b6e5713c55b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_adf764cbdea00d65edcd07bb9953ad2b7.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a74e80ff424218e041f9f966420fb5758.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a0b2696786cf079443dcb81ff69946138.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a17b5eb6563bc86a1f912b44b2ca640ab.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a1dddfe400c7a7d0a557b8caafbda36ec.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a1ebacd72beff98a60c877e85b1e21ad2.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a803f3943e026baf1bd5b272962e879b3.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a21a8f211f621a7df73bb5ac9ea6784ac.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a259737627eebea4cd418610d6ea8677d.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2a182c9714e85b77dc6c462bfcd42d58.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/index.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a1dddfe400c7a7d0a557b8caafbda36ec.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/annotated.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2a4ae76b9d8f8bb018fb88e671e81828.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2eb87ba7f137f2f541eb1087722af066.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2ebcf6fcbe7002935df4757c38a72cae.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a30b90786e2f149f1a6837074f8381414.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a17b5eb6563bc86a1f912b44b2ca640ab.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a37537d673f7ac1fd1746bc0103cc0d4a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a999a28d6f45b7fcdb923eb1c76e15d33.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a81a4326d9b6fd3e6c09bb08a7e8753ef.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06c2b226ae6b397baeb9aa8b26abb77e.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a37b2349f4fddc3967e740304a706f621.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a407c8942e8043862125edd21cce0f1a1.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a476aa987cf78c72941b9fefee6e55b10.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a4f9a8f62db1cad7693aced372b8ff3b9.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a631d0feb27811b79aa1147f508711172.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a69f0a2059c442541cdfe75e5afceac63.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6c0c215038a75b042b5bc6d3af53d9b4.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6f206c4d51ea77bf37c48170a609f94d.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6ff9e48dcc53b7031e589b5ee2c4ad67.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a71e811099fb245c5a15fd71668ce557c.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a748f32745153bab132e432ecc4df7025.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a74e80ff424218e041f9f966420fb5758.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a7d3b5f08173de85ce70e081cba116511.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a803f3943e026baf1bd5b272962e879b3.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a81a4326d9b6fd3e6c09bb08a7e8753ef.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a89bb11ba0d89ed51f7852fd439ab5e54.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a8a701927c6b9a395fcef0705d6a3f16a.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a8e9a7b02f27bf102d8f740e9db36eab5.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_afe6c57eda28e859a4fbb334eb560bd29.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9179c4a47073592090f7639f1d3964fb.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a957e72f600e612b09e326f8e86bb8d58.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a999a28d6f45b7fcdb923eb1c76e15d33.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9a8713d99c002ba8dadeed22f9a3c86b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_abedcbdb21852b28880b006a2d8443a4d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06d05d2c11a91ee32725d9c2a4763b11.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9aa5c02de0e81aaa1dae0bf01b520947.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_aafa13736dc93b9ba58e5329572bcdb50.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a71e811099fb245c5a15fd71668ce557c.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a0b2696786cf079443dcb81ff69946138.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a8a701927c6b9a395fcef0705d6a3f16a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_aeb1e01f371623217f7a60625b078cc2f.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_adcb1c8fec0ee9bf80ccaa4f289bcc204.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6c0c215038a75b042b5bc6d3af53d9b4.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2ebcf6fcbe7002935df4757c38a72cae.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a4f9a8f62db1cad7693aced372b8ff3b9.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_abedcbdb21852b28880b006a2d8443a4d.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ac1876ca873a2a64bf76cb406425f687b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a019442ae3fde38aa28b254b21bf9e269.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2eb87ba7f137f2f541eb1087722af066.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6f206c4d51ea77bf37c48170a609f94d.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ad5f26e5ed4b0dc16f935a82a65c9d509.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_adcb1c8fec0ee9bf80ccaa4f289bcc204.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_adf764cbdea00d65edcd07bb9953ad2b7.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ae37d73b5dde45eb0d197c4163d11781a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9179c4a47073592090f7639f1d3964fb.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6ff9e48dcc53b7031e589b5ee2c4ad67.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2a4ae76b9d8f8bb018fb88e671e81828.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a259737627eebea4cd418610d6ea8677d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a407c8942e8043862125edd21cce0f1a1.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a476aa987cf78c72941b9fefee6e55b10.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9aa5c02de0e81aaa1dae0bf01b520947.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ae5902fa6e81257a7549d845a5c781910.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a69f0a2059c442541cdfe75e5afceac63.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a21a8f211f621a7df73bb5ac9ea6784ac.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a89bb11ba0d89ed51f7852fd439ab5e54.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a631d0feb27811b79aa1147f508711172.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a37b2349f4fddc3967e740304a706f621.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a957e72f600e612b09e326f8e86bb8d58.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ad5f26e5ed4b0dc16f935a82a65c9d509.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/classes.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_aeb1e01f371623217f7a60625b078cc2f.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_afe6c57eda28e859a4fbb334eb560bd29.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_source.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/doc.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/doxygen.css
+share/doc/deviceatlas-enterprise-c/ApiDocs/doxygen.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/dynsections.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/files.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/folderclosed.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/folderopen.png
 share/doc/deviceatlas-enterprise-c/ApiDocs/functions.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/functions_vars.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/files.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/globals.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals_func.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals_type.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/globals_enum.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/globals_eval.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_l.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_m.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_r.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/close.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/mag_sel.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search.css
+share/doc/deviceatlas-enterprise-c/ApiDocs/globals_func.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/globals_type.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/index.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/jquery.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/nav_f.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/nav_g.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/nav_h.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/open.png
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_0.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_0.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_1.html
@@ -129,10 +112,25 @@ share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_e.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_e.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/classes_0.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/classes_0.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/close.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/enums_0.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/enums_0.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/enumvalues_0.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/enumvalues_0.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/files_0.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/files_0.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/functions_0.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/functions_0.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/mag_sel.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/nomatches.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/search.css
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/search.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_l.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_m.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_r.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/searchdata.js
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/typedefs_0.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/search/typedefs_0.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_0.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_0.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_1.html
@@ -161,22 +159,24 @@ share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_c.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_c.js
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_d.html
 share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_d.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/typedefs_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/typedefs_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enums_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enums_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enumvalues_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enumvalues_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/searchdata.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/nomatches.html
+share/doc/deviceatlas-enterprise-c/ApiDocs/splitbar.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/sync_off.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/sync_on.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/tab_a.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/tab_b.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/tab_h.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/tab_s.png
+share/doc/deviceatlas-enterprise-c/ApiDocs/tabs.css
+share/doc/deviceatlas-enterprise-c/README.ClientSide.html
+share/doc/deviceatlas-enterprise-c/README.DeviceApi.html
+share/doc/deviceatlas-enterprise-c/README.html
+share/doc/deviceatlas-enterprise-c/examples/daexutil.h
 share/doc/deviceatlas-enterprise-c/examples/example0
-share/doc/deviceatlas-enterprise-c/examples/example1
-share/doc/deviceatlas-enterprise-c/examples/example2
-share/doc/deviceatlas-enterprise-c/examples/example3
 share/doc/deviceatlas-enterprise-c/examples/example0.c
+share/doc/deviceatlas-enterprise-c/examples/example1
 share/doc/deviceatlas-enterprise-c/examples/example1.c
+share/doc/deviceatlas-enterprise-c/examples/example2
 share/doc/deviceatlas-enterprise-c/examples/example2.c
+share/doc/deviceatlas-enterprise-c/examples/example3
 share/doc/deviceatlas-enterprise-c/examples/example3.c
 share/doc/deviceatlas-enterprise-c/examples/util.c
-share/doc/deviceatlas-enterprise-c/examples/daexutil.h
diff --git a/deviceatlas-enterprise-c/buildlink3.mk b/deviceatlas-enterprise-c/buildlink3.mk
index 3fee263680..d3fbb94035 100644
--- a/deviceatlas-enterprise-c/buildlink3.mk
+++ b/deviceatlas-enterprise-c/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	deviceatlas-enterprise-c
 DEVICEATLAS_ENTERPRISE_C_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.deviceatlas-enterprise-c+=	pcre>=0.9nb1
-BUILDLINK_PKGSRCDIR.deviceatlas-enterprise-c?=	../../wip/deviceatlas-enterprise-c
+BUILDLINK_PKGSRCDIR.deviceatlas-enterprise-c?=		../../wip/deviceatlas-enterprise-c
 .endif # DEVICEATLAS_ENTERPRISE_C_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-deviceatlas-enterprise-c
diff --git a/dhcpd-snmp/Makefile b/dhcpd-snmp/Makefile
index 06619afa94..754c8f3bc5 100644
--- a/dhcpd-snmp/Makefile
+++ b/dhcpd-snmp/Makefile
@@ -25,7 +25,7 @@ DEPENDS+=		net-snmp-[0-9]*:../../net/net-snmp
 NET_SNMP_MIBDIR=	share/snmp/mibs
 EGDIR=			share/examples/dhcpd-snmp
 
-BUILD_DEFS+=            VARBASE NET_SNMP_MIBDIR
+BUILD_DEFS+=		VARBASE NET_SNMP_MIBDIR
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	dhcpd-snmp.conf.dist
diff --git a/digitemp/Makefile b/digitemp/Makefile
index 35ea4f9067..8d0eb2ed30 100644
--- a/digitemp/Makefile
+++ b/digitemp/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.digitemp.com/
 COMMENT=	Reads temperature from serial and USB thermometers
 LICENSE=	gnu-gpl-v3
 
-INSTALLATION_DIRS= 	bin
+INSTALLATION_DIRS=	bin
 PKG_DESTDIR_SUPPORT=	destdir
 USE_TOOLS+=		gmake
 BUILD_TARGET=		ds9097
diff --git a/dionysus/Makefile b/dionysus/Makefile
index 83143b459e..f8c2841c47 100644
--- a/dionysus/Makefile
+++ b/dionysus/Makefile
@@ -14,10 +14,10 @@ INFO_FILES=	yes
 USE_LANGUAGES=	# none
 USE_TOOLS+=	tclsh:run
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 
-INSTALLATION_DIRS+=	 bin ${PKGINFODIR} share/dionysus/databases
+INSTALLATION_DIRS+=	bin ${PKGINFODIR} share/dionysus/databases
 
 post-install:
 		${INSTALL_DATA} ${WRKSRC}/databases/*.ddb ${DESTDIR}${PREFIX}/share/dionysus/databases/
diff --git a/directfb/buildlink3.mk b/directfb/buildlink3.mk
index ad18074921..e38aab3974 100644
--- a/directfb/buildlink3.mk
+++ b/directfb/buildlink3.mk
@@ -7,7 +7,7 @@ DIRECTFB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.DirectFB+=	directfb>=0.9.17
 BUILDLINK_ABI_DEPENDS.DirectFB?=	directfb>=0.9.22nb3
-BUILDLINK_PKGSRCDIR.DirectFB?=	../../wip/directfb
+BUILDLINK_PKGSRCDIR.DirectFB?=		../../wip/directfb
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/distella/Makefile b/distella/Makefile
index ca3872b622..bd01228a8c 100644
--- a/distella/Makefile
+++ b/distella/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	xmor61%users.sourceforge.net@localhost
 HOMEPAGE=	http://members.cox.net/rcolbert/index.htm
 COMMENT=	6502 Disassembler with Atari 2600 headers and cycle counting info
 
-NO_CONFIGURE=	YES
+NO_CONFIGURE=		YES
 EXTRACT_OPTS_ZIP=	-Laqo
 
 post-extract:
diff --git a/dlt-viewer/Makefile b/dlt-viewer/Makefile
index e799c7a14c..1de1ec70ee 100644
--- a/dlt-viewer/Makefile
+++ b/dlt-viewer/Makefile
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/dlt-viewer-2.18.0
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-CWRAPPERS_PREPEND.cxx+= -std=c++11
+CWRAPPERS_PREPEND.cxx+=	-std=c++11
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtserialport/buildlink3.mk"
diff --git a/dma/Makefile b/dma/Makefile
index 38cb3a2b2c..35a87c725e 100644
--- a/dma/Makefile
+++ b/dma/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 
-DISTNAME=		dma-${GITHUB_TAG}
-PKGNAME=		dma-0.11
-CATEGORIES=		mail
+DISTNAME=	dma-${GITHUB_TAG}
+PKGNAME=	dma-0.11
+CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=corecode/}
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
@@ -11,14 +11,14 @@ COMMENT=	The DragonFly Mail Agent
 LICENSE=	modified-bsd
 
 GITHUB_PROJECT=	dma
-GITHUB_TAG=		v0.11
+GITHUB_TAG=	v0.11
 
 BUILD_DEFS+=		VARBASE
 
 PKG_SYSCONFSUBDIR=	dma
 EGDIR=			${PREFIX}/share/exmaples/${PKGBASE}
 
-USE_TOOLS+=		flex yacc
+USE_TOOLS+=	flex yacc
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
 NO_CONFIGURE=	yes
@@ -39,12 +39,12 @@ CFLAGS+=	-DDMA_ROOT_USER=\"${DMA_ROOT_USER}\"
 
 MAKE_ENV+=	CONFDIR=${PKG_SYSCONFDIR}
 
-MAKE_FLAGS=		"LIBEXEC=${PREFIX}/libexec"
+MAKE_FLAGS=	"LIBEXEC=${PREFIX}/libexec"
 MAKE_FLAGS+=	"MAN=${PREFIX}/${PKGMANDIR}"
 
 INSTALLATION_DIRS=	${EGDIR}
 
-CONF_FILES=		${EGDIR}/dma.conf ${PKG_SYSCONFDIR}/dma.conf
+CONF_FILES=	${EGDIR}/dma.conf ${PKG_SYSCONFDIR}/dma.conf
 CONF_FILES+=	${EGDIR}/auth.conf ${PKG_SYSCONFDIR}/auth.conf
 
 OWN_DIRS=	${VARBASE}/spool/dma
diff --git a/dmxproto/buildlink3.mk b/dmxproto/buildlink3.mk
index f82340aba9..ee586cf7fd 100644
--- a/dmxproto/buildlink3.mk
+++ b/dmxproto/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	dmxproto
 DMXPROTO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dmxproto+=	dmxproto>=2.2.2
-BUILDLINK_PKGSRCDIR.dmxproto?=	../../wip/dmxproto
+BUILDLINK_PKGSRCDIR.dmxproto?=		../../wip/dmxproto
 
 .include "../../x11/xproto/buildlink3.mk"
 .endif # DMXPROTO_BUILDLINK3_MK
diff --git a/dnscrypt-proxy/Makefile b/dnscrypt-proxy/Makefile
index 9068ab65cb..f15bd28160 100644
--- a/dnscrypt-proxy/Makefile
+++ b/dnscrypt-proxy/Makefile
@@ -16,15 +16,15 @@ USE_TOOLS+=	pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
-DNSCRYPT_USER?=         dnscrypt
-DNSCRYPT_GROUP?=        dnscrypt
-PKG_GROUPS+=            ${DNSCRYPT_GROUP}
-PKG_USERS+=             ${DNSCRYPT_USER}:${DNSCRYPT_GROUP}
-PKG_GROUPS_VARS+=       DNSCRYPT_GROUP
-PKG_USERS_VARS+=        DNSCRYPT_USER
+DNSCRYPT_USER?=			dnscrypt
+DNSCRYPT_GROUP?=		dnscrypt
+PKG_GROUPS+=			${DNSCRYPT_GROUP}
+PKG_USERS+=			${DNSCRYPT_USER}:${DNSCRYPT_GROUP}
+PKG_GROUPS_VARS+=		DNSCRYPT_GROUP
+PKG_USERS_VARS+=		DNSCRYPT_USER
 PKG_HOME.${DNSCRYPT_USER}?=	${VARBASE}/chroot/dnscrypt
-OWN_DIRS+=	${PKG_HOME.${DNSCRYPT_USER}}
-OWN_DIRS_PERMS+=	${PKG_HOME.${DNSCRYPT_USER}} ${DNSCRYPT_USER} ${DNSCRYPT_GROUP} 0700
+OWN_DIRS+=			${PKG_HOME.${DNSCRYPT_USER}}
+OWN_DIRS_PERMS+=		${PKG_HOME.${DNSCRYPT_USER}} ${DNSCRYPT_USER} ${DNSCRYPT_GROUP} 0700
 
 PKGCONFIG_OVERRIDE+=	src/libevent-modified/libevent_core.pc.in
 PKGCONFIG_OVERRIDE+=	src/libevent-modified/libevent.pc.in
diff --git a/docbook2X/Makefile b/docbook2X/Makefile
index 2fe7a77bfb..1fd78195bc 100644
--- a/docbook2X/Makefile
+++ b/docbook2X/Makefile
@@ -21,11 +21,11 @@ DEPENDS+=	p5-XML-SAX-[0-9]*:../../textproc/p5-XML-SAX
 DEPENDS+=	p5-XML-SAX-Expat-[0-9]*:../../textproc/p5-XML-SAX-Expat
 DEPENDS+=	tidy-[0-9]*:../../www/tidy
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	yes
-USE_TOOLS+=	gmake makeinfo perl
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
+USE_TOOLS+=		gmake makeinfo perl
 CONFIGURE_ARGS+=	MAKEINFO=${MAKEINFO}
-TEST_TARGET=	check
+TEST_TARGET=		check
 
 XML_CATALOGS=	${PREFIX}/share/docbook2X/dtd/catalog.xml
 XML_CATALOGS+=	${PREFIX}/share/docbook2X/xslt/catalog.xml
diff --git a/dokuwiki/Makefile b/dokuwiki/Makefile
index 8a20969eae..818e177f56 100644
--- a/dokuwiki/Makefile
+++ b/dokuwiki/Makefile
@@ -26,7 +26,7 @@ WWW_GROUP?=	${APACHE_GROUP}
 
 PKG_GROUPS_VARS+=	WWW_GROUP
 PKG_USERS_VARS=		WWW_USER
-BUILD_DEFS+=	WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP VARBASE
+BUILD_DEFS+=		WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP VARBASE
 
 DOKUDIR=	${PREFIX}/share/dokuwiki
 DOCDIR=		${PREFIX}/share/doc/dokuwiki
diff --git a/dolfin/Makefile b/dolfin/Makefile
index b5b6220684..ebf23a09d1 100644
--- a/dolfin/Makefile
+++ b/dolfin/Makefile
@@ -80,7 +80,7 @@ SUBST_SED.dolfinconf=	-e 's|${WRKDIR}/.buildlink|${PREFIX}|g' \
 			-e 's|${WRKDIR}/.wrapper|${PREFIX}|g'
 
 # From lang/python/extension.mk
-PLIST_SUBST+=   PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
 MMVERSION=	1.2
 
diff --git a/dolphin5/hacks.mk b/dolphin5/hacks.mk
index 6a89854605..9c686b8489 100644
--- a/dolphin5/hacks.mk
+++ b/dolphin5/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/doorman/Makefile b/doorman/Makefile
index b5bc24c680..16589ed653 100644
--- a/doorman/Makefile
+++ b/doorman/Makefile
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		bison
 USE_TOOLS+=		perl
-REPLACE_PERL=   	ipfw_add ipfw_delete pfctl_add pfctl_delete
+REPLACE_PERL=		ipfw_add ipfw_delete pfctl_add pfctl_delete
 
 INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/doorman
 EGDIR=			${PREFIX}/share/examples/doorman
diff --git a/dotclear/options.mk b/dotclear/options.mk
index f5393365ff..8a63cd9b37 100644
--- a/dotclear/options.mk
+++ b/dotclear/options.mk
@@ -27,12 +27,12 @@ WWW_SYSCONFDIR=		${PREFIX}/etc/httpd
 ### Use nginx web server
 ###
 .if !empty(PKG_OPTIONS:Mnginx)
-DEPENDS+=		nginx-[0-9]*:../../www/nginx
-DEPENDS+=		${PHP_PKG_PREFIX}-fpm>=5.5:../../www/php-fpm
-WWW_USER?=		nginx
-WWW_GROUP?=		nginx
-WWW_CONF_FILE=		nginx.conf
-WWW_SYSCONFDIR=		${PREFIX}/etc/nginx
+DEPENDS+=	nginx-[0-9]*:../../www/nginx
+DEPENDS+=	${PHP_PKG_PREFIX}-fpm>=5.5:../../www/php-fpm
+WWW_USER?=	nginx
+WWW_GROUP?=	nginx
+WWW_CONF_FILE=	nginx.conf
+WWW_SYSCONFDIR=	${PREFIX}/etc/nginx
 .endif
 ###
 ### Use mysql backend.
diff --git a/dragbox-git/Makefile b/dragbox-git/Makefile
index 3e580d6d13..f2d237196d 100644
--- a/dragbox-git/Makefile
+++ b/dragbox-git/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://users.student.lth.se/f04us/wiki/dragbox/
 COMMENT=	Command line drag-and-drop tool for GNOME
 LICENSE=	gnu-gpl-v2
 
-GIT_REPOSITORIES=       dragbox
+GIT_REPOSITORIES=	dragbox
 GIT_REPO.dragbox=	git://repo.or.cz/dragbox.git
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S|-${PKGVERSION_NOREV}||:Q}
@@ -19,8 +19,8 @@ USE_TOOLS+=	gmake
 USE_TOOLS+=	autoconf
 USE_TOOLS+=	automake
 
-REPLACE_PYTHON+=	dragbox
-PY_PATCHPLIST=	yes
+REPLACE_PYTHON+=		dragbox
+PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
 
 pre-configure:
diff --git a/drpython/Makefile b/drpython/Makefile
index c85ab8347b..000ae58ae5 100644
--- a/drpython/Makefile
+++ b/drpython/Makefile
@@ -20,8 +20,8 @@ USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
 
-PY_EXEC=${PREFIX}/bin/python${PYVERSSUFFIX}
-PY_APPAPATH=${PREFIX}/${PYSITELIB}/drpython/drpython.py
+PY_EXEC=	${PREFIX}/bin/python${PYVERSSUFFIX}
+PY_APPAPATH=	${PREFIX}/${PYSITELIB}/drpython/drpython.py
 
 post-extract:
 	${CP} ${FILESDIR}/drpython.desktop ${WRKSRC}
diff --git a/dscan/Makefile b/dscan/Makefile
index 508a173634..43e95558e8 100644
--- a/dscan/Makefile
+++ b/dscan/Makefile
@@ -1,23 +1,23 @@
 # $NetBSD: Makefile,v 1.3 2015/06/10 13:43:16 ahp-nils Exp $
 
-VERSION=			8ebbeb20c5721567eeba80e5cec65155a488291f
-DISTNAME=			${VERSION}
-PKGNAME=			dscan-0.1
-CATEGORIES=			net
+VERSION=		8ebbeb20c5721567eeba80e5cec65155a488291f
+DISTNAME=		${VERSION}
+PKGNAME=		dscan-0.1
+CATEGORIES=		net
 MASTER_SITES=		https://github.com/dugsong/dscan/archive/
 
-MAINTAINER=			nils%NetBSD.org@localhost
-HOMEPAGE=			https://github.com/dugsong/dscan
-COMMENT=			Network scanner
-LICENSE=			original-bsd
+MAINTAINER=		nils%NetBSD.org@localhost
+HOMEPAGE=		https://github.com/dugsong/dscan
+COMMENT=		Network scanner
+LICENSE=		original-bsd
 
-DEPENDS+=			wget-[0-9]*:../../net/wget
-WRKSRC=				${WRKDIR}/dscan-${VERSION}
+DEPENDS+=		wget-[0-9]*:../../net/wget
+WRKSRC=			${WRKDIR}/dscan-${VERSION}
 GNU_CONFIGURE=		yes
 INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man8 ${DOCDIR}
 AUTO_MKDIRS=		yes
+DOCDIR=			share/doc/dscan
 
-DOCDIR=				share/doc/dscan
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dscan ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/dscan.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff --git a/dspdfviewer/Makefile b/dspdfviewer/Makefile
index 84aa9e7e5b..3c936356f3 100644
--- a/dspdfviewer/Makefile
+++ b/dspdfviewer/Makefile
@@ -12,13 +12,13 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	qt5-qttools>=5.5.1:../../x11/qt5-qttools
 
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
-USE_CMAKE=	yes
-CMAKE_ARGS+=	-DBuildTests=OFF
-CONFIGURE_DIRS=	build
-CMAKE_ARG_PATH=	..
-BUILD_MAKE_FLAGS+= VERBOSE=1
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		pkg-config
+USE_CMAKE=		yes
+CMAKE_ARGS+=		-DBuildTests=OFF
+CONFIGURE_DIRS=		build
+CMAKE_ARG_PATH=		..
+BUILD_MAKE_FLAGS+=	VERBOSE=1
 
 pre-configure:
 	mkdir -p ${WRKSRC}/build
diff --git a/dssi/PLIST b/dssi/PLIST
index 9619b3a25c..192e56adef 100644
--- a/dssi/PLIST
+++ b/dssi/PLIST
@@ -9,11 +9,11 @@ bin/less_trivial_synth
 bin/trivial_sampler
 bin/trivial_synth
 include/dssi.h
+lib/dssi/karplong.la
 lib/dssi/less_trivial_synth.la
 ${PLIST.qt}lib/dssi/less_trivial_synth/LTS_qt
-${PLIST.qt}lib/dssi/trivial_sampler/trivial_sampler_qt
-lib/dssi/karplong.la
 lib/dssi/trivial_sampler.la
+${PLIST.qt}lib/dssi/trivial_sampler/trivial_sampler_qt
 lib/dssi/trivial_synth.la
 lib/pkgconfig/dssi.pc
 man/man1/dssi_analyse_plugin.1
diff --git a/duali-data/Makefile b/duali-data/Makefile
index 05c3865b8f..a074427a4b 100644
--- a/duali-data/Makefile
+++ b/duali-data/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE=	http://www.arabeyes.org/project.php?proj=Duali
 COMMENT=	Arabic dictionary
 LICENSE=	modified-bsd
 
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS=	share/duali-data share/doc/duali-data
diff --git a/dune-common/Makefile b/dune-common/Makefile
index ef07d21822..b77f83b85c 100644
--- a/dune-common/Makefile
+++ b/dune-common/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Contains the basic classes used by all DUNE modules
 
 DEPENDS+=	doxygen>=1.8.2:../../devel/doxygen
 
-CHECK_PORTABILITY_SKIP= configure
+CHECK_PORTABILITY_SKIP=	configure
 
 PKGCONFIG_OVERRIDE+=	dune-common-2.2.0/PaxHeaders.15870/dune-common.pc.in
 PKGCONFIG_OVERRIDE+=	dune-common-2.2.0/dune-common.pc.in
diff --git a/dune-common/Makefile.common b/dune-common/Makefile.common
index c43ea45148..2a07d4e51b 100644
--- a/dune-common/Makefile.common
+++ b/dune-common/Makefile.common
@@ -12,8 +12,8 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config perl
 USE_LANGUAGES=	c c++ fortran
 
diff --git a/dune-geometry/Makefile b/dune-geometry/Makefile
index 2e0097f596..407e55ad36 100644
--- a/dune-geometry/Makefile
+++ b/dune-geometry/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Includes everything related to the DUNE reference elements
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-CHECK_PORTABILITY_SKIP= configure
+CHECK_PORTABILITY_SKIP=	configure
 
 PKGCONFIG_OVERRIDE+=	dune-geometry-2.2.0/PaxHeaders.17347/dune-geometry.pc.in
 PKGCONFIG_OVERRIDE+=	dune-geometry-2.2.0/dune-geometry.pc.in
diff --git a/dune-istl/Makefile b/dune-istl/Makefile
index 64c56ec205..b83ec4a98d 100644
--- a/dune-istl/Makefile
+++ b/dune-istl/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Iterative Solver Template Library
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-CHECK_PORTABILITY_SKIP= configure
+CHECK_PORTABILITY_SKIP=	configure
 
-LDFLAGS+=         -L${BUILDLINK_PREFIX.superlu}/lib
+LDFLAGS+=	-L${BUILDLINK_PREFIX.superlu}/lib
 
 DEPENDS+=	metis>=4.0:../../math/metis
 
diff --git a/dwb-gtk2-git/Makefile b/dwb-gtk2-git/Makefile
index ff4100009b..6473f98719 100644
--- a/dwb-gtk2-git/Makefile
+++ b/dwb-gtk2-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2015/09/03 10:08:53 f8l Exp $
 .include "../../wip/dwb-gtk2-git/Makefile.common"
 
-PKGNAME=        ${DISTNAME:S/dwb/dwb-gtk2/}
+PKGNAME=	${DISTNAME:S/dwb/dwb-gtk2/}
 COMMENT=	Dynamic WebKit browser, gtk2 version
 
 .include "../../www/webkit24-gtk/buildlink3.mk"
diff --git a/dwb-gtk2-git/Makefile.common b/dwb-gtk2-git/Makefile.common
index 0c26389d83..b8ce2c9028 100644
--- a/dwb-gtk2-git/Makefile.common
+++ b/dwb-gtk2-git/Makefile.common
@@ -8,8 +8,8 @@ CATEGORIES=	www
 MASTER_SITES=	https://bitbucket.org/portix/dwb/get/
 
 GIT_REPOSITORIES=	dwb
-GIT_REPO.dwb=	http://bitbucket.org/portix/dwb.git
-WRKSRC=	${WRKDIR}/dwb
+GIT_REPO.dwb=		http://bitbucket.org/portix/dwb.git
+WRKSRC=			${WRKDIR}/dwb
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://portix.bitbucket.org/dwb/
diff --git a/dwb-gtk2/Makefile b/dwb-gtk2/Makefile
index d9651ca479..822d389328 100644
--- a/dwb-gtk2/Makefile
+++ b/dwb-gtk2/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2015/08/29 16:11:03 f8l Exp $
 .include "../../wip/dwb-gtk2/Makefile.common"
 
-PKGNAME=        ${DISTNAME:S/dwb/dwb-gtk2/}
+PKGNAME=	${DISTNAME:S/dwb/dwb-gtk2/}
 COMMENT=	Dynamic WebKit browser, gtk2 version
 
 .include "../../www/webkit24-gtk/buildlink3.mk"
diff --git a/dwb-gtk3-git/Makefile b/dwb-gtk3-git/Makefile
index f1e27174bf..4cfaaf67bf 100644
--- a/dwb-gtk3-git/Makefile
+++ b/dwb-gtk3-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2015/09/03 10:08:53 f8l Exp $
 .include "../../wip/dwb-gtk2-git/Makefile.common"
 
-PKGNAME=        ${DISTNAME:S/dwb/dwb-gtk3/}
+PKGNAME=	${DISTNAME:S/dwb/dwb-gtk3/}
 COMMENT=	Dynamic WebKit browser, gtk3 version
 
 MAKE_ENV+=	GTK=3
diff --git a/dwb-gtk3/Makefile b/dwb-gtk3/Makefile
index d1cb87122f..59075129c6 100644
--- a/dwb-gtk3/Makefile
+++ b/dwb-gtk3/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2015/08/29 16:11:03 f8l Exp $
 .include "../../wip/dwb-gtk2/Makefile.common"
 
-PKGNAME=        ${DISTNAME:S/dwb/dwb-gtk3/}
+PKGNAME=	${DISTNAME:S/dwb/dwb-gtk3/}
 PKGREVISION=	1
 COMMENT=	Dynamic WebKit browser, gtk3 version
Prev by Date: wip/b*: fix pkglint indentation warnings
Next by Date: wip/e*: fix pkglint indentation warnings
Previous by Thread: wip/b*: fix pkglint indentation warnings
Next by Thread: wip/e*: fix pkglint indentation warnings
Indexes:
Home | Main Index | Thread Index | Old Index