misc: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.

71 files changed, 379 insertions, 379 deletions

diff --git a/misc/JBidwatcher/Makefile b/misc/JBidwatcher/Makefile
index cbc5b016389..ca16b3c46eb 100644
--- a/misc/JBidwatcher/Makefile
+++ b/misc/JBidwatcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/04/06 03:45:17 rodent Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 17:04:19 rillig Exp $
 #
 
 DISTNAME=	JBidwatcher-2.1.5
@@ -11,9 +11,9 @@ HOMEPAGE=	http://www.jbidwatcher.com/
 COMMENT=	Software for eBay sniping, bidding and monitoring
 #LICENSE=	Creative Commons BY-NC-SA Amended
 
-WRKSRC=		${WRKDIR}
-USE_JAVA=	run
-INSTALLATION_DIRS=      bin libexec/JBidwatcher
+WRKSRC=			${WRKDIR}
+USE_JAVA=		run
+INSTALLATION_DIRS=	bin libexec/JBidwatcher
 
 do-build:
 	${ECHO} "#!/bin/sh" > ${WRKSRC}/JBidwatcher
diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile
index 1d922e2ab0d..768791aaf98 100644
--- a/misc/ascii/Makefile
+++ b/misc/ascii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/07/04 13:40:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 17:04:19 rillig Exp $
 #
 
 DISTNAME=	ascii-3.15
@@ -13,7 +13,7 @@ LICENSE=	modified-bsd
 USE_TOOLS=		gmake
 USE_LIBTOOL=		yes
 
-BUILD_TARGET= 		ascii
+BUILD_TARGET=		ascii
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
 SUBST_CLASSES+=		prefix
diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile
index ff38725cfd0..54eb0a7acfd 100644
--- a/misc/asr-manpages/Makefile
+++ b/misc/asr-manpages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/08/01 17:40:13 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 17:04:19 rillig Exp $
 #
 
 DISTNAME=	asr.pages
@@ -11,9 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	http://web.archive.org/web/2/www.winternet.com/~eric/sysadmin/manpages.html
 COMMENT=	Distribution of alt.sysadmin.recovery man page
 
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-DIST_SUBDIR=	${PKGNAME_NOREV}
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+DIST_SUBDIR=		${PKGNAME_NOREV}
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 do-install:
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 4da404504a0..14efa9cc4f1 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2017/01/19 18:52:18 agc Exp $
+# $NetBSD: Makefile,v 1.41 2019/11/03 17:04:19 rillig Exp $
 
 DISTNAME=	ast54unx
 PKGNAME=	astrolog-5.40
-PKGREVISION=     1
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.astrolog.org/ftp/ephem/
 MASTER_SITES+=	http://www.astrolog.org/ftp/
@@ -13,9 +13,9 @@ HOMEPAGE=	http://www.astrolog.org/
 COMMENT=	Astrology program for X11 and alpha-numeric terminals
 LICENSE=	astrolog-license
 
-RESTRICTED=	Do not sell or profit from this software in any way
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
+RESTRICTED=		Do not sell or profit from this software in any way
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=		${WRKDIR}
 EPHEM=		LRZ5_24 CHI_24 CPJV_24
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index 364202c1661..f7e497d593e 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/12/26 23:43:52 mef Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 17:04:20 rillig Exp $
 
 DISTNAME=	bottlerocket-0.04c
 PKGREVISION=	1
@@ -14,8 +14,8 @@ USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	br
 
-X10_PORT?=	${DEFAULT_SERIAL_DEVICE}
-CONFIGURE_ARGS+=--with-x10port=${X10_PORT:Q}
-BUILD_DEFS+=	X10_PORT
+X10_PORT?=		${DEFAULT_SERIAL_DEVICE}
+CONFIGURE_ARGS+=	--with-x10port=${X10_PORT:Q}
+BUILD_DEFS+=		X10_PORT
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/byobu/Makefile b/misc/byobu/Makefile
index 15d218b6950..0fe9212cae9 100644
--- a/misc/byobu/Makefile
+++ b/misc/byobu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 17:04:20 rillig Exp $
 
 BYOBUVER=	5.111
 DISTNAME=	byobu_${BYOBUVER}.orig
@@ -22,9 +22,9 @@ REPLACE_BASH+=	usr/lib/byobu/*
 REPLACE_BASH+=	usr/lib/byobu/include/*
 REPLACE_BASH+=	usr/share/byobu/tests/*
 
-REPLACE_PERL+=	usr/lib/byobu/include/*
-REPLACE_PYTHON+=	usr/lib/byobu/include/*
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-newt
+REPLACE_PERL+=			usr/lib/byobu/include/*
+REPLACE_PYTHON+=		usr/lib/byobu/include/*
+PYTHON_VERSIONS_ACCEPTED=	27 # py-newt
 
 EGDIR=			share/examples/byobu
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${EGDIR}
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index cc96f63960b..bdc8990f255 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/08/01 17:40:14 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/03 17:04:20 rillig Exp $
 #
 
 DISTNAME=	chipmunk-1.4
@@ -15,9 +15,9 @@ MAKE_ENV+=	CONFIG_OPTIONS=${CPPFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 MAKE_ENV+=	EXTRA_LIBS=-l${MACHINE_ARCH}
-.endif
+.  endif
 .endif
 
 INSTALLATION_DIRS=	sbin
diff --git a/misc/chordii/Makefile b/misc/chordii/Makefile
index f8411b40cee..36056811822 100644
--- a/misc/chordii/Makefile
+++ b/misc/chordii/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2015/11/24 12:04:23 mef Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 17:04:20 rillig Exp $
 
 DISTNAME=	chordii-4.5.3
 CATEGORIES=	misc
-MASTER_SITES=	 ${MASTER_SITE_SOURCEFORGE:=chordii/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=chordii/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Produce PS sheet-music from text input
-LICENSE=    gnu-gpl-v2 # or later
-GNU_CONFIGURE = yes
+LICENSE=	gnu-gpl-v2 # or later
+GNU_CONFIGURE =	yes
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
diff --git a/misc/cksfv/Makefile b/misc/cksfv/Makefile
index 4d91cc5d860..a6f50a5e66e 100644
--- a/misc/cksfv/Makefile
+++ b/misc/cksfv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/12/12 10:44:10 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/03 17:04:20 rillig Exp $
 #
 
 DISTNAME=	cksfv-1.3.14
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 INSTALLATION_DIRS=	share/doc/cksfv
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--package-prefix=${DESTDIR:Q}
 CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR}
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index 8e9086e8604..ac072d6b216 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/06/24 10:59:41 nia Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 17:04:20 rillig Exp $
 
 DISTNAME=	colortail-0.3.0
 CATEGORIES=	misc
@@ -10,8 +10,8 @@ COMMENT=	Colour-able replacement for tail(1)
 
 USE_LANGUAGES=	c c++
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share/examples/colortail
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/examples/colortail
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/examples/colortail
 
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index e153526893c..a7f4d670a62 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/08/01 16:47:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 17:04:20 rillig Exp $
 #
 
 DISTNAME=	cuecat-0.2.1
@@ -16,7 +16,7 @@ COMMENT=	Read and parse barcodes from your CueCat barcode reader
 # with both netbsd and linux.
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
-RESTRICTED=	Hardware manufacturer claims intellectual property infringement.
+RESTRICTED=		Hardware manufacturer claims intellectual property infringement.
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index c2d50153e1f..1cd4158f2fc 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2019/09/02 13:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.124 2019/11/03 17:04:20 rillig Exp $
 
 DISTNAME=	deskbar-applet-2.32.0
 PKGREVISION=	62
@@ -22,8 +22,8 @@ GCONF_SCHEMAS=		deskbar-applet.schemas
 
 PYTHON_VERSIONS_ACCEPTED=	27 # py-ORBit via py-gnome2, py-gtk2
 
-REPLACE_PYTHON=		deskbar/deskbar-applet.py
-PY_PATCHPLIST=			yes
+REPLACE_PYTHON=	deskbar/deskbar-applet.py
+PY_PATCHPLIST=	yes
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 4aa3de302f5..05809213562 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2019/06/22 11:37:13 nia Exp $
+# $NetBSD: Makefile,v 1.87 2019/11/03 17:04:21 rillig Exp $
 
 DISTNAME=	dialog-1.3-20190211
 PKGNAME=	${DISTNAME:C/-2/.2/}
@@ -11,9 +11,9 @@ HOMEPAGE=	https://invisible-island.net/dialog/dialog.html
 COMMENT=	Display dialog boxes from shell scripts
 LICENSE=	gnu-lgpl-v2.1
 
-GNU_CONFIGURE=	yes
-MAKE_FILE=	makefile
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=		yes
+MAKE_FILE=		makefile
+USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-libtool
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
diff --git a/misc/dose3/Makefile b/misc/dose3/Makefile
index 7284748bf45..0f5445328d5 100644
--- a/misc/dose3/Makefile
+++ b/misc/dose3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/11/12 16:10:25 jaapb Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 17:04:21 rillig Exp $
 
 DISTNAME=	dose3-5.0.1
 PKGREVISION=	5
@@ -10,9 +10,9 @@ HOMEPAGE=	https://gforge.inria.fr/projects/dose/
 COMMENT=	Package repository analysis toolkit
 LICENSE=	gnu-lgpl-v3
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	aclocal automake autoconf gmake pod2man
-MAKE_JOBS_SAFE=	no
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		aclocal automake autoconf gmake pod2man
+MAKE_JOBS_SAFE=		no
 OCAML_USE_FINDLIB=	yes
 
 .include "../../mk/ocaml.mk"
diff --git a/misc/ec2-api-tools/Makefile b/misc/ec2-api-tools/Makefile
index ef90db37a52..42396f769ef 100644
--- a/misc/ec2-api-tools/Makefile
+++ b/misc/ec2-api-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/08 09:57:20 asau Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 17:04:21 rillig Exp $
 #
 
 PKGNAME=	ec2-api-tools-1.3.62308
@@ -26,11 +26,11 @@ REPLACE.bash.old=	/usr/bin/env.*bash
 REPLACE.bash.new=	/bin/sh
 REPLACE_FILES.bash=	bin/*
 
-SUBST_CLASSES+=		java-path
-SUBST_STAGE.java-path=	pre-configure
-SUBST_FILES.java-path=	bin/ec2-cmd
-SUBST_VARS.java-path+=	PKG_JAVA_HOME
-SUBST_MESSAGE.java-path=Fixing path to Java interpreter.
+SUBST_CLASSES+=			java-path
+SUBST_STAGE.java-path=		pre-configure
+SUBST_FILES.java-path=		bin/ec2-cmd
+SUBST_VARS.java-path+=		PKG_JAVA_HOME
+SUBST_MESSAGE.java-path=	Fixing path to Java interpreter.
 
 SUBST_CLASSES+=		ec2-home
 SUBST_STAGE.ec2-home=	pre-configure
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index c83fc314e60..001772434ed 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 17:04:21 rillig Exp $
 
 DISTNAME=	elscreen-1.4.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -26,7 +26,7 @@ USE_LANGUAGES+=	c
 
 NO_BUILD=	yes
 
-EMACS_BUILDLINK=# empty
+EMACS_BUILDLINK=	# empty
 
 # Emacs 24 or later is not supported. Try wip/elscreen-current
 # instead.
@@ -34,8 +34,8 @@ EMACS_VERSIONS_ACCEPTED= \
 	emacs21 emacs21nox \
 	emacs20
 
-INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/elscreen
-INSTALLATION_DIRS+= share/doc/elscreen
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/elscreen
+INSTALLATION_DIRS+=	share/doc/elscreen
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/*/*.el ${DESTDIR}${EMACS_LISPPREFIX}/elscreen
diff --git a/misc/emacs-wiki/Makefile b/misc/emacs-wiki/Makefile
index 224d517194e..cc884dccaee 100644
--- a/misc/emacs-wiki/Makefile
+++ b/misc/emacs-wiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/02/17 19:18:07 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:04:21 rillig Exp $
 #
 
 DISTNAME=	${EMACSWIKI}-${EMACSWIKIVERSION}
