diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 113381aa9c0..86b42d248eb 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2019/08/21 10:55:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2020/02/03 20:40:37 sthen Exp $
 
 SHARED_LIBS +=	lz4                       3.0
 
@@ -7,13 +7,12 @@ COMMENT=	fast BSD-licensed data compression
 GH_ACCOUNT=	lz4
 GH_PROJECT=	lz4
 GH_TAGNAME=	v1.9.2
+REVISION=	0
 
 CATEGORIES=	archivers
 
 HOMEPAGE=	https://fastcompression.blogspot.com/p/lz4.html
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # library: BSD, tools: GPLv2
 PERMIT_PACKAGE=	Yes
 
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 4a9f05ad3c5..ec0bc9c24a5 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2019/07/10 21:01:26 tj Exp $
+# $OpenBSD: Makefile,v 1.18 2020/02/03 20:40:37 sthen Exp $
 
 COMMENT=	portable speedy lossless data compression library
 
 DISTNAME=	lzo-2.10
-REVISION=	1
+REVISION=	2
 PKGNAME=	${DISTNAME:S/lzo/lzo2/}
 
 CATEGORIES=	archivers devel
@@ -12,8 +12,6 @@ MASTER_SITES=	${HOMEPAGE}download/
 
 SHARED_LIBS +=	lzo2	1.0 # .2.0
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 HOMEPAGE=	https://www.oberhumer.com/opensource/lzo/
 
 # GPLv2+
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 800b42ea522..0acf8d6b624 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.43 2019/11/19 21:21:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	CLI tools to manage music collections
 
 MODPY_EGG_VERSION= 1.4.9
 DISTNAME=	beets-${MODPY_EGG_VERSION}
 CATEGORIES=	audio
-REVISION=	2
-
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+REVISION=	3
 
 HOMEPAGE=	http://beets.io/
 
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index a6325c0cfb5..d3d06f83749 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.49 2019/06/03 16:06:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	GSM audio codec library and converter
 
 D=		gsm-1.0-pl18
 DISTNAME=	${D:S/-pl/./}
 WRKDIST=	${WRKDIR}/$D
+REVISION=	0
 
 SHARED_LIBS=	gsm	1.0
 
@@ -12,8 +13,6 @@ CATEGORIES=	audio
 
 HOMEPAGE=	http://www.quut.com/gsm/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # ISC-like
 PERMIT_PACKAGE=	Yes
 
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index c2dcf662a71..51fbdd89aee 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2019/11/19 21:20:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT =	Python module to handle audio metadata
 
 MODPY_EGG_VERSION = 1.43.0
-REVISION =	0
+REVISION =	1
 DISTNAME =	mutagen-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 PORTROACH =	skipv:release-${MODPY_EGG_VERSION}
@@ -12,8 +12,6 @@ CATEGORIES =	audio
 
 HOMEPAGE =	https://mutagen.readthedocs.org/
 
-MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
-
 MASTER_SITES =	https://github.com/quodlibet/mutagen/releases/download/release-${MODPY_EGG_VERSION}/
 
 # GPLv2+
diff --git a/audio/quodlibet/Makefile b/audio/quodlibet/Makefile
index 71806501ec9..106e7ce0fa1 100644
--- a/audio/quodlibet/Makefile
+++ b/audio/quodlibet/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.31 2019/11/19 21:21:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	audio player and tagger for GTK+ with regex support
 
 MODPY_EGG_VERSION= 4.2.1
 DISTNAME=	quodlibet-${MODPY_EGG_VERSION}
 PORTROACH=	skipv:release-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	audio
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 HOMEPAGE=	https://quodlibet.readthedocs.org/
 
 # GPLv2+
diff --git a/audio/rgain/Makefile b/audio/rgain/Makefile
index 9c798df239f..b438e83d1cc 100644
--- a/audio/rgain/Makefile
+++ b/audio/rgain/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/11/19 21:21:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	multi-format tools and Python module for ReplayGain
 
@@ -8,14 +8,12 @@ COMMENT=	multi-format tools and Python module for ReplayGain
 MODPY_EGG_VERSION= 1.3.4
 DISTNAME=	rgain-${MODPY_EGG_VERSION}
 WRKDIST=	${WRKDIR}/fk-rgain-8df1a846a12c
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	audio
 
 HOMEPAGE=	https://bitbucket.org/fk/rgain
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/audio/squeezelite/Makefile b/audio/squeezelite/Makefile
index 46301769c2b..5b98a5d3035 100644
--- a/audio/squeezelite/Makefile
+++ b/audio/squeezelite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2019/12/31 23:38:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	lightweight headless squeezebox player
 
@@ -7,11 +7,10 @@ GH_ACCOUNT=	ralph-irving
 GH_PROJECT=	squeezelite
 GH_COMMIT=	1cff80e5330501b1f587a474f06db08fd53d9521
 DISTNAME=	squeezelite-$V
+REVISION=	0
 
 CATEGORIES=	audio
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv3
 PERMIT_PACKAGE=	Yes
 
diff --git a/books/wndw/Makefile b/books/wndw/Makefile
index 2ee6c6cc241..f6c870f72fc 100644
--- a/books/wndw/Makefile
+++ b/books/wndw/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2019/06/03 16:06:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT-main =	Wireless Networking in the Developing World, English edition
 COMMENT-es =	Wireless Networking in the Developing World, Spanish edition
