Bump all elisp packages for the CONFLICTS change.

90 files changed, 180 insertions, 158 deletions

diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile
index d48d1cd61b9..09d2defea05 100644
--- a/cad/dinotrace-mode/Makefile
+++ b/cad/dinotrace-mode/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2020/10/06 04:01:57 mef Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:32 dholland Exp $
 #
 
 VERSION=	9.4f
 DISTNAME=	dinotrace-${VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}dinotrace-mode-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	cad editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=veripool/}
 GITHUB_PROJECT=	dinotrace
diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
index 005df3821f9..bf1da56e182 100644
--- a/cad/verilog-mode/Makefile
+++ b/cad/verilog-mode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2020/01/26 17:30:48 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/14 22:25:32 dholland Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		cad editors
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 # The latest can be fetched interactively from
diff --git a/chat/emacs-jabber/Makefile b/chat/emacs-jabber/Makefile
index b1b2eb99eb6..a19faea4b41 100644
--- a/chat/emacs-jabber/Makefile
+++ b/chat/emacs-jabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 05:26:16 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/14 22:25:32 dholland Exp $
 
 DISTNAME=		emacs-jabber-0.8.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=emacs-jabber/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile
index b0dac8372f7..90b9b0750d5 100644
--- a/chat/irchat-pj/Makefile
+++ b/chat/irchat-pj/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2019/11/02 22:18:23 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/14 22:25:32 dholland Exp $
 
 DISTNAME=	irchat-pj-2.4.24.22
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	http://his.luky.org/ftp/mirrors/irchat-pj/
 #MASTER_SITES+=	http://gouketsu.net/irchat-pj/src/
diff --git a/chat/riece/Makefile b/chat/riece/Makefile
index 311005ef554..627e5e27e9e 100644
--- a/chat/riece/Makefile
+++ b/chat/riece/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2020/01/18 23:30:12 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2022/05/14 22:25:33 dholland Exp $
 #
 
 DISTNAME=	riece-9.0.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	chat japanese
 MASTER_SITES=	http://download.savannah.gnu.org/releases/riece/
 LICENSE=	gnu-gpl-v3
diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile
index c72ac4ce43b..28be90e916f 100644
--- a/chat/zenicb/Makefile
+++ b/chat/zenicb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/02/17 19:17:56 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/14 22:25:33 dholland Exp $
 
 DISTNAME=		zenicb-19981202
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile
index eb97e6bcdcd..bc7d78dad21 100644
--- a/chat/zenirc/Makefile
+++ b/chat/zenirc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2019/11/02 22:18:26 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/14 22:25:33 dholland Exp $
 #
 
 DISTNAME=	zenirc-2.112
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.splode.com/pub/zenirc/
 
diff --git a/devel/apel/Makefile b/devel/apel/Makefile
index 5fb82208d15..ec5ba93012e 100644
--- a/devel/apel/Makefile
+++ b/devel/apel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2022/01/31 00:17:58 mef Exp $
+# $NetBSD: Makefile,v 1.39 2022/05/14 22:25:33 dholland Exp $
 
 DISTNAME=	apel-10.8.0.20201107
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=wanderlust/}
 GITHUB_PROJECT=	apel
diff --git a/devel/cflow-mode/Makefile b/devel/cflow-mode/Makefile
index 75f52b35012..cd99a70acb4 100644
--- a/devel/cflow-mode/Makefile
+++ b/devel/cflow-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2020/01/18 23:30:24 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/14 22:25:33 dholland Exp $
 
 DISTNAME=	cflow-1.6
 PKGNAME=	cflow-mode-1.6
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=cflow/}
 
diff --git a/devel/cmake-mode/Makefile b/devel/cmake-mode/Makefile
index 68c9fb0eef8..8233bf41290 100644
--- a/devel/cmake-mode/Makefile
+++ b/devel/cmake-mode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2013/02/17 19:17:57 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/14 22:25:33 dholland Exp $
 #
 
 DISTNAME=	cmake-mode
 PKGNAME=	cmake-mode-20080606
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/CMakeDocs/
 EXTRACT_SUFX=	.el
