devel/p5-*: align variable assignments

pkglint -Wall -F --only aligned --only indent p5-*

No manual corrections.

152 files changed, 533 insertions, 533 deletions

diff --git a/devel/p5-Algorithm-C3/Makefile b/devel/p5-Algorithm-C3/Makefile
index ab8c1936060..7e311682f19 100644
--- a/devel/p5-Algorithm-C3/Makefile
+++ b/devel/p5-Algorithm-C3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 10:15:49 rillig Exp $
 
 DISTNAME=	Algorithm-C3-0.10
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Module for merging hierarchies using the C3 algorithm
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Algorithm/C3/.packlist
+PERL5_PACKLIST=	auto/Algorithm/C3/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Alien-Base-ModuleBuild/Makefile b/devel/p5-Alien-Base-ModuleBuild/Makefile
index d93f824c083..8ac5517a374 100644
--- a/devel/p5-Alien-Base-ModuleBuild/Makefile
+++ b/devel/p5-Alien-Base-ModuleBuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:18:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:15:49 rillig Exp $
 
 DISTNAME=	Alien-Base-ModuleBuild-1.06
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Alien-Base-ModuleBuild
 COMMENT=	Module::Build subclass for building Alien:: modules and libraries
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST=         auto/Alien/Base/ModuleBuild/.packlist
+PERL5_PACKLIST=		auto/Alien/Base/ModuleBuild/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 USE_TOOLS+=	pkg-config:run
diff --git a/devel/p5-Alien-Build/Makefile b/devel/p5-Alien-Build/Makefile
index 8bf29f2aeb8..cd6ec628557 100644
--- a/devel/p5-Alien-Build/Makefile
+++ b/devel/p5-Alien-Build/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/11/02 11:43:50 mef Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 10:15:49 rillig Exp $
 
 DISTNAME=	Alien-Build-1.91
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://metacpan.org/release/Alien-Build
 COMMENT=	Build external dependencies for use in CPAN
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST=         auto/Alien/Build/.packlist
+PERL5_PACKLIST=		auto/Alien/Build/.packlist
 
 USE_TOOLS+=	pkg-config:run
 
diff --git a/devel/p5-Alien-SDL/Makefile b/devel/p5-Alien-SDL/Makefile
index 72c689f2b36..d04b8c6b1ae 100644
--- a/devel/p5-Alien-SDL/Makefile
+++ b/devel/p5-Alien-SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:18:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 10:15:49 rillig Exp $
 
 DISTNAME=	Alien-SDL-1.446
 PKGNAME=	p5-${DISTNAME}
@@ -25,7 +25,7 @@ DEPENDS+=	p5-Tie-Simple-[0-9]*:../../devel/p5-Tie-Simple
 
 # To set this configure log "checking SDL_INST_DIR env var... yes, /usr/pkg"
 MAKE_ENV+=	SDL_INST_DIR=${PREFIX}
-USE_LANGUAGES=		c
+USE_LANGUAGES=	c
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Adjust path (see console output at configure stage)
diff --git a/devel/p5-Any-Moose/options.mk b/devel/p5-Any-Moose/options.mk
index 745014fa885..1763f324409 100644
--- a/devel/p5-Any-Moose/options.mk
+++ b/devel/p5-Any-Moose/options.mk
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2014/09/06 13:29:55 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 10:15:49 rillig Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-Any-Moose
+PKG_OPTIONS_VAR=		PKG_OPTIONS.p5-Any-Moose
 PKG_OPTIONS_REQUIRED_GROUPS=	backend
 PKG_OPTIONS_GROUP.backend=	moose mouse
 PKG_SUGGESTED_OPTIONS=		moose
diff --git a/devel/p5-AnyEvent-IRC/Makefile b/devel/p5-AnyEvent-IRC/Makefile
index 424d8f5d7a6..f123d050fc3 100644
--- a/devel/p5-AnyEvent-IRC/Makefile
+++ b/devel/p5-AnyEvent-IRC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:15:49 rillig Exp $
 
 DISTNAME=	AnyEvent-IRC-0.97
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Perl 5 event based IRC protocol client API
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/AnyEvent/IRC/.packlist
+PERL5_PACKLIST=	auto/AnyEvent/IRC/.packlist
 
 DEPENDS+=	p5-Object-Event-[0-9]*:../../devel/p5-Object-Event
 DEPENDS+=	p5-AnyEvent>=5:../../devel/p5-AnyEvent
diff --git a/devel/p5-AnyEvent/Makefile b/devel/p5-AnyEvent/Makefile
index 4e984c3286e..ccf4bf6aede 100644
--- a/devel/p5-AnyEvent/Makefile
+++ b/devel/p5-AnyEvent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/10/10 11:25:07 mef Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 10:15:49 rillig Exp $
 
 DISTNAME=	AnyEvent-7.17
 PKGNAME=	p5-${DISTNAME}
@@ -13,16 +13,16 @@ LICENSE=	${PERL5_LICENSE}
 PERL5_PACKLIST=	auto/AnyEvent/.packlist
 
 # 	  Task::Weaken in perl 5.14
-DEPENDS+= p5-Net-SSLeay>=1.33:../../security/p5-Net-SSLeay
-DEPENDS+= p5-JSON>=2.09:../../converters/p5-JSON
-DEPENDS+= p5-JSON-XS>=2.200:../../converters/p5-JSON-XS
-DEPENDS+= p5-EV>=4:../../devel/p5-EV
-DEPENDS+= p5-Guard>=1.020:../../devel/p5-Guard
-DEPENDS+= p5-Async-Interrupt>=1:../../devel/p5-Async-Interrupt
+DEPENDS+=	p5-Net-SSLeay>=1.33:../../security/p5-Net-SSLeay
+DEPENDS+=	p5-JSON>=2.09:../../converters/p5-JSON
+DEPENDS+=	p5-JSON-XS>=2.200:../../converters/p5-JSON-XS
+DEPENDS+=	p5-EV>=4:../../devel/p5-EV
+DEPENDS+=	p5-Guard>=1.020:../../devel/p5-Guard
+DEPENDS+=	p5-Async-Interrupt>=1:../../devel/p5-Async-Interrupt
 
 # setup for make test (expecting PASS with several skipping items)
 #BUILD_DEPENDS+=	p5-AnyEvent-AIO-[0-9]*:../../devel/p5-AnyEvent-AIO
-BUILD_DEPENDS+=	p5-IO-Async-[0-9]*:../../devel/p5-IO-Async
+BUILD_DEPENDS+=		p5-IO-Async-[0-9]*:../../devel/p5-IO-Async
 
 TEST_ENV+=	PERL_ANYEVENT_LOOP_TESTS=true
 TEST_ENV+=	PERL_ANYEVENT_NET_TESTS=true
diff --git a/devel/p5-App-Prove-Plugin-ProgressBar-Each/Makefile b/devel/p5-App-Prove-Plugin-ProgressBar-Each/Makefile
index aa450e01844..2655d54d83f 100644
--- a/devel/p5-App-Prove-Plugin-ProgressBar-Each/Makefile
+++ b/devel/p5-App-Prove-Plugin-ProgressBar-Each/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:18:51 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 10:15:50 rillig Exp $
 
 GIT_COMMIT=	f5f4dbf
 
@@ -17,10 +17,10 @@ WRKSRC=		${WRKDIR}/App-Prove-Plugin-ProgressBar-Each-${GIT_COMMIT}
 
 DEPENDS+=	p5-Term-ProgressBar-Simple-[0-9]*:../../devel/p5-Term-ProgressBar-Simple
 
-USE_LANGUAGES=	# empty
-USE_TOOLS+=	perl
-PERL5_PACKLIST=	auto/App/Prove/Plugin/ProgressBar/Each/.packlist
-PERL5_MODULE_TYPE=Module::Install
+USE_LANGUAGES=		# empty
+USE_TOOLS+=		perl
+PERL5_PACKLIST=		auto/App/Prove/Plugin/ProgressBar/Each/.packlist
+PERL5_MODULE_TYPE=	Module::Install
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-App-Prove-Plugin-ProgressBar/Makefile b/devel/p5-App-Prove-Plugin-ProgressBar/Makefile
index 07e8192d368..91fbc663f62 100644
--- a/devel/p5-App-Prove-Plugin-ProgressBar/Makefile
+++ b/devel/p5-App-Prove-Plugin-ProgressBar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:15:50 rillig Exp $
 
 GIT_COMMIT=	dd51ac5
 
@@ -18,10 +18,10 @@ WRKSRC=		${WRKDIR}/App-Prove-Plugin-ProgressBar-${GIT_COMMIT}
 DEPENDS+=	p5-Modern-Perl-[0-9]*:../../devel/p5-Modern-Perl
 DEPENDS+=	p5-Term-ProgressBar>=2.09:../../devel/p5-Term-ProgressBar
 
-USE_LANGUAGES=	# empty
-USE_TOOLS+=	perl
-PERL5_PACKLIST=	auto/App/Prove/Plugin/ProgressBar/.packlist
-PERL5_MODULE_TYPE=Module::Build
+USE_LANGUAGES=		# empty
+USE_TOOLS+=		perl
+PERL5_PACKLIST=		auto/App/Prove/Plugin/ProgressBar/.packlist
+PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-B-Debug/Makefile b/devel/p5-B-Debug/Makefile
index 0d7d7958ce8..c1ce37e7c48 100644
--- a/devel/p5-B-Debug/Makefile
+++ b/devel/p5-B-Debug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/15 14:23:00 mef Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 10:15:50 rillig Exp $
 
 DISTNAME=	B-Debug-1.26
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Walk Perl syntax tree, printing debug info about ops
 LICENSE=	gnu-gpl-v1
 
 USE_LANGUAGES=	# none
-PERL5_PACKLIST=         auto/B/Debug/.packlist
+PERL5_PACKLIST=	auto/B/Debug/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-BackPAN-Index/Makefile b/devel/p5-BackPAN-Index/Makefile
index c0621ac8e76..d68dfc9730c 100644
--- a/devel/p5-BackPAN-Index/Makefile
+++ b/devel/p5-BackPAN-Index/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 10:15:50 rillig Exp $
 
 DISTNAME=	BackPAN-Index-0.42
 PKGNAME=	p5-${DISTNAME}
@@ -18,18 +18,18 @@ PERL5_MODULE_TYPE=	Module::Build
 REPLACE_PERL+=	create_backpan_index.pl
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.90}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-Archive-Extract>=0.74:../../archivers/p5-Archive-Extract
-DEPENDS+=	p5-App-Cache>=0.37:../../devel/p5-App-Cache
-DEPENDS+=	p5-CLASS>=1.00:../../devel/p5-CLASS
-DEPENDS+=	p5-CPAN-DistnameInfo>=0.09:../../devel/p5-CPAN-DistnameInfo
-DEPENDS+=	p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
-DEPENDS+=	p5-DBD-SQLite>=1.25:../../databases/p5-DBD-SQLite
-DEPENDS+=	p5-DBIx-Class>=0.08109:../../databases/p5-DBIx-Class
-DEPENDS+=	p5-DBIx-Class-Schema-Loader>=0.05003:../../databases/p5-DBIx-Class-Schema-Loader
-DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=	p5-Path-Class>=0.17:../../devel/p5-Path-Class
-#DEPENDS+=	{perl>=5.10.1,p5-autodie-[0-9]*}:../../devel/p5-autodie
-#DEPENDS+=	{perl>=5.10.1,p5-parent-[0-9]*}:../../devel/p5-parent
+DEPENDS+=		p5-Archive-Extract>=0.74:../../archivers/p5-Archive-Extract
+DEPENDS+=		p5-App-Cache>=0.37:../../devel/p5-App-Cache
+DEPENDS+=		p5-CLASS>=1.00:../../devel/p5-CLASS
+DEPENDS+=		p5-CPAN-DistnameInfo>=0.09:../../devel/p5-CPAN-DistnameInfo
+DEPENDS+=		p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
+DEPENDS+=		p5-DBD-SQLite>=1.25:../../databases/p5-DBD-SQLite
+DEPENDS+=		p5-DBIx-Class>=0.08109:../../databases/p5-DBIx-Class
+DEPENDS+=		p5-DBIx-Class-Schema-Loader>=0.05003:../../databases/p5-DBIx-Class-Schema-Loader
+DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=		p5-Path-Class>=0.17:../../devel/p5-Path-Class
+#DEPENDS+=		{perl>=5.10.1,p5-autodie-[0-9]*}:../../devel/p5-autodie
+#DEPENDS+=		{perl>=5.10.1,p5-parent-[0-9]*}:../../devel/p5-parent
 
 # for make test
 #   SQLite.so: Undefined PLT symbol "sqlite3_strlike" with the prior version
diff --git a/devel/p5-CPAN-Changes/Makefile b/devel/p5-CPAN-Changes/Makefile
index ec8a0bc985d..f5bfe6a0961 100644
--- a/devel/p5-CPAN-Changes/Makefile
+++ b/devel/p5-CPAN-Changes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:15:50 rillig Exp $
 
 DISTNAME=	CPAN-Changes-0.400002
 PKGNAME=	p5-${DISTNAME}
@@ -11,14 +11,14 @@ HOMEPAGE=	https://metacpan.org/release/CPAN-Changes
 COMMENT=	Read and write Changes files
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=	#empty
+USE_LANGUAGES=		#empty
 PERL5_MODULE_TYPE=	Module::Install::Bundled
-PERL5_PACKLIST=	auto/CPAN/Changes/.packlist
-PERL5_REQD+=	5.10
-PERL5_REQD+=	5.11.4	# version >= 0.79
-PERL5_REQD+=	5.2	# Text::Wrap >= 0
-PERL5_REQD+=	5.13.4	# Test::More >= 0.96
-PERL5_REQD+=	5.15.2	# ExtUtils::MakeMaker >= 6.59
+PERL5_PACKLIST=		auto/CPAN/Changes/.packlist
+PERL5_REQD+=		5.10
+PERL5_REQD+=		5.11.4	# version >= 0.79
+PERL5_REQD+=		5.2	# Text::Wrap >= 0
+PERL5_REQD+=		5.13.4	# Test::More >= 0.96
+PERL5_REQD+=		5.15.2	# ExtUtils::MakeMaker >= 6.59
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-CPAN-Meta-Check/Makefile b/devel/p5-CPAN-Meta-Check/Makefile
index c1c7ebd2a36..921f130d14b 100644
--- a/devel/p5-CPAN-Meta-Check/Makefile
+++ b/devel/p5-CPAN-Meta-Check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:15:50 rillig Exp $
 
 DISTNAME=	CPAN-Meta-Check-0.014
 PKGNAME=	p5-${DISTNAME}
@@ -18,7 +18,7 @@ LICENSE=	${PERL5_LICENSE}
 # perl 5.20.0 has 1.000019, but test wants following version
 BUILD_DEPENDS+=	p5-Module-Metadata>=1.00023:../../devel/p5-Module-Metadata
 
-BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
 
 PERL5_PACKLIST=		auto/CPAN/Meta/Check/.packlist
 
diff --git a/devel/p5-CPAN-ParseDistribution/Makefile b/devel/p5-CPAN-ParseDistribution/Makefile
index 23ee7552410..1870ed35bfb 100644
--- a/devel/p5-CPAN-ParseDistribution/Makefile
+++ b/devel/p5-CPAN-ParseDistribution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:18:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:15:50 rillig Exp $
 #
 
 DISTNAME=	CPAN-ParseDistribution-1.54
@@ -17,7 +17,7 @@ BUILD_DEPENDS+=	p5-Devel-CheckOS-[0-9]*:../../devel/p5-Devel-CheckOS
 BUILD_DEPENDS+=	p5-Parallel-ForkManager-[0-9]*:../../devel/p5-Parallel-ForkManager
 BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 BUILD_DEPENDS+=	p5-YAML-[0-9]*:../../textproc/p5-YAML
-BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
+BUILD_DEPENDS+=	p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 
 PERL5_PACKLIST=	auto/CPAN/ParseDistribution/.packlist
 USE_LANGUAGES=	# none
diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile
index b64bf343e4e..28637bafea7 100644
--- a/devel/p5-CPAN-Uploader/Makefile
+++ b/devel/p5-CPAN-Uploader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:18:56 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:15:50 rillig Exp $
 
 DISTNAME=	CPAN-Uploader-0.103013
 PKGNAME=	p5-${DISTNAME}
@@ -11,12 +11,12 @@ HOMEPAGE=	https://metacpan.org/release/CPAN-Uploader
 COMMENT=	Perl 5 module to upload things to the CPAN
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-Getopt-Long-Descriptive>=0.084:../../devel/p5-Getopt-Long-Descriptive
-DEPENDS+=	p5-HTTP-Message-[0-9]*:../../www/p5-HTTP-Message
-DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=	p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
+DEPENDS+=		p5-Getopt-Long-Descriptive>=0.084:../../devel/p5-Getopt-Long-Descriptive
+DEPENDS+=		p5-HTTP-Message-[0-9]*:../../www/p5-HTTP-Message
+DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=		p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
 #BUILD_DEPENDS+=	{perl>=5.13.4,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-File-HomeDir-[0-9]*:../../devel/p5-File-HomeDir
