pkgsrc-WIP-changes archive

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

wip/c*: fix pkglint indentation warnings



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 20:20:51 2018 +0000
Changeset:	bed7aeec10f21359352ee5f5df33ecb06fc3b60f

Modified Files:
	c-news/Makefile
	c-news/buildlink3.mk
	cairo-dingbat-ttf/Makefile
	canna-dict/Makefile
	canna-lib/buildlink3.mk
	cardpeek/Makefile
	cargo/Makefile
	cartago/Makefile
	casady-fonts/Makefile
	cdbfasta/buildlink3.mk
	cde/Makefile
	cdirip/Makefile
	cedet/Makefile
	cgal/Makefile
	cgterm/Makefile
	check-update/Makefile
	cheese/Makefile
	cherokee/Makefile
	cherokee/PLIST
	chezscheme/Makefile
	chezscheme/options.mk
	choosefont/Makefile
	choosefont/PLIST
	chora/Makefile
	chromium/Makefile
	chromium/options.mk
	chruby/Makefile
	chruby/PLIST
	cinelerra-git/Makefile
	cl-alexandria/Makefile
	cl-alexandria/options.mk
	cl-anaphora/Makefile
	cl-anaphora/options.mk
	cl-babel/Makefile
	cl-babel/options.mk
	cl-bordeaux-threads/Makefile
	cl-bordeaux-threads/options.mk
	cl-cffi/Makefile
	cl-cffi/options.mk
	cl-fad/Makefile
	cl-fad/options.mk
	cl-flexi-streams/Makefile
	cl-flexi-streams/options.mk
	cl-ppcre-unicode/Makefile
	cl-ppcre-unicode/options.mk
	cl-ppcre/Makefile
	cl-ppcre/options.mk
	cl-split-sequence/Makefile
	cl-split-sequence/options.mk
	cl-trivial-features/Makefile
	cl-trivial-features/options.mk
	cl-trivial-gray-streams/Makefile
	cl-trivial-gray-streams/options.mk
	cl-unicode/Makefile
	cl-unicode/options.mk
	cl-who/Makefile
	cl-who/options.mk
	clang-git/Makefile
	clang-netbsd/Makefile
	classic-mac-font-pack/Makefile
	claws-mail-fancy/Makefile
	clearsans-ttf/Makefile
	clementine/Makefile
	clementine/PLIST
	clementine/options.mk
	clhep/Makefile
	cli-git/Makefile
	clisp-asdf/Makefile
	clockspeed/Makefile
	cloog/Makefile
	cluster-admin/PLIST.Linux
	clustershell/Makefile
	collectd-CGP/Makefile
	collectd-haproxy/Makefile
	collectd-redis/Makefile
	collectd-web/Makefile
	commandergenius/Makefile
	compiler-rt-netbsd/Makefile
	compiz-boxmenu/Makefile
	concorde/Makefile
	contact-lookup-applet/Makefile
	converttomp3/Makefile
	copytape/Makefile
	corefx-git/Makefile
	cortex-var/Makefile
	coturn/Makefile
	coturn/options.mk
	coxeter/Makefile
	cpdup/Makefile
	cpqarrayd/Makefile
	crawl-stone-soup/Makefile
	cronolog-devel/Makefile
	cross-binutils/Makefile
	crossguid/buildlink3.mk
	cryptcat/Makefile
	ctags-git/Makefile
	ctags-git/options.mk
	cubature/Makefile
	cufflinks-2.2.1/Makefile
	cufflinks/Makefile
	cursor-dmz-theme/PLIST
	cutecom/Makefile
	cvc3/Makefile
	cvs-syncmail/Makefile
	cvsproxy/Makefile
	cycle/Makefile

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

pkglint -Wall -F -o aligned c*/

The chezscheme Makefile had to be corrected manually.

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

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

diffstat:
 c-news/Makefile                    |   6 +-
 c-news/buildlink3.mk               |   4 +-
 cairo-dingbat-ttf/Makefile         |  12 ++--
 canna-dict/Makefile                |   2 +-
 canna-lib/buildlink3.mk            |   2 +-
 cardpeek/Makefile                  |  14 ++--
 cargo/Makefile                     |   8 +--
 cartago/Makefile                   |   4 +-
 casady-fonts/Makefile              |   8 +--
 cdbfasta/buildlink3.mk             |   2 +-
 cde/Makefile                       |   6 +-
 cdirip/Makefile                    |   2 +-
 cedet/Makefile                     |   8 +--
 cgal/Makefile                      |  10 +--
 cgterm/Makefile                    |  16 ++---
 check-update/Makefile              |  14 ++--
 cheese/Makefile                    |   4 +-
 cherokee/Makefile                  |  14 ++--
 cherokee/PLIST                     |   2 +-
 chezscheme/Makefile                |  20 +++---
 chezscheme/options.mk              |   4 +-
 choosefont/Makefile                |  10 +--
 choosefont/PLIST                   |  26 +++----
 chora/Makefile                     |   2 +-
 chromium/Makefile                  |   6 +-
 chromium/options.mk                |  14 ++--
 chruby/Makefile                    |   8 +--
 chruby/PLIST                       |   2 +-
 cinelerra-git/Makefile             |   2 +-
 cl-alexandria/Makefile             |  10 +--
 cl-alexandria/options.mk           |  12 ++--
 cl-anaphora/Makefile               |   8 +--
 cl-anaphora/options.mk             |  12 ++--
 cl-babel/Makefile                  |   8 +--
 cl-babel/options.mk                |  12 ++--
 cl-bordeaux-threads/Makefile       |   8 +--
 cl-bordeaux-threads/options.mk     |  12 ++--
 cl-cffi/Makefile                   |   8 +--
 cl-cffi/options.mk                 |  12 ++--
 cl-fad/Makefile                    |   8 +--
 cl-fad/options.mk                  |  12 ++--
 cl-flexi-streams/Makefile          |   8 +--
 cl-flexi-streams/options.mk        |  12 ++--
 cl-ppcre-unicode/Makefile          |   2 +-
 cl-ppcre-unicode/options.mk        |  12 ++--
 cl-ppcre/Makefile                  |   8 +--
 cl-ppcre/options.mk                |  12 ++--
 cl-split-sequence/Makefile         |  10 +--
 cl-split-sequence/options.mk       |  12 ++--
 cl-trivial-features/Makefile       |   8 +--
 cl-trivial-features/options.mk     |  12 ++--
 cl-trivial-gray-streams/Makefile   |   8 +--
 cl-trivial-gray-streams/options.mk |  12 ++--
 cl-unicode/Makefile                |   8 +--
 cl-unicode/options.mk              |  12 ++--
 cl-who/Makefile                    |   8 +--
 cl-who/options.mk                  |  12 ++--
 clang-git/Makefile                 |   2 +-
 clang-netbsd/Makefile              |   2 +-
 classic-mac-font-pack/Makefile     |  32 ++++-----
 claws-mail-fancy/Makefile          |   4 +-
 clearsans-ttf/Makefile             |   8 +--
 clementine/Makefile                |   2 +-
 clementine/PLIST                   |  14 ++--
 clementine/options.mk              |   6 +-
 clhep/Makefile                     |   6 +-
 cli-git/Makefile                   |   2 +-
 clisp-asdf/Makefile                |   6 +-
 clockspeed/Makefile                |   8 +--
 cloog/Makefile                     |   2 +-
 cluster-admin/PLIST.Linux          |   6 +-
 clustershell/Makefile              |   2 +-
 collectd-CGP/Makefile              |  10 +--
 collectd-haproxy/Makefile          |   2 +-
 collectd-redis/Makefile            |   6 +-
 collectd-web/Makefile              |  34 +++++-----
 commandergenius/Makefile           |   2 +-
 compiler-rt-netbsd/Makefile        |   4 +-
 compiz-boxmenu/Makefile            |   2 +-
 concorde/Makefile                  |   4 +-
 contact-lookup-applet/Makefile     |  18 ++---
 converttomp3/Makefile              |   2 +-
 copytape/Makefile                  |   2 +-
 corefx-git/Makefile                |   2 +-
 cortex-var/Makefile                |   2 +-
 coturn/Makefile                    |   8 +--
 coturn/options.mk                  |   2 +-
 coxeter/Makefile                   |   4 +-
 cpdup/Makefile                     |   4 +-
 cpqarrayd/Makefile                 |   2 +-
 crawl-stone-soup/Makefile          |   8 +--
 cronolog-devel/Makefile            |   6 +-
 cross-binutils/Makefile            |   2 +-
 crossguid/buildlink3.mk            |   2 +-
 cryptcat/Makefile                  |   2 +-
 ctags-git/Makefile                 |  12 ++--
 ctags-git/options.mk               |   8 +--
 cubature/Makefile                  |   2 +-
 cufflinks-2.2.1/Makefile           |   4 +-
 cufflinks/Makefile                 |   6 +-
 cursor-dmz-theme/PLIST             | 136 ++++++++++++++++++-------------------
 cutecom/Makefile                   |   2 +-
 cvc3/Makefile                      |  10 +--
 cvs-syncmail/Makefile              |   2 +-
 cvsproxy/Makefile                  |   2 +-
 cycle/Makefile                     |   2 +-
 106 files changed, 466 insertions(+), 462 deletions(-)

diffs:
diff --git a/c-news/Makefile b/c-news/Makefile
index 37cd68cc5a..beeacac73a 100644
--- a/c-news/Makefile
+++ b/c-news/Makefile
@@ -47,9 +47,9 @@ PKG_SYSCONFDIR.c-news=	${CNEWSDATA}/etc
 EGDIR=		${PREFIX}/share/examples/c-news
 
 # Debugging aids
-CFLAGS+=	-Wall -Wno-error
-DBG=		-O -g3
-INSTALL_UNSTRIPPED = yes
+CFLAGS+=		-Wall -Wno-error
+DBG=			-O -g3
+INSTALL_UNSTRIPPED =	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/c-news/buildlink3.mk b/c-news/buildlink3.mk
index b9778a0f2c..7252de7d4f 100644
--- a/c-news/buildlink3.mk
+++ b/c-news/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	c-news-CR
 C_NEWS_CR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.c-news-CR+=	c-news-CR>=7
-BUILDLINK_DEPMETHOD.c-news-CR?=	build
-BUILDLINK_PKGSRCDIR.c-news-CR?=	../../wip/c-news
+BUILDLINK_DEPMETHOD.c-news-CR?=		build
+BUILDLINK_PKGSRCDIR.c-news-CR?=		../../wip/c-news
 .endif # C_NEWS_CR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-c-news-CR
diff --git a/cairo-dingbat-ttf/Makefile b/cairo-dingbat-ttf/Makefile
index d0b9fa9e02..73bdcc28b6 100644
--- a/cairo-dingbat-ttf/Makefile
+++ b/cairo-dingbat-ttf/Makefile
@@ -11,14 +11,14 @@ HOMEPAGE=	http://christtrekker.users.sourceforge.net/fnt/cairo.shtml
 COMMENT=	Outline version of old Macintosh font
 LICENSE=	cc-by-sa-v3.0
 
-WRKSRC=		${WRKDIR}/cairo
-TTFPATH=	lib/X11/fonts/TTF
+WRKSRC=			${WRKDIR}/cairo
+TTFPATH=		lib/X11/fonts/TTF
 FONTS_DIRS.ttf+=	${PREFIX}/${TTFPATH:Q}
-DOCPATH=	share/doc/cairo-dingbat-ttf	# why doesn't ${PKGBASE} work here?
-DOCDIR=		${PREFIX}/${DOCPATH}
+DOCPATH=		share/doc/cairo-dingbat-ttf	# why doesn't ${PKGBASE} work here?
+DOCDIR=			${PREFIX}/${DOCPATH}
 INSTALLATION_DIRS=	${TTFPATH:Q} ${DOCPATH:Q}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf:Q}
diff --git a/canna-dict/Makefile b/canna-dict/Makefile
index e1a208fd51..16c3221aed 100644
--- a/canna-dict/Makefile
+++ b/canna-dict/Makefile
@@ -70,7 +70,7 @@ REQD_DIRS_PERMS+=	${CANNA_DICTDIR} ${CANNA_USER} ${CANNA_GROUP} 0775
 .for d in fuzokugo.cbd bushu.cld dics.dir iroha.cbd iroha.cld \
 	chimei.ctd hojomwd.ctd hojoswd.ctd kanasmpl.ctd katakana.ctd \
 	keishiki.ctd necgaiji.ctd number.ctd software.ctd suffix.ctd
-SPECIAL_PERMS+=	${CANNA_DICTDIR}/${d} ${CANNA_USER} ${CANNA_GROUP} 0664
+SPECIAL_PERMS+=		${CANNA_DICTDIR}/${d} ${CANNA_USER} ${CANNA_GROUP} 0664
 .endfor
 
 .include "../../wip/canna-lib/buildlink3.mk"