diff --git a/devel/cobol-mode/Makefile b/devel/cobol-mode/Makefile
index 7c5bd9c0a86..cbbe0e7b04a 100644
--- a/devel/cobol-mode/Makefile
+++ b/devel/cobol-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2017/08/01 14:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/14 22:25:35 dholland Exp $
 
 DISTNAME=	cobol-mode.el
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}-0.0.20150505
+PKGREVISION=	1
 CATEGORIES=	devel editors
 MASTER_SITES=	http://www.emacswiki.org/emacs/download/
 EXTRACT_SUFX=	# empty
diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile
index dd86bae2613..a62713f45f7 100644
--- a/devel/cqual/Makefile
+++ b/devel/cqual/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2021/05/24 19:49:54 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/05/14 22:25:33 dholland Exp $
 
 DISTNAME=		cqual-0.991
-PKGREVISION=		19
+PKGREVISION=		20
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cqual/}
 
diff --git a/devel/doxymacs/Makefile b/devel/doxymacs/Makefile
index 0671c377253..01624bbb5b9 100644
--- a/devel/doxymacs/Makefile
+++ b/devel/doxymacs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2022/04/18 19:10:49 adam Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/14 22:25:33 dholland Exp $
 #
 
 DISTNAME=	doxymacs-1.8.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=doxymacs/}
 
diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index 1e8a246bf6e..e19f2580a44 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2020/04/04 03:44:57 mef Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/14 22:25:35 dholland Exp $
 
 DISTNAME=	ecb-2.50
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ecb-home/}
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 08c42b5894b..348a6f73258 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2013/02/17 19:17:58 dholland Exp $
+# $NetBSD: Makefile,v 1.21 2022/05/14 22:25:33 dholland Exp $
 #
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 
 CONFLICTS+=	emacs20-elib-[0-9]*
 
diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index 64c1d2c4fcc..640a02cdf67 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2020/04/13 19:11:31 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/14 22:25:34 dholland Exp $
 #
 
 DISTNAME=	ilisp-20021222
 PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ilisp/}
 
diff --git a/devel/emacs20-elib/Makefile b/devel/emacs20-elib/Makefile
index f7fcc50c63d..ce582afdde0 100644
--- a/devel/emacs20-elib/Makefile
+++ b/devel/emacs20-elib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/02/17 19:17:58 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/14 22:25:34 dholland Exp $
 
 PKGNAME=	emacs20-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 
 EMACS_VERSIONS_ACCEPTED=	emacs20
 
diff --git a/devel/flim/Makefile b/devel/flim/Makefile
index 49aa60fc381..aa967837276 100644
--- a/devel/flim/Makefile
+++ b/devel/flim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2021/05/11 02:05:07 mef Exp $
+# $NetBSD: Makefile,v 1.42 2022/05/14 22:25:34 dholland Exp $
 
 DISTNAME=	flim-1.14.9
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/flim/flim-1.14/
 
diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile
index b1632236c27..e3244a2bbed 100644
--- a/devel/haskell-mode/Makefile
+++ b/devel/haskell-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2018/01/07 21:17:50 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/14 22:25:34 dholland Exp $
 
 DISTNAME=		haskell-mode-1.44
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel editors
 MASTER_SITES=		http://www.haskell.org/haskell-mode/
 
diff --git a/devel/js2-mode/Makefile b/devel/js2-mode/Makefile
index a935d9026d4..3bdd43692ca 100644
--- a/devel/js2-mode/Makefile
+++ b/devel/js2-mode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2018/09/13 12:56:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/14 22:25:34 dholland Exp $
 
 DISTNAME=	js2-20080406
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://js2-mode.googlecode.com/files/
 EXTRACT_SUFX=	.el
diff --git a/devel/lua-mode/Makefile b/devel/lua-mode/Makefile
index eace25e8306..77b5f3b655f 100644
--- a/devel/lua-mode/Makefile
+++ b/devel/lua-mode/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2022/04/14 10:21:21 nikita Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/14 22:25:35 dholland Exp $
 
 DISTNAME=	v${VERSION}
 VERSION=	20210802
 PKGNAME=	${EMACS_PKGNAME_PREFIX}lua-mode-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel lua
 MASTER_SITES=	https://github.com/immerrr/lua-mode/archive/
 
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index cbc0a057531..20a8c859efa 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2017/09/03 08:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/05/14 22:25:35 dholland Exp $
 
 DISTNAME=	magit-1.2.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/magit/magit/downloads/
 