@@ -13,12 +13,12 @@ HOMEPAGE=	http://repose.cx/emacs/wiki/
 COMMENT=	Wiki major mode for emacs, which aims for implicit and natural markup
 LICENSE=	gnu-gpl-v2
 
-EMACSWIKI=	emacs-wiki
-EMACSWIKIVERSION= 2.72
-DEPENDS=	semi>=1.14.6:../../devel/semi
+EMACSWIKI=		emacs-wiki
+EMACSWIKIVERSION=	2.72
+DEPENDS=		semi>=1.14.6:../../devel/semi
 
-USE_TOOLS+=	gmake makeinfo
-INFO_FILES=	yes
+USE_TOOLS+=		gmake makeinfo
+INFO_FILES=		yes
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
 .include "../../editors/emacs/modules.mk"
diff --git a/misc/fbreader/options.mk b/misc/fbreader/options.mk
index a9032998600..2b6d953ef54 100644
--- a/misc/fbreader/options.mk
+++ b/misc/fbreader/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.3 2017/09/26 09:43:28 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 17:04:21 rillig Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.fbreader
+PKG_OPTIONS_VAR=		PKG_OPTIONS.fbreader
 PKG_OPTIONS_REQUIRED_GROUPS=	gui
-PKG_OPTIONS_GROUP.gui=	gtk2 qt4
-PKG_SUPPORTED_OPTIONS=	debug
-PKG_SUGGESTED_OPTIONS=	qt4
+PKG_OPTIONS_GROUP.gui=		gtk2 qt4
+PKG_SUPPORTED_OPTIONS=		debug
+PKG_SUGGESTED_OPTIONS=		qt4
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 90b68a833e2..c1a9f30b682 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/01/06 11:27:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 17:04:21 rillig Exp $
 #
 
 DISTNAME=	FD-3.01b
@@ -24,7 +24,7 @@ DATADIR=	${PREFIX}/share/fd
 DOCDIR=		${PREFIX}/share/doc/fd
 EXAMPLESDIR=	${PREFIX}/share/examples/fd
 
-CFLAGS+=	-DUSEMANLANG -DUSEDATADIR
+CFLAGS+=		-DUSEMANLANG -DUSEDATADIR
 DESTDIR_VARNAME=	BUILD
 
 DOCS=		FAQ LICENSES HISTORY README TECHKNOW ToAdmin
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index e8b4661097f..9d97193d043 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/07/14 12:56:41 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 17:04:21 rillig Exp $
 
 DISTNAME=	fep
 PKGNAME=	fep-1.0
@@ -10,13 +10,13 @@ MAINTAINER=	nobu@psrc.isac.co.jp
 COMMENT=	General purpose front end for command line editing
 LICENSE=	fep-license
 
-RESTRICTED=	Do not redistribute for a fee.
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
+RESTRICTED=		Do not redistribute for a fee.
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}
-MANCOMPRESSED=	yes
-INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+WRKSRC=			${WRKDIR}
+MANCOMPRESSED=		yes
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/compiler.mk"
 
diff --git a/misc/gkrellm-flynn/Makefile b/misc/gkrellm-flynn/Makefile
index be25a20355e..c4b32e14fba 100644
--- a/misc/gkrellm-flynn/Makefile
+++ b/misc/gkrellm-flynn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/07/21 22:25:22 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/03 17:04:21 rillig Exp $
 #
 
 DISTNAME=	gkrellflynn-0.8
@@ -11,9 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	http://bax.comlab.uni-rostock.de/en/projekte/gkrellflynn.html
 COMMENT=	GKrellM2 plugin that shows system load with a DooM marine
 
-USE_TOOLS+=	gmake pkg-config
-BUILD_TARGET=	gkrellm2
-INSTALL_TARGET=	installgkrellm2
+USE_TOOLS+=		gmake pkg-config
+BUILD_TARGET=		gkrellm2
+INSTALL_TARGET=		installgkrellm2
 INSTALLATION_DIRS=	lib/gkrellm2/plugins
 
 .include "../../sysutils/gkrellm/buildlink3.mk"
diff --git a/misc/gkrellm-leds/Makefile b/misc/gkrellm-leds/Makefile
index 5b18c7b6afb..ffd7560cc92 100644
--- a/misc/gkrellm-leds/Makefile
+++ b/misc/gkrellm-leds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/07/21 22:25:22 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 17:04:22 rillig Exp $
 #
 
 DISTNAME=	gkleds-0.8.2
@@ -15,7 +15,7 @@ USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
-GNU_CONFIGURE_LIBSUBDIR=gkrellm2/plugins
+GNU_CONFIGURE_LIBSUBDIR=	gkrellm2/plugins
 
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 5ae51bc388c..29327ae5313 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.177 2019/08/11 13:21:54 wiz Exp $
+# $NetBSD: Makefile,v 1.178 2019/11/03 17:04:22 rillig Exp $
 
 DISTNAME=		gnome-utils-2.32.0
 PKGREVISION=		70
@@ -37,7 +37,7 @@ GCONF_SCHEMAS+=	gnome-screenshot.schemas
 GCONF_SCHEMAS+=	gnome-search-tool.schemas
 GCONF_SCHEMAS+=	gnome-system-log.schemas
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.9.1
 BUILDLINK_API_DEPENDS.gnome-panel+=	gnome-panel>=2.13.4
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.8.4
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.8.0
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index f649f5fa806..c380f4c28df 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/12/23 17:54:54 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 17:04:22 rillig Exp $
 #
 
 DISTNAME=	heyu-1.35
@@ -17,7 +17,7 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}/heyu.dir
 
 CONFIGURE_SCRIPT=	./Configure