diff --git a/canna-lib/buildlink3.mk b/canna-lib/buildlink3.mk
index 68cdd72e8b..88d3a394db 100644
--- a/canna-lib/buildlink3.mk
+++ b/canna-lib/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	Canna-lib
 CANNA_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.7pl3
-BUILDLINK_PKGSRCDIR.Canna-lib?=	../../wip/canna-lib
+BUILDLINK_PKGSRCDIR.Canna-lib?=		../../wip/canna-lib
 .endif # CANNA_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-Canna-lib
diff --git a/cardpeek/Makefile b/cardpeek/Makefile
index c5c19c5a8f..1a4cdc3a73 100644
--- a/cardpeek/Makefile
+++ b/cardpeek/Makefile
@@ -17,13 +17,13 @@ GNU_CONFIGURE=	YES
 
 .if ${OPSYS} == "Darwin"
 .if exists(/Developer/Applications/Xcode.app)
-SUBST_CLASSES+=	xcode
-SUBST_FILES.xcode=	configure
-SUBST_MESSAGE.xcode=	adapting Xcode install path
-SUBST_SED.xcode=	-e "s|/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform||g"
-SUBST_SED.xcode+=	-e "s|head -1|tail -1|g"
-SUBST_SED.xcode+=	-e "s|/Applications/Xcode.app/|/Developer/Applications/Xcode.app/|g"
-SUBST_STAGE.xcode=	post-patch
+SUBST_CLASSES+=			xcode
+SUBST_FILES.xcode=		configure
+SUBST_MESSAGE.xcode=		adapting Xcode install path
+SUBST_SED.xcode=		-e "s|/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform||g"
+SUBST_SED.xcode+=		-e "s|head -1|tail -1|g"
+SUBST_SED.xcode+=		-e "s|/Applications/Xcode.app/|/Developer/Applications/Xcode.app/|g"
+SUBST_STAGE.xcode=		post-patch
 BUILDLINK_PASSTHRU_DIRS+=	/Developer
 .endif
 .else
diff --git a/cargo/Makefile b/cargo/Makefile
index bb921880c2..f23d5e4e50 100644
--- a/cargo/Makefile
+++ b/cargo/Makefile
@@ -15,14 +15,14 @@ DIST_SUBDIR=	cargo
 
 # For crates download, Accept: header is required.
 # See: https://github.com/rust-lang/crates.io/issues/466
-FETCH_USING=	custom
-FETCH_CMD=	 ${TOOLS_PATH.curl}
+FETCH_USING=		custom
+FETCH_CMD=		${TOOLS_PATH.curl}
 FETCH_BEFORE_ARGS=	--fail --insecure --location --remote-time -H 'Accept:'
 FETCH_OUTPUT_ARGS=	-o
 FETCH_AFTER_ARGS=	-O
 
-CARGODIST=	cargo-0.17.0
-CARGODISTFILE=	cargo-0.17.0.tar.gz
+CARGODIST=		cargo-0.17.0
+CARGODISTFILE=		cargo-0.17.0.tar.gz
 SITES.${CARGODISTFILE}=	-https://github.com/rust-lang/cargo/archive/0.17.0.tar.gz
 CARGO_DISTFILES=	${CARGODISTFILE}
 
diff --git a/cartago/Makefile b/cartago/Makefile
index 89bfd8e425..1eb5661734 100644
--- a/cartago/Makefile
+++ b/cartago/Makefile
@@ -8,14 +8,14 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://alice.unibo.it/xwiki/bin/view/CARTAGO/
-COMMENT= Framework for programming and executing environments in multi-agent
+COMMENT=	Framework for programming and executing environments in multi-agent
 #LICENSE=	# TODO: (see mk/license.mk)
 
 USE_TOOLS+=	pax
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
 
 INSTALLATION_DIRS=	lib/java/cartago/lib share/doc/cartago
 
diff --git a/casady-fonts/Makefile b/casady-fonts/Makefile
index f8a77ec18b..6815a2d33f 100644
--- a/casady-fonts/Makefile
+++ b/casady-fonts/Makefile
@@ -15,12 +15,12 @@ HOMEPAGE=	http://www.moorstation.org/typoasis/designers/casady_greene/
 COMMENT=	TrueType fonts by Robin Casady
 LICENSE=	public-domain
 
-WRKSRC=		${WRKDIR}
-TTFPATH=	lib/X11/fonts/TTF
+WRKSRC=			${WRKDIR}
+TTFPATH=		lib/X11/fonts/TTF
 FONTS_DIRS.ttf+=	${PREFIX}/${TTFPATH:Q}
 INSTALLATION_DIRS=	${TTFPATH:Q}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf:Q}
diff --git a/cdbfasta/buildlink3.mk b/cdbfasta/buildlink3.mk
index b8dce7e9ed..bc87acc702 100644
--- a/cdbfasta/buildlink3.mk
+++ b/cdbfasta/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	cdbfasta
 CDBFASTA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cdbfasta+=	cdbfasta>=2010.07.22
-BUILDLINK_PKGSRCDIR.cdbfasta?=	../../wip/cdbfasta
+BUILDLINK_PKGSRCDIR.cdbfasta?=		../../wip/cdbfasta
 .endif	# CDBFASTA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-cdbfasta
diff --git a/cde/Makefile b/cde/Makefile
index 01d97693c2..d99c736fbe 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Common Desktop Environment
 LICENSE=	gnu-lgpl-v2
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=     bison bdftopcf mkfontdir ksh awk:run
+USE_TOOLS+=	bison bdftopcf mkfontdir ksh awk:run
 BUILD_TARGET=	World
 
 MAKE_JOBS_SAFE=	no
 
-DEPENDS+= ast-ksh-[0-9]*:../../shells/ast-ksh
+DEPENDS+=	ast-ksh-[0-9]*:../../shells/ast-ksh
 
 WRKSRC=	${WRKDIR}/${PKGNAME_NOREV}
 
@@ -52,7 +52,7 @@ OWN_DIRS+=		${PKG_SYSCONFDIR}/appconfig/${i}/${j}
 .endfor
 OWN_DIRS+=		${PKG_SYSCONFDIR}/config
 OWN_DIRS+=		${PKG_SYSCONFDIR}/config/Xsession.d
-BUILDLINK_PASSTHRU_DIRS+=${PREFIX}/dt/lib
+BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/dt/lib
 
 SUBST_CLASSES+=		destdir
 SUBST_STAGE.destdir=	pre-configure
diff --git a/cdirip/Makefile b/cdirip/Makefile
index 110c55cd27..83a776bd61 100644
--- a/cdirip/Makefile
+++ b/cdirip/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/jozip/cdirip/
 COMMENT=	Program for extracting tracks from a CDI (DiscJuggler) image
 LICENSE=	gnu-gpl-v2
 
-NO_CONFIGURE=	yes
+NO_CONFIGURE=		yes
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/cedet/Makefile b/cedet/Makefile
index d0506afe20..c6d802baa7 100644
--- a/cedet/Makefile
+++ b/cedet/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.9 2012/09/24 18:26:52 asau Exp $
 #
 
-DISTNAME=		cedet-1.0.1
-PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-CATEGORIES=		devel
+DISTNAME=	cedet-1.0.1
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
 MAINTAINER=		pho%cielonegro.org@localhost
@@ -18,7 +18,7 @@ MAKE_FLAGS+=		EMACS=${EMACS_BIN}
 EMACS_MODULES+=		base
 EMACS_BUILDLINK=	yes
 
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
+MESSAGE_SUBST+=	LISPDIR=${EMACS_LISPPREFIX}
 
 CEDET_DIRS= \
 	cogre \
diff --git a/cgal/Makefile b/cgal/Makefile
index 27c48b9983..ba7ad44861 100644
--- a/cgal/Makefile
+++ b/cgal/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.34 2017/08/24 20:03:00 adam Exp $
 
-PKGNAME=       cgal-4.11
-DISTNAME=       CGAL-4.11
-CATEGORIES=     wip
-MASTER_SITES=   https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11/
-EXTRACT_SUFX=   .tar.xz
+PKGNAME=	cgal-4.11
+DISTNAME=	CGAL-4.11
+CATEGORIES=	wip
+MASTER_SITES=	https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	reinoud%NetBSD.org@localhost
 HOMEPAGE=	http://www.cgal.org/
diff --git a/cgterm/Makefile b/cgterm/Makefile
index a636f5b0be..af1d8cb6c9 100644
--- a/cgterm/Makefile
+++ b/cgterm/Makefile
@@ -10,17 +10,17 @@ HOMEPAGE=	http://www.paradroid.net/cgterm/
 COMMENT=	Commodore Graphics Telnet Client
 #LICENSE=	# TODO: (see mk/license.mk)
 
-LICENSE=                2-clause-bsd
+LICENSE=		2-clause-bsd
 
-NO_CONFIGURE=   yes
+NO_CONFIGURE=	yes
 
-USE_TOOLS+=     gmake
+USE_TOOLS+=	gmake
 
-SUBST_CLASSES+= 		fix-paths
-SUBST_STAGE.fix-paths= 		post-patch
-SUBST_MESSAGE.fix-paths= 	Fixing absolute paths.
-SUBST_FILES.fix-paths= 		Makefile
-SUBST_SED.fix-paths= 		-e 's,/usr/local,${PREFIX},g'
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		post-patch
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		Makefile
+SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/check-update/Makefile b/check-update/Makefile
index 9c478b51f9..ca0d607cb9 100644
--- a/check-update/Makefile
+++ b/check-update/Makefile
@@ -9,21 +9,21 @@ HOMEPAGE=	https://github.com/makoto-fujiwara/check-update
 COMMENT=	Check pkgsrc trees for newer version
 LICENSE=	modified-bsd
 
-DEPENDS+=       httping-[0-9]*:../../net/httping
+DEPENDS+=	httping-[0-9]*:../../net/httping
 DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
 DEPENDS+=	curl-[0-9]*:../../www/curl
 DEPENDS+=	w3m-[0-9]*:../../www/w3m
-DEPENDS+=       p5-Algorithm-Diff-[0-9]*:../../devel/p5-Algorithm-Diff
+DEPENDS+=	p5-Algorithm-Diff-[0-9]*:../../devel/p5-Algorithm-Diff
 DEPENDS+=	ruby[0-9]*-base-[0-9]*:../../lang/${RUBY_PKGPREFIX}-base
 DEPENDS+=	p5-Algorithm-Diff-[0-9]*:../../devel/p5-Algorithm-Diff
 DEPENDS+=	p5-Mozilla-CA-[0-9]*:../../security/p5-Mozilla-CA
 
 USE_TOOLS+=	perl:run
-NO_BUILD=       YES
+NO_BUILD=	YES
 
-CHECK_UPDATE_DIR= share/check-update
+CHECK_UPDATE_DIR=	share/check-update
 WRKDIR_FOR_MAKE=	${VARBASE}/check-update
-EGDIR=		share/examples/check-update
+EGDIR=			share/examples/check-update
 
 CONF_FILES+=	${EGDIR}/Makefile	   	  ${WRKDIR_FOR_MAKE}/Makefile
 CONF_FILES+=	${EGDIR}/environment-sample.mk	  ${WRKDIR_FOR_MAKE}/environment.mk
@@ -33,8 +33,8 @@ CONF_FILES+=	${EGDIR}/cd-and-sh-sample         ${WRKDIR_FOR_MAKE}/cd-and-sh
 BUILD_DEFS+=	VARBASE
 
 # see INSTALL file also
-OWN_DIRS_PERMS+=${WRKDIR_FOR_MAKE}        ${SHAREOWN} ${SHAREGRP} 0755
-OWN_DIRS_PERMS+=${WRKDIR_FOR_MAKE}/htdocs ${SHAREOWN} ${SHAREGRP} 0755
+OWN_DIRS_PERMS+=	${WRKDIR_FOR_MAKE}        ${SHAREOWN} ${SHAREGRP} 0755
+OWN_DIRS_PERMS+=	${WRKDIR_FOR_MAKE}/htdocs ${SHAREOWN} ${SHAREGRP} 0755
 
 MAKE_FILES=	Makefile environment-sample.mk
 MAKE_SCRIPTS=	cd-and-sh-sample check-update-sample.sh
diff --git a/cheese/Makefile b/cheese/Makefile
index e81432c155..5a25f20c0a 100644
--- a/cheese/Makefile
+++ b/cheese/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	cheese-3.18.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cheese/3.18/}
-EXTRACT_SUFX=		.tar.xz
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.gnome.org/projects/cheese/
@@ -18,7 +18,7 @@ DEPENDS+=	gst-plugins1-vorbis-[0-9]*:../../audio/gst-plugins1-vorbis
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) || !empty(MACHINE_PLATFORM:MLinux)
-DEPENDS+= gst-plugins1-v4l2-[0-9]*:../../multimedia/gst-plugins1-v4l2
+DEPENDS+=	gst-plugins1-v4l2-[0-9]*:../../multimedia/gst-plugins1-v4l2
 .endif
 
 GNU_CONFIGURE=		yes