+BUILD_DEPENDS+=		p5-File-HomeDir-[0-9]*:../../devel/p5-File-HomeDir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/CPAN/Uploader/.packlist
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index 92b4a2ef5b9..de2e1b3dd11 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/11 14:44:18 mef Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:15:50 rillig Exp $
 
 DISTNAME=	CPANPLUS-0.9178
 PKGNAME=	p5-${DISTNAME}
@@ -23,7 +23,7 @@ BUILD_DEPENDS+=	p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
 BUILD_DEPENDS+=	p5-Log-Message-Simple-[0-9]*:../../devel/p5-Log-Message-Simple
 BUILD_DEPENDS+=	p5-Package-Constants-[0-9]*:../../devel/p5-Package-Constants
 
-PERL5_PACKLIST= auto/CPANPLUS/.packlist
+PERL5_PACKLIST=	auto/CPANPLUS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Cache-Memcached/Makefile b/devel/p5-Cache-Memcached/Makefile
index 452403f94c9..353f2b22a0a 100644
--- a/devel/p5-Cache-Memcached/Makefile
+++ b/devel/p5-Cache-Memcached/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Cache-Memcached-1.30
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-String-CRC32-[0-9]*:../../textproc/p5-String-CRC32
 #DEPENDS+=	{perl>=5.10,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 
-PERL5_PACKLIST= 	auto/Cache/Memcached/.packlist
+PERL5_PACKLIST=		auto/Cache/Memcached/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index c5a1513e203..56bdd60824b 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:18:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Cache-2.11
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=	p5-IO-String>=1.02:../../devel/p5-IO-String
 DEPENDS+=	p5-TimeDate>=1.00:../../time/p5-TimeDate
 DEPENDS+=	p5-Digest-SHA1>=2.01:../../security/p5-Digest-SHA1
 
-PERL5_PACKLIST=	auto/Cache/.packlist
+PERL5_PACKLIST=		auto/Cache/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index 9465d34e62e..0a6d2597bbb 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/11 13:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Class-Accessor-Grouped-0.10014
 PKGNAME=	p5-${DISTNAME}
@@ -15,12 +15,12 @@ DEPENDS+=	p5-Class-Inspector-[0-9]*:../../devel/p5-Class-Inspector
 DEPENDS+=	p5-Sub-Name>=0.05:../../devel/p5-Sub-Name
 
 # For test target
-BUILD_DEPENDS+=	p5-Sub-Identify-[0-9]*:../../devel/p5-Sub-Identify
-BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Sub-Identify-[0-9]*:../../devel/p5-Sub-Identify
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 #BUILD_DEPENDS+=	{perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Class-XSAccessor>=1.15:../../devel/p5-Class-XSAccessor
+BUILD_DEPENDS+=		p5-Class-XSAccessor>=1.15:../../devel/p5-Class-XSAccessor
 # for make test
-BUILD_DEPENDS+=	p5-Module-Runtime-[0-9]*:../../devel/p5-Module-Runtime
+BUILD_DEPENDS+=		p5-Module-Runtime-[0-9]*:../../devel/p5-Module-Runtime
 
 USE_LANGUAGES=		c
 PERL5_PACKLIST=		auto/Class/Accessor/Grouped/.packlist
diff --git a/devel/p5-Config-File/Makefile b/devel/p5-Config-File/Makefile
index 463cc9c03e5..4d5698ad84f 100644
--- a/devel/p5-Config-File/Makefile
+++ b/devel/p5-Config-File/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/11 13:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Config-File-1.51
 PKGNAME=	p5-${DISTNAME}
@@ -11,9 +11,9 @@ HOMEPAGE=	https://metacpan.org/pod/Config::File
 COMMENT=	Parse a simple configuration file
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_MODULE_TYPE=      Module::Build
-PERL5_PACKLIST=         auto/Config/File/.packlist
-USE_LANGUAGES=          # none
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		auto/Config/File/.packlist
+USE_LANGUAGES=		# none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Config-MVP/Makefile b/devel/p5-Config-MVP/Makefile
index f0b07b7103f..b8c39895ad5 100644
--- a/devel/p5-Config-MVP/Makefile
+++ b/devel/p5-Config-MVP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Config-MVP-2.200011
 PKGNAME=	p5-${DISTNAME}
@@ -21,11 +21,11 @@ DEPENDS+=	p5-Throwable-[0-9]*:../../devel/p5-Throwable
 DEPENDS+=	p5-Tie-IxHash-[0-9]*:../../devel/p5-Tie-IxHash
 DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
 
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=	p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 
 USE_LANGUAGES=		# empty
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index 080e083618e..3db51499599 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Coro-6.54
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-common-sense-[0-9]*:../../devel/p5-common-sense
 DEPENDS+=	p5-AnyEvent-[0-9]*:../../devel/p5-AnyEvent
 
 MAKE_JOBS_SAFE=	no
-PERL5_PACKLIST=		auto/Coro/.packlist
+PERL5_PACKLIST=	auto/Coro/.packlist
 REPLACE_PERL+=	Coro/jit-amd64-unix.pl Coro/jit-x86-unix.pl
 
 .include "../../devel/p5-EV/buildlink3.mk"
diff --git a/devel/p5-Data-Alias/Makefile b/devel/p5-Data-Alias/Makefile
index b8f63bd4d94..e1b3e22e02b 100644
--- a/devel/p5-Data-Alias/Makefile
+++ b/devel/p5-Data-Alias/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Data-Alias-1.21
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Data-Alias
 COMMENT=	Comprehensive set of aliasing operations
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST=	auto/Data/Alias/.packlist
+PERL5_PACKLIST=		auto/Data/Alias/.packlist
 PERL5_MODULE_TYPE=	Module::Install
 
 USE_LANGUAGES=	c
diff --git a/devel/p5-Data-Dumper-Names/Makefile b/devel/p5-Data-Dumper-Names/Makefile
index 5b7045672cb..7fabcf6eaa8 100644
--- a/devel/p5-Data-Dumper-Names/Makefile
+++ b/devel/p5-Data-Dumper-Names/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Data-Dumper-Names-0.03
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-PadWalker>0.13:../../devel/p5-PadWalker
 
-PERL5_MODULE_TYPE= Module::Build
+PERL5_MODULE_TYPE=	Module::Build
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Data/Dumper/Names/.packlist
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 05e8937ad79..4b9ba79822c 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/08/11 13:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/03 10:15:51 rillig Exp $
 
 DISTNAME=	Data-Dumper-2.173
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	p5-Test-Simple>0:../../devel/p5-Test-Simple
 DEPENDS+=	p5-ExtUtils-MakeMaker>0:../../devel/p5-ExtUtils-MakeMaker
 
 USE_LANGUAGES=	c
-PERL5_PACKLIST= auto/Data/Dumper/.packlist
+PERL5_PACKLIST=	auto/Data/Dumper/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Data-Section/Makefile b/devel/p5-Data-Section/Makefile
index 51d95b85d78..672ab5c4937 100644
--- a/devel/p5-Data-Section/Makefile
+++ b/devel/p5-Data-Section/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Data-Section-0.200007
 PKGNAME=	p5-Data-Section-0.200.007
@@ -11,10 +11,10 @@ HOMEPAGE=	https://metacpan.org/release/Data-Section
 COMMENT=	Perl 5 module to read multiple hunks of data out of your DATA section
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-MRO-Compat>=0.09:../../devel/p5-MRO-Compat
-DEPENDS+=	p5-Sub-Exporter>=0.979:../../devel/p5-Sub-Exporter
+DEPENDS+=		p5-MRO-Compat>=0.09:../../devel/p5-MRO-Compat
+DEPENDS+=		p5-Sub-Exporter>=0.979:../../devel/p5-Sub-Exporter
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
+BUILD_DEPENDS+=		p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
 
 PERL5_PACKLIST=		auto/Data/Section/.packlist
 
diff --git a/devel/p5-Data-Structure-Util/Makefile b/devel/p5-Data-Structure-Util/Makefile
index 654e3022b9a..08e088a416a 100644
--- a/devel/p5-Data-Structure-Util/Makefile
+++ b/devel/p5-Data-Structure-Util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/11 13:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Data-Structure-Util-0.16
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,10 @@ MASTER_SITES=	https://cpan.metacpan.org/authors/id/A/AN/ANDYA/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://cpan.metacpan.org/authors/id/A/AN/ANDYA/
 COMMENT=	Change nature of data within a structure
-LICENSE=        ${PERL5_LICENSE}
+LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Data/Structure/Util/.packlist
-USE_LANGUAGES=  c
+PERL5_PACKLIST=	auto/Data/Structure/Util/.packlist
+USE_LANGUAGES=	c
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Data-Uniqid/Makefile b/devel/p5-Data-Uniqid/Makefile
index 0bc584dd8eb..c88a1f3c0ca 100644
--- a/devel/p5-Data-Uniqid/Makefile
+++ b/devel/p5-Data-Uniqid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Data-Uniqid-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Data-Uniqid
 COMMENT=	Perl extension for simple generaion of unique ids
 LICENSE=	${PERL5_LICENSE}
 
-#DEPENDS+=  {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
+#DEPENDS+=	{perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 
 PERL5_PACKLIST=		auto/Data/Uniqid/.packlist
 
diff --git a/devel/p5-Data-Visitor/Makefile b/devel/p5-Data-Visitor/Makefile
index 2c4c3257f4f..3bf7ad68712 100644
--- a/devel/p5-Data-Visitor/Makefile
+++ b/devel/p5-Data-Visitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Data-Visitor-0.30
 PKGNAME=	p5-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	p5-Tie-ToObject>=0.01:../../devel/p5-Tie-ToObject
 DEPENDS+=	p5-namespace-clean>=0.19:../../devel/p5-namespace-clean
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 
 PERL5_PACKLIST=	auto/Data/Visitor/.packlist
 
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index eee39f37a28..2d8de701a46 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Debug-Client-0.31
 PKGNAME=	p5-${DISTNAME}
@@ -14,8 +14,8 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-PadWalker>=1.9.2:../../devel/p5-PadWalker
 DEPENDS+=	p5-Term-ReadLine-Perl>=1.0303:../../devel/p5-Term-ReadLine-Perl
 
-BUILD_DEPENDS+=	p5-Test-Class>=0.36:../../devel/p5-Test-Class
-BUILD_DEPENDS+= p5-Test-Deep>=0.108:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=		p5-Test-Class>=0.36:../../devel/p5-Test-Class
+BUILD_DEPENDS+=		p5-Test-Deep>=0.108:../../devel/p5-Test-Deep
 #BUILD_DEPENDS+=	{perl>=5.14.2,p5-Test-Simple>=0.98}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=		auto/Debug/Client/.packlist
diff --git a/devel/p5-Devel-Declare/Makefile b/devel/p5-Devel-Declare/Makefile
index 9b8738f5e65..226f63753cf 100644
--- a/devel/p5-Devel-Declare/Makefile
+++ b/devel/p5-Devel-Declare/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/08/11 13:19:16 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Devel-Declare-0.006019
 PKGNAME=	p5-${DISTNAME}
@@ -11,18 +11,18 @@ HOMEPAGE=	https://metacpan.org/release/Devel-Declare
 COMMENT=	Declarator magic for perl
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-B-Hooks-EndOfScope>0.05:../../devel/p5-B-Hooks-EndOfScope
-DEPENDS+=	p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
-BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
-BUILD_DEPENDS+= p5-B-Compiling-[0-9]*:../../devel/p5-B-Compiling # t/lines.t
+DEPENDS+=		p5-B-Hooks-EndOfScope>0.05:../../devel/p5-B-Hooks-EndOfScope
+DEPENDS+=		p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
+BUILD_DEPENDS+=		p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
+BUILD_DEPENDS+=		p5-B-Compiling-[0-9]*:../../devel/p5-B-Compiling # t/lines.t
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
+BUILD_DEPENDS+=		p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 # for make test
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 
-USE_LANGUAGES=		c
-PERL5_PACKLIST=		auto/Devel/Declare/.packlist
-PERL5_MODULE_TYPE=	Module::Install::Bundled
+USE_LANGUAGES=					c
+PERL5_PACKLIST=					auto/Devel/Declare/.packlist
+PERL5_MODULE_TYPE=				Module::Install::Bundled
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check=	full
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+=	p5-B-Hooks-OP-Check>=0.19
 
diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile
index 2bffbeb7e66..8f3966c6947 100644
--- a/devel/p5-Devel-NYTProf/Makefile
+++ b/devel/p5-Devel-NYTProf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/08/11 13:19:17 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Devel-NYTProf-6.06
 PKGNAME=	p5-${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=	Powerful feature-rich Perl 5 source code profiler
 LICENSE=	${PERL5_LICENSE}
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.84}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
-DEPENDS+=	p5-JSON-MaybeXS-[0-9]*:../../converters/p5-JSON-MaybeXS
-BUILD_DEPENDS+=	p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
-BUILD_DEPENDS+=	p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
+DEPENDS+=		p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
+DEPENDS+=		p5-JSON-MaybeXS-[0-9]*:../../converters/p5-JSON-MaybeXS
+BUILD_DEPENDS+=		p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
+BUILD_DEPENDS+=		p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
 
 PERL5_PACKLIST=		auto/Devel/NYTProf/.packlist
 REPLACE_PERL+=		lib/Devel/NYTProf/FileHandle.pm
diff --git a/devel/p5-Devel-OverloadInfo/Makefile b/devel/p5-Devel-OverloadInfo/Makefile
index 1a19bfcd2fa..8ca53d6f97b 100644
--- a/devel/p5-Devel-OverloadInfo/Makefile
+++ b/devel/p5-Devel-OverloadInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:19:17 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Devel-OverloadInfo-0.005
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Devel-OverloadInfo
 COMMENT=	Perl 5 module for introspect overloaded operators
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=       p5-MRO-Compat>=0:../../devel/p5-MRO-Compat
+DEPENDS+=	p5-MRO-Compat>=0:../../devel/p5-MRO-Compat
 DEPENDS+=	p5-Sub-Identify>=0:../../devel/p5-Sub-Identify
 
 BUILD_DEPENDS+=	p5-Package-Stash-[0-9]*:../../devel/p5-Package-Stash
diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile
index 4eef207866c..38e600697a0 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:15:52 rillig Exp $
 
 DISTNAME=	Devel-PartialDump-0.20
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-namespace-clean>=0.08:../../devel/p5-namespace-clean
 # For test target
 BUILD_DEPENDS+=	p5-Test-Warnings-[0-9]*:../../devel/p5-Test-Warnings
 BUILD_DEPENDS+=	p5-Test-Simple>=1.001010:../../devel/p5-Test-Simple
-BUILD_DEPENDS+= p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
+BUILD_DEPENDS+=	p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Devel/PartialDump/.packlist
diff --git a/devel/p5-Devel-Pragma/Makefile b/devel/p5-Devel-Pragma/Makefile
index eb5e6f7e178..0603bc0c9c3 100644
--- a/devel/p5-Devel-Pragma/Makefile
+++ b/devel/p5-Devel-Pragma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	Devel-Pragma-1.1.0
 PKGNAME=	p5-${DISTNAME}
@@ -17,8 +17,8 @@ DEPENDS+=	p5-B-Hooks-EndOfScope>0.09:../../devel/p5-B-Hooks-EndOfScope
 #DEPENDS+=	p5-B-Hooks-OP-Check>0.18:../../devel/p5-B-Hooks-OP-Check
 BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
 
-USE_LANGUAGES=		c
-PERL5_PACKLIST=		auto/Devel/Pragma/.packlist
+USE_LANGUAGES=					c
+PERL5_PACKLIST=					auto/Devel/Pragma/.packlist
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check=	full
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+=	p5-B-Hooks-OP-Check>=0.18
 
diff --git a/devel/p5-Devel-Refcount/Makefile b/devel/p5-Devel-Refcount/Makefile
index 0400c7710fd..e1268be89da 100644
--- a/devel/p5-Devel-Refcount/Makefile
+++ b/devel/p5-Devel-Refcount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	Devel-Refcount-0.10
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Devel-Refcount
 COMMENT=	Perl 5 module to obtain the REFCNT value of a referent
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST=	auto/Devel/Refcount/.packlist
+PERL5_PACKLIST=		auto/Devel/Refcount/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Devel-ebug/Makefile b/devel/p5-Devel-ebug/Makefile
index 7261934fec9..79b0babba8d 100644
--- a/devel/p5-Devel-ebug/Makefile
+++ b/devel/p5-Devel-ebug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:19:20 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	Devel-ebug-0.59
 PKGNAME=	p5-${DISTNAME}
@@ -27,7 +27,7 @@ BUILD_DEPENDS+=	p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
 USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Install
 PERL5_PACKLIST=		auto/Devel/ebug/.packlist
-REPLACE_PERL+=	bin/ebug bin/ebug_backend_perl
+REPLACE_PERL+=		bin/ebug bin/ebug_backend_perl
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 7663b5d2ad0..31fbc03211f 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/08/11 13:19:20 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	Dist-Zilla-6.012
 PKGNAME=	p5-${DISTNAME}
