diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index a7cb57dfded..0c37af4dd5d 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.31 2021/01/28 13:35:02 naddy Exp $
-
 COMMENT=	GNU cpio copies files to and from archives
 
 DISTNAME=	cpio-2.13
diff --git a/archivers/gcpio/patches/patch-doc_cpio_1 b/archivers/gcpio/patches/patch-doc_cpio_1
index 9eb0b1d43ef..08f78d68dac 100644
--- a/archivers/gcpio/patches/patch-doc_cpio_1
+++ b/archivers/gcpio/patches/patch-doc_cpio_1
@@ -1,5 +1,3 @@
-$OpenBSD: patch-doc_cpio_1,v 1.5 2019/11/10 10:23:02 naddy Exp $
-
 CVE-2015-1197: cpio directory traversal
 
 Index: doc/cpio.1
diff --git a/archivers/gcpio/patches/patch-src_global_c b/archivers/gcpio/patches/patch-src_global_c
index 46aaa2c3e73..2d0a23b5aa5 100644
--- a/archivers/gcpio/patches/patch-src_global_c
+++ b/archivers/gcpio/patches/patch-src_global_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_global_c,v 1.3 2021/01/28 13:35:02 naddy Exp $
-
 Fix for -fno-common.
 https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb
 
diff --git a/archivers/gcpio/patches/patch-src_util_c b/archivers/gcpio/patches/patch-src_util_c
index 8007be6a31b..72ad5017c14 100644
--- a/archivers/gcpio/patches/patch-src_util_c
+++ b/archivers/gcpio/patches/patch-src_util_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_util_c,v 1.3 2019/11/15 21:44:39 naddy Exp $
-
 Fix handling of device numbers on copy out.
 https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=df55fb19be545e22d023950263ed5d0756edf81e
 
diff --git a/archivers/gcpio/patches/patch-tests_symlink-bad-length_at b/archivers/gcpio/patches/patch-tests_symlink-bad-length_at
index a01f5273578..aca7fa9fce6 100644
--- a/archivers/gcpio/patches/patch-tests_symlink-bad-length_at
+++ b/archivers/gcpio/patches/patch-tests_symlink-bad-length_at
@@ -1,5 +1,3 @@
-$OpenBSD: patch-tests_symlink-bad-length_at,v 1.1 2019/11/10 10:23:02 naddy Exp $
-
 Index: tests/symlink-bad-length.at
 --- tests/symlink-bad-length.at.orig
 +++ tests/symlink-bad-length.at
diff --git a/archivers/gcpio/pkg/PLIST b/archivers/gcpio/pkg/PLIST
index 977e946075e..f01b40f8385 100644
--- a/archivers/gcpio/pkg/PLIST
+++ b/archivers/gcpio/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.10 2019/11/10 10:23:02 naddy Exp $
 @bin bin/gcpio
 @info info/cpio.info
 @comment lib/charset.alias
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 71fcbe787a1..33520294c78 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.88 2021/02/16 21:20:07 naddy Exp $
-
 COMMENT=	GNU version of the traditional tape archiver
 
 DISTNAME=	tar-1.34
diff --git a/archivers/gtar/patches/patch-configure b/archivers/gtar/patches/patch-configure
index 58f83094509..0683eb511a9 100644
--- a/archivers/gtar/patches/patch-configure
+++ b/archivers/gtar/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.19 2021/01/16 18:52:19 naddy Exp $
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/archivers/gtar/pkg/PFRAG.static b/archivers/gtar/pkg/PFRAG.static
index b9c5078fa6a..b3aebc35b49 100644
--- a/archivers/gtar/pkg/PFRAG.static
+++ b/archivers/gtar/pkg/PFRAG.static
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.static,v 1.1 2018/05/06 15:35:47 espie Exp $
 share/locale/
 share/locale/bg/
 share/locale/bg/LC_MESSAGES/
diff --git a/archivers/gtar/pkg/PLIST b/archivers/gtar/pkg/PLIST
index 8d17a206d63..662628146d7 100644
--- a/archivers/gtar/pkg/PLIST
+++ b/archivers/gtar/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.28 2018/05/06 15:35:47 espie Exp $
 @bin bin/gtar
 @info info/tar.info
 @comment lib/charset.alias
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 7b33d1dfdcb..a4da2e81b56 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.46 2022/02/24 22:54:43 naddy Exp $
-
 COMMENT=	multi-format archive and compression library
 
 DISTNAME=	libarchive-3.6.0
diff --git a/archivers/libarchive/patches/patch-cpio_bsdcpio_1 b/archivers/libarchive/patches/patch-cpio_bsdcpio_1
index 2d7b84c1e4a..b281bde2a05 100644
--- a/archivers/libarchive/patches/patch-cpio_bsdcpio_1
+++ b/archivers/libarchive/patches/patch-cpio_bsdcpio_1
@@ -1,4 +1,3 @@
-$OpenBSD: patch-cpio_bsdcpio_1,v 1.4 2016/05/26 20:31:37 naddy Exp $
 --- cpio/bsdcpio.1.orig	Tue Jan 10 07:41:09 2012
 +++ cpio/bsdcpio.1	Sat Mar 31 21:50:15 2012
 @@ -28,7 +28,7 @@
diff --git a/archivers/libarchive/patches/patch-tar_bsdtar_1 b/archivers/libarchive/patches/patch-tar_bsdtar_1
index 2a00772cba8..b5d7e55137e 100644
--- a/archivers/libarchive/patches/patch-tar_bsdtar_1
+++ b/archivers/libarchive/patches/patch-tar_bsdtar_1
@@ -1,4 +1,3 @@
-$OpenBSD: patch-tar_bsdtar_1,v 1.14 2021/08/27 14:37:59 naddy Exp $
 Index: tar/bsdtar.1
 --- tar/bsdtar.1.orig
 +++ tar/bsdtar.1
diff --git a/archivers/libarchive/pkg/PLIST b/archivers/libarchive/pkg/PLIST
index 033c80b0d39..10096428aa5 100644
--- a/archivers/libarchive/pkg/PLIST
+++ b/archivers/libarchive/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.13 2019/11/19 13:27:44 espie Exp $
 @bin bin/bsdcat
 @bin bin/bsdcpio
 @bin bin/bsdtar
diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index 0978d6c835e..9a4d3216fae 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.39 2021/11/02 15:47:53 bluhm Exp $
-
 COMMENT=	LZMA compression and decompression tools
 
 DISTNAME=	xz-5.2.5
diff --git a/archivers/xz/patches/patch-config_h_in b/archivers/xz/patches/patch-config_h_in
index d16c2de0d10..d57cd9bde71 100644
--- a/archivers/xz/patches/patch-config_h_in
+++ b/archivers/xz/patches/patch-config_h_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-config_h_in,v 1.9 2020/03/26 20:44:51 naddy Exp $
 Index: config.h.in
 --- config.h.in.orig
 +++ config.h.in
diff --git a/archivers/xz/patches/patch-src_xz_file_io_c b/archivers/xz/patches/patch-src_xz_file_io_c
index 5bb06a5842e..3754fcbad52 100644
--- a/archivers/xz/patches/patch-src_xz_file_io_c
+++ b/archivers/xz/patches/patch-src_xz_file_io_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_xz_file_io_c,v 1.3 2021/11/02 15:47:53 bluhm Exp $
-
 fix a test failure in a Perl module
 https://github.com/PerlAlien/Alien-Build/issues/62
 https://git.tukaani.org/?p=xz.git;a=commitdiff;h=892b16cc282f5b4e1c49871b326f4db25c5b4d81
diff --git a/archivers/xz/patches/patch-src_xz_main_c b/archivers/xz/patches/patch-src_xz_main_c
index a020ac0a0ac..a1f98d6c8c2 100644
--- a/archivers/xz/patches/patch-src_xz_main_c
+++ b/archivers/xz/patches/patch-src_xz_main_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_xz_main_c,v 1.6 2016/08/12 20:52:26 naddy Exp $
 --- src/xz/main.c.orig	Tue Sep 29 12:57:36 2015
 +++ src/xz/main.c	Fri Aug 12 22:49:04 2016
 @@ -163,12 +163,25 @@ main(int argc, char **argv)
diff --git a/archivers/xz/patches/patch-src_xzdec_xzdec_c b/archivers/xz/patches/patch-src_xzdec_xzdec_c
index d42ed94dd09..940a75d42aa 100644
--- a/archivers/xz/patches/patch-src_xzdec_xzdec_c
+++ b/archivers/xz/patches/patch-src_xzdec_xzdec_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_xzdec_xzdec_c,v 1.2 2016/08/12 20:52:26 naddy Exp $
 --- src/xzdec/xzdec.c.orig	Tue Sep 29 12:57:36 2015
 +++ src/xzdec/xzdec.c	Fri Aug 12 22:49:12 2016
 @@ -292,9 +292,17 @@ main(int argc, char **argv)
diff --git a/archivers/xz/pkg/PLIST b/archivers/xz/pkg/PLIST
index bc9c89598d8..ec8dce6c337 100644
--- a/archivers/xz/pkg/PLIST
+++ b/archivers/xz/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.11 2020/03/26 20:44:51 naddy Exp $
 @conflict lzma-*
 @pkgpath archivers/lzma
 bin/lzcat
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index c6f3ae006f8..15609e34ab1 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.63 2022/02/25 20:45:09 naddy Exp $
-
 COMMENT=	free lossless audio codec
 
 DISTNAME=	flac-1.3.4
diff --git a/audio/flac/patches/patch-man_flac_1 b/audio/flac/patches/patch-man_flac_1
index 3794ac6f9dc..c74329fdd5f 100644
--- a/audio/flac/patches/patch-man_flac_1
+++ b/audio/flac/patches/patch-man_flac_1
@@ -1,4 +1,3 @@
-$OpenBSD: patch-man_flac_1,v 1.4 2015/01/10 15:50:58 naddy Exp $
 --- man/flac.1.orig	Tue Nov 25 04:40:14 2014
 +++ man/flac.1	Sun Nov 30 20:59:42 2014
 @@ -384,7 +384,7 @@ These flags can be used to invert the sense of the cor
diff --git a/audio/flac/patches/patch-src_libFLAC_cpu_c b/audio/flac/patches/patch-src_libFLAC_cpu_c
index e0d8a3ef495..aae2c281d71 100644
--- a/audio/flac/patches/patch-src_libFLAC_cpu_c
+++ b/audio/flac/patches/patch-src_libFLAC_cpu_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_libFLAC_cpu_c,v 1.4 2022/02/25 20:45:09 naddy Exp $
-
 No support for reading PPC hwcaps on OpenBSD.
 
 Index: src/libFLAC/cpu.c
