pkgsrc-WIP-changes archive

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

*: fix pkglint warnings about variable alignment



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Wed Jun 6 20:44:18 2018 +0100
Changeset:	3d44863044507be43a8088568bea8364b82f4749

Modified Files:
	afflib/Makefile
	aolserver/Makefile
	aolserver4/Makefile
	avr-libc/Makefile
	avr-libc/options.mk
	bamtools/Makefile
	bamtools/buildlink3.mk
	bwa/Makefile
	cairo-java/Makefile
	canna-canuum/Makefile
	canu/Makefile
	chbg/Makefile
	courierpassd/Makefile
	daphne/Makefile
	ddate/Makefile
	debian_base/Makefile
	debian_glib/Makefile
	ecasound/Makefile
	eic/Makefile
	electricsheep-git/Makefile
	emacs-pr-el/Makefile
	emboss-domainatrix/Makefile
	emboss-emnu/Makefile
	emboss-hmmer/Makefile
	emboss-java/Makefile
	emboss-meme/Makefile
	emboss-phylip/Makefile
	emboss-topo/Makefile
	emboss/Makefile
	eot/Makefile
	firefox-hg/Makefile
	firefox-hg/mozilla-common.mk
	frida-glib2/Makefile
	frida-glib2/Makefile.common
	frida-glib2/modules.mk
	frida-glib2/schemas.mk
	frida-libffi/Makefile
	i2pd-git/Makefile
	i2pd/Makefile
	libdrm-dfbsd/Makefile
	libdrm-dfbsd/builtin.mk
	modular-xorg-server-dfbsd/options.mk
	obnc/Makefile
	oksh/Makefile
	openafs-git/Makefile
	openafs-git/options.mk
	openblas/Makefile.common
	openblas_openmp/buildlink3.mk
	openscad/Makefile
	oranchelo-icon-theme/Makefile
	pipes-c/Makefile
	plink2/Makefile
	printrun/Makefile
	py-absl-py/Makefile
	py-aniso8601/Makefile
	py-django-crispy-forms/Makefile
	py-django-jsonfield/Makefile
	py-django-picklefield/Makefile
	py-django-sudo/Makefile
	py-django-templatetag-sugar/Makefile
	py-email-reply-parser/Makefile
	py-factory_boy/Makefile
	py-flask-migrate/Makefile
	py-flask-restful/Makefile
	py-gast/Makefile
	py-hiredis/Makefile
	py-honcho/Makefile
	py-marshmallow/Makefile
	py-milksnake/Makefile
	py-mmh3/Makefile
	py-percy/Makefile
	py-petname/Makefile
	py-picture-to-gds/Makefile
	py-python-decouple/Makefile
	py-rb/Makefile
	py-redis-cluster/Makefile
	py-sentry/Makefile
	py-statsd/Makefile
	py-symbolic/Makefile
	py-test-html/Makefile
	py-test-metadata/Makefile
	py-toronado/Makefile
	py-u2flib-server/Makefile
	py-ua-parser/Makefile
	py-visionegg-contrib/Makefile
	sds/Makefile
	singularity/Makefile
	tleenx3/Makefile
	translate-toolkit/Makefile
	txt2tags/Makefile
	vcflib/Makefile

Log Message:
*: fix pkglint warnings about variable alignment

pkglint -Wall -F --only "aligned" -r

The result of the above command has been manually inspected and fixed
where necessary.

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

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

diffstat:
 afflib/Makefile                      |  15 +++--
 aolserver/Makefile                   |   2 +-
 aolserver4/Makefile                  |   2 +-
 avr-libc/Makefile                    |   2 +-
 avr-libc/options.mk                  |  50 ++++++++--------
 bamtools/Makefile                    |   4 +-
 bamtools/buildlink3.mk               |   2 +-
 bwa/Makefile                         |   2 +-
 cairo-java/Makefile                  |   2 +-
 canna-canuum/Makefile                |   4 +-
 canu/Makefile                        |   8 +--
 chbg/Makefile                        |   2 +-
 courierpassd/Makefile                |   2 +-
 daphne/Makefile                      |   2 +-
 ddate/Makefile                       |   2 +-
 debian_base/Makefile                 |   2 +-
 debian_glib/Makefile                 |   2 +-
 ecasound/Makefile                    |   2 +-
 eic/Makefile                         |  30 +++++-----
 electricsheep-git/Makefile           |   2 +-
 emacs-pr-el/Makefile                 |   2 +-
 emboss-domainatrix/Makefile          |  12 ++--
 emboss-emnu/Makefile                 |  19 +++---
 emboss-hmmer/Makefile                |  12 ++--
 emboss-java/Makefile                 |   2 +-
 emboss-meme/Makefile                 |  12 ++--
 emboss-phylip/Makefile               |  12 ++--
 emboss-topo/Makefile                 |  12 ++--
 emboss/Makefile                      |  38 ++++++------
 eot/Makefile                         |  12 ++--
 firefox-hg/Makefile                  |  12 ++--
 firefox-hg/mozilla-common.mk         |  12 ++--
 frida-glib2/Makefile                 |   4 +-
 frida-glib2/Makefile.common          |   4 +-
 frida-glib2/modules.mk               |   2 +-
 frida-glib2/schemas.mk               |   2 +-
 frida-libffi/Makefile                |   8 +--
 i2pd-git/Makefile                    |  26 ++++----
 i2pd/Makefile                        |  16 ++---
 libdrm-dfbsd/Makefile                |   4 +-
 libdrm-dfbsd/builtin.mk              |   2 +-
 modular-xorg-server-dfbsd/options.mk |   2 +-
 obnc/Makefile                        |   2 +-
 oksh/Makefile                        |   2 +-
 openafs-git/Makefile                 |  10 ++--
 openafs-git/options.mk               |  20 +++----
 openblas/Makefile.common             |  18 +++---
 openblas_openmp/buildlink3.mk        |   2 +-
 openscad/Makefile                    |   2 +-
 oranchelo-icon-theme/Makefile        |   6 +-
 pipes-c/Makefile                     |   2 +-
 plink2/Makefile                      |   2 +-
 printrun/Makefile                    |  30 +++++-----
 py-absl-py/Makefile                  |   8 +--
 py-aniso8601/Makefile                |  12 ++--
 py-django-crispy-forms/Makefile      |   6 +-
 py-django-jsonfield/Makefile         |   2 +-
 py-django-picklefield/Makefile       |   4 +-
 py-django-sudo/Makefile              |   2 +-
 py-django-templatetag-sugar/Makefile |   2 +-
 py-email-reply-parser/Makefile       |   2 +-
 py-factory_boy/Makefile              |  10 ++--
 py-flask-migrate/Makefile            |  14 ++---
 py-flask-restful/Makefile            |  18 +++---
 py-gast/Makefile                     |   2 +-
 py-hiredis/Makefile                  |   2 +-
 py-honcho/Makefile                   |   4 +-
 py-marshmallow/Makefile              |  12 ++--
 py-milksnake/Makefile                |   4 +-
 py-mmh3/Makefile                     |   2 +-
 py-percy/Makefile                    |   4 +-
 py-petname/Makefile                  |   2 +-
 py-picture-to-gds/Makefile           |   2 +-
 py-python-decouple/Makefile          |   8 +--
 py-rb/Makefile                       |   4 +-
 py-redis-cluster/Makefile            |   4 +-
 py-sentry/Makefile                   | 112 +++++++++++++++++------------------
 py-statsd/Makefile                   |   2 +-
 py-symbolic/Makefile                 |  96 +++++++++++++++---------------
 py-test-html/Makefile                |   8 +--
 py-test-metadata/Makefile            |   4 +-
 py-toronado/Makefile                 |   2 +-
 py-u2flib-server/Makefile            |   8 +--
 py-ua-parser/Makefile                |   4 +-
 py-visionegg-contrib/Makefile        |  22 +++----
 sds/Makefile                         |   2 +-
 singularity/Makefile                 |  12 ++--
 tleenx3/Makefile                     |  20 +++----
 translate-toolkit/Makefile           |   2 +-
 txt2tags/Makefile                    |  14 ++---
 vcflib/Makefile                      |   2 +-
 91 files changed, 448 insertions(+), 454 deletions(-)

diffs:
diff --git a/afflib/Makefile b/afflib/Makefile
index 3de57df450..9af0248c79 100644
--- a/afflib/Makefile
+++ b/afflib/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2012/11/25 23:32:07 othyro Exp $
-#
+# $NetBSD$
 
-DISTNAME=		afflib-1.6.31
-CATEGORIES=		devel
-MASTER_SITES=		http://www.afflib.org/downloads/
+DISTNAME=	afflib-1.6.31
+CATEGORIES=	devel
+MASTER_SITES=	http://www.afflib.org/downloads/
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		https://sourceforge.net/projects/afflib/
-COMMENT=		Advanced Forensic Format library
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://sourceforge.net/projects/afflib/
+COMMENT=	Advanced Forensic Format library
 LICENSE=	original-bsd
 
 USE_LANGUAGES=	c++
diff --git a/aolserver/Makefile b/aolserver/Makefile
index 58681c5f67..a61bc89e94 100644
--- a/aolserver/Makefile
+++ b/aolserver/Makefile
@@ -5,7 +5,7 @@ DISTNAME=		aolserver-4.01-src
 PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aolserver/}
-LICENSE=	mpl-1.1
+LICENSE=		mpl-1.1
 
 MAINTAINER=		iharding%destinydata.com@localhost
 HOMEPAGE=		http://www.aolserver.com/
diff --git a/aolserver4/Makefile b/aolserver4/Makefile
index fdfdf26396..9d3510a067 100644
--- a/aolserver4/Makefile
+++ b/aolserver4/Makefile
@@ -5,7 +5,7 @@ DISTNAME=		aolserver-4.0.10-src
 PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aolserver/}
-LICENSE=	mpl-1.1
+LICENSE=		mpl-1.1
 
 MAINTAINER=		iharding%destinydata.com@localhost
 HOMEPAGE=		http://www.aolserver.com/
diff --git a/avr-libc/Makefile b/avr-libc/Makefile
index 47b51ace4c..f475923a82 100644
--- a/avr-libc/Makefile
+++ b/avr-libc/Makefile
@@ -12,7 +12,7 @@ LICENSE=		modified-bsd
 
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
-USE_GNU_CONFIGURE_HOST= no
+USE_GNU_CONFIGURE_HOST=	no
 
 CONFIGURE_ARGS+=	--build=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	--host=avr
diff --git a/avr-libc/options.mk b/avr-libc/options.mk
index 8d877ac314..c678df56c0 100644
--- a/avr-libc/options.mk
+++ b/avr-libc/options.mk
@@ -9,31 +9,31 @@ PLIST_VARS+=			doc
 
 .if !empty(PKG_OPTIONS:Mdoc)
 CONFIGURE_ARGS+=	--enable-doc