@@ -16,7 +16,7 @@ PKGNAME-pt =	wndw-pt-1.0
 PKGNAME-id =	wndw-id-2.0
 PKGNAME-my =	wndw-my-3.0
 
-REVISION=	0
+REVISION=	1
 
 DISTNAME =	wndw
 
@@ -27,8 +27,6 @@ PERMIT_PACKAGE =	Yes
 
 MULTI_PACKAGES =-main -es -fr -ar -pt -id -my
 
-MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
-
 # High resolution print-ready PDFs are also available at the homepage
 # e.g. http://wndw.net/pdf/wndw3-en/wndw3-print.pdf (English edition).
 # Also available as printed books.
diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile
index 2d26e918e5b..0c50f3da2b8 100644
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.37 2019/06/03 16:06:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT =	gateway to send and receive SMS through GSM mobile phones
 
 DISTNAME =	smstools3-3.1.21
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	comms
 FIX_EXTRACT_PERMISSIONS=Yes
 
 HOMEPAGE =	http://smstools3.kekekasvi.com/
 
-MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2
 PERMIT_PACKAGE =	Yes
 
diff --git a/databases/libhiredis/Makefile b/databases/libhiredis/Makefile
index b1bdc9c9fc4..68a0a10bdf2 100644
--- a/databases/libhiredis/Makefile
+++ b/databases/libhiredis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/03 16:06:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	minimalistic C client for Redis
 
@@ -6,13 +6,12 @@ GH_ACCOUNT=	redis
 GH_PROJECT=	hiredis
 GH_TAGNAME=	v0.14.0
 PKGNAME=	lib${DISTNAME}
+REVISION=	0
 
 SHARED_LIBS=	hiredis 0.1 # 0.13
 
 CATEGORIES=	databases devel
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 6ef2940b46f..f7ec3e27557 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2019/06/03 16:06:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	Sybase database driver for the DBI module
 
 DISTNAME=	DBD-Sybase-1.16
-REVISION=	0
+REVISION=	1
 CATEGORIES=	databases
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # Perl
 PERMIT_PACKAGE=	Yes
 
diff --git a/devel/py-parsedatetime/Makefile b/devel/py-parsedatetime/Makefile
index dcd88043d77..6f4e97f5072 100644
--- a/devel/py-parsedatetime/Makefile
+++ b/devel/py-parsedatetime/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.13 2019/12/09 16:05:25 kmos Exp $
+# $OpenBSD: Makefile,v 1.14 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=		parse human-readable date/time text
 
 MODPY_EGG_VERSION =	2.5
 DISTNAME=		parsedatetime-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
+REVISION=		0
 
 CATEGORIES=		devel
 
-MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
-
 # Apache 2.0
 PERMIT_PACKAGE=	Yes
 
diff --git a/devel/py-tz/Makefile b/devel/py-tz/Makefile
index 9f41a4b9545..fbb0957988e 100644
--- a/devel/py-tz/Makefile
+++ b/devel/py-tz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2019/10/23 14:59:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.54 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT =		Python API for dealing with timezones
 
@@ -6,11 +6,10 @@ MODPY_EGG_VERSION =	2019.3
 DISTNAME =		pytz-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/^py/py-/}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		https://pythonhosted.org/pytz/
 
-MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 387d2888d73..a6fffd7c0ec 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.199 2020/01/14 11:41:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.200 2020/02/03 20:40:38 sthen Exp $
 
 BROKEN-arm=	libm functions (cabs etc) not detected, fallback code is broken
 
@@ -10,6 +10,7 @@ DISTNAME=		ImageMagick-${VER}-${DASHVER}
 PKGNAME=		ImageMagick-${VER}.${DASHVER}
 PORTROACH=		site:https://imagemagick.org/download/ limit:6.*
 EXTRACT_SUFX=		.tar.xz
+REVISION=		0
 
 SHARED_LIBS +=	MagickCore-6.Q16     7.0      # 6.0
 SHARED_LIBS +=	MagickWand-6.Q16     4.2      # 6.0
@@ -19,8 +20,6 @@ CATEGORIES=		graphics
 
 HOMEPAGE=		https://imagemagick.org/
 
-MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
-
 MASTER_SITES=		https://imagemagick.org/download/releases/ \
 			https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/ \
 			ftp://sunsite.icm.edu.pl/packages/ImageMagick/
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 3780f525cdb..395c7c1b9b6 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2019/11/10 15:32:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.96 2020/02/03 20:40:38 sthen Exp $
 
 ONLY_FOR_ARCHS= i386 amd64 aarch64
 