-MAKE_ENV+=	DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE:Q}
+MAKE_ENV+=		DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE:Q}
 INSTALL_MAKE_FLAGS+=	BIN=${DESTDIR}${PREFIX}/bin
 INSTALL_MAKE_FLAGS+=	MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 INSTALL_MAKE_FLAGS+=	MAN5=${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
diff --git a/misc/ja-less/Makefile b/misc/ja-less/Makefile
index e557d776fa9..fc4256ca70c 100644
--- a/misc/ja-less/Makefile
+++ b/misc/ja-less/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2013/02/02 13:59:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 17:04:22 rillig Exp $
 
 DISTNAME=	less-382
 PKGNAME=	ja-${DISTNAME}.262.03
 CATEGORIES=	japanese misc
 MASTER_SITES=	${MASTER_SITE_GNU:=less/}
 
-PATCH_SITES=	http://ryo-on.users.sourceforge.net/distrib/ja-less/
-PATCHFILES=	less-382-iso258.patch.gz
-PATCHFILES+=	less-382-iso258-259.patch.gz
-PATCHFILES+=	less-382-iso259-260.patch.gz
-PATCHFILES+=	less-382-iso260-261.patch.gz
-PATCHFILES+=	less-382-iso261-262.patch.gz
-PATCHFILES+=	less-382-iso262.ext03.patch.gz
-PATCH_DIST_STRIP= -p1
+PATCH_SITES=		http://ryo-on.users.sourceforge.net/distrib/ja-less/
+PATCHFILES=		less-382-iso258.patch.gz
+PATCHFILES+=		less-382-iso258-259.patch.gz
+PATCHFILES+=		less-382-iso259-260.patch.gz
+PATCHFILES+=		less-382-iso260-261.patch.gz
+PATCHFILES+=		less-382-iso261-262.patch.gz
+PATCHFILES+=		less-382-iso262.ext03.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	komine@cc.meisei-u.ac.jp
 # HOMEPAGE is gone.
diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile
index aeb1b8603cb..7a3ff2b1872 100644
--- a/misc/ja-man/Makefile
+++ b/misc/ja-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/03/02 07:20:30 obache Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 17:04:22 rillig Exp $
 
 DISTNAME=	NetBSD1.3I-jman-19990531
 PKGNAME=	ja-man-19990531
@@ -63,14 +63,14 @@ MKCATPAGES?=	yes
 pre-install:
 .if ${MKCATPAGES} == no
 	sed -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.if exists(${PKGDIR}/PLIST.${MACHINE})
+.  if exists(${PKGDIR}/PLIST.${MACHINE})
 	sed -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
-.endif
+.  endif
 .else
 	cp ${PKGDIR}/PLIST ${PLIST_SRC}
-.if exists(${PKGDIR}/PLIST.${MACHINE})
+.  if exists(${PKGDIR}/PLIST.${MACHINE})
 	cat ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
-.endif
+.  endif
 .endif
 
 post-install:
diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index 76ac1cd71d8..dfef44e59e0 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2019/10/27 17:23:34 kamil Exp $
+# $NetBSD: Makefile,v 1.93 2019/11/03 17:04:22 rillig Exp $
 
 DISTNAME=		kchmviewer-7.2.1
 PKGREVISION=		46
@@ -25,7 +25,7 @@ SUBST_STAGE.zip=	post-configure
 
 CHECK_PORTABILITY_SKIP=	build-win32-mingw.sh
 
-INSTALLATION_DIRS=      bin
+INSTALLATION_DIRS=	bin
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile
index 2719045c1b5..0cccf25f06c 100644
--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/08/22 12:23:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/03 17:04:22 rillig Exp $
 
 DISTNAME=	kdeartwork-15.08.3
 PKGNAME=	${DISTNAME:S/-1/4-1/}
@@ -13,9 +13,9 @@ CMAKE_ARGS+=	-DXSCREENSAVER_CONFIG_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/lib
 CMAKE_ARGS+=	-DXSCREENSAVER_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver
 CMAKE_ARGS+=	-DWITH_Eigen3:BOOL=OFF
 
-#BUILD_MAKE_FLAGS+= VERBOSE=1
+#BUILD_MAKE_FLAGS+=	VERBOSE=1
 
-BUILDLINK_API_DEPENDS.xscreensaver+=  xscreensaver>=5.10
+BUILDLINK_API_DEPENDS.xscreensaver+=	xscreensaver>=5.10
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile
index f92ff87cf83..67ac11bbe2a 100644
--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2019/08/22 12:23:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2019/11/03 17:04:22 rillig Exp $
 
 DISTNAME=	kdepim-runtime-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.04.3/src/}
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-BUILDLINK_DEPMETHOD.qt4-tools=full
+BUILDLINK_DEPMETHOD.qt4-tools=	full
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 166f6a97e82..d18089357cf 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2019/11/02 20:48:05 maya Exp $
+# $NetBSD: Makefile,v 1.95 2019/11/03 17:04:23 rillig Exp $
 
 DISTNAME=	kdepim-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
@@ -13,16 +13,16 @@ USE_TOOLS+=	gmake
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-CMAKE_ARGS+=-DKDEPIM_BUILD_MOBILE=OFF
+CMAKE_ARGS+=	-DKDEPIM_BUILD_MOBILE=OFF
 
-CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
-		ktimetracker/test/booktime-badduration.sh \
-		ktimetracker/test/booktime-badtime.sh \
-		ktimetracker/test/booktime-baduid.sh \
-		ktimetracker/test/booktime-works.sh \
-		ktimetracker/test/delete.sh \
-		ktimetracker/test/refresh_on_change.sh \
-		ktimetracker/test/version.sh
+CHECK_PORTABILITY_SKIP+=	ktimetracker/test/booktime-baddate.sh \
+				ktimetracker/test/booktime-badduration.sh \
+				ktimetracker/test/booktime-badtime.sh \
+				ktimetracker/test/booktime-baduid.sh \
+				ktimetracker/test/booktime-works.sh \
+				ktimetracker/test/delete.sh \
+				ktimetracker/test/refresh_on_change.sh \
+				ktimetracker/test/version.sh
 
 REPLACE_BASH+=	kmail/kconf_update/kmail-*.sh
 
@@ -66,7 +66,7 @@ NOT_PAX_MPROTECT_SAFE+=	bin/kontact
 NOT_PAX_MPROTECT_SAFE+=	bin/blogilo
 NOT_PAX_MPROTECT_SAFE+=	bin/knode
 
-BUILDLINK_DEPMETHOD.qt4-tools=full
+BUILDLINK_DEPMETHOD.qt4-tools=	full
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 87512800d9d..19093ae6a35 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2019/08/22 12:23:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.91 2019/11/03 17:04:23 rillig Exp $
 
 DISTNAME=	kdepimlibs-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
@@ -15,14 +15,14 @@ SUBST_MESSAGE.phononrelpath=	Fixing phonon RELWITHDEBINFO path
 SUBST_FILES.phononrelpath=	_KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-${TARGET_NAME}.cmake
 SUBST_SED.phononrelpath=	-e 's:[^"]*/\.buildlink/lib/libphonon\.so::'
 
-CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake
+CMAKE_DEPENDENCIES_REWRITE=	_KDE_build/KDEPimLibsDependencies.cmake
 
 CMAKE_ARGS+=	-DKDE4_BUILD_TESTS:BOOL=OFF
 
 # for strcasecmp
 CFLAGS.SunOS+=	-D__EXTENSIONS__
 
-REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
+REPLACE_PERL+=	mailtransport/kconf_update/migrate-transports.pl
 
 BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=1.8.51
 
diff --git a/misc/labelnation/Makefile b/misc/labelnation/Makefile
index 4abeb370b26..b20a85bc67e 100644
--- a/misc/labelnation/Makefile
+++ b/misc/labelnation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/04/25 07:33:07 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 17:04:23 rillig Exp $
 
 DISTNAME=		labelnation-1.212
 PKGREVISION=		2
@@ -10,14 +10,14 @@ HOMEPAGE=		https://www.red-bean.com/labelnation/
 COMMENT=		Command-line label, business card printing program
 LICENSE=		gnu-gpl-v3
 
-REPLACE_PYTHON= 	labelnation csv_to_ln
+REPLACE_PYTHON=		labelnation csv_to_ln
 
 USE_LANGUAGES=		# none
-NO_BUILD= 		yes
+NO_BUILD=		yes
 
-DOCDIR=                 share/doc/labelnation
+DOCDIR=			share/doc/labelnation
 EXAMPLESDIR=		share/examples/labelnation
-INSTALLATION_DIRS=      bin ${DOCDIR} ${EXAMPLESDIR}
+INSTALLATION_DIRS=	bin ${DOCDIR} ${EXAMPLESDIR}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/labelnation ${DESTDIR}${PREFIX}/bin
diff --git a/misc/less/options.mk b/misc/less/options.mk
index 9be3aa32be1..7cda6fa66f7 100644
--- a/misc/less/options.mk
+++ b/misc/less/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2019/06/15 10:03:38 leot Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 17:04:23 rillig Exp $
 
-PKG_OPTIONS_VAR=	 	PKG_OPTIONS.less
+PKG_OPTIONS_VAR=		PKG_OPTIONS.less
 PKG_OPTIONS_REQUIRED_GROUPS=	regex
 PKG_OPTIONS_GROUP.regex=	pcre regexp
-PKG_SUGGESTED_OPTIONS=	 	regexp
+PKG_SUGGESTED_OPTIONS=		regexp
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/misc/libcarddav/options.mk b/misc/libcarddav/options.mk
index b895ef5e59a..5bea806ca39 100644
--- a/misc/libcarddav/options.mk
+++ b/misc/libcarddav/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2016/08/26 17:16:53 joerg Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/03 17:04:23 rillig Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.libcarddav
-PKG_SUPPORTED_OPTIONS=	doc
-PKG_SUGGESTED_OPTIONS=	doc
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libcarddav
+PKG_SUPPORTED_OPTIONS=		doc
+PKG_SUGGESTED_OPTIONS=		doc
 PKG_OPTIONS_LEGACY_OPTS+=	doxygen:doc
 
 .include "../../mk/bsd.options.mk"
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index 881f80fe9c7..f1635c998db 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.210 2019/11/02 13:12:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.211 2019/11/03 17:04:23 rillig Exp $
 
 VERREL=		6.3.3
 VERRC=		2
@@ -41,7 +41,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27 37 38
 
 CHECK_SHLIBS_SUPPORTED=	no
 # configure will be regenerated.