@@ -64,15 +64,15 @@ DEPENDS+=	p5-YAML-Tiny-[0-9]*:../../textproc/p5-YAML-Tiny
 DEPENDS+=	p5-autobox>=2.53:../../devel/p5-autobox
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
-BUILD_DEPENDS+=	p5-CPAN-Meta-Check-[0-9]*:../../devel/p5-CPAN-Meta-Check
-BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.03:../../devel/p5-File-ShareDir-Install
-BUILD_DEPENDS+=	p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
-BUILD_DEPENDS+=	p5-Log-Log4perl-[0-9]*:../../devel/p5-Log-Log4perl
-BUILD_DEPENDS+=	p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Test-File-ShareDir-[0-9]*:../../devel/p5-Test-File-ShareDir
+BUILD_DEPENDS+=		p5-CPAN-Meta-Check-[0-9]*:../../devel/p5-CPAN-Meta-Check
+BUILD_DEPENDS+=		p5-File-ShareDir-Install>=0.03:../../devel/p5-File-ShareDir-Install
+BUILD_DEPENDS+=		p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
+BUILD_DEPENDS+=		p5-Log-Log4perl-[0-9]*:../../devel/p5-Log-Log4perl
+BUILD_DEPENDS+=		p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-File-ShareDir-[0-9]*:../../devel/p5-Test-File-ShareDir
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.45:../../devel/p5-Scalar-List-Utils
+BUILD_DEPENDS+=		p5-Scalar-List-Utils>=1.45:../../devel/p5-Scalar-List-Utils
 
 # for make test
 BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
diff --git a/devel/p5-ExtUtils-CppGuess/Makefile b/devel/p5-ExtUtils-CppGuess/Makefile
index b4dc5a1a10e..516863db8b3 100644
--- a/devel/p5-ExtUtils-CppGuess/Makefile
+++ b/devel/p5-ExtUtils-CppGuess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/17 14:20:17 mef Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	ExtUtils-CppGuess-0.20
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	${PERL5_LICENSE}
 BUILD_DEPENDS+=	p5-Module-Build-[0-9]*:../../devel/p5-Module-Build
 DEPENDS+=	p5-Capture-Tiny-[0-9]*:../../devel/p5-Capture-Tiny
 
-USE_LANGUAGES+= c c++
+USE_LANGUAGES+=	c c++
 
 PERL5_PACKLIST=		auto/ExtUtils/CppGuess/.packlist
 # one test failure as of 0.12
diff --git a/devel/p5-ExtUtils-XSpp/Makefile b/devel/p5-ExtUtils-XSpp/Makefile
index 8e728db134e..ee20d14c8e8 100644
--- a/devel/p5-ExtUtils-XSpp/Makefile
+++ b/devel/p5-ExtUtils-XSpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:19:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	ExtUtils-XSpp-0.18
 #                                    0.1602               -> 0.16.02
@@ -13,10 +13,10 @@ COMMENT=	XS for C++
 LICENSE=	${PERL5_LICENSE}
 
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Module-Build>=0.38000}:../../devel/p5-Module-Build
-BUILD_DEPENDS+=	p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
-BUILD_DEPENDS+=	p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
-#DEPENDS+=	{perl>=5.14.1,p5-ExtUtils-ParseXS>=2.22.02}:../../devel/p5-ExtUtils-ParseXS
-#DEPENDS+=	{perl>=5.7.3,p5-Digest-MD5>=2.0}:../../security/p5-Digest-MD5
+BUILD_DEPENDS+=		p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
+BUILD_DEPENDS+=		p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
+#DEPENDS+=		{perl>=5.14.1,p5-ExtUtils-ParseXS>=2.22.02}:../../devel/p5-ExtUtils-ParseXS
+#DEPENDS+=		{perl>=5.7.3,p5-Digest-MD5>=2.0}:../../security/p5-Digest-MD5
 
 USE_LANGUAGES=		c
 PERL5_MODULE_TYPE=	Module::Build
diff --git a/devel/p5-File-BOM/Makefile b/devel/p5-File-BOM/Makefile
index 10e30828957..79cefb3142d 100644
--- a/devel/p5-File-BOM/Makefile
+++ b/devel/p5-File-BOM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:19:24 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	File-BOM-0.16
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Readonly-[0-9]*:../../devel/p5-Readonly
 BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST=	auto/File/BOM/.packlist
+PERL5_PACKLIST=		auto/File/BOM/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-File-ChangeNotify/Makefile b/devel/p5-File-ChangeNotify/Makefile
index 8d0ce2c206d..96ef7f02096 100644
--- a/devel/p5-File-ChangeNotify/Makefile
+++ b/devel/p5-File-ChangeNotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/11 13:19:25 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	File-ChangeNotify-0.31
 PKGNAME=	p5-${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=	Watch for changes to files, cross-platform style
 LICENSE=	artistic-2.0
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-MooseX-Params-Validate>=0.08:../../devel/p5-MooseX-Params-Validate
-DEPENDS+=	p5-MooseX-SemiAffordanceAccessor-[0-9]*:../../devel/p5-MooseX-SemiAffordanceAccessor
-DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
-DEPENDS+=	p5-Type-Tiny-[0-9]*:../../devel/p5-Type-Tiny
+DEPENDS+=		p5-MooseX-Params-Validate>=0.08:../../devel/p5-MooseX-Params-Validate
+DEPENDS+=		p5-MooseX-SemiAffordanceAccessor-[0-9]*:../../devel/p5-MooseX-SemiAffordanceAccessor
+DEPENDS+=		p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
+DEPENDS+=		p5-Type-Tiny-[0-9]*:../../devel/p5-Type-Tiny
 
 # for make test
 BUILD_DEPENDS+=	p5-Moo-[0-9]*:../../devel/p5-Moo
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index 13ff60ae47f..d619976f280 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/11 13:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 10:15:53 rillig Exp $
 
 DISTNAME=	File-Flock-2014.01
 PKGNAME=	p5-${DISTNAME}
@@ -19,8 +19,8 @@ BUILD_DEPENDS+=	p5-IO-Event-[0-9]*:../../devel/p5-IO-Event
 BUILD_DEPENDS+=	p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
 BUILD_DEPENDS+=	p5-AnyEvent-[0-9]*:../../devel/p5-AnyEvent
 
-PERL5_PACKLIST= auto/File/Flock/.packlist
-USE_LANGUAGES=  # none
+PERL5_PACKLIST=	auto/File/Flock/.packlist
+USE_LANGUAGES=	# none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-File-LibMagic/Makefile b/devel/p5-File-LibMagic/Makefile
index 7c932b3b805..49701e8d022 100644
--- a/devel/p5-File-LibMagic/Makefile
+++ b/devel/p5-File-LibMagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:19:27 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 10:15:54 rillig Exp $
 
 DISTNAME=	File-LibMagic-1.16
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 # incompatible change in MakeMaker 7.06 vs. 7.04.1 in object file location
 # => enforce the new behaviour
 # Behavior back to 7.04.1
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=7.10:../../devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=7.10:../../devel/p5-ExtUtils-MakeMaker
 
 # cannot open LibMagic.xs: No such file or directory
 MAKE_JOBS_SAFE=	no
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index 48417e7b3e5..059af386c2a 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:27 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:54 rillig Exp $
 
 DISTNAME=	File-Modified-0.10
 PKGNAME=	p5-${DISTNAME}
@@ -12,8 +12,8 @@ COMMENT=	Perl module for checking intelligently if files have changed
 LICENSE=	${PERL5_LICENSE}
 
 #BUILD_DEPENDS+=	{perl>=5.6.1,p5-File-Temp>=0}:../../devel/p5-File-Temp
-DEPENDS+=	p5-Digest-SHA1>=0:../../security/p5-Digest-SHA1
-#DEPENDS+=	{perl>=5.7.3,p5-Digest-MD5>=0}:../../security/p5-Digest-MD5
+DEPENDS+=		p5-Digest-SHA1>=0:../../security/p5-Digest-SHA1
+#DEPENDS+=		{perl>=5.7.3,p5-Digest-MD5>=0}:../../security/p5-Digest-MD5
 
 PERL5_PACKLIST=		auto/File/Modified/.packlist
 
diff --git a/devel/p5-FindBin-libs/Makefile b/devel/p5-FindBin-libs/Makefile
index 8c8f9588bb8..07e53f63bae 100644
--- a/devel/p5-FindBin-libs/Makefile
+++ b/devel/p5-FindBin-libs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:31 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:54 rillig Exp $
 
 DISTNAME=		FindBin-libs-2.019002
-PKGNAME=        	p5-${DISTNAME:S/.0/./:S/00/./}
-PKGREVISION=        	2
+PKGNAME=		p5-${DISTNAME:S/.0/./:S/00/./}
+PKGREVISION=		2
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=FindBin/}
 
diff --git a/devel/p5-Future/Makefile b/devel/p5-Future/Makefile
index dc2d0fa4908..45cf57e8ea6 100644
--- a/devel/p5-Future/Makefile
+++ b/devel/p5-Future/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/14 01:36:13 wen Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:15:54 rillig Exp $
 
 DISTNAME=	Future-0.41
 PKGNAME=	p5-${DISTNAME}
@@ -14,10 +14,10 @@ BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 BUILD_DEPENDS+=	p5-Test-Identity-[0-9]*:../../devel/p5-Test-Identity
 BUILD_DEPENDS+=	p5-Test-Refcount-[0-9]*:../../devel/p5-Test-Refcount
 
-USE_LANGUAGES=	#empty
+USE_LANGUAGES=		#empty
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/Future/.packlist
-PERL5_REQD+=	5.10.1	# Test::More >= 0.88
+PERL5_REQD+=		5.10.1	# Test::More >= 0.88
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Getopt-Long-Descriptive/Makefile b/devel/p5-Getopt-Long-Descriptive/Makefile
index f5905befc00..d540aa04aac 100644
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/08/14 01:48:06 wen Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 10:15:54 rillig Exp $
 
 DISTNAME=	Getopt-Long-Descriptive-0.104
 PKGNAME=	p5-${DISTNAME}
@@ -13,10 +13,10 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-Params-Validate>=0.97:../../devel/p5-Params-Validate
 DEPENDS+=	p5-Sub-Exporter>=0.972:../../devel/p5-Sub-Exporter
 
-#BUILD_DEPENDS+= {perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-Warnings>=0.005:../../devel/p5-Test-Warnings
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-CPAN-Meta-Check-[0-9]*:../../devel/p5-CPAN-Meta-Check
+#BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
+BUILD_DEPENDS+=		p5-Test-Warnings>=0.005:../../devel/p5-Test-Warnings
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-CPAN-Meta-Check-[0-9]*:../../devel/p5-CPAN-Meta-Check
 
 PERL5_PACKLIST=		auto/Getopt/Long/Descriptive/.packlist
 
diff --git a/devel/p5-Git-Wrapper/Makefile b/devel/p5-Git-Wrapper/Makefile
index 1d5c092b2c3..2f74db1ff1c 100644
--- a/devel/p5-Git-Wrapper/Makefile
+++ b/devel/p5-Git-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:54 rillig Exp $
 
 DISTNAME=		Git-Wrapper-0.048
 PKGNAME=		p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=		Wrap git(7) command-line interface
 LICENSE=		${PERL5_LICENSE}
 
 BUILD_DEPENDS+=		p5-Env-Path-[0-9]*:../../devel/p5-Env-Path
-#BUILD_DEPENDS+=		{perl>=5.001,p5-File-Path-[0-9]*}:../../devel/p5-File-Path
+#BUILD_DEPENDS+=	{perl>=5.001,p5-File-Path-[0-9]*}:../../devel/p5-File-Path
 BUILD_DEPENDS+=		p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
 BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=		p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
diff --git a/devel/p5-Hash-FieldHash/Makefile b/devel/p5-Hash-FieldHash/Makefile
index 17d90d7e171..8a290aca9af 100644
--- a/devel/p5-Hash-FieldHash/Makefile
+++ b/devel/p5-Hash-FieldHash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:19:34 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:15:54 rillig Exp $
 #
 
 DISTNAME=	Hash-FieldHash-0.15
@@ -14,8 +14,8 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Test-LeakTrace>=0:../../devel/p5-Test-LeakTrace
 
-PERL5_PACKLIST=	auto/Hash/FieldHash/.packlist
-USE_LANGUAGES=	c
+PERL5_PACKLIST=		auto/Hash/FieldHash/.packlist
+USE_LANGUAGES=		c
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Hash-MoreUtils/Makefile b/devel/p5-Hash-MoreUtils/Makefile
index 95cdf06997d..87061aba35e 100644
--- a/devel/p5-Hash-MoreUtils/Makefile
+++ b/devel/p5-Hash-MoreUtils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:19:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:55 rillig Exp $
 #
 
 DISTNAME=	Hash-MoreUtils-0.06
@@ -12,8 +12,8 @@ HOMEPAGE=	https://metacpan.org/release/Hash-MoreUtils
 COMMENT=	Provide the stuff missing in Hash::Util
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/Hash/MoreUtils/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/Hash/MoreUtils/.packlist
 #PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Hash-Util-FieldHash-Compat/Makefile b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
index f58f3446365..432e34e4de2 100644
--- a/devel/p5-Hash-Util-FieldHash-Compat/Makefile
+++ b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:19:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:15:55 rillig Exp $
 #
 
 DISTNAME=	Hash-Util-FieldHash-Compat-0.11
@@ -19,11 +19,11 @@ PERL5_PACKLIST=	auto/Hash/Util/FieldHash/Compat/.packlist
 # version for pkgsrc. The module Hash::Util::FieldHash is a core
 # module since version 5.9.4. Thus this module/package does not need
 # any of the two dependencies below.
-#DEPENDS+= p5-Tie-RefHash>=1.38:../../devel/p5-Tie-RefHash
+#DEPENDS+=	p5-Tie-RefHash>=1.38:../../devel/p5-Tie-RefHash
 # ---------------------
 # Data for 2015-06-01
 # Tie::RefHash::Weak was not in CORE (or so I think)
-DEPENDS+= p5-Tie-RefHash-Weak>=0.08:../../devel/p5-Tie-RefHash-Weak
+DEPENDS+=	p5-Tie-RefHash-Weak>=0.08:../../devel/p5-Tie-RefHash-Weak
 
 BUILD_DEPENDS+=	p5-Test-Simple>=1.001010:../../devel/p5-Test-Simple
 
diff --git a/devel/p5-IO-Async/Makefile b/devel/p5-IO-Async/Makefile
index 3c2fadc643a..3512e85ceeb 100644
--- a/devel/p5-IO-Async/Makefile
+++ b/devel/p5-IO-Async/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/14 02:32:28 wen Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:15:55 rillig Exp $
 
 DISTNAME=	IO-Async-0.74
 PKGNAME=	p5-${DISTNAME}
@@ -15,9 +15,9 @@ DEPENDS+=	p5-Future>=0.18:../../devel/p5-Future
 BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 BUILD_DEPENDS+=	p5-Test-Identity-[0-9]*:../../devel/p5-Test-Identity
 BUILD_DEPENDS+=	p5-Test-Refcount-[0-9]*:../../devel/p5-Test-Refcount
-BUILD_DEPENDS+= p5-Struct-Dumb-[0-9]*:../../devel/p5-Struct-Dumb
+BUILD_DEPENDS+=	p5-Struct-Dumb-[0-9]*:../../devel/p5-Struct-Dumb
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/IO/Async/.packlist
 
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index 6bc38a7dcd7..a14f9f22763 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2019/10/19 13:56:49 mef Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:15:55 rillig Exp $
 #
 
 DISTNAME=	IO-Pager-1.01
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
-EXTRACT_SUFX=  .tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://metacpan.org/release/IO-Pager
diff --git a/devel/p5-IO-TieCombine/Makefile b/devel/p5-IO-TieCombine/Makefile
index ca4ca02b2a2..a998bd313a7 100644
--- a/devel/p5-IO-TieCombine/Makefile
+++ b/devel/p5-IO-TieCombine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:19:39 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:55 rillig Exp $
 #
 
 DISTNAME=	IO-TieCombine-1.005
@@ -12,7 +12,7 @@ HOMEPAGE=	https://metacpan.org/release/IO-TieCombine
 COMMENT=	Perl 5 module to produce tied separate but combined variables
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/IO/TieCombine/.packlist
+PERL5_PACKLIST=	auto/IO/TieCombine/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index f0f87e5c8f4..a6c9cf76d26 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:19:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:55 rillig Exp $
 
 DISTNAME=	IPC-DirQueue-1.0
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/IPC-DirQueue
 COMMENT=	Disk-based many-to-many task queue
 LICENSE=	${PERL5_LICENSE}
 