diff --git a/cherokee/Makefile b/cherokee/Makefile
index e404760184..885c5032d1 100644
--- a/cherokee/Makefile
+++ b/cherokee/Makefile
@@ -37,20 +37,20 @@ CONF_FILES+=		${EGDIR}/cherokee/cherokee.conf \
 
 RCD_SCRIPTS=		cherokee
 
-PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36 # not yet ported as of 1.2.101
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 1.2.101
 
 .include "options.mk"
 
 BUILD_DEFS+=		VARBASE
 
 # this needs to be done before pre-configure
-SUBST_CLASSES+= 	python
-SUBST_STAGE.python= 	post-patch
-SUBST_MESSAGE.python= 	Fixing Python references
-SUBST_FILES.python= 	po/admin/generate_POTFILESin.py
-SUBST_VARS.python= 	PYTHONBIN
+SUBST_CLASSES+=		python
+SUBST_STAGE.python=	post-patch
+SUBST_MESSAGE.python=	Fixing Python references
+SUBST_FILES.python=	po/admin/generate_POTFILESin.py
+SUBST_VARS.python=	PYTHONBIN
 
-REPLACE_PYTHON= 	admin/server.py \
+REPLACE_PYTHON=		admin/server.py \
 			cherokee/cherokee-admin-launcher \
 			cherokee/cherokee-tweak
 
diff --git a/cherokee/PLIST b/cherokee/PLIST
index aee35822a3..0819585988 100644
--- a/cherokee/PLIST
+++ b/cherokee/PLIST
@@ -78,6 +78,7 @@ lib/cherokee/libplugin_htdigest.la
 lib/cherokee/libplugin_htpasswd.la
 lib/cherokee/libplugin_ip_hash.la
 ${PLIST.ldap}lib/cherokee/libplugin_ldap.la
+${PLIST.ssl}lib/cherokee/libplugin_libssl.la
 lib/cherokee/libplugin_method.la
 ${PLIST.mysql}lib/cherokee/libplugin_mysql.la
 lib/cherokee/libplugin_ncsa.la
@@ -98,7 +99,6 @@ lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_secdownload.la
 lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_ssi.la
-${PLIST.ssl}lib/cherokee/libplugin_libssl.la
 ${PLIST.ffmpeg}lib/cherokee/libplugin_streaming.la
 lib/cherokee/libplugin_target_ip.la
 lib/cherokee/libplugin_tls.la
diff --git a/chezscheme/Makefile b/chezscheme/Makefile
index 9a8159b186..cbb79c2a55 100644
--- a/chezscheme/Makefile
+++ b/chezscheme/Makefile
@@ -6,16 +6,20 @@ PKGNAME=	${GITHUB_PROJECT:tl}-${VERSION}
 DISTNAME=	v${VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cisco/}
-GITHUB_TAG=     ${DISTNAME}
+GITHUB_TAG=	${DISTNAME}
 DIST_SUBDIR=	${GITHUB_PROJECT}
 DISTFILES=	ChezScheme-${VERSION}.tar.gz \
 		zlib-1.2.11.tar.gz \
 		nanopass-framework-scheme-1.9.tar.gz \
 		stex-1.2.1.tar.gz
-SITES.zlib-1.2.11.tar.gz= -https://github.com/madler/zlib/archive/v1.2.11.tar.gz
-SITES.ChezScheme-${VERSION}.tar.gz= -https://github.com/cisco/ChezScheme/archive/v${VERSION}.tar.gz
-SITES.nanopass-framework-scheme-1.9.tar.gz= -https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz
-SITES.stex-1.2.1.tar.gz= -https://github.com/dybvig/stex/archive/v1.2.1.tar.gz
+SITES.zlib-1.2.11.tar.gz= \
+		-https://github.com/madler/zlib/archive/v1.2.11.tar.gz
+SITES.ChezScheme-${VERSION}.tar.gz= \
+		-https://github.com/cisco/ChezScheme/archive/v${VERSION}.tar.gz
+SITES.nanopass-framework-scheme-1.9.tar.gz= \
+		-https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz
+SITES.stex-1.2.1.tar.gz= \
+		-https://github.com/dybvig/stex/archive/v1.2.1.tar.gz
 
 MAINTAINER=	root%zta.lk@localhost
 HOMEPAGE=	https://cisco.github.io/ChezScheme/
@@ -43,9 +47,9 @@ do-configure:
 ONLY_FOR_PLATFORM+=	Linux-*-x86_64 Darwin-*-x86_64
 ONLY_FOR_PLATFORM+=	Linux-*-i386 Darwin-*-i386
 .if ${OPSYS} == Linux
-PLIST_SUBST+=	OS=le
+PLIST_SUBST+=		OS=le
 .elif ${OPSYS} == Darwin
-PLIST_SUBST+=	OS=osx
+PLIST_SUBST+=		OS=osx
 .endif
 
 .if ${MACHINE_ARCH} == i386
@@ -55,7 +59,7 @@ PLIST_SUBST+=	M=a6
 .endif
 
 BUILD_TARGET=	build
-PLIST_SUBST+=   T=${THR}
+PLIST_SUBST+=	T=${THR}
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/chezscheme/options.mk b/chezscheme/options.mk
index cf25473def..da2e296e57 100644
--- a/chezscheme/options.mk
+++ b/chezscheme/options.mk
@@ -6,6 +6,6 @@ PKG_SUGGESTED_OPTIONS=	threads
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mthreads)
-CONFIGURE_ARGS+=--threads
-THR=t
+CONFIGURE_ARGS+= --threads
+THR=	t
 .endif
diff --git a/choosefont/Makefile b/choosefont/Makefile
index 6d78aa7cf7..ad27af92e8 100644
--- a/choosefont/Makefile
+++ b/choosefont/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Choosefont permit you to choose fonts out of a big amount of fonts
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
-DEPENDS+=		tk-Tix>=8.4.3:../../x11/tk-Tix
-USE_TOOLS+=		tclsh:run
-NO_BUILD=		yes
+DEPENDS+=	tk-Tix>=8.4.3:../../x11/tk-Tix
+USE_TOOLS+=	tclsh:run
+NO_BUILD=	yes
 
-INSTALLATION_DIRS=  bin lib/x11/choosefont lib/x11/choosefont/src lib/x11/choosefont/locale
-INSTALLATION_DIRS+= lib/x11/choosefont/src/output
+INSTALLATION_DIRS=	bin lib/x11/choosefont lib/x11/choosefont/src lib/x11/choosefont/locale
+INSTALLATION_DIRS+=	lib/x11/choosefont/src/output
 
 REPLACE_INTERPRETER+=	tclsh
 REPLACE.tclsh.old=	.*bash
diff --git a/choosefont/PLIST b/choosefont/PLIST
index 68e1b2968e..2032351084 100644
--- a/choosefont/PLIST
+++ b/choosefont/PLIST
@@ -1,19 +1,19 @@
 @comment $NetBSD: PLIST,v 1.1 2013/05/10 13:20:49 francksys Exp $
 bin/choosefont
+lib/x11/choosefont/CONTACT
+lib/x11/choosefont/COPYING
+lib/x11/choosefont/Changes
+lib/x11/choosefont/INSTALL
+lib/x11/choosefont/Makefile
+lib/x11/choosefont/Readme
+lib/x11/choosefont/TODO
+lib/x11/choosefont/choosefont.tcl
+lib/x11/choosefont/locale/en_US.tcl
+lib/x11/choosefont/locale/nl_NL.tcl
 lib/x11/choosefont/src/config.tcl
 lib/x11/choosefont/src/font.tcl
-lib/x11/choosefont/src/output/X.tcl
-lib/x11/choosefont/src/output/HTML.tcl
+lib/x11/choosefont/src/fontdialog.tcl
 lib/x11/choosefont/src/output/CSS.tcl
+lib/x11/choosefont/src/output/HTML.tcl
+lib/x11/choosefont/src/output/X.tcl
 lib/x11/choosefont/src/output/name.tcl
-lib/x11/choosefont/src/fontdialog.tcl
-lib/x11/choosefont/Makefile
-lib/x11/choosefont/TODO
-lib/x11/choosefont/locale/nl_NL.tcl
-lib/x11/choosefont/locale/en_US.tcl
-lib/x11/choosefont/INSTALL
-lib/x11/choosefont/choosefont.tcl
-lib/x11/choosefont/Readme
-lib/x11/choosefont/Changes
-lib/x11/choosefont/CONTACT
-lib/x11/choosefont/COPYING
diff --git a/chora/Makefile b/chora/Makefile
index 105dced8dd..958624d67b 100644
--- a/chora/Makefile
+++ b/chora/Makefile
@@ -17,7 +17,7 @@ DEPENDS+=	horde>=2.2.4:../../www/horde
 USE_LANGUAGES=	# empty
 NO_BUILD=	YES
 
-CHORADIR=	${PREFIX}/share/chora
+CHORADIR=		${PREFIX}/share/chora
 INSTALLATION_DIRS+=	${CHORADIR}/config ${CHORADIR}/docs ${CHORADIR}/js/src
 INSTALLATION_DIRS+=	${CHORADIR}/lib/Block
 INSTALLATION_DIRS+=	${CHORADIR}/locale/cs_CZ/LC_MESSAGES
diff --git a/chromium/Makefile b/chromium/Makefile
index 2fa0a20e15..39dbeedaff 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE=	http://www.chromium.org/Home
 COMMENT=	Chromium web browser
 LICENSE=	modified-bsd AND gnu-lgpl-v3 AND mpl-2.0
 
-USE_TOOLS+=	bash bison flex:pkgsrc gmake pax perl pkg-config
-TOOLS_PLATFORM.flex=   # override the platform definition to use pkgsrc's flex.
-USE_LANGUAGES=	c c++
+USE_TOOLS+=		bash bison flex:pkgsrc gmake pax perl pkg-config
+TOOLS_PLATFORM.flex=	# override the platform definition to use pkgsrc's flex.
+USE_LANGUAGES=		c c++
 
 BUILD_DEPENDS+=	gperf>=3.0.1:../../devel/gperf
 BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
diff --git a/chromium/options.mk b/chromium/options.mk
index ef4929e54c..da98cebbe6 100644
--- a/chromium/options.mk
+++ b/chromium/options.mk
@@ -19,15 +19,15 @@ GN_ARGS+=	use_pulseaudio=true
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-BUILDTYPE=	Debug
-GN_ARGS+=	is_debug=true
+BUILDTYPE=		Debug
+GN_ARGS+=		is_debug=true
 # Dynamic link build causes link errors in pkgsrc.
-GN_ARGS+=	is_component_build=false
+GN_ARGS+=		is_component_build=false
 GN_BOOTSTRAP_FLAGS+=	--debug
 #GN_VERBOSE=    -v
 .else
-BUILDTYPE=	Release
-GN_ARGS+=	is_debug=false \
-		symbol_level=0 \
-		remove_webcore_debug_symbols=true
+BUILDTYPE=		Release
+GN_ARGS+=		is_debug=false \
+			symbol_level=0 \
+			remove_webcore_debug_symbols=true
 .endif
diff --git a/chruby/Makefile b/chruby/Makefile
index 78f277cebd..b3946152cf 100644
--- a/chruby/Makefile
+++ b/chruby/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/11/08 14:02:18 steven43126 Exp $
 
 DISTNAME=	chruby-0.3.8
-PKGREVISION= 1
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	-https://github.com/postmodern/chruby/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
@@ -10,8 +10,8 @@ HOMEPAGE=	https://github.com/postmodern/chruby/
 COMMENT=	CLI tool which allows you to manage/use multiple Ruby environments
 LICENSE=	mit
 
-NO_BUILD=       yes
-REPLACE_BASH=   bin/chruby-exec
-USE_TOOLS+=     bash:run
+NO_BUILD=	yes
+REPLACE_BASH=	bin/chruby-exec
+USE_TOOLS+=	bash:run
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chruby/PLIST b/chruby/PLIST
index eb7122c518..ce60893fca 100644
--- a/chruby/PLIST
+++ b/chruby/PLIST
@@ -2,7 +2,7 @@
 bin/chruby-exec
 share/chruby/auto.sh
 share/chruby/chruby.sh
-share/doc/chruby-0.3.8/ChangeLog.md
 share/doc/chruby-0.3.8/CONTRIBUTING.md
+share/doc/chruby-0.3.8/ChangeLog.md
 share/doc/chruby-0.3.8/LICENSE.txt
 share/doc/chruby-0.3.8/README.md
diff --git a/cinelerra-git/Makefile b/cinelerra-git/Makefile
index 27e6150ec2..583293b01f 100644
--- a/cinelerra-git/Makefile
+++ b/cinelerra-git/Makefile
@@ -34,7 +34,7 @@ post-patch:
 		./autogen.sh
 
 # We need 'xxd' in build time, which is in the vim-share package.