diff --git a/devel/mell/Makefile b/devel/mell/Makefile
index e6c239aa1ec..554973b5593 100644
--- a/devel/mell/Makefile
+++ b/devel/mell/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2017/09/03 08:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/14 22:25:34 dholland Exp $
 #
 
 DISTNAME=	mell-1.0.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 #MASTER_SITES=	http://taiyaki.org/elisp/mell/src/
 
diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index 6ab1c60db6c..a57c8d00274 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2013/04/06 20:27:19 rodent Exp $
+# $NetBSD: Makefile,v 1.28 2022/05/14 22:25:34 dholland Exp $
 #
 
 DISTNAME=	pcl-cvs-2.9.9
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel scm
 MASTER_SITES=	# ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/
 
diff --git a/devel/php-mode/Makefile b/devel/php-mode/Makefile
index 4524dc55782..864a40204d2 100644
--- a/devel/php-mode/Makefile
+++ b/devel/php-mode/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2017/09/03 08:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/14 22:25:35 dholland Exp $
 #
 
 DISTNAME=	php-mode-1.13.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=php-mode/}
 EXTRACT_SUFX=	.zip
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index c440030bdc4..e5876c5fb6c 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2021/11/15 17:32:45 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2022/05/14 22:25:34 dholland Exp $
 #
 # This package is very outdated and should be built from sources
 # rather than using Linux binaries.
@@ -7,7 +7,7 @@
 
 DISTNAME=		pvs-${VERSION}
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel lang
 MASTER_SITES+=		http://ftp.lip6.fr/pub/pvs/pvs3.2/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/rainbow-delimiters-el/Makefile b/devel/rainbow-delimiters-el/Makefile
index 4e4859d6b61..8c5169d1c39 100644
--- a/devel/rainbow-delimiters-el/Makefile
+++ b/devel/rainbow-delimiters-el/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:29 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/14 22:25:36 dholland Exp $
 
 DISTNAME=	rainbow-delimiters-1.3.5
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Fanael/}
 
diff --git a/devel/rsltc/Makefile b/devel/rsltc/Makefile
index 9d3ce664a05..ac7030b10af 100644
--- a/devel/rsltc/Makefile
+++ b/devel/rsltc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2017/09/04 18:00:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/14 22:25:34 dholland Exp $
 #
 
 DISTNAME=		rsltcsrc
 PKGNAME=		rsltc-2.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		http://www.iist.unu.edu/newrh/III/3/1/docs/rsltc/source/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/ruby-rd-mode/Makefile b/devel/ruby-rd-mode/Makefile
