wip/f*: fix pkglint indentation warnings

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

Modified Files:
	facedetect/Makefile
	farsi-ttf/Makefile
	fastahack/buildlink3.mk
	fastbit/Makefile
	fastjet/Makefile
	fbpanel/Makefile
	feathercoin/Makefile
	felt/PLIST
	festvox-ks/PLIST
	feynhiggs/Makefile
	fftjet/Makefile
	fftw-mpich/PLIST
	fgallery/Makefile
	firebird/Makefile
	firefox-dfbsd/Makefile
	firefox-dfbsd/mozilla-common.mk
	firefox-dfbsd/options.mk
	firefox-hg/Makefile.common
	firefox-hg/mozilla-common.mk
	firefox-hg/options.mk
	firefox-webrtc/Makefile
	firefox-webrtc/mozilla-common.mk
	firefox-webrtc/options.mk
	firefox/Makefile
	firefox/mozilla-common.mk
	flam3-svn/PLIST
	flasm/PLIST
	flexdump/Makefile
	flim/Makefile
	flite2/Makefile
	fluxspace/Makefile
	fragrouter/Makefile
	freebayes/buildlink3.mk
	freedup/Makefile
	freedup16/Makefile
	freedup16/PLIST
	freeradius2/Makefile
	freeswitch-core/Makefile
	freeswitch-music/options.mk
	fribid/Makefile
	fs-uae-launcher/Makefile
	ftpd-tls/Makefile
	fvcom2/Makefile
	fvwm-crystal/options.mk
	fvwm265/Makefile
	fvwm265/options.mk

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

pkglint -Wall -F -o aligned f*/

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

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

diffstat:
 facedetect/Makefile              | 48 ++++++++++++-------------
 farsi-ttf/Makefile               |  2 +-
 fastahack/buildlink3.mk          |  2 +-
 fastbit/Makefile                 |  4 +--
 fastjet/Makefile                 | 10 +++---
 fbpanel/Makefile                 |  4 +--
 feathercoin/Makefile             | 16 ++++-----
 felt/PLIST                       |  4 +--
 festvox-ks/PLIST                 |  6 ++--
 feynhiggs/Makefile               |  4 +--
 fftjet/Makefile                  |  2 +-
 fftw-mpich/PLIST                 |  8 ++---
 fgallery/Makefile                | 76 ++++++++++++++++++++--------------------
 firebird/Makefile                |  2 +-
 firefox-dfbsd/Makefile           | 12 +++----
 firefox-dfbsd/mozilla-common.mk  | 12 +++----
 firefox-dfbsd/options.mk         |  2 +-
 firefox-hg/Makefile.common       | 12 +++----
 firefox-hg/mozilla-common.mk     | 10 +++---
 firefox-hg/options.mk            |  2 +-
 firefox-webrtc/Makefile          | 16 ++++-----
 firefox-webrtc/mozilla-common.mk | 12 +++----
 firefox-webrtc/options.mk        |  2 +-
 firefox/Makefile                 | 12 +++----
 firefox/mozilla-common.mk        | 12 +++----
 flam3-svn/PLIST                  |  8 ++---
 flasm/PLIST                      |  4 +--
 flexdump/Makefile                |  2 +-
 flim/Makefile                    | 12 +++----
 flite2/Makefile                  |  6 ++--
 fluxspace/Makefile               |  2 +-
 fragrouter/Makefile              |  2 +-
 freebayes/buildlink3.mk          |  2 +-
 freedup/Makefile                 |  6 ++--
 freedup16/Makefile               | 14 ++++----
 freedup16/PLIST                  |  2 +-
 freeradius2/Makefile             |  4 +--
 freeswitch-core/Makefile         |  8 ++---
 freeswitch-music/options.mk      | 24 ++++++-------
 fribid/Makefile                  |  4 +--
 fs-uae-launcher/Makefile         | 10 +++---
 ftpd-tls/Makefile                |  2 +-
 fvcom2/Makefile                  |  6 ++--
 fvwm-crystal/options.mk          | 14 ++++----
 fvwm265/Makefile                 |  2 +-
 fvwm265/options.mk               |  2 +-
 46 files changed, 214 insertions(+), 214 deletions(-)

diffs:
diff --git a/facedetect/Makefile b/facedetect/Makefile
index 457d120be0..f486fb5d24 100644
--- a/facedetect/Makefile
+++ b/facedetect/Makefile
@@ -1,38 +1,38 @@
 # $NetBSD$
 
 PORTREVISION=	0.1
-PKGBASE=        facedetect
-DISTNAME=       ${PKGBASE}-v${PORTREVISION}
-PKGREVISION=    2
-CATEGORIES=     graphics
+PKGBASE=	facedetect
+DISTNAME=	${PKGBASE}-v${PORTREVISION}
+PKGREVISION=	2
+CATEGORIES=	graphics
 
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=wavexx/}
-GITHUB_PROJECT= ${PKGBASE}
-GITHUB_TAG=     v${PORTREVISION}
-EXTRACT_OPTS_TAR= -s/facedetect-${PORTREVISION}/${DISTNAME}/p
+MASTER_SITES=		${MASTER_SITE_GITHUB:=wavexx/}
+GITHUB_PROJECT=		${PKGBASE}
+GITHUB_TAG=		v${PORTREVISION}
+EXTRACT_OPTS_TAR=	-s/facedetect-${PORTREVISION}/${DISTNAME}/p
 
-MAINTAINER=     ast%NetBSD.org@localhost
-HOMEPAGE=       http://www.thregr.org/~wavexx/software/facedetect/
-COMMENT=        Simple face detector for batch processing
-LICENSE=        gnu-gpl-v2
+MAINTAINER=	ast%NetBSD.org@localhost
+HOMEPAGE=	http://www.thregr.org/~wavexx/software/facedetect/
+COMMENT=	Simple face detector for batch processing
+LICENSE=	gnu-gpl-v2
 
-DEPENDS+=       opencv>=2.4:../../graphics/opencv2
+DEPENDS+=	opencv>=2.4:../../graphics/opencv2
 