@@ -8,14 +8,12 @@ V=		2.6.3
 DISTNAME=	darktable-$V
 PORTROACH=	limitw:1,even skipv:release-$V
 EXTRACT_SUFX=	.tar.xz
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	graphics x11
 
 HOMEPAGE=	http://www.darktable.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv3+
 PERMIT_PACKAGE=	Yes
 
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index e53e84ce984..324707a2b9b 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.29 2019/06/03 16:06:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	extract digital camera info tags from JPEG images
 
 DISTNAME=	libexif-0.6.21
 SHARED_LIBS=	exif	13.1
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://libexif.sourceforge.net/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # LGPLv2.1
 PERMIT_PACKAGE=   Yes
 
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 3a0dd7a3f43..95c6e5c418e 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.17 2019/06/03 16:06:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT =		library for processing panoramic images
 DISTNAME =		libpano13-2.9.19
 # the following are useful for rc/betas and don't hurt otherwise:
 PKGNAME =		${DISTNAME:S/_//}
 WRKDIST =		${WRKDIR}/${DISTNAME:C/_.*//}
+REVISION =		0
 
 SHARED_LIBS +=		pano13               3.0
 
 CATEGORIES =		graphics
 HOMEPAGE =		http://panotools.sourceforge.net/
 
-MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
diff --git a/graphics/openjp2/Makefile b/graphics/openjp2/Makefile
index 1d552faddfb..b20a101a23f 100644
--- a/graphics/openjp2/Makefile
+++ b/graphics/openjp2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2020/01/03 16:29:25 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	open-source JPEG 2000 codec library
 
@@ -6,6 +6,7 @@ GH_ACCOUNT=	uclouvain
 GH_PROJECT=	openjpeg
 GH_TAGNAME=	v2.3.1
 DISTNAME=	openjp2-${GH_TAGNAME:S/v//}
+REVISION=	0
 
 SHARED_LIBS +=	openjp2                   3.1
 
@@ -13,8 +14,6 @@ CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.openjpeg.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index a72698db049..120a7e26a2a 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2019/06/03 16:06:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	open-source JPEG 2000 codec library
 
@@ -7,6 +7,7 @@ PORTROACH =	limit:^1
 DISTNAME=	openjpeg-version.$V
 PKGNAME=	openjpeg-$V
 DISTFILES=	${DISTNAME}{version.$V}.tar.gz
+REVISION=	0
 
 SHARED_LIBS +=	openjpeg             5.0      # 6.2
 
@@ -14,8 +15,6 @@ CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.openjpeg.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 0e6aa48f3a4..e1ed9fba8d4 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.50 2019/06/10 14:57:59 cwen Exp $
+# $OpenBSD: Makefile,v 1.51 2020/02/03 20:40:38 sthen Exp $
 
 COMMENT=	read and manipulate raw images from digital cameras
 
 DISTNAME=	ufraw-0.22
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ufraw/}
 HOMEPAGE=	http://ufraw.sourceforge.net/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index c6fbb77b4ac..21199c99556 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	RRDtool frontend for Postfix statistics
 
 DISTNAME=	mailgraph-1.14
-REVISION=	1
+REVISION=	2
 CATEGORIES=	net mail
 
 MASTER_SITES=	${HOMEPAGE}/pub/ \
@@ -11,8 +11,6 @@ MASTER_SITES=	${HOMEPAGE}/pub/ \
 
 HOMEPAGE=	http://mailgraph.schweikert.ch
 
-MAINTAINER=     Stuart Henderson <sthen@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE=	Yes
 
diff --git a/mail/p5-Email-Address-XS/Makefile b/mail/p5-Email-Address-XS/Makefile
index 52eb1fe6802..ecd2c0329f5 100644
--- a/mail/p5-Email-Address-XS/Makefile
+++ b/mail/p5-Email-Address-XS/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	parse and format RFC 5322 email addresses and groups
 
 MODULES=	cpan
 DISTNAME=	Email-Address-XS-1.04
 CATEGORIES=	mail
-
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+REVISION=	0
 
 # Perl
 PERMIT_PACKAGE=	Yes
diff --git a/mail/p5-Email-Address/Makefile b/mail/p5-Email-Address/Makefile
index 99de767db2b..d672a8e8e8c 100644
--- a/mail/p5-Email-Address/Makefile
+++ b/mail/p5-Email-Address/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	RFC 2822 address parsing and creation
 
@@ -6,8 +6,7 @@ MODULES=	cpan
 PKG_ARCH=	*
 DISTNAME=	Email-Address-1.912
 CATEGORIES=	mail
-
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+REVISION=	0
 
 # Perl
 PERMIT_PACKAGE=	Yes
diff --git a/mail/pear-Mail-Mime/Makefile b/mail/pear-Mail-Mime/Makefile
index e762adcf226..25b5d5c6bd9 100644
--- a/mail/pear-Mail-Mime/Makefile
+++ b/mail/pear-Mail-Mime/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2020/02/03 20:36:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	classes to create and decode MIME messages in PHP
 
 DISTNAME=	Mail_Mime-1.10.5
 CATEGORIES=	mail
-
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+REVISION=	0
 
 MODULES=	www/pear
 
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index b7445eef491..0207bd10430 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	milter for rspamd (also supports clamav, rate-limiting, etc)
 
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rmilter
 GH_TAGNAME=	1.10.0
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	mail
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/misc/wordnet/Makefile b/misc/wordnet/Makefile
index 5b092a8dda1..253ffc82b64 100644
--- a/misc/wordnet/Makefile
+++ b/misc/wordnet/Makefile
@@ -1,18 +1,16 @@
-# $OpenBSD: Makefile,v 1.18 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=		browser for a large lexical database of English
 
 DISTNAME=		WordNet-3.0
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} wn3.1.dict.tar.gz:0
 PKGNAME=		wordnet-3.1
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		misc
 
 HOMEPAGE=		http://wordnet.princeton.edu/
 
-MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index faaad17d051..ecabe0b3854 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	read and set MPEG-4/3GPP metadata tags
 
 V=		0.9.6
 DISTNAME=	atomicparsley-$V
-REVISION=	3
+REVISION=	4
 DISTFILES=	${DISTNAME}{$V}.tar.bz2
 WRKDIST=	${WRKDIR}/wez-atomicparsley-da2f6e4fc120
 
@@ -12,8 +12,6 @@ CATEGORIES=	multimedia
 
 HOMEPAGE=	https://bitbucket.org/wez/atomicparsley/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2 "or its successor"
 PERMIT_PACKAGE=	Yes
 
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index 39dd1c90fb8..5ef9946cf8b 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2019/06/03 16:06:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
 
@@ -9,12 +9,10 @@ V=		1.2.1
 DISTNAME=	minidlna-${V}-glebius
 PKGNAME=	minidlna-${V}
 
-REVISION=	5
+REVISION=	6
 
 CATEGORIES=	multimedia
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 HOMEPAGE=	http://sourceforge.net/projects/minidlna/
 
 # GPLv2 only
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index 411aae244a1..2d6e2ac54fa 100644
--- a/net/irrtoolset/Makefile
+++ b/net/irrtoolset/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.9 2019/06/03 16:06:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	toolset for internet routing registries
 
 V=		5.0.1
-REVISION=	4
+REVISION=	5
 DISTNAME=	irrtoolset-$V
 
 CATEGORIES=	net
 
 HOMEPAGE=	http://irrtoolset.isc.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/libbind/Makefile b/net/libbind/Makefile
index 517e52ca91e..2417bef768c 100644
--- a/net/libbind/Makefile
+++ b/net/libbind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2019/07/15 08:47:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	BIND stub resolver library for special use cases
 
@@ -13,7 +13,7 @@ COMMENT=	BIND stub resolver library for special use cases
 V=		6.0
 DISTNAME=	libbind-6.0
 EPOCH=		0
-REVISION=	5
+REVISION=	6
 
 SHARED_LIBS +=	bind                      6.0 # 6.1
 
@@ -21,8 +21,6 @@ CATEGORIES=	net
 
 HOMEPAGE=	http://www.isc.org/software/libbind
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # ISC
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/mac-telnet/Makefile b/net/mac-telnet/Makefile
index e39086c9662..2ce97c0ac7c 100644
--- a/net/mac-telnet/Makefile
+++ b/net/mac-telnet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/03 16:06:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	client for MikroTik's "L2 telnet" protocol#'
 
@@ -6,14 +6,12 @@ GH_ACCOUNT=	haakonnessjoen
 GH_PROJECT=	MAC-Telnet
 GH_TAGNAME=	v0.4.4
 PKGNAME=	${DISTNAME:L}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	net
 
 HOMEPAGE=	http://lunatic.no/2010/10/routeros-mac-telnet-application-for-linux-users/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/mirmon/Makefile b/net/mirmon/Makefile
index 3dd78e2bedc..1c694138b3f 100644
--- a/net/mirmon/Makefile
+++ b/net/mirmon/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.18 2019/06/03 16:06:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	monitors the status of mirrors
 
 DISTNAME=	mirmon-2.11
+REVISION=	0
 
 CATEGORIES=	net
 HOMEPAGE=	http://people.cs.uu.nl/henkp/mirmon/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # free license, see LICENSE
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 7c040e4ac57..89308a90312 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2019/08/21 15:23:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.70 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	network diagnostic tool, similar to ping and traceroute
 
@@ -6,11 +6,10 @@ GH_ACCOUNT=	traviscross
 GH_PROJECT=	mtr
 GH_TAGNAME=	v0.93
 EPOCH=		0
+REVISION=	0
 
 CATEGORIES=	net
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 HOMEPAGE=	https://www.bitwizard.nl/mtr/
 
 # GPLv2+
diff --git a/net/nagios/nsca-ng/Makefile b/net/nagios/nsca-ng/Makefile
index a09bf05ae67..e924eb06894 100644
--- a/net/nagios/nsca-ng/Makefile
+++ b/net/nagios/nsca-ng/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2019/06/03 16:06:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT-main=	server to accept passive check results for Nagios/Icinga
 COMMENT-client=	client to send passive check results to Nagios/Icinga
 
 V=		1.5
-REVISION=	3
+REVISION=	4
 DISTNAME=	nsca-ng-$V
 PKGNAME-main=	nsca-ng-$V
 PKGNAME-client=	nsca-ng-client-$V
@@ -12,8 +12,6 @@ CATEGORIES=	net
 
 HOMEPAGE=	https://www.nsca-ng.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/nagios/p5-Nagios-Plugin/Makefile b/net/nagios/p5-Nagios-Plugin/Makefile
index e7c3c39aa13..32748eab372 100644
--- a/net/nagios/p5-Nagios-Plugin/Makefile
+++ b/net/nagios/p5-Nagios-Plugin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/06/03 16:06:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	helper routines for writing monitoring plugins
 
@@ -7,8 +7,7 @@ DISTNAME=	Monitoring-Plugin-0.40
 CATEGORIES=	net
 MODULES=	cpan
 PKG_ARCH=	*
-
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+REVISION=	0
 
 HOMEPAGE=	https://github.com/monitoring-plugins/monitoring-plugin-perl
 
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 646667d92cb..c64707e4445 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2019/08/21 07:16:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT-main =		tools to collect and process netflow data
 COMMENT-nfprofile =	filters data from nfdump according to profiles
@@ -11,13 +11,13 @@ DISTFILES =		nfdump-$V-reroll.tar.gz
 RDVISION =		0
 FULLPKGNAME-main =	nfdump-$V
 FULLPKGNAME-nfprofile =	nfprofile-$V
+REVISION-main =		0
+REVISION-nfprofile =	0
 
 SHARED_LIBS +=	nfdump                    0.0 # 0.0
 
 CATEGORIES =		net
 
-MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE =	Yes
 
diff --git a/net/nfsen/Makefile b/net/nfsen/Makefile
index d02dec1ad1a..76d5fafdbec 100644
--- a/net/nfsen/Makefile
+++ b/net/nfsen/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.44 2019/09/26 21:59:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	web-based front end for the nfdump netflow tools
 
 V=		1.3.8
-REVISION=	5
+REVISION=	6
 DISTNAME=	nfsen-$V
 CATEGORIES=	net www
 HOMEPAGE=	http://nfsen.sourceforge.net/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/noVNC/Makefile b/net/noVNC/Makefile
index 8d36df21049..bf18eea298f 100644
--- a/net/noVNC/Makefile
+++ b/net/noVNC/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/03 16:06:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	VNC client using HTML5 (Web Sockets, Canvas)
 
@@ -6,13 +6,12 @@ DISTNAME=	noVNC-20160209
 GH_ACCOUNT=	kelleyk
 GH_PROJECT=	noVNC
 GH_COMMIT=	9ade40e815b15c7dcf732e24f6870cd0d88547c2
+REVISION=	0
 
 CATEGORIES=	net www
 
 HOMEPAGE=	http://novnc.com/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # core: MPL 2.0
 # (plus some others for included files)
 PERMIT_PACKAGE=	Yes
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 096cf88b389..1820496cae7 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.53 2019/09/12 14:16:18 bket Exp $
+# $OpenBSD: Makefile,v 1.54 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	client for Cisco AnyConnect SSL VPN
 
 DISTNAME=	openconnect-8.05
+REVISION=	0
 
 SHARED_LIBS +=  openconnect               4.4 # 5.5
 
@@ -10,8 +11,6 @@ CATEGORIES=	net
 
 HOMEPAGE=	https://www.infradead.org/openconnect/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # LGPLv2.1 only
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/pear-Net-SMTP/Makefile b/net/pear-Net-SMTP/Makefile
index 73a8b786797..915e720f263 100644
--- a/net/pear-Net-SMTP/Makefile
+++ b/net/pear-Net-SMTP/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.23 2019/12/02 11:23:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	SMTP support for PHP
 
 DISTNAME=	Net_SMTP-1.9.0
 CATEGORIES=	net
+REVISION=	0
 
 MODULES=	www/pear
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # PHP License
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/pear-Net-Sieve/Makefile b/net/pear-Net-Sieve/Makefile
index 67dbe9d3393..c0873752cfa 100644
--- a/net/pear-Net-Sieve/Makefile
+++ b/net/pear-Net-Sieve/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/03 16:06:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2020/02/03 20:40:39 sthen Exp $
 
 COMMENT=	pear class to talk to Sieve servers
 
 DISTNAME=	Net_Sieve-1.4.4
 CATEGORIES=	net
+REVISION=	0
 
 MODULES=	www/pear
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/php-weathermap/Makefile b/net/php-weathermap/Makefile
index b0c50ef91bf..44e5129528b 100644
--- a/net/php-weathermap/Makefile
+++ b/net/php-weathermap/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.21 2019/09/26 21:59:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	graphical network traffic map
 
 DISTNAME=	php-weathermap-0.97c
 EXTRACT_SUFX=	.zip
-REVISION=	5
+REVISION=	6
 
 CATEGORIES=	net www
 
 HOMEPAGE=	http://www.network-weathermap.com/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/radcli/Makefile b/net/radcli/Makefile
index a1cf6d443eb..c1920f28e76 100644
--- a/net/radcli/Makefile
+++ b/net/radcli/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/06/03 16:06:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	simple RADIUS client library
 
@@ -6,13 +6,12 @@ SHARED_LIBS +=	radcli               0.3      # 6.0
 
 V=		1.2.11
 DISTNAME=	radcli-$V
+REVISION=	0
 
 CATEGORIES=	net
 
 HOMEPAGE=	http://radcli.github.io/radcli/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # recent code BSD, some old MERIT/Livingston
 PERMIT_PACKAGE=	Yes
 
diff --git a/net/rtg/Makefile b/net/rtg/Makefile
index a82a491cfbb..27fd42d2cee 100644
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.18 2019/06/03 16:06:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT =		SNMP statistics monitoring system
 
 DISTNAME =		rtg-0.7.4
-REVISION =		13
+REVISION =		14
 CATEGORIES =		net
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=rtg/}
 
 HOMEPAGE =		http://rtg.sourceforge.net/
 
-MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index 08b15b68de9..e4349d99024 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2019/06/03 16:06:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT-gui =		enhanced TightVNC client GUI and wrappers
 COMMENT-main =		enhanced TightVNC client
@@ -10,15 +10,13 @@ PKGNAME =		ssvnc-$V
 EPOCH =			0
 FULLPKGNAME-gui =	ssvnc-$V
 FULLPKGNAME-main =	ssvnc-viewer-$V
-REVISION-gui =		3
-REVISION-main =		1
+REVISION-gui =		4
+REVISION-main =		2
 
 CATEGORIES =		net x11
 
 HOMEPAGE =		http://www.karlrunge.com/x11vnc/ssvnc.html
 
-MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2
 PERMIT_PACKAGE =	Yes
 
diff --git a/net/vpnc-scripts/Makefile b/net/vpnc-scripts/Makefile
index 2952d6c4a46..53594609664 100644
--- a/net/vpnc-scripts/Makefile
+++ b/net/vpnc-scripts/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/03 16:06:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	connect scripts for use with vpnc and openconnect
 
 PKGNAME=	vpnc-scripts-20140401
 DISTNAME=	a78b3ddfc56ab457104c88e94dca72d8738f4fad
-REVISION=	0
+REVISION=	1
 
 DISTFILES=	${PKGNAME}{${DISTNAME}}${EXTRACT_SUFX}
 