index 3599d788228..790ce6646bf 100644
--- a/devel/ruby-rd-mode/Makefile
+++ b/devel/ruby-rd-mode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2017/09/04 18:00:53 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/05/14 22:25:35 dholland Exp $
 #
 
 DISTNAME=	rdtool-${RUBY_RD_VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-rd-mode-${RUBY_RD_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel ruby
 MASTER_SITES=	# http://rubyforge.org/frs/download.php/33346/
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 3e43dd6de70..fc558fb3bec 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2020/03/20 11:57:33 nia Exp $
+# $NetBSD: Makefile,v 1.36 2022/05/14 22:25:35 dholland Exp $
 
 DISTNAME=	semantic-1.4.4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
diff --git a/devel/semi/Makefile b/devel/semi/Makefile
index d9a950caa4e..31daed21f9e 100644
--- a/devel/semi/Makefile
+++ b/devel/semi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2019/11/03 10:39:30 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2022/05/14 22:25:35 dholland Exp $
 #
 
 DISTNAME=	semi-1.14.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/semi/semi-1.14-for-flim-1.14/
 
diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile
index 82a11fac9ba..216e19babf3 100644
--- a/devel/sml-mode/Makefile
+++ b/devel/sml-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2021/04/21 08:24:51 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/14 22:25:35 dholland Exp $
 
 DISTNAME=	sml-mode-3.9.5
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel editors
 MASTER_SITES=	# ftp://flint.cs.yale.edu/pub/monnier/sml-mode/
 
diff --git a/devel/zig-mode/Makefile b/devel/zig-mode/Makefile
index c181bc4a404..6786ff5e7e6 100644
--- a/devel/zig-mode/Makefile
+++ b/devel/zig-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2022/04/14 13:51:45 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:36 dholland Exp $
 
 DISTNAME=	zig-mode-0.0.20220105
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ziglang/}
 GITHUB_TAG=	aa20d630b8c413dab8d6bd120ec3ed5db5c9da70
diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile
index 0199af3f834..ad66b8501ea 100644
--- a/editors/emacs-packages/Makefile
+++ b/editors/emacs-packages/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2022/02/15 23:20:18 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/05/14 22:25:36 dholland Exp $
 
 DISTNAME=	emacs-packages-0.12
+PKGREVISION=	1
 CATEGORIES=	editors meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 1e31953b526..128022056e2 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/03/08 11:20:56 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/14 22:25:36 dholland Exp $
 
 DISTNAME=	gnuserv-3.12.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 #MASTER_SITES=	${HOMEPAGE}/src/
 
diff --git a/editors/javascript-mode/Makefile b/editors/javascript-mode/Makefile
index bd233794db4..456cde8a349 100644
--- a/editors/javascript-mode/Makefile
+++ b/editors/javascript-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/08/16 20:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/14 22:25:37 dholland Exp $
 
 DISTNAME=	javascript-2.2.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-/-mode-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel editors
 MASTER_SITES=	#
 DISTFILES=	#
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index e44748c321f..c5a5164d841 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2019/06/08 10:40:55 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2022/05/14 22:25:36 dholland Exp $
 #
 
 DISTNAME=	jde-2.3.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "real" site has silly naming conventions:
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 7ee2ec55421..ba1925a7d1f 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2020/01/18 23:30:46 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/14 22:25:36 dholland Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}a${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index 03190f4c957..0e6d202ef45 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/02/17 19:18:02 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:36 dholland Exp $
 #
 
 DISTNAME=		matlab.el
@@ -6,7 +6,7 @@ DISTNAME=		matlab.el
 # emacs vs xemacs
 BASEPKGNAME=		matlab-mode-2.3.1
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${BASEPKGNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		editors math
 MASTER_SITES=		http://www.mathworks.com/matlabcentral/files/104/
 EXTRACT_SUFX=
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 93a0d093ef7..4efcd875195 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2019/06/08 10:40:56 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/14 22:25:36 dholland Exp $
 
 DISTNAME=	Mule-UCS-0.84
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/mule/Mule-UCS/
 
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 1a05cb7b2d0..1e9fe59450e 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2020/03/20 11:57:35 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/05/14 22:25:36 dholland Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index d87b1bda133..ec1ce4fa0ea 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2019/06/08 10:40:58 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2022/05/14 22:25:37 dholland Exp $
 
 DISTNAME=	tamago-4.0.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}tamago-20020909
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/tamago/
 
diff --git a/graphics/artist/Makefile b/graphics/artist/Makefile
index 78255a7e7f8..da6d85be4c6 100644
--- a/graphics/artist/Makefile
+++ b/graphics/artist/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/01/26 17:31:20 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:37 dholland Exp $
 
 DISTNAME=	artist-1.2.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lysator.liu.se/~tab/artist/
 
diff --git a/graphics/graphviz-dot-mode/Makefile b/graphics/graphviz-dot-mode/Makefile
index 13573645620..d511f06db7c 100644
--- a/graphics/graphviz-dot-mode/Makefile
+++ b/graphics/graphviz-dot-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/02/17 19:18:03 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/14 22:25:37 dholland Exp $
 
 DISTNAME=	graphviz-dot-mode
 PKGNAME=	${DISTNAME}-0.3.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://users.skynet.be/ppareit/projects/graphviz-dot-mode/
 EXTRACT_SUFX=	.el
diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile
index da611e0e138..9a9ffc4da4e 100644
--- a/inputmethod/anthy-elisp/Makefile
+++ b/inputmethod/anthy-elisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2013/02/17 19:18:03 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/14 22:25:37 dholland Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 PKGNAME=	${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	inputmethod editors
 
 MAINTAINER=	taya@NetBSD.org
diff --git a/inputmethod/iiimecf/Makefile b/inputmethod/iiimecf/Makefile
index b4e94b16f24..63fa098d309 100644
--- a/inputmethod/iiimecf/Makefile
+++ b/inputmethod/iiimecf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2019/11/02 22:56:54 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/14 22:25:37 dholland Exp $
 #
 
 DISTNAME=	IIIMECF-0.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}iiimecf-0.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/mule/IIIM/
 
diff --git a/inputmethod/mozc-elisp/Makefile b/inputmethod/mozc-elisp/Makefile
index 219a7012acb..d3de6b0707b 100644
--- a/inputmethod/mozc-elisp/Makefile
+++ b/inputmethod/mozc-elisp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2022/04/24 22:19:15 tnn Exp $
+# $NetBSD: Makefile,v 1.65 2022/05/14 22:25:38 dholland Exp $
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	inputmethod editors
 
 EMACS_MODULES=	base leim
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index 402b9f364c0..fa5faa139fa 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2020/09/06 03:03:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2022/05/14 22:25:37 dholland Exp $
 
 DISTNAME=	ddskk-ddskk-17.1_Neppu
 PKGNAME=	${EMACS_PKGNAME_PREFIX}skk-17.1
+PKGREVISION=	1
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	${MASTER_SITE_GITHUB:=skk-dev/}
 GITHUB_PROJECT=	ddskk
diff --git a/inputmethod/tamago-tsunagi/Makefile b/inputmethod/tamago-tsunagi/Makefile
index b8cca66c3c4..a016744e2f2 100644
--- a/inputmethod/tamago-tsunagi/Makefile
+++ b/inputmethod/tamago-tsunagi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2017/12/09 03:28:49 taca Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	tamago-tsunagi-5.0.7.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_OSDN:=tamago-tsunagi/62701/}
 