-CHECK_PORTABILITY_SKIP=configure
+CHECK_PORTABILITY_SKIP=	configure
 
 NOT_PAX_MPROTECT_SAFE+=	${PKGNAME_NOREV}/lib/libreoffice/program/soffice.bin
 
@@ -142,7 +142,7 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 # is a no-go with normal pkgsrc wrappers.
 # dmake is slowly beeing removed from the LibreOffice build process
 # and this option will hopefully become unneeded in the future
-WRAPPER_SKIP_TRANSFORM=yes
+WRAPPER_SKIP_TRANSFORM=	yes
 
 LDFLAGS+=		-lboost_system
 
@@ -237,8 +237,8 @@ LO_PROGRAMS+=		lofromtemplate loimpress lomath loweb lowriter
 LO_DESKTOP_FILES=	calc.desktop draw.desktop impress.desktop math.desktop \
 			startcenter.desktop writer.desktop
 
-#OBJDIR=			pkgsrcbuild
-#CONFIGURE_DIRS=		${OBJDIR}
+#OBJDIR=		pkgsrcbuild
+#CONFIGURE_DIRS=	${OBJDIR}
 CONFIGURE_SCRIPT=	${WRKSRC}/autogen.sh
 
 #LD_LIBRARY_PATH+=	${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
@@ -284,10 +284,10 @@ do-install:
 		${MKDIR} ${d}
 .endfor
 
-UNO_PATH=${PREFIX}/${PKGNAME}/lib/libreoffice/program
+UNO_PATH=	${PREFIX}/${PKGNAME}/lib/libreoffice/program
 
-BUILD_DEFS+=   UNO_PATH
-BUILD_DEFS+=   PYTHONBIN
+BUILD_DEFS+=	UNO_PATH
+BUILD_DEFS+=	PYTHONBIN
 
 post-install:
 .for f in ${LO_PROGRAMS}
diff --git a/misc/libreoffice/options.mk b/misc/libreoffice/options.mk
index e4f21f85f2a..baaddd8031a 100644
--- a/misc/libreoffice/options.mk
+++ b/misc/libreoffice/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2019/10/27 17:26:10 kamil Exp $
+# $NetBSD: options.mk,v 1.8 2019/11/03 17:04:23 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice
 PKG_SUPPORTED_OPTIONS=	java debug gtk3 cups
@@ -20,7 +20,7 @@ USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 CONFIGURE_ARGS+=	--with-ant-home=${LOCALBASE}
 
-DEPENDS+=	hsqldb18-[0-9]*:../../databases/hsqldb18
+DEPENDS+=		hsqldb18-[0-9]*:../../databases/hsqldb18
 CONFIGURE_ARGS+=	--with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
 CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-java \
diff --git a/misc/libreoffice5-bin/Makefile b/misc/libreoffice5-bin/Makefile
index 823a3914c5d..8171be2b814 100644
--- a/misc/libreoffice5-bin/Makefile
+++ b/misc/libreoffice5-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/02/21 05:56:57 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:04:23 rillig Exp $
 
 DISTNAME=		libreoffice5-bin	# overridden below
 PKGNAME=		libreoffice5-bin-${OO_RELEASE}
@@ -65,7 +65,7 @@ MASTER_SITES=		https://downloadarchive.documentfoundation.org/libreoffice/old/${
 
 .include "options.mk"
 
-INSTALLATION_DIRS= bin share/applications
+INSTALLATION_DIRS=	bin share/applications
 DESKTOP_FILESDIR=	${.CURDIR}/../../misc/libreoffice5-bin/files
 
 do-install:
diff --git a/misc/libreoffice6-bin/Makefile b/misc/libreoffice6-bin/Makefile
index a57249dc72c..d00cb95cf21 100644
--- a/misc/libreoffice6-bin/Makefile
+++ b/misc/libreoffice6-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/07 15:02:27 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 17:04:23 rillig Exp $
 
 DISTNAME=		libreoffice6-bin	# overridden below
 PKGNAME=		libreoffice6-bin-${OO_RELEASE}
@@ -66,7 +66,7 @@ MASTER_SITES=		http://download.documentfoundation.org/libreoffice/stable/${OO_RE
 
 .include "options.mk"
 
-INSTALLATION_DIRS= bin share/applications
+INSTALLATION_DIRS=	bin share/applications
 DESKTOP_FILESDIR=	${.CURDIR}/../../misc/libreoffice6-bin/files
 
 do-install:
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index 1f8abb6443c..4106355bb23 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/08/16 20:21:11 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 17:04:23 rillig Exp $
 
 DISTNAME=	logsurfer-1.8
 PKGNAME=	logsurfer-1.8
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.crypt.gen.nz/logsurfer/
 COMMENT=	Processes logfiles and performs certain actions
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
diff --git a/misc/lookup/Makefile b/misc/lookup/Makefile
index 3664b5a8c8d..169092b0573 100644
--- a/misc/lookup/Makefile
+++ b/misc/lookup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 17:04:24 rillig Exp $
 
 DISTNAME=	lookup-1.4.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,13 +15,13 @@ MAKE_JOBS_SAFE=	no
 DEPENDS+=	eblook>=1.4:../../textproc/eblook
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
-EMACS_BUILDLINK=# defined
+EMACS_BUILDLINK=		# defined
 
 GNU_CONFIGURE=	YES
 MAKEFLAGS+=	lispdir=${EMACS_LISPPREFIX}/lookup
 INFO_FILES=	yes
 
-CONFIGURE_ARGS+=${EMACS_FLAVOR}
+CONFIGURE_ARGS+=	${EMACS_FLAVOR}
 
 .include "../../editors/emacs/modules.mk"
 
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index 09e4ec9f603..4a0829792c2 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/09/03 08:36:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 17:04:24 rillig Exp $
 
 DISTNAME=	lv451
 PKGNAME=	lv-4.51
@@ -11,11 +11,11 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Powerful Multilingual File Viewer
 LICENSE=	gnu-gpl-v2
 
-CONFIGURE_DIRS=	build
-GNU_CONFIGURE=	yes
-CONFIGURE_SCRIPT= ../src/configure
+CONFIGURE_DIRS=		build
+GNU_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	../src/configure
 