-#DEPENDS+=  {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
+#DEPENDS+=	{perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/IPC/DirQueue/.packlist
diff --git a/devel/p5-List-UtilsBy/Makefile b/devel/p5-List-UtilsBy/Makefile
index aedee49b006..dfb7a0b2c5a 100644
--- a/devel/p5-List-UtilsBy/Makefile
+++ b/devel/p5-List-UtilsBy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:19:43 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 10:15:55 rillig Exp $
 
 DISTNAME=	List-UtilsBy-0.11
 PKGNAME=	p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=	https://metacpan.org/release/List-UtilsBy
 COMMENT=	Higher-order list utility functions
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/List/UtilsBy/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/List/UtilsBy/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Log-Dispatchouli/Makefile b/devel/p5-Log-Dispatchouli/Makefile
index ff6b8e35ffd..32f8a58434e 100644
--- a/devel/p5-Log-Dispatchouli/Makefile
+++ b/devel/p5-Log-Dispatchouli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/22 06:15:01 mef Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=	Log-Dispatchouli-2.019
 PKGNAME=	p5-${DISTNAME}
@@ -18,11 +18,11 @@ DEPENDS+=	p5-Sub-Exporter-[0-9]*:../../devel/p5-Sub-Exporter
 DEPENDS+=	p5-Sub-Exporter-GlobExporter>=0.002:../../devel/p5-Sub-Exporter-GlobExporter
 DEPENDS+=	p5-Try-Tiny>=0.04:../../devel/p5-Try-Tiny
 
-BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
-BUILD_DEPENDS+= p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+= p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
-BUILD_DEPENDS+= p5-Specio-[0-9]*:../../devel/p5-Specio
-BUILD_DEPENDS+= p5-Params-ValidationCompiler-[0-9]*:../../devel/p5-Params-ValidationCompiler
+BUILD_DEPENDS+=		p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
+BUILD_DEPENDS+=		p5-Specio-[0-9]*:../../devel/p5-Specio
+BUILD_DEPENDS+=		p5-Params-ValidationCompiler-[0-9]*:../../devel/p5-Params-ValidationCompiler
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=		auto/Log/Dispatchouli/.packlist
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index ca9f9fb2d94..597d006b408 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/11 13:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=	Make-1.2.0
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Perl5 module implementing 'make' in Perl
 LICENSE=	${PERL5_LICENSE}
 
 # for make test
-BUILD_DEPENDS+= p5-Test-Compile-[0-9]*:../../devel/p5-Test-Compile
+BUILD_DEPENDS+=	p5-Test-Compile-[0-9]*:../../devel/p5-Test-Compile
 
 REPLACE_PERL=	pmake
 
diff --git a/devel/p5-Modern-Perl/Makefile b/devel/p5-Modern-Perl/Makefile
index 482fe348ff7..502b05c7d9a 100644
--- a/devel/p5-Modern-Perl/Makefile
+++ b/devel/p5-Modern-Perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/10/25 14:04:47 mef Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=	Modern-Perl-1.20190727
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	${PERL5_LICENSE}
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Modern/Perl/.packlist
 
-PERL5_REQD+=            5.10.0
+PERL5_REQD+=		5.10.0
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Module-Build-Tiny/Makefile b/devel/p5-Module-Build-Tiny/Makefile
index 15f0ad114c8..faa91b8f68e 100644
--- a/devel/p5-Module-Build-Tiny/Makefile
+++ b/devel/p5-Module-Build-Tiny/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:19:48 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:56 rillig Exp $
 #
 
 DISTNAME=	Module-Build-Tiny-0.039
@@ -18,7 +18,7 @@ DEPENDS+=	p5-ExtUtils-InstallPaths>=0.002:../../devel/p5-ExtUtils-InstallPaths
 
 BUILD_DEPENDS+=	p5-Test-Harness>=3.30:../../devel/p5-Test-Harness
 
-USE_LANGUAGES=	c       # For the tests
+USE_LANGUAGES=		c       # For the tests
 #BUILDING_MODULE_BUILD=	yes
 PERL5_MODULE_TYPE=	Module::Build::Tiny
 PERL5_PACKLIST=		auto/Module/Build/Tiny/.packlist
diff --git a/devel/p5-Module-Build-WithXSpp/Makefile b/devel/p5-Module-Build-WithXSpp/Makefile
index b56bb8b6fe3..b2244374138 100644
--- a/devel/p5-Module-Build-WithXSpp/Makefile
+++ b/devel/p5-Module-Build-WithXSpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:19:48 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=	Module-Build-WithXSpp-0.14
 PKGNAME=	p5-${DISTNAME}
@@ -20,7 +20,7 @@ DEPENDS+=	p5-ExtUtils-XSpp-[0-9]*:../../devel/p5-ExtUtils-XSpp
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/Module/Build/WithXSpp/.packlist
 # For the tests:
-#USE_TOOLS+=	perl
+#USE_TOOLS+=		perl
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index f1472a7f836..da0ac5b8fd7 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2019/10/25 14:14:49 mef Exp $
+# $NetBSD: Makefile,v 1.60 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=	Module-Build-0.4229
 PKGNAME=	p5-${DISTNAME}0
@@ -15,7 +15,7 @@ DEPENDS+=	p5-inc-latest-[0-9]*:../../devel/p5-inc-latest
 TEST_DEPENDS+=	p5-CPAN-Meta>=2.142060:../../devel/p5-CPAN-Meta
 TEST_DEPENDS+=	p5-PAR-Dist-[0-9]*:../../devel/p5-PAR-Dist
 # For the tests:
-USE_TOOLS+=		perl
+USE_TOOLS+=	perl
 
 .include "options.mk"
 
diff --git a/devel/p5-Module-ExtractUse/Makefile b/devel/p5-Module-ExtractUse/Makefile
index fcf2e426df7..2a90e7a26ce 100644
--- a/devel/p5-Module-ExtractUse/Makefile
+++ b/devel/p5-Module-ExtractUse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:15:56 rillig Exp $
 #
 
 DISTNAME=	Module-ExtractUse-0.343
@@ -21,7 +21,7 @@ BUILD_DEPENDS+=	p5-Test-Pod>=0:../../devel/p5-Test-Pod
 BUILD_DEPENDS+=	p5-Test-Pod-Coverage>=0:../../devel/p5-Test-Pod-Coverage
 BUILD_DEPENDS+=	p5-UNIVERSAL-require>=0:../../devel/p5-UNIVERSAL-require
 
-PERL5_PACKLIST=	auto/Module/ExtractUse/.packlist
+PERL5_PACKLIST=		auto/Module/ExtractUse/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Module-FromPerlVer/Makefile b/devel/p5-Module-FromPerlVer/Makefile
index e94a40e4b4a..e5034d834b1 100644
--- a/devel/p5-Module-FromPerlVer/Makefile
+++ b/devel/p5-Module-FromPerlVer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=		Module-FromPerlVer-0.030000
-PKGNAME=        	p5-${DISTNAME}
-PKGREVISION=        	2
+PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		2
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Module/}
 
diff --git a/devel/p5-Module-Implementation/Makefile b/devel/p5-Module-Implementation/Makefile
index f12e16cde1e..bf05711f2a4 100644
--- a/devel/p5-Module-Implementation/Makefile
+++ b/devel/p5-Module-Implementation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 10:15:56 rillig Exp $
 
 DISTNAME=	Module-Implementation-0.09
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	p5-Test-Fatal>=0.006:../../devel/p5-Test-Fatal
 BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/Module/Implementation/.packlist
+PERL5_PACKLIST=	auto/Module/Implementation/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Module-Install-GithubMeta/Makefile b/devel/p5-Module-Install-GithubMeta/Makefile
index a83fac050fc..185000d5fa7 100644
--- a/devel/p5-Module-Install-GithubMeta/Makefile
+++ b/devel/p5-Module-Install-GithubMeta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 10:15:57 rillig Exp $
 
 DISTNAME=	Module-Install-GithubMeta-0.30
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ LICENSE=	${PERL5_LICENSE}
 BUILD_DEPENDS+=	p5-Capture-Tiny-[0-9]*:../../devel/p5-Capture-Tiny
 BUILD_DEPENDS+=	p5-Module-Install-[0-9]*:../../devel/p5-Module-Install
 
-USE_LANGUAGES=  # empty
+USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Module/Install/GithubMeta/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Module-Install-RTx/Makefile b/devel/p5-Module-Install-RTx/Makefile
index 72dfa69539e..8fae56a86a1 100644
--- a/devel/p5-Module-Install-RTx/Makefile
+++ b/devel/p5-Module-Install-RTx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:15:57 rillig Exp $
 
 DISTNAME=	Module-Install-RTx-0.40
 PKGNAME=	p5-${DISTNAME}
@@ -15,9 +15,9 @@ DEPENDS+=	p5-Module-Install-[0-9]*:../../devel/p5-Module-Install
 
 PERL5_PACKLIST=		auto/Module/Install/RTx/.packlist
 
-SUBST_CLASSES+=         manpath
-SUBST_STAGE.manpath=    pre-configure
-SUBST_FILES.manpath=    lib/Module/Install/RTx.pm
+SUBST_CLASSES+=		manpath
+SUBST_STAGE.manpath=	pre-configure
+SUBST_FILES.manpath=	lib/Module/Install/RTx.pm
 SUBST_VARS.manpath=	PREFIX PKGMANDIR
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Module-Install-ReadmeFromPod/Makefile b/devel/p5-Module-Install-ReadmeFromPod/Makefile
index 6468dd755f0..befb6871163 100644
--- a/devel/p5-Module-Install-ReadmeFromPod/Makefile
+++ b/devel/p5-Module-Install-ReadmeFromPod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:15:57 rillig Exp $
 #
 
 DISTNAME=	Module-Install-ReadmeFromPod-0.30
@@ -16,9 +16,9 @@ DEPENDS+=	p5-Capture-Tiny>=0.05:../../devel/p5-Capture-Tiny
 DEPENDS+=	p5-Module-Install>=0.85:../../devel/p5-Module-Install
 
 # for make test
-BUILD_DEPENDS+=p5-IO-All-[0-9]*:../../devel/p5-IO-All
-BUILD_DEPENDS+=p5-Test-InDistDir-[0-9]*:../../devel/p5-Test-InDistDir
-BUILD_DEPENDS+=p5-Pod-Markdown-[0-9]*:../../textproc/p5-Pod-Markdown
+BUILD_DEPENDS+=	p5-IO-All-[0-9]*:../../devel/p5-IO-All
+BUILD_DEPENDS+=	p5-Test-InDistDir-[0-9]*:../../devel/p5-Test-InDistDir
+BUILD_DEPENDS+=	p5-Pod-Markdown-[0-9]*:../../textproc/p5-Pod-Markdown
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Module/Install/ReadmeFromPod/.packlist
diff --git a/devel/p5-Module-Install-XSUtil/Makefile b/devel/p5-Module-Install-XSUtil/Makefile
index 4c2292ee658..36bfadaad82 100644
--- a/devel/p5-Module-Install-XSUtil/Makefile
+++ b/devel/p5-Module-Install-XSUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:15:57 rillig Exp $
 #
 
 DISTNAME=	Module-Install-XSUtil-0.45
@@ -16,7 +16,7 @@ USE_LANGUAGES=		c # for test target
 
 PERL5_PACKLIST=	auto/Module/Install/XSUtil/.packlist
 
-BUILD_DEPENDS+=	p5-B-Hooks-OP-Annotation>=0.43:../../devel/p5-B-Hooks-OP-Annotation
+BUILD_DEPENDS+=		p5-B-Hooks-OP-Annotation>=0.43:../../devel/p5-B-Hooks-OP-Annotation
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Devel-PPPort>=3.19}:../../devel/p5-Devel-PPPort
 #BUILD_DEPENDS+=	{perl>=5.12.0,p5-ExtUtils-ParseXS>=3.18}:../../devel/p5-ExtUtils-ParseXS
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
diff --git a/devel/p5-MooX-ClassAttribute/Makefile b/devel/p5-MooX-ClassAttribute/Makefile
index 6c5d332a031..ee2614e00a3 100644
--- a/devel/p5-MooX-ClassAttribute/Makefile
+++ b/devel/p5-MooX-ClassAttribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/11 13:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 10:15:57 rillig Exp $
 
 DISTNAME=	MooX-ClassAttribute-0.011
 PKGNAME=	p5-${DISTNAME}
@@ -12,11 +12,11 @@ COMMENT=	Declare class attributes Moose-style... but without Moose
 LICENSE=	${PERL5_LICENSE}
 
 # for make test
-BUILD_DEPENDS+= p5-MooseX-ClassAttribute-[0-9]*:../../devel/p5-MooseX-ClassAttribute
-BUILD_DEPENDS+= p5-Moo-[0-9]*:../../devel/p5-Moo
-BUILD_DEPENDS+= p5-Exporter-Tiny-[0-9]*:../../devel/p5-Exporter-Tiny
+BUILD_DEPENDS+=	p5-MooseX-ClassAttribute-[0-9]*:../../devel/p5-MooseX-ClassAttribute
+BUILD_DEPENDS+=	p5-Moo-[0-9]*:../../devel/p5-Moo
+BUILD_DEPENDS+=	p5-Exporter-Tiny-[0-9]*:../../devel/p5-Exporter-Tiny
 
-PERL5_PACKLIST= auto/MooX/ClassAttribute/.packlist
+PERL5_PACKLIST=	auto/MooX/ClassAttribute/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index c0b9c6d095a..9a12ff7f498 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:15:57 rillig Exp $
 #
 
 DISTNAME=	Moose-Autobox-0.16
@@ -12,8 +12,8 @@ HOMEPAGE=	https://metacpan.org/release/Moose-Autobox
 COMMENT=	Perl 5 module providing autoboxed wrappers for native datatypes
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/Moose/Autobox/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/Moose/Autobox/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 DEPENDS+=	p5-autobox>=2.23:../../devel/p5-autobox
@@ -23,7 +23,7 @@ DEPENDS+=	p5-List-MoreUtils>=0.07:../../devel/p5-List-MoreUtils
 
 BUILD_DEPENDS+=	p5-Test-Exception>=0.21:../../devel/p5-Test-Exception
 # for make test
-BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index f4698b390f9..9824380223c 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2019/08/11 13:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2019/11/03 10:15:57 rillig Exp $
 
 DISTNAME=	Moose-2.2011
 PKGNAME=	p5-${DISTNAME}
@@ -36,40 +36,40 @@ DEPENDS+=	p5-Scalar-List-Utils>=1.45:../../devel/p5-Scalar-List-Utils
 # Note: Moose can take advantage of PartialDump, but as PartialDump depends
 # on Moose, we cannot add it to DEPENDS
 
-BUILD_DEPENDS+= p5-Test-Fatal>=0.05:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+= p5-Test-Requires>=0.05:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=	p5-Test-Fatal>=0.05:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=	p5-Test-Requires>=0.05:../../devel/p5-Test-Requires
 
 CONFLICTS+=	p5-Class-MOP-[0-9]*
 
-BUILD_DEPENDS+= p5-DBM-Deep-[0-9]*:../../databases/p5-DBM-Deep
-BUILD_DEPENDS+= p5-DateTime-Calendar-Mayan-[0-9]*:../../time/p5-DateTime-Calendar-Mayan
-BUILD_DEPENDS+= p5-DateTime-Format-MySQL-[0-9]*:../../time/p5-DateTime-Format-MySQL
-BUILD_DEPENDS+= p5-Declare-Constraints-Simple-[0-9]*:../../devel/p5-Declare-Constraints-Simple
-BUILD_DEPENDS+= p5-IO-String-[0-9]*:../../devel/p5-IO-String
-BUILD_DEPENDS+= p5-Locale-US-[0-9]*:../../misc/p5-Locale-US
-BUILD_DEPENDS+= p5-Module-Refresh-[0-9]*:../../devel/p5-Module-Refresh
-BUILD_DEPENDS+= p5-Params-Coerce-[0-9]*:../../devel/p5-Params-Coerce
-BUILD_DEPENDS+= p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common
-BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=	p5-DBM-Deep-[0-9]*:../../databases/p5-DBM-Deep
+BUILD_DEPENDS+=	p5-DateTime-Calendar-Mayan-[0-9]*:../../time/p5-DateTime-Calendar-Mayan
+BUILD_DEPENDS+=	p5-DateTime-Format-MySQL-[0-9]*:../../time/p5-DateTime-Format-MySQL
+BUILD_DEPENDS+=	p5-Declare-Constraints-Simple-[0-9]*:../../devel/p5-Declare-Constraints-Simple
+BUILD_DEPENDS+=	p5-IO-String-[0-9]*:../../devel/p5-IO-String
+BUILD_DEPENDS+=	p5-Locale-US-[0-9]*:../../misc/p5-Locale-US
+BUILD_DEPENDS+=	p5-Module-Refresh-[0-9]*:../../devel/p5-Module-Refresh
+BUILD_DEPENDS+=	p5-Params-Coerce-[0-9]*:../../devel/p5-Params-Coerce
+BUILD_DEPENDS+=	p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common
+BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
 BUILD_DEPENDS+=	p5-Test-Warnings>=0.016:../../devel/p5-Test-Warnings
 
 # other documented develop dependencies