@@ -12,8 +12,6 @@ CATEGORIES=	net
 
 HOMEPAGE=	http://www.infradead.org/openconnect/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index ee955331b64..67d3321c84d 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.60 2019/06/03 16:06:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	SLang-based newsreader
 
 DISTNAME=	slrn-1.0.2
-REVISION=	2
+REVISION=	3
 CATEGORIES=	news
 
 HOMEPAGE=	http://slrn.sourceforge.net/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile
index 4746877160c..d3fb8bd9a29 100644
--- a/security/acme-client/Makefile
+++ b/security/acme-client/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2020/01/25 12:22:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	privilege-separated letsencrypt client
 
 DISTNAME=	acme-client-0.1.16
-REVISION=	1
+REVISION=	2
 EXTRACT_SUFX=	.tgz
 
 CATEGORIES=	security security/letsencrypt
@@ -11,8 +11,6 @@ CATEGORIES=	security security/letsencrypt
 HOMEPAGE =	https://kristaps.bsd.lv/acme-client/
 MASTER_SITES=	${HOMEPAGE}snapshots/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # ISC
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/letsencrypt/acme-tiny/Makefile b/security/letsencrypt/acme-tiny/Makefile
index 59f80f27c15..f1228ac4d0e 100644
--- a/security/letsencrypt/acme-tiny/Makefile
+++ b/security/letsencrypt/acme-tiny/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/06/03 16:06:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	small 3rd-party letsencrypt client
 