-MAKE_ENV+=	LN=${LN:Q}
+MAKE_ENV+=		LN=${LN:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 lib/lv
 
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/misc/marble/Makefile b/misc/marble/Makefile
index d62f7dd4001..bcea614ba27 100644
--- a/misc/marble/Makefile
+++ b/misc/marble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/08/22 12:23:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/03 17:04:24 rillig Exp $
 
 DISTNAME=	marble-${_KDE_VERSION}
 PKGREVISION=	14
@@ -6,7 +6,7 @@ CATEGORIES=	misc
 COMMENT=	KDE desktop globe
 
 # .../src/apps/marble-kde/marble_part.cpp:106:10: fatal error: 'settings.h' file not found
-MAKE_JOBS_SAFE=no
+MAKE_JOBS_SAFE=	no
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
diff --git a/misc/mkcue/Makefile b/misc/mkcue/Makefile
index 966725c9319..12bcde3eeb2 100644
--- a/misc/mkcue/Makefile
+++ b/misc/mkcue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/08 09:57:30 asau Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 17:04:24 rillig Exp $
 #
 
 DISTNAME=	mkcue_1.orig
@@ -17,7 +17,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
 
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS=	bin
 
 post-extract:
 	${CP} ${FILESDIR}/mb_dragonfly.cpp ${WRKSRC}/osdep
diff --git a/misc/molden/Makefile b/misc/molden/Makefile
index baf16011b7e..b20aaf9c687 100644
--- a/misc/molden/Makefile
+++ b/misc/molden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/04/25 14:23:36 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 17:04:24 rillig Exp $
 
 DISTNAME=	molden4.6
 PKGNAME=	${DISTNAME:S/molden/&-/}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.cmbi.ru.nl/molden/molden.html
 COMMENT=	Displaying MOLecular DENsity
 LICENSE=	molden-license
 
-RESTRICTED=	Redistributing Molden by unregistered user is prohibited.
+RESTRICTED=		Redistributing Molden by unregistered user is prohibited.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
diff --git a/misc/mtail/Makefile b/misc/mtail/Makefile
index 382143003f6..db8de39577b 100644
--- a/misc/mtail/Makefile
+++ b/misc/mtail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/04/25 07:33:08 maya Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 17:04:24 rillig Exp $
 #
 
 DISTNAME=	mtail-1.1.1
@@ -13,7 +13,7 @@ COMMENT=	Small tail workalike that performs output coloring
 
 NO_BUILD=	yes
 
-REPLACE_PYTHON=	mtail
+REPLACE_PYTHON=		mtail
 INSTALLATION_DIRS=	bin share/doc share/examples
 
 do-install:
diff --git a/misc/ocaml-cudf/Makefile b/misc/ocaml-cudf/Makefile
index fe274185a49..9be6e09f358 100644
--- a/misc/ocaml-cudf/Makefile
+++ b/misc/ocaml-cudf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/11/12 16:10:25 jaapb Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 17:04:24 rillig Exp $
 
 DISTNAME=	cudf-0.9
 PKGNAME=	ocaml-${DISTNAME}
@@ -11,9 +11,9 @@ HOMEPAGE=	https://gforge.inria.fr/projects/cudf
 COMMENT=	OCaml library for the Common Upgradeability Description Format
 LICENSE=	gnu-lgpl-v3
 
-USE_TOOLS+=	gmake pkg-config pod2man
+USE_TOOLS+=		gmake pkg-config pod2man
 OCAML_USE_FINDLIB=	yes
-MAKE_JOBS_SAFE=	no
+MAKE_JOBS_SAFE=		no
 
 PKGCONFIG_OVERRIDE+=	c-lib/cudf.pc.in
 
diff --git a/misc/ocaml-magic-mime/buildlink3.mk b/misc/ocaml-magic-mime/buildlink3.mk
index df2e4bc5981..fd76b108878 100644
--- a/misc/ocaml-magic-mime/buildlink3.mk
+++ b/misc/ocaml-magic-mime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/07/01 15:53:30 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 17:04:24 rillig Exp $
 
 BUILDLINK_TREE+=	ocaml-magic-mime
 
@@ -7,7 +7,7 @@ OCAML_MAGIC_MIME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-magic-mime+=	ocaml-magic-mime>=1.1.1
 BUILDLINK_ABI_DEPENDS.ocaml-magic-mime+=	ocaml-magic-mime>=1.1.1
-BUILDLINK_PKGSRCDIR.ocaml-magic-mime?=	../../misc/ocaml-magic-mime
+BUILDLINK_PKGSRCDIR.ocaml-magic-mime?=		../../misc/ocaml-magic-mime
 .endif	# OCAML_MAGIC_MIME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocaml-magic-mime
diff --git a/misc/ocaml-opaline/buildlink3.mk b/misc/ocaml-opaline/buildlink3.mk
index 8cf3f45dd8b..9e5f95bd99d 100644
--- a/misc/ocaml-opaline/buildlink3.mk
+++ b/misc/ocaml-opaline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2019/03/06 10:38:22 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2019/11/03 17:04:24 rillig Exp $
 
 BUILDLINK_TREE+=	ocaml-opaline
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ocaml-opaline+=	ocaml-opaline>=0.3.2
 BUILDLINK_PKGSRCDIR.ocaml-opaline?=	../../misc/ocaml-opaline
 
 # We only need this to install
-BUILDLINK_DEPMETHOD.ocaml-opaline?=     build
+BUILDLINK_DEPMETHOD.ocaml-opaline?=	build
 
 .endif	# OCAML_OPALINE_BUILDLINK3_MK
 
diff --git a/misc/ocaml-opam-file-format/Makefile b/misc/ocaml-opam-file-format/Makefile
index 764b1626879..2b284c862c0 100644
--- a/misc/ocaml-opam-file-format/Makefile
+++ b/misc/ocaml-opam-file-format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/01/13 23:22:51 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 17:04:25 rillig Exp $
 
 VERSION=	2.0.0
 GITHUB_PROJECT=	opam-file-format
@@ -14,7 +14,7 @@ HOMEPAGE=	http://opam.ocaml.org/
 COMMENT=	Parser and printer for the opam file syntax
 LICENSE=	gnu-lgpl-v3
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=		gmake
 OCAML_USE_FINDLIB=	yes
 
 INSTALL_ENV+=	LIBDIR=${PREFIX}/${OCAML_SITELIBDIR}
diff --git a/misc/ocaml-opam/Makefile b/misc/ocaml-opam/Makefile
index 1508cdc3b6e..e8a9c637fe2 100644
--- a/misc/ocaml-opam/Makefile
+++ b/misc/ocaml-opam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/22 12:23:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 17:04:25 rillig Exp $
 
 VERSION=	2.0.3
 GITHUB_PROJECT=	opam
@@ -14,7 +14,7 @@ COMMENT=	OCaml package manager
 LICENSE=	gnu-lgpl-v3
 MAKE_JOBS_SAFE=	no
 
-HAS_CONFIGURE=		yes
+HAS_CONFIGURE=	yes
 OCAML_USE_DUNE=	yes
 
 OCAML_FINDLIB_DIRS+=	opam-installer
diff --git a/misc/ocaml-topkg/Makefile b/misc/ocaml-topkg/Makefile
index e824f15e17a..102e44db3c1 100644
--- a/misc/ocaml-topkg/Makefile
+++ b/misc/ocaml-topkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/11/27 16:43:05 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:04:25 rillig Exp $
 
 DISTNAME=	topkg-1.0.0
 PKGNAME=	ocaml-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Transitory OCaml software packager
 LICENSE=	isc
 
 OCAML_USE_TOPKG=	yes
-OCAML_USE_OPAM=	yes
+OCAML_USE_OPAM=		yes
 
 INSTALLATION_DIRS+=	share/doc/topkg
 
diff --git a/misc/open2300-mysql/Makefile b/misc/open2300-mysql/Makefile
index 01b8934a4ef..d05a219da64 100644
--- a/misc/open2300-mysql/Makefile
+++ b/misc/open2300-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/03/02 20:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 17:04:25 rillig Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-mysql-/}
@@ -6,8 +6,8 @@ PKGREVISION=	3
 COMMENT=	WS 23xx weather station MySQL support
 LICENSE=	gnu-gpl-v2
 
-BUILD_TARGET=	mysql2300
-INSTALL_TARGET=	install-mysql
+BUILD_TARGET=		mysql2300
+INSTALL_TARGET=		install-mysql
 INSTALLATION_DIRS+=	bin
 
 LIBS+=		-lmysqlclient
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index a37aca79892..3d5277c4c0f 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/09/02 13:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/03 17:04:25 rillig Exp $
 
 DISTNAME=	orca-2.32.1
 PKGREVISION=	2
@@ -23,15 +23,15 @@ DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 DEPENDS+=	gnome-speech>=0.4.25:../../audio/gnome-speech
 DEPENDS+=	gnome-mag>=0.16.2:../../x11/gnome-mag
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	intltool pkg-config gmake msgfmt
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		intltool pkg-config gmake msgfmt
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-ORBit, py-gnome2, py-gtk2
+PYTHON_VERSIONS_ACCEPTED=	27 # py-ORBit, py-gnome2, py-gtk2
 
 .include "../../mk/bsd.prefs.mk"
 .if ${X11_TYPE} == "modular" || !exists(${X11BASE}/bin/xmodmap)
diff --git a/misc/p5-App-MrShell/Makefile b/misc/p5-App-MrShell/Makefile
index a7bb1312c6f..d423015f43d 100644
--- a/misc/p5-App-MrShell/Makefile
+++ b/misc/p5-App-MrShell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:56 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 17:04:25 rillig Exp $
 
 DISTNAME=	App-MrShell-2.0207
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Mr. Shell runs a command on multiple hosts
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/App/MrShell/.packlist
+PERL5_PACKLIST=	auto/App/MrShell/.packlist
 
 DEPENDS+=	p5-Config-Tiny-[0-9]*:../../devel/p5-Config-Tiny
 DEPENDS+=	p5-POE-[0-9]*:../../devel/p5-POE
diff --git a/misc/p5-Locale-libintl/Makefile b/misc/p5-Locale-libintl/Makefile
index b2119e391cc..32f713c2593 100644
--- a/misc/p5-Locale-libintl/Makefile
+++ b/misc/p5-Locale-libintl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/08/23 11:07:04 adam Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 17:04:25 rillig Exp $
 
 DISTNAME=	libintl-perl-1.31
 PKGNAME=	p5-${DISTNAME:S/libintl-perl/Locale-libintl/}
@@ -10,20 +10,20 @@ HOMEPAGE=	https://metacpan.org/release/libintl-perl
 COMMENT=	Perl internationalization library
 LICENSE=	gnu-lgpl-v2.1
 