-BUILD_DEPENDS+=	p5-Algorithm-C3-[0-9]*:../../devel/p5-Algorithm-C3
-BUILD_DEPENDS+=	p5-Test-CleanNamespaces>=0.13:../../devel/p5-Test-CleanNamespaces
+BUILD_DEPENDS+=		p5-Algorithm-C3-[0-9]*:../../devel/p5-Algorithm-C3
+BUILD_DEPENDS+=		p5-Test-CleanNamespaces>=0.13:../../devel/p5-Test-CleanNamespaces
 # devel/p5-Data-Visitor depends on devel/p5-Moose
 # BUILD_DEPENDS+=	p5-Data-Visitor-[0-9]*:../../devel/p5-Data-Visitor
-BUILD_DEPENDS+=	p5-HTTP-Message-[0-9]*:../../www/p5-HTTP-Message
-BUILD_DEPENDS+=	p5-PadWalker-[0-9]*:../../devel/p5-PadWalker
-BUILD_DEPENDS+=	p5-SUPER-[0-9]*:../../devel/p5-SUPER
+BUILD_DEPENDS+=		p5-HTTP-Message-[0-9]*:../../www/p5-HTTP-Message
+BUILD_DEPENDS+=		p5-PadWalker-[0-9]*:../../devel/p5-PadWalker
+BUILD_DEPENDS+=		p5-SUPER-[0-9]*:../../devel/p5-SUPER
 # missing Test::DependentModules>=0.13
-BUILD_DEPENDS+=	p5-Test-Inline-[0-9]*:../../devel/p5-Test-Inline
-BUILD_DEPENDS+=	p5-Test-LeakTrace-[0-9]*:../../devel/p5-Test-LeakTrace
-BUILD_DEPENDS+=	p5-Test-Memory-Cycle-[0-9]*:../../devel/p5-Test-Memory-Cycle
-BUILD_DEPENDS+= p5-Test-Output-[0-9]*:../../devel/p5-Test-Output
-BUILD_DEPENDS+=	p5-Test-CheckDeps>=0.006:../../devel/p5-Test-CheckDeps
-BUILD_DEPENDS+=	p5-CPAN-Meta-Check>=0.007:../../devel/p5-CPAN-Meta-Check
+BUILD_DEPENDS+=		p5-Test-Inline-[0-9]*:../../devel/p5-Test-Inline
+BUILD_DEPENDS+=		p5-Test-LeakTrace-[0-9]*:../../devel/p5-Test-LeakTrace
+BUILD_DEPENDS+=		p5-Test-Memory-Cycle-[0-9]*:../../devel/p5-Test-Memory-Cycle
+BUILD_DEPENDS+=		p5-Test-Output-[0-9]*:../../devel/p5-Test-Output
+BUILD_DEPENDS+=		p5-Test-CheckDeps>=0.006:../../devel/p5-Test-CheckDeps
+BUILD_DEPENDS+=		p5-CPAN-Meta-Check>=0.007:../../devel/p5-CPAN-Meta-Check
 # missing Test::Spelling
-BUILD_DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
+BUILD_DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
 #BUILD_DEPENDS+=	p5-Test-Pod-Coverage-[0-9]*:../../devel/p5-Test-Pod-Coverage # xt/author/pod_coverage.t
 #BUILD_DEPENDS+=	p5-Test-Pod-[0-9]*:../../devel/p5-Test-Pod # xt/author/pod.t
 #BUILD_DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
@@ -78,13 +78,13 @@ BUILD_DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 BUILD_DEPENDS+=		p5-Module-Metadata>=1.000023:../../devel/p5-Module-Metadata
 # circular test dependency: p5-MetaCPAN-Client => p5-Type-Tiny => p5-Moose
 # => p5-Test-DependentModules => p5-MetaCPAN-Client
-#BUILD_DEPENDS+=		p5-Test-DependentModules-[0-9]*:../../devel/p5-Test-DependentModules
+#BUILD_DEPENDS+=	p5-Test-DependentModules-[0-9]*:../../devel/p5-Test-DependentModules
 
 
 USE_LANGUAGES=		c
 USE_TOOLS+=		gmake
 
-PERL5_PACKLIST= auto/Moose/.packlist
+PERL5_PACKLIST=	auto/Moose/.packlist
 
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile
index 415fe17857c..41116a42f7e 100644
--- a/devel/p5-MooseX-AttributeHelpers/Makefile
+++ b/devel/p5-MooseX-AttributeHelpers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:15:57 rillig Exp $
 #
 
 DISTNAME=	MooseX-AttributeHelpers-0.25
@@ -17,7 +17,7 @@ USE_LANGUAGES=	# empty
 BUILD_DEPENDS+=	p5-Test-Exception>=0.21:../../devel/p5-Test-Exception
 DEPENDS+=	p5-Moose>=0.56:../../devel/p5-Moose
 
-PERL5_PACKLIST=	auto/MooseX/AttributeHelpers/.packlist
+PERL5_PACKLIST=		auto/MooseX/AttributeHelpers/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-ClassAttribute/Makefile b/devel/p5-MooseX-ClassAttribute/Makefile
index 6b196d04617..9bc1448fc34 100644
--- a/devel/p5-MooseX-ClassAttribute/Makefile
+++ b/devel/p5-MooseX-ClassAttribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/03 10:15:57 rillig Exp $
 #
 
 DISTNAME=	MooseX-ClassAttribute-0.29
@@ -21,8 +21,8 @@ DEPENDS+=	p5-namespace-autoclean>=0.11:../../devel/p5-namespace-autoclean
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 # for make test
 #BUILD_DEPENDS+=	p5-MooseX-Role-Strict-[0-9]*:../../devel/p5-MooseX-Role-Strict 
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-ConfigFromFile/Makefile b/devel/p5-MooseX-ConfigFromFile/Makefile
index 7c995d0926d..14cd6d66026 100644
--- a/devel/p5-MooseX-ConfigFromFile/Makefile
+++ b/devel/p5-MooseX-ConfigFromFile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:58 rillig Exp $
 
 DISTNAME=	MooseX-ConfigFromFile-0.14
 PKGNAME=	p5-${DISTNAME}
@@ -26,7 +26,7 @@ BUILD_DEPENDS+=	p5-Test-Without-Module-[0-9]*:../../devel/p5-Test-Without-Module
 
 USE_LANGUAGES=	# empty
 
-PERL5_PACKLIST=	auto/MooseX/ConfigFromFile/.packlist
+PERL5_PACKLIST=		auto/MooseX/ConfigFromFile/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Daemonize/Makefile b/devel/p5-MooseX-Daemonize/Makefile
index c2b7f02087e..ec9d27def42 100644
--- a/devel/p5-MooseX-Daemonize/Makefile
+++ b/devel/p5-MooseX-Daemonize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:58 rillig Exp $
 #
 
 DISTNAME=	MooseX-Daemonize-0.21
@@ -17,8 +17,8 @@ DEPENDS+=	p5-MooseX-Getopt>=0.07:../../devel/p5-MooseX-Getopt
 DEPENDS+=	p5-MooseX-Types-Path-Class-[0-9]*:../../devel/p5-MooseX-Types-Path-Class
 DEPENDS+=	p5-Sub-Exporter-ForMethods>=0:../../devel/p5-Sub-Exporter-ForMethods
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/MooseX/Daemonize/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/MooseX/Daemonize/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile
index cc9866794b2..7a74d77eac3 100644
--- a/devel/p5-MooseX-Declare/Makefile
+++ b/devel/p5-MooseX-Declare/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/08/11 13:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 10:15:58 rillig Exp $
 #
 
 DISTNAME=	MooseX-Declare-0.43
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=	p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
 BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 BUILD_DEPENDS+=	p5-Test-CheckDeps>=0.007:../../devel/p5-Test-CheckDeps
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Build::Tiny
 PERL5_PACKLIST=		auto/MooseX/Declare/.packlist
 
diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
index 1fc2cc6a7d3..a98ad997b61 100644
--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:58 rillig Exp $
 
 DISTNAME=	MooseX-Emulate-Class-Accessor-Fast-0.009032
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 
 BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 
-PERL5_PACKLIST=	auto/MooseX/Emulate/Class/Accessor/Fast/.packlist
+PERL5_PACKLIST=		auto/MooseX/Emulate/Class/Accessor/Fast/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-FollowPBP/Makefile b/devel/p5-MooseX-FollowPBP/Makefile
index bec35c2199a..2913ca9fb4f 100644
--- a/devel/p5-MooseX-FollowPBP/Makefile
+++ b/devel/p5-MooseX-FollowPBP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 10:15:58 rillig Exp $
 #
 
 DISTNAME=	MooseX-FollowPBP-0.05
@@ -13,8 +13,8 @@ COMMENT=	Name your accessors get_foo() and set_foo()
 LICENSE=	artistic-2.0
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-Moose>=0.94:../../devel/p5-Moose
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+DEPENDS+=		p5-Moose>=0.94:../../devel/p5-Moose
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MooseX/FollowPBP/.packlist
diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile
index 2eda4ee0da1..423b7437723 100644
--- a/devel/p5-MooseX-Getopt/Makefile
+++ b/devel/p5-MooseX-Getopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/11 13:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/03 10:15:58 rillig Exp $
 
 DISTNAME=	MooseX-Getopt-0.74
 PKGNAME=	p5-${DISTNAME}
@@ -17,26 +17,26 @@ DEPENDS+=	p5-MooseX-Role-Parameterized-[0-9]*:../../devel/p5-MooseX-Role-Paramet
 DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
-TEST_DEPENDS+=	p5-Module-Runtime-[0-9]*:../../devel/p5-Module-Runtime
-TEST_DEPENDS+=	p5-Path-Tiny>=0.009:../../filesystems/p5-Path-Tiny
-TEST_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
-TEST_DEPENDS+=	p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
-TEST_DEPENDS+=	p5-Test-Kwalitee>=1.12:../../devel/p5-Test-Kwalitee
-TEST_DEPENDS+=	p5-Test-Needs-[0-9]*:../../devel/p5-Test-Needs
-TEST_DEPENDS+=	p5-Test-Pod>=1.41:../../devel/p5-Test-Pod
-TEST_DEPENDS+=	p5-Test-Pod-Coverage>=1.08:../../devel/p5-Test-Pod-Coverage
-TEST_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-TEST_DEPENDS+=	p5-Test-Trap-[0-9]*:../../devel/p5-Test-Trap
-TEST_DEPENDS+=	p5-Test-Warnings>=0.009:../../devel/p5-Test-Warnings
+TEST_DEPENDS+=		p5-Module-Runtime-[0-9]*:../../devel/p5-Module-Runtime
+TEST_DEPENDS+=		p5-Path-Tiny>=0.009:../../filesystems/p5-Path-Tiny
+TEST_DEPENDS+=		p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+TEST_DEPENDS+=		p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
+TEST_DEPENDS+=		p5-Test-Kwalitee>=1.12:../../devel/p5-Test-Kwalitee
+TEST_DEPENDS+=		p5-Test-Needs-[0-9]*:../../devel/p5-Test-Needs
+TEST_DEPENDS+=		p5-Test-Pod>=1.41:../../devel/p5-Test-Pod
+TEST_DEPENDS+=		p5-Test-Pod-Coverage>=1.08:../../devel/p5-Test-Pod-Coverage
+TEST_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+TEST_DEPENDS+=		p5-Test-Trap-[0-9]*:../../devel/p5-Test-Trap
+TEST_DEPENDS+=		p5-Test-Warnings>=0.009:../../devel/p5-Test-Warnings
 # recommended modules ...
 #BUILD_DEPENDS+=	p5-CPAN-Meta-[0-9]*:../../devel/p5-CPAN-Meta
 #BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.120900:../../devel/p5-CPAN-Meta-Requirements
 #BUILD_DEPENDS+=	p5-MooseX-ConfigFromFile-[0-9]*:../../devel/p5-MooseX-ConfigFromFile
 #BUILD_DEPENDS+=	p5-MooseX-SimpleConfig>=0.07:../../devel/p5-MooseX-SimpleConfig
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Build::Tiny
-PERL5_PACKLIST=	auto/MooseX/Getopt/.packlist
+PERL5_PACKLIST=		auto/MooseX/Getopt/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-LazyRequire/Makefile b/devel/p5-MooseX-LazyRequire/Makefile
index 907df2297a3..74818e2b347 100644
--- a/devel/p5-MooseX-LazyRequire/Makefile
+++ b/devel/p5-MooseX-LazyRequire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:15:58 rillig Exp $
 #
 
 DISTNAME=	MooseX-LazyRequire-0.11
@@ -16,11 +16,11 @@ DEPENDS+=	p5-Moose>=0.94:../../devel/p5-Moose
 DEPENDS+=	p5-aliased>=0.30:../../devel/p5-aliased
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
-BUILD_DEPENDS+=	p5-Test-CheckDeps>=0.002:../../devel/p5-Test-CheckDeps
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-CheckDeps>=0.002:../../devel/p5-Test-CheckDeps
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MooseX/LazyRequire/.packlist
diff --git a/devel/p5-MooseX-MarkAsMethods/Makefile b/devel/p5-MooseX-MarkAsMethods/Makefile
index 7c662f59a06..d51fc70f898 100644
--- a/devel/p5-MooseX-MarkAsMethods/Makefile
+++ b/devel/p5-MooseX-MarkAsMethods/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:15:58 rillig Exp $
 #
 
 DISTNAME=	MooseX-MarkAsMethods-0.15
@@ -19,7 +19,7 @@ DEPENDS+=	p5-Moose>=1.10:../../devel/p5-Moose
 DEPENDS+=	p5-B-Hooks-EndOfScope-[0-9]*:../../devel/p5-B-Hooks-EndOfScope
 DEPENDS+=	p5-namespace-autoclean>=0.12:../../devel/p5-namespace-autoclean
 # for make test
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-Method-Signatures/Makefile b/devel/p5-MooseX-Method-Signatures/Makefile
index ac14db95430..7bbc9407c8c 100644
--- a/devel/p5-MooseX-Method-Signatures/Makefile
+++ b/devel/p5-MooseX-Method-Signatures/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/08/11 13:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 10:15:58 rillig Exp $
 #
 
 DISTNAME=	MooseX-Method-Signatures-0.49
@@ -29,14 +29,14 @@ DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 DEPENDS+=	p5-Eval-Closure-[0-9]*:../../devel/p5-Eval-Closure
 DEPENDS+=	p5-Module-Runtime>=0.012:../../devel/p5-Module-Runtime
 
-BUILD_DEPENDS+=	p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
-BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
+BUILD_DEPENDS+=		p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.89}:../../devel/p5-Test-Simple
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Install::Bundled
-PERL5_PACKLIST=	auto/MooseX/Method/Signatures/.packlist
+PERL5_PACKLIST=		auto/MooseX/Method/Signatures/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-MethodAttributes/Makefile b/devel/p5-MooseX-MethodAttributes/Makefile
index ba30610e804..343af70e4b1 100644
--- a/devel/p5-MooseX-MethodAttributes/Makefile
+++ b/devel/p5-MooseX-MethodAttributes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/08/11 13:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/03 10:15:59 rillig Exp $
 
 DISTNAME=	MooseX-MethodAttributes-0.31
 PKGNAME=	p5-${DISTNAME}
@@ -15,11 +15,11 @@ DEPENDS+=	p5-Moose>=0.98:../../devel/p5-Moose
 DEPENDS+=	p5-MooseX-Types>=0.21:../../devel/p5-MooseX-Types
 DEPENDS+=	p5-namespace-clean>=0.10:../../devel/p5-namespace-clean
 
-BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
-BUILD_DEPENDS+=	p5-MooseX-Role-Parameterized-[0-9]*:../../devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS+=		p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
+BUILD_DEPENDS+=		p5-MooseX-Role-Parameterized-[0-9]*:../../devel/p5-MooseX-Role-Parameterized
 
 PERL5_PACKLIST=	auto/MooseX/MethodAttributes/.packlist
 
diff --git a/devel/p5-MooseX-NonMoose/Makefile b/devel/p5-MooseX-NonMoose/Makefile
index 01fad659ee0..308b15c7ce5 100644
--- a/devel/p5-MooseX-NonMoose/Makefile
+++ b/devel/p5-MooseX-NonMoose/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:15:59 rillig Exp $
 #
 
 DISTNAME=	MooseX-NonMoose-0.26
@@ -20,7 +20,7 @@ DEPENDS+=	p5-Moose>=1.08:../../devel/p5-Moose
 DEPENDS+=	p5-Try-Tiny>=0:../../devel/p5-Try-Tiny
 # for make test
 BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-OneArgNew/Makefile b/devel/p5-MooseX-OneArgNew/Makefile
index cff38828f2e..dadc0082553 100644
--- a/devel/p5-MooseX-OneArgNew/Makefile
+++ b/devel/p5-MooseX-OneArgNew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:15:59 rillig Exp $
 #
 
 DISTNAME=	MooseX-OneArgNew-0.005