diff --git a/audio/flac/pkg/PLIST b/audio/flac/pkg/PLIST
index 9c9602bfea3..92b087a08a3 100644
--- a/audio/flac/pkg/PLIST
+++ b/audio/flac/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.19 2021/05/08 15:19:22 naddy Exp $
 @bin bin/flac
 @bin bin/metaflac
 include/FLAC/
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 59e1bc23c40..642e0ca00a5 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.58 2019/07/12 20:43:34 sthen Exp $
-
 COMMENT=	portable audio output library
 
 DISTNAME=	libao-1.2.0
diff --git a/audio/libao/patches/patch-configure b/audio/libao/patches/patch-configure
index 1c6931219bf..8109165c3fb 100644
--- a/audio/libao/patches/patch-configure
+++ b/audio/libao/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.13 2014/05/27 19:44:56 naddy Exp $
 --- configure.orig	Mon Jan 27 18:10:36 2014
 +++ configure	Tue May 27 17:07:14 2014
 @@ -12077,9 +12077,9 @@ else
diff --git a/audio/libao/patches/patch-doc_Makefile_in b/audio/libao/patches/patch-doc_Makefile_in
index 37baae20bfc..9c67204c54d 100644
--- a/audio/libao/patches/patch-doc_Makefile_in
+++ b/audio/libao/patches/patch-doc_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.11 2014/05/27 19:44:56 naddy Exp $
 --- doc/Makefile.in.orig	Tue Jan 28 00:57:41 2014
 +++ doc/Makefile.in	Tue May 27 17:07:14 2014
 @@ -257,7 +257,7 @@ build_vendor = @build_vendor@
diff --git a/audio/libao/patches/patch-src_plugins_Makefile_in b/audio/libao/patches/patch-src_plugins_Makefile_in
index 8d6afd6dd4b..f95de74f336 100644
--- a/audio/libao/patches/patch-src_plugins_Makefile_in
+++ b/audio/libao/patches/patch-src_plugins_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_plugins_Makefile_in,v 1.7 2014/05/27 19:44:56 naddy Exp $
 --- src/plugins/Makefile.in.orig	Tue Jan 28 00:57:41 2014
 +++ src/plugins/Makefile.in	Tue May 27 17:06:54 2014
 @@ -388,7 +388,7 @@ $(am__recursive_targets):