-BUILD_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
+BUILD_DEPENDS+=	vim-share-[0-9]*:../../editors/vim-share
 
 # cinelerra has some assembler source files.
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
diff --git a/cl-alexandria/Makefile b/cl-alexandria/Makefile
index f825dd44df..9f117daf8d 100644
--- a/cl-alexandria/Makefile
+++ b/cl-alexandria/Makefile
@@ -4,17 +4,17 @@
 SHORTNAME=	alexandria
 DISTNAME=	${SHORTNAME}-${VERSION}
 VERSION=	20120615
-PKGNAME=        ${LISP_PREFIX}-${SHORTNAME}-${VERSION}
+PKGNAME=	${LISP_PREFIX}-${SHORTNAME}-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kozachuk.info/netbsd/contrib/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://common-lisp.net/project/alexandria/
-COMMENT=        Alexandria is a collection utilities for Common Lisp
-LICENSE=        public-domain
+COMMENT=	Alexandria is a collection utilities for Common Lisp
+LICENSE=	public-domain
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
-COMMON_LISP_EXTRAFILES= alexandria.html
+COMMON_LISP_EXTRAFILES=	alexandria.html
 COMMON_LISP_DOCFILES=	README AUTHORS LICENCE alexandria.html
 
 .include "options.mk"
diff --git a/cl-alexandria/options.mk b/cl-alexandria/options.mk
index ef1fa69582..225d6ed53b 100644
--- a/cl-alexandria/options.mk
+++ b/cl-alexandria/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:09 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-anaphora/Makefile b/cl-anaphora/Makefile
index 525b387939..78ef5479b2 100644
--- a/cl-anaphora/Makefile
+++ b/cl-anaphora/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.3 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        0.9.4
+VERSION=	0.9.4
 SHORTNAME=	anaphora
 DISTNAME=	${SHORTNAME}-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/project/anaphora/files/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://common-lisp.net/project/anaphora/
