time: align variable assignments

pkglint -Wall -F --only aligned -r

No manual corrections.

40 files changed, 126 insertions, 126 deletions

diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile
index d16198ee6d0..1887e3b5c7b 100644
--- a/time/cardboard-schedule/Makefile
+++ b/time/cardboard-schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/05/23 19:23:18 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/02 16:28:37 rillig Exp $
 #
 
 DISTNAME=	cs113ins
@@ -13,7 +13,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Project and resource management software implemented in Java/Swing
 LICENSE=	cardboard-schedule-license
 
-RESTRICTED=	Distribution permitted only of unmodified distfile at no charge.
+RESTRICTED=		Distribution permitted only of unmodified distfile at no charge.
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/time/dateutils/Makefile b/time/dateutils/Makefile
index 1555df68519..908bf9f210f 100644
--- a/time/dateutils/Makefile
+++ b/time/dateutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/09/29 17:18:19 wiedi Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 16:28:38 rillig Exp $
 
 DISTNAME=	dateutils-0.4.3
 PKGREVISION=	1
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config automake autoconf gmake makeinfo bison flex
 USE_LIBTOOL=	yes
-MAKE_JOBS_SAFE= no
+MAKE_JOBS_SAFE=	no
 
 INFO_FILES=		yes
 TEST_TARGET=		check
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index 0858b628f1f..d14a0ac86a6 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/10/14 20:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/02 16:28:38 rillig Exp $
 #
 
 DISTNAME=	emiclock-2.0.2
@@ -10,11 +10,11 @@ MAINTAINER=	minoura@NetBSD.org
 COMMENT=	Analog clock with image in the middle
 LICENSE=	emiclock-license
 