diff --git a/audio/libao/patches/patch-src_plugins_sndio_ao_sndio_c b/audio/libao/patches/patch-src_plugins_sndio_ao_sndio_c
index 76925b9f416..0c9df6cc673 100644
--- a/audio/libao/patches/patch-src_plugins_sndio_ao_sndio_c
+++ b/audio/libao/patches/patch-src_plugins_sndio_ao_sndio_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_plugins_sndio_ao_sndio_c,v 1.3 2014/05/27 19:44:56 naddy Exp $
 --- src/plugins/sndio/ao_sndio.c.orig	Tue Feb 14 01:46:06 2012
 +++ src/plugins/sndio/ao_sndio.c	Tue May 27 17:07:14 2014
 @@ -99,6 +99,7 @@ int ao_plugin_set_option(ao_device *device, const char
diff --git a/audio/libao/pkg/PLIST b/audio/libao/pkg/PLIST
index 9dcde41d7e9..85cff1d4b1e 100644
--- a/audio/libao/pkg/PLIST
+++ b/audio/libao/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.13 2016/03/13 22:55:56 naddy Exp $
 @pkgpath audio/libao,-main
 @pkgpath audio/libao,no_arts
 @pkgpath audio/libao,no_arts,no_esd
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index e94d1431e6e..ed30c7e6909 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.22 2021/02/07 16:21:58 naddy Exp $
-
 COMMENT=	library for reading ID3 tags
 
 DISTNAME=	libid3tag-0.15.1b
diff --git a/audio/libid3tag/files/id3tag.pc.in b/audio/libid3tag/files/id3tag.pc.in
index fa12b407d6d..c95fc7c8179 100644
--- a/audio/libid3tag/files/id3tag.pc.in
+++ b/audio/libid3tag/files/id3tag.pc.in
@@ -1,4 +1,3 @@
-# $OpenBSD: id3tag.pc.in,v 1.1 2009/07/20 15:36:19 naddy Exp $
 # libid3tag pkg-config source file
 
 prefix=@prefix@
diff --git a/audio/libid3tag/patches/patch-Makefile_in b/audio/libid3tag/patches/patch-Makefile_in
index 5fdaea83681..362efc0b1af 100644
--- a/audio/libid3tag/patches/patch-Makefile_in
+++ b/audio/libid3tag/patches/patch-Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2021/02/07 16:21:58 naddy Exp $
-
 Fix parallel build.  gmake recognizes foo.c and $(srcdir)/foo.c as
 equivalent, ours does not.
 
diff --git a/audio/libid3tag/patches/patch-compat_gperf b/audio/libid3tag/patches/patch-compat_gperf
index 501fbda082b..a276e60ab1a 100644
--- a/audio/libid3tag/patches/patch-compat_gperf
+++ b/audio/libid3tag/patches/patch-compat_gperf
@@ -1,4 +1,3 @@
-$OpenBSD: patch-compat_gperf,v 1.1 2009/05/25 14:06:16 ajacoutot Exp $
 --- compat.gperf.orig	Fri Jan 23 10:41:32 2004
 +++ compat.gperf	Wed May 20 18:25:44 2009
 @@ -236,6 +236,10 @@ int id3_compat_fixup(struct id3_tag *tag)
diff --git a/audio/libid3tag/patches/patch-compat_h b/audio/libid3tag/patches/patch-compat_h
index ad94c6bbc22..3ed35f46df2 100644
--- a/audio/libid3tag/patches/patch-compat_h
+++ b/audio/libid3tag/patches/patch-compat_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-compat_h,v 1.1 2018/01/19 23:01:41 espie Exp $
-
 Index: compat.h
 --- compat.h.orig
 +++ compat.h
diff --git a/audio/libid3tag/patches/patch-configure b/audio/libid3tag/patches/patch-configure
index bf46caa9ecd..299da8a9d6f 100644
--- a/audio/libid3tag/patches/patch-configure
+++ b/audio/libid3tag/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.2 2010/04/01 22:23:09 naddy Exp $
 --- configure.orig	Thu Feb  5 10:35:25 2004
 +++ configure	Fri Apr  2 00:21:37 2010
 @@ -19007,6 +19007,7 @@ debug=""
diff --git a/audio/libid3tag/patches/patch-parse_c b/audio/libid3tag/patches/patch-parse_c
index 98e6d29afe7..15e344aa797 100644
--- a/audio/libid3tag/patches/patch-parse_c
+++ b/audio/libid3tag/patches/patch-parse_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-parse_c,v 1.1 2009/05/25 14:06:16 ajacoutot Exp $
 --- parse.c.orig	Fri Jan 23 10:41:32 2004
 +++ parse.c	Wed May 20 18:25:44 2009
 @@ -165,6 +165,9 @@ id3_ucs4_t *id3_parse_string(id3_byte_t const **ptr, i
diff --git a/audio/libid3tag/patches/patch-utf16_c b/audio/libid3tag/patches/patch-utf16_c
index cbefdf6bc3b..70869a04e93 100644
--- a/audio/libid3tag/patches/patch-utf16_c
+++ b/audio/libid3tag/patches/patch-utf16_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-utf16_c,v 1.1 2009/05/25 14:06:16 ajacoutot Exp $
 --- utf16.c.orig	Fri Jan 23 10:41:32 2004
 +++ utf16.c	Wed May 20 18:27:16 2009
 @@ -282,5 +282,18 @@ id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **p
diff --git a/audio/libid3tag/pkg/PLIST b/audio/libid3tag/pkg/PLIST
index 35d89d2005d..4d064664aad 100644
--- a/audio/libid3tag/pkg/PLIST
+++ b/audio/libid3tag/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:36 naddy Exp $
 @conflict mad-*
 include/id3tag.h
 lib/libid3tag.a
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 8481708a08e..580c515ff61 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.19 2019/07/12 20:43:34 sthen Exp $
-
 COMMENT=	high-quality MPEG audio decoder
 
 DISTNAME=	libmad-0.15.1b
diff --git a/audio/libmad/files/mad.pc.in b/audio/libmad/files/mad.pc.in
index 22e9fc5ccae..8c3b2d8e94c 100644
--- a/audio/libmad/files/mad.pc.in
+++ b/audio/libmad/files/mad.pc.in
@@ -1,4 +1,3 @@
-# $OpenBSD: mad.pc.in,v 1.1 2005/06/04 15:30:58 naddy Exp $
 # libmad pkg-config source file
 
 prefix=@prefix@
diff --git a/audio/libmad/patches/patch-configure b/audio/libmad/patches/patch-configure
index d8c5cd031c2..2be8ca66e21 100644
--- a/audio/libmad/patches/patch-configure
+++ b/audio/libmad/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.2 2010/04/01 21:08:20 naddy Exp $
 --- configure.orig	Thu Feb  5 10:34:07 2004
 +++ configure	Thu Apr  1 23:02:56 2010
 @@ -19032,6 +19032,7 @@ debug=""
diff --git a/audio/libmad/patches/patch-fixed_h b/audio/libmad/patches/patch-fixed_h
index 73cb0e128ea..713908b1bd2 100644
--- a/audio/libmad/patches/patch-fixed_h
+++ b/audio/libmad/patches/patch-fixed_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fixed_h,v 1.1 2018/12/04 20:43:58 naddy Exp $
-
 Prevent multiple evaluation of macro argument.
 
 Index: fixed.h
diff --git a/audio/libmad/pkg/PLIST b/audio/libmad/pkg/PLIST
index 90dc680d771..f0681e9a6c2 100644
--- a/audio/libmad/pkg/PLIST
+++ b/audio/libmad/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:36 naddy Exp $
 @conflict mad-*
 include/mad.h
 lib/libmad.a
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index fbec5e46319..ab9e8d95241 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.41 2021/06/09 19:43:39 naddy Exp $
-
 COMMENT=	Ogg bitstream library
 
 DISTNAME=	libogg-1.3.5
diff --git a/audio/libogg/patches/patch-configure b/audio/libogg/patches/patch-configure
index 7ac5279a519..53822c6ea45 100644
--- a/audio/libogg/patches/patch-configure
+++ b/audio/libogg/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.17 2021/06/09 19:43:39 naddy Exp $
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/audio/libogg/pkg/PLIST b/audio/libogg/pkg/PLIST
index aa0294ce251..6e787918fb7 100644
--- a/audio/libogg/pkg/PLIST
+++ b/audio/libogg/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.11 2021/06/09 19:43:39 naddy Exp $
 include/ogg/
 include/ogg/config_types.h
 include/ogg/ogg.h
diff --git a/audio/libopusenc/Makefile b/audio/libopusenc/Makefile
index 7bc3f4bdde9..a7560405832 100644
--- a/audio/libopusenc/Makefile
+++ b/audio/libopusenc/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2019/07/12 20:43:35 sthen Exp $
-
 COMMENT=	high-level API for encoding .opus files
 
 DISTNAME=	libopusenc-0.2.1
diff --git a/audio/libopusenc/pkg/PLIST b/audio/libopusenc/pkg/PLIST
index aabb646f4a8..a0c3689ade1 100644
--- a/audio/libopusenc/pkg/PLIST
+++ b/audio/libopusenc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/09/25 19:44:52 naddy Exp $
 include/opus/opusenc.h
 lib/libopusenc.a
 lib/libopusenc.la
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 85055de0caa..65361b0c9c3 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.22 2019/07/12 20:43:35 sthen Exp $
-
 COMMENT=	C64 music player and SID chip emulator library
 
 DISTNAME=	libsidplay-1.36.57
diff --git a/audio/libsidplay/patches/patch-configure b/audio/libsidplay/patches/patch-configure
index db2e5cac946..7bc6066554c 100644
--- a/audio/libsidplay/patches/patch-configure
+++ b/audio/libsidplay/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.1 2017/04/16 10:57:41 espie Exp $
 --- configure.orig	Sun Apr 16 10:48:30 2017
 +++ configure	Sun Apr 16 10:48:52 2017
 @@ -1279,8 +1279,9 @@ else
diff --git a/audio/libsidplay/patches/patch-src_samples_cpp b/audio/libsidplay/patches/patch-src_samples_cpp
index 694eff19209..30cc499ec6a 100644
--- a/audio/libsidplay/patches/patch-src_samples_cpp
+++ b/audio/libsidplay/patches/patch-src_samples_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_samples_cpp,v 1.1 2018/04/10 16:56:20 jasper Exp $
-
 error: constant expression evaluates to 208 which cannot be narrowed to type 'sbyte' (aka 'signed char')
 
 Index: src/samples.cpp
diff --git a/audio/libsidplay/patches/patch-src_smart_h b/audio/libsidplay/patches/patch-src_smart_h
index 841ee7934f0..ce5944878f4 100644
--- a/audio/libsidplay/patches/patch-src_smart_h
+++ b/audio/libsidplay/patches/patch-src_smart_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_smart_h,v 1.1 2010/05/11 21:19:25 espie Exp $
 --- src/smart.h.orig	Tue May 11 23:07:35 2010
 +++ src/smart.h	Tue May 11 23:16:56 2010
 @@ -211,16 +211,16 @@ class smartPtr : public smartPtrBase<T>
diff --git a/audio/libsidplay/pkg/PLIST b/audio/libsidplay/pkg/PLIST
index 6a27d3ffd82..ab144bd5352 100644
--- a/audio/libsidplay/pkg/PLIST
+++ b/audio/libsidplay/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:36 naddy Exp $
 include/sidplay/
 include/sidplay/compconf.h
 include/sidplay/emucfg.h
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index af4c05a51ef..4fc8f8649b1 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.46 2020/07/05 15:45:00 tj Exp $
-
 COMMENT=	audio compression codec library
 
 DISTNAME=	libvorbis-1.3.7
diff --git a/audio/libvorbis/patches/patch-configure b/audio/libvorbis/patches/patch-configure
index 6ae6bd8627e..31691ab564d 100644
--- a/audio/libvorbis/patches/patch-configure
+++ b/audio/libvorbis/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.17 2018/03/16 21:44:10 naddy Exp $
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/audio/libvorbis/pkg/PLIST b/audio/libvorbis/pkg/PLIST
index 1ce3cfc7131..421f3cffb40 100644
--- a/audio/libvorbis/pkg/PLIST
+++ b/audio/libvorbis/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.14 2020/06/28 20:03:51 tj Exp $
 include/vorbis/
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 2e83a6da21a..980f118dfdb 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.28 2019/07/12 20:43:35 sthen Exp $
-
 COMMENT=	command-line MPEG audio decoder and player
 
 DISTNAME=	madplay-0.15.2b
diff --git a/audio/madplay/files/audio_sndio.c b/audio/madplay/files/audio_sndio.c
index 353720ad8f6..d9e5814cfe6 100644
--- a/audio/madplay/files/audio_sndio.c
+++ b/audio/madplay/files/audio_sndio.c
@@ -1,5 +1,3 @@
-/*	$OpenBSD: audio_sndio.c,v 1.2 2009/06/20 14:56:18 martynas Exp $	*/
-
 /*
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
  *
diff --git a/audio/madplay/patches/patch-Makefile_in b/audio/madplay/patches/patch-Makefile_in
index ccff90fda94..c987a6c894f 100644
--- a/audio/madplay/patches/patch-Makefile_in
+++ b/audio/madplay/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2010/04/01 22:12:47 naddy Exp $
 --- Makefile.in.orig	Thu Apr  1 23:33:04 2010
 +++ Makefile.in	Thu Apr  1 23:33:52 2010
 @@ -117,6 +117,7 @@ am__depfiles_maybe = depfiles
diff --git a/audio/madplay/patches/patch-audio_h b/audio/madplay/patches/patch-audio_h
index 185858aaebd..3825e6fb246 100644
--- a/audio/madplay/patches/patch-audio_h
+++ b/audio/madplay/patches/patch-audio_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-audio_h,v 1.1 2009/03/28 16:26:46 martynas Exp $
 --- audio.h.orig	Tue Mar 24 12:31:01 2009
 +++ audio.h	Tue Mar 24 12:31:25 2009
 @@ -98,6 +98,7 @@ audio_ctlfunc_t audio_jaguar;
diff --git a/audio/madplay/patches/patch-configure_ac b/audio/madplay/patches/patch-configure_ac
index 5f580ca5e1c..a8610b87495 100644
--- a/audio/madplay/patches/patch-configure_ac
+++ b/audio/madplay/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.2 2010/04/01 22:12:47 naddy Exp $
 --- configure.ac.orig	Mon Feb 23 22:34:53 2004
 +++ configure.ac	Thu Apr  1 23:08:53 2010
 @@ -72,6 +72,7 @@ debug=""
diff --git a/audio/madplay/pkg/PLIST b/audio/madplay/pkg/PLIST
index 6c34e6e3e0c..e4462b9b3ae 100644
--- a/audio/madplay/pkg/PLIST
+++ b/audio/madplay/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2018/05/12 10:00:24 espie Exp $
 @conflict mad-*
 bin/abxtest
 @bin bin/madplay
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 1ff63fc6bcc..643b3356deb 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.111 2022/01/15 14:50:08 naddy Exp $
-
 COMMENT=	fast console MPEG audio player and decoder library
 
 DISTNAME=	mpg123-1.29.3
diff --git a/audio/mpg123/pkg/PLIST b/audio/mpg123/pkg/PLIST
index a7f4628eebb..078e833acff 100644
--- a/audio/mpg123/pkg/PLIST
+++ b/audio/mpg123/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.12 2020/06/01 21:59:54 naddy Exp $
 @bin bin/mpg123
 @bin bin/mpg123-id3dump
 @bin bin/mpg123-strip
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 70a1ce20ec0..205c93b7511 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.33 2021/01/31 20:18:25 naddy Exp $
-
 COMMENT=	clone of mpg123, a command-line mp3 player
 
 VERSION=	0.3.2
diff --git a/audio/mpg321/patches/patch-fft_c b/audio/mpg321/patches/patch-fft_c
index 18695635c55..5d1f04649b0 100644
--- a/audio/mpg321/patches/patch-fft_c
+++ b/audio/mpg321/patches/patch-fft_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fft_c,v 1.1 2021/01/31 20:18:25 naddy Exp $
-
 Index: fft.c
 --- fft.c.orig
 +++ fft.c
diff --git a/audio/mpg321/patches/patch-mad_c b/audio/mpg321/patches/patch-mad_c
index 0c133460829..119e8a9e7a2 100644
--- a/audio/mpg321/patches/patch-mad_c
+++ b/audio/mpg321/patches/patch-mad_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mad_c,v 1.3 2021/01/31 20:18:25 naddy Exp $
-
 Index: mad.c
 --- mad.c.orig
 +++ mad.c
diff --git a/audio/mpg321/patches/patch-mpg321_c b/audio/mpg321/patches/patch-mpg321_c
index c7daba9a08c..2da01a806dd 100644
--- a/audio/mpg321/patches/patch-mpg321_c
+++ b/audio/mpg321/patches/patch-mpg321_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mpg321_c,v 1.8 2021/01/31 20:18:25 naddy Exp $
 Index: mpg321.c
 --- mpg321.c.orig
 +++ mpg321.c
diff --git a/audio/mpg321/patches/patch-mpg321_h b/audio/mpg321/patches/patch-mpg321_h
index cbeb7016eb2..e3f4c21d154 100644
--- a/audio/mpg321/patches/patch-mpg321_h
+++ b/audio/mpg321/patches/patch-mpg321_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mpg321_h,v 1.2 2021/01/31 20:18:25 naddy Exp $
 Index: mpg321.h
 --- mpg321.h.orig
 +++ mpg321.h
diff --git a/audio/mpg321/patches/patch-options_c b/audio/mpg321/patches/patch-options_c
index 69bcc2ad992..5db66bc3f29 100644
--- a/audio/mpg321/patches/patch-options_c
+++ b/audio/mpg321/patches/patch-options_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-options_c,v 1.1 2021/01/31 20:18:25 naddy Exp $
-
 Index: options.c
 --- options.c.orig
 +++ options.c
diff --git a/audio/mpg321/patches/patch-remote_c b/audio/mpg321/patches/patch-remote_c
index 47a1aead42c..72ec2154ee0 100644
--- a/audio/mpg321/patches/patch-remote_c
+++ b/audio/mpg321/patches/patch-remote_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-remote_c,v 1.1 2021/01/31 20:18:25 naddy Exp $
-
 Index: remote.c
 --- remote.c.orig
 +++ remote.c
diff --git a/audio/mpg321/pkg/PLIST b/audio/mpg321/pkg/PLIST
index 389e4833cdf..076e89dac2c 100644
--- a/audio/mpg321/pkg/PLIST
+++ b/audio/mpg321/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/06/03 16:07:02 pea Exp $
 @bin bin/mpg321
 @man man/man1/mpg321.1
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index 2f72b21cf00..06c7dfaaa1a 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/12 20:43:37 sthen Exp $
-
 COMMENT=	encode, inspect, and decode Opus files
 
 DISTNAME=	opus-tools-0.2
diff --git a/audio/opus-tools/pkg/PLIST b/audio/opus-tools/pkg/PLIST
index 9c4ec5c430f..9d67f967f3e 100644
--- a/audio/opus-tools/pkg/PLIST
+++ b/audio/opus-tools/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/10 12:12:37 naddy Exp $
 @bin bin/opusdec
 @bin bin/opusenc
 @bin bin/opusinfo
diff --git a/audio/opus/Makefile b/audio/opus/Makefile
index 5984838b05b..27ed1d340a8 100644
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.21 2019/07/12 20:43:37 sthen Exp $
-
 COMMENT=	IETF audio codec
 
 DISTNAME=	opus-1.3.1
diff --git a/audio/opus/pkg/PLIST b/audio/opus/pkg/PLIST
index 9af4d17bff5..e807cd3e418 100644
--- a/audio/opus/pkg/PLIST
+++ b/audio/opus/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/10/20 17:48:16 naddy Exp $
 include/opus/
 include/opus/opus.h
 include/opus/opus_defines.h
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index c9ab6eb64ce..f602a10644b 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2020/07/10 19:44:31 naddy Exp $
-
 COMMENT =		high-level decoding and seeking API for Opus files
 DISTNAME =		opusfile-0.12
 CATEGORIES =		audio
diff --git a/audio/opusfile/pkg/PLIST b/audio/opusfile/pkg/PLIST
index a56a052ee75..9f08c327fcb 100644
--- a/audio/opusfile/pkg/PLIST
+++ b/audio/opusfile/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2020/07/10 19:44:31 naddy Exp $
 include/opus/opusfile.h
 @static-lib lib/libopusfile.a
 lib/libopusfile.la
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 760d07d7ad3..78e7e3994d9 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2019/07/14 00:39:35 naddy Exp $
-
 COMMENT=	fast compression for waveform files
 
 DISTNAME=	shorten-3.6.1
diff --git a/audio/shorten/pkg/PLIST b/audio/shorten/pkg/PLIST
index ec24f8944df..7fe81a41c84 100644
--- a/audio/shorten/pkg/PLIST
+++ b/audio/shorten/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/11/14 17:36:24 naddy Exp $
 @bin bin/shorten
 @man man/man1/shorten.1
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index dab6b62a78b..25ad09ffdb9 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.19 2019/07/12 20:43:41 sthen Exp $
-
 COMMENT=	Commodore 64 music player and SID chip emulator
 
 DISTNAME=	sidplay-base-1.0.9
diff --git a/audio/sidplay/patches/patch-configure b/audio/sidplay/patches/patch-configure
index 4a9f9732e30..4136aefab3d 100644
--- a/audio/sidplay/patches/patch-configure
+++ b/audio/sidplay/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.3 2014/10/26 15:24:10 ratchov Exp $
 --- configure.orig	Sat Sep 28 20:44:14 2002
 +++ configure	Fri Oct 24 15:49:10 2014
 @@ -1590,11 +1590,9 @@ EOF
diff --git a/audio/sidplay/patches/patch-configure_in b/audio/sidplay/patches/patch-configure_in
index 740d8a0f6c3..e0cbffe5596 100644
--- a/audio/sidplay/patches/patch-configure_in
+++ b/audio/sidplay/patches/patch-configure_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure_in,v 1.1 2014/10/26 15:24:10 ratchov Exp $
 --- configure.in.orig	Sat Sep 28 20:44:02 2002
 +++ configure.in	Fri Oct 24 15:57:45 2014
 @@ -64,11 +64,9 @@ case "$host" in 
diff --git a/audio/sidplay/patches/patch-sid2wav_cpp b/audio/sidplay/patches/patch-sid2wav_cpp
index 08eed9ef628..d01028e27b0 100644
--- a/audio/sidplay/patches/patch-sid2wav_cpp
+++ b/audio/sidplay/patches/patch-sid2wav_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-sid2wav_cpp,v 1.1 2017/04/22 01:42:27 jsg Exp $
 --- sid2wav.cpp.orig	Thu Apr 20 16:59:16 2017
 +++ sid2wav.cpp	Thu Apr 20 16:59:52 2017
 @@ -18,9 +18,9 @@
diff --git a/audio/sidplay/patches/patch-sidcon_cpp b/audio/sidplay/patches/patch-sidcon_cpp
index ed7599783e6..9b49fb948eb 100644
--- a/audio/sidplay/patches/patch-sidcon_cpp
+++ b/audio/sidplay/patches/patch-sidcon_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-sidcon_cpp,v 1.1 2017/04/22 01:42:27 jsg Exp $
 --- sidcon.cpp.orig	Thu Apr 20 17:00:09 2017
 +++ sidcon.cpp	Thu Apr 20 17:00:34 2017
 @@ -25,11 +25,13 @@
diff --git a/audio/sidplay/patches/patch-sidplay_cpp b/audio/sidplay/patches/patch-sidplay_cpp
index 6e192b6341a..b5aa2797607 100644
--- a/audio/sidplay/patches/patch-sidplay_cpp
+++ b/audio/sidplay/patches/patch-sidplay_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-sidplay_cpp,v 1.1 2017/04/22 01:42:27 jsg Exp $
 --- sidplay.cpp.orig	Thu Apr 20 16:54:28 2017
 +++ sidplay.cpp	Thu Apr 20 16:58:52 2017
 @@ -18,8 +18,9 @@
diff --git a/audio/sidplay/pkg/PLIST b/audio/sidplay/pkg/PLIST
index a64e2aef7bd..7694b2e9677 100644
--- a/audio/sidplay/pkg/PLIST
+++ b/audio/sidplay/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/05/12 10:00:24 espie Exp $
 @bin bin/sid2wav
 @bin bin/sidcon
 @bin bin/sidplay
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 513f13b0d36..8b6bc93ebf6 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.31 2019/07/12 20:43:41 sthen Exp $
-
 COMMENT=	patent-free speech codec
 
 DISTNAME=	speex-1.2.0
diff --git a/audio/speex/patches/patch-src_Makefile_in b/audio/speex/patches/patch-src_Makefile_in
index b98134e96a8..f8650cf0398 100644
--- a/audio/speex/patches/patch-src_Makefile_in
+++ b/audio/speex/patches/patch-src_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2017/08/15 01:05:13 naddy Exp $
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
diff --git a/audio/speex/patches/patch-src_speexdec_c b/audio/speex/patches/patch-src_speexdec_c
index d8f7b833213..407c08ef792 100644
--- a/audio/speex/patches/patch-src_speexdec_c
+++ b/audio/speex/patches/patch-src_speexdec_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_speexdec_c,v 1.5 2017/08/15 01:05:13 naddy Exp $
 Index: src/speexdec.c
 --- src/speexdec.c.orig
 +++ src/speexdec.c
diff --git a/audio/speex/pkg/PLIST b/audio/speex/pkg/PLIST
index ec0a8db1c9b..ba2a1b6fc97 100644
--- a/audio/speex/pkg/PLIST
+++ b/audio/speex/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2017/08/15 01:05:13 naddy Exp $
 @bin bin/speexdec
 @bin bin/speexenc
 include/speex/speex.h
diff --git a/audio/speexdsp/Makefile b/audio/speexdsp/Makefile
index c197fd08206..853ff3fb454 100644
--- a/audio/speexdsp/Makefile
+++ b/audio/speexdsp/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/17 17:11:38 naddy Exp $
-
 COMMENT=	speech processing DSP library
 
 DISTNAME=	speexdsp-1.2.0
diff --git a/audio/speexdsp/pkg/PLIST b/audio/speexdsp/pkg/PLIST
index 205444b1d46..cfc89a3454c 100644
--- a/audio/speexdsp/pkg/PLIST
+++ b/audio/speexdsp/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/08/15 01:02:40 naddy Exp $
 @conflict speex-<1.2rc2
 include/speex/
 include/speex/speex_echo.h
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index ec5d1ac1d69..31e6931497e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.56 2021/01/23 22:13:14 naddy Exp $
-
 COMMENT=	play, encode, and manage Ogg Vorbis files
 
 DISTNAME=	vorbis-tools-1.4.2
diff --git a/audio/vorbis-tools/patches/patch-configure b/audio/vorbis-tools/patches/patch-configure
index 58455bdf064..31520b5a54e 100644
--- a/audio/vorbis-tools/patches/patch-configure
+++ b/audio/vorbis-tools/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.9 2021/01/23 22:13:14 naddy Exp $
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/audio/vorbis-tools/patches/patch-ogg123_Makefile_in b/audio/vorbis-tools/patches/patch-ogg123_Makefile_in
index 98a5c58cb3c..810b7877817 100644
--- a/audio/vorbis-tools/patches/patch-ogg123_Makefile_in
+++ b/audio/vorbis-tools/patches/patch-ogg123_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-ogg123_Makefile_in,v 1.11 2021/01/23 22:13:14 naddy Exp $
 Index: ogg123/Makefile.in
 --- ogg123/Makefile.in.orig
 +++ ogg123/Makefile.in
diff --git a/audio/vorbis-tools/patches/patch-ogg123_ogg123_c b/audio/vorbis-tools/patches/patch-ogg123_ogg123_c
index 266e2c87c5b..f57ae8bb83e 100644
--- a/audio/vorbis-tools/patches/patch-ogg123_ogg123_c
+++ b/audio/vorbis-tools/patches/patch-ogg123_ogg123_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ogg123_ogg123_c,v 1.4 2021/01/23 22:13:14 naddy Exp $
-
 The underlying mutex is actually guaranteed to be unlocked when we
 reach this point.  Do not try to unlock it again.
 
diff --git a/audio/vorbis-tools/patches/patch-ogg123_vorbis_comments_c b/audio/vorbis-tools/patches/patch-ogg123_vorbis_comments_c
index cf9a88b606c..48c25493404 100644
--- a/audio/vorbis-tools/patches/patch-ogg123_vorbis_comments_c
+++ b/audio/vorbis-tools/patches/patch-ogg123_vorbis_comments_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ogg123_vorbis_comments_c,v 1.2 2021/01/23 22:13:14 naddy Exp $
-
 strcspn(3) does not work this way, fix SIGSEGV on unknown comments
 
 Index: ogg123/vorbis_comments.c
diff --git a/audio/vorbis-tools/patches/patch-ogginfo_codec_skeleton_c b/audio/vorbis-tools/patches/patch-ogginfo_codec_skeleton_c
index a6d8f8043dd..7998bb48fdd 100644
--- a/audio/vorbis-tools/patches/patch-ogginfo_codec_skeleton_c
+++ b/audio/vorbis-tools/patches/patch-ogginfo_codec_skeleton_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ogginfo_codec_skeleton_c,v 1.1 2021/01/23 22:13:14 naddy Exp $
-
 Index: ogginfo/codec_skeleton.c
 --- ogginfo/codec_skeleton.c.orig
 +++ ogginfo/codec_skeleton.c
diff --git a/audio/vorbis-tools/pkg/PLIST b/audio/vorbis-tools/pkg/PLIST
index fa09c0d93d1..2b2eb69887c 100644
--- a/audio/vorbis-tools/pkg/PLIST
+++ b/audio/vorbis-tools/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.12 2010/06/03 15:50:28 naddy Exp $
 @bin bin/ogg123
 @bin bin/oggdec
 @bin bin/oggenc
diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile
index 6d019ee53e7..f2cd23039b6 100644
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.16 2020/01/26 11:14:30 jasper Exp $
-
 COMMENT=	curses-based emulator for the Wyse 60 terminal
 
 DISTNAME=	wy60-2.0.9
diff --git a/comms/wy60/patches/patch-configure_ac b/comms/wy60/patches/patch-configure_ac
index 9e9c5965d51..9a6af89fb5f 100644
--- a/comms/wy60/patches/patch-configure_ac
+++ b/comms/wy60/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.1 2012/12/07 15:16:49 naddy Exp $
 --- configure.ac.orig	Wed Dec  5 18:01:38 2012
 +++ configure.ac	Wed Dec  5 18:02:35 2012
 @@ -33,7 +33,8 @@ AC_FUNC_CHOWN
diff --git a/comms/wy60/patches/patch-wy60_c b/comms/wy60/patches/patch-wy60_c
index 1e0ae39e728..73182619453 100644
--- a/comms/wy60/patches/patch-wy60_c
+++ b/comms/wy60/patches/patch-wy60_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-wy60_c,v 1.4 2013/08/07 19:16:48 naddy Exp $
 --- wy60.c.orig	Sat Feb  3 05:07:20 2007
 +++ wy60.c	Wed Dec  5 21:09:50 2012
 @@ -5333,7 +5333,9 @@ static int forkPty(int *fd, char *name) {
diff --git a/comms/wy60/pkg/PLIST b/comms/wy60/pkg/PLIST
index 6111333c466..d048a88bdfc 100644
--- a/comms/wy60/pkg/PLIST
+++ b/comms/wy60/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2011/11/14 19:33:34 naddy Exp $
 @bin bin/wy60
 @man man/man1/wy60.1
 share/examples/wy60/
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index bc374beff37..4abfcb47bf2 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.99 2021/11/22 15:00:41 espie Exp $
-
 COMMENT-runtime=	GNU gettext runtime libraries and programs
 COMMENT-textstyle=	text styling library
 COMMENT-tools=		GNU gettext development and translation tools
diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_dcigettext_c b/devel/gettext/patches/patch-gettext-runtime_intl_dcigettext_c
index b57e85c7a66..161e81bc918 100644
--- a/devel/gettext/patches/patch-gettext-runtime_intl_dcigettext_c
+++ b/devel/gettext/patches/patch-gettext-runtime_intl_dcigettext_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-gettext-runtime_intl_dcigettext_c,v 1.10 2020/08/20 21:03:25 naddy Exp $
 Index: gettext-runtime/intl/dcigettext.c
 --- gettext-runtime/intl/dcigettext.c.orig
 +++ gettext-runtime/intl/dcigettext.c
diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_l10nflist_c b/devel/gettext/patches/patch-gettext-runtime_intl_l10nflist_c
index ac7548bfd13..b9dba29e83d 100644
--- a/devel/gettext/patches/patch-gettext-runtime_intl_l10nflist_c
+++ b/devel/gettext/patches/patch-gettext-runtime_intl_l10nflist_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-gettext-runtime_intl_l10nflist_c,v 1.7 2020/08/20 21:03:25 naddy Exp $
 Index: gettext-runtime/intl/l10nflist.c
 --- gettext-runtime/intl/l10nflist.c.orig
 +++ gettext-runtime/intl/l10nflist.c
diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_log_c b/devel/gettext/patches/patch-gettext-runtime_intl_log_c
index 685c3022ade..2608d4042d0 100644
--- a/devel/gettext/patches/patch-gettext-runtime_intl_log_c
+++ b/devel/gettext/patches/patch-gettext-runtime_intl_log_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-gettext-runtime_intl_log_c,v 1.4 2013/01/21 22:08:52 naddy Exp $
 --- gettext-runtime/intl/log.c.orig	Tue Dec  4 07:28:58 2012
 +++ gettext-runtime/intl/log.c	Wed Jan 16 23:06:10 2013
 @@ -66,6 +66,7 @@ _nl_log_untranslated_locked (const char *logfilename, 
diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_relocatable_c b/devel/gettext/patches/patch-gettext-runtime_intl_relocatable_c
index ba9e75a425d..5ab6382dc18 100644
--- a/devel/gettext/patches/patch-gettext-runtime_intl_relocatable_c
+++ b/devel/gettext/patches/patch-gettext-runtime_intl_relocatable_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-gettext-runtime_intl_relocatable_c,v 1.7 2020/08/20 21:03:25 naddy Exp $
 Index: gettext-runtime/intl/relocatable.c
 --- gettext-runtime/intl/relocatable.c.orig
 +++ gettext-runtime/intl/relocatable.c
diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_vasnprintf_c b/devel/gettext/patches/patch-gettext-runtime_intl_vasnprintf_c
index 34343f2bb62..4db7a0c35da 100644
--- a/devel/gettext/patches/patch-gettext-runtime_intl_vasnprintf_c
+++ b/devel/gettext/patches/patch-gettext-runtime_intl_vasnprintf_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-runtime_intl_vasnprintf_c,v 1.1 2020/10/07 21:14:35 jca Exp $
-
 Don't use printf %n.
 
 Index: gettext-runtime/intl/vasnprintf.c
diff --git a/devel/gettext/patches/patch-gettext-runtime_libasprintf_vasnprintf_c b/devel/gettext/patches/patch-gettext-runtime_libasprintf_vasnprintf_c
index cff0879a12b..067e2953f1e 100644
--- a/devel/gettext/patches/patch-gettext-runtime_libasprintf_vasnprintf_c
+++ b/devel/gettext/patches/patch-gettext-runtime_libasprintf_vasnprintf_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-runtime_libasprintf_vasnprintf_c,v 1.2 2020/10/23 21:34:05 jca Exp $
-
 Don't use printf %n.
 https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
 
diff --git a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in
index 4d4e51f6d45..f870da28d4d 100644
--- a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in
+++ b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-tools_gnulib-lib_Makefile_in,v 1.12 2020/08/20 21:03:25 naddy Exp $
-
 Use standard shared library versioning.
 
 Do not remove static library after building.
diff --git a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_asyncsafe-spin_c b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_asyncsafe-spin_c
index 0981a072ced..38c9d930574 100644
--- a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_asyncsafe-spin_c
+++ b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_asyncsafe-spin_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-tools_gnulib-lib_asyncsafe-spin_c,v 1.1 2021/02/03 16:49:43 kurt Exp $
-
 - fix undefined reference to `__sync_val_compare_and_swap_4' on hppa
 
 Index: gettext-tools/gnulib-lib/asyncsafe-spin.c
diff --git a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_vasnprintf_c b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_vasnprintf_c
index 931650385cf..b1881f63c8b 100644
--- a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_vasnprintf_c
+++ b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_vasnprintf_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-tools_gnulib-lib_vasnprintf_c,v 1.2 2020/10/23 21:34:05 jca Exp $
-
 Don't use printf %n.
 https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
 
diff --git a/devel/gettext/patches/patch-gettext-tools_libgettextpo_vasnprintf_c b/devel/gettext/patches/patch-gettext-tools_libgettextpo_vasnprintf_c
index b1dfe75c0e6..9a8107afe2b 100644
--- a/devel/gettext/patches/patch-gettext-tools_libgettextpo_vasnprintf_c
+++ b/devel/gettext/patches/patch-gettext-tools_libgettextpo_vasnprintf_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-tools_libgettextpo_vasnprintf_c,v 1.2 2020/10/23 21:34:05 jca Exp $
-
 Don't use printf %n.
 https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
 
diff --git a/devel/gettext/patches/patch-gettext-tools_src_Makefile_in b/devel/gettext/patches/patch-gettext-tools_src_Makefile_in
index 16f690d8d36..635d59cb963 100644
--- a/devel/gettext/patches/patch-gettext-tools_src_Makefile_in
+++ b/devel/gettext/patches/patch-gettext-tools_src_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gettext-tools_src_Makefile_in,v 1.13 2020/08/20 21:03:25 naddy Exp $
-
 Use standard shared library versioning.
 
 Do not remove static library after building.  
diff --git a/devel/gettext/patches/patch-libtextstyle_lib_vasnprintf_c b/devel/gettext/patches/patch-libtextstyle_lib_vasnprintf_c
index 0e3ffa2e859..f63dc7160b9 100644
--- a/devel/gettext/patches/patch-libtextstyle_lib_vasnprintf_c
+++ b/devel/gettext/patches/patch-libtextstyle_lib_vasnprintf_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libtextstyle_lib_vasnprintf_c,v 1.2 2020/10/23 21:34:05 jca Exp $
-
 Don't use printf %n.
 https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
 
diff --git a/devel/gettext/pkg/PLIST-runtime b/devel/gettext/pkg/PLIST-runtime
index 980b9d75c33..cc3121d9d8e 100644
--- a/devel/gettext/pkg/PLIST-runtime
+++ b/devel/gettext/pkg/PLIST-runtime
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-runtime,v 1.2 2020/02/13 20:50:13 naddy Exp $
 @conflict gettext-*
 @pkgpath devel/gettext
 @bin bin/envsubst
diff --git a/devel/gettext/pkg/PLIST-textstyle b/devel/gettext/pkg/PLIST-textstyle
index 6795f7fc9fe..4d4180f88d3 100644
--- a/devel/gettext/pkg/PLIST-textstyle
+++ b/devel/gettext/pkg/PLIST-textstyle
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-textstyle,v 1.2 2020/02/13 20:50:13 naddy Exp $
 include/textstyle/
 include/textstyle.h
 include/textstyle/stdbool.h
diff --git a/devel/gettext/pkg/PLIST-tools b/devel/gettext/pkg/PLIST-tools
index fdf792b8de7..b513775bf13 100644
--- a/devel/gettext/pkg/PLIST-tools
+++ b/devel/gettext/pkg/PLIST-tools
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-tools,v 1.4 2020/08/20 21:03:25 naddy Exp $
 @pkgpath devel/gettext-tools
 bin/autopoint
 bin/gettextize
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index bd7570c78ea..33c153d1180 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.45 2021/11/22 15:00:41 espie Exp $
-
 COMMENT-main=	library for arbitrary precision arithmetic
 COMMENT-cxx=	C++ library for arbitrary precision arithmetic
 
diff --git a/devel/gmp/patches/patch-mpn_asm-defs_m4 b/devel/gmp/patches/patch-mpn_asm-defs_m4
index f1dd526468b..49f9b9987d8 100644
--- a/devel/gmp/patches/patch-mpn_asm-defs_m4
+++ b/devel/gmp/patches/patch-mpn_asm-defs_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mpn_asm-defs_m4,v 1.1 2021/09/10 20:29:04 gkoehler Exp $
-
 Fix libgmp.a on powerpc, which needs the PIC asm, because OpenBSD uses
 PIE position-independent executables.  powerpc and powerpc64 define
 PIC_ALWAYS to `yes', but the quotes on `PIC_ALWAYS' broke the macro
diff --git a/devel/gmp/patches/patch-mpn_sparc32_sparc-defs_m4 b/devel/gmp/patches/patch-mpn_sparc32_sparc-defs_m4
index abf7aace304..065e9805997 100644
--- a/devel/gmp/patches/patch-mpn_sparc32_sparc-defs_m4
+++ b/devel/gmp/patches/patch-mpn_sparc32_sparc-defs_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mpn_sparc32_sparc-defs_m4,v 1.1 2020/02/21 23:36:55 naddy Exp $
-
 as(1) from binutils 2.17 does not support %gdop().  Partially revert
 https://gmplib.org/repo/gmp/rev/20cf1131dc94
 
diff --git a/devel/gmp/pkg/PLIST-cxx b/devel/gmp/pkg/PLIST-cxx
index f8b2d20bea9..d824325fc69 100644
--- a/devel/gmp/pkg/PLIST-cxx
+++ b/devel/gmp/pkg/PLIST-cxx
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-cxx,v 1.2 2020/02/21 23:36:55 naddy Exp $
 @conflict gmp-<6.1.2p2
 include/gmpxx.h
 @static-lib lib/libgmpxx.a
diff --git a/devel/gmp/pkg/PLIST-main b/devel/gmp/pkg/PLIST-main
index 020b02f89c1..26a4e6b0dfc 100644
--- a/devel/gmp/pkg/PLIST-main
+++ b/devel/gmp/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2020/02/21 23:36:55 naddy Exp $
 @pkgpath devel/gmp
 include/gmp.h
 @info info/gmp.info
diff --git a/devel/libidn2/Makefile b/devel/libidn2/Makefile
index eb7d8d6235a..1ceee6fa9b9 100644
--- a/devel/libidn2/Makefile
+++ b/devel/libidn2/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2019/11/23 21:43:21 naddy Exp $
-
 COMMENT=	implementation of IDNA2008 internationalized domain names
 
 DISTNAME=	libidn2-2.3.0
diff --git a/devel/libidn2/patches/patch-lib_puny_decode_c b/devel/libidn2/patches/patch-lib_puny_decode_c
index 12a27164b8c..dba8836cbe0 100644
--- a/devel/libidn2/patches/patch-lib_puny_decode_c
+++ b/devel/libidn2/patches/patch-lib_puny_decode_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_puny_decode_c,v 1.1 2019/11/23 21:43:21 naddy Exp $
-
 The version script already maps _idn2* to _idn2*@IDN2_0.0.0.  Do not
 create a duplicate entry with .symver that ld.bfd cannot handle.
 
diff --git a/devel/libidn2/patches/patch-lib_puny_encode_c b/devel/libidn2/patches/patch-lib_puny_encode_c
index 1379fdc0853..5563bf9c423 100644
--- a/devel/libidn2/patches/patch-lib_puny_encode_c
+++ b/devel/libidn2/patches/patch-lib_puny_encode_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_puny_encode_c,v 1.1 2019/11/23 21:43:21 naddy Exp $
-
 The version script already maps _idn2* to _idn2*@IDN2_0.0.0.  Do not
 create a duplicate entry with .symver that ld.bfd cannot handle.
 
diff --git a/devel/libidn2/patches/patch-src_idn2_c b/devel/libidn2/patches/patch-src_idn2_c
index 99ac66cc6d4..3952b476b9a 100644
--- a/devel/libidn2/patches/patch-src_idn2_c
+++ b/devel/libidn2/patches/patch-src_idn2_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_idn2_c,v 1.3 2019/11/21 22:09:14 naddy Exp $
 Index: src/idn2.c
 --- src/idn2.c.orig
 +++ src/idn2.c
diff --git a/devel/libidn2/pkg/PLIST b/devel/libidn2/pkg/PLIST
index bd2de45a36f..24e3eaee83c 100644
--- a/devel/libidn2/pkg/PLIST
+++ b/devel/libidn2/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2019/11/21 22:09:14 naddy Exp $
 @bin bin/idn2
 include/idn2.h
 @info info/libidn2.info
diff --git a/devel/libzen/Makefile b/devel/libzen/Makefile
index 36cac2f9758..081d3d27865 100644
--- a/devel/libzen/Makefile
+++ b/devel/libzen/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/04/29 20:13:45 naddy Exp $
-
 COMMENT=	C++ utility library
 
 VERSION=	0.4.39
diff --git a/devel/libzen/patches/patch-Project_GNU_Library_configure_ac b/devel/libzen/patches/patch-Project_GNU_Library_configure_ac
index 62c03c5ff4d..6df1a7ea9a3 100644
--- a/devel/libzen/patches/patch-Project_GNU_Library_configure_ac
+++ b/devel/libzen/patches/patch-Project_GNU_Library_configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Project_GNU_Library_configure_ac,v 1.1.1.1 2021/04/29 20:13:45 naddy Exp $
-
 Index: Project/GNU/Library/configure.ac
 --- Project/GNU/Library/configure.ac.orig
 +++ Project/GNU/Library/configure.ac
diff --git a/devel/libzen/pkg/PLIST b/devel/libzen/pkg/PLIST
index 6fe755cbf2a..8e4f28f9369 100644
--- a/devel/libzen/pkg/PLIST
+++ b/devel/libzen/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/04/29 20:13:45 naddy Exp $
 include/ZenLib/
 include/ZenLib/BitStream.h
 include/ZenLib/BitStream_Fast.h
diff --git a/devel/mpfr/Makefile b/devel/mpfr/Makefile
index afd7df3ea91..b9057e0f111 100644
--- a/devel/mpfr/Makefile
+++ b/devel/mpfr/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.25 2020/11/19 21:08:04 naddy Exp $
-
 COMMENT=	library for multiple-precision floating-point computations
 
 DISTNAME=	mpfr-4.1.0
diff --git a/devel/mpfr/pkg/PLIST b/devel/mpfr/pkg/PLIST
index bfc54d63c6b..fbfb9b0fceb 100644
--- a/devel/mpfr/pkg/PLIST
+++ b/devel/mpfr/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2020/11/19 21:08:04 naddy Exp $
 @conflict gmp-<4.2
 include/mpf2mpfr.h
 include/mpfr.h
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index c039445049e..7c037ecdd68 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.22 2019/10/17 18:34:27 naddy Exp $
-
 COMMENT=	binary visual display editor, based on vi
 
 DISTNAME=	bvi-1.4.1
diff --git a/editors/bvi/patches/patch-Makefile_in b/editors/bvi/patches/patch-Makefile_in
index e2085743670..d2b3a8ee925 100644
--- a/editors/bvi/patches/patch-Makefile_in
+++ b/editors/bvi/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2014/10/27 21:59:32 naddy Exp $
 --- Makefile.in.orig	Wed Oct  1 20:59:36 2014
 +++ Makefile.in	Mon Oct 27 22:38:09 2014
 @@ -57,7 +57,8 @@ bvi: $(OBJS) $(HEADER)
diff --git a/editors/bvi/pkg/PLIST b/editors/bvi/pkg/PLIST
index c5577ab5bbf..d894bbe9c32 100644
--- a/editors/bvi/pkg/PLIST
+++ b/editors/bvi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2014/10/27 21:59:32 naddy Exp $
 @bin bin/bmore
 @bin bin/bvedit
 @bin bin/bvi
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 3abde0cc221..6a2c48890fe 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.126 2022/02/27 14:36:46 naddy Exp $
-
 COMMENT=	simple editor, inspired by Pico
 
 DISTNAME=	nano-6.2
diff --git a/editors/nano/patches/patch-src_Makefile_in b/editors/nano/patches/patch-src_Makefile_in
index 66b6d70b38d..9d642488ecc 100644
--- a/editors/nano/patches/patch-src_Makefile_in
+++ b/editors/nano/patches/patch-src_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_Makefile_in,v 1.28 2021/12/20 15:23:35 mestre Exp $
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
diff --git a/editors/nano/pkg/PLIST b/editors/nano/pkg/PLIST
index 5837e5e2cdd..e567b2b7815 100644
--- a/editors/nano/pkg/PLIST
+++ b/editors/nano/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.38 2021/12/20 15:23:36 mestre Exp $
 @pkgpath editors/nano,slang
 @bin bin/nano
 bin/rnano
diff --git a/education/gtypist/Makefile b/education/gtypist/Makefile
index b40f09679fe..807668a53ae 100644
--- a/education/gtypist/Makefile
+++ b/education/gtypist/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.36 2019/07/12 20:46:07 sthen Exp $
-
 COMMENT=	interactive typing tutor
 
 DISTNAME=	gtypist-2.9.5
diff --git a/education/gtypist/pkg/PLIST b/education/gtypist/pkg/PLIST
index 5d1c1e7e483..8b87757d683 100644
--- a/education/gtypist/pkg/PLIST
+++ b/education/gtypist/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.13 2018/05/20 08:43:45 espie Exp $
 @bin bin/gtypist
 bin/typefortune
 @info info/gtypist.cs.info
diff --git a/education/verbiste/Makefile b/education/verbiste/Makefile
index 1d2aa1ea8ae..943d7b1e089 100644
--- a/education/verbiste/Makefile
+++ b/education/verbiste/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.47 2020/03/26 20:51:02 naddy Exp $
-
 COMMENT=	French and Italian conjugation system
 
 DISTNAME=	verbiste-0.1.47
diff --git a/education/verbiste/patches/patch-Makefile_in b/education/verbiste/patches/patch-Makefile_in
index 5567a59ceb6..3d5c6540449 100644
--- a/education/verbiste/patches/patch-Makefile_in
+++ b/education/verbiste/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.8 2019/10/03 22:43:39 naddy Exp $
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
diff --git a/education/verbiste/pkg/PLIST b/education/verbiste/pkg/PLIST
index e19fda45fab..283948061e2 100644
--- a/education/verbiste/pkg/PLIST
+++ b/education/verbiste/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.15 2019/07/31 17:30:30 naddy Exp $
 @bin bin/french-conjugator
 @bin bin/french-deconjugator
 @bin bin/verbiste-gtk
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 4693c7c2c07..959fc0d1fbe 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.49 2019/07/12 20:47:40 sthen Exp $
-
 COMMENT=	RPN and algebraic scientific calculator
 
 DISTNAME=	calcoo-1.3.18
diff --git a/math/calcoo/patches/patch-src_Makefile_in b/math/calcoo/patches/patch-src_Makefile_in
index 8e589a948ba..f2f4e774300 100644
--- a/math/calcoo/patches/patch-src_Makefile_in
+++ b/math/calcoo/patches/patch-src_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2018/04/28 15:32:48 naddy Exp $
-
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
diff --git a/math/calcoo/pkg/PLIST b/math/calcoo/pkg/PLIST
index a9747e29fc2..d2be9ad0a20 100644
--- a/math/calcoo/pkg/PLIST
+++ b/math/calcoo/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/05/20 08:21:35 espie Exp $
 @bin bin/calcoo
 @man man/man1/calcoo.1
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 963649a76c4..9bde24ce2e7 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.62 2021/01/28 20:12:13 naddy Exp $
-
 COMMENT=	GTK-based scientific calculator
 
 GH_ACCOUNT=	galculator
diff --git a/math/galculator/patches/patch-src_config_file_c b/math/galculator/patches/patch-src_config_file_c
index 3d7ed1ca049..66846ec9f8d 100644
--- a/math/galculator/patches/patch-src_config_file_c
+++ b/math/galculator/patches/patch-src_config_file_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_config_file_c,v 1.1 2021/01/28 20:12:13 naddy Exp $
-
 Fix with -fno-common
 
 Index: src/config_file.c
diff --git a/math/galculator/pkg/PLIST b/math/galculator/pkg/PLIST
index eff9b865c2d..61175d3cd23 100644
--- a/math/galculator/pkg/PLIST
+++ b/math/galculator/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.22 2018/06/29 22:16:17 espie Exp $
 @bin bin/galculator
 @man man/man1/galculator.1
 share/appdata/
diff --git a/misc/bible-kjv/Makefile b/misc/bible-kjv/Makefile
index f890b1e4888..475482aba01 100644
--- a/misc/bible-kjv/Makefile
+++ b/misc/bible-kjv/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.13 2021/11/14 18:33:07 naddy Exp $
-
 COMMENT=	Bible reading, browsing, and searching tool
 
 DISTNAME=	bible-kjv_4.37
diff --git a/misc/bible-kjv/patches/patch-makeconcfile_c b/misc/bible-kjv/patches/patch-makeconcfile_c
index 129808e6ffe..1eae6283fd6 100644
--- a/misc/bible-kjv/patches/patch-makeconcfile_c
+++ b/misc/bible-kjv/patches/patch-makeconcfile_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-makeconcfile_c,v 1.1.1.1 2011/09/19 20:20:42 naddy Exp $
 --- makeconcfile.c.orig	Sun Sep 18 18:08:18 2011
 +++ makeconcfile.c	Sun Sep 18 18:08:40 2011
 @@ -201,7 +201,7 @@ int main(int argc,char **argv)
diff --git a/misc/bible-kjv/patches/patch-makeindex2 b/misc/bible-kjv/patches/patch-makeindex2
index 29700736fdd..864d0ec39d4 100644
--- a/misc/bible-kjv/patches/patch-makeindex2
+++ b/misc/bible-kjv/patches/patch-makeindex2
@@ -1,4 +1,3 @@
-$OpenBSD: patch-makeindex2,v 1.1.1.1 2011/09/19 20:20:42 naddy Exp $
 --- makeindex2.orig	Sun Sep 18 17:39:32 2011
 +++ makeindex2	Sun Sep 18 17:39:37 2011
 @@ -1,4 +1,4 @@
diff --git a/misc/bible-kjv/pkg/PLIST b/misc/bible-kjv/pkg/PLIST
index c7fb401a4f3..fd644d09146 100644
--- a/misc/bible-kjv/pkg/PLIST
+++ b/misc/bible-kjv/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/19 20:20:42 naddy Exp $
 @bin bin/bible
 @bin bin/randverse
 lib/bible.data
diff --git a/misc/teseq/Makefile b/misc/teseq/Makefile
index 22905897841..62012dafd19 100644
--- a/misc/teseq/Makefile
+++ b/misc/teseq/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:47:54 sthen Exp $
-
 COMMENT=	analyze terminal control sequences
 
 DISTNAME=	teseq-1.1.1
diff --git a/misc/teseq/pkg/PLIST b/misc/teseq/pkg/PLIST
index 6a25d02e8dc..748ac8bb2d8 100644
--- a/misc/teseq/pkg/PLIST
+++ b/misc/teseq/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/06/14 15:37:29 naddy Exp $
 bin/reseq
 @bin bin/teseq
 @info info/teseq.info
diff --git a/misc/vttest/Makefile b/misc/vttest/Makefile
index fd000f357aa..3fa1035c43d 100644
--- a/misc/vttest/Makefile
+++ b/misc/vttest/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.25 2022/02/27 14:41:06 naddy Exp $
-
 COMMENT=	test VT100-type terminal
 
 DISTNAME=	vttest-20220215
diff --git a/misc/vttest/pkg/PLIST b/misc/vttest/pkg/PLIST
index 89d02778eaa..bceac11b147 100644
--- a/misc/vttest/pkg/PLIST
+++ b/misc/vttest/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/10/13 16:52:40 nicm Exp $
 @bin bin/vttest
 @man man/man1/vttest.1
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index 392999c2439..181c5721f9f 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2021/11/29 19:53:57 naddy Exp $
-
 COMMENT=	read metadata from media files
 
 VERSION=	21.09
diff --git a/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac b/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac
index 82ad375a809..a4306f550f9 100644
--- a/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac
+++ b/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Project_GNU_Library_configure_ac,v 1.1.1.1 2021/04/29 20:16:01 naddy Exp $
-
 Index: Project/GNU/Library/configure.ac
 --- Project/GNU/Library/configure.ac.orig
 +++ Project/GNU/Library/configure.ac
diff --git a/multimedia/libmediainfo/pkg/PLIST b/multimedia/libmediainfo/pkg/PLIST
index 63d560e5e0e..80cd3a49b07 100644
--- a/multimedia/libmediainfo/pkg/PLIST
+++ b/multimedia/libmediainfo/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/04/29 20:16:01 naddy Exp $
 include/MediaInfo/
 include/MediaInfo/MediaInfo.h
 include/MediaInfo/MediaInfoList.h
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 7ccca409608..8c41f1eb20e 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.26 2021/11/29 19:53:57 naddy Exp $
-
 COMMENT=	utility for reading information from audio/video files
 
 VERSION=	21.09
diff --git a/multimedia/mediainfo/patches/patch-Project_GNU_CLI_configure_ac b/multimedia/mediainfo/patches/patch-Project_GNU_CLI_configure_ac
index 5d35ec1e87f..aa1fd69fcb3 100644
--- a/multimedia/mediainfo/patches/patch-Project_GNU_CLI_configure_ac
+++ b/multimedia/mediainfo/patches/patch-Project_GNU_CLI_configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Project_GNU_CLI_configure_ac,v 1.1 2021/04/29 20:19:54 naddy Exp $
-
 Index: Project/GNU/CLI/configure.ac
 --- Project/GNU/CLI/configure.ac.orig
 +++ Project/GNU/CLI/configure.ac
diff --git a/multimedia/mediainfo/pkg/PLIST b/multimedia/mediainfo/pkg/PLIST
index 41b0a4bf614..2f89049a35f 100644
--- a/multimedia/mediainfo/pkg/PLIST
+++ b/multimedia/mediainfo/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/06/13 20:48:58 naddy Exp $
 @bin bin/mediainfo
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 4d0173b13c0..4e25a48a390 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.126 2022/01/05 21:59:59 naddy Exp $
-
 COMMENT=	GNU Bourne Again Shell
 
 DISTNAME=	bash-5.1.16
diff --git a/shells/bash/patches/patch-Makefile_in b/shells/bash/patches/patch-Makefile_in
index 6dcf40b7d19..f78138700b4 100644
--- a/shells/bash/patches/patch-Makefile_in
+++ b/shells/bash/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.7 2020/12/08 20:45:15 naddy Exp $
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
diff --git a/shells/bash/pkg/PLIST b/shells/bash/pkg/PLIST
index d87c13062e9..4bccfc2aad1 100644
--- a/shells/bash/pkg/PLIST
+++ b/shells/bash/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.19 2020/12/08 20:45:16 naddy Exp $
 @pkgpath shells/bash,static
 @shell bin/bash
 bin/bashbug
diff --git a/sysutils/colorls/Makefile b/sysutils/colorls/Makefile
index b427cc91fe0..a85ba8da700 100644
--- a/sysutils/colorls/Makefile
+++ b/sysutils/colorls/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.41 2021/05/09 13:38:57 naddy Exp $
-
 COMMENT=	ls(1) that can use color to display file attributes
 
 VERSION=	6.9
diff --git a/sysutils/colorls/patches/patch-Makefile b/sysutils/colorls/patches/patch-Makefile
index 7a1e13b8b1e..1daa95084da 100644
--- a/sysutils/colorls/patches/patch-Makefile
+++ b/sysutils/colorls/patches/patch-Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.14 2018/03/14 21:50:56 naddy Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/sysutils/colorls/patches/patch-colorls_1 b/sysutils/colorls/patches/patch-colorls_1
index 0b72d72552e..4ef71b4bbc2 100644
--- a/sysutils/colorls/patches/patch-colorls_1
+++ b/sysutils/colorls/patches/patch-colorls_1
@@ -1,4 +1,3 @@
-$OpenBSD: patch-colorls_1,v 1.18 2018/03/14 21:50:56 naddy Exp $
 Index: colorls.1
 --- colorls.1.orig
 +++ colorls.1
diff --git a/sysutils/colorls/patches/patch-extern_h b/sysutils/colorls/patches/patch-extern_h
index 01aa94f71f8..625a25b03c1 100644
--- a/sysutils/colorls/patches/patch-extern_h
+++ b/sysutils/colorls/patches/patch-extern_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-extern_h,v 1.6 2016/04/06 18:53:16 naddy Exp $
 --- extern.h.orig	Tue Dec  1 19:36:13 2015
 +++ extern.h	Wed Apr  6 19:12:57 2016
 @@ -52,3 +52,13 @@ void	 printlong(DISPLAY *);
diff --git a/sysutils/colorls/patches/patch-ls_c b/sysutils/colorls/patches/patch-ls_c
index f69ce133535..fdf0bad055b 100644
--- a/sysutils/colorls/patches/patch-ls_c
+++ b/sysutils/colorls/patches/patch-ls_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-ls_c,v 1.19 2021/05/09 13:38:57 naddy Exp $
 --- ls.c.orig	Fri Aug  5 21:32:46 2016
 +++ ls.c	Fri Aug  5 21:41:30 2016
 @@ -50,6 +50,10 @@
diff --git a/sysutils/colorls/patches/patch-ls_h b/sysutils/colorls/patches/patch-ls_h
index f6dd59fa2c2..487b3e498eb 100644
--- a/sysutils/colorls/patches/patch-ls_h
+++ b/sysutils/colorls/patches/patch-ls_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-ls_h,v 1.4 2007/08/11 17:52:11 naddy Exp $
 --- ls.h.orig	Mon May  7 20:39:28 2007
 +++ ls.h	Sat Aug 11 19:28:48 2007
 @@ -51,6 +51,9 @@ extern int f_size;		/* list size in short listing */
diff --git a/sysutils/colorls/patches/patch-print_c b/sysutils/colorls/patches/patch-print_c
index 06345f4708b..9479bc6be6a 100644
--- a/sysutils/colorls/patches/patch-print_c
+++ b/sysutils/colorls/patches/patch-print_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-print_c,v 1.17 2021/05/09 13:38:57 naddy Exp $
 Index: print.c
 --- print.c.orig
 +++ print.c
diff --git a/sysutils/colorls/patches/patch-util_c b/sysutils/colorls/patches/patch-util_c
index c3c2a8f07d0..4fa60340905 100644
--- a/sysutils/colorls/patches/patch-util_c
+++ b/sysutils/colorls/patches/patch-util_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-util_c,v 1.11 2016/04/06 18:53:16 naddy Exp $
 --- util.c.orig	Tue Dec  1 19:36:13 2015
 +++ util.c	Wed Apr  6 20:28:44 2016
 @@ -64,7 +64,11 @@ void
diff --git a/sysutils/colorls/pkg/PLIST b/sysutils/colorls/pkg/PLIST
index 826042c1525..c4c8bec927e 100644
--- a/sysutils/colorls/pkg/PLIST
+++ b/sysutils/colorls/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/06/23 22:50:29 naddy Exp $
 @bin bin/colorls
 @man man/man1/colorls.1
diff --git a/sysutils/find2perl/Makefile b/sysutils/find2perl/Makefile
index 8f56c6835b9..f90337ac11f 100644
--- a/sysutils/find2perl/Makefile
+++ b/sysutils/find2perl/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/05/16 15:13:03 naddy Exp $
-
 COMMENT=	translate find command lines to Perl code
 
 V=		1.005
diff --git a/sysutils/find2perl/pkg/PLIST b/sysutils/find2perl/pkg/PLIST
index 9070772c400..6f03c69fb58 100644
--- a/sysutils/find2perl/pkg/PLIST
+++ b/sysutils/find2perl/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/05/16 15:13:03 naddy Exp $
 bin/find2perl
 @comment ${P5SITE}/App/
 @comment ${P5SITE}/App/find2perl.pm
diff --git a/sysutils/ggrep/Makefile b/sysutils/ggrep/Makefile
index 13f841a6e75..eb010f7377a 100644
--- a/sysutils/ggrep/Makefile
+++ b/sysutils/ggrep/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.40 2021/09/10 18:44:55 jasper Exp $
-
 COMMENT=	GNU versions of grep pattern matching utilities
 
 DISTNAME=	grep-3.7
diff --git a/sysutils/ggrep/patches/patch-lib_sigsegv_c b/sysutils/ggrep/patches/patch-lib_sigsegv_c
index 54f140442c4..1374e219a26 100644
--- a/sysutils/ggrep/patches/patch-lib_sigsegv_c
+++ b/sysutils/ggrep/patches/patch-lib_sigsegv_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_sigsegv_c,v 1.1 2021/09/10 18:44:55 jasper Exp $
-
 Index: lib/sigsegv.c
 --- lib/sigsegv.c.orig
 +++ lib/sigsegv.c
diff --git a/sysutils/ggrep/pkg/PLIST b/sysutils/ggrep/pkg/PLIST
index 602822f6bec..f4ff7e36e1e 100644
--- a/sysutils/ggrep/pkg/PLIST
+++ b/sysutils/ggrep/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2014/08/27 01:36:16 gsoares Exp $
 bin/gegrep
 bin/gfgrep
 @bin bin/ggrep
diff --git a/sysutils/ncal/Makefile b/sysutils/ncal/Makefile
index a4c17eb7a2d..6e444fe500f 100644
--- a/sysutils/ncal/Makefile
+++ b/sysutils/ncal/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2020/05/25 19:56:40 naddy Exp $
-
 COMMENT=	display a calendar and the date of Easter
 
 DISTNAME=	ncal-334873
diff --git a/sysutils/ncal/files/Makefile b/sysutils/ncal/files/Makefile
index 25aa31a1b03..b9dc1f79498 100644
--- a/sysutils/ncal/files/Makefile
+++ b/sysutils/ncal/files/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/09/09 13:31:23 naddy Exp $
-
 .PATH:	${.CURDIR}/../libcalendar
 
 PROG=	ncal
diff --git a/sysutils/ncal/patches/patch-ncal_ncal_1 b/sysutils/ncal/patches/patch-ncal_ncal_1
index 05542daff2b..bbe2c860cee 100644
--- a/sysutils/ncal/patches/patch-ncal_ncal_1
+++ b/sysutils/ncal/patches/patch-ncal_ncal_1
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ncal_ncal_1,v 1.1.1.1 2018/09/09 13:31:23 naddy Exp $
-
 Index: ncal/ncal.1
 --- ncal/ncal.1.orig
 +++ ncal/ncal.1
diff --git a/sysutils/ncal/patches/patch-ncal_ncal_c b/sysutils/ncal/patches/patch-ncal_ncal_c
index c25fa12a320..2ef8078d8a3 100644
--- a/sysutils/ncal/patches/patch-ncal_ncal_c
+++ b/sysutils/ncal/patches/patch-ncal_ncal_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ncal_ncal_c,v 1.1.1.1 2018/09/09 13:31:23 naddy Exp $
-
 In the FreeBSD POSIX locale, nl_langinfo(D_MD_ORDER) returns "md".
 
 Index: ncal/ncal.c
diff --git a/sysutils/ncal/pkg/PLIST b/sysutils/ncal/pkg/PLIST
index 78dbd011ed7..095b7d7bcfa 100644
--- a/sysutils/ncal/pkg/PLIST
+++ b/sysutils/ncal/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/09/09 13:31:23 naddy Exp $
 @bin bin/ncal
 @man man/man1/ncal.1
diff --git a/telephony/siproxd/Makefile b/telephony/siproxd/Makefile
index ec9c3edab06..e1235d6eac7 100644
--- a/telephony/siproxd/Makefile
+++ b/telephony/siproxd/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.19 2020/10/02 19:22:09 naddy Exp $
-
 COMMENT=	proxy/masquerading daemon for the SIP protocol
 
 DISTNAME=	siproxd-0.8.3
diff --git a/telephony/siproxd/patches/patch-doc_siproxd_conf_example b/telephony/siproxd/patches/patch-doc_siproxd_conf_example
index ccedd24011c..5c7ddc4bb08 100644
--- a/telephony/siproxd/patches/patch-doc_siproxd_conf_example
+++ b/telephony/siproxd/patches/patch-doc_siproxd_conf_example
@@ -1,4 +1,3 @@
-$OpenBSD: patch-doc_siproxd_conf_example,v 1.6 2020/10/02 19:22:09 naddy Exp $
 Index: doc/siproxd.conf.example
 --- doc/siproxd.conf.example.orig
 +++ doc/siproxd.conf.example
diff --git a/telephony/siproxd/patches/patch-src_Makefile_in b/telephony/siproxd/patches/patch-src_Makefile_in
index 66b3df91d21..e9f87a61c76 100644
--- a/telephony/siproxd/patches/patch-src_Makefile_in
+++ b/telephony/siproxd/patches/patch-src_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_Makefile_in,v 1.5 2020/10/02 19:22:09 naddy Exp $
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
diff --git a/telephony/siproxd/patches/patch-src_siproxd_c b/telephony/siproxd/patches/patch-src_siproxd_c
index 93688ec7be3..32654b77479 100644
--- a/telephony/siproxd/patches/patch-src_siproxd_c
+++ b/telephony/siproxd/patches/patch-src_siproxd_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_siproxd_c,v 1.2 2020/10/02 19:22:09 naddy Exp $
 This prevents siproxd from creating a redundant PID file outside the chroot jail
 Index: src/siproxd.c
 --- src/siproxd.c.orig
diff --git a/telephony/siproxd/pkg/PLIST b/telephony/siproxd/pkg/PLIST
index 21ddf9e6c3a..98dcb35164c 100644
--- a/telephony/siproxd/pkg/PLIST
+++ b/telephony/siproxd/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2020/10/02 19:22:09 naddy Exp $
 @newgroup _siproxd:574
 @newuser _siproxd:574:574:daemon:SIP proxy:/var/empty:/sbin/nologin
 @rcscript ${RCDIR}/siproxd
diff --git a/telephony/siproxd/pkg/siproxd.rc b/telephony/siproxd/pkg/siproxd.rc
index d28773ed43e..3cbf32a555d 100644
--- a/telephony/siproxd/pkg/siproxd.rc
+++ b/telephony/siproxd/pkg/siproxd.rc
@@ -1,6 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: siproxd.rc,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/siproxd"
 
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index a5fa30d9a18..a93e88ee11d 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.54 2019/07/12 20:51:29 sthen Exp $
-
 COMMENT=	graphics file viewer for X11
 
 VERSION=	4.1
diff --git a/x11/xloadimage/patches/patch-Makefile.in b/x11/xloadimage/patches/patch-Makefile.in
index 6d36fe011e0..9822563f2d3 100644
--- a/x11/xloadimage/patches/patch-Makefile.in
+++ b/x11/xloadimage/patches/patch-Makefile.in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile.in,v 1.3 2001/07/10 21:12:00 naddy Exp $
 --- Makefile.in.orig	Tue Jul 10 19:24:46 2001
 +++ Makefile.in	Tue Jul 10 19:25:21 2001
 @@ -3,8 +3,8 @@
diff --git a/x11/xloadimage/patches/patch-cmuwmraster_c b/x11/xloadimage/patches/patch-cmuwmraster_c
index 00ff2354b74..d29d56fea95 100644
--- a/x11/xloadimage/patches/patch-cmuwmraster_c
+++ b/x11/xloadimage/patches/patch-cmuwmraster_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-cmuwmraster_c,v 1.1 2008/07/16 14:38:32 naddy Exp $
 --- cmuwmraster.c.orig	Wed Jul 16 16:22:59 2008
 +++ cmuwmraster.c	Wed Jul 16 16:23:21 2008
 @@ -22,9 +22,9 @@ struct cmuwm_header *headerp;
diff --git a/x11/xloadimage/patches/patch-image_h b/x11/xloadimage/patches/patch-image_h
index 3060ce670db..0adc13ab947 100644
--- a/x11/xloadimage/patches/patch-image_h
+++ b/x11/xloadimage/patches/patch-image_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-image_h,v 1.2 2012/04/13 10:56:41 naddy Exp $
 --- image.h.orig	Fri Apr 13 12:46:25 2012
 +++ image.h	Fri Apr 13 12:47:21 2012
 @@ -163,7 +163,7 @@ typedef struct {
diff --git a/x11/xloadimage/patches/patch-xloadimage.man b/x11/xloadimage/patches/patch-xloadimage.man
index ac21921add8..751296c3631 100644
--- a/x11/xloadimage/patches/patch-xloadimage.man
+++ b/x11/xloadimage/patches/patch-xloadimage.man
@@ -1,4 +1,3 @@
-$OpenBSD: patch-xloadimage.man,v 1.5 2013/12/12 13:22:41 naddy Exp $
 --- xloadimage.man.orig	Wed Dec 11 23:44:28 2013
 +++ xloadimage.man	Wed Dec 11 23:45:46 2013
 @@ -633,7 +633,7 @@ distribution.
diff --git a/x11/xloadimage/pkg/PLIST b/x11/xloadimage/pkg/PLIST
index 38ee1095b83..eeb491815a3 100644
--- a/x11/xloadimage/pkg/PLIST
+++ b/x11/xloadimage/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.10 2017/06/19 17:11:40 bcallah Exp $
 @conflict xli-*
 @bin bin/uufilter
 @bin bin/xloadimage