@@ -6,12 +6,10 @@ GH_ACCOUNT=	diafygi
 GH_PROJECT=	acme-tiny
 GH_TAGNAME=	4.0.4
 EPOCH=		0
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://github.com/diafygi/acme-tiny
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # MIT
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/letsencrypt/client/Makefile b/security/letsencrypt/client/Makefile
index 298025a080f..767f278092b 100644
--- a/security/letsencrypt/client/Makefile
+++ b/security/letsencrypt/client/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2019/12/05 17:16:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	client for certificate authorities using ACME protocols
 
 HOMEPAGE=	https://certbot.eff.org/
 
 DISTNAME=	certbot-${MODPY_EGG_VERSION}
+REVISION=	0
 
 RUN_DEPENDS=	devel/py-configargparse${MODPY_FLAVOR} \
 		devel/py-configobj${MODPY_FLAVOR} \
diff --git a/security/letsencrypt/py-acme/Makefile b/security/letsencrypt/py-acme/Makefile
index 004ca3610b6..7ed0d53cc1e 100644
--- a/security/letsencrypt/py-acme/Makefile
+++ b/security/letsencrypt/py-acme/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2019/12/05 22:19:28 kmos Exp $
+# $OpenBSD: Makefile,v 1.21 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	ACME protocol implementation
 
@@ -6,6 +6,7 @@ HOMEPAGE=	https://certbot.eff.org/
 
 DISTNAME=	acme-${MODPY_EGG_VERSION}
 PKGNAME=	${MODPY_PY_PREFIX}${DISTNAME:S/.dev/pre/}
+REVISION=	0
 
 FLAVORS=	python3
 FLAVOR?=
diff --git a/security/libsrtp/Makefile b/security/libsrtp/Makefile
index 1ac5c9302d0..26ec8c02d40 100644
--- a/security/libsrtp/Makefile
+++ b/security/libsrtp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/12/24 15:34:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/02/03 20:40:40 sthen Exp $
 
 SHARED_LIBS +=  srtp2                     1.0 # 0.0
 
@@ -7,11 +7,10 @@ COMMENT=	secure RTP library
 GH_ACCOUNT=	cisco
 GH_PROJECT=	libsrtp
 GH_TAGNAME=	v2.3.0
+REVISION=	0
 
 CATEGORIES=	security telephony
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index a9f164bf9fb..16c5b87428a 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/07/16 21:29:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT-main=	toolkit for OATH/HOTP and TOTP
 COMMENT-pskc=	toolkit for RFC 6030 Portable Symmetric Key Container
@@ -7,8 +7,8 @@ V=		2.6.2
 DISTNAME=	oath-toolkit-$V
 PKGNAME-main=	oath-toolkit-$V
 PKGNAME-pskc=	oath-toolkit-pskc-$V
-REVISION-main=	1
-REVISION-pskc=	1
+REVISION-main=	2
+REVISION-pskc=	2
 
 SHARED_LIBS +=  oath                      0.2 # 1.3
 SHARED_LIBS +=  pskc                      0.1 # 0.1
@@ -18,8 +18,6 @@ CATEGORIES=	security devel
 HOMEPAGE=	http://www.nongnu.org/oath-toolkit/
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:=oath-toolkit/}
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # libraries: LGPLv2.1+, tools: GPLv3+
 PERMIT_PACKAGE=	 Yes
 