@@ -18,7 +18,7 @@ DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 #BUILD_DEPENDS+=	{perl>=5.14.0,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MooseX/OneArgNew/.packlist
diff --git a/devel/p5-MooseX-POE/Makefile b/devel/p5-MooseX-POE/Makefile
index c61ea2bdf95..1f49d5b8690 100644
--- a/devel/p5-MooseX-POE/Makefile
+++ b/devel/p5-MooseX-POE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:15:59 rillig Exp $
 
 DISTNAME=	MooseX-POE-0.215
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Moose wrapper around a POE::Session
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/MooseX/POE/.packlist
+PERL5_PACKLIST=	auto/MooseX/POE/.packlist
 
 BUILD_DEPENDS+=	p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
 DEPENDS+=	p5-POE>=1.310:../../devel/p5-POE
diff --git a/devel/p5-MooseX-Params-Validate/Makefile b/devel/p5-MooseX-Params-Validate/Makefile
index 38750204692..29e92c94d99 100644
--- a/devel/p5-MooseX-Params-Validate/Makefile
+++ b/devel/p5-MooseX-Params-Validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:15:59 rillig Exp $
 #
 
 DISTNAME=	MooseX-Params-Validate-0.21
@@ -22,7 +22,7 @@ DEPENDS+=	p5-Sub-Exporter-[0-9]*:../../devel/p5-Sub-Exporter
 
 # for make test
 BUILD_DEPENDS+=	p5-Test-Exception>=0.21:../../devel/p5-Test-Exception
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Role-Parameterized/Makefile b/devel/p5-MooseX-Role-Parameterized/Makefile
index 24ef4f74ae0..ab030d7818e 100644
--- a/devel/p5-MooseX-Role-Parameterized/Makefile
+++ b/devel/p5-MooseX-Role-Parameterized/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/10/26 11:53:56 mef Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/03 10:15:59 rillig Exp $
 #
 
 DISTNAME=	MooseX-Role-Parameterized-1.11
@@ -27,9 +27,9 @@ TEST_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 # for make test
 TEST_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Install::Bundled
-PERL5_PACKLIST=	auto/MooseX/Role/Parameterized/.packlist
+PERL5_PACKLIST=		auto/MooseX/Role/Parameterized/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-Role-Tempdir/Makefile b/devel/p5-MooseX-Role-Tempdir/Makefile
index e54784c81e3..b0064ff21a4 100644
--- a/devel/p5-MooseX-Role-Tempdir/Makefile
+++ b/devel/p5-MooseX-Role-Tempdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:15:59 rillig Exp $
 #
 
 DISTNAME=	MooseX-Role-Tempdir-0.101
@@ -14,8 +14,8 @@ LICENSE=	${PERL5_LICENSE}
 
 # for make test
 BUILD_DEPENDS+=	p5-MooseX-Role-Parameterized-[0-9]*:../../devel/p5-MooseX-Role-Parameterized
-BUILD_DEPENDS+= p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 PERL5_PACKLIST=	auto/MooseX/Role/Tempdir/.packlist
 USE_LANGUAGES=	# none
diff --git a/devel/p5-MooseX-Role-WithOverloading/Makefile b/devel/p5-MooseX-Role-WithOverloading/Makefile
index 293485b36d5..b3a6862a064 100644
--- a/devel/p5-MooseX-Role-WithOverloading/Makefile
+++ b/devel/p5-MooseX-Role-WithOverloading/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:15:59 rillig Exp $
 
 DISTNAME=	MooseX-Role-WithOverloading-0.17
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=	c
 PERL5_PACKLIST=	auto/MooseX/Role/WithOverloading/.packlist
diff --git a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
index 21e871bb684..edd513d8a52 100644
--- a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:15:59 rillig Exp $
 #
 
 DISTNAME=	MooseX-SemiAffordanceAccessor-0.10
@@ -13,12 +13,12 @@ COMMENT=	Perl 5 module to name your accessors foo() and set_foo()
 LICENSE=	artistic-2.0
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/MooseX/SemiAffordanceAccessor/.packlist
+PERL5_PACKLIST=	auto/MooseX/SemiAffordanceAccessor/.packlist
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-Moose>=0.94:../../devel/p5-Moose
+DEPENDS+=		p5-Moose>=0.94:../../devel/p5-Moose
 # for make test
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-SetOnce/Makefile b/devel/p5-MooseX-SetOnce/Makefile
index 24648e9522e..ba361b4b7b1 100644
--- a/devel/p5-MooseX-SetOnce/Makefile
+++ b/devel/p5-MooseX-SetOnce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:16:00 rillig Exp $
 #
 
 DISTNAME=	MooseX-SetOnce-0.200002
@@ -14,7 +14,7 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Moose>=0.90:../../devel/p5-Moose
 # for make test
-BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MooseX/SetOnce/.packlist
diff --git a/devel/p5-MooseX-SimpleConfig/Makefile b/devel/p5-MooseX-SimpleConfig/Makefile
index dfb7e9f6c34..62dffa91306 100644
--- a/devel/p5-MooseX-SimpleConfig/Makefile
+++ b/devel/p5-MooseX-SimpleConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 10:16:00 rillig Exp $
 
 DISTNAME=	MooseX-SimpleConfig-0.11
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-MooseX-ConfigFromFile>=0.02:../../devel/p5-MooseX-ConfigFromFile
 
 USE_LANGUAGES=	# empty
 
-PERL5_PACKLIST=	auto/MooseX/SimpleConfig/.packlist
+PERL5_PACKLIST=		auto/MooseX/SimpleConfig/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Singleton/Makefile b/devel/p5-MooseX-Singleton/Makefile
index b6e280facc9..9754d95d6c0 100644
--- a/devel/p5-MooseX-Singleton/Makefile
+++ b/devel/p5-MooseX-Singleton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 10:16:00 rillig Exp $
 #
 
 DISTNAME=	MooseX-Singleton-0.30
@@ -12,17 +12,17 @@ HOMEPAGE=	https://metacpan.org/release/MooseX-Singleton
 COMMENT=	Perl 5 module to turn Moose class into a singleton
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/MooseX/Singleton/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/MooseX/Singleton/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 DEPENDS+=	p5-Moose>=1.10:../../devel/p5-Moose
 
-BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
-BUILD_DEPENDS+=	p5-Test-Warnings-[0-9]*:../../devel/p5-Test-Warnings
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Test-Warnings-[0-9]*:../../devel/p5-Test-Warnings
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-StrictConstructor/Makefile b/devel/p5-MooseX-StrictConstructor/Makefile
index 05292c512f6..a12995b8b23 100644
--- a/devel/p5-MooseX-StrictConstructor/Makefile
+++ b/devel/p5-MooseX-StrictConstructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:16:00 rillig Exp $
 #
 
 DISTNAME=	MooseX-StrictConstructor-0.21
@@ -15,8 +15,8 @@ LICENSE=	artistic-2.0
 DEPENDS+=	p5-Moose>=0.94:../../devel/p5-Moose
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MooseX/StrictConstructor/.packlist
diff --git a/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile
index ca390f8eecd..799d15fb853 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:16:00 rillig Exp $
 
 DISTNAME=	MooseX-Traits-0.13
 PKGNAME=	p5-${DISTNAME}
@@ -17,9 +17,9 @@ DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 BUILD_DEPENDS+=	p5-Test-Simple>=1.001010:../../devel/p5-Test-Simple
-BUILD_DEPENDS+= p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-BUILD_DEPENDS+= p5-MooseX-Role-Parameterized-[0-9]*:../../devel/p5-MooseX-Role-Parameterized
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=	p5-MooseX-Role-Parameterized-[0-9]*:../../devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 
 USE_LANGUAGES=		# empty
diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile
index 6a3cee569af..8efa34fffbc 100644
--- a/devel/p5-MooseX-Types-Path-Class/Makefile
+++ b/devel/p5-MooseX-Types-Path-Class/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:16:00 rillig Exp $
 
 DISTNAME=	MooseX-Types-Path-Class-0.09
 PKGNAME=	p5-${DISTNAME}
@@ -17,11 +17,11 @@ DEPENDS+=	p5-Path-Class>=0.16:../../devel/p5-Path-Class
 
 # For tests (but introduce a circular dependency for devel/p5-MooseX-Getopt)
 #BUILD_DEPENDS+=	p5-MooseX-Getopt>=0:../../devel/p5-MooseX-Getopt
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
-BUILD_DEPENDS+=	p5-Test-Needs>=0:../../devel/p5-Test-Needs
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Test-Needs>=0:../../devel/p5-Test-Needs
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/MooseX/Types/Path/Class/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/MooseX/Types/Path/Class/.packlist
 PERL5_MODULE_TYPE=	Module::Build::Tiny
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
index e368af08ad9..2ac4a822919 100644
--- a/devel/p5-MooseX-Types-Perl/Makefile
+++ b/devel/p5-MooseX-Types-Perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:16:00 rillig Exp $
 #
 
 DISTNAME=	MooseX-Types-Perl-0.101343
@@ -21,7 +21,7 @@ DEPENDS+=	p5-Params-Util-[0-9]*:../../devel/p5-Params-Util
 
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-Types-Stringlike/Makefile b/devel/p5-MooseX-Types-Stringlike/Makefile
index c21b198bae0..f7d872a9843 100644
--- a/devel/p5-MooseX-Types-Stringlike/Makefile
+++ b/devel/p5-MooseX-Types-Stringlike/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:16:00 rillig Exp $
 #
 
 DISTNAME=	MooseX-Types-Stringlike-0.003
@@ -14,7 +14,7 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types
 # for make test
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/MooseX/Types/Stringlike/.packlist
diff --git a/devel/p5-MooseX-Types-Structured/Makefile b/devel/p5-MooseX-Types-Structured/Makefile
index b7f89071442..2b87eb12f09 100644
--- a/devel/p5-MooseX-Types-Structured/Makefile
+++ b/devel/p5-MooseX-Types-Structured/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 10:16:01 rillig Exp $
 #
 
 DISTNAME=	MooseX-Types-Structured-0.36
@@ -18,13 +18,13 @@ DEPENDS+=	p5-MooseX-Types>=0.22:../../devel/p5-MooseX-Types
 DEPENDS+=	p5-Sub-Exporter>=0.982:../../devel/p5-Sub-Exporter
 
 # For test target
-BUILD_DEPENDS+=	p5-DateTime-[0-9]*:../../time/p5-DateTime
-BUILD_DEPENDS+=	p5-MooseX-Types-DateTime-[0-9]*:../../time/p5-MooseX-Types-DateTime
-BUILD_DEPENDS+=	p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
-BUILD_DEPENDS+=	p5-Test-Exception>=0.27:../../devel/p5-Test-Exception
-BUILD_DEPENDS+= p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-#BUILD_DEPENDS+= {perl>=5.11.1,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
+BUILD_DEPENDS+=		p5-DateTime-[0-9]*:../../time/p5-DateTime
+BUILD_DEPENDS+=		p5-MooseX-Types-DateTime-[0-9]*:../../time/p5-MooseX-Types-DateTime
+BUILD_DEPENDS+=		p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Test-Exception>=0.27:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+#BUILD_DEPENDS+=	{perl>=5.11.1,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Install::Bundled
diff --git a/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile
index 5f3c410b65b..ff79645a9c1 100644
--- a/devel/p5-MooseX-Types/Makefile
+++ b/devel/p5-MooseX-Types/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/11 13:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/03 10:16:00 rillig Exp $
 
 DISTNAME=	MooseX-Types-0.50
 PKGNAME=	p5-${DISTNAME}
@@ -19,15 +19,15 @@ DEPENDS+=	p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
 DEPENDS+=	p5-namespace-clean>=0.19:../../devel/p5-namespace-clean
 DEPENDS+=	p5-Sub-Exporter-ForMethods>=0.100052:../../devel/p5-Sub-Exporter-ForMethods
 
-BUILD_DEPENDS+=	p5-Module-Build-Tiny>=0.035:../../devel/p5-Module-Build-Tiny
+BUILD_DEPENDS+=		p5-Module-Build-Tiny>=0.035:../../devel/p5-Module-Build-Tiny
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.80}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Test-Requires>=0.05:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Requires>=0.05:../../devel/p5-Test-Requires
 # for make test
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/MooseX/Types/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/MooseX/Types/.packlist
 PERL5_MODULE_TYPE=	Module::Build::Tiny
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Net-LDAP-SID/Makefile b/devel/p5-Net-LDAP-SID/Makefile
index 45fd35f3265..b7a21748d07 100644
--- a/devel/p5-Net-LDAP-SID/Makefile
+++ b/devel/p5-Net-LDAP-SID/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/11 13:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	Net-LDAP-SID-0.001
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Active Directory Security Identifier manipulation
 LICENSE=	artistic-2.0
 
 
-PERL5_PACKLIST= auto/Net/LDAP/SID/.packlist
+PERL5_PACKLIST=	auto/Net/LDAP/SID/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Object-InsideOut/Makefile b/devel/p5-Object-InsideOut/Makefile
index f62b5c426eb..d44de5791fe 100644
--- a/devel/p5-Object-InsideOut/Makefile
+++ b/devel/p5-Object-InsideOut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/08/11 13:20:03 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	Object-InsideOut-4.05
 PKGNAME=	p5-${DISTNAME}
@@ -18,8 +18,8 @@ DEPENDS+=	p5-Scalar-List-Utils>=1.23:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Want>=0.12:../../devel/p5-Want
 #DEPENDS+=	{perl>=5.8.8,p5-Storable>=2.15}:../../devel/p5-Storable
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/Object/InsideOut/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/Object/InsideOut/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Object-Signature/Makefile b/devel/p5-Object-Signature/Makefile
index 6be9e4d27b8..feb0d20a52b 100644
--- a/devel/p5-Object-Signature/Makefile
+++ b/devel/p5-Object-Signature/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:20:04 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	Object-Signature-1.08
 PKGNAME=	p5-${DISTNAME}
@@ -17,8 +17,8 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-PathTools>=0.80:../../devel/p5-PathTools
 DEPENDS+=	p5-ExtUtils-AutoInstall>=0.63:../../devel/p5-ExtUtils-AutoInstall
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/Object/Signature/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/Object/Signature/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
diff --git a/devel/p5-Ouch/Makefile b/devel/p5-Ouch/Makefile
index de84a3a70be..6f03f5e1c0a 100644
--- a/devel/p5-Ouch/Makefile
+++ b/devel/p5-Ouch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:20:04 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:16:01 rillig Exp $
 #
 
 DISTNAME=		Ouch-0.0501
-PKGNAME=        	p5-${DISTNAME}
-PKGREVISION=        	1
+PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../../authors/id/R/RI/RIZEN/}
 
diff --git a/devel/p5-POE-Component-Cron/Makefile b/devel/p5-POE-Component-Cron/Makefile
index f75a66e226c..0c9648a4e11 100644
--- a/devel/p5-POE-Component-Cron/Makefile
+++ b/devel/p5-POE-Component-Cron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:20:04 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	POE-Component-Cron-0.021
 PKGNAME=	p5-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	p5-DateTime-Event-Random>=0:../../time/p5-DateTime-Event-Random
 DEPENDS+=	p5-DateTime>=0:../../time/p5-DateTime
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/POE/Component/Cron/.packlist
+PERL5_PACKLIST=	auto/POE/Component/Cron/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-POE-Component-Schedule/Makefile b/devel/p5-POE-Component-Schedule/Makefile
index 493cb0088d5..0c84df9a53e 100644
--- a/devel/p5-POE-Component-Schedule/Makefile
+++ b/devel/p5-POE-Component-Schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	POE-Component-Schedule-0.95
 PKGNAME=	p5-${DISTNAME}
@@ -16,8 +16,8 @@ DEPENDS+=	p5-DateTime>=0.48:../../time/p5-DateTime
 DEPENDS+=	p5-DateTime-Set>=0.25:../../time/p5-DateTime-Set
 DEPENDS+=	p5-DateTime-TimeZone>=1.13:../../time/p5-DateTime-TimeZone
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/POE/Component/Schedule/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/POE/Component/Schedule/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-POE-Component-Syndicator/Makefile b/devel/p5-POE-Component-Syndicator/Makefile
index 9796fcdb5c9..cac98029e70 100644
--- a/devel/p5-POE-Component-Syndicator/Makefile
+++ b/devel/p5-POE-Component-Syndicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	POE-Component-Syndicator-0.06
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	p5-POE>=1.311:../../devel/p5-POE
 DEPENDS+=	p5-Object-Pluggable>=1.29:../../devel/p5-Object-Pluggable
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/POE/Component/Syndicator/.packlist
+PERL5_PACKLIST=	auto/POE/Component/Syndicator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-POE-Test-Loops/Makefile b/devel/p5-POE-Test-Loops/Makefile
index 74ff12379c8..4e488e52eed 100644
--- a/devel/p5-POE-Test-Loops/Makefile
+++ b/devel/p5-POE-Test-Loops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:16:01 rillig Exp $
 
 DISTNAME=	POE-Test-Loops-1.360
 PKGNAME=	p5-${DISTNAME}
@@ -13,8 +13,8 @@ LICENSE=	${PERL5_LICENSE}
 
 PERL5_PACKLIST=		auto/POE/Test/Loops/.packlist
 