-PERL5_PACKLIST=		auto/libintl-perl/.packlist
+PERL5_PACKLIST=			auto/libintl-perl/.packlist
 # Interpreter /bin/false
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/Messages.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/Recode.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/Recode/*.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/RecodeData.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/RecodeData/*.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/TextDomain.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/Util.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_dumb.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_pp.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_xs.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_xs.pod
-CHECK_INTERPRETER_SKIP+=${PERL5_SUB_INSTALLVENDORLIB}/Locale/libintlFAQ.pod
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/Messages.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/Recode.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/Recode/*.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/RecodeData.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/RecodeData/*.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/TextDomain.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/Util.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_dumb.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_pp.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_xs.pm
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/gettext_xs.pod
+CHECK_INTERPRETER_SKIP+=	${PERL5_SUB_INSTALLVENDORLIB}/Locale/libintlFAQ.pod
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/misc/p5-Vroom/Makefile b/misc/p5-Vroom/Makefile
index 8309b3cefd6..6424b2928bb 100644
--- a/misc/p5-Vroom/Makefile
+++ b/misc/p5-Vroom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:21:59 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 17:04:25 rillig Exp $
 
 DISTNAME=	Vroom-0.37
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Slide Shows in Vim
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Vroom/.packlist
+PERL5_PACKLIST=	auto/Vroom/.packlist
 
 REPLACE_PERL+=	bin/vroom
 
diff --git a/misc/ppower/Makefile b/misc/ppower/Makefile
index fbe6245318a..90852d9adfc 100644
--- a/misc/ppower/Makefile
+++ b/misc/ppower/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 09:57:35 asau Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 17:04:26 rillig Exp $
 #
 
 DISTNAME=	ppower-0.1.5
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ppower/}
 MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://ppower.sourceforge.net/
 COMMENT=	X10 controller software for the CM11A interface
-#LICENSE=       	GPL
+#LICENSE=	GPL
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		lex
diff --git a/misc/py-anita/options.mk b/misc/py-anita/options.mk
index 8fec68815f6..5091793047c 100644
--- a/misc/py-anita/options.mk
+++ b/misc/py-anita/options.mk
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.9 2017/05/28 12:48:53 gson Exp $
+# $NetBSD: options.mk,v 1.10 2019/11/03 17:04:26 rillig Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.py-anita
+PKG_OPTIONS_VAR=		PKG_OPTIONS.py-anita
 PKG_SUPPORTED_OPTIONS=		xen
 PKG_OPTIONS_OPTIONAL_GROUPS=	qemu
 PKG_OPTIONS_GROUP.qemu=		qemu
diff --git a/misc/py-carddav/Makefile b/misc/py-carddav/Makefile
index c3f0abb28d6..f52af469b7b 100644
--- a/misc/py-carddav/Makefile
+++ b/misc/py-carddav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/09/02 13:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 17:04:26 rillig Exp $
 
 DISTNAME=	pyCardDAV-0.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pyCardDAV/carddav/}
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # as of 0.7.0
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 0.7.0
 
 REPLACE_PYTHON=		pycarddav/ui.py
 REPLACE_PYTHON+=	pycarddav/controllers/__init__.py
@@ -30,7 +30,7 @@ REPLACE_PYTHON+=	pycarddav/carddav.py
 REPLACE_PYTHON+=	pycarddav/backend.py
 REPLACE_PYTHON+=	pycarddav/__init__.py
 
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/py-carddav share/examples/py-carddav
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/py-carddav share/examples/py-carddav
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README* ${DESTDIR}${PREFIX}/share/doc/py-carddav
diff --git a/misc/py-trytond-party/options.mk b/misc/py-trytond-party/options.mk
index a83042ed0ff..836e059cbd1 100644
--- a/misc/py-trytond-party/options.mk
+++ b/misc/py-trytond-party/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2019/09/02 13:19:44 adam Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/03 17:04:26 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-trytond-party
 PKG_SUPPORTED_OPTIONS=	vatnumber
@@ -7,6 +7,6 @@ PKG_SUGGESTED_OPTIONS+=	vatnumber
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mvatnumber)
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-simplesoap via py-stdnum and py-vatnumber
+PYTHON_VERSIONS_ACCEPTED= 27 # py-simplesoap via py-stdnum and py-vatnumber
 DEPENDS+=	${PYPKGPREFIX}-vatnumber-[0-9]*:../../finance/py-vatnumber
 .endif
diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index e6c89beb7aa..ebcd7d28915 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/12/24 02:06:59 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 17:04:26 rillig Exp $
 #
 
 DISTNAME=	userland-20170109
@@ -14,7 +14,7 @@ HOMEPAGE=	https://github.com/jaredmcneill/userland
 COMMENT=	Various libraries for the Raspberry Pi
 LICENSE=	modified-bsd
 
-EXTRACT_USING=                bsdtar
+EXTRACT_USING=	bsdtar
 
 ONLY_FOR_PLATFORM=	NetBSD-*-*arm*
 
@@ -22,7 +22,7 @@ USE_LANGUAGES=	c c++
 
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-netbsdelf.cmake
-USE_TOOLS+=		bash:run
+USE_TOOLS+=	bash:run
 
 SUBST_CLASSES+=		vc
 SUBST_STAGE.vc=		pre-configure
diff --git a/misc/raspberrypi-userland/options.mk b/misc/raspberrypi-userland/options.mk
index 8e819177b95..6793563a6a0 100644
--- a/misc/raspberrypi-userland/options.mk
+++ b/misc/raspberrypi-userland/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2013/08/06 10:05:39 jmcneill Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 17:04:26 rillig Exp $
 
-PKG_OPTIONS_VAR=	 	PKG_OPTIONS.raspberrypi-userland
-PKG_SUPPORTED_OPTIONS=	 	debug
+PKG_OPTIONS_VAR=		PKG_OPTIONS.raspberrypi-userland
+PKG_SUPPORTED_OPTIONS=		debug
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile
index 8129c8c0be8..2bf334e94b4 100644
--- a/misc/routeplanner-cli/Makefile
+++ b/misc/routeplanner-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/04/26 13:14:06 maya Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 17:04:27 rillig Exp $
 #
 
 DISTNAME=		routeplanner_0.11
@@ -16,9 +16,9 @@ NO_BUILD=		yes
 USE_TOOLS+=		gzip
 
 REPLACE_PYTHON=	rpcli
-RPLIBDIR=		${PREFIX}/lib/routeplanner
-RPPY= rpcli.py rpcountry.py rpdbase.py rpunits.py rpcity.py rproute.py
-RPDB= Basic-USA.rpl3 NorthAmerica.rpl3
+RPLIBDIR=	${PREFIX}/lib/routeplanner
+RPPY=		rpcli.py rpcountry.py rpdbase.py rpunits.py rpcity.py rproute.py
+RPDB=		Basic-USA.rpl3 NorthAmerica.rpl3
 
 RP_LIBDIR_SED=	"s|/usr/share/routeplanner|${RPLIBDIR}|g"
 
@@ -41,7 +41,7 @@ do-install:
 	done
 
 # optional speedup
-#PYTHON_VERSIONS_INCOMPATIBLE=  36 # py-kjbuckets
+#PYTHON_VERSIONS_INCOMPATIBLE=	36 # py-kjbuckets
 #.include "../../devel/py-kjbuckets/buildlink3.mk"
 #.include "../../devel/py-pqueue/buildlink3.mk"
 
diff --git a/misc/screen/options.mk b/misc/screen/options.mk
index b6b7b3a7b0e..1a76740ecaa 100644
--- a/misc/screen/options.mk
+++ b/misc/screen/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/06/11 18:49:31 shattered Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 17:04:27 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.screen
 
@@ -17,12 +17,12 @@ CURSES_DEFAULT=	curses
 .endif
 
 .if !empty(PKG_OPTIONS:Mncurses)
-CURSES_DEFAULT=	ncurses
+CURSES_DEFAULT=		ncurses
 CONFIGURE_ARGS+=	--enable-colors256
 .endif
 
 .if !empty(PKG_OPTIONS:Mpdcurses)
-CURSES_DEFAULT=	pdcurses
+CURSES_DEFAULT=		pdcurses
 CONFIGURE_ARGS+=	--enable-colors256
 .endif
 
diff --git a/misc/send-pr/Makefile b/misc/send-pr/Makefile
index 614e7d32349..140720b42ce 100644
--- a/misc/send-pr/Makefile
+++ b/misc/send-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 17:04:27 rillig Exp $
 
 DISTNAME=	gnats-3.113.1
 PKGNAME=	send-pr-${GNATS_VERSION}
@@ -48,12 +48,12 @@ CONF_FILES=		${EGDIR}/config \
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/gnats \
 			${PKG_SYSCONFDIR}/gnats/gnats-adm
 
-SUBST_CLASSES+=		fix-paths
-SUBST_STAGE.fix-paths=	pre-configure
-SUBST_MESSAGE.fix-paths=Fixing paths
-SUBST_FILES.fix-paths=	send-pr.sh
-SUBST_SED.fix-paths=	-e 's,install-sid,${PREFIX}/bin/install-sid,'
-SUBST_SED.fix-paths+=	-e 's,send-pr --request-id,${PREFIX}/bin/send-pr --request-id,'
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing paths
+SUBST_FILES.fix-paths=		send-pr.sh
+SUBST_SED.fix-paths=		-e 's,install-sid,${PREFIX}/bin/install-sid,'
+SUBST_SED.fix-paths+=		-e 's,send-pr --request-id,${PREFIX}/bin/send-pr --request-id,'
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index d273f6bb2ec..95fbb079e53 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2015/10/14 20:17:27 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2019/11/03 17:04:27 rillig Exp $
 #
 
 DISTNAME=	siag-3.6.1
@@ -16,23 +16,23 @@ CONFLICTS=	siod-[0-9]*
 #DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 #DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-x
-CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
-USE_TOOLS+=	gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/siag
+USE_TOOLS+=		gmake
 
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=	XAW_TYPE
 
 .if ${XAW_TYPE} == "xpm"
-CONFIGURE_ARGS+=--with-xawm=XawXpm
+CONFIGURE_ARGS+=	--with-xawm=XawXpm
 .elif ${XAW_TYPE} == "3d"
-CONFIGURE_ARGS+=--with-xawm=Xaw3d
+CONFIGURE_ARGS+=	--with-xawm=Xaw3d
 .elif ${XAW_TYPE} == "neXtaw"
-CONFIGURE_ARGS+=--with-xawm=neXtaw
+CONFIGURE_ARGS+=	--with-xawm=neXtaw
 .else
-CONFIGURE_ARGS+=--with-xawm=Xaw
+CONFIGURE_ARGS+=	--with-xawm=Xaw
 .endif
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/misc/superkaramba/Makefile b/misc/superkaramba/Makefile
index be4776c818c..a7a20df2462 100644
--- a/misc/superkaramba/Makefile
+++ b/misc/superkaramba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/09/02 13:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 17:04:27 rillig Exp $
 
 DISTNAME=	superkaramba-15.08.3
 PKGREVISION=	13
@@ -6,7 +6,7 @@ CATEGORIES=	misc
 COMMENT=	KDE desktop widgets
 MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.08.3/src/}
 
-PYTHON_VERSIONS_ACCEPTED=   27 # not yet ported as of 4.11.3
+PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 4.11.3
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 867742ac815..16edbd22d7c 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/27 17:04:20 kamil Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 17:04:27 rillig Exp $
 #
 
 DISTNAME=	sword-1.8.1
@@ -19,10 +19,10 @@ CONFIGURE_ARGS+=	--with-clucene=${BUILDLINK_PREFIX.libclucene}
 
 PKGCONFIG_OVERRIDE+=	sword.pc.in
 
-INSTALLATION_DIRS+=share/examples/sword
-INSTALL_TARGET= install install_config
-REQD_FILES=	${PREFIX}/share/examples/sword/sword.conf \
-		${PKG_SYSCONFDIR}/sword.conf
+INSTALLATION_DIRS+=	share/examples/sword
+INSTALL_TARGET=		install install_config
+REQD_FILES=		${PREFIX}/share/examples/sword/sword.conf \
+			${PKG_SYSCONFDIR}/sword.conf
 
 # needed with at least GCC-5.4.0 which has a default value of 25
 CXXFLAGS+=	-ftemplate-depth=50
diff --git a/misc/teseq/Makefile b/misc/teseq/Makefile
index 13bdaec3b15..fb3f9172357 100644
--- a/misc/teseq/Makefile
+++ b/misc/teseq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 17:04:27 rillig Exp $
 
 DISTNAME=	teseq-1.1.1
 PKGREVISION=	3
@@ -16,7 +16,7 @@ USE_LANGUAGES=	c99
 USE_TOOLS+=	perl:run
 
 CONFIGURE_ENV+=	AUTOCONF=true # files pre-built, not needed
-CONFIGURE_ENV+= MAKEINFO=true
+CONFIGURE_ENV+=	MAKEINFO=true
 CONFIGURE_ENV+=	HELP2MAN=true
 
 INFO_FILES=	yes
@@ -24,7 +24,7 @@ INFO_FILES=	yes
 REPLACE_PERL=	reseq.in
 REPLACE_SH=	tests/run.in
 
-SUBST_CLASSES+=	infodir
+SUBST_CLASSES+=		infodir
 SUBST_FILES.infodir=	Makefile.in
 SUBST_MESSAGE.infodir=	Fixing info directory pathname
 SUBST_SED.infodir=	-e 's,@infodir@,${PREFIX}/${PKGINFODIR},g'
diff --git a/misc/todoman/Makefile b/misc/todoman/Makefile
index 2793868a52d..e42e502540b 100644
--- a/misc/todoman/Makefile
+++ b/misc/todoman/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2019/10/10 13:23:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 17:04:27 rillig Exp $
 
-DISTNAME=	todoman-3.7.0
-CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_PYPI:=t/todoman/}
-#MASTER_SITES=	${MASTER_SITE_GITHUB:=pimutils/}
+DISTNAME=		todoman-3.7.0
+CATEGORIES=		misc
+MASTER_SITES=		${MASTER_SITE_PYPI:=t/todoman/}
+#MASTER_SITES=		${MASTER_SITE_GITHUB:=pimutils/}
 #GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -35,8 +35,8 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-REPLACE_PYTHON+=	bin/todo
-USE_LANGUAGES=	# none
+REPLACE_PYTHON+=		bin/todo
+USE_LANGUAGES=			# none
 
 # overwrite automatically generated file with recommended one, per
 # "Notes for Packagers" in documentation
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index 40f0435e591..ceb37378ccb 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/10/28 19:02:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 17:04:27 rillig Exp $
 #
 
 DISTNAME=	zyGrib-8.0.1
@@ -33,122 +33,122 @@ INSTALLATION_DIRS+=	share/zyGrib/img
 INSTALLATION_DIRS+=	share/zyGrib/maps/gshhs
 INSTALLATION_DIRS+=	share/zyGrib/stuff
 INSTALLATION_DIRS+=	share/zyGrib/tr
-INSTALL_FILES+=	colors/colors_binary.txt
-INSTALL_FILES+=	colors/colors_cape_jkg.txt
-INSTALL_FILES+=	colors/colors_cin_jkg.txt
-INSTALL_FILES+=	colors/colors_clouds_black_pc.txt
-INSTALL_FILES+=	colors/colors_clouds_white_pc.txt
-INSTALL_FILES+=	colors/colors_current_kts.txt
-INSTALL_FILES+=	colors/colors_deltatemp_celcius.txt
-INSTALL_FILES+=	colors/colors_humidrel_pc.txt
-INSTALL_FILES+=	colors/colors_rain_mmh.txt
-INSTALL_FILES+=	colors/colors_snowdepth_m.txt
-INSTALL_FILES+=	colors/colors_temp_celcius.txt
-INSTALL_FILES+=	colors/colors_thetae_celcius.txt
-INSTALL_FILES+=	colors/colors_thetae_celcius_1.txt
-INSTALL_FILES+=	colors/colors_waveheight_m.txt
-INSTALL_FILES+=	colors/colors_whitecap_prb.txt
-INSTALL_FILES+=	colors/colors_whitecap_prb.txt.colors
-INSTALL_FILES+=	colors/colors_wind_jet_kts.txt
-INSTALL_FILES+=	colors/colors_wind_kts.txt
-INSTALL_FILES+=	gis/cities_10k-more.txt.gz
-INSTALL_FILES+=	gis/cities_3k-10k.txt.gz
-INSTALL_FILES+=	gis/countries_en.txt.gz
-INSTALL_FILES+=	gis/countries_fr.txt.gz
-INSTALL_FILES+=	gis/states_en.txt.gz
-INSTALL_FILES+=	gis/stations_metar.txt.gz
-INSTALL_FILES+=	img/1leftarrow.png
-INSTALL_FILES+=	img/1rightarrow.png
-INSTALL_FILES+=	img/2leftarrow.png
-INSTALL_FILES+=	img/2rightarrow.png
-INSTALL_FILES+=	img/airport.png
-INSTALL_FILES+=	img/anim.png
-INSTALL_FILES+=	img/back.png
-INSTALL_FILES+=	img/connect_no.png
-INSTALL_FILES+=	img/down.png
-INSTALL_FILES+=	img/drapeau_ar.png
-INSTALL_FILES+=	img/drapeau_cz.png
-INSTALL_FILES+=	img/drapeau_de.png
-INSTALL_FILES+=	img/drapeau_en.png
-INSTALL_FILES+=	img/drapeau_es.png
-INSTALL_FILES+=	img/drapeau_fi.png
-INSTALL_FILES+=	img/drapeau_fr.png
-INSTALL_FILES+=	img/drapeau_gr.png
-INSTALL_FILES+=	img/drapeau_it.png
-INSTALL_FILES+=	img/drapeau_nl.png
-INSTALL_FILES+=	img/drapeau_pt.png
-INSTALL_FILES+=	img/drapeau_ru.png
-INSTALL_FILES+=	img/exit.png
-INSTALL_FILES+=	img/fileclose.png
-INSTALL_FILES+=	img/fileopen.png
-INSTALL_FILES+=	img/forward.png
-INSTALL_FILES+=	img/help.png
-INSTALL_FILES+=	img/info.png
-INSTALL_FILES+=	img/media-floppy.png
-INSTALL_FILES+=	img/meteoblue.png
-INSTALL_FILES+=	img/network.png
-INSTALL_FILES+=	img/player_eject.png
-INSTALL_FILES+=	img/player_end.png
-INSTALL_FILES+=	img/player_fwd.png
-INSTALL_FILES+=	img/player_pause.png
-INSTALL_FILES+=	img/player_play.png
-INSTALL_FILES+=	img/player_playlist.png
-INSTALL_FILES+=	img/player_rew.png
-INSTALL_FILES+=	img/player_start.png
-INSTALL_FILES+=	img/player_stop.png
-INSTALL_FILES+=	img/printer.png
-INSTALL_FILES+=	img/reload.png
-INSTALL_FILES+=	img/resource.rc
-INSTALL_FILES+=	img/spreadsheet.png
-INSTALL_FILES+=	img/time_icon.png
-INSTALL_FILES+=	img/up.png
-INSTALL_FILES+=	img/viewmag+.png
-INSTALL_FILES+=	img/viewmag-.png
-INSTALL_FILES+=	img/viewmag1.png
-INSTALL_FILES+=	img/viewmagfit.png
-INSTALL_FILES+=	img/zyGrib.icns
-INSTALL_FILES+=	img/zyGrib_32.ico
-INSTALL_FILES+=	img/zyGrib_32.xpm
-INSTALL_FILES+=	maps/gshhs/README.gshhs
-INSTALL_FILES+=	maps/gshhs/README.gshhs.rangs
-INSTALL_FILES+=	maps/gshhs/gshhs_2.rim
-INSTALL_FILES+=	maps/gshhs/gshhs_3.rim
-INSTALL_FILES+=	maps/gshhs/gshhs_4.rim
-INSTALL_FILES+=	maps/gshhs/rangs_2.cat
-INSTALL_FILES+=	maps/gshhs/rangs_2.cel
-INSTALL_FILES+=	maps/gshhs/rangs_3.cat
-INSTALL_FILES+=	maps/gshhs/rangs_3.cel
-INSTALL_FILES+=	maps/gshhs/rangs_4.cat
-INSTALL_FILES+=	maps/gshhs/rangs_4.cel
-INSTALL_FILES+=	maps/gshhs/wdb_borders_c.b
-INSTALL_FILES+=	maps/gshhs/wdb_borders_i.b
-INSTALL_FILES+=	maps/gshhs/wdb_borders_l.b
-INSTALL_FILES+=	maps/gshhs/wdb_rivers_c.b
-INSTALL_FILES+=	maps/gshhs/wdb_rivers_i.b
-INSTALL_FILES+=	maps/gshhs/wdb_rivers_l.b
-INSTALL_FILES+=	stuff/boat_parameters.csv
-INSTALL_FILES+=	tr/zyGrib_ar.qm
-INSTALL_FILES+=	tr/zyGrib_ar.ts
-INSTALL_FILES+=	tr/zyGrib_cz.qm
-INSTALL_FILES+=	tr/zyGrib_cz.ts
-INSTALL_FILES+=	tr/zyGrib_de.qm
-INSTALL_FILES+=	tr/zyGrib_de.ts
-INSTALL_FILES+=	tr/zyGrib_es.qm
-INSTALL_FILES+=	tr/zyGrib_es.ts
-INSTALL_FILES+=	tr/zyGrib_fi.qm
-INSTALL_FILES+=	tr/zyGrib_fi.ts
-INSTALL_FILES+=	tr/zyGrib_fr.qm
-INSTALL_FILES+=	tr/zyGrib_fr.ts
-INSTALL_FILES+=	tr/zyGrib_gr.qm
-INSTALL_FILES+=	tr/zyGrib_gr.ts
-INSTALL_FILES+=	tr/zyGrib_it.qm
-INSTALL_FILES+=	tr/zyGrib_it.ts
-INSTALL_FILES+=	tr/zyGrib_nl.qm
-INSTALL_FILES+=	tr/zyGrib_nl.ts
-INSTALL_FILES+=	tr/zyGrib_pt.qm
-INSTALL_FILES+=	tr/zyGrib_pt.ts
-INSTALL_FILES+=	tr/zyGrib_ru.qm
-INSTALL_FILES+=	tr/zyGrib_ru.ts
+INSTALL_FILES+=		colors/colors_binary.txt
+INSTALL_FILES+=		colors/colors_cape_jkg.txt
+INSTALL_FILES+=		colors/colors_cin_jkg.txt
+INSTALL_FILES+=		colors/colors_clouds_black_pc.txt
+INSTALL_FILES+=		colors/colors_clouds_white_pc.txt
+INSTALL_FILES+=		colors/colors_current_kts.txt
+INSTALL_FILES+=		colors/colors_deltatemp_celcius.txt
+INSTALL_FILES+=		colors/colors_humidrel_pc.txt
+INSTALL_FILES+=		colors/colors_rain_mmh.txt
+INSTALL_FILES+=		colors/colors_snowdepth_m.txt
+INSTALL_FILES+=		colors/colors_temp_celcius.txt
+INSTALL_FILES+=		colors/colors_thetae_celcius.txt
+INSTALL_FILES+=		colors/colors_thetae_celcius_1.txt
+INSTALL_FILES+=		colors/colors_waveheight_m.txt
+INSTALL_FILES+=		colors/colors_whitecap_prb.txt
+INSTALL_FILES+=		colors/colors_whitecap_prb.txt.colors
+INSTALL_FILES+=		colors/colors_wind_jet_kts.txt
+INSTALL_FILES+=		colors/colors_wind_kts.txt
+INSTALL_FILES+=		gis/cities_10k-more.txt.gz
+INSTALL_FILES+=		gis/cities_3k-10k.txt.gz
+INSTALL_FILES+=		gis/countries_en.txt.gz
+INSTALL_FILES+=		gis/countries_fr.txt.gz
+INSTALL_FILES+=		gis/states_en.txt.gz
+INSTALL_FILES+=		gis/stations_metar.txt.gz
+INSTALL_FILES+=		img/1leftarrow.png
+INSTALL_FILES+=		img/1rightarrow.png
+INSTALL_FILES+=		img/2leftarrow.png
+INSTALL_FILES+=		img/2rightarrow.png
+INSTALL_FILES+=		img/airport.png
+INSTALL_FILES+=		img/anim.png
+INSTALL_FILES+=		img/back.png
+INSTALL_FILES+=		img/connect_no.png
+INSTALL_FILES+=		img/down.png
+INSTALL_FILES+=		img/drapeau_ar.png
+INSTALL_FILES+=		img/drapeau_cz.png
+INSTALL_FILES+=		img/drapeau_de.png
+INSTALL_FILES+=		img/drapeau_en.png
+INSTALL_FILES+=		img/drapeau_es.png
+INSTALL_FILES+=		img/drapeau_fi.png
+INSTALL_FILES+=		img/drapeau_fr.png
+INSTALL_FILES+=		img/drapeau_gr.png
+INSTALL_FILES+=		img/drapeau_it.png
+INSTALL_FILES+=		img/drapeau_nl.png
+INSTALL_FILES+=		img/drapeau_pt.png
+INSTALL_FILES+=		img/drapeau_ru.png
+INSTALL_FILES+=		img/exit.png
+INSTALL_FILES+=		img/fileclose.png
+INSTALL_FILES+=		img/fileopen.png
+INSTALL_FILES+=		img/forward.png
+INSTALL_FILES+=		img/help.png
+INSTALL_FILES+=		img/info.png
+INSTALL_FILES+=		img/media-floppy.png
+INSTALL_FILES+=		img/meteoblue.png
+INSTALL_FILES+=		img/network.png
+INSTALL_FILES+=		img/player_eject.png
+INSTALL_FILES+=		img/player_end.png
+INSTALL_FILES+=		img/player_fwd.png
+INSTALL_FILES+=		img/player_pause.png
+INSTALL_FILES+=		img/player_play.png
+INSTALL_FILES+=		img/player_playlist.png
+INSTALL_FILES+=		img/player_rew.png
+INSTALL_FILES+=		img/player_start.png
+INSTALL_FILES+=		img/player_stop.png
+INSTALL_FILES+=		img/printer.png
+INSTALL_FILES+=		img/reload.png
+INSTALL_FILES+=		img/resource.rc
+INSTALL_FILES+=		img/spreadsheet.png
+INSTALL_FILES+=		img/time_icon.png
+INSTALL_FILES+=		img/up.png
+INSTALL_FILES+=		img/viewmag+.png
+INSTALL_FILES+=		img/viewmag-.png
+INSTALL_FILES+=		img/viewmag1.png
+INSTALL_FILES+=		img/viewmagfit.png
+INSTALL_FILES+=		img/zyGrib.icns
+INSTALL_FILES+=		img/zyGrib_32.ico
+INSTALL_FILES+=		img/zyGrib_32.xpm
+INSTALL_FILES+=		maps/gshhs/README.gshhs
+INSTALL_FILES+=		maps/gshhs/README.gshhs.rangs
+INSTALL_FILES+=		maps/gshhs/gshhs_2.rim
+INSTALL_FILES+=		maps/gshhs/gshhs_3.rim
+INSTALL_FILES+=		maps/gshhs/gshhs_4.rim
+INSTALL_FILES+=		maps/gshhs/rangs_2.cat
+INSTALL_FILES+=		maps/gshhs/rangs_2.cel
+INSTALL_FILES+=		maps/gshhs/rangs_3.cat
+INSTALL_FILES+=		maps/gshhs/rangs_3.cel
+INSTALL_FILES+=		maps/gshhs/rangs_4.cat
+INSTALL_FILES+=		maps/gshhs/rangs_4.cel
+INSTALL_FILES+=		maps/gshhs/wdb_borders_c.b
+INSTALL_FILES+=		maps/gshhs/wdb_borders_i.b
+INSTALL_FILES+=		maps/gshhs/wdb_borders_l.b
+INSTALL_FILES+=		maps/gshhs/wdb_rivers_c.b
+INSTALL_FILES+=		maps/gshhs/wdb_rivers_i.b
+INSTALL_FILES+=		maps/gshhs/wdb_rivers_l.b
+INSTALL_FILES+=		stuff/boat_parameters.csv
+INSTALL_FILES+=		tr/zyGrib_ar.qm
+INSTALL_FILES+=		tr/zyGrib_ar.ts
+INSTALL_FILES+=		tr/zyGrib_cz.qm
+INSTALL_FILES+=		tr/zyGrib_cz.ts
+INSTALL_FILES+=		tr/zyGrib_de.qm
+INSTALL_FILES+=		tr/zyGrib_de.ts
+INSTALL_FILES+=		tr/zyGrib_es.qm
+INSTALL_FILES+=		tr/zyGrib_es.ts
+INSTALL_FILES+=		tr/zyGrib_fi.qm
+INSTALL_FILES+=		tr/zyGrib_fi.ts
+INSTALL_FILES+=		tr/zyGrib_fr.qm
+INSTALL_FILES+=		tr/zyGrib_fr.ts
+INSTALL_FILES+=		tr/zyGrib_gr.qm
+INSTALL_FILES+=		tr/zyGrib_gr.ts
+INSTALL_FILES+=		tr/zyGrib_it.qm
+INSTALL_FILES+=		tr/zyGrib_it.ts
+INSTALL_FILES+=		tr/zyGrib_nl.qm
+INSTALL_FILES+=		tr/zyGrib_nl.ts
+INSTALL_FILES+=		tr/zyGrib_pt.qm
+INSTALL_FILES+=		tr/zyGrib_pt.ts
+INSTALL_FILES+=		tr/zyGrib_ru.qm
+INSTALL_FILES+=		tr/zyGrib_ru.ts
 
 do-configure:
 	cd ${WRKSRC} && ${QTDIR}/bin/qmake "QMAKE_RPATHDIR+=${QWT_DIR}/lib" "QMAKE_LIBDIR+=${QWT_DIR}/lib"