-BUILD_DEPENDS+=         doxygen>=1.8.9.1.nb1:../../devel/doxygen
-BUILD_DEPENDS+=         tex-psnfss-[0-9]*:../../fonts/tex-psnfss
-BUILD_DEPENDS+=         tex-wasysym-[0-9]*:../../fonts/tex-wasysym
-BUILD_DEPENDS+=         netpbm-[0-9]*:../../graphics/netpbm
-BUILD_DEPENDS+=         tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf
-BUILD_DEPENDS+=         tex-adjustbox-[0-9]*:../../print/tex-adjustbox
-BUILD_DEPENDS+=         tex-caption-[0-9]*:../../print/tex-caption
-BUILD_DEPENDS+=         tex-collectbox-[0-9]*:../../print/tex-collectbox
-BUILD_DEPENDS+=         tex-colortbl-[0-9]*:../../print/tex-colortbl
-BUILD_DEPENDS+=         tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
-BUILD_DEPENDS+=         tex-float-[0-9]*:../../print/tex-float
-BUILD_DEPENDS+=         tex-geometry-[0-9]*:../../print/tex-geometry
-BUILD_DEPENDS+=         tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg
-BUILD_DEPENDS+=         tex-hyperref-[0-9]*:../../print/tex-hyperref
-BUILD_DEPENDS+=         tex-latex-bin-[0-9]*:../../print/tex-latex-bin
-BUILD_DEPENDS+=         tex-multirow-[0-9]*:../../print/tex-multirow
-BUILD_DEPENDS+=         tex-natbib-[0-9]*:../../print/tex-natbib
-BUILD_DEPENDS+=         tex-pgf-[0-9]*:../../print/tex-pgf
-BUILD_DEPENDS+=         tex-sectsty-[0-9]*:../../print/tex-sectsty
-BUILD_DEPENDS+=         tex-tabu-[0-9]*:../../print/tex-tabu
-BUILD_DEPENDS+=         tex-tocloft-[0-9]*:../../print/tex-tocloft
-BUILD_DEPENDS+=         tex-xcolor-[0-9]*:../../print/tex-xcolor
-BUILD_DEPENDS+=         tex-xkeyval-[0-9]*:../../print/tex-xkeyval
-BUILD_DEPENDS+=         fig2dev-[0-9]*:../../print/fig2dev
-BUILD_DEPENDS+=         makeindexk-[0-9]*:../../textproc/makeindexk
+BUILD_DEPENDS+=		doxygen>=1.8.9.1.nb1:../../devel/doxygen
+BUILD_DEPENDS+=		tex-psnfss-[0-9]*:../../fonts/tex-psnfss
+BUILD_DEPENDS+=		tex-wasysym-[0-9]*:../../fonts/tex-wasysym
+BUILD_DEPENDS+=		netpbm-[0-9]*:../../graphics/netpbm
+BUILD_DEPENDS+=		tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf
+BUILD_DEPENDS+=		tex-adjustbox-[0-9]*:../../print/tex-adjustbox
+BUILD_DEPENDS+=		tex-caption-[0-9]*:../../print/tex-caption
+BUILD_DEPENDS+=		tex-collectbox-[0-9]*:../../print/tex-collectbox
+BUILD_DEPENDS+=		tex-colortbl-[0-9]*:../../print/tex-colortbl
+BUILD_DEPENDS+=		tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
+BUILD_DEPENDS+=		tex-float-[0-9]*:../../print/tex-float
+BUILD_DEPENDS+=		tex-geometry-[0-9]*:../../print/tex-geometry
+BUILD_DEPENDS+=		tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg
+BUILD_DEPENDS+=		tex-hyperref-[0-9]*:../../print/tex-hyperref
+BUILD_DEPENDS+=		tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+BUILD_DEPENDS+=		tex-multirow-[0-9]*:../../print/tex-multirow
+BUILD_DEPENDS+=		tex-natbib-[0-9]*:../../print/tex-natbib
+BUILD_DEPENDS+=		tex-pgf-[0-9]*:../../print/tex-pgf
+BUILD_DEPENDS+=		tex-sectsty-[0-9]*:../../print/tex-sectsty
+BUILD_DEPENDS+=		tex-tabu-[0-9]*:../../print/tex-tabu
+BUILD_DEPENDS+=		tex-tocloft-[0-9]*:../../print/tex-tocloft
+BUILD_DEPENDS+=		tex-xcolor-[0-9]*:../../print/tex-xcolor
+BUILD_DEPENDS+=		tex-xkeyval-[0-9]*:../../print/tex-xkeyval
+BUILD_DEPENDS+=		fig2dev-[0-9]*:../../print/fig2dev
+BUILD_DEPENDS+=		makeindexk-[0-9]*:../../textproc/makeindexk
 
 post-extract:
 	${MKDIR} ${WRKSRC}/doc/api/latex_src
diff --git a/bamtools/Makefile b/bamtools/Makefile
index dd8fc868a6..cbd1caa25c 100644
--- a/bamtools/Makefile
+++ b/bamtools/Makefile
@@ -14,8 +14,8 @@ LICENSE=	mit
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _build
+CMAKE_ARG_PATH=	..
+CONFIGURE_DIRS=	_build
 
 PORTVERSION=	2.5.1
 
diff --git a/bamtools/buildlink3.mk b/bamtools/buildlink3.mk
index eefdf3d0a8..0a5e7b5aaf 100644
--- a/bamtools/buildlink3.mk
+++ b/bamtools/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	bamtools
 BAMTOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.bamtools+=	bamtools>=2.5.1
-BUILDLINK_PKGSRCDIR.bamtools?=	../../wip/bamtools
+BUILDLINK_PKGSRCDIR.bamtools?=		../../wip/bamtools
 
 .endif	# BAMTOOLS_BUILDLINK3_MK
 
diff --git a/bwa/Makefile b/bwa/Makefile
index b382e4a148..10123f9bfc 100644
--- a/bwa/Makefile
+++ b/bwa/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	bwa-0.7.17
 CATEGORIES=	biology
 PKGREVISION=	1
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lh3/}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
diff --git a/cairo-java/Makefile b/cairo-java/Makefile
index cf7a3a7089..562b62d1d3 100644
--- a/cairo-java/Makefile
+++ b/cairo-java/Makefile
@@ -5,7 +5,7 @@ DISTNAME=		cairo-java-1.0.1
 PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/cairo-java/1.0/}
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://java-gnome.sourceforge.net/
diff --git a/canna-canuum/Makefile b/canna-canuum/Makefile
index 5d0dffc1ec..8affb25c54 100644
--- a/canna-canuum/Makefile
+++ b/canna-canuum/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.3 2012/09/24 18:26:51 asau Exp $
 
-CANNA_MODULE=	canuum
+CANNA_MODULE=		canuum
 
 .include "../../wip/canna/Makefile.common"
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 INSTALLATION_DIRS=	${PKGMANDIR}/ja_JP.EUC/man1
 