-TESTS_TO_FIX= 00_info.pm comp_tcp_concurrent.pm all_errors.pm comp_tcp.pm \
-	connect_errors.pm k_alarms.pm k_aliases.pm k_detach.pm \
+TESTS_TO_FIX=	00_info.pm comp_tcp_concurrent.pm all_errors.pm comp_tcp.pm \
+		connect_errors.pm k_alarms.pm k_aliases.pm k_detach.pm \
 	k_run_returns.pm k_selects.pm k_sig_child.pm k_signals.pm \
 	k_signals_rerun.pm sbk_signal_init.pm \
 	ses_nfa.pm ses_session.pm wheel_accept.pm wheel_curses.pm \
@@ -26,7 +26,7 @@ TESTS_TO_FIX= 00_info.pm comp_tcp_concurrent.pm all_errors.pm comp_tcp.pm \
 	z_rt54319_bazerka_followtail.pm z_steinert_signal_integrity.pm
 
 .for t in ${TESTS_TO_FIX}
-REPLACE_PERL+= lib/POE/Test/Loops/${t}
+REPLACE_PERL+=	lib/POE/Test/Loops/${t}
 .endfor
 
 SUBST_CLASSES+=		perl
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index ec22fb068ac..8219c864dbf 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/08/11 13:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:16:02 rillig Exp $
 
 DISTNAME=	POEx-Types-1.100910
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Exported Types for use within POEx modules
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/POEx/Types/.packlist
+PERL5_PACKLIST=	auto/POEx/Types/.packlist
 
 DEPENDS+=	p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types
 DEPENDS+=	p5-MooseX-Types-Structured-[0-9]*:../../devel/p5-MooseX-Types-Structured
diff --git a/devel/p5-PPI-XS/Makefile b/devel/p5-PPI-XS/Makefile
index 34d740fa254..b70fac78498 100644
--- a/devel/p5-PPI-XS/Makefile
+++ b/devel/p5-PPI-XS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:16:02 rillig Exp $
 
 DISTNAME=	PPI-XS-0.910
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-PPI>=1.203:../../devel/p5-PPI
 
 BUILD_DEPENDS+=	p5-ExtUtils-AutoInstall>=0.63:../../devel/p5-ExtUtils-AutoInstall
 
-USE_LANGUAGES=c
+USE_LANGUAGES=	c
 PERL5_PACKLIST=	auto/PPI/XS/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-PPI/Makefile b/devel/p5-PPI/Makefile
index aa0feef7d5a..2f5a81982aa 100644
--- a/devel/p5-PPI/Makefile
+++ b/devel/p5-PPI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/08/14 15:13:34 wen Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 10:16:02 rillig Exp $
 
 DISTNAME=	PPI-1.270
 PKGNAME=	p5-${DISTNAME}
@@ -21,12 +21,12 @@ DEPENDS+=	p5-Params-Util>=1.00:../../devel/p5-Params-Util
 DEPENDS+=	p5-Task-Weaken-[0-9]*:../../devel/p5-Task-Weaken
 #DEPENDS+=	{perl>=5.8,p5-Storable>=2.17}:../../devel/p5-Storable
 
-BUILD_DEPENDS+=	p5-Class-Inspector>=1.22:../../devel/p5-Class-Inspector
-BUILD_DEPENDS+=	p5-File-Remove>=1.42:../../sysutils/p5-File-Remove
-BUILD_DEPENDS+=	p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings
-BUILD_DEPENDS+=	p5-Test-Object>=0.07:../../devel/p5-Test-Object
+BUILD_DEPENDS+=		p5-Class-Inspector>=1.22:../../devel/p5-Class-Inspector
+BUILD_DEPENDS+=		p5-File-Remove>=1.42:../../sysutils/p5-File-Remove
+BUILD_DEPENDS+=		p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings
+BUILD_DEPENDS+=		p5-Test-Object>=0.07:../../devel/p5-Test-Object
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.86}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-SubCalls>=1.07:../../devel/p5-Test-SubCalls
+BUILD_DEPENDS+=		p5-Test-SubCalls>=1.07:../../devel/p5-Test-SubCalls
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/PPI/.packlist
diff --git a/devel/p5-Package-DeprecationManager/Makefile b/devel/p5-Package-DeprecationManager/Makefile
index 22975e72bce..114dbc2cd88 100644
--- a/devel/p5-Package-DeprecationManager/Makefile
+++ b/devel/p5-Package-DeprecationManager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 10:16:02 rillig Exp $
 
 DISTNAME=	Package-DeprecationManager-0.17
 PKGNAME=	p5-${DISTNAME}
@@ -17,14 +17,14 @@ PERL5_PACKLIST=		auto/Package/DeprecationManager/.packlist
 DEPENDS+=	p5-Package-Stash-[0-9]*:../../devel/p5-Package-Stash
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
-BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 # for make test
-BUILD_DEPENDS+=	p5-Test-Warnings-[0-9]*:../../devel/p5-Test-Warnings
-BUILD_DEPENDS+=	p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
+BUILD_DEPENDS+=		p5-Test-Warnings-[0-9]*:../../devel/p5-Test-Warnings
+BUILD_DEPENDS+=		p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
 
 DEPENDS+=	p5-Params-Util-[0-9]*:../../devel/p5-Params-Util
 DEPENDS+=	p5-Sub-Install-[0-9]*:../../devel/p5-Sub-Install
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index 8ff70443e89..8f3c6f4433c 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:20:07 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:16:02 rillig Exp $
 
 DISTNAME=	Package-Stash-0.38
 PKGNAME=	p5-${DISTNAME}
@@ -17,9 +17,9 @@ DEPENDS+=	p5-Dist-CheckConflicts>=0.02:../../devel/p5-Dist-CheckConflicts
 DEPENDS+=	p5-Module-Implementation>=0.06:../../devel/p5-Module-Implementation
 DEPENDS+=	p5-Package-Stash-XS>=0.26:../../devel/p5-Package-Stash-XS
 
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=	# empty
diff --git a/devel/p5-PadWalker/Makefile b/devel/p5-PadWalker/Makefile
index 2bba8b0c884..d219715508f 100644
--- a/devel/p5-PadWalker/Makefile
+++ b/devel/p5-PadWalker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:20:07 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:16:02 rillig Exp $
 
 DISTNAME=	PadWalker-2.3
 PKGNAME=	p5-${DISTNAME:S/96/9.6/}
@@ -12,7 +12,7 @@ COMMENT=	Play with other peoples' lexical variables
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	c
-PERL5_PACKLIST= auto/PadWalker/.packlist
+PERL5_PACKLIST=	auto/PadWalker/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Parse-Method-Signatures/Makefile b/devel/p5-Parse-Method-Signatures/Makefile
index 9bc8711e423..36e18455327 100644
--- a/devel/p5-Parse-Method-Signatures/Makefile
+++ b/devel/p5-Parse-Method-Signatures/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:20:09 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 10:16:02 rillig Exp $
 #
 
 DISTNAME=	Parse-Method-Signatures-1.003019
@@ -28,9 +28,9 @@ BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=	p5-aliased-[0-9]*:../../devel/p5-aliased
 BUILD_DEPENDS+=	p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Install::Bundled
-PERL5_PACKLIST=	auto/Parse/Method/Signatures/.packlist
+PERL5_PACKLIST=		auto/Parse/Method/Signatures/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Perl-Critic/Makefile b/devel/p5-Perl-Critic/Makefile
index 34486e905b7..dd3b46360ab 100644
--- a/devel/p5-Perl-Critic/Makefile
+++ b/devel/p5-Perl-Critic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/08/11 13:20:10 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 10:16:02 rillig Exp $
 #
 
 DISTNAME=	Perl-Critic-1.134
@@ -38,8 +38,8 @@ BUILD_DEPENDS+=	p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-Readonly-XS-[0-9]*:../../devel/p5-Readonly-XS
 #DEPENDS+=	p5-Regexp-Parser>=0.20:../../devel/p5-Regexp-Parser
 
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	auto/Perl/Critic/.packlist
+USE_LANGUAGES=		# empty
+PERL5_PACKLIST=		auto/Perl/Critic/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Perl-PrereqScanner/Makefile b/devel/p5-Perl-PrereqScanner/Makefile
index 74a23bd3e13..483fe26d798 100644
--- a/devel/p5-Perl-PrereqScanner/Makefile
+++ b/devel/p5-Perl-PrereqScanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:20:11 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:16:02 rillig Exp $
 #
 
 DISTNAME=	Perl-PrereqScanner-1.023
@@ -23,9 +23,9 @@ DEPENDS+=	p5-String-RewritePrefix>=0.005:../../textproc/p5-String-RewritePrefix
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
+BUILD_DEPENDS+=		p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
 # for make test
-BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 PERL5_PACKLIST=	auto/Perl/PrereqScanner/.packlist
 
diff --git a/devel/p5-PerlIO-via-dynamic/Makefile b/devel/p5-PerlIO-via-dynamic/Makefile
index fbe41ef2290..5a8d00eb43d 100644
--- a/devel/p5-PerlIO-via-dynamic/Makefile
+++ b/devel/p5-PerlIO-via-dynamic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:20:12 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	PerlIO-via-dynamic-0.14
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ PERL5_PACKLIST=		auto/PerlIO/via/dynamic/.packlist
 # The following DEPENDS applies only if the perl version is 5.10,
 # but there's no way to specify that kind of condition, and it's
 # probably safe to make the dependency unconditional.
-DEPENDS+= p5-Internals>=1.1:../../devel/p5-Internals
+DEPENDS+=	p5-Internals>=1.1:../../devel/p5-Internals
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-RT-Authen-ExternalAuth/Makefile b/devel/p5-RT-Authen-ExternalAuth/Makefile
index 65086383378..2a1647bea6e 100644
--- a/devel/p5-RT-Authen-ExternalAuth/Makefile
+++ b/devel/p5-RT-Authen-ExternalAuth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:20:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	RT-Authen-ExternalAuth-0.17
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
 DEPENDS+=	p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST=		auto/RT/Authen/ExternalAuth/.packlist
+PERL5_PACKLIST=	auto/RT/Authen/ExternalAuth/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Role-HasMessage/Makefile b/devel/p5-Role-HasMessage/Makefile
index 7bd03aaae2e..ab2bb057cfe 100644
--- a/devel/p5-Role-HasMessage/Makefile
+++ b/devel/p5-Role-HasMessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:20:16 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	Role-HasMessage-0.006
 PKGNAME=	p5-${DISTNAME}
@@ -17,11 +17,11 @@ DEPENDS+=	p5-String-Errf-[0-9]*:../../textproc/p5-String-Errf
 DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
 DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 
-BUILD_DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
+BUILD_DEPENDS+=		p5-Moose-[0-9]*:../../devel/p5-Moose
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 PERL5_PACKLIST=		auto/Role/HasMessage/.packlist
 
diff --git a/devel/p5-Role-Identifiable/Makefile b/devel/p5-Role-Identifiable/Makefile
index ca4998e8173..ed18a5f8990 100644
--- a/devel/p5-Role-Identifiable/Makefile
+++ b/devel/p5-Role-Identifiable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:20:16 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	Role-Identifiable-0.007
 PKGNAME=	p5-${DISTNAME}
@@ -13,10 +13,10 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
 
-BUILD_DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
+BUILD_DEPENDS+=		p5-Moose-[0-9]*:../../devel/p5-Moose
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 # for make test
-BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+BUILD_DEPENDS+=		p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 PERL5_PACKLIST=		auto/Role/Identifiable/.packlist
 
diff --git a/devel/p5-Role-Tiny/Makefile b/devel/p5-Role-Tiny/Makefile
index 3962c8611aa..6739e2ed67a 100644
--- a/devel/p5-Role-Tiny/Makefile
+++ b/devel/p5-Role-Tiny/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/27 14:16:20 mef Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	Role-Tiny-2.001004
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	${PERL5_LICENSE}
 
 CONFLICTS+=	p5-Moo<0.009014
 
-BUILD_DEPENDS+=	p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Fatal>=0.003:../../devel/p5-Test-Fatal
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=	auto/Role/Tiny/.packlist
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 77656047e35..26f103d17b8 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/08/11 13:20:16 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	SDL-2.548
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-Alien-SDL-[0-9]*:../../devel/p5-Alien-SDL
 BUILD_DEPENDS+=	p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
 
-PERL5_OPTIONS+=	threads
+PERL5_OPTIONS+=		threads
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/SDL/.packlist
 
diff --git a/devel/p5-Software-License/Makefile b/devel/p5-Software-License/Makefile
index 14211d41af0..eb95357483b 100644
--- a/devel/p5-Software-License/Makefile
+++ b/devel/p5-Software-License/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:20:19 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	Software-License-0.103014
 # put a period in the center of 6 digit, for example, 0.103004 -> 0.103.004
@@ -13,14 +13,14 @@ COMMENT=	Perl 5 module which provide templated software licenses
 LICENSE=	${PERL5_LICENSE}
 
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-Data-Section-[0-9]*:../../devel/p5-Data-Section
-DEPENDS+=	p5-Sub-Install-[0-9]*:../../devel/p5-Sub-Install
-DEPENDS+=	p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
+DEPENDS+=		p5-Data-Section-[0-9]*:../../devel/p5-Data-Section
+DEPENDS+=		p5-Sub-Install-[0-9]*:../../devel/p5-Sub-Install
+DEPENDS+=		p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
 
 # for make test
 BUILD_DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
 
-PERL5_PACKLIST=	auto/Software/License/.packlist
+PERL5_PACKLIST=		auto/Software/License/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index 25af0b28e3a..f0e5e7262eb 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:20:20 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/03 10:16:03 rillig Exp $
 
 DISTNAME=	Spiffy-0.46
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ LICENSE=	${PERL5_LICENSE}
 # optional requirement for spiffy_filter() sub
 DEPENDS+=	p5-Filter-[0-9]*:../../textproc/p5-Filter
 
-PERL5_PACKLIST=	auto/Spiffy/.packlist
+PERL5_PACKLIST=		auto/Spiffy/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-TAP-Formatter-HTML/Makefile b/devel/p5-TAP-Formatter-HTML/Makefile
index 4f7ee2df520..af782b2af1f 100644
--- a/devel/p5-TAP-Formatter-HTML/Makefile
+++ b/devel/p5-TAP-Formatter-HTML/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:20:23 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:16:03 rillig Exp $
 
-DISTNAME=		TAP-Formatter-HTML-0.11
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		8
-CATEGORIES=		devel perl5
+DISTNAME=	TAP-Formatter-HTML-0.11
+PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	8
+CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/S/SP/SPURKIS/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://cpan.metacpan.org/authors/id/S/SP/SPURKIS/
 COMMENT=	TAP Test Harness output delegate for html output
-LICENSE=  ${PERL5_LICENSE}
+LICENSE=	${PERL5_LICENSE}
 
 #DEPENDS+=	{perl>=5.10.1,p5-Test-Harness>=3.10}:../../devel/p5-Test-Harness
 DEPENDS+=	p5-Template-Toolkit>=2.14:../../www/p5-Template-Toolkit
diff --git a/devel/p5-Task-Weaken/Makefile b/devel/p5-Task-Weaken/Makefile
index 4753c53f47f..7550b88922e 100644
--- a/devel/p5-Task-Weaken/Makefile
+++ b/devel/p5-Task-Weaken/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:20:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Task-Weaken-1.06
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Perl 5 module to ensure that a platform has weaken support
 LICENSE=	${PERL5_LICENSE}
 
 PERL5_MODULE_TYPE=	Module::Install::Bundled
-PERL5_PACKLIST=	auto/Task/Weaken/.packlist
+PERL5_PACKLIST=		auto/Task/Weaken/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index adf6c4ff067..19774a4b1ec 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/18 13:13:29 wen Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Term-Shell-0.11
 PKGNAME=	p5-${DISTNAME}
@@ -13,9 +13,9 @@ COMMENT=	Write command-line shells in Perl
 DEPENDS+=	p5-Term-ReadKey>=2.30:../../devel/p5-Term-ReadKey
 DEPENDS+=	p5-Text-Autoformat-[0-9]*:../../textproc/p5-Text-Autoformat
 
-PERL5_PACKLIST=	auto/Term/Shell/.packlist
-PERL5_MODULE_TYPE= Module::Build
-USE_LANGUAGES=	# none
+PERL5_PACKLIST=		auto/Term/Shell/.packlist
+PERL5_MODULE_TYPE=	Module::Build
+USE_LANGUAGES=		# none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-API/Makefile b/devel/p5-Test-API/Makefile
index e12cbdaca5e..69c3b23d252 100644
--- a/devel/p5-Test-API/Makefile
+++ b/devel/p5-Test-API/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:20:27 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 10:16:04 rillig Exp $
 
-DISTNAME=		Test-API-0.010
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
-CATEGORIES=		devel perl5
+DISTNAME=	Test-API-0.010
+PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	2
+CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/p5-Test-Aggregate/Makefile b/devel/p5-Test-Aggregate/Makefile
index 64993503038..848e5fbc228 100644
--- a/devel/p5-Test-Aggregate/Makefile
+++ b/devel/p5-Test-Aggregate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:20:27 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Test-Aggregate-0.375
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=	p5-Data-Dump-Streamer>=1.11:../../devel/p5-Data-Dump-Streamer
 DEPENDS+=	p5-Perl-Tidy>=20060614:../../devel/p5-Perl-Tidy
 #DEPENDS+=	{perl>=5.11.1,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
 