-SUBST_CLASSES+=          fix-paths
-SUBST_STAGE.fix-paths=   post-extract
-SUBST_MESSAGE.fix-paths= Fixing absolute paths.
-SUBST_FILES.fix-paths=   facedetect
-SUBST_SED.fix-paths=     -e "s,'/usr/share/opencv,'${PREFIX}/share/OpenCV,g"
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		post-extract
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		facedetect
+SUBST_SED.fix-paths=		-e "s,'/usr/share/opencv,'${PREFIX}/share/OpenCV,g"
 
-INSTALLATION_DIRS= bin ${FD_DOCSDIR}
+INSTALLATION_DIRS=	bin ${FD_DOCSDIR}
 
-FD_DOCSDIR=     share/doc/facedetect
-FD_DOCS=        README.rst COPYING.txt doc/biggest-best.jpg
+FD_DOCSDIR=	share/doc/facedetect
+FD_DOCS=	README.rst COPYING.txt doc/biggest-best.jpg
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-NO_BUILD=        yes
-REPLACE_PYTHON=  facedetect
+NO_BUILD=	yes
+REPLACE_PYTHON=	facedetect
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PKGBASE} ${DESTDIR}${PREFIX}/bin/${PKGBASE}
diff --git a/farsi-ttf/Makefile b/farsi-ttf/Makefile
index 510808b69e..83f3173638 100644
--- a/farsi-ttf/Makefile
+++ b/farsi-ttf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mothanna is a sans-serif like Arabic OpenType font
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
-NO_BUILD=		yes
+NO_BUILD=	yes
 
 FONTS_DIRS.ttf=		lib/X11/fonts/TTF
 
diff --git a/fastahack/buildlink3.mk b/fastahack/buildlink3.mk
index 8d5b2b2bc5..ccaf2cb3e6 100644
--- a/fastahack/buildlink3.mk
+++ b/fastahack/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	fastahack
 FASTAHACK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.fastahack+=	fastahack>=18ed4b86ef962fa1b40f89b78625b2f271d9b155
-BUILDLINK_PKGSRCDIR.fastahack?=	../../wip/fastahack
+BUILDLINK_PKGSRCDIR.fastahack?=		../../wip/fastahack
 .endif	# FASTAHACK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-fastahack
diff --git a/fastbit/Makefile b/fastbit/Makefile
index 0718c741ca..0bdc0038a3 100644
--- a/fastbit/Makefile
+++ b/fastbit/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.3 2014/10/09 14:06:27 thomasklausner Exp $
 #
 
-VER=	1.2.0
-PKGNAME=    fastbit-${VER}
+VER=		1.2.0
+PKGNAME=	fastbit-${VER}
 DISTNAME=	fastbit-ibis${VER}
 CATEGORIES=	databases
 MASTER_SITES=	https://codeforge.lbl.gov/frs/download.php/208/
diff --git a/fastjet/Makefile b/fastjet/Makefile
index 48bc0cdbc9..d0cf11e10a 100644
--- a/fastjet/Makefile
+++ b/fastjet/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	http://fastjet.fr/
 COMMENT=	Software package for jet finding in pp and e+e- collisions
 LICENSE=	gnu-gpl-v2
 
-CHECK_PORTABILITY_SKIP= configure plugins/SISCone/siscone/configure \
+CHECK_PORTABILITY_SKIP=	configure plugins/SISCone/siscone/configure \
 			configure.lineno
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	bash
-USE_LANGUAGES=	c c++ fortran
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		bash
+USE_LANGUAGES=		c c++ fortran
 
 REPLACE_INTERPRETER+=	bash
 REPLACE.bash.old=	/bin/bash
diff --git a/fbpanel/Makefile b/fbpanel/Makefile
index 1d611f4128..8a09a3612d 100644
--- a/fbpanel/Makefile
+++ b/fbpanel/Makefile
@@ -19,10 +19,10 @@ HAS_CONFIGURE=		yes
 
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--cpu=on
-PLIST_SUBST+=	CPUPLUGIN=""
+PLIST_SUBST+=		CPUPLUGIN=""
 .else
 CONFIGURE_ARGS+=	--cpu=off
-PLIST_SUBST+=	CPUPLUGIN="@comment "
+PLIST_SUBST+=		CPUPLUGIN="@comment "
 .endif
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
diff --git a/feathercoin/Makefile b/feathercoin/Makefile
index 06a0b630d5..0afdebe991 100644
--- a/feathercoin/Makefile
+++ b/feathercoin/Makefile
@@ -33,17 +33,17 @@ QMAKE_OPTIONS+=	BDB_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	OPENSSL_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	LIB_RPATH=${PREFIX}/lib
 
-QMAKE_MOC += 	QMAKE_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+QMAKE_MOC +=	QMAKE_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
 
-RCD_SCRIPTS=	feathercoind
-OWN_DIRS=	${VARBASE}/feathercoin
-EGDIR=		${PREFIX}/share/examples/feathercoin
-CONF_FILES=	${EGDIR}/feathercoin.conf ${PKG_SYSCONFDIR}/feathercoin.conf
+RCD_SCRIPTS=		feathercoind
+OWN_DIRS=		${VARBASE}/feathercoin
+EGDIR=			${PREFIX}/share/examples/feathercoin
+CONF_FILES=		${EGDIR}/feathercoin.conf ${PKG_SYSCONFDIR}/feathercoin.conf
 CONF_FILES_PERMS=	${EGDIR}/feathercoin.conf ${PKG_SYSCONFDIR}/feathercoin.conf ${ROOT_USER} ${ROOT_GROUP} 0600
 
-CONFIGURE_ARGS+=       		 --without-gui
-CONFIGURE_ARGS+=                --with-boost=${BUILDLINK_PREFIX.boost-libs}
-BUILDLINK_TRANSFORM+=           l:db_cxx:db4_cxx
+CONFIGURE_ARGS+=	--without-gui
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
+BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
 
 do-configure:
 	(cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake "PREFIX=${PREFIX}" "QMAKE_CXXFLAGS=${CXXFLAGS}" ${QMAKE_OPTIONS} feathercoin-qt.pro)
diff --git a/felt/PLIST b/felt/PLIST
index e9cd63275f..2d8dd745ce 100644
--- a/felt/PLIST
+++ b/felt/PLIST
@@ -2,8 +2,8 @@
 bin/burlap
 bin/corduroy
 bin/felt