diff --git a/inputmethod/tc/Makefile b/inputmethod/tc/Makefile
index 4cb66bc4413..9d32e27a247 100644
--- a/inputmethod/tc/Makefile
+++ b/inputmethod/tc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2019/11/02 22:56:55 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/14 22:25:37 dholland Exp $
 #
 
 DISTNAME=	tc-2.3.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/tcode/resources/soft/
 
diff --git a/inputmethod/uim-elisp/Makefile b/inputmethod/uim-elisp/Makefile
index e71567887e9..3e545bd47ec 100644
--- a/inputmethod/uim-elisp/Makefile
+++ b/inputmethod/uim-elisp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2019/11/29 03:19:55 nia Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:37 dholland Exp $
 
 .include		"../../inputmethod/uim/Makefile.common"
 PKGNAME=		${EMACS_PKGNAME_PREFIX}uim-elisp-${DISTNAME:S/^uim-//1}
+PKGREVISION=		1
 CATEGORIES=		inputmethod editors
 
 COMMENT=		Emacs LISP for inputmethod/uim
diff --git a/lang/ats2/Makefile b/lang/ats2/Makefile
index adc25c78a04..43e06cb4c0b 100644
--- a/lang/ats2/Makefile
+++ b/lang/ats2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/04/14 20:13:19 nikita Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	ATS2-Postiats-0.4.2
 PKGNAME=	${DISTNAME:S/ATS2-Postiats/ats2/}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ats2-lang/}
 EXTRACT_SUFX=	.tgz
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index e47c4be70c6..3dff522e412 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2020/03/20 11:57:55 nia Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	eieio-0.17
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	lang editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
diff --git a/mail/etach/Makefile b/mail/etach/Makefile
index e629031a558..a8a89f99816 100644
--- a/mail/etach/Makefile
+++ b/mail/etach/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2017/09/03 08:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=		etach-1.2.9
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 #MASTER_SITES=		https://rulnick.com/etach/download/
 
diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
index cbb8be4d05a..42c4a9727d4 100644
--- a/mail/gnus/Makefile
+++ b/mail/gnus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2020/01/26 17:31:34 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	gnus-5.10.10
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	mail news
 MASTER_SITES=	http://gnus.org/dist/
 
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 93bc411e4d1..4e8a7c12ef6 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2018/09/13 14:16:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	mailcrypt-3.5.9
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
 
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 46f7ca7210e..0a5826ca24b 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.101 2021/03/21 13:48:09 taca Exp $
+# $NetBSD: Makefile,v 1.102 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	mew-6.8
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mew.org/Release/
 
diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile
index 0079d753683..569a837e08d 100644
--- a/mail/rmail-mime/Makefile
+++ b/mail/rmail-mime/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2013/02/17 19:18:06 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:39 dholland Exp $
 #
 
 DISTNAME=	rmail-mime-1.13.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/rmail-mime/
 
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 87f8a8dcaf0..64094db8d5f 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2018/11/29 00:36:23 markd Exp $
+# $NetBSD: Makefile,v 1.45 2022/05/14 22:25:38 dholland Exp $
 
 DISTNAME=	vm-8.2.0b
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://launchpad.net/vm/8.2.x/8.2.0b/+download/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/wl-snapshot/Makefile b/mail/wl-snapshot/Makefile
index 1200bcdd24a..5b90654c1b2 100644
--- a/mail/wl-snapshot/Makefile
+++ b/mail/wl-snapshot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2020/01/18 21:49:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/14 22:25:39 dholland Exp $
 
 DISTNAME=	wl-beta_2.15.9+0.20190919
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/beta_//:S/+0//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/w/wl-beta/}
 EXTRACT_SUFX=	.orig.tar.gz
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index c31348ffa83..2d35f86b92c 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2021/04/24 11:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2022/05/14 22:25:39 dholland Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	mail
 #MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/
 
diff --git a/math/calc/Makefile b/math/calc/Makefile
index 5b0f57abeba..f54b70a0bbe 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2017/08/16 20:21:11 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/05/14 22:25:39 dholland Exp $
 
 DISTNAME=	calc-2.02f
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=calc/}
 
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 4502c9a7e20..b18bb5d5914 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2021/05/24 19:52:55 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2022/05/14 22:25:39 dholland Exp $
 
 DISTNAME=	ess-13.09-1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-1$/.1/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/
 EXTRACT_SUFX=	.tgz
diff --git a/math/texdrive/Makefile b/math/texdrive/Makefile
index 307c631fd3c..192fe47baf1 100644
--- a/math/texdrive/Makefile
+++ b/math/texdrive/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2020/01/26 17:31:41 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/14 22:25:39 dholland Exp $
 #
 
 DISTNAME=	texdrive
 PKGNAME=	texdrive-0.0.20081126.171834
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://www.djcbsoftware.nl/code/texdrive/
 EXTRACT_SUFX=	.el
diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index 8017308bcc9..9c60f0bd381 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2022/04/14 14:31:09 nikita Exp $
+# $NetBSD: Makefile,v 1.36 2022/05/14 22:25:39 dholland Exp $
 
 DISTNAME=		bbdb-2.35
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail misc news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bbdb/}
 
diff --git a/misc/bbdb3/Makefile b/misc/bbdb3/Makefile
index 8e35f993763..b9ca1f5997c 100644
--- a/misc/bbdb3/Makefile
+++ b/misc/bbdb3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2022/04/20 18:07:19 nikita Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=		bbdb-3.2.2a
-PKGREVISION=		1
+PKGREVISION=		2
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		misc mail news
 MASTER_SITES=		http://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/
diff --git a/misc/color-theme/Makefile b/misc/color-theme/Makefile
index f76f21c942b..c3052342703 100644
--- a/misc/color-theme/Makefile
+++ b/misc/color-theme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2020/01/18 23:33:02 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/14 22:25:39 dholland Exp $
 #
 
 DISTNAME=	color-theme-6.6.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://download.savannah.gnu.org/releases/${PKGBASE}/
 
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 001772434ed..1caf6f81ff2 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2019/11/03 17:04:21 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2022/05/14 22:25:39 dholland Exp $
 
 DISTNAME=	elscreen-1.4.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/
 MASTER_SITES+=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/old/
diff --git a/misc/emacs-neotree/Makefile b/misc/emacs-neotree/Makefile
index 72b2d2c3815..f0ce4b42897 100644
--- a/misc/emacs-neotree/Makefile
+++ b/misc/emacs-neotree/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2022/04/15 09:48:19 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=	emacs-neotree-0.5.2.98fe213
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jaypei/}
 GITHUB_TAG=	98fe21334affaffe2334bf7c987edaf1980d2d0b