-BUILD_DEPENDS+=	p5-Test-Most>=0.21:../../devel/p5-Test-Most
+BUILD_DEPENDS+=		p5-Test-Most>=0.21:../../devel/p5-Test-Most
 #BUILD_DEPENDS+=	{perl>=5.11.1,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=	auto/Test/Aggregate/.packlist
diff --git a/devel/p5-Test-CPAN-Meta-JSON/Makefile b/devel/p5-Test-CPAN-Meta-JSON/Makefile
index 2d0288baa18..9a3f587a982 100644
--- a/devel/p5-Test-CPAN-Meta-JSON/Makefile
+++ b/devel/p5-Test-CPAN-Meta-JSON/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/11/02 13:20:16 mef Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Test-CPAN-Meta-JSON-0.16
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://cpan.metacpan.org/authors/id/B/BA/BARBIE/
 COMMENT=	Validate a META.json file within a CPAN distribution
 LICENSE=	artistic-2.0
 
-PERL5_PACKLIST=         auto/Test/CPAN/Meta/JSON/.packlist
+PERL5_PACKLIST=		auto/Test/CPAN/Meta/JSON/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-DistManifest/Makefile b/devel/p5-Test-DistManifest/Makefile
index 47771918def..c76501982c6 100644
--- a/devel/p5-Test-DistManifest/Makefile
+++ b/devel/p5-Test-DistManifest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:20:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 10:16:04 rillig Exp $
 #
 
 DISTNAME=	Test-DistManifest-1.014
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v1
 
 DEPENDS+=	p5-Test-NoWarnings>=1.04:../../devel/p5-Test-NoWarnings
 
-USE_LANGUAGES=  # empty
+USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Test/DistManifest/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Test-EOL/Makefile b/devel/p5-Test-EOL/Makefile
index a2e3874edab..b9597341bd6 100644
--- a/devel/p5-Test-EOL/Makefile
+++ b/devel/p5-Test-EOL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/08/11 13:20:30 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Test-EOL-2.00
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Test-EOL
 COMMENT=	Check the correct line endings in your project
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST=         auto/Test/EOL/.packlist
+PERL5_PACKLIST=		auto/Test/EOL/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index 1f091a59543..e5cffd5f24b 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:20:31 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Test-File-ShareDir-1.001002
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny
 DEPENDS+=	p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
 DEPENDS+=	p5-Scope-Guard-[0-9]*:../../devel/p5-Scope-Guard
 
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 #BUILD_DEPENDS+=	{perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=		auto/Test/File/ShareDir/.packlist
diff --git a/devel/p5-Test-Identity/Makefile b/devel/p5-Test-Identity/Makefile
index 301c89bdd67..a0cdf24b7e2 100644
--- a/devel/p5-Test-Identity/Makefile
+++ b/devel/p5-Test-Identity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:20:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 10:16:04 rillig Exp $
 
 DISTNAME=	Test-Identity-0.01
 PKGNAME=	p5-${DISTNAME}
@@ -17,9 +17,9 @@ LICENSE=	${PERL5_LICENSE}
 USE_LANGUAGES=	
 PERL5_MODULE_TYPE+=	Module::Build
 PERL5_PACKLIST+=	auto/Test/Identity/.packlist
-PERL5_REQD+=	5.7.3	# Scalar::Util >= 0
-PERL5_REQD+=	5.6.2	# Test::More >= 0
-PERL5_REQD+=	5.8.8	# Test::Builder::Tester >= 0
+PERL5_REQD+=		5.7.3	# Scalar::Util >= 0
+PERL5_REQD+=		5.6.2	# Test::More >= 0
+PERL5_REQD+=		5.8.8	# Test::Builder::Tester >= 0
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Kwalitee/Makefile b/devel/p5-Test-Kwalitee/Makefile
index 198a81cb9c4..2fe17a54b68 100644
--- a/devel/p5-Test-Kwalitee/Makefile
+++ b/devel/p5-Test-Kwalitee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:20:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:16:05 rillig Exp $
 
 DISTNAME=		Test-Kwalitee-1.28
 PKGNAME=		p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=		https://metacpan.org/release/Test-Kwalitee
 COMMENT=		Perl5 module to test the Kwalitee of a distribution
 LICENSE=		${PERL5_LICENSE}
 
-DEPENDS+=  		p5-Module-CPANTS-Analyse>=0.82:../../devel/p5-Module-CPANTS-Analyse
+DEPENDS+=		p5-Module-CPANTS-Analyse>=0.82:../../devel/p5-Module-CPANTS-Analyse
 DEPENDS+=		p5-Test-Warnings>=0:../../devel/p5-Test-Warnings
 DEPENDS+=		p5-CPAN-Meta-Check>=0:../../devel/p5-CPAN-Meta-Check
 DEPENDS+=		p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 99e7cd3bef4..c2395732059 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/10/28 13:06:24 mef Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 10:16:05 rillig Exp $
 
 DISTNAME=	Test-MockObject-1.20191002
 PKGNAME=	p5-${DISTNAME}
@@ -20,7 +20,7 @@ TEST_DEPENDS+=	p5-Test-Warn>=0.23:../../devel/p5-Test-Warn
 INSTALL_TARGET=	pure_install
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Test/MockObject/.packlist
+PERL5_PACKLIST=	auto/Test/MockObject/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Modern/Makefile b/devel/p5-Test-Modern/Makefile
index 1859b9408c4..23396276963 100644
--- a/devel/p5-Test-Modern/Makefile
+++ b/devel/p5-Test-Modern/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2019/08/11 13:20:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 10:16:05 rillig Exp $
 
-DISTNAME=		Test-Modern-0.013
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		4
-CATEGORIES=		devel perl5
+DISTNAME=	Test-Modern-0.013
+PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	4
+CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/p5-Test-Perl-Critic/Makefile b/devel/p5-Test-Perl-Critic/Makefile
index 60ad658f37e..b6e568e4d7a 100644
--- a/devel/p5-Test-Perl-Critic/Makefile
+++ b/devel/p5-Test-Perl-Critic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:20:35 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:16:05 rillig Exp $
 #
 
 DISTNAME=	Test-Perl-Critic-1.04
@@ -14,9 +14,9 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Perl-Critic>=1.105:../../devel/p5-Perl-Critic
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 PERL5_MODULE_TYPE=	Module::Build	
-PERL5_PACKLIST=	auto/Test/Perl/Critic/.packlist
+PERL5_PACKLIST=		auto/Test/Perl/Critic/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Refcount/Makefile b/devel/p5-Test-Refcount/Makefile
index 9b89baedfa8..a7d11f85f3a 100644
--- a/devel/p5-Test-Refcount/Makefile
+++ b/devel/p5-Test-Refcount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:20:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 10:16:05 rillig Exp $
 
 DISTNAME=	Test-Refcount-0.10
 PKGNAME=	p5-${DISTNAME}
@@ -17,11 +17,11 @@ LICENSE=	${PERL5_LICENSE}
 USE_LANGUAGES=
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST+=	auto/Test/Refcount/.packlist
-PERL5_REQD+=	5.7.3	# Scalar::Util >= 0
-PERL5_REQD+=	5.6.2	# Test::Builder >= 0
-PERL5_REQD+=	5.5	# B >= 0
-PERL5_REQD+=	5.6.2	# Test::More >= 0
-PERL5_REQD+=	5.8.8	# Test::Builder::Tester >= 0
+PERL5_REQD+=		5.7.3	# Scalar::Util >= 0
+PERL5_REQD+=		5.6.2	# Test::Builder >= 0
+PERL5_REQD+=		5.5	# B >= 0
+PERL5_REQD+=		5.6.2	# Test::More >= 0
+PERL5_REQD+=		5.8.8	# Test::Builder::Tester >= 0
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Requires-Git/Makefile b/devel/p5-Test-Requires-Git/Makefile
index f7c2f7959a5..7c03f527bf1 100644
--- a/devel/p5-Test-Requires-Git/Makefile
+++ b/devel/p5-Test-Requires-Git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:20:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 10:16:05 rillig Exp $
 
 DISTNAME=	Test-Requires-Git-1.008
 PKGNAME=	p5-${DISTNAME}
@@ -15,8 +15,8 @@ LICENSE=	${PERL5_LICENSE}
 BUILD_DEPENDS+=	p5-Git-Version-Compare-[0-9]*:../../devel/p5-Git-Version-Compare
 BUILD_DEPENDS+=	p5-namespace-clean-[0-9]*:../../devel/p5-namespace-clean
 
-PERL5_PACKLIST=         auto/Test/Requires/Git/.packlist
-USE_LANGUAGES=          # none
+PERL5_PACKLIST=		auto/Test/Requires/Git/.packlist
+USE_LANGUAGES=		# none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Spelling/Makefile b/devel/p5-Test-Spelling/Makefile
index 6a66822932b..004cfeba66f 100644
--- a/devel/p5-Test-Spelling/Makefile
+++ b/devel/p5-Test-Spelling/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/10/31 14:02:58 mef Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 10:16:05 rillig Exp $
 
 DISTNAME=	Test-Spelling-0.25
 PKGNAME=	p5-${DISTNAME}
@@ -8,18 +8,18 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://metacpan.org/release/SARTAK/Test-Spelling-0.20
 COMMENT=	Test::Spelling - check for spelling errors in POD files
-LICENSE=        ${PERL5_LICENSE}
+LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Module-Install-GithubMeta-[0-9]*:../../devel/p5-Module-Install-GithubMeta
 DEPENDS+=	p5-Module-Manifest-Skip-[0-9]*:../../devel/p5-Module-Manifest-Skip
 DEPENDS+=	p5-Pod-Spell-[0-9]*:../../textproc/p5-Pod-Spell
 
 # for make test:
-BUILD_DEPENDS+= p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny
-BUILD_DEPENDS+= p5-IPC-Run3-[0-9]*:../../devel/p5-IPC-Run3
+BUILD_DEPENDS+=	p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny
+BUILD_DEPENDS+=	p5-IPC-Run3-[0-9]*:../../devel/p5-IPC-Run3
 
-USE_LANGUAGES=  # empty
-PERL5_PACKLIST= auto/Test/Spelling/.packlist
+USE_LANGUAGES=	# empty
+PERL5_PACKLIST=	auto/Test/Spelling/.packlist
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
 
diff --git a/devel/p5-Test-Stream/Makefile b/devel/p5-Test-Stream/Makefile
index f824ca491cf..4c48de6d7fc 100644
--- a/devel/p5-Test-Stream/Makefile
+++ b/devel/p5-Test-Stream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:20:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 10:16:05 rillig Exp $
 
 DISTNAME=	Test-Stream-1.302027
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://cpan.metacpan.org/authors/id/E/EX/EXODIST/
 COMMENT=	Successor to Test::More and Test::Builder
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Test/Stream/.packlist
+PERL5_PACKLIST=	auto/Test/Stream/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-YAML-Valid/Makefile b/devel/p5-Test-YAML-Valid/Makefile
index 0bb5f98a6a1..eabc17444bd 100644
--- a/devel/p5-Test-YAML-Valid/Makefile
+++ b/devel/p5-Test-YAML-Valid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:20:39 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 10:16:05 rillig Exp $
 #
 
 DISTNAME=	Test-YAML-Valid-0.04
@@ -17,7 +17,7 @@ DEPENDS+=	p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML
 DEPENDS+=	p5-YAML-Syck>=0.60:../../textproc/p5-YAML-Syck
 DEPENDS+=	p5-YAML-Tiny-[0-9]*:../../textproc/p5-YAML-Tiny
 
-PERL5_PACKLIST= 	auto/Test/YAML/Valid/.packlist
+PERL5_PACKLIST=		auto/Test/YAML/Valid/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-TryCatch/Makefile b/devel/p5-TryCatch/Makefile
index 5ac8bed2416..8278bc7f031 100644
--- a/devel/p5-TryCatch/Makefile
+++ b/devel/p5-TryCatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:20:42 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:16:06 rillig Exp $
 
 DISTNAME=	TryCatch-1.003002
 PKGNAME=	p5-${DISTNAME}
@@ -22,7 +22,7 @@ DEPENDS+=	p5-Scope-Upper>=0.06:../../devel/p5-Scope-Upper
 DEPENDS+=	p5-Sub-Exporter>=0.979:../../devel/p5-Sub-Exporter
 DEPENDS+=	p5-Variable-Magic>=0.28:../../devel/p5-Variable-Magic
 
-BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
+BUILD_DEPENDS+=		p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
 #BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 
 PERL5_PACKLIST=		auto/TryCatch/.packlist
diff --git a/devel/p5-UNIVERSAL-can/Makefile b/devel/p5-UNIVERSAL-can/Makefile
index 4bb65bfd042..25982fa23ea 100644
--- a/devel/p5-UNIVERSAL-can/Makefile
+++ b/devel/p5-UNIVERSAL-can/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:20:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:16:06 rillig Exp $
 
 DISTNAME=	UNIVERSAL-can-1.20140328
 PKGNAME=	p5-${DISTNAME}
@@ -11,12 +11,12 @@ HOMEPAGE=	https://metacpan.org/release/UNIVERSAL-can
 COMMENT=	Hack around people calling UNIVERSAL::can() as a function
 LICENSE=	${PERL5_LICENSE}
 
-#DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
+#DEPENDS+=		{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 #BUILD_DEPENDS+=	{perl>=5.10,p5-Test-Simple>=0.60}:../../devel/p5-Test-Simple
 
-USE_LANGUAGES=	# empty
+USE_LANGUAGES=		# empty
 #PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST= auto/UNIVERSAL/can/.packlist
+PERL5_PACKLIST=		auto/UNIVERSAL/can/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-accessors-fast/Makefile b/devel/p5-accessors-fast/Makefile
index 3471bb826b1..538900cf269 100644
--- a/devel/p5-accessors-fast/Makefile
+++ b/devel/p5-accessors-fast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 13:20:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 10:16:06 rillig Exp $
 #
 
 DISTNAME=	accessors-fast-0.03
@@ -12,12 +12,12 @@ HOMEPAGE=	https://metacpan.org/release/accessors-fast
 COMMENT=	Compiletime accessors using Class::Accessor::Fast
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
-DEPENDS+=	p5-Class-C3-[0-9]*:../../devel/p5-Class-C3
-BUILD_DEPENDS+=	p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
+DEPENDS+=		p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
+DEPENDS+=		p5-Class-C3-[0-9]*:../../devel/p5-Class-C3
+BUILD_DEPENDS+=		p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
 #BUILD_DEPENDS+=	{perl>=5.6.2,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
-DEPENDS+=	p5-constant-def>=0.01:../../devel/p5-constant-def
-BUILD_DEPENDS+=	p5-lib-abs>=0.90:../../devel/p5-lib-abs
+DEPENDS+=		p5-constant-def>=0.01:../../devel/p5-constant-def
+BUILD_DEPENDS+=		p5-lib-abs>=0.90:../../devel/p5-lib-abs
 
 REPLACE_PERL+=	cpants.pl
 
diff --git a/devel/p5-pip/Makefile b/devel/p5-pip/Makefile
index 5b3b89ae0e8..90371eaaf71 100644
--- a/devel/p5-pip/Makefile
+++ b/devel/p5-pip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:20:48 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:16:06 rillig Exp $
 
 DISTNAME=	pip-1.19
 PKGNAME=	p5-${DISTNAME}
@@ -26,7 +26,7 @@ BUILD_DEPENDS+=	p5-Test-Script>=1.02:../../devel/p5-Test-Script
 
 PERL5_PACKLIST=		auto/pip/.packlist
 #PERL5_MODULE_TYPE=	Module::Install::Bundled
-MAKE_PARAMS+=	--skipdeps
+MAKE_PARAMS+=		--skipdeps
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
 
diff --git a/devel/p5-signatures/Makefile b/devel/p5-signatures/Makefile
index b7e2e96739d..6bff3d90dc2 100644
--- a/devel/p5-signatures/Makefile
+++ b/devel/p5-signatures/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:20:48 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:16:06 rillig Exp $
 
 DISTNAME=	signatures-0.14
 PKGNAME=	p5-${DISTNAME}
@@ -11,11 +11,11 @@ HOMEPAGE=	https://metacpan.org/pod/signatures
 COMMENT=	Subroutine signatures with no source filter
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=	c
-PERL5_PACKLIST=	auto/signatures/.packlist
+USE_LANGUAGES=		c
+PERL5_PACKLIST=		auto/signatures/.packlist
 #PERL5_MODULE_TYPE=	Module::Install::Bundled
 
-BUILD_DEPENDS+=    p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
+BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:../../devel/p5-ExtUtils-Depends
 
 DEPENDS+=	p5-B-Hooks-EndOfScope>=0.08:../../devel/p5-B-Hooks-EndOfScope