-bin/loom
 bin/felt-patchwork
+bin/loom
 bin/velvet
 bin/yardstick
 lib/felt/beam.defaults
@@ -14,8 +14,8 @@ lib/felt/spanish.trn
 lib/felt/truss.defaults
 man/man1/burlap.1
 man/man1/corduroy.1
-man/man1/felt.1
 man/man1/felt-patchwork.1
+man/man1/felt.1
 man/man1/velvet.1
 man/man1/yardstick.1
 man/man3/Drawing.3
diff --git a/festvox-ks/PLIST b/festvox-ks/PLIST
index bece63d62f..b142492267 100755
--- a/festvox-ks/PLIST
+++ b/festvox-ks/PLIST
@@ -1,4 +1,7 @@
 @comment $NetBSD: PLIST,v 1.1 2014/10/30 13:21:27 noud4 Exp $
+share/festival/lib/etc/unknown_DebianGNULinux/.made
+share/festival/lib/etc/unknown_DebianGNULinux/audsp
+share/festival/lib/etc/unknown_DebianGNULinux/mbrola
 share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/festvox/diphlist.scm
 share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/festvox/pjwstk_pl_accent_def.scm
 share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/festvox/pjwstk_pl_dur.scm
@@ -19,7 +22,4 @@ share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/festvox/pjwstk_pl_tobi_f0.s
 share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/festvox/pjwstk_pl_token.scm
 share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/mbrola-pl1/pl1
 share/festival/lib/voices/polish/pjwstk_pl_ks_mbrola/mbrola-pl1/pl1_phones
-share/festival/lib/etc/unknown_DebianGNULinux/.made
-share/festival/lib/etc/unknown_DebianGNULinux/audsp
-share/festival/lib/etc/unknown_DebianGNULinux/mbrola
 @pkgdir share/festival/lib/etc/unknown_DebianGNULinux/tmp
diff --git a/feynhiggs/Makefile b/feynhiggs/Makefile
index 6049c2b8d2..0e7feb70dd 100644
--- a/feynhiggs/Makefile
+++ b/feynhiggs/Makefile
@@ -11,13 +11,13 @@ HOMEPAGE=	http://www.feynhiggs.de/FeynHiggs.html
 COMMENT=	Fortran code for the diagrammatic calculation of the masses
 #LICENSE=	# TODO: (see mk/license.mk)
 
-MAKE_JOBS_SAFE=NO
+MAKE_JOBS_SAFE=	NO
 
 GNU_CONFIGURE=	yes
 MAKE_FILE=	makefile
 USE_LANGUAGES=	c c++ fortran
 
-INSTALLATION_DIRS= share/doc/feynhiggs ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	share/doc/feynhiggs ${PKGMANDIR}/man1
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/man/api.pdf ${DESTDIR}${PREFIX}/share/doc/feynhiggs
diff --git a/fftjet/Makefile b/fftjet/Makefile
index ec7c729526..46cbe7b80f 100644
--- a/fftjet/Makefile
+++ b/fftjet/Makefile
@@ -14,7 +14,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++ fortran
 
-BUILDLINK_TRANSFORM+=    rm:-fpermissive
+BUILDLINK_TRANSFORM+=	rm:-fpermissive
 
 PKGCONFIG_OVERRIDE+=	fftjet.pc.in
 
diff --git a/fftw-mpich/PLIST b/fftw-mpich/PLIST
index 6eca86cf34..11bc6e9218 100644
--- a/fftw-mpich/PLIST
+++ b/fftw-mpich/PLIST
@@ -1,14 +1,14 @@
 @comment $NetBSD: PLIST,v 1.1 2013/06/23 18:22:25 outpaddling Exp $
 mpich/bin/fftw-wisdom
 mpich/bin/fftw-wisdom-to-conf
+mpich/include/fftw3-mpi.f03
+mpich/include/fftw3-mpi.h
 mpich/include/fftw3.f
 mpich/include/fftw3.f03
 mpich/include/fftw3.h
-mpich/include/fftw3-mpi.f03
-mpich/include/fftw3-mpi.h
+mpich/info/fftw3.info
 mpich/lib/libfftw3.la
 mpich/lib/libfftw3_mpi.la
 mpich/lib/pkgconfig/fftw3.pc
-mpich/info/fftw3.info
-mpich/man/man1/fftw-wisdom.1
 mpich/man/man1/fftw-wisdom-to-conf.1
+mpich/man/man1/fftw-wisdom.1
diff --git a/fgallery/Makefile b/fgallery/Makefile
index ac357e0e35..374bdb220f 100644
--- a/fgallery/Makefile
+++ b/fgallery/Makefile
@@ -1,49 +1,49 @@
 # $NetBSD$
 
-PORTVERSION=    1.8.2
-PKGBASE=        fgallery
-DISTNAME=       ${PKGBASE}-${PORTVERSION}
-PKGREVISION=    4
-CATEGORIES=     www
+PORTVERSION=	1.8.2
+PKGBASE=	fgallery
+DISTNAME=	${PKGBASE}-${PORTVERSION}
+PKGREVISION=	4
+CATEGORIES=	www
 
-MASTER_SITES=   http://www.thregr.org/~wavexx/software/fgallery/releases/
-EXTRACT_SUFX=   .zip
+MASTER_SITES=	http://www.thregr.org/~wavexx/software/fgallery/releases/
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=     ast%NetBSD.org@localhost
-HOMEPAGE=       http://www.thregr.org/~wavexx/software/fgallery
-COMMENT=        Minimilistic, static photo gallery generator
-LICENSE=        gnu-gpl-v2
+MAINTAINER=	ast%NetBSD.org@localhost
+HOMEPAGE=	http://www.thregr.org/~wavexx/software/fgallery
+COMMENT=	Minimilistic, static photo gallery generator
+LICENSE=	gnu-gpl-v2
 
-NO_BUILD=       yes
-USE_TOOLS+=     perl
-REPLACE_PERL=   ${PKGBASE}
+NO_BUILD=	yes
+USE_TOOLS+=	perl
+REPLACE_PERL=	${PKGBASE}
 