diff --git a/security/openssl/1.0.2/Makefile b/security/openssl/1.0.2/Makefile
index 02324689aec..a3d4fc6e0be 100644
--- a/security/openssl/1.0.2/Makefile
+++ b/security/openssl/1.0.2/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2019/12/20 17:11:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2020/02/03 20:40:40 sthen Exp $
 
 PORTROACH=	limit:^1\.0\.
 V=		1.0.2u
+REVISION=	0
 
 SHLIBVER=	6.2
 SHARED_LIBS=	crypto ${SHLIBVER} \
diff --git a/security/openssl/1.1/Makefile b/security/openssl/1.1/Makefile
index dc91e30212c..299541a9f3f 100644
--- a/security/openssl/1.1/Makefile
+++ b/security/openssl/1.1/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2019/12/05 16:24:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/02/03 20:40:40 sthen Exp $
 
 PORTROACH=	limit:^1\.1\.[0-9][a-z] skipb:0 skipv:1.1.1
 V=		1.1.1d
-REVISION=	0
+REVISION=	1
 
 SHLIBVER=	11.4
 SHARED_LIBS=	crypto ${SHLIBVER} \
diff --git a/security/p5-Chipcard-PCSC/Makefile b/security/p5-Chipcard-PCSC/Makefile
index b100eccf1d6..7b69a5e4796 100644
--- a/security/p5-Chipcard-PCSC/Makefile
+++ b/security/p5-Chipcard-PCSC/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/06/03 16:06:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	perl interface to PC/SC smartcards
 
@@ -6,12 +6,10 @@ V=		1.4.14
 DISTNAME=	pcsc-perl-$V
 PKGNAME=	p5-Chipcard-PCSC-$V
 EXTRACT_SUFX=	.tar.bz2
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	security
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 5f0639cee21..508fa3b558f 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.6 2019/06/03 16:06:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	tools for use with PC/SC drivers, cards, readers
 
 DISTNAME=	pcsc-tools-1.4.27
+REVISION=	0
 
 CATEGORIES=	security sysutils
 
 HOMEPAGE=	http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/pecl-mcrypt/Makefile b/security/pecl-mcrypt/Makefile
index 844483351f4..8a1191ff456 100644
--- a/security/pecl-mcrypt/Makefile
+++ b/security/pecl-mcrypt/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2019/09/26 09:54:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT =	PHP bindings for the libmcrypt library
 
 DISTNAME =	mcrypt-1.0.3
 DIST_SUBDIR =	pecl
+REVISION =	0
 
 CATEGORIES =	security
 
-MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
-
 # PHP
 PERMIT_PACKAGE =	Yes
 
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index ca6f98efe4b..e6d09e30f96 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2019/06/20 14:05:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	bcrypt blowfish password hashing for Python
 
 MODPY_EGG_VERSION= 3.1.7
 DISTNAME=	bcrypt-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}
-
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+REVISION=	0
 
 CATEGORIES=	security
 
diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile
index 6528f08cf0f..ef1eeef440d 100644
--- a/security/py-josepy/Makefile
+++ b/security/py-josepy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2020/01/29 14:59:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	Javascript Object Signing and Encryption (JOSE)
 
@@ -7,6 +7,7 @@ CATEGORIES=	security devel
 MODPY_EGG_VERSION= 1.3.0
 DISTNAME=	josepy-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}
+REVISION=	0
 
 FLAVORS=	python3
 FLAVOR?=
@@ -14,8 +15,6 @@ FLAVOR?=
 # Apache 2.0
 PERMIT_PACKAGE= Yes
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 MODULES=	lang/python
 MODPY_PI=	Yes
 MODPY_SETUPTOOLS= Yes
diff --git a/security/sslsplit/Makefile b/security/sslsplit/Makefile
index 229776fbefd..b778cb75801 100644
--- a/security/sslsplit/Makefile
+++ b/security/sslsplit/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.17 2019/08/31 14:01:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2020/02/03 20:40:40 sthen Exp $
 
 COMMENT=	transparent and scalable SSL/TLS interception
 
 DISTNAME=	sslsplit-0.5.5
 EXTRACT_SUFX=	.tar.bz2
+REVISION=	0
 
 CATEGORIES=	security
 
 HOMEPAGE=	https://www.roe.ch/SSLsplit
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # SSLsplit: BSD, khash.h (header-based library): MIT
 PERMIT_PACKAGE=	Yes
 
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 89af45ce99d..89562e4f7ba 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.142 2019/09/09 11:10:10 robert Exp $
+# $OpenBSD: Makefile,v 1.143 2020/02/03 20:40:40 sthen Exp $
 
 # XXX building this port while a version is already installed on the
 # system will lead to unexpected hidden dependencies!!!
@@ -18,8 +18,13 @@ PKGNAME-bat=		bacula-bat-$V
 PKGNAME-mysql=		bacula-mysql-$V
 PKGNAME-pgsql=		bacula-pgsql-$V
 PKGNAME-sqlite3=	bacula-sqlite3-$V
+REVISION-bat=		0
+REVISION-main=		0
+REVISION-mysql=		0
+REVISION-pgsql=		0
+REVISION-sqlite3=	0
 
-REVISION-server=	1
+REVISION-server=	2
 
 CATEGORIES=		sysutils
 