diff --git a/canu/Makefile b/canu/Makefile
index 23302927a5..4f16d4bc29 100644
--- a/canu/Makefile
+++ b/canu/Makefile
@@ -50,7 +50,7 @@ REPLACE_PERL+=	bogart/*.pl \
 		*.pl
 
 # May work on other 64-bit processors, but untested
-ONLY_FOR_PLATFORM=	 *-*-x86_64
+ONLY_FOR_PLATFORM=	*-*-x86_64
 
 USE_LANGUAGES=	c c++
 USE_JAVA=	run
@@ -63,9 +63,9 @@ MAKE_ENV+=	DESTDIR=${WRKSRC}
 
 PV=		1.7
 
-TMP_INST=	${WRKSRC}${PREFIX}/${OPSYS}-${MACHINE_ARCH:S/x86_64/amd64/}
-SITE_PERL_REL=	lib/perl5/site_perl
-JAVAJARDIR=	share/java/classes
+TMP_INST=		${WRKSRC}${PREFIX}/${OPSYS}-${MACHINE_ARCH:S/x86_64/amd64/}
+SITE_PERL_REL=		lib/perl5/site_perl
+JAVAJARDIR=		share/java/classes
 INSTALLATION_DIRS=	bin ${JAVAJARDIR}
 
 post-extract:
diff --git a/chbg/Makefile b/chbg/Makefile
index c513ab3699..cec09a351d 100644
--- a/chbg/Makefile
+++ b/chbg/Makefile
@@ -6,7 +6,7 @@ PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=chbg/}
 EXTRACT_SUFX=		.tgz
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 MAINTAINER=		ccatrian%eml.cc@localhost
 HOMEPAGE=		http://chbg.sourceforge.net/
diff --git a/courierpassd/Makefile b/courierpassd/Makefile
index 348aba0780..3dd75bec6b 100644
--- a/courierpassd/Makefile
+++ b/courierpassd/Makefile
@@ -4,7 +4,7 @@
 DISTNAME=		courierpassd-1.1.2
 CATEGORIES=		security
 MASTER_SITES=		http://www.arda.homeunix.net/store/
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 MAINTAINER=		joe%joe.cz@localhost
 HOMEPAGE=		http://www.arda.homeunix.net/store/
diff --git a/daphne/Makefile b/daphne/Makefile
index 5592ff5b2e..fd78364332 100644
--- a/daphne/Makefile
+++ b/daphne/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES+=		http://daphne.rulecity.com/download/old/
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.daphne-emu.com/site3/
 COMMENT=		Emulator for Laserdisc arcade games
-LICENSE=	gnu-gpl-v2 # or later
+LICENSE=		gnu-gpl-v2 # or later
 
 WRKSRC=			${WRKDIR}/daphne
 USE_TOOLS+=		gmake
diff --git a/ddate/Makefile b/ddate/Makefile
index 8cfad86fa6..dabd9733a7 100644
--- a/ddate/Makefile
+++ b/ddate/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=system/misc/} \
 MAINTAINER=		lkundrak%skosi.org@localhost
 HOMEPAGE=		http://freshmeat.net/projects/util-linux/
 COMMENT=		The enhanced Discordian date program
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
diff --git a/debian_base/Makefile b/debian_base/Makefile
index 67da8f3e2e..eaac1ba18b 100644
--- a/debian_base/Makefile
+++ b/debian_base/Makefile
@@ -7,7 +7,7 @@ PKGNAME=		debian_base-3.1
 PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		# none
-LICENSE=	gnu-lgpl-v2.1 AND zlib AND gnu-gpl-v2
+LICENSE=		gnu-lgpl-v2.1 AND zlib AND gnu-gpl-v2
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.debian.org/
diff --git a/debian_glib/Makefile b/debian_glib/Makefile
index b426702d89..40feb4050d 100644
--- a/debian_glib/Makefile
+++ b/debian_glib/Makefile
@@ -5,7 +5,7 @@ DISTFILES=		${DEBS}
 PKGNAME=		debian_glib-1.2.10.9
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/g/glib1.2/}
-LICENSE=	gnu-lgpl-v2
+LICENSE=		gnu-lgpl-v2
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.debian.org/
diff --git a/ecasound/Makefile b/ecasound/Makefile
index 3422d8abe6..74acededf3 100644
--- a/ecasound/Makefile
+++ b/ecasound/Makefile
@@ -4,7 +4,7 @@
 DISTNAME=		ecasound-2.4.1
 CATEGORIES=		audio
 MASTER_SITES=		http://ecasound.seul.org/download/
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
+LICENSE=		gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://ecasound.seul.org/
diff --git a/eic/Makefile b/eic/Makefile
index 97b483c061..bd1aac013c 100644
--- a/eic/Makefile
+++ b/eic/Makefile
@@ -1,29 +1,29 @@
 # $NetBSD: Makefile,v 1.9 2012/09/28 22:07:31 asau Exp $
 #
 
-DISTNAME=		EiCsrc_4.3.0
-PKGNAME=		EiC-4.3.0
-WRKSRC=			${WRKDIR}/EiC/
-CATEGORIES=		lang
-MASTER_SITES=		http://rpm.rutgers.edu/repository/solaris/SOURCES/
-EXTRACT_SUFX=		.tgz
+DISTNAME=	EiCsrc_4.3.0
+PKGNAME=	EiC-4.3.0
+WRKSRC=		${WRKDIR}/EiC/
+CATEGORIES=	lang
+MASTER_SITES=	http://rpm.rutgers.edu/repository/solaris/SOURCES/
+EXTRACT_SUFX=	.tgz
 LICENSE=	artistic
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-COMMENT=		C style scripting lang
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+COMMENT=	C style scripting lang
 
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=	gmake
 
 do-configure:
-		cd ${WRKSRC} && config/makeconfig
+	cd ${WRKSRC} && config/makeconfig
 
-do-build:	do-install
+do-build: do-install
 
 do-install:
-		cd ${WRKSRC} && ${GMAKE} INSTALL_DIR=${PREFIX}/bin;	\
-		${INSTALL_DATA_DIR} ${PREFIX}/EiC; cd ${WRKSRC}; ${CP} -r doc include lib main \
-		module test BugList.html Change.html Distribution.html LICENCE Maintenance \
-		${PREFIX}/EiC; ${CP} ${WRKSRC}/eic.man ${PREFIX}/${PKGMANDIR}/man1/eic.man.1
+	cd ${WRKSRC} && ${GMAKE} INSTALL_DIR=${PREFIX}/bin;	\
+	${INSTALL_DATA_DIR} ${PREFIX}/EiC; cd ${WRKSRC}; ${CP} -r doc include lib main \
+	module test BugList.html Change.html Distribution.html LICENCE Maintenance \
+	${PREFIX}/EiC; ${CP} ${WRKSRC}/eic.man ${PREFIX}/${PKGMANDIR}/man1/eic.man.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/electricsheep-git/Makefile b/electricsheep-git/Makefile
index 1cd437f0e9..74e03f8586 100644
--- a/electricsheep-git/Makefile
+++ b/electricsheep-git/Makefile
@@ -4,7 +4,7 @@ PKGNAME=		electricsheep-2.7
 DISTNAME=		electricsheep
 CATEGORIES=		x11
 MASTER_SITES=		http://electricsheep.org/
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 MAINTAINER=		rhialto%falu.nl@localhost
 HOMEPAGE=		http://electricsheep.org/
diff --git a/emacs-pr-el/Makefile b/emacs-pr-el/Makefile
index 7c9badc6a8..0256c8ac39 100644
--- a/emacs-pr-el/Makefile
+++ b/emacs-pr-el/Makefile
@@ -4,7 +4,7 @@ DISTNAME=		emacs-pr-el-0.0.1
 CATEGORIES=		misc
 MASTER_SITES=		# empty
 DISTFILES=		# empty
-LICENSE=	gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 MAINTAINER=		cheusov%NetBSD.org@localhost
 HOMEPAGE=		#
diff --git a/emboss-domainatrix/Makefile b/emboss-domainatrix/Makefile
index afc04b55e3..d479ba3464 100644
--- a/emboss-domainatrix/Makefile
+++ b/emboss-domainatrix/Makefile
@@ -4,15 +4,15 @@
 .include "../emboss-base/Makefile.common"
 .include "../emboss/Makefile.common"
 
-DISTNAME=		DOMAINATRIX-1.0.0
-PKGNAME=		emboss-domainatrix-1.0.0
-PKGREVISION=		1
+DISTNAME=	DOMAINATRIX-1.0.0
+PKGNAME=	emboss-domainatrix-1.0.0
+PKGREVISION=	1
 
-COMMENT=		Collection of bioinformatic programs for EMBOSS
+COMMENT=	Collection of bioinformatic programs for EMBOSS
 LICENSE=	gnu-gpl-v2
 
-BUILD_TARGET=		#empty
-DIST_SUBDIR=		emboss/domainatrix-1.0.0-20040715
+BUILD_TARGET=	#empty
+DIST_SUBDIR=	emboss/domainatrix-1.0.0-20040715
 
 pre-configure:
 	${SED} -e 's|../../../plplot/libplplot.la|${PREFIX}/lib/libplplot.la|' \
diff --git a/emboss-emnu/Makefile b/emboss-emnu/Makefile
index ce7e47825f..456a757f50 100644
--- a/emboss-emnu/Makefile
+++ b/emboss-emnu/Makefile
@@ -4,18 +4,18 @@
 .include "../emboss-base/Makefile.common"
 .include "../emboss/Makefile.common"
 
-DISTNAME=		EMNU-1.05
-PKGNAME=		emboss-emnu-1.05
-PKGREVISION=		1
+DISTNAME=	EMNU-1.05
+PKGNAME=	emboss-emnu-1.05
+PKGREVISION=	1
 
-COMMENT=		Simple menu for EMBOSS applications
+COMMENT=	Simple menu for EMBOSS applications
 LICENSE=	gnu-gpl-v2
 
-BUILD_TARGET=		#empty
-DIST_SUBDIR=		emboss/emnu-1.05-20041107
-GNU_CONFIGURE=		yes
+BUILD_TARGET=	#empty
+DIST_SUBDIR=	emboss/emnu-1.05-20041107
+GNU_CONFIGURE=	yes
 #ncurses required for the redrawwin function
-USE_NCURSES=		yes
+USE_NCURSES=	yes
 
 pre-configure:
 	${SED} -e 's|../../../plplot/libplplot.la|${PREFIX}/lib/libplplot.la|' \
@@ -30,8 +30,5 @@ pre-configure:
 		${WRKSRC}/Makefile.in > ${WRKSRC}/Makefile.in.bak
 	${MV} ${WRKSRC}/Makefile.in.bak ${WRKSRC}/Makefile.in
 
-
-
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emboss-hmmer/Makefile b/emboss-hmmer/Makefile
index 404feb8eed..e850030a4c 100644
--- a/emboss-hmmer/Makefile
+++ b/emboss-hmmer/Makefile
@@ -4,15 +4,15 @@
 .include "../emboss-base/Makefile.common"
 .include "../emboss/Makefile.common"
 
-DISTNAME=		HMMER-2.1.1
-PKGNAME=		emboss-hmmer-2.1.1
-PKGREVISION=		2
+DISTNAME=	HMMER-2.1.1
+PKGNAME=	emboss-hmmer-2.1.1
+PKGREVISION=	2
 
-COMMENT=		Collection of bioinformatic programs supplimenting the EMBOSS package
+COMMENT=	Collection of bioinformatic programs supplimenting the EMBOSS package
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=		emboss/hmmer-2.1.1-20041107
-BUILD_TARGET=		#EMPTY
+DIST_SUBDIR=	emboss/hmmer-2.1.1-20041107
+BUILD_TARGET=	#EMPTY
 
 pre-configure:
 	${SED} -e 's|../../../ajax/libajax.la|${PREFIX}/lib/libajax.la|' \
diff --git a/emboss-java/Makefile b/emboss-java/Makefile
index 67784040d8..49d68082a0 100644
--- a/emboss-java/Makefile
+++ b/emboss-java/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=		ftp://ftp.uk.embnet.org/pub/EMBOSS/
 MAINTAINER=		dprice%cs.nmsu.edu@localhost
 HOMEPAGE=		http://emboss.sourceforge.net/
 COMMENT=		Interface between emboss and jemboss
-LICENSE=	gnu-lgpl-v2.1
+LICENSE=		gnu-lgpl-v2.1
 
 DEPENDS+=		emboss-base>=2.9.0:../../wip/emboss-base
 
diff --git a/emboss-meme/Makefile b/emboss-meme/Makefile
index 56802dfd1b..8f3ce9e3c0 100644
--- a/emboss-meme/Makefile
+++ b/emboss-meme/Makefile
@@ -4,15 +4,15 @@
 .include "../emboss-base/Makefile.common"
 .include "../emboss/Makefile.common"
 
-DISTNAME=		MEME-2.3.1
-PKGNAME=		emboss-meme-2.3.1
-PKGREVISION=		1
+DISTNAME=	MEME-2.3.1
+PKGNAME=	emboss-meme-2.3.1
+PKGREVISION=	1
 
-COMMENT=		Motif detection tool for EMBOSS
+COMMENT=	Motif detection tool for EMBOSS
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=		emboss/meme-2.3.1-20041107
-BUILD_TARGET=		#empty
+DIST_SUBDIR=	emboss/meme-2.3.1-20041107
+BUILD_TARGET=	#empty
 
 pre-configure:
 	${SED} -e 's|@EMBOSSLIB@|${PREFIX}/lib|' \
diff --git a/emboss-phylip/Makefile b/emboss-phylip/Makefile
index e27ea82f7d..07b8ecad68 100644
--- a/emboss-phylip/Makefile
+++ b/emboss-phylip/Makefile
@@ -4,15 +4,15 @@
 .include "../emboss-base/Makefile.common"
 .include "../emboss/Makefile.common"
 
-DISTNAME=		PHYLIP-3.57c
-PKGNAME=		emboss-phylip-3.57c
-PKGREVISION=		1
+DISTNAME=	PHYLIP-3.57c
+PKGNAME=	emboss-phylip-3.57c
+PKGREVISION=	1
 
-COMMENT=		Package of programs for inferring phylogenies
+COMMENT=	Package of programs for inferring phylogenies
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=		emboss/phylip-3.57c-20041107
-BUILD_TARGET=		#empty
+DIST_SUBDIR=	emboss/phylip-3.57c-20041107
+BUILD_TARGET=	#empty
 
 pre-configure:
 	${SED} -e 's|../../../ajax/libajax.la|${PREFIX}/lib/libajax.la|' \
diff --git a/emboss-topo/Makefile b/emboss-topo/Makefile
index fb3419acbc..9587a357fd 100644
--- a/emboss-topo/Makefile
+++ b/emboss-topo/Makefile
@@ -4,15 +4,15 @@
 .include "../emboss-base/Makefile.common"
 .include "../emboss/Makefile.common"
 
-DISTNAME=		TOPO-1.0.0
-PKGNAME=		emboss-topo-1.0.0
-PKGREVISION=		1
+DISTNAME=	TOPO-1.0.0
+PKGNAME=	emboss-topo-1.0.0
+PKGREVISION=	1
 
-COMMENT=		Draws an image of a transmembrane protein
+COMMENT=	Draws an image of a transmembrane protein
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=		${PKG_DISTFILES_DIR}/topo-1.0.0-20041107
-BUILD_TARGET=		#empty
+DIST_SUBDIR=	${PKG_DISTFILES_DIR}/topo-1.0.0-20041107
+BUILD_TARGET=	#empty
 
 pre-configure:
 	${SED} -e 's|@X116@|-Wl,-R${X11BASE}/lib|' \
diff --git a/emboss/Makefile b/emboss/Makefile
index 4cdb78858c..5927ac5797 100644
--- a/emboss/Makefile
+++ b/emboss/Makefile
@@ -1,29 +1,29 @@
 # $NetBSD: Makefile,v 1.6 2012/09/02 11:14:09 noud4 Exp $
 #
 
-DISTNAME=		EMBOSS-2.9.0
-PKGNAME=		emboss-2.9.0
-PKGREVISION=		1
-CATEGORIES=		biology
-MASTER_SITES=		#empty
-DISTFILES=		#empty
+DISTNAME=	EMBOSS-2.9.0
+PKGNAME=	emboss-2.9.0
+PKGREVISION=	1
+CATEGORIES=	biology
+MASTER_SITES=	#empty
+DISTFILES=	#empty
 LICENSE=	gnu-gpl-v2
 
-MAINTAINER=		dprice%cs.nmsu.edu@localhost
-HOMEPAGE=		http://emboss.sourceforge.net/
-COMMENT=		European Molecular Biology Open Software Suite
+MAINTAINER=	dprice%cs.nmsu.edu@localhost
+HOMEPAGE=	http://emboss.sourceforge.net/
+COMMENT=	European Molecular Biology Open Software Suite
 
-DEPENDS+=		emboss-base>=2.9.0:../../wip/emboss-base
-DEPENDS+=		emboss-domainatrix>=1.0.0:../../wip/emboss-domainatrix
-DEPENDS+=		emboss-emnu>=1.05:../../wip/emboss-emnu
-DEPENDS+=		emboss-hmmer>=2.1.1:../../wip/emboss-hmmer
-DEPENDS+=		emboss-meme>=2.3.1:../../wip/emboss-meme
-#DEPENDS+=		emboss-mse>=1.0.0:../../wip/emboss-mse
-DEPENDS+=		emboss-phylip>=3.57c:../../wip/emboss-phylip
-DEPENDS+=		emboss-topo>=1.0.0:../../wip/emboss-topo
+DEPENDS+=	emboss-base>=2.9.0:../../wip/emboss-base
+DEPENDS+=	emboss-domainatrix>=1.0.0:../../wip/emboss-domainatrix
+DEPENDS+=	emboss-emnu>=1.05:../../wip/emboss-emnu
+DEPENDS+=	emboss-hmmer>=2.1.1:../../wip/emboss-hmmer
+DEPENDS+=	emboss-meme>=2.3.1:../../wip/emboss-meme
+#DEPENDS+=	emboss-mse>=1.0.0:../../wip/emboss-mse
+DEPENDS+=	emboss-phylip>=3.57c:../../wip/emboss-phylip
+DEPENDS+=	emboss-topo>=1.0.0:../../wip/emboss-topo
 
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 
 do-install:
 	#empty
diff --git a/eot/Makefile b/eot/Makefile
index 0669857faa..b705c2d9dc 100644
--- a/eot/Makefile
+++ b/eot/Makefile
@@ -1,13 +1,13 @@
 # $NetBSD: Makefile,v 1.2 2012/09/28 21:53:00 asau Exp $
 #
 
-DISTNAME=		eot-1.1
-CATEGORIES=		mail
-MASTER_SITES=		http://gwolf.org/soft/eot/
+DISTNAME=	eot-1.1
+CATEGORIES=	mail
+MASTER_SITES=	http://gwolf.org/soft/eot/
 
-MAINTAINER=		tonio%NetBSD.org@localhost
-HOMEPAGE=		http://gwolf.org/soft/eot/
-COMMENT=		Expire Old Threads
+MAINTAINER=	tonio%NetBSD.org@localhost
+HOMEPAGE=	http://gwolf.org/soft/eot/
+COMMENT=	Expire Old Threads
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	p5-Mail-Box>=2.038:../../mail/p5-Mail-Box
diff --git a/firefox-hg/Makefile b/firefox-hg/Makefile
index 49814fca9d..f7d100e735 100644
--- a/firefox-hg/Makefile
+++ b/firefox-hg/Makefile
@@ -54,14 +54,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-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index 09840ea065..06a70ca538 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -44,12 +44,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-default-toolkit=cairo-gtk3
 CONFIGURE_ARGS+=	--enable-pie
diff --git a/frida-glib2/Makefile b/frida-glib2/Makefile
index a12fc699f2..858774a4ac 100644
--- a/frida-glib2/Makefile
+++ b/frida-glib2/Makefile
@@ -32,8 +32,8 @@ CHECK_WRKREF_SKIP+=		bin/gtester-report
 # need pcre utf8 + unicode-properties
 BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.31
 # to avoid pkg-config dependency, explicitly specify pcre location
-CONFIGURE_ARGS+=	PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
-CONFIGURE_ARGS+=	PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
+CONFIGURE_ARGS+=		PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
+CONFIGURE_ARGS+=		PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
 
 # needs gz_header structure
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.2.1
diff --git a/frida-glib2/Makefile.common b/frida-glib2/Makefile.common
index eab8115ad0..4d7829400d 100644
--- a/frida-glib2/Makefile.common
+++ b/frida-glib2/Makefile.common
@@ -10,8 +10,8 @@
 DISTNAME=	glib-2.54.3
 PKGNAME=	frida-${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=frida/}
-GITHUB_TAG=     d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac
+MASTER_SITES=	${MASTER_SITE_GITHUB:=frida/}
+GITHUB_TAG=	d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac
 
 GITHUB_PROJECT=	glib
 
diff --git a/frida-glib2/modules.mk b/frida-glib2/modules.mk
index e563a7c701..a6cd710137 100644
--- a/frida-glib2/modules.mk
+++ b/frida-glib2/modules.mk
@@ -12,7 +12,7 @@ GIO_QUERYMODULES=	${BUILDLINK_PREFIX.glib2}/bin/gio-querymodules
 
 FILES_SUBST+=		GIO_MODULES_DIR=${GIO_MODULES_DIR:Q}
 FILES_SUBST+=		GIO_QUERYMODULES=${GIO_QUERYMODULES:Q}
-GIO_MODULES_DIR=${BUILDLINK_PREFIX.glib2}/lib/gio/modules
+GIO_MODULES_DIR=	${BUILDLINK_PREFIX.glib2}/lib/gio/modules
 INSTALL_TEMPLATES+=	../../devel/glib2/files/modules.tmpl
 DEINSTALL_TEMPLATES+=	../../devel/glib2/files/modules.tmpl
 
diff --git a/frida-glib2/schemas.mk b/frida-glib2/schemas.mk
index 14a916074a..604e8ba7d3 100644
--- a/frida-glib2/schemas.mk
+++ b/frida-glib2/schemas.mk
@@ -12,7 +12,7 @@ GLIB_COMPILE_SCHEMAS=	${BUILDLINK_PREFIX.glib2}/bin/glib-compile-schemas
 
 FILES_SUBST+=		GLIB_SCHEMAS_DIR=${GLIB_SCHEMAS_DIR:Q}
 FILES_SUBST+=		GLIB_COMPILE_SCHEMAS=${GLIB_COMPILE_SCHEMAS:Q}
-GLIB_SCHEMAS_DIR=${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas
+GLIB_SCHEMAS_DIR=	${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas
 INSTALL_TEMPLATES+=	../../devel/glib2/files/schemas.tmpl
 DEINSTALL_TEMPLATES+=	../../devel/glib2/files/schemas.tmpl
 
diff --git a/frida-libffi/Makefile b/frida-libffi/Makefile
index d0b595cbab..fdd04ed19e 100644
--- a/frida-libffi/Makefile
+++ b/frida-libffi/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	libffi-3.0.13
 PKGNAME=	frida-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=frida/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=frida/}
 GITHUB_TAG=	808ca2c69269f6df3ee6d33e22515d11739ffd5c
 
 GITHUB_PROJECT=	libffi
@@ -47,13 +47,13 @@ LIBS+=	-lm68k
 
 # fix http://gnats.netbsd.org/42865
 .if !empty(MACHINE_PLATFORM:MSunOS-*-i386) && !empty(CC_VERSION:Mgcc-[23]*)
-CPPFLAGS += -D__PIC__
+CPPFLAGS +=	-D__PIC__
 .endif
 
 # irix fixes from PR 48587
 .if !empty(OPSYS:MIRIX)
-USE_TOOLS+=     bash gmake
-MAKE_FLAGS+=SHELL=${TOOLS_DIR}/bin/bash
+USE_TOOLS+=	bash gmake
+MAKE_FLAGS+=	SHELL=${TOOLS_DIR}/bin/bash
 .endif
 
 FRIDA_SUBPREFIX=	frida
diff --git a/i2pd-git/Makefile b/i2pd-git/Makefile
index db24b7e1c4..014ba6b384 100644
--- a/i2pd-git/Makefile
+++ b/i2pd-git/Makefile
@@ -5,7 +5,7 @@
 GIT_SHA=	ce8d701ecb92be1563681ec9ce98a9e4d02041fd
 DISTNAME=	i2pd-${GIT_SHA}
 PKGNAME=	i2pd-git-${GIT_SHA}
-MASTER_SITES= -https://github.com/PurpleI2P/i2pd/archive/${GIT_SHA}.tar.gz
+MASTER_SITES=	-https://github.com/PurpleI2P/i2pd/archive/${GIT_SHA}.tar.gz
 WRKSRC=		${WRKDIR}/i2pd-${GIT_SHA}/build
 
 COMMENT=	Full-featured C++ implementation of I2P client
@@ -16,22 +16,22 @@ CMAKE_ARGS+=	-DWITH_LIBRARY=no
 I2PD_USER=	i2pd
 I2PD_GROUP=	i2pd
 
-CONFLICTS+= i2pd-[0-9]*
+CONFLICTS+=	i2pd-[0-9]*
 
 PKG_USERS=	${I2PD_USER}:${I2PD_GROUP}
 PKG_GROUPS=	${I2PD_GROUP}
 
-MAKE_DIRS+=${PREFIX}/etc/i2pd
-MAKE_DIRS+=${VARBASE}/db/i2pd
-MAKE_DIRS+=${VARBASE}/log/i2pd
-MAKE_DIRS+=${VARBASE}/run/i2pd
-
-MAKE_DIRS_PERMS+=${VARBASE}/db/i2pd \
-				 ${I2PD_USER} ${I2PD_GROUP} 0755
-MAKE_DIRS_PERMS+=${VARBASE}/log/i2pd \
-				 ${I2PD_USER} ${I2PD_GROUP} 0755
-MAKE_DIRS_PERMS+=${VARBASE}/run/i2pd \
-				 ${I2PD_USER} ${I2PD_GROUP} 0755
+MAKE_DIRS+=	${PREFIX}/etc/i2pd
+MAKE_DIRS+=	${VARBASE}/db/i2pd
+MAKE_DIRS+=	${VARBASE}/log/i2pd
+MAKE_DIRS+=	${VARBASE}/run/i2pd
+
+MAKE_DIRS_PERMS+=	${VARBASE}/db/i2pd \
+					${I2PD_USER} ${I2PD_GROUP} 0755
+MAKE_DIRS_PERMS+=	${VARBASE}/log/i2pd \
+					${I2PD_USER} ${I2PD_GROUP} 0755
+MAKE_DIRS_PERMS+=	${VARBASE}/run/i2pd \
+					${I2PD_USER} ${I2PD_GROUP} 0755
 
 post-install:
 	${INSTALL_DATA} ${DESTDIR}/${PREFIX}/etc/i2pd
diff --git a/i2pd/Makefile b/i2pd/Makefile
index 7e1e2e2559..be0c7edcb5 100644
--- a/i2pd/Makefile
+++ b/i2pd/Makefile
@@ -37,11 +37,11 @@ INSTALLATION_DIRS+=	var/i2pd
 INSTALLATION_DIRS+=	var/i2pd/certificates
 
 .if ${OPSYS} == "NetBSD" # NetBSD-specific config
-CONF_FILES+= ${EGDIR}/i2pd.conf.NetBSD \
-		${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
+CONF_FILES+=	${EGDIR}/i2pd.conf.NetBSD \
+		   ${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
 .else
-CONF_FILES+= ${EGDIR}/i2pd.conf \
-		${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
+CONF_FILES+=	${EGDIR}/i2pd.conf \
+		   ${PREFIX}/${PKG_SYSCONFDIR}/i2pd.conf
 .endif
 
 RCD_SCRIPTS+=		i2pd
@@ -51,16 +51,16 @@ MAKE_DIRS+=	${VARBASE}/log/i2pd
 MAKE_DIRS+=	${VARBASE}/run/i2pd
 
 MAKE_DIRS_PERMS+=	${VARBASE}/log/i2pd \
-		${I2PD_USER} ${I2PD_GROUP} 0755
+			${I2PD_USER} ${I2PD_GROUP} 0755
 
 MAKE_DIRS_PERMS+=	${VARBASE}/run/i2pd \
-		${I2PD_USER} ${I2PD_GROUP} 0700
+			${I2PD_USER} ${I2PD_GROUP} 0700
 
 MAKE_DIRS_PERMS+=	${PREFIX}/var/i2pd \
-		${I2PD_USER} ${I2PD_GROUP} 0700
+			${I2PD_USER} ${I2PD_GROUP} 0700
 
 MAKE_DIRS_PERMS+=	${PREFIX}/var/i2pd/certificates \
-		${I2PD_USER} ${I2PD_GROUP} 0700
+			${I2PD_USER} ${I2PD_GROUP} 0700
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/debian/i2pd.1 \
diff --git a/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index 6e35fb458d..a80e4fbd8c 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -73,9 +73,9 @@ CONFIGURE_ARGS+=	PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
 			PTHREADSTUBS_LIBS=-L${PREFIX}/lib
 .endif
 
-PLIST_VARS+=	libkms	
+PLIST_VARS+=		libkms	
 .if !empty(PKG_OPTIONS:Mlibkms)
-PLIST.libkms=	yes
+PLIST.libkms=		yes
 CONFIGURE_ARGS+=	--enable-libkms
 .else
 CONFIGURE_ARGS+=	--disable-libkms
diff --git a/libdrm-dfbsd/builtin.mk b/libdrm-dfbsd/builtin.mk
index d9fe1b4f32..1b52d9b25e 100644
--- a/libdrm-dfbsd/builtin.mk
+++ b/libdrm-dfbsd/builtin.mk
@@ -1,6 +1,6 @@
 # $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
 
-BUILTIN_PKG:=	libdrm
+BUILTIN_PKG:=		libdrm
 PKGCONFIG_FILE.libdrm=	${X11BASE}/lib/pkgconfig/libdrm.pc
 PKGCONFIG_FILE.libdrm+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/libdrm.pc
 
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index 32dc952d2f..fe93e91e89 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=	inet6
 
 PKG_SUPPORTED_OPTIONS+=	devd
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= devd
+PKG_SUGGESTED_OPTIONS+=	devd
 .endif
 
 .if ${X11_TYPE} == "modular"
diff --git a/obnc/Makefile b/obnc/Makefile
index a1d435b1cd..05745878a7 100644
--- a/obnc/Makefile
+++ b/obnc/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 WRKSRC=	${WRKDIR}/${PKGNAME_NOREV}
 
-USE_LANGUAGE=c
+USE_LANGUAGE=	c
 
 do-build:
 	cd ${WRKSRC} && \
diff --git a/oksh/Makefile b/oksh/Makefile
index 5859f1cfa8..b9b48f0d8a 100644
--- a/oksh/Makefile
+++ b/oksh/Makefile
@@ -10,6 +10,6 @@ COMMENT=	Portable OpenBSD ksh(1)
 WRKSRC=		${WRKDIR}/${PKGNAME}
 LICENSE=	original-bsd
 
-GNU_CONFIGURE=          yes
+GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/openafs-git/Makefile b/openafs-git/Makefile
index 442a08c926..9de2744c4b 100644
--- a/openafs-git/Makefile
+++ b/openafs-git/Makefile
@@ -14,9 +14,9 @@ CONFLICTS+=	heimdal-[0-9]*
 CONFLICTS+=	rx-[0-9]*
 
 .if 0
-MAKE_JOBS_SAFE=no
+MAKE_JOBS_SAFE=	no
 .else
-USE_TOOLS+=		gmake
+USE_TOOLS+=	gmake
 .endif
 
 GNU_CONFIGURE=		yes
@@ -30,9 +30,9 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-roken=internal
 
-USE_GNU_CONFIGURE_HOST= no
+USE_GNU_CONFIGURE_HOST=	no
 
-WRKSRC=         ${WRKDIR}/openafs
+WRKSRC=		${WRKDIR}/openafs
 
 PLIST_SRC+=		${.CURDIR}/PLIST
 OWN_DIRS+=		${PKG_SYSCONFDIR}/openafs
@@ -43,7 +43,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
 
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 
-BUILD_DEFS+= VARBASE
+BUILD_DEFS+=	VARBASE
 
 #
 # Rename liblwp.a to libafslwp.a to avoid conflict with the lwp package.
diff --git a/openafs-git/options.mk b/openafs-git/options.mk
index e0a6d30288..a504fb61a7 100644
--- a/openafs-git/options.mk
+++ b/openafs-git/options.mk
@@ -2,25 +2,25 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.openafs
-PKG_SUPPORTED_OPTIONS+= server bitmap-later
-PKG_SUPPORTED_OPTIONS+= kernel-module supergroups namei
-PKG_SUGGESTED_OPTIONS=  server -bitmap-later
-PKG_SUGGESTED_OPTIONS+= namei -kernel-module -supergroups
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openafs
+PKG_SUPPORTED_OPTIONS+=	server bitmap-later
+PKG_SUPPORTED_OPTIONS+=	kernel-module supergroups namei
+PKG_SUGGESTED_OPTIONS=	server -bitmap-later
+PKG_SUGGESTED_OPTIONS+=	namei -kernel-module -supergroups
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msupergroups)
-CONFIGURE_ARGS+=        --enable-supergroups
+CONFIGURE_ARGS+=	--enable-supergroups
 .endif
 .if !empty(PKG_OPTIONS:Mbitmap-later)
-CONFIGURE_ARGS+=        --enable-bitmap-later
+CONFIGURE_ARGS+=	--enable-bitmap-later
 .endif
 .if !empty(PKG_OPTIONS:Mkernel-module)
-CONFIGURE_ARGS+=        --enable-kernel-module
+CONFIGURE_ARGS+=	--enable-kernel-module
 .else
-CONFIGURE_ARGS+=        --disable-kernel-module
+CONFIGURE_ARGS+=	--disable-kernel-module
 .endif
 .if !empty(PKG_OPTIONS:Mnamei)
-CONFIGURE_ARGS+=        --enable-namei-fileserver
+CONFIGURE_ARGS+=	--enable-namei-fileserver
 .endif
diff --git a/openblas/Makefile.common b/openblas/Makefile.common
index c83b099387..399283e045 100644
--- a/openblas/Makefile.common
+++ b/openblas/Makefile.common
@@ -39,7 +39,7 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	c fortran
 USE_TOOLS+=	gmake perl:build
 
-NO_CONFIGURE=   yes
+NO_CONFIGURE=	yes
 
 TEST_TARGET=	tests
 
@@ -51,22 +51,22 @@ MAKE_FLAGS+=	FFLAGS=${FFLAGS:Q}
 
 # You may override the autodetected thread count limit.
 # Default is detected from build host.
-BUILD_DEFS+=    OPENBLAS_THREAD_LIMIT
+BUILD_DEFS+=	OPENBLAS_THREAD_LIMIT
 
 # Default checks number of cores of build host.
 # Do we want a pkgsrc-wide default?
 .if !empty(OPENBLAS_THREAD_LIMIT)
-MAKE_FLAGS+=	NUM_THREADS=${OPENBLAS_THREAD_LIMIT:Q}
+MAKE_FLAGS+=		NUM_THREADS=${OPENBLAS_THREAD_LIMIT:Q}
 .endif
 BENCHMARK_MAXTHREADS?=	8
 .if ${MACHINE_ARCH:M*64} == ""
-MAKE_FLAGS+=	BINARY32=1
+MAKE_FLAGS+=		BINARY32=1
 .else
-MAKE_FLAGS+=	BINARY64=1
+MAKE_FLAGS+=		BINARY64=1
 .endif
 # Those come in separate BLAS-agnostic packages.
 # ... except we start headaches about ILP64?
-MAKE_FLAGS+=	NO_CBLAS=1 NO_LAPACKE=1
+MAKE_FLAGS+=		NO_CBLAS=1 NO_LAPACKE=1
 
 # Separate headers and cmake stuff.
 MAKE_FLAGS+=	OPENBLAS_INCLUDE_DIR=${PREFIX}/include/${OPENBLAS_VARIANT}
@@ -138,9 +138,9 @@ SUBST_FILES.threads+=	${WRKSRC}/ctest/Makefile
 
 # Fix up pkgconfig file installation.
 SUBST_CLASSES+=		pc
-SUBST_STAGE.pc=	post-patch
-SUBST_SED.pc+=	-e 's+-lopenblas+-l${OPENBLAS_VARIANT}+'
-SUBST_SED.pc+=	-e 's+openblas.pc$$+${OPENBLAS_VARIANT}.pc+'
+SUBST_STAGE.pc=		post-patch
+SUBST_SED.pc+=		-e 's+-lopenblas+-l${OPENBLAS_VARIANT}+'
+SUBST_SED.pc+=		-e 's+openblas.pc$$+${OPENBLAS_VARIANT}.pc+'
 SUBST_FILES.pc+=	Makefile.install openblas.pc.in
 
 post-extract:
diff --git a/openblas_openmp/buildlink3.mk b/openblas_openmp/buildlink3.mk
index 8894717bde..95bd6ccf7f 100644
--- a/openblas_openmp/buildlink3.mk
+++ b/openblas_openmp/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openblas_openmp
 OPENBLAS_OPENMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openblas_openmp+=	openblas_openmp>=0.2.20
-BUILDLINK_PKGSRCDIR.openblas_openmp?=		../../wip/openblas_openmp
+BUILDLINK_PKGSRCDIR.openblas_openmp?=	../../wip/openblas_openmp
 .endif	# OPENBLAS_OPENMP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-openblas_openmp
diff --git a/openscad/Makefile b/openscad/Makefile
index 570f83ff89..6a3b2042c7 100644
--- a/openscad/Makefile
+++ b/openscad/Makefile
@@ -17,7 +17,7 @@ USE_LIBTOOL=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
-CHECK_PORTABILITY_SKIP+=tests/compare-bitmaps.sh
+CHECK_PORTABILITY_SKIP+=	tests/compare-bitmaps.sh
 
 REPLACE_PYTHON=	libraries/MCAD/get_submodules.py
 .include "../../lang/python/application.mk"
diff --git a/oranchelo-icon-theme/Makefile b/oranchelo-icon-theme/Makefile
index cd86f2b0c6..f7cddf39fb 100644
--- a/oranchelo-icon-theme/Makefile
+++ b/oranchelo-icon-theme/Makefile
@@ -12,9 +12,9 @@ HOMEPAGE=	https://github.com/OrancheloTeam/oranchelo-icon-theme/
 COMMENT=	Flat icon theme for XFCE
 LICENSE=	gnu-gpl-v3
 
-ICON_THEMES=	yes
-NO_BUILD=	yes
-USE_LANGUAGES=	# none
+ICON_THEMES=		yes
+NO_BUILD=		yes
+USE_LANGUAGES=		# none
 INSTALLATION_DIRS=	share/icons
 
 
diff --git a/pipes-c/Makefile b/pipes-c/Makefile
index 13ba016efb..fc25c2bc32 100644
--- a/pipes-c/Makefile
+++ b/pipes-c/Makefile
@@ -12,6 +12,6 @@ HOMEPAGE=	https://github.com/pipeseroni/pipes.c/
 COMMENT=	Mimics the "pipes" screensaver in a terminal window
 LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/plink2/Makefile b/plink2/Makefile
index 709026ec9a..eb7d21fde4 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -29,7 +29,7 @@ MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -llapack -lcblas -lblas"
 # Keep debug info until at least next beta
 # INSTALL_TARGET=	install-strip
 
-PORTVERSION=	0.0.0.20180518
+PORTVERSION=		0.0.0.20180518
 USE_BUILTIN.zlib=	no
 
 MAKE_FILE=	${FILESDIR}/Makefile.generic
diff --git a/printrun/Makefile b/printrun/Makefile
index 73522d1df5..91ada0469d 100644
--- a/printrun/Makefile
+++ b/printrun/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-GITHUB_PROJECT= Printrun
-DISTNAME=       printrun-1.6.0
+GITHUB_PROJECT=	Printrun
+DISTNAME=	printrun-1.6.0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=kliment/}
-GITHUB_TAG=     ${DISTNAME}
+GITHUB_TAG=	${DISTNAME}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.pronterface.com/
@@ -14,22 +14,22 @@ LICENSE=	gnu-gpl-v3
 #PYTHON_VERSIONS_ACCEPTED=	36 35 34 27
 PYTHON_VERSIONS_ACCEPTED=	27
 
-DEPENDS+=       ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-DEPENDS+=       ${PYPKGPREFIX}-readline>=1.0:../../devel/py-readline
-DEPENDS+=       ${PYPKGPREFIX}-serial>=2.6:../../comms/py-serial
-DEPENDS+=       ${PYPKGPREFIX}-numpy>=1.8.2:../../math/py-numpy
-DEPENDS+=       ${PYPKGPREFIX}-pyglet>=1.1:../../wip/py-pyglet
-DEPENDS+=       ${PYPKGPREFIX}-cairo>=1.8.8:../../graphics/py-cairo
-DEPENDS+=       ${PYPKGPREFIX}-cairosvg>=1.0.9:../../converters/py27-cairosvg
+DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-readline>=1.0:../../devel/py-readline
+DEPENDS+=	${PYPKGPREFIX}-serial>=2.6:../../comms/py-serial
+DEPENDS+=	${PYPKGPREFIX}-numpy>=1.8.2:../../math/py-numpy
+DEPENDS+=	${PYPKGPREFIX}-pyglet>=1.1:../../wip/py-pyglet
+DEPENDS+=	${PYPKGPREFIX}-cairo>=1.8.8:../../graphics/py-cairo
+DEPENDS+=	${PYPKGPREFIX}-cairosvg>=1.0.9:../../converters/py27-cairosvg
 #Meh linux sleep thing same with the dbus req.
-#DEPENDS+=       ${PYPKGPREFIX}-psutil>=5.2.2:../../sysutil/py-psutil
-DEPENDS+=       ${PYPKGPREFIX}-gobject>=2.14.0:../../devel/py-gobject
-DEPENDS+=       ${PYPKGPREFIX}-libxml2>=2.9.1:../../textproc/py-libxml2
+#DEPENDS+=	${PYPKGPREFIX}-psutil>=5.2.2:../../sysutil/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-gobject>=2.14.0:../../devel/py-gobject
+DEPENDS+=	${PYPKGPREFIX}-libxml2>=2.9.1:../../textproc/py-libxml2
 
-PYSETUP=        	setup.py
+PYSETUP=		setup.py
 #Meh patch it for now
 #PYSETUPINSTALLARGS=	--prefix=${PREFIX}
-REPLACE_PYTHON+=        *.py
+REPLACE_PYTHON+=	*.py
 
 #do-install:
 #	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} setup.py install --root=${DESTDIR} --prefix=${PREFIX}
diff --git a/py-absl-py/Makefile b/py-absl-py/Makefile
index 215a690bd9..63d130e090 100644
--- a/py-absl-py/Makefile
+++ b/py-absl-py/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD$
 
 DISTNAME=	absl-py-0.1.13
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     devel python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=a/absl-py/}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/absl-py/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/abseil/abseil-py
 COMMENT=	Abseil Python Common Libraries
 LICENSE=	apache-2.0
 
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/absl-py-${PKGVERSION_NOREV}
diff --git a/py-aniso8601/Makefile b/py-aniso8601/Makefile
index 66c0ead2e0..04c5e53132 100644
--- a/py-aniso8601/Makefile
+++ b/py-aniso8601/Makefile
@@ -1,18 +1,18 @@
 # $NetBSD$
 
 DISTNAME=	aniso8601-3.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	time
-MASTER_SITES=   ${MASTER_SITE_PYPI:=a/aniso8601/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/aniso8601/}
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://bitbucket.org/nielsenb/aniso8601
 COMMENT=	Library for parsing ISO 8601 strings
-LICENSE=        modified-bsd
+LICENSE=	modified-bsd
 
 
-DEPENDS+=       ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
-DEPENDS+=       ${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
 
 
 .include "../../lang/python/egg.mk"
diff --git a/py-django-crispy-forms/Makefile b/py-django-crispy-forms/Makefile
index 64ff92b9bb..7e2f4fdf71 100644
--- a/py-django-crispy-forms/Makefile
+++ b/py-django-crispy-forms/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	django-crispy-forms-1.7.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=d/django-crispy-forms/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-crispy-forms/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	http://github.com/maraujop/django-crispy-forms
@@ -11,7 +11,7 @@ COMMENT=	Best way to have Django DRY forms
 LICENSE=	mit
 
 
-DEPENDS+=       ${PYPKGPREFIX}-django>=1.11:../../www/py-django
+DEPENDS+=	${PYPKGPREFIX}-django>=1.11:../../www/py-django
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/django-crispy-forms-1.7.2
diff --git a/py-django-jsonfield/Makefile b/py-django-jsonfield/Makefile
index 22d48c8e29..07a086b538 100644
--- a/py-django-jsonfield/Makefile
+++ b/py-django-jsonfield/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	django-jsonfield-1.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-jsonfield/}
 
diff --git a/py-django-picklefield/Makefile b/py-django-picklefield/Makefile
index 3625794f29..5780b3d9b1 100644
--- a/py-django-picklefield/Makefile
+++ b/py-django-picklefield/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	django-picklefield-1.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=d/django-picklefield/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-picklefield/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/gintas/django-picklefield	
diff --git a/py-django-sudo/Makefile b/py-django-sudo/Makefile
index bdfc88b93b..f8c71acc5f 100644
--- a/py-django-sudo/Makefile
+++ b/py-django-sudo/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	django-sudo-2.1.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	secutiry python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-sudo/}
 
diff --git a/py-django-templatetag-sugar/Makefile b/py-django-templatetag-sugar/Makefile
index f96b698fdd..0bcee8cc14 100644
--- a/py-django-templatetag-sugar/Makefile
+++ b/py-django-templatetag-sugar/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	django-templatetag-sugar-1.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-templatetag-sugar/}
 
diff --git a/py-email-reply-parser/Makefile b/py-email-reply-parser/Makefile
index 17eef0c34f..a0a778368b 100644
--- a/py-email-reply-parser/Makefile
+++ b/py-email-reply-parser/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	email_reply_parser-0.1.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/_/-/:S/_/-/}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/:S/_/-/}
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/email_reply_parser/}
 
diff --git a/py-factory_boy/Makefile b/py-factory_boy/Makefile
index 81a5caa4f6..f2e5429ef6 100644
--- a/py-factory_boy/Makefile
+++ b/py-factory_boy/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD$
 
 DISTNAME=	factory_boy-2.10.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_PYPI:=f/factory_boy/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/factory_boy/}
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/FactoryBoy/factory_boy
 COMMENT=	Versatile test fixtures replacement
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
-DEPENDS+=       ${PYPKGPREFIX}-faker>=0.7.0:../../devel/py-faker
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-faker>=0.7.0:../../devel/py-faker
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-flask-migrate/Makefile b/py-flask-migrate/Makefile
index 8af08eb13f..22201821ae 100644
--- a/py-flask-migrate/Makefile
+++ b/py-flask-migrate/Makefile
@@ -1,18 +1,18 @@
 # $NetBSD$
 
 DISTNAME=	Flask-Migrate-2.1.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     devel
-MASTER_SITES=   ${MASTER_SITE_PYPI:=F/Flask-Migrate/}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-Migrate/}
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	http://github.com/miguelgrinberg/flask-migrate/
 COMMENT=	SQLAlchemy database migrations for Flask applications
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-flask>=0.10:../../www/py-flask
-DEPENDS+=       ${PYPKGPREFIX}-flask-sqlalchemy>=1.0:../../www/py-flask-sqlalchemy
-DEPENDS+=       ${PYPKGPREFIX}-alembic>=0.6:../../databases/py-alembic
+DEPENDS+=	${PYPKGPREFIX}-flask>=0.10:../../www/py-flask
+DEPENDS+=	${PYPKGPREFIX}-flask-sqlalchemy>=1.0:../../www/py-flask-sqlalchemy
+DEPENDS+=	${PYPKGPREFIX}-alembic>=0.6:../../databases/py-alembic
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-flask-restful/Makefile b/py-flask-restful/Makefile
index f6f4f231cd..9d58cf07f7 100644
--- a/py-flask-restful/Makefile
+++ b/py-flask-restful/Makefile
@@ -1,22 +1,22 @@
 # $NetBSD$
 
 DISTNAME=	Flask-RESTful-0.3.6
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=   ${MASTER_SITE_PYPI:=F/Flask-RESTful/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=F/Flask-RESTful/}
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://www.github.com/flask-restful/flask-restful/
 COMMENT=	Simple framework for creating REST APIs
 LICENSE=	modified-bsd
 
 
-DEPENDS+=       ${PYPKGPREFIX}-sphinx>=1.6.3:../../textproc/py-sphinx
-DEPENDS+=       ${PYPKGPREFIX}-crypto>=2.6:../../security/py-crypto
-DEPENDS+=       ${PYPKGPREFIX}-flask>=0.10:../../www/py-flask
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.3.0:../../lang/py-six
-DEPENDS+=       ${PYPKGPREFIX}-aniso8601>=0.82:../../wip/py-aniso8601
-DEPENDS+=       ${PYPKGPREFIX}-six>=[0-9]*:../../time/py-pytz
+DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.6.3:../../textproc/py-sphinx
+DEPENDS+=	${PYPKGPREFIX}-crypto>=2.6:../../security/py-crypto
+DEPENDS+=	${PYPKGPREFIX}-flask>=0.10:../../www/py-flask
+DEPENDS+=	${PYPKGPREFIX}-six>=1.3.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-aniso8601>=0.82:../../wip/py-aniso8601
+DEPENDS+=	${PYPKGPREFIX}-six>=[0-9]*:../../time/py-pytz
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/Flask-RESTful-0.3.6
diff --git a/py-gast/Makefile b/py-gast/Makefile
index 5b78ca9a83..9720c56ce4 100644
--- a/py-gast/Makefile
+++ b/py-gast/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	gast-0.2.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/gast/}
 
diff --git a/py-hiredis/Makefile b/py-hiredis/Makefile
index 26bb5bcebe..92b443f9d7 100644
--- a/py-hiredis/Makefile
+++ b/py-hiredis/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	hiredis-0.2.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/hiredis/}
 
diff --git a/py-honcho/Makefile b/py-honcho/Makefile
index a319fc8f52..3ff26f6519 100644
--- a/py-honcho/Makefile
+++ b/py-honcho/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	honcho-1.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/honcho/}
 
@@ -11,7 +11,7 @@ COMMENT=	Clone of Foreman, for managing Procfile-based applications
 LICENSE=	mit
 
 
-DEPENDS+=       ${PYPKGPREFIX}-jinja2>=2.10:../../textproc/py-jinja2
+DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.10:../../textproc/py-jinja2
 
 .include "../../lang/python/egg.mk"
 USE_LANGUAGES=	# none
diff --git a/py-marshmallow/Makefile b/py-marshmallow/Makefile
index f42e1d9a6a..1bf0522924 100644
--- a/py-marshmallow/Makefile
+++ b/py-marshmallow/Makefile
@@ -1,18 +1,18 @@
 # $NetBSD$
 
 DISTNAME=	marshmallow-3.0.0b8
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=   ${MASTER_SITE_PYPI:=m/marshmallow/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/marshmallow/}
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/marshmallow-code/marshmallow
 COMMENT=	Library for converting complex datatypes
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
-DEPENDS+=       ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
-DEPENDS+=       ${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/marshmallow-3.0.0b8
diff --git a/py-milksnake/Makefile b/py-milksnake/Makefile
index 815574cb6f..20951c3093 100644
--- a/py-milksnake/Makefile
+++ b/py-milksnake/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	milksnake-0.1.5
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/milksnake/}
 EXTRACT_SUFX=	.zip
@@ -12,7 +12,7 @@ COMMENT=	Library that extends setuptools for binary extensions
 LICENSE=	apache-2.0
 
 
-DEPENDS+=       ${PYPKGPREFIX}-cffi>=1.6.0:../../devel/py-cffi
+DEPENDS+=	${PYPKGPREFIX}-cffi>=1.6.0:../../devel/py-cffi
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-mmh3/Makefile b/py-mmh3/Makefile
index b68643db4f..430b3aeee6 100644
--- a/py-mmh3/Makefile
+++ b/py-mmh3/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	mmh3-2.5.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/mmh3/}
 
diff --git a/py-percy/Makefile b/py-percy/Makefile
index e1351e555c..6cb3b3cf84 100644
--- a/py-percy/Makefile
+++ b/py-percy/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	percy-1.1.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=p/percy/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/percy/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/percy/python-percy-client
diff --git a/py-petname/Makefile b/py-petname/Makefile
index 7b85f8970d..81feb81c2d 100644
--- a/py-petname/Makefile
+++ b/py-petname/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	petname-2.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/petname/}
 
diff --git a/py-picture-to-gds/Makefile b/py-picture-to-gds/Makefile
index 954cdbfb78..d9964e1de1 100644
--- a/py-picture-to-gds/Makefile
+++ b/py-picture-to-gds/Makefile
@@ -22,7 +22,7 @@ INSTALL_DIR=	${PREFIX}/bin
 SHARE_DIR=	${PREFIX}/picture-to-gds/share
 USE_LANGUAGES=	# empty
 
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36
 
 do-install:
 	( cd ${WRKSRC};\
diff --git a/py-python-decouple/Makefile b/py-python-decouple/Makefile
index f5d29f488d..cb7f2fd60d 100644
--- a/py-python-decouple/Makefile
+++ b/py-python-decouple/Makefile
@@ -1,16 +1,16 @@
 # $NetBSD$
 
 DISTNAME=	python-decouple-3.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils
-MASTER_SITES=   ${MASTER_SITE_PYPI:=p/python-decouple/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-decouple/}
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
+MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	http://github.com/henriquebastos/python-decouple/
 COMMENT=	Strict separation of settings from code
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/python-decouple-3.1
diff --git a/py-rb/Makefile b/py-rb/Makefile
index ff4c5dbe1c..3c7ebbf6c6 100644
--- a/py-rb/Makefile
+++ b/py-rb/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	rb-1.7
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/rb/}
 
@@ -11,7 +11,7 @@ COMMENT=	The redis blaster
 LICENSE=	apache-2.0
 
 
-DEPENDS+=       redis>=4.0.9:../../databases/redis
+DEPENDS+=	redis>=4.0.9:../../databases/redis
 
 .include "../../lang/python/egg.mk"
 USE_LANGUAGES=	# none
diff --git a/py-redis-cluster/Makefile b/py-redis-cluster/Makefile
index 1e31ef9fdd..1b28162c54 100644
--- a/py-redis-cluster/Makefile
+++ b/py-redis-cluster/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	redis-py-cluster-1.3.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py-//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py-//}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/redis-py-cluster/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/grokzen/redis-py-cluster/
 COMMENT=	Cluster library for redis 3.0.0 built on top of redis-py
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-redis-[0-9]*:../../databases/py-redis
+DEPENDS+=	${PYPKGPREFIX}-redis-[0-9]*:../../databases/py-redis
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sentry/Makefile b/py-sentry/Makefile
index b52ead1052..be652e8c3d 100644
--- a/py-sentry/Makefile
+++ b/py-sentry/Makefile
@@ -13,62 +13,62 @@ LICENSE=	modified-bsd
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 
-DEPENDS+=      ${PYPKGPREFIX}-boto3>=1.6.2:../../net/py-boto3
-DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.1.6:../../devel/py-enum34
-DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.9.2:../../net/py-botocore
-DEPENDS+=      ${PYPKGPREFIX}-celery>=4.1.0:../../net/py-celery
-DEPENDS+=      ${PYPKGPREFIX}-click>=6.7:../../devel/py-click
-DEPENDS+=      ${PYPKGPREFIX}-cssutils>=1.0.2:../../textproc/py-cssutils
-DEPENDS+=      ${PYPKGPREFIX}-dateutil>=2.7.0:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-django>=1.11.11:../../www/py-django
-DEPENDS+=      ${PYPKGPREFIX}-django-crispy-forms>=1.7.2:../../wip/py-django-crispy-forms
-DEPENDS+=      ${PYPKGPREFIX}-django-jsonfield>=1.0.1:../../wip/py-django-jsonfield
-DEPENDS+=      ${PYPKGPREFIX}-django-picklefield>=1.0.0:../../wip/py-django-picklefield
-DEPENDS+=      ${PYPKGPREFIX}-django-sudo>=2.1.0:../../wip/py-django-sudo
-DEPENDS+=      ${PYPKGPREFIX}-django-templatetag-sugar>=1.0:../../wip/py-django-templatetag-sugar
-DEPENDS+=      ${PYPKGPREFIX}-djangorestframework>=3.7.7:../../www/py-djangorestframework
-DEPENDS+=      ${PYPKGPREFIX}-email-reply-parser>=0.1.1:../../wip/py-email-reply-parser
-DEPENDS+=      ${PYPKGPREFIX}-exam>=0.10.6:../../devel/py-exam
-DEPENDS+=      ${PYPKGPREFIX}-hiredis>=0.2.0:../../wip/py-hiredis
-DEPENDS+=      ${PYPKGPREFIX}-honcho>=1.0.1:../../wip/py-honcho
-DEPENDS+=      ${PYPKGPREFIX}-ipaddress>=1.0.19:../../net/py-ipaddress
-DEPENDS+=      ${PYPKGPREFIX}-kombu>=4.1.0:../../net/py-kombu
-DEPENDS+=      ${PYPKGPREFIX}-loremipsum>=1.0.5:../../textproc/py-loremipsum
-DEPENDS+=      ${PYPKGPREFIX}-lxml>=4.2.1:../../textproc/py-lxml
-DEPENDS+=      ${PYPKGPREFIX}-memcached>=1.59:../../devel/py-memcached
-DEPENDS+=      ${PYPKGPREFIX}-mmh3>=2.5.1:../../wip/py-mmh3
-DEPENDS+=      ${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock
-DEPENDS+=      ${PYPKGPREFIX}-oauth2>=1.5.211:../../security/py-oauth2
-DEPENDS+=      ${PYPKGPREFIX}-openid>=2.2.5:../../security/py-openid
-DEPENDS+=      ${PYPKGPREFIX}-Pillow>=5.0.0:../../graphics/py-Pillow
-DEPENDS+=      ${PYPKGPREFIX}-percy>=1.1.2:../../wip/py-percy
-DEPENDS+=      ${PYPKGPREFIX}-petname>=2.2:../../wip/py-petname
-DEPENDS+=      ${PYPKGPREFIX}-progressbar2>=3.6.0:../../wip/py-progressbar2
-DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2.7.4:../../databases/py-psycopg2
-DEPENDS+=      ${PYPKGPREFIX}-pyaml>=17.12.1:../../textproc/py-pyaml
-DEPENDS+=      ${PYPKGPREFIX}-qrcode>=5.3:../../graphics/py-qrcode
-DEPENDS+=      ${PYPKGPREFIX}-raven>=6.6.0:../../www/py-raven
-DEPENDS+=      ${PYPKGPREFIX}-rb>=1.7:../../wip/py-rb
-DEPENDS+=      ${PYPKGPREFIX}-redis-cluster>=1.3.4:../../wip/py-redis-cluster
-DEPENDS+=      ${PYPKGPREFIX}-redis>=2.10.6:../../databases/py-redis
-DEPENDS+=      ${PYPKGPREFIX}-requests>=2.18.4:../../devel/py-requests
-DEPENDS+=      ${PYPKGPREFIX}-selenium>=3.11.0:../../www/py-selenium
-DEPENDS+=      ${PYPKGPREFIX}-setproctitle>=1.1.10:../../sysutils/py-setproctitle
-DEPENDS+=      ${PYPKGPREFIX}-simplejson>=3.13.0:../../converters/py-simplejson
-DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
-DEPENDS+=      ${PYPKGPREFIX}-sqlparse>=0.2.4:../../databases/py-sqlparse
-DEPENDS+=      ${PYPKGPREFIX}-statsd>=3.2.2:../../wip/py-statsd
-DEPENDS+=      ${PYPKGPREFIX}-structlog>=18.1.0:../../sysutils/py-structlog
-DEPENDS+=      ${PYPKGPREFIX}-symbolic>=5.0.1:../../wip/py-symbolic
-DEPENDS+=      ${PYPKGPREFIX}-test-django>=3.1.2:../../www/py-test-django
-DEPENDS+=      ${PYPKGPREFIX}-test-html>=1.17.0:../../wip/py-test-html
-DEPENDS+=      ${PYPKGPREFIX}-test-metadata>=1.7.0:../../wip/py-test-metadata
-DEPENDS+=      ${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
-DEPENDS+=      ${PYPKGPREFIX}-toronado>=0.0.11:../../wip/py-toronado
-DEPENDS+=      ${PYPKGPREFIX}-u2flib-server>=5.0.0:../../wip/py-u2flib-server
-DEPENDS+=      ${PYPKGPREFIX}-ua-parser>=0.8.0:../../wip/py-ua-parser
-DEPENDS+=      ${PYPKGPREFIX}-urllib3>=1.22:../../www/py-urllib3
-DEPENDS+=      ${PYPKGPREFIX}-uwsgi>=2.0.17:../../www/py-uwsgi
+DEPENDS+=	${PYPKGPREFIX}-boto3>=1.6.2:../../net/py-boto3
+DEPENDS+=	${PYPKGPREFIX}-botocore>=1.1.6:../../devel/py-enum34
+DEPENDS+=	${PYPKGPREFIX}-botocore>=1.9.2:../../net/py-botocore
+DEPENDS+=	${PYPKGPREFIX}-celery>=4.1.0:../../net/py-celery
+DEPENDS+=	${PYPKGPREFIX}-click>=6.7:../../devel/py-click
+DEPENDS+=	${PYPKGPREFIX}-cssutils>=1.0.2:../../textproc/py-cssutils
+DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.7.0:../../time/py-dateutil
+DEPENDS+=	${PYPKGPREFIX}-django>=1.11.11:../../www/py-django
+DEPENDS+=	${PYPKGPREFIX}-django-crispy-forms>=1.7.2:../../wip/py-django-crispy-forms
+DEPENDS+=	${PYPKGPREFIX}-django-jsonfield>=1.0.1:../../wip/py-django-jsonfield
+DEPENDS+=	${PYPKGPREFIX}-django-picklefield>=1.0.0:../../wip/py-django-picklefield
+DEPENDS+=	${PYPKGPREFIX}-django-sudo>=2.1.0:../../wip/py-django-sudo
+DEPENDS+=	${PYPKGPREFIX}-django-templatetag-sugar>=1.0:../../wip/py-django-templatetag-sugar
+DEPENDS+=	${PYPKGPREFIX}-djangorestframework>=3.7.7:../../www/py-djangorestframework
+DEPENDS+=	${PYPKGPREFIX}-email-reply-parser>=0.1.1:../../wip/py-email-reply-parser
+DEPENDS+=	${PYPKGPREFIX}-exam>=0.10.6:../../devel/py-exam
+DEPENDS+=	${PYPKGPREFIX}-hiredis>=0.2.0:../../wip/py-hiredis
+DEPENDS+=	${PYPKGPREFIX}-honcho>=1.0.1:../../wip/py-honcho
+DEPENDS+=	${PYPKGPREFIX}-ipaddress>=1.0.19:../../net/py-ipaddress
+DEPENDS+=	${PYPKGPREFIX}-kombu>=4.1.0:../../net/py-kombu
+DEPENDS+=	${PYPKGPREFIX}-loremipsum>=1.0.5:../../textproc/py-loremipsum
+DEPENDS+=	${PYPKGPREFIX}-lxml>=4.2.1:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-memcached>=1.59:../../devel/py-memcached
+DEPENDS+=	${PYPKGPREFIX}-mmh3>=2.5.1:../../wip/py-mmh3
+DEPENDS+=	${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock
+DEPENDS+=	${PYPKGPREFIX}-oauth2>=1.5.211:../../security/py-oauth2
+DEPENDS+=	${PYPKGPREFIX}-openid>=2.2.5:../../security/py-openid
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=5.0.0:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-percy>=1.1.2:../../wip/py-percy
+DEPENDS+=	${PYPKGPREFIX}-petname>=2.2:../../wip/py-petname
+DEPENDS+=	${PYPKGPREFIX}-progressbar2>=3.6.0:../../wip/py-progressbar2
+DEPENDS+=	${PYPKGPREFIX}-psycopg2>=2.7.4:../../databases/py-psycopg2
+DEPENDS+=	${PYPKGPREFIX}-pyaml>=17.12.1:../../textproc/py-pyaml
+DEPENDS+=	${PYPKGPREFIX}-qrcode>=5.3:../../graphics/py-qrcode
+DEPENDS+=	${PYPKGPREFIX}-raven>=6.6.0:../../www/py-raven
+DEPENDS+=	${PYPKGPREFIX}-rb>=1.7:../../wip/py-rb
+DEPENDS+=	${PYPKGPREFIX}-redis-cluster>=1.3.4:../../wip/py-redis-cluster
+DEPENDS+=	${PYPKGPREFIX}-redis>=2.10.6:../../databases/py-redis
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.18.4:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-selenium>=3.11.0:../../www/py-selenium
+DEPENDS+=	${PYPKGPREFIX}-setproctitle>=1.1.10:../../sysutils/py-setproctitle
+DEPENDS+=	${PYPKGPREFIX}-simplejson>=3.13.0:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-sqlparse>=0.2.4:../../databases/py-sqlparse
+DEPENDS+=	${PYPKGPREFIX}-statsd>=3.2.2:../../wip/py-statsd
+DEPENDS+=	${PYPKGPREFIX}-structlog>=18.1.0:../../sysutils/py-structlog
+DEPENDS+=	${PYPKGPREFIX}-symbolic>=5.0.1:../../wip/py-symbolic
+DEPENDS+=	${PYPKGPREFIX}-test-django>=3.1.2:../../www/py-test-django
+DEPENDS+=	${PYPKGPREFIX}-test-html>=1.17.0:../../wip/py-test-html
+DEPENDS+=	${PYPKGPREFIX}-test-metadata>=1.7.0:../../wip/py-test-metadata
+DEPENDS+=	${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
+DEPENDS+=	${PYPKGPREFIX}-toronado>=0.0.11:../../wip/py-toronado
+DEPENDS+=	${PYPKGPREFIX}-u2flib-server>=5.0.0:../../wip/py-u2flib-server
+DEPENDS+=	${PYPKGPREFIX}-ua-parser>=0.8.0:../../wip/py-ua-parser
+DEPENDS+=	${PYPKGPREFIX}-urllib3>=1.22:../../www/py-urllib3
+DEPENDS+=	${PYPKGPREFIX}-uwsgi>=2.0.17:../../www/py-uwsgi
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-statsd/Makefile b/py-statsd/Makefile
index e57aef7284..80326ee5a2 100644
--- a/py-statsd/Makefile
+++ b/py-statsd/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	statsd-3.2.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/statsd/}
 
diff --git a/py-symbolic/Makefile b/py-symbolic/Makefile
index f0785c639c..aefe3d35e7 100644
--- a/py-symbolic/Makefile
+++ b/py-symbolic/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	symbolic-5.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/symbolic/}
 EXTRACT_SUFX=	.zip
@@ -12,7 +12,7 @@ COMMENT=	Library for dealing with symbol files and more
 LICENSE=	mit
 
 
-MAKE_ENV+=      RUSTFLAGS="-Clink-arg=${COMPILER_RPATH_FLAG}${PREFIX}/lib"
+MAKE_ENV+=	RUSTFLAGS="-Clink-arg=${COMPILER_RPATH_FLAG}${PREFIX}/lib"
 
 DEPENDS+=       ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=       ${PYPKGPREFIX}-milksnake>=0.1.5:../../wip/py-milksnake
@@ -21,62 +21,62 @@ DEPENDS+=       ${PYPKGPREFIX}-cparser>=2.18:../../devel/py-cparser
 BUILD_DEPENDS+=         cmake-[0-9]*:../../devel/cmake
 .include "../../mk/bsd.prefs.mk"
 
-#HAS_CONFIGURE=          yes
-CONFIGURE_ARGS+=        --prefix=${PREFIX}
-CONFIGURE_ARGS+=        --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=        --python=${PYTHONBIN}
-CONFIGURE_ARGS+=        --release-channel=stable
-CONFIGURE_ARGS+=       --enable-local-rust
-CONFIGURE_ARGS+=        --local-rust-root=${RUST_BOOTSTRAP_PATH}
-CONFIGURE_ARGS+=        --enable-extended       # Build and install cargo too.
-CONFIGURE_ARGS+=        --enable-rpath
-CONFIGURE_ARGS+=        --disable-codegen-tests
-CONFIGURE_ARGS+=        --disable-dist-src
-CONFIGURE_ARGS+=        --disable-llvm-static-stdcpp
-CONFIGURE_ARGS+=        --disable-ninja
-CONFIGURE_ARGS+=        --enable-vendor
-
-CONFIGURE_ARGS+=        --rustc=${PREFIX}/bin/rustc
-CONFIGURE_ARGS+=        --rustdoc=${PREFIX}/bin/rustdoc
-MAKE_ENV+=              OPENSSL_DIR=${BUILDLINK_PREFIX.openssl}
-MAKE_ENV+=              LIBGIT2_SYS_USE_PKG_CONFIG=1
-MAKE_ENV+=              VERBOSE=1
-
-UNLIMIT_RESOURCES+=     cputime
-
-#PYSETUP=                setup.py
-PYTHON_VERSIONS_ACCEPTED=       27
-
-CHECK_RELRO_SUPPORTED=  no
-
-GCC_REQD+=      	4.8
+#HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--python=${PYTHONBIN}
+CONFIGURE_ARGS+=	--release-channel=stable
+CONFIGURE_ARGS+=	--enable-local-rust
+CONFIGURE_ARGS+=	--local-rust-root=${RUST_BOOTSTRAP_PATH}
+CONFIGURE_ARGS+=	--enable-extended       # Build and install cargo too.
+CONFIGURE_ARGS+=	--enable-rpath
+CONFIGURE_ARGS+=	--disable-codegen-tests
+CONFIGURE_ARGS+=	--disable-dist-src
+CONFIGURE_ARGS+=	--disable-llvm-static-stdcpp
+CONFIGURE_ARGS+=	--disable-ninja
+CONFIGURE_ARGS+=	--enable-vendor
+
+CONFIGURE_ARGS+=	--rustc=${PREFIX}/bin/rustc
+CONFIGURE_ARGS+=	--rustdoc=${PREFIX}/bin/rustdoc
+MAKE_ENV+=		OPENSSL_DIR=${BUILDLINK_PREFIX.openssl}
+MAKE_ENV+=		LIBGIT2_SYS_USE_PKG_CONFIG=1
+MAKE_ENV+=		VERBOSE=1
+
+UNLIMIT_RESOURCES+=	cputime
+
+#PYSETUP=	setup.py
+PYTHON_VERSIONS_ACCEPTED= 27
+
+CHECK_RELRO_SUPPORTED=	no
+
+GCC_REQD+=		4.8
 USE_GCC_RUNTIME=	yes
 USE_LANGUAGES=		c c++ c++11
-USE_LIBTOOL=            yes
-USE_TOOLS+=             bash gmake perl:build pkg-config
+USE_LIBTOOL=		yes
+USE_TOOLS+=		bash gmake perl:build pkg-config
 
-CMAKE_ARGS+=    -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
-CMAKE_ARGS+=    -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=    -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=    -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH}
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 
-BUILDLINK_FNAME_TRANSFORM.NetBSD+=    rm:-Wl,--enable-new-dtags
+BUILDLINK_FNAME_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
 
 
 .if ${OPSYS} == "FreeBSD"
-MAKE_ENV+=              OPENSSL_DIR=${SSLBASE}
+MAKE_ENV+=		OPENSSL_DIR=${SSLBASE}
 .endif
 
-OPSYSVARS+=             SOEXT
-SOEXT.Darwin=           dylib
-SOEXT.*=                so
+OPSYSVARS+=		SOEXT
+SOEXT.Darwin=		dylib
+SOEXT.*=		so
 
-EGG_NAME?=              ${DISTNAME}
-EGG_INFODIR?=           ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-PLIST_SUBST+=           PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=           EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
-PLIST_SUBST+=           EGG_INFODIR=${EGG_INFODIR}
+EGG_NAME?=		${DISTNAME}
+EGG_INFODIR?=		${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=		EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
+PLIST_SUBST+=		EGG_INFODIR=${EGG_INFODIR}
 
 do-build:
 	cd ${WRKSRC} && ${PYTHONBIN} setup.py build
diff --git a/py-test-html/Makefile b/py-test-html/Makefile
index cfd5c701fc..2872953125 100644
--- a/py-test-html/Makefile
+++ b/py-test-html/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD$
 
 DISTNAME=	pytest-html-1.17.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	devel python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=p/pytest-html/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pytest-html/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/pytest-dev/pytest-html
 COMMENT=	Pytest plugin for generating HTML reports
 LICENSE=	mpl-2.0
 
-DEPENDS+=       ${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
-DEPENDS+=       ${PYPKGPREFIX}-test-metadata>=1.7.0:../../wip/py-test-metadata
+DEPENDS+=	${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
+DEPENDS+=	${PYPKGPREFIX}-test-metadata>=1.7.0:../../wip/py-test-metadata
 
 .include "../../lang/python/egg.mk"
 USE_LANGUAGES=	# none
diff --git a/py-test-metadata/Makefile b/py-test-metadata/Makefile
index 00cc54e34a..c2ef0f2c94 100644
--- a/py-test-metadata/Makefile
+++ b/py-test-metadata/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	pytest-metadata-1.7.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pytest-metadata/}
 
@@ -12,7 +12,7 @@ LICENSE=	mpl-2.0
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 
-DEPENDS+=       ${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
+DEPENDS+=	${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
 
 .include "../../lang/python/egg.mk"
 USE_LANGUAGES=	# none
diff --git a/py-toronado/Makefile b/py-toronado/Makefile
index 0576ae2d5f..f009ef9a6e 100644
--- a/py-toronado/Makefile
+++ b/py-toronado/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	toronado-0.0.11
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/toronado/}
 
diff --git a/py-u2flib-server/Makefile b/py-u2flib-server/Makefile
index 4b91d6e3b7..91e7808653 100644
--- a/py-u2flib-server/Makefile
+++ b/py-u2flib-server/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	python-u2flib-server-5.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/python-//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-u2flib-server/}
 
@@ -11,13 +11,13 @@ COMMENT=	Python based U2F server library
 #LICENSE=	# TODO: (see mk/license.mk)
 
 
-DEPENDS+=       ${PYPKGPREFIX}-cryptography>=1.2.0:../../security/py-cryptography
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.2.0:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
 
 .include "../../lang/python/distutils.mk"
 
 .if ${PYVERSSUFFIX} == "3.4"
-DEPENDS+=       ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
+DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
 .endif
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/py-ua-parser/Makefile b/py-ua-parser/Makefile
index f479fbc6c4..0589627bb9 100644
--- a/py-ua-parser/Makefile
+++ b/py-ua-parser/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	ua-parser-0.8.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=u/ua-parser/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/ua-parser/uap-python/
 COMMENT=	Python implementation of the UA Parser
 LICENSE=	apache-2.0
 
-BUILD_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+BUILD_DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/ua-parser-0.8.0
diff --git a/py-visionegg-contrib/Makefile b/py-visionegg-contrib/Makefile
index 7f20d1cf00..56373ef124 100644
--- a/py-visionegg-contrib/Makefile
+++ b/py-visionegg-contrib/Makefile
@@ -1,19 +1,19 @@
 # $NetBSD: Makefile,v 1.14 2014/05/09 07:38:51 thomasklausner Exp $
 
-DISTNAME=		visionegg-contrib-0.9.3
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		3
-CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=visionegg/}
-EXTRACT_SUFX=		.zip
+DISTNAME=	visionegg-contrib-0.9.3
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	3
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=visionegg/}
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://visionegg.sourceforge.net/
-COMMENT=		Additional modules for py-visionegg package
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://visionegg.sourceforge.net/
+COMMENT=	Additional modules for py-visionegg package
 LICENSE=	gnu-lgpl-v2.1
 
-NO_BUILD=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+NO_BUILD=	yes
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 PY_VC_FILES_LABVIEW=	"Edit Grating C.vi" \
 			"Grating C to A.vi" \
diff --git a/sds/Makefile b/sds/Makefile
index 3d99372c12..6712f6abbf 100644
--- a/sds/Makefile
+++ b/sds/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 GHCOMMIT=	974b5d11f9e17a6659f591bcc07a8bd981acdfd0
 DISTNAME=	${GHCOMMIT}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=antirez/sds/archive/}
-DIST_SUBDIR= sds
+DIST_SUBDIR=	sds
 WRKSRC=		${WRKDIR}/sds-${GHCOMMIT}
 
 MAINTAINER=	tr%vispaul.me@localhost
diff --git a/singularity/Makefile b/singularity/Makefile
index 19d6c63921..375d81faec 100644
--- a/singularity/Makefile
+++ b/singularity/Makefile
@@ -25,8 +25,8 @@ USE_TOOLS+=	autoconf automake autoreconf bash
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
-PV=		2.5.1
-CONFIG_SHELL=	${BASH}
+PV=			2.5.1
+CONFIG_SHELL=		${BASH}
 CHECK_PORTABILITY_SKIP=	configure
 
 # Requires clone()
@@ -34,10 +34,10 @@ ONLY_FOR_PLATFORM=	Linux-*-*
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 PKG_SYSCONFSUBDIR=	${PKGBASE}
-CONF_FILES+=	${EGDIR}/default-nsswitch.conf ${PKG_SYSCONFDIR}/default-nsswitch.conf
-CONF_FILES+=	${EGDIR}/init ${PKG_SYSCONFDIR}/init
-CONF_FILES+=	${EGDIR}/nvliblist.conf ${PKG_SYSCONFDIR}/nvliblist.conf
-CONF_FILES+=	${EGDIR}/singularity.conf ${PKG_SYSCONFDIR}/singularity.conf
+CONF_FILES+=		${EGDIR}/default-nsswitch.conf ${PKG_SYSCONFDIR}/default-nsswitch.conf
+CONF_FILES+=		${EGDIR}/init ${PKG_SYSCONFDIR}/init
+CONF_FILES+=		${EGDIR}/nvliblist.conf ${PKG_SYSCONFDIR}/nvliblist.conf
+CONF_FILES+=		${EGDIR}/singularity.conf ${PKG_SYSCONFDIR}/singularity.conf
 
 INSTALLATION_DIRS=	${EGDIR}
 
diff --git a/tleenx3/Makefile b/tleenx3/Makefile
index fe205bf3dd..e82528030b 100644
--- a/tleenx3/Makefile
+++ b/tleenx3/Makefile
@@ -1,19 +1,17 @@
 # $NetBSD: Makefile,v 1.8 2012/10/07 17:17:40 asau Exp $
-#
 
-DISTNAME=		TleenX3-0.1
-PKGNAME=		${DISTNAME:S/T/t/:S/X/x/}
-PKGREVISION=		1
-CATEGORIES=		chat
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tleenx/}
+DISTNAME=	TleenX3-0.1
+PKGNAME=	${DISTNAME:S/T/t/:S/X/x/}
+PKGREVISION=	1
+CATEGORIES=	chat
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tleenx/}
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://tleenx.sourceforge.net/
-COMMENT=		Polish IM communication client
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://tleenx.sourceforge.net/
+COMMENT=	Polish IM communication client
 LICENSE=	gnu-gpl-v2
 
-
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../net/gnet/buildlink3.mk"
diff --git a/translate-toolkit/Makefile b/translate-toolkit/Makefile
index a84496a0f5..808e11c1b0 100644
--- a/translate-toolkit/Makefile
+++ b/translate-toolkit/Makefile
@@ -21,7 +21,7 @@ USE_LANGUAGES=	c
 REPLACE_BASH=	tools/*
 USE_TOOLS+=	bash:run
 
-PYTHON_VERSIONS_ACCEPTED=       36 35 34 27
+PYTHON_VERSIONS_ACCEPTED=	36 35 34 27
 
 post-extract:
 	${RM} ${WRKSRC}/tools/mozilla/build_firefox.sh
diff --git a/txt2tags/Makefile b/txt2tags/Makefile
index 5e86806748..3e556df8eb 100644
--- a/txt2tags/Makefile
+++ b/txt2tags/Makefile
@@ -6,9 +6,9 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://txt2tags.googlecode.com/files/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=			dbolgheroni%unifei.edu.br@localhost
-HOMEPAGE=			http://txt2tags.sourceforge.net/
-COMMENT=			Text formatting and conversion tool
+MAINTAINER=	dbolgheroni%unifei.edu.br@localhost
+HOMEPAGE=	http://txt2tags.sourceforge.net/
+COMMENT=	Text formatting and conversion tool
 LICENSE=	gnu-gpl-v2
 
 REPLACE_PYTHON=		txt2tags
@@ -17,10 +17,10 @@ USE_PKGLOCALEDIR=	yes
 NO_BUILD=		yes
 USE_LANGUAGES=		# none
 
-DOC_DIR=			${PREFIX}/share/doc/${PKGBASE}
-SAMPLES_DIR=			${PREFIX}/share/examples/${PKGBASE}
-INSTALLATION_DIRS+=		${DOC_DIR} ${SAMPLES_DIR}
-INSTALLATION_DIRS+=		bin ${PKGMANDIR}/man1
+DOC_DIR=		${PREFIX}/share/doc/${PKGBASE}
+SAMPLES_DIR=		${PREFIX}/share/examples/${PKGBASE}
+INSTALLATION_DIRS+=	${DOC_DIR} ${SAMPLES_DIR}
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOC_DIR} ${SAMPLES_DIR} ${DESTDIR}${SAMPLES_DIR}/img
diff --git a/vcflib/Makefile b/vcflib/Makefile
index 7f5acd40db..6927b6f4c0 100644
--- a/vcflib/Makefile
+++ b/vcflib/Makefile
@@ -13,7 +13,7 @@ LICENSE=	mit
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
-SUBST_CLASSES+=	ldflags
+SUBST_CLASSES+=		ldflags
 SUBST_FILES.ldflags=	${WRKSRC}/Makefile.external-libs
 SUBST_STAGE.ldflags=	post-patch
 SUBST_SED.ldflags=	-e "s|LDFLAGS =|LDFLAGS = ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g"


Home | Main Index | Thread Index | Old Index