-DEPENDS+=       facedetect>=0.1:../../wip/facedetect
-DEPENDS+=       ImageMagick>=6.9:../../graphics/ImageMagick
-DEPENDS+=       jpegoptim>=1.4:../../graphics/jpegoptim
-DEPENDS+=       pngcrush>=1.7:../../graphics/pngcrush
-DEPENDS+=       lcms2>=2.7:../../graphics/lcms2
-DEPENDS+=       p7zip>=9.38:../../archivers/p7zip
-DEPENDS+=       p5-Image-ExifTool>=10.0:../../graphics/p5-Image-ExifTool
+DEPENDS+=	facedetect>=0.1:../../wip/facedetect
+DEPENDS+=	ImageMagick>=6.9:../../graphics/ImageMagick
+DEPENDS+=	jpegoptim>=1.4:../../graphics/jpegoptim
+DEPENDS+=	pngcrush>=1.7:../../graphics/pngcrush
+DEPENDS+=	lcms2>=2.7:../../graphics/lcms2
+DEPENDS+=	p7zip>=9.38:../../archivers/p7zip
+DEPENDS+=	p5-Image-ExifTool>=10.0:../../graphics/p5-Image-ExifTool
 
-FG_SHAREDIR=    share/${PKGBASE}
-FG_VIEWDIR=     share/${PKGBASE}/view
+FG_SHAREDIR=	share/${PKGBASE}
+FG_VIEWDIR=	share/${PKGBASE}/view
 
-SUBST_CLASSES+=          fix-paths
-SUBST_STAGE.fix-paths=   post-patch
-SUBST_MESSAGE.fix-paths= Fixing ${FG_VIEWDIR} path.
-SUBST_FILES.fix-paths=   fgallery
-SUBST_SED.fix-paths=     -e "s,%%FG_VIEWDIR%%,${PREFIX}/${FG_VIEWDIR},g"
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		post-patch
+SUBST_MESSAGE.fix-paths=	Fixing ${FG_VIEWDIR} path.
+SUBST_FILES.fix-paths=		fgallery
+SUBST_SED.fix-paths=		-e "s,%%FG_VIEWDIR%%,${PREFIX}/${FG_VIEWDIR},g"
 