@@ -38,10 +43,7 @@ SHARED_LIBS +=  baccats-sqlite3      ${BACCATS_LIBV}
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 HOMEPAGE=		http://www.bacula.org/
 
-MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
-
 WANTLIB += c crypto iconv intl m pthread ssl z ${COMPILER_LIBCXX}
-
 COMPILER =		base-clang ports-gcc base-gcc
 
 # AGPLv3 with exception for OpenSSL (majority),
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 34a7c9d421a..24d23451428 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.103 2019/06/03 16:06:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.104 2020/02/03 20:40:41 sthen Exp $
 
 COMMENT-main=	UPS monitoring program supporting many brands
 COMMENT-cgi=	CGIs for monitoring Nut-based UPSs
@@ -12,10 +12,10 @@ PKGNAME-cgi=	${DISTNAME:S/-/-cgi-/}
 PKGNAME-snmp=	${DISTNAME:S/-/-snmp-/}
 PKGNAME-xml=	${DISTNAME:S/-/-xml-/}
 
-REVISION-main=	6
-REVISION-snmp=	2
-REVISION-xml=	3
-REVISION-cgi=	3
+REVISION-main=	7
+REVISION-snmp=	3
+REVISION-xml=	4
+REVISION-cgi=	4
 
 SHARED_LIBS +=	upsclient            4.0      # .4.0
 SHARED_LIBS +=	nutclient            0.0      # .0.0
@@ -24,8 +24,6 @@ SHARED_LIBS +=	nutscan              2.0      # .1.0
 CATEGORIES=	sysutils
 HOMEPAGE=	http://www.networkupstools.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+, some scripts (not packaged) are GPLv3+
 PERMIT_PACKAGE=	Yes
 
diff --git a/sysutils/od1000_firmware/Makefile b/sysutils/od1000_firmware/Makefile
index 363eb7708fb..3e914ac1415 100644
--- a/sysutils/od1000_firmware/Makefile
+++ b/sysutils/od1000_firmware/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/03 16:06:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2020/02/03 20:40:41 sthen Exp $
 
 COMMENT=	firmware and flash tool for SOFTIRON OverDrive 1000
 
 DISTNAME=	overdrive_1000_firmware-1.02-2017-01-19
 PKGNAME=	od1000_firmware-1.02.20170119
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	sysutils
 
 HOMEPAGE=	https://support.softiron.com/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # tools: BSD
 # UEFI firmware (Tianocore EDK2, Linaro OpenPlatformPkg): BSD
 # PIC32 firmware: unknown - @comment'ed in PLIST for now.
diff --git a/textproc/pecl-yaml/Makefile b/textproc/pecl-yaml/Makefile
index d9c4eae584d..3f675da4a51 100644
--- a/textproc/pecl-yaml/Makefile
+++ b/textproc/pecl-yaml/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/03 16:06:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2020/02/03 20:40:41 sthen Exp $
 
 COMMENT =	YAML-1.1 parser and emitter for PHP
 
 DISTNAME =	yaml-2.0.4
 DIST_SUBDIR =	pecl
+REVISION =	0
 
 CATEGORIES =	textproc
 
-MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
-
 # PHP
 PERMIT_PACKAGE =	Yes
 
diff --git a/textproc/podofo/Makefile b/textproc/podofo/Makefile
index 3f67a96b08b..6c6ec7e6f4c 100644
--- a/textproc/podofo/Makefile
+++ b/textproc/podofo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2019/12/14 20:17:14 bket Exp $
+# $OpenBSD: Makefile,v 1.13 2020/02/03 20:40:41 sthen Exp $
 
 COMMENT=	library and tools to modify and parse PDF documents
 
 DISTNAME=	podofo-0.9.5
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS +=	podofo                    2.0 # 0.9
 
@@ -11,8 +11,6 @@ CATEGORIES=	textproc
 
 HOMEPAGE=	http://podofo.sourceforge.net/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv2+ (tools) LGPLv2+ (lib)
 PERMIT_PACKAGE=	Yes
 
diff --git a/textproc/pugixml/Makefile b/textproc/pugixml/Makefile
index 0d12e5c6a78..c3dcc4fd8a8 100644
--- a/textproc/pugixml/Makefile
+++ b/textproc/pugixml/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2019/06/03 16:06:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/02/03 20:40:41 sthen Exp $
 
 COMMENT=	light-weight, simple and fast XML parser for C++
 
 V=		1.9
 DISTNAME=	pugixml-$V
+REVISION=	0
 
 SHARED_LIBS +=	pugixml                   1.0 # 1.9
 
@@ -11,8 +12,6 @@ CATEGORIES=	textproc devel
 
 HOMEPAGE=	https://pugixml.org/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # MIT
 PERMIT_PACKAGE=	Yes
 
diff --git a/www/squidclamav/Makefile b/www/squidclamav/Makefile
index d83d0498e53..d8416e2783a 100644
--- a/www/squidclamav/Makefile
+++ b/www/squidclamav/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.18 2019/06/03 16:06:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2020/02/03 20:40:41 sthen Exp $
 
 COMMENT=	clamd-based virus scanner for c-icap
 
 DISTNAME=	squidclamav-6.16
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	www
 
 HOMEPAGE=	http://squidclamav.darold.net/
 
-MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
-
 # GPLv3+
 PERMIT_PACKAGE=	Yes