-COMMENT=        Anaphora is the anaphoric macro collection
-LICENSE=        public-domain
+COMMENT=	Anaphora is the anaphoric macro collection
+LICENSE=	public-domain
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 COMMON_LISP_DOCFILES=	LICENSE
diff --git a/cl-anaphora/options.mk b/cl-anaphora/options.mk
index e4d0fdcf9a..c2fcfe5cb5 100644
--- a/cl-anaphora/options.mk
+++ b/cl-anaphora/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.3 2011/11/28 09:05:41 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-babel/Makefile b/cl-babel/Makefile
index 20bf4c747c..40640584c6 100644
--- a/cl-babel/Makefile
+++ b/cl-babel/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        0.3.0
+VERSION=	0.3.0
 SHORTNAME=	babel
 DISTNAME=	${SHORTNAME}_${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/project/babel/releases/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://www.cliki.net/Babel
-COMMENT=        Babel is a character encoding/decoding library for Common Lisp
-LICENSE=        public-domain
+COMMENT=	Babel is a character encoding/decoding library for Common Lisp
+LICENSE=	public-domain
 DEPENDS+=	${LISP_PREFIX}-alexandria-*:../../wip/cl-alexandria
 DEPENDS+=	${LISP_PREFIX}-trivial-features-*:../../wip/cl-trivial-features
 DEPENDS+=	${LISP_PREFIX}-trivial-gray-streams-*:../../wip/cl-trivial-gray-streams
diff --git a/cl-babel/options.mk b/cl-babel/options.mk
index ca19f5e2c1..aa276f48b4 100644
--- a/cl-babel/options.mk
+++ b/cl-babel/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:11 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-bordeaux-threads/Makefile b/cl-bordeaux-threads/Makefile
index cbf815cdc9..9b74155ff2 100644
--- a/cl-bordeaux-threads/Makefile
+++ b/cl-bordeaux-threads/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.7 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        0.8.2
+VERSION=	0.8.2
 SHORTNAME=	bordeaux-threads
 DISTNAME=	${SHORTNAME}-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/project/bordeaux-threads/releases/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://common-lisp.net/project/bordeaux-threads/
-COMMENT=        Portable shared-state concurrency for Common Lisp
-LICENSE=        public-domain
+COMMENT=	Portable shared-state concurrency for Common Lisp
+LICENSE=	public-domain
 DEPENDS+=	${LISP_PREFIX}-alexandria-[0-9]*:../../wip/cl-alexandria
 
 WRKSRC=			${WRKDIR}/${SHORTNAME}-${VERSION}
diff --git a/cl-bordeaux-threads/options.mk b/cl-bordeaux-threads/options.mk
index ca19f5e2c1..aa276f48b4 100644
--- a/cl-bordeaux-threads/options.mk
+++ b/cl-bordeaux-threads/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:11 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-cffi/Makefile b/cl-cffi/Makefile
index f714d6cab3..a05e443111 100644
--- a/cl-cffi/Makefile
+++ b/cl-cffi/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.7 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        0.10.7.1
+VERSION=	0.10.7.1
 SHORTNAME=	cffi
 DISTNAME=	${SHORTNAME}_${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/project/cffi/releases/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://common-lisp.net/project/cffi/
-COMMENT=        The Common Foreign Function Interface for Common Lisp
-LICENSE=        public-domain
+COMMENT=	The Common Foreign Function Interface for Common Lisp
+LICENSE=	public-domain
 DEPENDS+=	${LISP_PREFIX}-trivial-features-[0-9]*:../../wip/cl-trivial-features
 DEPENDS+=	${LISP_PREFIX}-alexandria-[0-9]*:../../wip/cl-alexandria
 DEPENDS+=	${LISP_PREFIX}-babel-[0-9]*:../../wip/cl-babel
diff --git a/cl-cffi/options.mk b/cl-cffi/options.mk
index d2c2ae3d6f..d06469fbf4 100644
--- a/cl-cffi/options.mk
+++ b/cl-cffi/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:12 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-fad/Makefile b/cl-fad/Makefile
index 316f8a52a1..68137f55b4 100644
--- a/cl-fad/Makefile
+++ b/cl-fad/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        0.6.4
+VERSION=	0.6.4
 SHORTNAME=	cl-fad
 DISTNAME=	${SHORTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://weitz.de/files/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://weitz.de/cl-fad/
-COMMENT=        CL-FAD is a thin layer atop Common Lisp standard pathname functions
-LICENSE=        modified-bsd
+COMMENT=	CL-FAD is a thin layer atop Common Lisp standard pathname functions
+LICENSE=	modified-bsd
 
 WRKSRC=			${WRKDIR}/${DISTNAME}-${VERSION}
 COMMON_LISP_DOCFILES=	README CHANGELOG doc/index.html
diff --git a/cl-fad/options.mk b/cl-fad/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-fad/options.mk
+++ b/cl-fad/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-flexi-streams/Makefile b/cl-flexi-streams/Makefile
index 9dd4f26542..fa81f20f66 100644
--- a/cl-flexi-streams/Makefile
+++ b/cl-flexi-streams/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.5 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        1.0.7
+VERSION=	1.0.7
 SHORTNAME=	flexi-streams
 DISTNAME=	${SHORTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://weitz.de/files/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://weitz.de/flexi-streams/
-COMMENT=        FLEXI-STREAMS - Flexible bivalent streams for Common Lisp
-LICENSE=        modified-bsd
+COMMENT=	FLEXI-STREAMS - Flexible bivalent streams for Common Lisp
+LICENSE=	modified-bsd
 DEPENDS+=	${LISP_PREFIX}-trivial-gray-streams-[0-9]*:../../wip/cl-trivial-gray-streams
 
 WRKSRC=			${WRKDIR}/${DISTNAME}-${VERSION}
diff --git a/cl-flexi-streams/options.mk b/cl-flexi-streams/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-flexi-streams/options.mk
+++ b/cl-flexi-streams/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-ppcre-unicode/Makefile b/cl-ppcre-unicode/Makefile
index 2ba9c1b9f0..3a59e51a97 100644
--- a/cl-ppcre-unicode/Makefile
+++ b/cl-ppcre-unicode/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	-http://weitz.de/files/cl-ppcre.tar.gz
 MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://weitz.de/cl-ppcre
 COMMENT=	CL-PPCRE-UNICODE is the CL-PPCRE package with Unicode support
-LICENSE= 	modified-bsd
+LICENSE=	modified-bsd
 
 WRKSRC=			${WRKDIR}/${DISTNAME}-${VERSION}
 
diff --git a/cl-ppcre-unicode/options.mk b/cl-ppcre-unicode/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-ppcre-unicode/options.mk
+++ b/cl-ppcre-unicode/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-ppcre/Makefile b/cl-ppcre/Makefile
index 2be858f9e6..da679703ef 100644
--- a/cl-ppcre/Makefile
+++ b/cl-ppcre/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.5 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        2.0.11
+VERSION=	2.0.11
 SHORTNAME=	cl-ppcre
 DISTNAME=	${SHORTNAME}-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	-http://weitz.de/files/cl-ppcre.tar.gz
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://weitz.de/cl-ppcre/
-COMMENT=        CL-PPCRE is a portable regular expression library for Common Lisp
-LICENSE=        modified-bsd
+COMMENT=	CL-PPCRE is a portable regular expression library for Common Lisp
+LICENSE=	modified-bsd
 
 COMMON_LISP_DOCFILES=	CHANGELOG doc/index.html
 
diff --git a/cl-ppcre/options.mk b/cl-ppcre/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-ppcre/options.mk
+++ b/cl-ppcre/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-split-sequence/Makefile b/cl-split-sequence/Makefile
index 607b2da323..c751255b6b 100644
--- a/cl-split-sequence/Makefile
+++ b/cl-split-sequence/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        1.0
+VERSION=	1.0
 SHORTNAME=	split-sequence
 DISTNAME=	${SHORTNAME}-${VERSION}
 CATEGORIES=	devel
-MASTER_SITES= 	http://common-lisp.net/~sionescu/files/
+MASTER_SITES=	http://common-lisp.net/~sionescu/files/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://www.cliki.net/SPLIT-SEQUENCE
-COMMENT=        Common Lisp utility to split sequences
-LICENSE=        public-domain
+COMMENT=	Common Lisp utility to split sequences
+LICENSE=	public-domain
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
diff --git a/cl-split-sequence/options.mk b/cl-split-sequence/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-split-sequence/options.mk
+++ b/cl-split-sequence/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-trivial-features/Makefile b/cl-trivial-features/Makefile
index 525001f6c8..7cb6aa5284 100644
--- a/cl-trivial-features/Makefile
+++ b/cl-trivial-features/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        0.6
+VERSION=	0.6
 SHORTNAME=	trivial-features
 DISTNAME=	${SHORTNAME}_${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/~loliveira/tarballs/trivial-features/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://www.cliki.net/trivial-features
-COMMENT=        Trivial-features ensures consistent *FEATURES* in Common Lisp
-LICENSE=        mit
+COMMENT=	Trivial-features ensures consistent *FEATURES* in Common Lisp
+LICENSE=	mit
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 COMMON_LISP_DOCFILES=	README COPYRIGHT
diff --git a/cl-trivial-features/options.mk b/cl-trivial-features/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-trivial-features/options.mk
+++ b/cl-trivial-features/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-trivial-gray-streams/Makefile b/cl-trivial-gray-streams/Makefile
index 9afd21cc46..4ffac2ac75 100644
--- a/cl-trivial-gray-streams/Makefile
+++ b/cl-trivial-gray-streams/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 18:26:53 asau Exp $
 #
 
-VERSION=        2008.11.02
+VERSION=	2008.11.02
 SHORTNAME=	trivial-gray-streams
 DISTNAME=	${SHORTNAME}-${VERSION:S/./-/g}
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/project/cl-plus-ssl/download/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://www.cliki.net/trivial-gray-streams
-COMMENT=        Trivial-gray-streams is a compatibility layer for Gray streams
-LICENSE=        mit
+COMMENT=	Trivial-gray-streams is a compatibility layer for Gray streams
+LICENSE=	mit
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 COMMON_LISP_DOCFILES=	README COPYING
diff --git a/cl-trivial-gray-streams/options.mk b/cl-trivial-gray-streams/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-trivial-gray-streams/options.mk
+++ b/cl-trivial-gray-streams/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-unicode/Makefile b/cl-unicode/Makefile
index 7fd3ecedcd..d897712cfe 100644
--- a/cl-unicode/Makefile
+++ b/cl-unicode/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.6 2012/09/24 18:26:54 asau Exp $
 #
 
-VERSION=        0.1.2
+VERSION=	0.1.2
 SHORTNAME=	cl-unicode
 DISTNAME=	${SHORTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://weitz.de/files/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://weitz.de/cl-fad/
-COMMENT=        CL-UNICODE - A portable Unicode library for Common Lisp
-LICENSE=        modified-bsd
+COMMENT=	CL-UNICODE - A portable Unicode library for Common Lisp
+LICENSE=	modified-bsd
 DEPENDS+=	${LISP_PREFIX}-ppcre-[0-9]*:../../wip/cl-ppcre
 DEPENDS+=	${LISP_PREFIX}-flexi-streams-[0-9]*:../../wip/cl-flexi-streams
 
diff --git a/cl-unicode/options.mk b/cl-unicode/options.mk
index b5751010d6..e695451e06 100644
--- a/cl-unicode/options.mk
+++ b/cl-unicode/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/29 09:25:13 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/cl-who/Makefile b/cl-who/Makefile
index e37019d787..93d27fd55c 100644
--- a/cl-who/Makefile
+++ b/cl-who/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 18:26:54 asau Exp $
 #
 
-VERSION=        0.11.1
+VERSION=	0.11.1
 SHORTNAME=	cl-who
 DISTNAME=	${SHORTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://weitz.de/files/
 
-MAINTAINER=     ddeus.pkgsrc%mailnull.com@localhost
+MAINTAINER=	ddeus.pkgsrc%mailnull.com@localhost
 HOMEPAGE=	http://weitz.de/cl-who/
-COMMENT=        CL-WHO - Yet another Lisp markup language
-LICENSE=        modified-bsd
+COMMENT=	CL-WHO - Yet another Lisp markup language
+LICENSE=	modified-bsd
 
 WRKSRC=			${WRKDIR}/${DISTNAME}-${VERSION}
 COMMON_LISP_DOCFILES=	CHANGELOG doc/index.html
diff --git a/cl-who/options.mk b/cl-who/options.mk
index b05b7990b9..4e8c2b5675 100644
--- a/cl-who/options.mk
+++ b/cl-who/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2011/11/27 22:35:46 ddeus Exp $
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
-PKG_OPTIONS_REQUIRED_GROUPS=    lisp
-PKG_OPTIONS_GROUP.lisp=         ecl sbcl clisp
-PKG_SUGGESTED_OPTIONS+=         ecl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cl-${SHORTNAME:S/^cl-//}
+PKG_OPTIONS_REQUIRED_GROUPS=	lisp
+PKG_OPTIONS_GROUP.lisp=		ecl sbcl clisp
+PKG_SUGGESTED_OPTIONS+=		ecl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                    ${PKG_OPTIONS_GROUP.lisp}
+PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
 .for opt in ${PKG_OPTIONS_GROUP.lisp}
 .  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=                   yes
+PLIST.${opt}=			yes
 COMMON_LISP_SYSTEM:=		${opt}
 .  endif
 .endfor
diff --git a/clang-git/Makefile b/clang-git/Makefile
index 78debd06ce..81533bf7d3 100644
--- a/clang-git/Makefile
+++ b/clang-git/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	clang-5.0.0
+PKGNAME=		clang-5.0.0
 PYTHON_FOR_BUILD_ONLY=	yes
 
 CMAKE_ARGS+=	-DCLANG_ENABLE_STATIC_ANALYZER=OFF
diff --git a/clang-netbsd/Makefile b/clang-netbsd/Makefile
index 62584aa98f..3205394c2f 100644
--- a/clang-netbsd/Makefile
+++ b/clang-netbsd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	clang-6.0.0
+PKGNAME=		clang-6.0.0
 PYTHON_FOR_BUILD_ONLY=	yes
 
 CMAKE_ARGS+=	-DCLANG_ENABLE_STATIC_ANALYZER=OFF
diff --git a/classic-mac-font-pack/Makefile b/classic-mac-font-pack/Makefile
index 53498e0bbe..973cc2588b 100644
--- a/classic-mac-font-pack/Makefile
+++ b/classic-mac-font-pack/Makefile
@@ -9,16 +9,16 @@ CATEGORIES=	fonts
 
 #DISTFILES+=	alexandria.zip
 # File is invalid?
-DISTFILES+=	Chicago.zip
-SITES.Chicago.zip=	http://moorstation.org/typoasis/designers/casady_greene/
-DISTFILES+=	Geneva_TTF.zip
-SITES.Geneva_TTF.zip=	http://www.masterstech-home.com/The_Library/Font_Samples/Font_Sample_Files/PC/G/
-DISTFILES+=	London.ttf.gz
-SITES.London.ttf.gz=	http://68kmla.org/wiki/uploads/4/4a/
-DISTFILES+=	CityOfAngelsTTF.zip
+DISTFILES+=			Chicago.zip
+SITES.Chicago.zip=		http://moorstation.org/typoasis/designers/casady_greene/
+DISTFILES+=			Geneva_TTF.zip
+SITES.Geneva_TTF.zip=		http://www.masterstech-home.com/The_Library/Font_Samples/Font_Sample_Files/PC/G/
+DISTFILES+=			London.ttf.gz
+SITES.London.ttf.gz=		http://68kmla.org/wiki/uploads/4/4a/
+DISTFILES+=			CityOfAngelsTTF.zip
 SITES.CityOfAngelsTTF.zip=	http://68kmla.org/wiki/uploads/0/0a/
-DISTFILES+=	MONACO.TTF
-SITES.MONACO.TTF=	http://www.webdevkungfu.com/files/
+DISTFILES+=			MONACO.TTF
+SITES.MONACO.TTF=		http://www.webdevkungfu.com/files/
 # Cf. http://www.gringod.com/wp-upload/software/Fonts/Monaco_5.1.ttf
 # Cf. http://www.gringod.com/wp-upload/software/Fonts/Monaco_Linux.ttf
 # This binhex file yields a StuffIt archive, which there is no practical way
@@ -29,15 +29,15 @@ SITES.MONACO.TTF=	http://www.webdevkungfu.com/files/
 #DISTFILES+=	Fernando%20Regular%20(2).ttf
 #SITES.Fernando%20Regular%20(2).ttf=	http://ufonts.com/bin/
 # Brampton is not yet complete.
-DISTFILES+=	Brampton.tgz
-SITES.Brampton.tgz=	http://christtrekker.users.sourceforge.net/fnt/
+DISTFILES+=			Brampton.tgz
+SITES.Brampton.tgz=		http://christtrekker.users.sourceforge.net/fnt/
 #DISTFILES+=	genoa.zip
 
 # This next one has Apple Garamond.
 # I don't think it is freely distributable though.
 #DISTFILES+=	macfonts.tar.gz
 #SITES.macfonts.tar.gz=	http://ubuntu-debs.googlecode.com/files/
-DISTFILES+=	virtue.zip
+DISTFILES+=		virtue.zip
 SITES.virtue.zip=	http://www.scootergraphics.com/virtue/
 #DISTFILES+=	Mottek.zip
 #SITES.Mottek.zip=	http://www.searchfreefonts.com/assets/downloads/
@@ -51,12 +51,12 @@ RESTRICTED=	Various.
 DEPENDS+=	cairo-dingbat-ttf-[0-9]*:../../wip/cairo-dingbat-ttf
 DEPENDS+=	urbanrenewal-ttf-[0-9]*:../../fonts/urbanrenewal-ttf
 
-WRKSRC=		${WRKDIR}
-TTFPATH=	lib/X11/fonts/TTF
+WRKSRC=			${WRKDIR}
+TTFPATH=		lib/X11/fonts/TTF
 FONTS_DIRS.ttf+=	${PREFIX}/${TTFPATH}
 INSTALLATION_DIRS=	${TTFPATH}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
 
 # OPTIONS
 PKG_OPTIONS_VAR=	PKG_OPTIONS.classic-mac-font-pack
diff --git a/claws-mail-fancy/Makefile b/claws-mail-fancy/Makefile
index 2390e489b7..609bd9c0ec 100644
--- a/claws-mail-fancy/Makefile
+++ b/claws-mail-fancy/Makefile
@@ -7,8 +7,8 @@ PLUGIN_NAME=    fancy
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 COMMENT=	Renders HTML e-mail using the WebKit library
 
-CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
-CONFIGURE_ARGS+= --disable-libravatar-plugin
+CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
+CONFIGURE_ARGS+=	--disable-libravatar-plugin
 
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
diff --git a/clearsans-ttf/Makefile b/clearsans-ttf/Makefile
index 357f00e82a..4e48fcb11f 100644
--- a/clearsans-ttf/Makefile
+++ b/clearsans-ttf/Makefile
@@ -12,13 +12,13 @@ HOMEPAGE=	https://01.org/clear-sans
 COMMENT=	Clear Sans TrueType font from Intel
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=  # none
+USE_LANGUAGES=	# none
 NO_BUILD=	yes
 
-FONTDIR=        ${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf= ${FONTDIR}
+FONTDIR=	${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=	${FONTDIR}
 
-INSTALLATION_DIRS=      ${FONTDIR} share/doc/clearsans-ttf
+INSTALLATION_DIRS=	${FONTDIR} share/doc/clearsans-ttf
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${DESTDIR}${FONTDIR}
diff --git a/clementine/Makefile b/clementine/Makefile
index 09d75fa496..b228e56bf1 100644
--- a/clementine/Makefile
+++ b/clementine/Makefile
@@ -23,7 +23,7 @@ CFLAGS+=	-Wno-inconsistent-missing-override \
 		-Wno-unused-variable \
 		-Wno-unused-function
 
-CMAKE_ARGS+= 	-DENABLE_SPOTIFY_BLOB=OFF \
+CMAKE_ARGS+=	-DENABLE_SPOTIFY_BLOB=OFF \
 		-DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \
 	     	-DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
 	     	-DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
diff --git a/clementine/PLIST b/clementine/PLIST
index 6a1ca1b9ab..ac9d10af34 100644
--- a/clementine/PLIST
+++ b/clementine/PLIST
@@ -3,13 +3,6 @@ bin/clementine
 bin/clementine-tagreader
 share/appdata/clementine.appdata.xml
 share/applications/clementine.desktop
-share/icons/hicolor/128x128/apps/clementine.png
-share/icons/hicolor/64x64/apps/clementine.png
-share/icons/hicolor/scalable/apps/clementine.svg
-share/kde4/services/clementine-feed.protocol
-share/kde4/services/clementine-itms.protocol
-share/kde4/services/clementine-itpc.protocol
-share/kde4/services/clementine-zune.protocol
 ${PLIST.visualisations}share/clementine/projectm-presets/Aderrasi - Agitator.milk
 ${PLIST.visualisations}share/clementine/projectm-presets/Aderrasi - Aimless (Gravity Directive Mix).milk
 ${PLIST.visualisations}share/clementine/projectm-presets/Aderrasi - Aimless (Spirogravity Mix).milk
@@ -581,3 +574,10 @@ ${PLIST.visualisations}share/clementine/projectm-presets/nil - Vortex of Vortice
 ${PLIST.visualisations}share/clementine/projectm-presets/project.tga
 ${PLIST.visualisations}share/clementine/projectm-presets/shifter - escape the worm - Eo.S. + Phat - Before_It_Eats_Your_Brain_Mix_v2.milk
 ${PLIST.visualisations}share/clementine/projectm-presets/shifter - escape the worm - Eo.S. + Phat 5362.milk
+share/icons/hicolor/128x128/apps/clementine.png
+share/icons/hicolor/64x64/apps/clementine.png
+share/icons/hicolor/scalable/apps/clementine.svg
+share/kde4/services/clementine-feed.protocol
+share/kde4/services/clementine-itms.protocol
+share/kde4/services/clementine-itpc.protocol
+share/kde4/services/clementine-zune.protocol
diff --git a/clementine/options.mk b/clementine/options.mk
index dffa121fe9..e1d9f0d4ed 100644
--- a/clementine/options.mk
+++ b/clementine/options.mk
@@ -96,10 +96,10 @@ CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
 ###
 
 .if !empty(PKG_OPTIONS:Mvisualisations)
-CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=ON
-PLIST.visualisations= yes
+CMAKE_ARGS+=		-DENABLE_VISUALISATIONS=ON
+PLIST.visualisations=	yes
 .else
-CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=OFF
+CMAKE_ARGS+=		-DENABLE_VISUALISATIONS=OFF
 .endif
 
 ###
diff --git a/clhep/Makefile b/clhep/Makefile
index 84f18d123b..3bd4bce276 100644
--- a/clhep/Makefile
+++ b/clhep/Makefile
@@ -15,9 +15,9 @@ TMPEXT_DIR=	${WRKDIR}/${PKGVERSION_NOREV}/CLHEP
 AUTOCONF_REQD=	2.59
 USE_TOOLS+=	aclocal autoconf automake gmake perl
 
-GNU_CONFIGURE=	yes
-CONFIGURE_SCRIPT= ${TMPEXT_DIR}/configure
-USE_LANGUAGES=	c c++
+GNU_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${TMPEXT_DIR}/configure
+USE_LANGUAGES=		c c++
 
 # Apply extra force to make it link on FreeBSD 6.3:
 LDFLAGS.FreeBSD=	-lc
diff --git a/cli-git/Makefile b/cli-git/Makefile
index 5b5ebed3b8..ee2b1afb48 100644
--- a/cli-git/Makefile
+++ b/cli-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2015/04/25 10:01:54 krytarowski Exp $
 
 GIT_REPOSITORIES=	cli
-GIT_REPO.cli=	https://github.com/dotnet/cli.git
+GIT_REPO.cli=		https://github.com/dotnet/cli.git
 
 DISTNAME=	cli
 PKGNAME=	cli-0.0.0
diff --git a/clisp-asdf/Makefile b/clisp-asdf/Makefile
index 1cd0404ae5..92295237c8 100644
--- a/clisp-asdf/Makefile
+++ b/clisp-asdf/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	asdf-2.018.19
 PKGNAME=	clisp-${DISTNAME}
-PKGREVISION=    1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kozachuk.info/netbsd/contrib/
 
@@ -16,7 +16,7 @@ DEPENDS+=	clisp>=2.49:../../lang/clisp
 USE_TOOLS+=	makeinfo
 INFO_FILES=	yes
 
-PKG_SYSCONFSUBDIR= clisp
+PKG_SYSCONFSUBDIR=	clisp
 
 INSTALLATION_DIRS= \
 		lib/clisp/dynmod \
@@ -30,7 +30,7 @@ CONF_FILES+=	share/examples/${PKGBASE}/source-registry.conf \
 CONF_FILES+=	share/examples/${PKGBASE}/asdf-output-translations.conf \
 		${PKG_SYSCONFDIR}/asdf-output-translations.conf
 
-CHECK_PORTABILITY_SKIP= bin/asdf-version bin/make-tarball
+CHECK_PORTABILITY_SKIP=	bin/asdf-version bin/make-tarball
 
 do-build:
 	( cd ${WRKSRC} && \
diff --git a/clockspeed/Makefile b/clockspeed/Makefile
index a3bec2bdc0..a21c8eb3e9 100644
--- a/clockspeed/Makefile
+++ b/clockspeed/Makefile
@@ -16,8 +16,8 @@ PKGDOCDIR=	${PREFIX}/share/doc/${PKGBASE}
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CLOCKSPEEDDIR=	${VARBASE}/${PKGBASE}
 
-DJB_RESTRICTED= NO
-DJB_CONFIG_PREFIX= ${CLOCKSPEEDDIR}
+DJB_RESTRICTED=		NO
+DJB_CONFIG_PREFIX=	${CLOCKSPEEDDIR}
 
 DOCS=		${WRKSRC}/BLURB ${WRKSRC}/CHANGES ${WRKSRC}/README \
 		${WRKSRC}/INSTALL ${WRKSRC}/TODO ${WRKSRC}/THANKS
@@ -26,8 +26,8 @@ USER_CMDS=	${CMDDIR}/clockview \
 SYS_CMDS=	${CMDDIR}/clockspeed ${CMDDIR}/clockadd
 CONF_FILES=	${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 
-INSTALLATION_DIRS= ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 \
-		${PKGMANDIR}/man8 ${EGDIR} bin sbin
+INSTALLATION_DIRS=	${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 \
+			${PKGMANDIR}/man8 ${EGDIR} bin sbin
 
 post-extract:
 	${CP} ${.CURDIR}/files/leapsecs.dat ${WRKSRC}
diff --git a/cloog/Makefile b/cloog/Makefile
index b62965bea4..7da209bd3a 100644
--- a/cloog/Makefile
+++ b/cloog/Makefile
@@ -10,7 +10,7 @@ COMMENT=	The CLooG Code Generator in the Polyhedral Model's Home
 LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL= yes
+USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++ fortran
 
diff --git a/cluster-admin/PLIST.Linux b/cluster-admin/PLIST.Linux
index db588a5c09..5139242090 100644
--- a/cluster-admin/PLIST.Linux
+++ b/cluster-admin/PLIST.Linux
@@ -65,8 +65,8 @@ sbin/cluster-sync-user
 sbin/cluster-sync-yum-packages
 sbin/cluster-update-backup-nodes
 sbin/cluster-update-io-nodes
-sbin/cluster-useradd
 sbin/cluster-user-admin
+sbin/cluster-useradd
 sbin/cluster-users
 sbin/compute-node-yum-packages
 sbin/enable-icmp-redirects
@@ -94,12 +94,12 @@ sbin/slurm-sync-backup-login
 sbin/slurm-sync-config
 sbin/slurm-update-idle-nodes
 sbin/slurm-usage-report
-sbin/ssh-keygen.csh
 sbin/ssh-keygen-for-user
+sbin/ssh-keygen.csh
 sbin/ssh-keygen.sh
 sbin/update-idle-nodes
 sbin/update-yum-pkgs
-share/cluster-admin/sys-update.sbatch
 share/cluster-admin/WWW/centos-power.jpg
 share/cluster-admin/WWW/global_styles.css
 share/cluster-admin/WWW/index.php
+share/cluster-admin/sys-update.sbatch
diff --git a/clustershell/Makefile b/clustershell/Makefile
index 691e1b8800..64cdfd8453 100644
--- a/clustershell/Makefile
+++ b/clustershell/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	wenheping%gmail.com@localhost
 HOMEPAGE=	http://clustershell.sourceforge.net/
 COMMENT=	Python library to execute commands on local or distant cluster nodes
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/collectd-CGP/Makefile b/collectd-CGP/Makefile
index 44767de9ca..206490d6da 100644
--- a/collectd-CGP/Makefile
+++ b/collectd-CGP/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
 DISTNAME=	collectd-cgp-1
-PKGNAME=        ${PHP_PKG_PREFIX}-${DISTNAME:S/-1//}
+PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/-1//}
 CATEGORIES=	www
 GITHUB_PROJECT=	CGP
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=pommi/}
-GITHUB_TAG=     v${DISTNAME:S/collectd-cgp-//}
-EXTRACT_SUFX=   .zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=pommi/}
+GITHUB_TAG=	v${DISTNAME:S/collectd-cgp-//}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/pommi/
@@ -19,7 +19,7 @@ USE_TOOLS+=	pax unzip
 AUTO_MKDIRS=	yes
 EXTRACT_ONLY=	# empty
 
-INSTALLATION_DIRS=      share/collectd-graph-panel
+INSTALLATION_DIRS=	share/collectd-graph-panel
 
 WRKSRC=		${WRKDIR}/CGP-1
 
diff --git a/collectd-haproxy/Makefile b/collectd-haproxy/Makefile
index 8cd4b2edb0..12a2546c24 100644
--- a/collectd-haproxy/Makefile
+++ b/collectd-haproxy/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE=	https://github.com/wglass/collectd-haproxy
 COMMENT=	Plugin for collectd to gather HAProxy metrics
 LICENSE=	mit
 
-DEPENDS+=       haproxy>=1.4:../../net/haproxy
+DEPENDS+=	haproxy>=1.4:../../net/haproxy
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 DEPENDS+=	${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
diff --git a/collectd-redis/Makefile b/collectd-redis/Makefile
index e15cd70c24..a4806d9da4 100644
--- a/collectd-redis/Makefile
+++ b/collectd-redis/Makefile
@@ -3,9 +3,9 @@
 COLLECTD_PACKAGE=	redis
 COLLECTD_PLUGINS=	redis
 
-USE_TOOLS+=     gmake
-USE_LIBTOOL=    yes
-MAKE_ENV+=      DESTDIR=${DESTDIR}
+USE_TOOLS+=	gmake
+USE_LIBTOOL=	yes
+MAKE_ENV+=	DESTDIR=${DESTDIR}
 
 COMMENT=		Statistics collection daemon - redis plugins
 
diff --git a/collectd-web/Makefile b/collectd-web/Makefile
index a7e2f3308e..dad8236837 100644
--- a/collectd-web/Makefile
+++ b/collectd-web/Makefile
@@ -3,32 +3,32 @@
 DISTNAME=	collectd-web-0.4.1
 CATEGORIES=	www
 GITHUB_PROJECT=	collectd-web
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=httpdss/}
-EXTRACT_SUFX=   .zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=httpdss/}
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/httpdss/
 COMMENT=	Web interface for Collectd	
-LICENSE=        gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
-NO_CONFIGURE=   yes
-NO_BUILD=       yes
-USE_TOOLS+=     pax unzip
-AUTO_MKDIRS=    yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+USE_TOOLS+=		pax unzip
+AUTO_MKDIRS=		yes
 #EXTRACT_ONLY=   # empty
-REPLACE_PERL+=  cgi-bin/*.pl
-REPLACE_PERL+=  cgi-bin/*.cgi
-INSTALLATION_DIRS=      share/collectd-web
+REPLACE_PERL+=		cgi-bin/*.pl
+REPLACE_PERL+=		cgi-bin/*.cgi
+INSTALLATION_DIRS=	share/collectd-web
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_LANGUAGES=	# none
 
-DEPENDS+=       fcgiwrap>=1.1.0:../../www/fcgiwrap
-DEPENDS+=       spawn-fcgi>=1.6.3:../../www/spawn-fcgi
-DEPENDS+=       p5-HTTP-Parser>=0.06:../../www/p5-HTTP-Parser
-DEPENDS+=       p5-JSON>=2.94:../../converters/p5-JSON
-DEPENDS+=       p5-RRD-Simple>=1.44:../../databases/p5-RRD-Simple
-DEPENDS+=       p5-CGI>=4.36:../../www/p5-CGI
+DEPENDS+=	fcgiwrap>=1.1.0:../../www/fcgiwrap
+DEPENDS+=	spawn-fcgi>=1.6.3:../../www/spawn-fcgi
+DEPENDS+=	p5-HTTP-Parser>=0.06:../../www/p5-HTTP-Parser
+DEPENDS+=	p5-JSON>=2.94:../../converters/p5-JSON
+DEPENDS+=	p5-RRD-Simple>=1.44:../../databases/p5-RRD-Simple
+DEPENDS+=	p5-CGI>=4.36:../../www/p5-CGI
 #DEPENDS+=       cgic>=2.02:../../www/cgic
 #DEPENDS+=       fcgi>=2.4.0:../../www/fcgi
 
diff --git a/commandergenius/Makefile b/commandergenius/Makefile
index 0beab694b0..8fbf1f8e53 100644
--- a/commandergenius/Makefile
+++ b/commandergenius/Makefile
@@ -10,7 +10,7 @@ GITHUB_TAG=	v200Release
 DISTFILES=	${DEFAULT_DISTFILES} GsKit-${GSKIT_VER}.tar.gz
 GSKIT_VER=	f925d1362f0bc99598141a97d5a200d5e6a41391
 SITES.GsKit-${GSKIT_VER}.tar.gz= \
--https://github.com/gerstrong/GsKit/archive/${GSKIT_VER}.tar.gz
+		-https://github.com/gerstrong/GsKit/archive/${GSKIT_VER}.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clonekeenplus.sourceforge.net/
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index c394375bcf..3581243caa 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -3,8 +3,8 @@
 PKGNAME=	compiler-rt-6.0.0
 CATEGORIES=	lang devel
 
-SVN_REPOSITORIES=	compiler-rt
-SVN_REPO.compiler-rt=	http://llvm.org/svn/llvm-project/compiler-rt/trunk
+SVN_REPOSITORIES=		compiler-rt
+SVN_REPO.compiler-rt=		http://llvm.org/svn/llvm-project/compiler-rt/trunk
 SVN_REVISION.compiler-rt=	323273
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/compiz-boxmenu/Makefile b/compiz-boxmenu/Makefile
index 072d9332a2..314676be8a 100644
--- a/compiz-boxmenu/Makefile
+++ b/compiz-boxmenu/Makefile
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_LANGUAGES+=	c
 USE_TOOLS+=	gmake m4 pkg-config
 
-PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 EGDIR=			share/examples/xdg/compiz/boxmenu
 INSTALLATION_DIRS+=	${EGDIR}
diff --git a/concorde/Makefile b/concorde/Makefile
index 8b0d1d6819..e06e773569 100644
--- a/concorde/Makefile
+++ b/concorde/Makefile
@@ -15,12 +15,12 @@ DEPENDS+=	nawk-[0-9]*:../../lang/nawk
 
 WRKSRC=		${WRKDIR}/concorde
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-pthreads
 
 REPLACE_AWK+=	TINY/randtsp.awk
 
-ALL_TARGET= everything
+ALL_TARGET=	everything
 
 BINFILES=	CUT/mincut FMATCH/fmatch LINKERN/linkern \
 		 TINY/tinytsp TOOLS/edg2len TOOLS/edgunion TOOLS/fconvert \
diff --git a/contact-lookup-applet/Makefile b/contact-lookup-applet/Makefile
index 0b78fcd0d1..bac2ad0726 100644
--- a/contact-lookup-applet/Makefile
+++ b/contact-lookup-applet/Makefile
@@ -10,16 +10,16 @@ HOMEPAGE=	http://www.burtonini.com/wordpress/?s=Contact+Lookup+Applet
 COMMENT=	Gnome panel applet for easy Evolution contact book access
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix=${PREFIX}
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=	intltool
-USE_TOOLS+=	perl
-USE_TOOLS+=	pkg-config
-USE_TOOLS+=	gettext
-USE_TOOLS+=	gmake
-USE_LANGUAGES+= c
+USE_TOOLS+=		intltool
+USE_TOOLS+=		perl
+USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gettext
+USE_TOOLS+=		gmake
+USE_LANGUAGES+=		c
 
 .include "../../x11/gnome-panel/buildlink3.mk"
 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=2.24.3
diff --git a/converttomp3/Makefile b/converttomp3/Makefile
index 5d81720ded..805b2ae793 100644
--- a/converttomp3/Makefile
+++ b/converttomp3/Makefile
@@ -22,7 +22,7 @@ WRKSRC=				${WRKDIR}
 
 INSTALLATION_DIRS=	bin
 
-REPLACE_PYTHON+=	ConvertToMP3.py
+REPLACE_PYTHON+=		ConvertToMP3.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.6.3
 
 do-install:
diff --git a/copytape/Makefile b/copytape/Makefile
index fc88f784bc..90755ad957 100644
--- a/copytape/Makefile
+++ b/copytape/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=		copytape
 PKGNAME=		${DISTNAME}-1.0
 CATEGORIES=		sysutils
-MASTER_SITES= \
+MASTER_SITES=		\
 	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.unix/volume10/ \
 	ftp://ftp.uu.net/usenet/comp.sources.unix/volume10/ \
 	ftp://ftp.funet.fi/pub/archive/comp.sources.unix/volume10/ \
diff --git a/corefx-git/Makefile b/corefx-git/Makefile
index 5826c40fa0..c8e3fdacd4 100644
--- a/corefx-git/Makefile
+++ b/corefx-git/Makefile
@@ -25,7 +25,7 @@ PKG_CC=			clang
 PKG_CXX=		clang++
 
 # NetBSD specific for now
-CMAKE_ARGS+=	 -DHeimdalGssApi=ON
+CMAKE_ARGS+=	-DHeimdalGssApi=ON
 
 do-configure:
 	${RUN} ${ECHO} Skip configure and call CMake via build.sh
diff --git a/cortex-var/Makefile b/cortex-var/Makefile
index c48c1a2b64..c117f0b9bf 100644
--- a/cortex-var/Makefile
+++ b/cortex-var/Makefile
@@ -14,7 +14,7 @@ COMMENT=	TODO: Short description of the package
 
 WRKSRC=		${WRKDIR}/CORTEX_release_v1.0.5.21
 USE_TOOLS+=	pkg-config gmake
-BUILD_TARGET= 	cortex_var
+BUILD_TARGET=	cortex_var
 
 _BLNK_PASSTHRU_DIRS+=	${WRKSRC}/libs
 
diff --git a/coturn/Makefile b/coturn/Makefile
index 61c411dc4a..63eee5c4bd 100644
--- a/coturn/Makefile
+++ b/coturn/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	coturn-4.5.0.6
 CATEGORIES=	net
 GITHUB_PROJECT=	coturn
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=coturn/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=coturn/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
@@ -11,8 +11,8 @@ HOMEPAGE=	https://github.com/coturn/coturn
 COMMENT=	The TURN Server is a VoIP media traffic NAT traversal server
 LICENSE=	citrix_ica-license
 
-USE_LANGUAGES=  c c++
-USE_LIBTOOL=    yes
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
 
 CONFIGURE_ENV+=		PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1
 CONFIGURE_ENV+=		LIBEVENT_OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.libevent}/include"
@@ -28,7 +28,7 @@ CONFIGURE_ENV+=		EXAMPLESDIR=${PREFIX}/share/examples
 CONFIGURE_ENV+=		TURNDBDIR=${PREFIX}/share/turnserver
 CONFIGURE_ENV+=		TURNINCLUDEDIR=${PREFIX}/include/turn
 
-INSTALLATION_DIRS+=     bin include lib ${PKGMANDIR}/man1 share/doc share/examples/etc share/examples/scripts share/turnserver
+INSTALLATION_DIRS+=	bin include lib ${PKGMANDIR}/man1 share/doc share/examples/etc share/examples/scripts share/turnserver
 #CONF_FILES+=            ${PREFIX}/etc/turnserver.conf.default
 #RCD_SCRIPTS=                  turnserver
 
diff --git a/coturn/options.mk b/coturn/options.mk
index fa7169f060..07a875f8e7 100644
--- a/coturn/options.mk
+++ b/coturn/options.mk
@@ -24,5 +24,5 @@ CONFIGURE_ENV+=	POSTCFLAGS="-I${PREFIX}/include/postgresql"
 .endif
 
 .if !empty(PKG_OPTIONS:Mredis)
-DEPENDS+=       redis-[0-9]*:../../databases/redis
+DEPENDS+=	redis-[0-9]*:../../databases/redis
 .endif
diff --git a/coxeter/Makefile b/coxeter/Makefile
index 05cb14dd2a..5530ac9b78 100644
--- a/coxeter/Makefile
+++ b/coxeter/Makefile
@@ -15,8 +15,8 @@ MAKE_FILE=	makefile
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 
-GCC_REQD+=	3.3.5
-ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-*
+GCC_REQD+=		3.3.5
+ONLY_FOR_PLATFORM=	NetBSD-*-* Linux-*-* SunOS-*-*
 
 INSTALLATION_DIRS=	bin
 
diff --git a/cpdup/Makefile b/cpdup/Makefile
index ecf0fa7412..ee6f4a10c0 100644
--- a/cpdup/Makefile
+++ b/cpdup/Makefile
@@ -25,9 +25,9 @@ do-install:
 
 # on platforms where libbsd is available, it is needed for MD5
 .if defined(USE_LIBBSD)
-MAKE_FLAGS+= -DLIBBSD
+MAKE_FLAGS+=	-DLIBBSD
 .elif ${OPSYS} == Darwin
-MAKE_FLAGS+= -DNOMD5
+MAKE_FLAGS+=	-DNOMD5
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cpqarrayd/Makefile b/cpqarrayd/Makefile
index 45b9dfbc45..4ee2d692bb 100644
--- a/cpqarrayd/Makefile
+++ b/cpqarrayd/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v2
 
 ONLY_FOR_PLATFORM=	Linux-*-*
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-snmptrap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/crawl-stone-soup/Makefile b/crawl-stone-soup/Makefile
index 44638d219c..6d6773bbf2 100644
--- a/crawl-stone-soup/Makefile
+++ b/crawl-stone-soup/Makefile
@@ -12,10 +12,10 @@ HOMEPAGE=	http://crawl.develz.org/wordpress/
 COMMENT=	Dungeon Crawl Stone Soup is a role-playing roguelike game
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	pkg-config
-USE_TOOLS+=	gmake
-USE_TOOLS+=	perl
-USE_LANGUAGES=	c c++
+USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gmake
+USE_TOOLS+=		perl
+USE_LANGUAGES=		c c++
 BUILD_MAKE_FLAGS+=	prefix=${PREFIX}
 BUILD_MAKE_FLAGS+=	SAVEDIR='~/.crawl'
 BUILD_MAKE_FLAGS+=	V=y
diff --git a/cronolog-devel/Makefile b/cronolog-devel/Makefile
index bd6c76bda7..827d6d119d 100644
--- a/cronolog-devel/Makefile
+++ b/cronolog-devel/Makefile
@@ -13,9 +13,9 @@ HOMEPAGE=	http://www.freshports.org/sysutils/cronolog-devel/
 COMMENT=	Web log rotation utility that provides datestamp filenames
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	YES
-INFO_FILES=	yes
-USE_TOOLS+=	perl:run
+GNU_CONFIGURE=		YES
+INFO_FILES=		yes
+USE_TOOLS+=		perl:run
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
 SUBST_CLASSES+=	cl
diff --git a/cross-binutils/Makefile b/cross-binutils/Makefile
index e3f2d4ba56..347290f839 100644
--- a/cross-binutils/Makefile
+++ b/cross-binutils/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--enable-targets=all
 # Ensure that --host is not included as default
 CONFIGURE_ARGS+=	--target=i386-linux
 # ./configure.lineno: 3281: Syntax error: "(" unexpected (expecting "fi")
-PKGSRC_MAKE_ENV+=       SH=/bin/ksh
+PKGSRC_MAKE_ENV+=	SH=/bin/ksh
 
 MAKE_ARGS+=		CFLAGS="${CFLAGS}"
 BUILD_TARGET=		all-binutils all-ld
diff --git a/crossguid/buildlink3.mk b/crossguid/buildlink3.mk
index dceaac79bc..a0acc47daf 100644
--- a/crossguid/buildlink3.mk
+++ b/crossguid/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	crossguid
 CROSSGUID_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.crossguid+=	crossguid>=0.0_pre20160908
-BUILDLINK_PKGSRCDIR.crossguid?=	../../devel/crossguid
+BUILDLINK_PKGSRCDIR.crossguid?=		../../devel/crossguid
 
 .include "../../devel/libuuid/buildlink3.mk"
 .endif	# CROSSGUID_BUILDLINK3_MK
diff --git a/cryptcat/Makefile b/cryptcat/Makefile
index 40a787dd9e..c161844ad3 100644
--- a/cryptcat/Makefile
+++ b/cryptcat/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake
 WRKSRC=		${WRKDIR}/unix
 BUILD_TARGET=	${LOWER_OPSYS}
 
-INSTALLATION_DIRS+= 	bin share/doc/cryptcat
+INSTALLATION_DIRS+=	bin share/doc/cryptcat
 
 do-install:
 	cd ${WRKSRC} && \
diff --git a/ctags-git/Makefile b/ctags-git/Makefile
index 7f081fbd5d..2a840a950b 100644
--- a/ctags-git/Makefile
+++ b/ctags-git/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	ctags-5.8
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=universal-ctags/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=universal-ctags/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://ctags.io/
@@ -19,11 +19,11 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 USE_TOOLS=		aclocal autoreconf autoconf automake autoheader
 USE_TOOLS+=		bash gmake perl
 
-SUBST_CLASSES+=         bash
-SUBST_MESSAGE.bash=     Fixing shellbang references to bash.
-SUBST_STAGE.bash=       post-extract
-SUBST_SED.bash=         -e 's,\#\!/bin/bash,\#\!${BASH},g'
-SUBST_FILES.bash=       misc/optlib2c
+SUBST_CLASSES+=		bash
+SUBST_MESSAGE.bash=	Fixing shellbang references to bash.
+SUBST_STAGE.bash=	post-extract
+SUBST_SED.bash=		-e 's,\#\!/bin/bash,\#\!${BASH},g'
+SUBST_FILES.bash=	misc/optlib2c
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
diff --git a/ctags-git/options.mk b/ctags-git/options.mk
index dec8afd3d8..890bb6ad20 100644
--- a/ctags-git/options.mk
+++ b/ctags-git/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.1 2015/04/27 21:17:15 jonthn Exp $
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.ctags
-PKG_SUPPORTED_OPTIONS=          exctags emacs
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ctags
+PKG_SUPPORTED_OPTIONS=		exctags emacs
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,8 +20,8 @@ PLIST_SUBST+=		PREFIX_PROGRAM=""
 ###
 ### Generate tool/link for emacs support
 ###
-PLIST_VARS+=	emacs
+PLIST_VARS+=		emacs
 .if !empty(PKG_OPTIONS:Memacs)
 CONFIGURE_ARGS+=	--enable-etags
-PLIST.emacs=	yes
+PLIST.emacs=		yes
 .endif
diff --git a/cubature/Makefile b/cubature/Makefile
index e66adc7fe8..f53ff5591d 100644
--- a/cubature/Makefile
+++ b/cubature/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v3
 
 NO_BUILD=	yes
 
-INSTALLATION_DIRS= include	share/doc/cubature
+INSTALLATION_DIRS=	include	share/doc/cubature
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/cubature.h ${DESTDIR}${PREFIX}/include
diff --git a/cufflinks-2.2.1/Makefile b/cufflinks-2.2.1/Makefile
index 31eb0e3307..5c5c342103 100644
--- a/cufflinks-2.2.1/Makefile
+++ b/cufflinks-2.2.1/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	bacon%NetBSD.org@localhost
 COMMENT=	RNA transcript assembly, differential expression/regulation
 LICENSE=	boost-license
 
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	yes
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-bam=${PREFIX}/samtools0119
 
 # Darwin
diff --git a/cufflinks/Makefile b/cufflinks/Makefile
index 094f647ab3..733ed0de8c 100644
--- a/cufflinks/Makefile
+++ b/cufflinks/Makefile
@@ -59,9 +59,9 @@ SUBST_STAGE.boolint=	post-patch
 SUBST_FILES.boolint=	${WRKSRC}/src/rounding.h
 SUBST_SED.boolint+=	-e 's|int& is_up|bool\& is_up|g'
 
-CONFIGURE_ARGS+=--with-bam=${PREFIX}/samtools0119 --with-boost
-CFLAGS+=	-I${PREFIX}/include/eigen3
-LDFLAGS+=	-lboost_system -lboost_iostreams -lboost_thread
+CONFIGURE_ARGS+=	--with-bam=${PREFIX}/samtools0119 --with-boost
+CFLAGS+=		-I${PREFIX}/include/eigen3
+LDFLAGS+=		-lboost_system -lboost_iostreams -lboost_thread
 
 PORTVERSION=	2.1.1
 
diff --git a/cursor-dmz-theme/PLIST b/cursor-dmz-theme/PLIST
index 099bbc9bac..66c5ad4cf9 100644
--- a/cursor-dmz-theme/PLIST
+++ b/cursor-dmz-theme/PLIST
@@ -16,73 +16,73 @@ share/icons/Vanilla-DMZ/cursors/9081237383d90e509aa00f00170e968f
 share/icons/Vanilla-DMZ/cursors/9d800788f1b08800ae810202380a0822
 share/icons/Vanilla-DMZ/cursors/X_cursor
 share/icons/Vanilla-DMZ/cursors/arrow
-share/icons/Vanilla-DMZ/cursors/watch
-share/icons/Vanilla-DMZ/cursors/v_double_arrow
-share/icons/Vanilla-DMZ/cursors/ur_angle
-share/icons/Vanilla-DMZ/cursors/ul_angle
-share/icons/Vanilla-DMZ/cursors/top_tee
-share/icons/Vanilla-DMZ/cursors/top_side
-share/icons/Vanilla-DMZ/cursors/top_right_corner
-share/icons/Vanilla-DMZ/cursors/top_left_corner
-share/icons/Vanilla-DMZ/cursors/top_left_arrow
-share/icons/Vanilla-DMZ/cursors/tcross
-share/icons/Vanilla-DMZ/cursors/target
-share/icons/Vanilla-DMZ/cursors/sb_v_double_arrow
-share/icons/Vanilla-DMZ/cursors/sb_up_arrow
-share/icons/Vanilla-DMZ/cursors/sb_right_arrow
-share/icons/Vanilla-DMZ/cursors/sb_left_arrow
-share/icons/Vanilla-DMZ/cursors/sb_h_double_arrow
-share/icons/Vanilla-DMZ/cursors/sb_down_arrow
-share/icons/Vanilla-DMZ/cursors/right_tee
-share/icons/Vanilla-DMZ/cursors/right_side
-share/icons/Vanilla-DMZ/cursors/right_ptr
-share/icons/Vanilla-DMZ/cursors/question_arrow
-share/icons/Vanilla-DMZ/cursors/plus
-share/icons/Vanilla-DMZ/cursors/pirate
-share/icons/Vanilla-DMZ/cursors/pencil
-share/icons/Vanilla-DMZ/cursors/move
-share/icons/Vanilla-DMZ/cursors/lr_angle
-share/icons/Vanilla-DMZ/cursors/ll_angle
-share/icons/Vanilla-DMZ/cursors/link
-share/icons/Vanilla-DMZ/cursors/left_tee
-share/icons/Vanilla-DMZ/cursors/left_side
-share/icons/Vanilla-DMZ/cursors/left_ptr_watch
-share/icons/Vanilla-DMZ/cursors/left_ptr_help
-share/icons/Vanilla-DMZ/cursors/left_ptr
-share/icons/Vanilla-DMZ/cursors/icon
-share/icons/Vanilla-DMZ/cursors/help
-share/icons/Vanilla-DMZ/cursors/hand2
-share/icons/Vanilla-DMZ/cursors/hand1
-share/icons/Vanilla-DMZ/cursors/hand
-share/icons/Vanilla-DMZ/cursors/h_double_arrow
-share/icons/Vanilla-DMZ/cursors/grabbing
-share/icons/Vanilla-DMZ/cursors/fleur
-share/icons/Vanilla-DMZ/cursors/fd_double_arrow
-share/icons/Vanilla-DMZ/cursors/fcf1c3c7cd4491d801f1e1c78f100000
-share/icons/Vanilla-DMZ/cursors/e29285e634086352946a0e7090d73106
-share/icons/Vanilla-DMZ/cursors/draped_box
-share/icons/Vanilla-DMZ/cursors/draft_small
-share/icons/Vanilla-DMZ/cursors/draft_large
-share/icons/Vanilla-DMZ/cursors/double_arrow
-share/icons/Vanilla-DMZ/cursors/dotbox
-share/icons/Vanilla-DMZ/cursors/dot_box_mask
-share/icons/Vanilla-DMZ/cursors/dnd-none
-share/icons/Vanilla-DMZ/cursors/dnd-move
-share/icons/Vanilla-DMZ/cursors/dnd-link
-share/icons/Vanilla-DMZ/cursors/dnd-copy
-share/icons/Vanilla-DMZ/cursors/dnd-ask
-share/icons/Vanilla-DMZ/cursors/diamond_cross
-share/icons/Vanilla-DMZ/cursors/d9ce0ab605698f320427677b458ad60b
-share/icons/Vanilla-DMZ/cursors/crosshair
-share/icons/Vanilla-DMZ/cursors/crossed_circle
-share/icons/Vanilla-DMZ/cursors/cross_reverse
-share/icons/Vanilla-DMZ/cursors/cross
-share/icons/Vanilla-DMZ/cursors/copy
-share/icons/Vanilla-DMZ/cursors/circle
-share/icons/Vanilla-DMZ/cursors/c7088f0f3e6c8088236ef8e1e3e70000
-share/icons/Vanilla-DMZ/cursors/bottom_tee
-share/icons/Vanilla-DMZ/cursors/bottom_side
-share/icons/Vanilla-DMZ/cursors/bottom_right_corner
-share/icons/Vanilla-DMZ/cursors/bottom_left_corner
 share/icons/Vanilla-DMZ/cursors/bd_double_arrow
+share/icons/Vanilla-DMZ/cursors/bottom_left_corner
+share/icons/Vanilla-DMZ/cursors/bottom_right_corner
+share/icons/Vanilla-DMZ/cursors/bottom_side
+share/icons/Vanilla-DMZ/cursors/bottom_tee
+share/icons/Vanilla-DMZ/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+share/icons/Vanilla-DMZ/cursors/circle
+share/icons/Vanilla-DMZ/cursors/copy
+share/icons/Vanilla-DMZ/cursors/cross
+share/icons/Vanilla-DMZ/cursors/cross_reverse
+share/icons/Vanilla-DMZ/cursors/crossed_circle
+share/icons/Vanilla-DMZ/cursors/crosshair
+share/icons/Vanilla-DMZ/cursors/d9ce0ab605698f320427677b458ad60b
+share/icons/Vanilla-DMZ/cursors/diamond_cross
+share/icons/Vanilla-DMZ/cursors/dnd-ask
+share/icons/Vanilla-DMZ/cursors/dnd-copy
+share/icons/Vanilla-DMZ/cursors/dnd-link
+share/icons/Vanilla-DMZ/cursors/dnd-move
+share/icons/Vanilla-DMZ/cursors/dnd-none
+share/icons/Vanilla-DMZ/cursors/dot_box_mask
+share/icons/Vanilla-DMZ/cursors/dotbox
+share/icons/Vanilla-DMZ/cursors/double_arrow
+share/icons/Vanilla-DMZ/cursors/draft_large
+share/icons/Vanilla-DMZ/cursors/draft_small
+share/icons/Vanilla-DMZ/cursors/draped_box
+share/icons/Vanilla-DMZ/cursors/e29285e634086352946a0e7090d73106
+share/icons/Vanilla-DMZ/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+share/icons/Vanilla-DMZ/cursors/fd_double_arrow
+share/icons/Vanilla-DMZ/cursors/fleur
+share/icons/Vanilla-DMZ/cursors/grabbing
+share/icons/Vanilla-DMZ/cursors/h_double_arrow
+share/icons/Vanilla-DMZ/cursors/hand
+share/icons/Vanilla-DMZ/cursors/hand1
+share/icons/Vanilla-DMZ/cursors/hand2
+share/icons/Vanilla-DMZ/cursors/help
+share/icons/Vanilla-DMZ/cursors/icon
+share/icons/Vanilla-DMZ/cursors/left_ptr
+share/icons/Vanilla-DMZ/cursors/left_ptr_help
+share/icons/Vanilla-DMZ/cursors/left_ptr_watch
+share/icons/Vanilla-DMZ/cursors/left_side
+share/icons/Vanilla-DMZ/cursors/left_tee
+share/icons/Vanilla-DMZ/cursors/link
+share/icons/Vanilla-DMZ/cursors/ll_angle
+share/icons/Vanilla-DMZ/cursors/lr_angle
+share/icons/Vanilla-DMZ/cursors/move
+share/icons/Vanilla-DMZ/cursors/pencil
+share/icons/Vanilla-DMZ/cursors/pirate
+share/icons/Vanilla-DMZ/cursors/plus
+share/icons/Vanilla-DMZ/cursors/question_arrow
+share/icons/Vanilla-DMZ/cursors/right_ptr
+share/icons/Vanilla-DMZ/cursors/right_side
+share/icons/Vanilla-DMZ/cursors/right_tee
+share/icons/Vanilla-DMZ/cursors/sb_down_arrow
+share/icons/Vanilla-DMZ/cursors/sb_h_double_arrow
+share/icons/Vanilla-DMZ/cursors/sb_left_arrow
+share/icons/Vanilla-DMZ/cursors/sb_right_arrow
+share/icons/Vanilla-DMZ/cursors/sb_up_arrow
+share/icons/Vanilla-DMZ/cursors/sb_v_double_arrow
+share/icons/Vanilla-DMZ/cursors/target
+share/icons/Vanilla-DMZ/cursors/tcross
+share/icons/Vanilla-DMZ/cursors/top_left_arrow
+share/icons/Vanilla-DMZ/cursors/top_left_corner
+share/icons/Vanilla-DMZ/cursors/top_right_corner
+share/icons/Vanilla-DMZ/cursors/top_side
+share/icons/Vanilla-DMZ/cursors/top_tee
+share/icons/Vanilla-DMZ/cursors/ul_angle
+share/icons/Vanilla-DMZ/cursors/ur_angle
+share/icons/Vanilla-DMZ/cursors/v_double_arrow
+share/icons/Vanilla-DMZ/cursors/watch
 share/icons/Vanilla-DMZ/cursors/xterm
diff --git a/cutecom/Makefile b/cutecom/Makefile
index 2a5c643894..f6de9122f3 100644
--- a/cutecom/Makefile
+++ b/cutecom/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	http://cutecom.sourceforge.net/
 COMMENT=	Graphical serial terminal
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=      	lrzsz>=0.12.20:../../comms/lrzsz
+DEPENDS+=	lrzsz>=0.12.20:../../comms/lrzsz
 
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
diff --git a/cvc3/Makefile b/cvc3/Makefile
index cc34469cbd..c970b46b14 100644
--- a/cvc3/Makefile
+++ b/cvc3/Makefile
@@ -16,11 +16,11 @@ USE_TOOLS+=	gmake bash perl bison
 
 CONFIGURE_ENV+=			ac_cv_prog_YACC="bison -y"
 
-SUBST_CLASSES+=                 fix-bash
-SUBST_STAGE.fix-bash=          	pre-configure
-SUBST_MESSAGE.fix-bash=        	Fixing hard-coded reference to bash.
-SUBST_FILES.fix-bash=          	Makefile.std
-SUBST_SED.fix-bash=            	-e 's,SHELL = /bin/bash,SHELL = ${TOOLS_PATH.bash},g'
+SUBST_CLASSES+=			fix-bash
+SUBST_STAGE.fix-bash=		pre-configure
+SUBST_MESSAGE.fix-bash=		Fixing hard-coded reference to bash.
+SUBST_FILES.fix-bash=		Makefile.std
+SUBST_SED.fix-bash=		-e 's,SHELL = /bin/bash,SHELL = ${TOOLS_PATH.bash},g'
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cvs-syncmail/Makefile b/cvs-syncmail/Makefile
index c0f15b88b3..1b2d05330e 100644
--- a/cvs-syncmail/Makefile
+++ b/cvs-syncmail/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Automatically send cvs commit messages via mail
 WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 NO_BUILD=		yes
-REPLACE_PYTHON=	syncmail
+REPLACE_PYTHON=		syncmail
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/cvsproxy/Makefile b/cvsproxy/Makefile
index 2dfe73093a..262e207d51 100644
--- a/cvsproxy/Makefile
+++ b/cvsproxy/Makefile
@@ -10,6 +10,6 @@ COMMENT=	The cvsproxy is a relay server for the cvs pserver protocol
 
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=		autoconf automake
+USE_TOOLS+=	autoconf automake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cycle/Makefile b/cycle/Makefile
index ce2f3d9164..d5becadd51 100644
--- a/cycle/Makefile
+++ b/cycle/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cycle is a fertility calendar program for women
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
 REPLACE_PYTHON=	cycle.py
 
-INSTALLATION_DIRS= lib/cycle lib/cycle/bitmaps \
+INSTALLATION_DIRS=	lib/cycle lib/cycle/bitmaps \
 	lib/cycle/icons lib/cycle/icons/large lib/cycle/icons/mini \
 	lib/cycle/msg lib/cycle/msg/ca/LC_MESSAGES \
 	lib/cycle/msg/cs/LC_MESSAGES lib/cycle/msg/de/LC_MESSAGES \


Home | Main Index | Thread Index | Old Index