-SUBST_CLASSES+=          fix-vers
-SUBST_STAGE.fix-vers=    post-patch
-SUBST_MESSAGE.fix-vers=  Setting version to ${PKGVERSION:C/^.*-//}.
-SUBST_FILES.fix-vers=    fgallery
-SUBST_SED.fix-vers=      -e "s,\"${PORTVERSION}\",\"${PKGVERSION:C/^.*-//}\","
+SUBST_CLASSES+=		fix-vers
+SUBST_STAGE.fix-vers=	post-patch
+SUBST_MESSAGE.fix-vers=	Setting version to ${PKGVERSION:C/^.*-//}.
+SUBST_FILES.fix-vers=	fgallery
+SUBST_SED.fix-vers=	-e "s,\"${PORTVERSION}\",\"${PKGVERSION:C/^.*-//}\","
 
-FG_DOCS=        COPYING.txt NEWS.html NEWS.rst README.html README.rst
-FG_SRCDIR=      ${WRKDIR}/${DISTNAME}
-FG_VIEWFILES=   back.png \
+FG_DOCS=	COPYING.txt NEWS.html NEWS.rst README.html README.rst
+FG_SRCDIR=	${WRKDIR}/${DISTNAME}
+FG_VIEWFILES=	back.png \
 		cap-always.png \
 		cap-never.png \
 		cap-normal.png \
@@ -63,13 +63,13 @@ FG_VIEWFILES=   back.png \
                 noise.png \
                 throbber.gif
 
-OV_FILES=       overview.css \
+OV_FILES=	overview.css \
                 overview.html \
                 overview.js \
                 overview.png \
                 noscript.css
 
-INSTALLATION_DIRS= bin ${FG_SHAREDIR} ${FG_VIEWDIR}
+INSTALLATION_DIRS=	bin ${FG_SHAREDIR} ${FG_VIEWDIR}
 
 pre-patch:
 .for file in ${OV_FILES}
diff --git a/firebird/Makefile b/firebird/Makefile
index a9ef9f5e65..44ca8691af 100644
--- a/firebird/Makefile
+++ b/firebird/Makefile
@@ -37,7 +37,7 @@ FBUSER?=		firebird
 FBGROUP?=		firebird
 FBHOME?=		firebird
 
-BUILD_DEFS+=            FBHOME
+BUILD_DEFS+=		FBHOME
 
 PKG_GROUPS=		${FBGROUP}
 PKG_USERS=		${FBUSER}:${FBGROUP}
diff --git a/firefox-dfbsd/Makefile b/firefox-dfbsd/Makefile
index bc1493f896..d4de7ee631 100644
--- a/firefox-dfbsd/Makefile
+++ b/firefox-dfbsd/Makefile
@@ -45,14 +45,14 @@ LDFLAGS.Linux=		-lnspr4
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=	lib/firefox/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox
+MOZILLA=	firefox
 MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=	Firefox
diff --git a/firefox-dfbsd/mozilla-common.mk b/firefox-dfbsd/mozilla-common.mk
index 1b1e5075b4..0b137ed414 100644
--- a/firefox-dfbsd/mozilla-common.mk
+++ b/firefox-dfbsd/mozilla-common.mk
@@ -40,12 +40,12 @@ CXXFLAGS+=		-march=i586
 CXXFLAGS+=		-mstackrealign
 .endif
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
 CONFIGURE_ARGS+=	--enable-pie
 CONFIGURE_ARGS+=	--disable-tests
diff --git a/firefox-dfbsd/options.mk b/firefox-dfbsd/options.mk
index fdb4afbbf2..333cdd9c1e 100644
--- a/firefox-dfbsd/options.mk
+++ b/firefox-dfbsd/options.mk
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS+=	oss dbus
 .elif ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=	oss dbus
 .else
-PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
+PKG_SUGGESTED_OPTIONS+=	dbus pulseaudio
 .endif
 
 # On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
diff --git a/firefox-hg/Makefile.common b/firefox-hg/Makefile.common
index 21ea8c9786..8640580926 100644
--- a/firefox-hg/Makefile.common
+++ b/firefox-hg/Makefile.common
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--enable-application=browser
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox-${MOZ_BRANCH} ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=		-lm
 
-PLIST_SUBST+=	VERSION=${MOZ_BRANCH}
+PLIST_SUBST+=		VERSION=${MOZ_BRANCH}
 PRINT_PLIST_AWK+=	{ gsub(/${MOZ_BRANCH}/, "$${VERSION}") }
 
 ALL_ENV+=		MOZILLA_PKG_NAME=firefox
@@ -56,14 +56,14 @@ LDFLAGS.Linux=		-lnspr4
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpt.py
 
 CHECK_WRKREF_SKIP+=	lib/firefox-${MOZ_BRANCH}/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox
+MOZILLA=	firefox
 MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=	Firefox
diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index aa5f51e037..c63b39276b 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -32,10 +32,10 @@ CPPFLAGS+=		-march=i486
 GCC_REQD+=		4.5
 .endif
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 
 CONFIGURE_ARGS+=	--disable-tests
 CONFIGURE_ARGS+=	--with-pthreads
@@ -77,7 +77,7 @@ SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths+=		${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
 SUBST_SED.fix-paths+=		-e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
 
-MOZ_OBJDIR=obj.${MACHINE_ARCH}
+MOZ_OBJDIR=	obj.${MACHINE_ARCH}
 
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}${MOZ_OBJDIR}/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.guess
diff --git a/firefox-hg/options.mk b/firefox-hg/options.mk
index 9840dec472..26463a4d02 100644
--- a/firefox-hg/options.mk
+++ b/firefox-hg/options.mk
@@ -10,7 +10,7 @@ PLIST_SRC+=	PLIST
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc
 .else
-PKG_SUGGESTED_OPTIONS+= pulseaudio
+PKG_SUGGESTED_OPTIONS+=	pulseaudio
 .endif
 
 PKG_SUGGESTED_OPTIONS+=	webrtc
diff --git a/firefox-webrtc/Makefile b/firefox-webrtc/Makefile
index b15431e0e6..398a8333c8 100644
--- a/firefox-webrtc/Makefile
+++ b/firefox-webrtc/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.268 2016/10/26 20:23:27 ryoon Exp $
 
-FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=	49.0
+FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+MOZ_BRANCH=		49.0
 MOZ_BRANCH_MINOR=	.2
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
@@ -44,14 +44,14 @@ LDFLAGS.Linux=		-lnspr4
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=	lib/firefox/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox
+MOZILLA=	firefox
 MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=	Firefox
diff --git a/firefox-webrtc/mozilla-common.mk b/firefox-webrtc/mozilla-common.mk
index 5d76021424..d059854021 100644
--- a/firefox-webrtc/mozilla-common.mk
+++ b/firefox-webrtc/mozilla-common.mk
@@ -38,12 +38,12 @@ CXXFLAGS+=		-march=i586
 CXXFLAGS+=		-mstackrealign
 .endif
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
 CONFIGURE_ARGS+=	--enable-pie
 CONFIGURE_ARGS+=	--disable-tests
diff --git a/firefox-webrtc/options.mk b/firefox-webrtc/options.mk
index 0cc78b4ff8..326d0f4f7b 100644
--- a/firefox-webrtc/options.mk
+++ b/firefox-webrtc/options.mk
@@ -9,7 +9,7 @@ PLIST_VARS+=		gnome jemalloc debug
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc dbus
 .else
-PKG_SUGGESTED_OPTIONS+= pulseaudio dbus
+PKG_SUGGESTED_OPTIONS+=	pulseaudio dbus
 .endif
 
 # On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
diff --git a/firefox/Makefile b/firefox/Makefile
index 401b1e2ec0..6f43be13e1 100644
--- a/firefox/Makefile
+++ b/firefox/Makefile
@@ -53,14 +53,14 @@ LDFLAGS.Linux=		-lnspr4
 .include "mozilla-common.mk"
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=	lib/firefox/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox
+MOZILLA=	firefox
 MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=	Firefox
diff --git a/firefox/mozilla-common.mk b/firefox/mozilla-common.mk
index fb1dc61a4f..d09b389aa3 100644
--- a/firefox/mozilla-common.mk
+++ b/firefox/mozilla-common.mk
@@ -40,12 +40,12 @@ CXXFLAGS+=		-march=i586
 CXXFLAGS+=		-mstackrealign
 .endif
 
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
 CONFIGURE_ARGS+=	--enable-pie
 CONFIGURE_ARGS+=	--disable-tests
diff --git a/flam3-svn/PLIST b/flam3-svn/PLIST
index 7a7089b7a6..6080fb043b 100644
--- a/flam3-svn/PLIST
+++ b/flam3-svn/PLIST
@@ -1,15 +1,15 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2010/01/31 17:25:56 rhialto Exp $
-lib/libflam3.la
-lib/pkgconfig/flam3.pc
 bin/flam3-animate
+bin/flam3-convert
 bin/flam3-genome
 bin/flam3-render
-bin/flam3-convert
 include/flam3.h
 include/isaac.h
 include/isaacs.h
+lib/libflam3.la
+lib/pkgconfig/flam3.pc
 man/man1/flam3-animate.1
+man/man1/flam3-convert.1
 man/man1/flam3-genome.1
 man/man1/flam3-render.1
-man/man1/flam3-convert.1
 share/flam3/flam3-palettes.xml
diff --git a/flasm/PLIST b/flasm/PLIST
index 690e3971a5..bfb184d827 100644
--- a/flasm/PLIST
+++ b/flasm/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.2 2006/09/11 18:59:07 kh-p Exp $
 bin/flasm
-share/examples/flasm.ini
-share/doc/flasm.html
 share/doc/classic.css
+share/doc/flasm.html
+share/examples/flasm.ini
diff --git a/flexdump/Makefile b/flexdump/Makefile
index 3376a59850..3b347e34fc 100644
--- a/flexdump/Makefile
+++ b/flexdump/Makefile
@@ -15,7 +15,7 @@ REPLACE_PERL=		${WRKSRC}/flexbackup
 NO_BUILD=		YES
 
 SUBST_CLASSES+=		cfgpath
-SUBST_MESSAGE.cfgpath = Fixing hardcoded configuration file path.
+SUBST_MESSAGE.cfgpath =	Fixing hardcoded configuration file path.
 SUBST_STAGE.cfgpath =	post-patch
 SUBST_FILES.cfgpath =	flexbackup flexbackup.1 flexbackup.conf.5
 SUBST_SED.cfgpath =	-e s,/etc/flexbackup.conf,${PKG_SYSCONFDIR}/flexbackup.conf,
diff --git a/flim/Makefile b/flim/Makefile
index d9040c76a0..e7792b47e4 100644
--- a/flim/Makefile
+++ b/flim/Makefile
@@ -32,15 +32,15 @@ MAKEFLAGS.emacs+=	EMACS=${EMACS_BIN}
 MAKEFLAGS.xemacs+=	XEMACS=${EMACS_BIN} \
 			PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 
-EMACS_MODULES=	base
+EMACS_MODULES=		base
 EMACS_BUILDLINK=	# empty
 
 # string-to-int to string-to-number
-SUBST_CLASSES+=                s2i
-SUBST_MESSAGE.s2i=     string-to-int is an obsolete function; use `string-to-number' instead
-SUBST_STAGE.s2i=       post-patch
-SUBST_FILES.s2i=       mime-parse.el
-SUBST_SED.s2i=         -e s/string-to-int/string-to-number/g
+SUBST_CLASSES+=		s2i
+SUBST_MESSAGE.s2i=	string-to-int is an obsolete function; use `string-to-number' instead
+SUBST_STAGE.s2i=	post-patch
+SUBST_FILES.s2i=	mime-parse.el
+SUBST_SED.s2i=		-e s/string-to-int/string-to-number/g
 
 
 post-build:
diff --git a/flite2/Makefile b/flite2/Makefile
index 3874d91edc..eed2383ccd 100644
--- a/flite2/Makefile
+++ b/flite2/Makefile
@@ -13,10 +13,10 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.speech.cs.cmu.edu/flite/
 COMMENT=	Small and fast run-time synthesis engine
 
-CONFLICTS+=     flite-1.3:../../audio/flite
+CONFLICTS+=		flite-1.3:../../audio/flite
 # Error opening output file '[...]/cmu_us_kal_diphone.o': No such file or directory
-MAKE_JOBS_SAFE=	no
-CFLAGS+=        -fPIC
+MAKE_JOBS_SAFE=		no
+CFLAGS+=		-fPIC
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
diff --git a/fluxspace/Makefile b/fluxspace/Makefile
index 333cc6073f..23238aec56 100644
--- a/fluxspace/Makefile
+++ b/fluxspace/Makefile
@@ -19,7 +19,7 @@ PY_PATCHPLIST=		YES
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=	${EXPORT_SYMBOLS_LDFLAGS}
 
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
+CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xml
 
 .include "../../textproc/py-xml/buildlink3.mk"
diff --git a/fragrouter/Makefile b/fragrouter/Makefile
index 9c4e7d3016..8c5e71a770 100644
--- a/fragrouter/Makefile
+++ b/fragrouter/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 COMMENT=	Tool for testing network IDS implementations
 
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libnet=${BUILDLINK_PREFIX.libnet10}
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
 
diff --git a/freebayes/buildlink3.mk b/freebayes/buildlink3.mk
index 1972ee53f4..6bbb6c25bb 100644
--- a/freebayes/buildlink3.mk
+++ b/freebayes/buildlink3.mk
@@ -16,7 +16,7 @@ BUILDLINK_TREE+=	freebayes
 FREEBAYES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.freebayes+=	freebayes>=65c4880d09ec21f7f2755eac9476b607011522f3
-BUILDLINK_PKGSRCDIR.freebayes?=	../../wip/freebayes
+BUILDLINK_PKGSRCDIR.freebayes?=		../../wip/freebayes
 .endif	# FREEBAYES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-freebayes
diff --git a/freedup/Makefile b/freedup/Makefile
index 8cc405cbd1..01bbe19623 100644
--- a/freedup/Makefile
+++ b/freedup/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Free disk space by hard linking duplicate files
 
 USE_TOOLS+=	gmake
 
-WRKSRC=	${WRKDIR}/freedup-1.3
+WRKSRC=		${WRKDIR}/freedup-1.3
 MAKE_ENV+=	BIN_DIR=${PREFIX:Q}/bin
 MAKE_ENV+=	MAN_DIR=${PREFIX:Q}/${PKGMANDIR}
 
-DEPENDS+= coreutils>=6.9:../../sysutils/coreutils
+DEPENDS+=	coreutils>=6.9:../../sysutils/coreutils
 
 SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths+=	pre-configure
+SUBST_STAGE.fix-paths+=		pre-configure
 SUBST_MESSAGE.fix-paths+=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		freedup.h
 SUBST_SED.fix-paths=		-e 's,/usr/bin/,${PREFIX}/bin/g,g'
diff --git a/freedup16/Makefile b/freedup16/Makefile
index 61ea1af68d..769bd88147 100644
--- a/freedup16/Makefile
+++ b/freedup16/Makefile
@@ -13,22 +13,22 @@ HOMEPAGE=	http://freedup.org/
 COMMENT=	Free disk space by hard linking duplicate files
 USE_TOOLS+=	gmake
 
-WRKSRC=	${WRKDIR}/freedup-1.6
+WRKSRC=		${WRKDIR}/freedup-1.6
 MAKE_ENV+=	BIN_DIR=${PREFIX:Q}/bin
 MAKE_ENV+=	MAN_DIR=${PREFIX:Q}/${PKGMANDIR}
 
-DEPENDS+= coreutils>=6.9:../../sysutils/coreutils
+DEPENDS+=	coreutils>=6.9:../../sysutils/coreutils
 
 SUBST_CLASSES=			fix-paths
-SUBST_STAGE.fix-paths=	pre-configure
+SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		freedup.h
 SUBST_SED.fix-paths=		-e 's,/usr/bin/,${PREFIX}/bin/g,g'
 
-ONLY_FOR_PLATFORM=DragonFly-*-* \
-		NetBSD-[5-9]*-i386 \
-		NetBSD-[5-9]*-x86_64 \
-		NetBSD-[5-9]*-amd64
+ONLY_FOR_PLATFORM=	DragonFly-*-* \
+			NetBSD-[5-9]*-i386 \
+			NetBSD-[5-9]*-x86_64 \
+			NetBSD-[5-9]*-amd64
 
 post-extract:
 		cd ${WRKSRC} && rm symharden
diff --git a/freedup16/PLIST b/freedup16/PLIST
index d17b5b0831..0ecc3b67cd 100644
--- a/freedup16/PLIST
+++ b/freedup16/PLIST
@@ -1,4 +1,4 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2012/01/08 13:25:19 draga Exp $
 bin/freedup
-man/man1/freedup.1
 bin/symharden
+man/man1/freedup.1
diff --git a/freeradius2/Makefile b/freeradius2/Makefile
index d73aeb79f9..6cc7b2cdff 100644
--- a/freeradius2/Makefile
+++ b/freeradius2/Makefile
@@ -84,7 +84,7 @@ SUBST_MESSAGE.config=	Fixing configuration files.
 
 .include "options.mk"
 
-EGFILES=acct_users attrs attrs.access_reject attrs.accounting_response \
+EGFILES=	acct_users attrs attrs.access_reject attrs.accounting_response \
 	attrs.pre-proxy certs/README certs/bootstrap certs/ca.cnf \
 	certs/client.cnf certs/demoCA/cacert.pem certs/server.cnf \
 	certs/xpextensions clients.conf dictionary eap.conf experimental.conf \
@@ -121,7 +121,7 @@ EGFILES=acct_users attrs attrs.access_reject attrs.accounting_response \
 	sql/postgresql/schema.sql \
 	sql/postgresql/update_radacct_group_trigger.sql \
 	sql/postgresql/voip-postpaid.conf sqlippool.conf templates.conf users
-EGDIRS=	certs certs/demoCA modules sql sql/mssql sql/mysql sql/oracle \
+EGDIRS=		certs certs/demoCA modules sql sql/mssql sql/mysql sql/oracle \
 	sql/postgresql sites-available sites-enabled
 
 .for f in ${EGFILES}
diff --git a/freeswitch-core/Makefile b/freeswitch-core/Makefile
index ba4ad56cec..3f7996ffe1 100644
--- a/freeswitch-core/Makefile
+++ b/freeswitch-core/Makefile
@@ -135,10 +135,10 @@ INSTALLATION_DIRS+=	freeswitch/modules
 INSTALLATION_DIRS+=	freeswitch/sounds
 INSTALLATION_DIRS+=	freeswitch/recordings
 
-CONFLICTS=      	xmlrpc-c-[0-9]*
+CONFLICTS=		xmlrpc-c-[0-9]*
 
-DEPENDS+=        	flite-[0-9]*:../../audio/flite
-DEPENDS+=        	libyaml-[0-9]*:../../textproc/libyaml
+DEPENDS+=		flite-[0-9]*:../../audio/flite
+DEPENDS+=		libyaml-[0-9]*:../../textproc/libyaml
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -147,7 +147,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	libtool */libtool */*/libtool */*/*/libtool
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
-CFLAGS+=        	-Wno-c11-extensions -Wno-deprecated-declarations \
+CFLAGS+=		-Wno-c11-extensions -Wno-deprecated-declarations \
 			-Wno-zero-length-array -Wno-incompatible-pointer-types
 .endif
 
diff --git a/freeswitch-music/options.mk b/freeswitch-music/options.mk
index 46c3ccdc83..3a59891538 100644
--- a/freeswitch-music/options.mk
+++ b/freeswitch-music/options.mk
@@ -7,27 +7,27 @@ PKG_SUGGESTED_OPTIONS=	freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-4
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-08k)
-DISTFILES+=	freeswitch-sounds-music-8000-${VERSION}.tar.gz
-INSTALLATION_DIRS+= share/freeswitch/sounds/music/default/8000
-SOUND_DIRS+=	8000
+DISTFILES+=		freeswitch-sounds-music-8000-${VERSION}.tar.gz
+INSTALLATION_DIRS+=	share/freeswitch/sounds/music/default/8000
+SOUND_DIRS+=		8000
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-16k)
-DISTFILES+=	freeswitch-sounds-music-16000-${VERSION}.tar.gz
-SOUND_DIRS+=	16000
-INSTALLATION_DIRS+= share/freeswitch/sounds/music/default/16000
+DISTFILES+=		freeswitch-sounds-music-16000-${VERSION}.tar.gz
+SOUND_DIRS+=		16000
+INSTALLATION_DIRS+=	share/freeswitch/sounds/music/default/16000
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-32k)
-DISTFILES+=	freeswitch-sounds-music-32000-${VERSION}.tar.gz
-SOUND_DIRS+=	32000
-INSTALLATION_DIRS+= share/freeswitch/sounds/music/default/32000
+DISTFILES+=		freeswitch-sounds-music-32000-${VERSION}.tar.gz
+SOUND_DIRS+=		32000
+INSTALLATION_DIRS+=	share/freeswitch/sounds/music/default/32000
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreeswitch-48k)
-DISTFILES+=	freeswitch-sounds-music-48000-${VERSION}.tar.gz
-SOUND_DIRS+=	48000
-INSTALLATION_DIRS+= share/freeswitch/sounds/music/default/48000
+DISTFILES+=		freeswitch-sounds-music-48000-${VERSION}.tar.gz
+SOUND_DIRS+=		48000
+INSTALLATION_DIRS+=	share/freeswitch/sounds/music/default/48000
 .endif
 
 .for opt in ${PKG_SUPPORTED_OPTIONS}
diff --git a/fribid/Makefile b/fribid/Makefile
index c51781f10b..5ba5463ad8 100644
--- a/fribid/Makefile
+++ b/fribid/Makefile
@@ -7,9 +7,9 @@ MASTER_SITES=		http://fribid.se/releases/source/
 
 MAINTAINER=		oht%users.sourceforge.net@localhost
 HOMEPAGE=		http://fribid.se/
-EXTRACT_SUFX=    	.tar.bz2
+EXTRACT_SUFX=		.tar.bz2
 COMMENT=		FriBID  is a web browser plugin for BankID
-USE_TOOLS+=             gmake pkg-config
+USE_TOOLS+=		gmake pkg-config
 LICENSE=		mit
 
 
diff --git a/fs-uae-launcher/Makefile b/fs-uae-launcher/Makefile
index c4623bfa40..dff13d6cce 100644
--- a/fs-uae-launcher/Makefile
+++ b/fs-uae-launcher/Makefile
@@ -20,12 +20,12 @@ INSTALL_ENV+=	PYTHONBIN=${PYTHONBIN}
 # Imports urllib.parse which is 3+.
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-REPLACE_PYTHON+=OpenGL/arrays/_buffers.py
-REPLACE_PYTHON+=OpenGL/arrays/buffers.py
+REPLACE_PYTHON+=	OpenGL/arrays/_buffers.py
+REPLACE_PYTHON+=	OpenGL/arrays/buffers.py
 
-PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}	# 3.5
-PLIST_SUBST+=   PYVERS=${PYPKGPREFIX:S/py//}	# py35 -> 35
-PLIST_SUBST+=   VERSION=${VERSION}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}	# 3.5
+PLIST_SUBST+=	PYVERS=${PYPKGPREFIX:S/py//}	# py35 -> 35
+PLIST_SUBST+=	VERSION=${VERSION}
 
 #DEPENDS+=	${PYPKGPREFIX}-qt4>=4.10.2nb1:../../x11/py-qt4
 # when building with qt5 it should co-exist with calibre and qbzr.
diff --git a/ftpd-tls/Makefile b/ftpd-tls/Makefile
index 8c438f4e25..73bc57e0f4 100644
--- a/ftpd-tls/Makefile
+++ b/ftpd-tls/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=	yes
 
 RCD_SCRIPTS=	ftpdtls
 
-SUBST_CLASSES+=	path
+SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_MESSAGE.path=	Fixing hardcoded path.
 SUBST_FILES.path=	ftpd.8.TLS pathnames.h tlsutil.c README.TLS
diff --git a/fvcom2/Makefile b/fvcom2/Makefile
index 2076df8e7b..474e8ad42a 100644
--- a/fvcom2/Makefile
+++ b/fvcom2/Makefile
@@ -22,9 +22,9 @@ USE_LANGUAGES=	c fortran77
 
 AUTO_MKDIRS=	yes
 
-FETCH_MESSAGE=  "Please download the files"
-FETCH_MESSAGE+= "    "${DISTFILES:Q}
-FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"."
+FETCH_MESSAGE=	"Please download the files"
+FETCH_MESSAGE+=	"    "${DISTFILES:Q}
+FETCH_MESSAGE+=	"manually from "${MASTER_SITES:Q}"."
 
 SUBST_CLASSES+=		log2
 SUBST_FILES.log2=	METIS_source/coarsen.c \
diff --git a/fvwm-crystal/options.mk b/fvwm-crystal/options.mk
index c01f987865..415debe68e 100644
--- a/fvwm-crystal/options.mk
+++ b/fvwm-crystal/options.mk
@@ -7,26 +7,26 @@ PKG_SUGGESTED_OPTIONS=	habak aterm
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mhabak)
-DEPENDS+=      habak>=0.2.5:../../wip/habak
+DEPENDS+=	habak>=0.2.5:../../wip/habak
 .endif
 
 .if !empty(PKG_OPTIONS:Mhsetroot)
-DEPENDS+=      hsetroot>=1.0.2:../../x11/hsetroot
+DEPENDS+=	hsetroot>=1.0.2:../../x11/hsetroot
 .endif
 
 .if !empty(PKG_OPTIONS:Materm)
-DEPENDS+=      aterm>=1.0.0:../../x11/aterm
+DEPENDS+=	aterm>=1.0.0:../../x11/aterm
 .endif
 
 .if !empty(PKG_OPTIONS:Murxvt)
-DEPENDS+=      rxvt-unicode>=0.8.3:../../x11/rxvt-unicode
+DEPENDS+=	rxvt-unicode>=0.8.3:../../x11/rxvt-unicode
 .endif
 
 .if !empty(PKG_OPTIONS:Mmpc)
-DEPENDS+=      musicpd>=0.11.5:../../audio/musicpd
-DEPENDS+=      mpc>=0.11.2:../../audio/mpc
+DEPENDS+=	musicpd>=0.11.5:../../audio/musicpd
+DEPENDS+=	mpc>=0.11.2:../../audio/mpc
 .endif
 
 .if !empty(PKG_OPTIONS:Mxmms)
-DEPENDS+=      xmms>=1.2.11:../../audio/xmms
+DEPENDS+=	xmms>=1.2.11:../../audio/xmms
 .endif
diff --git a/fvwm265/Makefile b/fvwm265/Makefile
index 5802ca5d10..0b84e95495 100644
--- a/fvwm265/Makefile
+++ b/fvwm265/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 # To avoid ${WRKDIR} is included in perl script
-CONFIGURE_ENV+=         ac_cv_path_PERL=${PERL5:Q}
+CONFIGURE_ENV+=		ac_cv_path_PERL=${PERL5:Q}
 
 post-extract:
 	mkdir ${WRKDIR:Q}/icons
diff --git a/fvwm265/options.mk b/fvwm265/options.mk
index 4c00d51ab7..8b7aeeac9c 100644
--- a/fvwm265/options.mk
+++ b/fvwm265/options.mk
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--disable-bidi
 #.include "../../graphics/gdk-pixbuf/buildlink3.mk"
 # not found in pkgsrc yet (?)
 .else
-CONFIGURE_ARGS+=        --disable-gdk
+CONFIGURE_ARGS+=	--disable-gdk
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
Prev by Date: wip/e*: fix pkglint indentation warnings
Next by Date: wip/g*: fix pkglint indentation warnings
Previous by Thread: wip/e*: fix pkglint indentation warnings
Next by Thread: wip/g*: fix pkglint indentation warnings
Indexes:
Home | Main Index | Thread Index | Old Index