diff --git a/misc/emacs-wiki/Makefile b/misc/emacs-wiki/Makefile
index cc884dccaee..3e60d7e5c23 100644
--- a/misc/emacs-wiki/Makefile
+++ b/misc/emacs-wiki/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2019/11/03 17:04:21 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/14 22:25:40 dholland Exp $
 #
 
 DISTNAME=	${EMACSWIKI}-${EMACSWIKIVERSION}
 PKGNAME=	emacs-wiki-${EMACSWIKIVERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.mwolson.org/static/dist/emacs-wiki/
 #EXTRACT_SUFX=	.gz
diff --git a/misc/howm/Makefile b/misc/howm/Makefile
index 44d4c6ddd94..bb83e53c022 100644
--- a/misc/howm/Makefile
+++ b/misc/howm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/07/21 14:40:30 taca Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=	howm-1.4.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://howm.osdn.jp/a/
 
diff --git a/misc/lookup/Makefile b/misc/lookup/Makefile
index 169092b0573..1b34266d15f 100644
--- a/misc/lookup/Makefile
+++ b/misc/lookup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2019/11/03 17:04:24 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=	lookup-1.4.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://openlab.jp/edict/lookup/dist/
 
diff --git a/misc/mic-paren/Makefile b/misc/mic-paren/Makefile
index f7a12938b4f..d63b804e169 100644
--- a/misc/mic-paren/Makefile
+++ b/misc/mic-paren/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2020/01/22 00:11:01 pho Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=	mic-paren-3.13
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=emacsattic/}
 GITHUB_TAG=	d0410c7d805c9aaf51a1bcefaaef092bed5824c4
diff --git a/net/twittering-mode/Makefile b/net/twittering-mode/Makefile
index b930b6e4630..f7341803113 100644
--- a/net/twittering-mode/Makefile
+++ b/net/twittering-mode/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=	twittering-mode-3.0.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES+=	http://sourceforge.net/projects/twmode/files/twittering-mode-3.0.0/
 
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 42fa840bc59..b8857b215ec 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2021/12/08 16:06:12 adam Exp $
+# $NetBSD: Makefile,v 1.62 2022/05/14 22:25:32 dholland Exp $
 
 DISTNAME=		auctex-11.92
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		13
+PKGREVISION=		14
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNU:=auctex/}
 
diff --git a/security/EasyPG/Makefile b/security/EasyPG/Makefile
index 11eb99e8837..10c57831bc7 100644
--- a/security/EasyPG/Makefile
+++ b/security/EasyPG/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:51 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/14 22:25:32 dholland Exp $
 
 DISTNAME=	epg-0.0.16
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/epg/EasyPG/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security mail
 MASTER_SITES=	${MASTER_SITE_OSDN:=epg/29289/}
 
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 6918d1c1f33..ee3fd12669e 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:27 agc Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=		dictem-1.0.4
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		textproc editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dictem/}
 MASTER_SITES+=		http://www.mova.org/~cheusov/pub/dictem/
diff --git a/textproc/emacs-dict-client/Makefile b/textproc/emacs-dict-client/Makefile
index cfdeb3dece7..2085a093067 100644
--- a/textproc/emacs-dict-client/Makefile
+++ b/textproc/emacs-dict-client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/01/26 17:32:14 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:40 dholland Exp $
 
 DISTNAME=	dictionary-1.8.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/dictionary/emacs-dict-client/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/textproc/emacs-muse/Makefile b/textproc/emacs-muse/Makefile
index e1dec5a2a2c..e861d1037be 100644
--- a/textproc/emacs-muse/Makefile
+++ b/textproc/emacs-muse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2019/11/04 21:43:35 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/14 22:25:41 dholland Exp $
 
 DISTNAME=	muse-3.20
 PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc editors
 MASTER_SITES=	https://web.archive.org/web/20170309215441/http://download.gna.org/muse-el/
 
diff --git a/textproc/flyspell/Makefile b/textproc/flyspell/Makefile
index 121c4be9872..df7f90beb35 100644
--- a/textproc/flyspell/Makefile
+++ b/textproc/flyspell/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2017/08/01 17:40:17 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/14 22:25:41 dholland Exp $
 #
 
 DISTNAME=	flyspell-1.7m.el
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/.el//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/
 EXTRACT_SUFX=	# empty
diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile
index 83d8ae6ffb1..47fe0a49abb 100644
--- a/textproc/ispell-emacs/Makefile
+++ b/textproc/ispell-emacs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2013/04/24 02:20:38 rodent Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:41 dholland Exp $
 #
 
 DISTNAME=	ispell.el
 PKGNAME=	${EMACS_PKGNAME_PREFIX}ispell-emacs-3.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://kdstevens.com/pub/stevens/
 EXTRACT_SUFX=	.gz
diff --git a/textproc/markdown-mode/Makefile b/textproc/markdown-mode/Makefile
index 56858de8e6d..a46affa479a 100644
--- a/textproc/markdown-mode/Makefile
+++ b/textproc/markdown-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2020/08/18 04:49:38 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/14 22:25:41 dholland Exp $
 
 DISTNAME=	markdown-mode-2.4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jrblevin/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/textproc/migemo-elisp/Makefile b/textproc/migemo-elisp/Makefile
index 5a538de8f44..2889a336c46 100644
--- a/textproc/migemo-elisp/Makefile
+++ b/textproc/migemo-elisp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2018/02/25 12:25:48 taca Exp $
+# $NetBSD: Makefile,v 1.10 2022/05/14 22:25:41 dholland Exp $
 
 .include "../../textproc/migemo/Makefile.common"
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}migemo-elisp-${MIGEMO_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 
 COMMENT=	Elisp for migemo
 
diff --git a/textproc/nxml-mode/Makefile b/textproc/nxml-mode/Makefile
index e166240b66b..2c1fa3f9795 100644
--- a/textproc/nxml-mode/Makefile
+++ b/textproc/nxml-mode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/14 22:25:41 dholland Exp $
 
 DISTNAME=		nxml-mode-20041004
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		textproc editors
 MASTER_SITES=		http://www.thaiopensource.com/download/
 
diff --git a/textproc/po-mode/Makefile b/textproc/po-mode/Makefile
index f095f5f1fb7..79bc4235e57 100644
--- a/textproc/po-mode/Makefile
+++ b/textproc/po-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/01/18 23:35:30 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/14 22:25:41 dholland Exp $
 
 DISTNAME=		gettext-0.18.1.1
 PKGNAME=		po-mode-2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 EXTRACT_ELEMENTS=	${DISTNAME}/gettext-tools/misc
diff --git a/textproc/psgml-mode/Makefile b/textproc/psgml-mode/Makefile
index bba80fecdda..b9a41dc5ff4 100644
--- a/textproc/psgml-mode/Makefile
+++ b/textproc/psgml-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2017/09/03 08:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/14 22:25:41 dholland Exp $
 
 DISTNAME=		psgml-1.3.2
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-/-mode-/}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		textproc editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=psgml/}
 
diff --git a/textproc/xslide/Makefile b/textproc/xslide/Makefile
index 7efbd3664f8..7400b1004d2 100644
--- a/textproc/xslide/Makefile
+++ b/textproc/xslide/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2020/03/20 11:58:30 nia Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/14 22:25:41 dholland Exp $
 #
 
 DISTNAME=		xslide-0.2.2
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xslide/}
 
diff --git a/www/emacs-w3m-snapshot/Makefile b/www/emacs-w3m-snapshot/Makefile
index cddaa51dffc..bd2913a25a1 100644
--- a/www/emacs-w3m-snapshot/Makefile
+++ b/www/emacs-w3m-snapshot/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2021/02/01 11:19:16 mef Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/14 22:25:42 dholland Exp $
 
 VERSION=	1.4.632
 DATE_TIME=	20210106.2144
 HASH=		f29aada
 DISTNAME=	w3m-el-snapshot_${VERSION}+0.${DATE_TIME}.${HASH}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.${HASH}//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
 EXTRACT_SUFX=	.orig.tar.gz
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 6356da38bfa..3d955537973 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2019/11/04 22:09:54 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2022/05/14 22:25:42 dholland Exp $
 
 DISTNAME=	emacs-w3m-1.4.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/www/w3/Makefile b/www/w3/Makefile
index 61c7afb8ef7..b4fafcd26a3 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2020/01/18 23:35:46 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/14 22:25:42 dholland Exp $
 
 DISTNAME=	w3-4.0pre.47
 PKGNAME=	${EMACS_PKGNAME_PREFIX}w3-4.0b47
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_XEMACS:=emacs-w3/}