-RESTRICTED=	Do not distribute
-NO_SRC_ON_FTP=${RESTRICTED}
-NO_BIN_ON_FTP=${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
+RESTRICTED=		Do not distribute
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_IMAKE=	yes
 
diff --git a/time/etm/Makefile b/time/etm/Makefile
index 7481474d158..cc62b783830 100644
--- a/time/etm/Makefile
+++ b/time/etm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/09/02 13:20:04 adam Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/02 16:28:38 rillig Exp $
 
 DISTNAME=	etm-877
 PKGREVISION=	2
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets
 DEPENDS+=	${PYPKGPREFIX}-icalendar>=2.0.1:../../time/py-icalendar
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-wxWidgets
+PYTHON_VERSIONS_ACCEPTED=	27 # py-wxWidgets
 
 USE_LANGUAGES=	# none
 
diff --git a/time/fet/Makefile b/time/fet/Makefile
index a528bc1805f..961dc10a41e 100644
--- a/time/fet/Makefile
+++ b/time/fet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/09/18 14:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 16:28:38 rillig Exp $
 
 DISTNAME=	fet-5.25.0
 PKGREVISION=	28
@@ -13,10 +13,10 @@ LICENSE=	gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	bsdtar
-EXTRACT_USING=	bsdtar
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		bsdtar
+EXTRACT_USING=		bsdtar
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/fet
 
 # conflicts with import.h in package itself
diff --git a/time/ical/Makefile b/time/ical/Makefile
index caae4b502f2..e7d65d469d6 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/11/08 05:32:23 markd Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/02 16:28:38 rillig Exp $
 
 DISTNAME=	ical-3.0.3
 CATEGORIES=	time
@@ -8,9 +8,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://launchpad.net/ical-tcl/
 COMMENT=	Calendar application
 
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --prefix=${PREFIX} \
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 		--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
 		--with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
 		--with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
diff --git a/time/kholidays/buildlink3.mk b/time/kholidays/buildlink3.mk
index 546b4a31f53..6fd85a8fe28 100644
--- a/time/kholidays/buildlink3.mk
+++ b/time/kholidays/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2019/04/03 00:33:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2019/11/02 16:28:38 rillig Exp $
 
 BUILDLINK_TREE+=	kholidays
 
@@ -7,7 +7,7 @@ KHOLIDAYS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kholidays+=	kholidays>=5.44.0
 BUILDLINK_ABI_DEPENDS.kholidays?=	kholidays>=5.47.0nb4
-BUILDLINK_PKGSRCDIR.kholidays?=	../../time/kholidays
+BUILDLINK_PKGSRCDIR.kholidays?=		../../time/kholidays
 
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/time/libical/Makefile b/time/libical/Makefile
index e0fa58399e3..f1f5534be66 100644
--- a/time/libical/Makefile
+++ b/time/libical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 16:28:38 rillig Exp $
 #
 
 DISTNAME=	libical-3.0.3
@@ -14,9 +14,9 @@ LICENSE=	gnu-lgpl-v2.1 OR mpl-2.0
 
 USE_TOOLS+=	perl pkg-config
 USE_CMAKE=	yes
-CMAKE_ARGS+= -DUSE_BUILTIN_TZDATA=false
-CMAKE_ARGS+= -DICAL_BUILD_DOCS=false
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_BDB=true
+CMAKE_ARGS+=	-DUSE_BUILTIN_TZDATA=false
+CMAKE_ARGS+=	-DICAL_BUILD_DOCS=false
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_BDB=true
 MAKE_JOBS_SAFE=	no
 
 PKGCONFIG_OVERRIDE+=	libical.pc.in src/libical-glib/libical-glib.pc.in
diff --git a/time/memo/Makefile b/time/memo/Makefile
index 5480982df9e..035f6928911 100644
--- a/time/memo/Makefile
+++ b/time/memo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/09/15 16:25:22 khorben Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 16:28:38 rillig Exp $
 
 DISTNAME=	memo-0.6
 PKGREVISION=	1
@@ -15,7 +15,7 @@ USE_TOOLS+=	bash:run
 
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
-NO_BUILD=	yes
+NO_BUILD=		yes
 INSTALLATION_DIRS=	bin share/doc/memo
 
 REPLACE_BASH+=	memo
diff --git a/time/ocaml-calendar/Makefile b/time/ocaml-calendar/Makefile
index 1c3d2c2b9b3..a4215d60743 100644
--- a/time/ocaml-calendar/Makefile
+++ b/time/ocaml-calendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/11/12 16:10:28 jaapb Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 16:28:38 rillig Exp $
 #
 
 DISTNAME=	calendar-2.04
@@ -12,8 +12,8 @@ HOMEPAGE=	http://calendar.forge.ocamlcore.org/
 COMMENT=	OCaml library managing dates and times
 LICENSE=	gnu-lgpl-v2.1
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake
 OCAML_USE_FINDLIB=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/time/ocaml-mtime/Makefile b/time/ocaml-mtime/Makefile
index 9a0ba3dfe0a..f29ccadd4b3 100644
--- a/time/ocaml-mtime/Makefile
+++ b/time/ocaml-mtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/07/01 16:06:55 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	mtime-1.1.0
 PKGNAME=	ocaml-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Monotonic wall-clock time for OCaml
 LICENSE=	isc
 
 OCAML_USE_TOPKG=	yes
-OCAML_USE_OPAM=	yes
+OCAML_USE_OPAM=		yes
 
 .include "options.mk"
 .include "../../mk/ocaml.mk"
diff --git a/time/p5-Calendar-Simple/Makefile b/time/p5-Calendar-Simple/Makefile
index 9dfd6baa76a..105be4fcc57 100644
--- a/time/p5-Calendar-Simple/Makefile
+++ b/time/p5-Calendar-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	Calendar-Simple-1.23
 PKGNAME=	p5-${DISTNAME}
@@ -12,9 +12,9 @@ COMMENT=	Perl extension to create simple calendars
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	#empty
-PERL5_PACKLIST= auto/Calendar/Simple/.packlist
+PERL5_PACKLIST=	auto/Calendar/Simple/.packlist
 
-PERL5_MODULE_TYPE= Module::Build
+PERL5_MODULE_TYPE=	Module::Build
 
 post-extract:
 	${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \;
diff --git a/time/p5-Convert-NLS_DATE_FORMAT/Makefile b/time/p5-Convert-NLS_DATE_FORMAT/Makefile
index 19d263e3249..bb090d9b8cb 100644
--- a/time/p5-Convert-NLS_DATE_FORMAT/Makefile
+++ b/time/p5-Convert-NLS_DATE_FORMAT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	Convert-NLS_DATE_FORMAT-0.06
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Convert Oracle NLS_DATE_FORMAT <-> strftime Format Strings
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	#empty
-PERL5_PACKLIST= auto/Convert/NLS_DATE_FORMAT/.packlist
+PERL5_PACKLIST=	auto/Convert/NLS_DATE_FORMAT/.packlist
 
 PERL5_MODULE_TYPE=	Module::Build::Tiny
 
diff --git a/time/p5-Data-ICal/Makefile b/time/p5-Data-ICal/Makefile
index 1b475dfc9af..d9cecfdf477 100644
--- a/time/p5-Data-ICal/Makefile
+++ b/time/p5-Data-ICal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/11/02 14:51:35 mef Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=		Data-ICal-0.23
 PKGNAME=		p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=		p5-Class-ReturnValue>=0.53:../../devel/p5-Class-ReturnValue
 #DEPENDS+=		{perl>=5.7.3,p5-MIME-Base64-[0-9]*}:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Text-vFile-asData>=0.05:../../textproc/p5-Text-vFile-asData
 
-#BUILD_DEPENDS+=		{perl>=5.6.2,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
+#BUILD_DEPENDS+=	{perl>=5.6.2,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
 TEST_DEPENDS+=		p5-Test-LongString-[0-9]*:../../devel/p5-Test-LongString
 TEST_DEPENDS+=		p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
 TEST_DEPENDS+=		p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
diff --git a/time/p5-DateTime-Event-Random/Makefile b/time/p5-DateTime-Event-Random/Makefile
index 955c451d427..5a64804a268 100644
--- a/time/p5-DateTime-Event-Random/Makefile
+++ b/time/p5-DateTime-Event-Random/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:24:05 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	DateTime-Event-Random-0.03
 PKGNAME=	p5-${DISTNAME}
 PKGREVISION=	10
 CATEGORIES=	time perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=../../authors/id/F/FG/FGLOCK/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/F/FG/FGLOCK/}
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://metacpan.org/release/DateTime-Event-Random
 COMMENT=	DateTime extension for creating random datetimes
 
diff --git a/time/p5-DateTime-Format-Builder/Makefile b/time/p5-DateTime-Format-Builder/Makefile
index ee2f6396418..702e08fa47a 100644
--- a/time/p5-DateTime-Format-Builder/Makefile
+++ b/time/p5-DateTime-Format-Builder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:05 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	DateTime-Format-Builder-0.82
 PKGNAME=	p5-${DISTNAME}00
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=	p5-Package-Stash-[0-9]*:../../devel/p5-Package-Stash
 BUILD_DEPENDS+=	p5-Sub-Name-[0-9]*:../../devel/p5-Sub-Name
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/DateTime/Format/Builder/.packlist
+PERL5_PACKLIST=	auto/DateTime/Format/Builder/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-DateTime-Format-DateManip/Makefile b/time/p5-DateTime-Format-DateManip/Makefile
index 5f6abf545ec..ddad49cbcbf 100644
--- a/time/p5-DateTime-Format-DateManip/Makefile
+++ b/time/p5-DateTime-Format-DateManip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:24:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	DateTime-Format-DateManip-0.04
 PKGNAME=	p5-${DISTNAME}
@@ -13,8 +13,8 @@ COMMENT=	Convert Date::Manip dates and durations to/from DateTimes
 DEPENDS+=	p5-DateTime>0:../../time/p5-DateTime
 DEPENDS+=	p5-Date-Manip>0:../../devel/p5-Date-Manip
 
-PERL5_MODULE_TYPE=     Module::Build
-USE_LANGUAGES=	#
+PERL5_MODULE_TYPE=	Module::Build
+USE_LANGUAGES=		#
 
 PERL5_PACKLIST=	auto/DateTime/Format/DateManip/.packlist
 
diff --git a/time/p5-DateTime-Format-DateParse/Makefile b/time/p5-DateTime-Format-DateParse/Makefile
index 835d7d10d25..839ade442be 100644
--- a/time/p5-DateTime-Format-DateParse/Makefile
+++ b/time/p5-DateTime-Format-DateParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:24:06 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	DateTime-Format-DateParse-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -15,8 +15,8 @@ DEPENDS+=	p5-DateTime>=0.2900:../../time/p5-DateTime
 DEPENDS+=	p5-DateTime-TimeZone>=0.27:../../time/p5-DateTime-TimeZone
 DEPENDS+=	p5-TimeDate>=1.16:../../time/p5-TimeDate
 
-PERL5_MODULE_TYPE=  	Module::Build
-USE_LANGUAGES=	#
+PERL5_MODULE_TYPE=	Module::Build
+USE_LANGUAGES=		#
 
 PERL5_PACKLIST=	auto/DateTime/Format/DateParse/.packlist
 
diff --git a/time/p5-DateTime-Format-HTTP/Makefile b/time/p5-DateTime-Format-HTTP/Makefile
index 477584a8363..beb64820b1b 100644
--- a/time/p5-DateTime-Format-HTTP/Makefile
+++ b/time/p5-DateTime-Format-HTTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:28:39 rillig Exp $
 
 DISTNAME=	DateTime-Format-HTTP-0.42
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-DateTime>=0.17:../../time/p5-DateTime
 DEPENDS+=	p5-libwww>=1.44:../../www/p5-libwww
 
-PERL5_PACKLIST=	auto/DateTime/Format/HTTP/.packlist
+PERL5_PACKLIST=		auto/DateTime/Format/HTTP/.packlist
 PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
diff --git a/time/p5-DateTime-Format-Mail/Makefile b/time/p5-DateTime-Format-Mail/Makefile
index 935c5649ef2..6e5fbdbe158 100644
--- a/time/p5-DateTime-Format-Mail/Makefile
+++ b/time/p5-DateTime-Format-Mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	DateTime-Format-Mail-0.403
 # make sure it has 4 digits
@@ -16,7 +16,7 @@ DEPENDS+=	p5-DateTime>=0.18:../../time/p5-DateTime
 #DEPENDS+=	{perl>=5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
 DEPENDS+=	p5-Params-Validate>=0.67:../../devel/p5-Params-Validate
 
-PERL5_PACKLIST= auto/DateTime/Format/Mail/.packlist
+PERL5_PACKLIST=	auto/DateTime/Format/Mail/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-DateTime-Format-Natural/Makefile b/time/p5-DateTime-Format-Natural/Makefile
index 53c51809677..93f3b917719 100644
--- a/time/p5-DateTime-Format-Natural/Makefile
+++ b/time/p5-DateTime-Format-Natural/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	DateTime-Format-Natural-1.07
 PKGNAME=	p5-${DISTNAME}
@@ -22,8 +22,8 @@ DEPENDS+=	p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
 
 TEST_DEPENDS+=	p5-Test-MockTime-[0-9]*:../../time/p5-Test-MockTime
 
-PERL5_MODULE_TYPE=  	Module::Build
-USE_LANGUAGES=	#
+PERL5_MODULE_TYPE=	Module::Build
+USE_LANGUAGES=		#
 
 PERL5_PACKLIST=	auto/DateTime/Format/Natural/.packlist
 
diff --git a/time/p5-DateTime-Format-W3CDTF/Makefile b/time/p5-DateTime-Format-W3CDTF/Makefile
index 56bdc3e1dad..6cc067843ac 100644
--- a/time/p5-DateTime-Format-W3CDTF/Makefile
+++ b/time/p5-DateTime-Format-W3CDTF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	DateTime-Format-W3CDTF-0.07
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Convert between DateTime and W3CDTF date/time format
 
 DEPENDS+=	p5-DateTime-[0-9]*:../../time/p5-DateTime
 
-PERL5_PACKLIST= auto/DateTime/Format/W3CDTF/.packlist
+PERL5_PACKLIST=	auto/DateTime/Format/W3CDTF/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-DateTime-Incomplete/Makefile b/time/p5-DateTime-Incomplete/Makefile
index 9a50add451c..54d7fe53432 100644
--- a/time/p5-DateTime-Incomplete/Makefile
+++ b/time/p5-DateTime-Incomplete/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/08/11 13:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	DateTime-Incomplete-0.08
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ LICENSE=	${PERL5_LICENSE}
 BUILD_DEPENDS+=	p5-DateTime-Set-[0-9]*:../../time/p5-DateTime-Set
 BUILD_DEPENDS+=	p5-DateTime-Event-Recurrence-[0-9]*:../../time/p5-DateTime-Event-Recurrence
 
-PERL5_PACKLIST= auto/DateTime/Incomplete/.packlist
+PERL5_PACKLIST=	auto/DateTime/Incomplete/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-DateTime-TimeZone/Makefile b/time/p5-DateTime-TimeZone/Makefile
index 7d4bb7d5238..14c1d4dff53 100644
--- a/time/p5-DateTime-TimeZone/Makefile
+++ b/time/p5-DateTime-TimeZone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2019/09/13 09:55:05 wen Exp $
+# $NetBSD: Makefile,v 1.104 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	DateTime-TimeZone-2.37
 PKGNAME=	p5-${DISTNAME}
@@ -15,23 +15,23 @@ DEPENDS+=	p5-Params-Validate>=0.72:../../devel/p5-Params-Validate
 DEPENDS+=	p5-List-AllUtils>=0:../../devel/p5-List-AllUtils
 DEPENDS+=	p5-Module-Runtime-[0-9]*:../../devel/p5-Module-Runtime
 DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
-DEPENDS+=       p5-Params-ValidationCompiler-[0-9]*:../../devel/p5-Params-ValidationCompiler
-DEPENDS+=       p5-Specio-[0-9]*:../../devel/p5-Specio
+DEPENDS+=	p5-Params-ValidationCompiler-[0-9]*:../../devel/p5-Params-ValidationCompiler
+DEPENDS+=	p5-Specio-[0-9]*:../../devel/p5-Specio
 
 # for tests, but can't depend in it, since it depends on this package
 #BUILD_DEPENDS+=	p5-DateTime>=0.1501:../../time/p5-DateTime
-BUILD_DEPENDS+=	p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
-BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Test-Output-[0-9]*:../../devel/p5-Test-Output
-BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
-BUILD_DEPENDS+=	p5-Test-Taint-[0-9]*:../../devel/p5-Test-Taint
-BUILD_DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
+BUILD_DEPENDS+=		p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
+BUILD_DEPENDS+=		p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+BUILD_DEPENDS+=		p5-Test-Output-[0-9]*:../../devel/p5-Test-Output
+BUILD_DEPENDS+=		p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+BUILD_DEPENDS+=		p5-Test-Taint-[0-9]*:../../devel/p5-Test-Taint
+BUILD_DEPENDS+=		p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 # on HPUX it requires ../../time/p5-DateTime-TimeZone-HPUX
 # but this will result in a circular dependency
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/DateTime/TimeZone/.packlist
+PERL5_PACKLIST=	auto/DateTime/TimeZone/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-DateTimeX-Easy/Makefile b/time/p5-DateTimeX-Easy/Makefile
index 2f44da98f66..864317eb5cd 100644
--- a/time/p5-DateTimeX-Easy/Makefile
+++ b/time/p5-DateTimeX-Easy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:09 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	DateTimeX-Easy-0.089
 PKGNAME=	p5-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 BUILD_DEPENDS+=	p5-Test-Most>0:../../devel/p5-Test-Most
 
 PERL5_MODULE_TYPE=	Module::Install::Bundled
-USE_LANGUAGES=	#
+USE_LANGUAGES=		#
 
 PERL5_PACKLIST=	auto/DateTimeX/Easy/.packlist
 
diff --git a/time/p5-Rose-DateTime/Makefile b/time/p5-Rose-DateTime/Makefile
index a509562e32e..50e63c03736 100644
--- a/time/p5-Rose-DateTime/Makefile
+++ b/time/p5-Rose-DateTime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:24:10 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	Rose-DateTime-0.540
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Rose-DateTime
 COMMENT=	DateTime helper functions and objects for Rose
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+= 	p5-Rose-Object>=0.82:../../devel/p5-Rose-Object
+DEPENDS+=	p5-Rose-Object>=0.82:../../devel/p5-Rose-Object
 DEPENDS+=	p5-DateTime-[0-9]*:../../time/p5-DateTime
 
 PERL5_PACKLIST=		auto/Rose/DateTime/.packlist
diff --git a/time/p5-Template-Plugin-DateTime/Makefile b/time/p5-Template-Plugin-DateTime/Makefile
index ee8cb64f14f..d4b5874dd1d 100644
--- a/time/p5-Template-Plugin-DateTime/Makefile
+++ b/time/p5-Template-Plugin-DateTime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:24:10 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:28:40 rillig Exp $
 #
 
 DISTNAME=	Template-Plugin-DateTime-0.06002
@@ -17,7 +17,7 @@ DEPENDS+=	p5-DateTime-Format-Strptime-[0-9]*:../../time/p5-DateTime-Format-Strpt
 DEPENDS+=	p5-Template-Toolkit>=2:../../www/p5-Template-Toolkit
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST=		auto/Template/Plugin/DateTime/.packlist
+PERL5_PACKLIST=	auto/Template/Plugin/DateTime/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Time-Clock/Makefile b/time/p5-Time-Clock/Makefile
index 985ad698bdc..a3c49fb5467 100644
--- a/time/p5-Time-Clock/Makefile
+++ b/time/p5-Time-Clock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/11 13:24:10 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 16:28:40 rillig Exp $
 
 DISTNAME=	Time-Clock-1.03
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Twenty-four hour clock object with nanosecond precision
 LICENSE=	${PERL5_LICENSE}
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/Time/Clock/.packlist
+PERL5_PACKLIST=	auto/Time/Clock/.packlist
 
 post-extract:
 	${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \;
diff --git a/time/p5-Time-Duration/Makefile b/time/p5-Time-Duration/Makefile
index 797304d55bc..15bb4f63fca 100644
--- a/time/p5-Time-Duration/Makefile
+++ b/time/p5-Time-Duration/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:11 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 16:28:41 rillig Exp $
 
-DISTNAME=      	Time-Duration-1.21
+DISTNAME=	Time-Duration-1.21
 PKGNAME=	p5-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	devel perl5 time
diff --git a/time/p5-Time-TAI64/Makefile b/time/p5-Time-TAI64/Makefile
index 90da4550d70..d6f383fb7fd 100644
--- a/time/p5-Time-TAI64/Makefile
+++ b/time/p5-Time-TAI64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 16:28:41 rillig Exp $
 
 DISTNAME=	Time-TAI64-2.11
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://metacpan.org/release/Time-TAI64
 COMMENT=	Convert TAI64 strings into standard unix timestamps
 
 #BUILD_DEPENDS+=	{perl>=5.6.2,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
-#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/Time/TAI64/.packlist
 
diff --git a/time/php-mrbs/Makefile b/time/php-mrbs/Makefile
index f289729ad89..2c6d75b09cb 100644
--- a/time/php-mrbs/Makefile
+++ b/time/php-mrbs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/01/31 12:23:14 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:28:41 rillig Exp $
 #
 
 DISTNAME=	mrbs-1.4.11
@@ -16,7 +16,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=5.3.0:../../converters/php-iconv
 .include "options.mk"
 
 USE_LANGUAGES=	# none
-EGDIR=	${PREFIX}/share/examples/mrbs
+EGDIR=		${PREFIX}/share/examples/mrbs
 CONF_FILES=	${EGDIR}/config.inc.php ${PREFIX}/share/mrbs/config.inc.php
 CONF_FILES+=	${EGDIR}/site_faq/site_faq.html ${PREFIX}/share/mrbs/site_faq/site_faq.html
 CONF_FILES+=	${EGDIR}/site_faq/site_faq_cs.html ${PREFIX}/share/mrbs/site_faq/site_faq_cs.html
diff --git a/time/php-mrbs/options.mk b/time/php-mrbs/options.mk
index dd470a2a84a..4721da33a22 100644
--- a/time/php-mrbs/options.mk
+++ b/time/php-mrbs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/09/11 17:03:28 taca Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/02 16:28:41 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.php-mrbs
 
@@ -13,10 +13,10 @@ PKG_SUGGESTED_OPTIONS=	mysql
 ### Use mysql, or pgsql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
+DEPENDS+=		${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
 PHP_VERSIONS_ACCEPTED=	56
 .elif !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+=	${PHP_PKG_PREFIX}-pgsql>=5.2.0:../../databases/php-pgsql
+DEPENDS+=		${PHP_PKG_PREFIX}-pgsql>=5.2.0:../../databases/php-pgsql
 .else
 PKG_FAIL_REASON+=	${PKGNAME} needs either mysql or pgsql
 .endif
diff --git a/time/py-goocalendar/Makefile b/time/py-goocalendar/Makefile
index 2c27962e2b8..2af3dc091a7 100644
--- a/time/py-goocalendar/Makefile
+++ b/time/py-goocalendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/09/02 13:20:04 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 16:28:41 rillig Exp $
 
 DISTNAME=	GooCalendar-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-goocanvas-[0-9]*:../../graphics/py-goocanvas
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-gtk2 via py-goocanvas
+PYTHON_VERSIONS_ACCEPTED=	27 # py-gtk2 via py-goocanvas
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/py-pytimeparse/Makefile b/time/py-pytimeparse/Makefile
index d47f3523ab6..f8b297b02db 100644
--- a/time/py-pytimeparse/Makefile
+++ b/time/py-pytimeparse/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2019/07/07 10:14:44 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 16:28:41 rillig Exp $
 
-DISTNAME=               pytimeparse-1.1.8
-PKGNAME=                ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=             python time
-MASTER_SITES=           ${MASTER_SITE_PYPI:=p/pytimeparse/}
+DISTNAME=		pytimeparse-1.1.8
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=		python time
+MASTER_SITES=		${MASTER_SITE_PYPI:=p/pytimeparse/}
 
-MAINTAINER=             pkgsrc-users@NetBSD.org
-HOMEPAGE=               https://timeparse.readthedocs.io/
-COMMENT=                Parse various kinds of time expressions
-LICENSE=                mit
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		https://timeparse.readthedocs.io/
+COMMENT=		Parse various kinds of time expressions
+LICENSE=		mit
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/time/py-vdirsyncer/Makefile b/time/py-vdirsyncer/Makefile
index 6df39a795a2..65fe56bc52d 100644
--- a/time/py-vdirsyncer/Makefile
+++ b/time/py-vdirsyncer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/10/21 22:15:10 adam Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/02 16:28:41 rillig Exp $
 
 DISTNAME=	vdirsyncer-0.16.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,23 +12,23 @@ LICENSE=	modified-bsd
 
 EXTRACT_USING=	bsdtar	# gtar cannot handle pre-1970 timestamps
 
-DEPENDS+=	${PYPKGPREFIX}-atomicwrites>=0.1.7:../../devel/py-atomicwrites
-DEPENDS+=	${PYPKGPREFIX}-click>=5.0:../../devel/py-click
-DEPENDS+=	${PYPKGPREFIX}-click-log>=0.3.0:../../devel/py-click-log
-DEPENDS+=	${PYPKGPREFIX}-click-threading>=0.2.0:../../devel/py-click-threading
-DEPENDS+=	${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests
-DEPENDS+=	${PYPKGPREFIX}-requests-oauthlib-[0-9]*:../../security/py-requests-oauthlib
-DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.4.0:../../devel/py-requests-toolbelt
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
-BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+DEPENDS+=		${PYPKGPREFIX}-atomicwrites>=0.1.7:../../devel/py-atomicwrites
+DEPENDS+=		${PYPKGPREFIX}-click>=5.0:../../devel/py-click
+DEPENDS+=		${PYPKGPREFIX}-click-log>=0.3.0:../../devel/py-click-log
+DEPENDS+=		${PYPKGPREFIX}-click-threading>=0.2.0:../../devel/py-click-threading
+DEPENDS+=		${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests
+DEPENDS+=		${PYPKGPREFIX}-requests-oauthlib-[0-9]*:../../security/py-requests-oauthlib
+DEPENDS+=		${PYPKGPREFIX}-requests-toolbelt>=0.4.0:../../devel/py-requests-toolbelt
+DEPENDS+=		${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+BUILD_DEPENDS+=		${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # tests need DAV_SERVER and REMOTESTORAGE_SERVER environment variables set
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 
-USE_LANGUAGES=	# none
+USE_LANGUAGES=		# none
 INSTALLATION_DIRS=	share/examples/${PKGBASE} ${PKGMANDIR}/man1
-PLIST_SUBST+=	PKGBASE=${PKGBASE}
+PLIST_SUBST+=		PKGBASE=${PKGBASE}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 # not supported any longer
 
diff --git a/time/rclock/Makefile b/time/rclock/Makefile
index d1206618dca..01e702ac5b3 100644
--- a/time/rclock/Makefile
+++ b/time/rclock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:28 agc Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 16:28:41 rillig Exp $
 
 DISTNAME=		rxvt-2.7.10
 PKGNAME=		rclock-2.7.10
 CATEGORIES=		x11 time
-MASTER_SITES=           ftp://ftp.rxvt.org/pub/rxvt/
+MASTER_SITES=		ftp://ftp.rxvt.org/pub/rxvt/
 MASTER_SITES+=		ftp://mason.primenet.com.au/pub/rxvt/
 EXTRACT_SUFX=		.tar.bz2
 
diff --git a/time/rsibreak/Makefile b/time/rsibreak/Makefile
index a468582a061..f28acef8e09 100644
--- a/time/rsibreak/Makefile
+++ b/time/rsibreak/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.65 2019/08/22 12:23:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2019/11/02 16:28:41 rillig Exp $
 
 DISTNAME=		rsibreak-0.11
 PKGREVISION=		41
 CATEGORIES=		time kde
 MASTER_SITES=		http://www.rsibreak.org/files/
-EXTRACT_SUFX=           .tar.bz2
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		markd@NetBSD.org
 HOMEPAGE=		http://www.rsibreak.org/
diff --git a/time/vixie-cron/Makefile b/time/vixie-cron/Makefile
index 5fe32357de7..eb39a3e338a 100644
--- a/time/vixie-cron/Makefile
+++ b/time/vixie-cron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 13:04:29 asau Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 16:28:41 rillig Exp $
 
 DISTNAME=		cron_4.1
 PKGNAME=		vixie-cron-4.1
@@ -13,7 +13,7 @@ COMMENT=		Execute and maintain scheduled commands
 SPECIAL_PERMS+=		bin/crontab ${SETUID_ROOT_PERMS}
 
 # Don't extract into WRKDIR because rc.d script is replaced with binary
-EXTRACT_CMD=   ${MKDIR} ${WRKSRC} && cd ${WRKSRC} && ${CAT} $$extract_file | ${SH}
+EXTRACT_CMD=	${MKDIR} ${WRKSRC} && cd ${WRKSRC} && ${CAT} $$extract_file | ${SH}
 
 RCD_SCRIPTS=		cron
 
diff --git a/time/wxRemind/Makefile b/time/wxRemind/Makefile
index 6285084d955..becd3263d8a 100644
--- a/time/wxRemind/Makefile
+++ b/time/wxRemind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/02 13:20:04 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 16:28:42 rillig Exp $
 
 DISTNAME=		wxRemind-0.6.18
 PKGREVISION=		5
@@ -11,7 +11,7 @@ COMMENT=		Graphical front-end to Remind
 
 DEPENDS+=		${PYPKGPREFIX}-wxWidgets>=2.6.1:../../x11/py-wxWidgets
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-wxWidgets
+PYTHON_VERSIONS_ACCEPTED=	27 # py-wxWidgets
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xtide/Makefile b/time/xtide/Makefile
index 0ad8ddab102..1bcde20d774 100644
--- a/time/xtide/Makefile
+++ b/time/xtide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/07/18 00:06:24 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 16:28:42 rillig Exp $
 
 DISTNAME=	xtide-2.8.3
 PKGREVISION=	5
@@ -17,9 +17,9 @@ PREV_PKGPATH=	misc/xtide
 
 HARMONICS_FILE=	harmonics-dwf-20060708.tcd
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} X11BASE=${X11BASE:Q}
-EGDIR=		${PREFIX}/share/examples/xtide
-CONF_FILES=	${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} X11BASE=${X11BASE:Q}
+EGDIR=			${PREFIX}/share/examples/xtide
+CONF_FILES=		${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf
 
 LDFLAGS.SunOS+=	-lsocket -lnsl