diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 671b6792848..0787b060a3d 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2021/05/21 17:06:23 tj Exp $
-
 COMMENT=	fast BSD-licensed data compression
 
 GH_ACCOUNT=	lz4
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile
index a248952db5f..c96f55f7b42 100644
--- a/archivers/lz4/patches/patch-lib_Makefile
+++ b/archivers/lz4/patches/patch-lib_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_Makefile,v 1.12 2020/11/16 15:52:38 bket Exp $
-
 Index: lib/Makefile
 --- lib/Makefile.orig
 +++ lib/Makefile
diff --git a/archivers/lz4/patches/patch-lib_lz4_c b/archivers/lz4/patches/patch-lib_lz4_c
index a78993e2550..a158428bb43 100644
--- a/archivers/lz4/patches/patch-lib_lz4_c
+++ b/archivers/lz4/patches/patch-lib_lz4_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_lz4_c,v 1.3 2021/05/21 17:06:23 tj Exp $
-
 CVE-2021-3520 
 
 Index: lib/lz4.c
diff --git a/archivers/lz4/pkg/PLIST b/archivers/lz4/pkg/PLIST
index aa0afb10c9a..903c0b31250 100644
--- a/archivers/lz4/pkg/PLIST
+++ b/archivers/lz4/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2020/11/16 15:52:38 bket Exp $
 @bin bin/lz4
 bin/lz4c
 bin/lz4cat
diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 77f7a69e0d7..c38c0d5bfb4 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.39 2022/01/23 15:05:55 bket Exp $
-
 COMMENT =		zstandard fast real-time compression algorithm
 
 V =			1.5.2
diff --git a/archivers/zstd/patches/patch-lib_libzstd_mk b/archivers/zstd/patches/patch-lib_libzstd_mk
index b06c7c5eea6..9f6a496dc90 100644
--- a/archivers/zstd/patches/patch-lib_libzstd_mk
+++ b/archivers/zstd/patches/patch-lib_libzstd_mk
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_libzstd_mk,v 1.2 2022/01/23 15:05:55 bket Exp $
-
 Some compilers don't have -Wvla.
 
 Index: lib/libzstd.mk
diff --git a/archivers/zstd/pkg/PLIST b/archivers/zstd/pkg/PLIST
index d4a2f0d7af5..bd2756a9672 100644
--- a/archivers/zstd/pkg/PLIST
+++ b/archivers/zstd/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2021/12/25 13:28:13 bket Exp $
 bin/unzstd
 @bin bin/zstd
 bin/zstdcat
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 6217c23f029..64900a31250 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.66 2021/03/28 05:40:31 bket Exp $
-
      SUBDIR =
      SUBDIR += player
      SUBDIR += plugins
diff --git a/audio/audacious/Makefile.inc b/audio/audacious/Makefile.inc
index 4c7b78175bb..9b8b2e4813e 100644
--- a/audio/audacious/Makefile.inc
+++ b/audio/audacious/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.10 2021/03/28 05:40:31 bket Exp $
-
 # Do not forget to sync meta/audacious
 VERSION =	4.1
 
diff --git a/audio/audacious/player/Makefile b/audio/audacious/player/Makefile
index 80415da99b3..75db983640a 100644
--- a/audio/audacious/player/Makefile
+++ b/audio/audacious/player/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2021/08/27 09:25:26 bket Exp $
-
 COMMENT =		graphical audio player which supports lots of formats
 
 DISTNAME =		audacious-${VERSION}
diff --git a/audio/audacious/player/patches/patch-buildsys_mk_in b/audio/audacious/player/patches/patch-buildsys_mk_in
index 9ae50197cf9..8cac2a6f988 100644
--- a/audio/audacious/player/patches/patch-buildsys_mk_in
+++ b/audio/audacious/player/patches/patch-buildsys_mk_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-buildsys_mk_in,v 1.2 2021/02/03 21:44:37 edd Exp $
-
 Show compiler invocations.
 
 Index: buildsys.mk.in
diff --git a/audio/audacious/player/patches/patch-src_libaudcore_Makefile b/audio/audacious/player/patches/patch-src_libaudcore_Makefile
index d0888ada20f..932822edb6e 100644
--- a/audio/audacious/player/patches/patch-src_libaudcore_Makefile
+++ b/audio/audacious/player/patches/patch-src_libaudcore_Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_libaudcore_Makefile,v 1.2 2021/02/03 21:44:37 edd Exp $
 Index: src/libaudcore/Makefile
 --- src/libaudcore/Makefile.orig
 +++ src/libaudcore/Makefile
diff --git a/audio/audacious/player/patches/patch-src_libaudgui_Makefile b/audio/audacious/player/patches/patch-src_libaudgui_Makefile
index 8458a728fd0..90c66dc09d3 100644
--- a/audio/audacious/player/patches/patch-src_libaudgui_Makefile
+++ b/audio/audacious/player/patches/patch-src_libaudgui_Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_libaudgui_Makefile,v 1.1 2020/04/15 15:50:16 bket Exp $
 Index: src/libaudgui/Makefile
 --- src/libaudgui/Makefile.orig
 +++ src/libaudgui/Makefile
diff --git a/audio/audacious/player/patches/patch-src_libaudqt_Makefile b/audio/audacious/player/patches/patch-src_libaudqt_Makefile
index 21deb6dbf8f..cc56dc05f4a 100644
--- a/audio/audacious/player/patches/patch-src_libaudqt_Makefile
+++ b/audio/audacious/player/patches/patch-src_libaudqt_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_libaudqt_Makefile,v 1.1 2021/02/19 20:44:44 edd Exp $
-
 Index: src/libaudqt/Makefile
 --- src/libaudqt/Makefile.orig
 +++ src/libaudqt/Makefile
diff --git a/audio/audacious/player/patches/patch-src_libaudtag_Makefile b/audio/audacious/player/patches/patch-src_libaudtag_Makefile
index 5681730feea..42b9b64510b 100644
--- a/audio/audacious/player/patches/patch-src_libaudtag_Makefile
+++ b/audio/audacious/player/patches/patch-src_libaudtag_Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_libaudtag_Makefile,v 1.1 2020/04/15 15:50:16 bket Exp $
 Index: src/libaudtag/Makefile
 --- src/libaudtag/Makefile.orig
 +++ src/libaudtag/Makefile
diff --git a/audio/audacious/player/pkg/PLIST b/audio/audacious/player/pkg/PLIST
index a6dc91fa555..409eb0a4b04 100644
--- a/audio/audacious/player/pkg/PLIST
+++ b/audio/audacious/player/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/03/28 05:40:32 bket Exp $
 @conflict audacious-<4.0
 @pkgpath audio/audacious/player,qt5
 @bin bin/audacious
diff --git a/audio/audacious/plugins/Makefile b/audio/audacious/plugins/Makefile
index f7ae91eda88..fd83d03d057 100644
--- a/audio/audacious/plugins/Makefile
+++ b/audio/audacious/plugins/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2021/03/28 05:40:32 bket Exp $
-
 COMMENT =		input and output plugins for Audacious
 
 DISTNAME =		audacious-plugins-${VERSION}
diff --git a/audio/audacious/plugins/patches/patch-buildsys_mk_in b/audio/audacious/plugins/patches/patch-buildsys_mk_in
index 9ae50197cf9..8cac2a6f988 100644
--- a/audio/audacious/plugins/patches/patch-buildsys_mk_in
+++ b/audio/audacious/plugins/patches/patch-buildsys_mk_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-buildsys_mk_in,v 1.2 2021/02/03 21:44:37 edd Exp $
-
 Show compiler invocations.
 
 Index: buildsys.mk.in
diff --git a/audio/audacious/plugins/patches/patch-configure b/audio/audacious/plugins/patches/patch-configure
index daa0694c388..9798ceff93b 100644
--- a/audio/audacious/plugins/patches/patch-configure
+++ b/audio/audacious/plugins/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.4 2021/02/03 21:44:37 edd Exp $
-
 Set AUDACIOUS_{CFLAGS,LIBS} only after the end of all plugin checks.
 This fixes some of the autoconf checks as the LIBS variable is being
 polluted very early on, breaking most of the checks using AC_CHECK_LIB.
diff --git a/audio/audacious/plugins/patches/patch-src_neon_neon_cc b/audio/audacious/plugins/patches/patch-src_neon_neon_cc
index 31ef1448e1f..40d0e88e56d 100644
--- a/audio/audacious/plugins/patches/patch-src_neon_neon_cc
+++ b/audio/audacious/plugins/patches/patch-src_neon_neon_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_neon_neon_cc,v 1.1 2020/04/15 15:50:16 bket Exp $
-
 Fix for ports gcc as feof() is a macro
 
 neon.cc:968:16: error: expected unqualified-id before '(' token
diff --git a/audio/audacious/plugins/patches/patch-src_psf_psx_hw_cc b/audio/audacious/plugins/patches/patch-src_psf_psx_hw_cc
index fc54da3e754..044548bc06e 100644
--- a/audio/audacious/plugins/patches/patch-src_psf_psx_hw_cc
+++ b/audio/audacious/plugins/patches/patch-src_psf_psx_hw_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_psf_psx_hw_cc,v 1.1 2020/04/15 15:50:16 bket Exp $
-
 change some srand to srand_deterministic, found by deraadt@
 
 Index: src/psf/psx_hw.cc
diff --git a/audio/audacious/plugins/pkg/PLIST b/audio/audacious/plugins/pkg/PLIST
index d609724eac6..0e9fe8efda0 100644
--- a/audio/audacious/plugins/pkg/PLIST
+++ b/audio/audacious/plugins/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/03/28 05:40:32 bket Exp $
 @pkgpath audio/audacious-plugins,-main
 @pkgpath audio/audacious-plugins
 @pkgpath audio/audacious/plugins,qt5
diff --git a/devel/bats/Makefile b/devel/bats/Makefile
index 3a4741177e2..93fe9324e15 100644
--- a/devel/bats/Makefile
+++ b/devel/bats/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2022/02/25 17:56:26 bket Exp $
-
 COMMENT =	bash automated testing system
 
 GH_ACCOUNT =	bats-core
diff --git a/devel/bats/pkg/PLIST b/devel/bats/pkg/PLIST
index ae489d9909d..c33f722a85b 100644
--- a/devel/bats/pkg/PLIST
+++ b/devel/bats/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/10/23 06:07:26 bket Exp $
 bin/bats
 lib/bats-core/
 lib/bats-core/common.bash
diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile
index 885e5f7e601..005e836ca67 100644
--- a/devel/git-cola/Makefile
+++ b/devel/git-cola/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.43 2022/01/23 10:57:17 bket Exp $
-
 COMMENT =	python powered git gui
 
 MODPY_EGG_VERSION=	3.12.0
diff --git a/devel/git-cola/patches/patch-cola_app_py b/devel/git-cola/patches/patch-cola_app_py
index 10eb112d880..a317fe94add 100644
--- a/devel/git-cola/patches/patch-cola_app_py
+++ b/devel/git-cola/patches/patch-cola_app_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cola_app_py,v 1.8 2020/10/04 14:34:48 bket Exp $
-
 Use ssh-askpass implementation from xenocara.
 
 Index: cola/app.py
diff --git a/devel/git-cola/patches/patch-pytest_ini b/devel/git-cola/patches/patch-pytest_ini
index babab81b402..269de2a304e 100644
--- a/devel/git-cola/patches/patch-pytest_ini
+++ b/devel/git-cola/patches/patch-pytest_ini
@@ -1,5 +1,3 @@
-$OpenBSD: patch-pytest_ini,v 1.1 2021/07/14 09:07:21 bket Exp $
-
 Avoid use of pytest --doctest-modules as this causes a regression test to fail
 with "ImportError (Could not load inotify functions from libc)". Failure is
 caused by the doctest module testing a piece of code that is linux-only. This
diff --git a/devel/git-cola/pkg/PLIST b/devel/git-cola/pkg/PLIST
index 52baf8bd96f..6600c687c5e 100644
--- a/devel/git-cola/pkg/PLIST
+++ b/devel/git-cola/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.22 2022/01/23 10:57:17 bket Exp $
 bin/git-cola
 bin/git-cola-sequence-editor
 bin/git-dag
diff --git a/devel/p5-Conf-Libconfig/Makefile b/devel/p5-Conf-Libconfig/Makefile
index 84f7d032415..f60e6601fa9 100644
--- a/devel/p5-Conf-Libconfig/Makefile
+++ b/devel/p5-Conf-Libconfig/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2020/07/03 21:44:44 sthen Exp $
-
 COMMENT =	perl extension for libconfig
 
 DISTNAME =	Conf-Libconfig-0.100
diff --git a/devel/p5-Conf-Libconfig/pkg/PLIST b/devel/p5-Conf-Libconfig/pkg/PLIST
index 1fbacb01108..e1043a8e0e2 100644
--- a/devel/p5-Conf-Libconfig/pkg/PLIST
+++ b/devel/p5-Conf-Libconfig/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/02/16 19:40:35 bket Exp $
 ${P5ARCH}/
 ${P5ARCH}/Conf/
 ${P5ARCH}/Conf/Libconfig.pm
diff --git a/meta/audacious/Makefile b/meta/audacious/Makefile
index c7acb3ba2af..af56757cecb 100644
--- a/meta/audacious/Makefile
+++ b/meta/audacious/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2021/03/28 05:40:32 bket Exp $
-
 COMMENT =	audacious meta-package
 
 VERSION =	4.1
diff --git a/meta/audacious/pkg/PLIST b/meta/audacious/pkg/PLIST
index dfb3eb5a5cb..44e2476ab36 100644
--- a/meta/audacious/pkg/PLIST
+++ b/meta/audacious/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/03/28 05:40:32 bket Exp $
 @pkgpath audio/audacious
 @pkgpath meta/audacious,qt5
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 5685b769846..38531749226 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.87 2022/02/15 20:56:14 bket Exp $
-
 BROKEN-hppa=	serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type
 BROKEN-alpha=	serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type
 
diff --git a/net/filezilla/patches/patch-configure_ac b/net/filezilla/patches/patch-configure_ac
index b7b890dacae..f8531831eff 100644
--- a/net/filezilla/patches/patch-configure_ac
+++ b/net/filezilla/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.1 2019/11/28 15:56:26 bket Exp $
-
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/net/filezilla/patches/patch-src_commonui_Makefile_am b/net/filezilla/patches/patch-src_commonui_Makefile_am
index f175c99b9f2..4683708700f 100644
--- a/net/filezilla/patches/patch-src_commonui_Makefile_am
+++ b/net/filezilla/patches/patch-src_commonui_Makefile_am
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_commonui_Makefile_am,v 1.1 2021/03/16 13:02:33 bket Exp $
-
 Index: src/commonui/Makefile.am
 --- src/commonui/Makefile.am.orig
 +++ src/commonui/Makefile.am
diff --git a/net/filezilla/patches/patch-src_commonui_fz_paths_cpp b/net/filezilla/patches/patch-src_commonui_fz_paths_cpp
index 9adf33759ac..2232f2e1368 100644
--- a/net/filezilla/patches/patch-src_commonui_fz_paths_cpp
+++ b/net/filezilla/patches/patch-src_commonui_fz_paths_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_commonui_fz_paths_cpp,v 1.3 2021/10/27 07:25:10 bket Exp $
-
 Index: src/commonui/fz_paths.cpp
 --- src/commonui/fz_paths.cpp.orig
 +++ src/commonui/fz_paths.cpp
diff --git a/net/filezilla/patches/patch-src_engine_Makefile_am b/net/filezilla/patches/patch-src_engine_Makefile_am
index f891c736147..61735ba087b 100644
--- a/net/filezilla/patches/patch-src_engine_Makefile_am
+++ b/net/filezilla/patches/patch-src_engine_Makefile_am
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_engine_Makefile_am,v 1.4 2021/10/24 18:55:40 bket Exp $
-
 Index: src/engine/Makefile.am
 --- src/engine/Makefile.am.orig
 +++ src/engine/Makefile.am
diff --git a/net/filezilla/patches/patch-src_interface_Mainfrm_h b/net/filezilla/patches/patch-src_interface_Mainfrm_h
index d575904ef8a..104716f939c 100644
--- a/net/filezilla/patches/patch-src_interface_Mainfrm_h
+++ b/net/filezilla/patches/patch-src_interface_Mainfrm_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_interface_Mainfrm_h,v 1.1 2020/03/13 12:34:42 bket Exp $
-
 Index: src/interface/Mainfrm.h
 --- src/interface/Mainfrm.h.orig
 +++ src/interface/Mainfrm.h
diff --git a/net/filezilla/pkg/PLIST b/net/filezilla/pkg/PLIST
index beec4037f06..45dfa9989ec 100644
--- a/net/filezilla/pkg/PLIST
+++ b/net/filezilla/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.27 2021/07/11 09:22:17 bket Exp $
 @bin bin/filezilla
 @bin bin/fzputtygen
 @bin bin/fzsftp
diff --git a/net/libfilezilla/Makefile b/net/libfilezilla/Makefile
index dc87ab42ccc..50a95fbf299 100644
--- a/net/libfilezilla/Makefile
+++ b/net/libfilezilla/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.25 2022/02/15 20:55:44 bket Exp $
-
 COMMENT =	support library for FileZilla
 
 DISTNAME =	libfilezilla-0.36.0
diff --git a/net/libfilezilla/patches/patch-configure_ac b/net/libfilezilla/patches/patch-configure_ac
index 8c49bcbf413..c34f70347f3 100644
--- a/net/libfilezilla/patches/patch-configure_ac
+++ b/net/libfilezilla/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/03/16 13:02:02 bket Exp $
-
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/net/libfilezilla/patches/patch-lib_impersonation_cpp b/net/libfilezilla/patches/patch-lib_impersonation_cpp
index f256cf0ce83..a98bc062ca8 100644
--- a/net/libfilezilla/patches/patch-lib_impersonation_cpp
+++ b/net/libfilezilla/patches/patch-lib_impersonation_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_impersonation_cpp,v 1.2 2021/12/11 06:43:19 bket Exp $
-
 Index: lib/impersonation.cpp
 --- lib/impersonation.cpp.orig
 +++ lib/impersonation.cpp
diff --git a/net/libfilezilla/pkg/PLIST b/net/libfilezilla/pkg/PLIST
index 37dcd9adfb6..2ed8cdf5e35 100644
--- a/net/libfilezilla/pkg/PLIST
+++ b/net/libfilezilla/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.11 2021/10/27 07:24:42 bket Exp $
 include/libfilezilla/
 include/libfilezilla/apply.hpp
 include/libfilezilla/buffer.hpp
diff --git a/net/py-msgpack/Makefile b/net/py-msgpack/Makefile
index 21175d075f4..181906a8e3d 100644
--- a/net/py-msgpack/Makefile
+++ b/net/py-msgpack/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2022/03/01 10:36:53 bket Exp $
-
 COMMENT =		messagepack (de)serializer
 
 MODPY_EGG_VERSION =	1.0.3
diff --git a/net/py-msgpack/pkg/PLIST b/net/py-msgpack/pkg/PLIST
index 411d7d4a320..0dabedab98b 100644
--- a/net/py-msgpack/pkg/PLIST
+++ b/net/py-msgpack/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2022/03/01 10:36:53 bket Exp $
 @pkgpath net/py-msgpack
 lib/python${MODPY_VERSION}/site-packages/msgpack/
 lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index ecb34aa0f41..ab959e879e3 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.27 2022/01/16 09:20:20 kmos Exp $
-
 COMMENT =	SSL/SSH multiplexer
 
 DISTNAME =	sslh-v1.22c
diff --git a/net/sslh/patches/patch-Makefile b/net/sslh/patches/patch-Makefile
index 27e65fd25e0..a2e8db0062e 100644
--- a/net/sslh/patches/patch-Makefile
+++ b/net/sslh/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.10 2021/10/30 14:51:25 bket Exp $
-
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/net/sslh/patches/patch-basic_cfg b/net/sslh/patches/patch-basic_cfg
index e31fe8e2f86..f33d8267eae 100644
--- a/net/sslh/patches/patch-basic_cfg
+++ b/net/sslh/patches/patch-basic_cfg
@@ -1,4 +1,3 @@
-$OpenBSD: patch-basic_cfg,v 1.5 2018/01/28 16:31:48 sthen Exp $
 Index: basic.cfg
 --- basic.cfg.orig
 +++ basic.cfg
diff --git a/net/sslh/patches/patch-example_cfg b/net/sslh/patches/patch-example_cfg
index 32e41cf6cee..1139d6a7861 100644
--- a/net/sslh/patches/patch-example_cfg
+++ b/net/sslh/patches/patch-example_cfg
@@ -1,4 +1,3 @@
-$OpenBSD: patch-example_cfg,v 1.5 2018/01/28 16:31:48 sthen Exp $
 Index: example.cfg
 --- example.cfg.orig
 +++ example.cfg
diff --git a/net/sslh/patches/patch-sslh_pod b/net/sslh/patches/patch-sslh_pod
index 34e3ff898bc..51391cf136e 100644
--- a/net/sslh/patches/patch-sslh_pod
+++ b/net/sslh/patches/patch-sslh_pod
@@ -1,4 +1,3 @@
-$OpenBSD: patch-sslh_pod,v 1.10 2021/10/30 14:51:25 bket Exp $
 Index: sslh.pod
 --- sslh.pod.orig
 +++ sslh.pod
diff --git a/net/sslh/patches/patch-t b/net/sslh/patches/patch-t
index e0a894861dc..a92b32cc0d4 100644
--- a/net/sslh/patches/patch-t
+++ b/net/sslh/patches/patch-t
@@ -1,5 +1,3 @@
-$OpenBSD: patch-t,v 1.4 2021/10/30 14:51:25 bket Exp $
-
 Index: t
 --- t.orig
 +++ t
diff --git a/net/sslh/patches/patch-test_cfg b/net/sslh/patches/patch-test_cfg
index 3cd4dc26f4e..1c31ecfe639 100644
--- a/net/sslh/patches/patch-test_cfg
+++ b/net/sslh/patches/patch-test_cfg
@@ -1,5 +1,3 @@
-$OpenBSD: patch-test_cfg,v 1.1 2021/10/30 14:51:25 bket Exp $
-
 Taken from https://github.com/yrutschle/sslh/pull/310.
 
 Index: test.cfg
diff --git a/net/sslh/pkg/PLIST b/net/sslh/pkg/PLIST
index b51276a9791..625f2c9e780 100644
--- a/net/sslh/pkg/PLIST
+++ b/net/sslh/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/10/30 14:51:25 bket Exp $
 @newgroup _sslh:696
 @newuser _sslh:696:696:daemon:sslh:/nonexistent:/sbin/nologin
 @rcscript ${RCDIR}/sslh_fork
diff --git a/net/sslh/pkg/sslh_fork.rc b/net/sslh/pkg/sslh_fork.rc
index bb1702cc37a..ef9bced10b7 100644
--- a/net/sslh/pkg/sslh_fork.rc
+++ b/net/sslh/pkg/sslh_fork.rc
@@ -1,7 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: sslh_fork.rc,v 1.6 2018/11/21 13:12:37 bket Exp $
-
 daemon="${TRUEPREFIX}/sbin/sslh-fork"
 daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --tls 127.0.0.1:443"
 
diff --git a/net/sslh/pkg/sslh_select.rc b/net/sslh/pkg/sslh_select.rc
index dc3858e512c..1fa103886e0 100644
--- a/net/sslh/pkg/sslh_select.rc
+++ b/net/sslh/pkg/sslh_select.rc
@@ -1,7 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: sslh_select.rc,v 1.6 2018/11/21 13:12:37 bket Exp $
-
 daemon="${TRUEPREFIX}/sbin/sslh-select"
 daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --tls 127.0.0.1:443"
 
diff --git a/net/unison/2.4x/Makefile b/net/unison/2.4x/Makefile
index b118bddb295..306c1ed8167 100644
--- a/net/unison/2.4x/Makefile
+++ b/net/unison/2.4x/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.17 2021/12/10 04:11:00 daniel Exp $
-
 VER=		2.48.15
 REV=		v4
 REVISION=	9
diff --git a/net/unison/2.4x/patches/patch-bytearray_stubs_c b/net/unison/2.4x/patches/patch-bytearray_stubs_c
index 156eae59f5b..0a6fb0791bf 100644
--- a/net/unison/2.4x/patches/patch-bytearray_stubs_c
+++ b/net/unison/2.4x/patches/patch-bytearray_stubs_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-bytearray_stubs_c,v 1.1 2018/04/26 21:34:23 bket Exp $
-
 Fix rare SIGSEGV when transferring large replicas.
 Fix a theoretical integer overflow. 
 
diff --git a/net/unison/2.4x/patches/patch-files_ml b/net/unison/2.4x/patches/patch-files_ml
index 25b167c1313..8332d9e4312 100644
--- a/net/unison/2.4x/patches/patch-files_ml
+++ b/net/unison/2.4x/patches/patch-files_ml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-files_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
-
 Index: files.ml
 --- files.ml.orig
 +++ files.ml
diff --git a/net/unison/2.4x/patches/patch-recon_ml b/net/unison/2.4x/patches/patch-recon_ml
index b372abac7eb..8aa6d5a6d28 100644
--- a/net/unison/2.4x/patches/patch-recon_ml
+++ b/net/unison/2.4x/patches/patch-recon_ml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-recon_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
-
 Index: recon.ml
 --- recon.ml.orig
 +++ recon.ml
diff --git a/net/unison/2.4x/patches/patch-system_system_generic_ml b/net/unison/2.4x/patches/patch-system_system_generic_ml
index 5b095f864f7..c0e74c7cf66 100644
--- a/net/unison/2.4x/patches/patch-system_system_generic_ml
+++ b/net/unison/2.4x/patches/patch-system_system_generic_ml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-system_system_generic_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
-
 Index: system/system_generic.ml
 --- system/system_generic.ml.orig
 +++ system/system_generic.ml
diff --git a/net/unison/2.4x/patches/patch-test_ml b/net/unison/2.4x/patches/patch-test_ml
index 54c77d12b22..709cedef588 100644
--- a/net/unison/2.4x/patches/patch-test_ml
+++ b/net/unison/2.4x/patches/patch-test_ml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-test_ml,v 1.1 2018/04/26 21:34:23 bket Exp $
-
 Index: test.ml
 --- test.ml.orig
 +++ test.ml
diff --git a/net/unison/2.4x/patches/patch-uigtk2_ml b/net/unison/2.4x/patches/patch-uigtk2_ml
index 0920619bf7c..67236bbae9b 100644
--- a/net/unison/2.4x/patches/patch-uigtk2_ml
+++ b/net/unison/2.4x/patches/patch-uigtk2_ml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-uigtk2_ml,v 1.1 2019/03/04 12:51:16 chrisz Exp $
-
 Index: uigtk2.ml
 --- uigtk2.ml.orig
 +++ uigtk2.ml
diff --git a/net/unison/2.4x/patches/patch-uutil_ml b/net/unison/2.4x/patches/patch-uutil_ml
index 9e0dd167ed6..101ef8bede7 100644
--- a/net/unison/2.4x/patches/patch-uutil_ml
+++ b/net/unison/2.4x/patches/patch-uutil_ml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-uutil_ml,v 1.1 2021/12/04 01:31:33 daniel Exp $
-
 ocaml 4.12 compat
 
 Index: uutil.ml
diff --git a/net/unison/2.4x/pkg/PLIST b/net/unison/2.4x/pkg/PLIST
index bcb9fea32f2..4dec94d3e98 100644
--- a/net/unison/2.4x/pkg/PLIST
+++ b/net/unison/2.4x/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/11/03 19:45:30 bket Exp $
 @option is-branch
 @conflict unison-*
 @pkgpath net/unison/stable${FLAVOR_COMMA}
diff --git a/net/unison/2.4x/pkg/README b/net/unison/2.4x/pkg/README
index 67a03c66ae1..71178de8682 100644
--- a/net/unison/2.4x/pkg/README
+++ b/net/unison/2.4x/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.5 2021/01/03 19:59:15 bket Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/net/unison/2.5x/Makefile b/net/unison/2.5x/Makefile
index b45ebea1f26..6cbe06fa43f 100644
--- a/net/unison/2.5x/Makefile
+++ b/net/unison/2.5x/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2021/12/19 18:49:45 bket Exp $
-
 GH_TAGNAME=	v2.51.5
 
 .include <bsd.port.mk>
diff --git a/net/unison/2.5x/pkg/PLIST b/net/unison/2.5x/pkg/PLIST
index f3b90579166..964d847170d 100644
--- a/net/unison/2.5x/pkg/PLIST
+++ b/net/unison/2.5x/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/06/27 19:17:41 bket Exp $
 @option is-branch
 @conflict unison-*
 @bin bin/unison
diff --git a/net/unison/2.5x/pkg/README b/net/unison/2.5x/pkg/README
index 67a03c66ae1..71178de8682 100644
--- a/net/unison/2.5x/pkg/README
+++ b/net/unison/2.5x/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.5 2021/01/03 19:59:15 bket Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 4a82b1449e5..f904bfe434c 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2018/04/26 21:34:23 bket Exp $
-
 SUBDIR =
 SUBDIR += 2.4x
 SUBDIR += 2.4x,no_x11
diff --git a/net/unison/Makefile.inc b/net/unison/Makefile.inc
index f28e56e979c..e6195c96705 100644
--- a/net/unison/Makefile.inc
+++ b/net/unison/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.33 2021/06/27 19:17:41 bket Exp $
-
 COMMENT=	multi-platform file synchronization tool
 
 GH_ACCOUNT=	bcpierce00
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index dd69551eb02..d78b325cfa8 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2022/02/12 12:39:09 kn Exp $
-
 COMMENT =	binary newsreader supporting NZB files
 
 VERSION =	21.1
diff --git a/news/nzbget/patches/patch-nzbget_conf b/news/nzbget/patches/patch-nzbget_conf
index 58cc283d6bb..e0a807cdf1b 100644
--- a/news/nzbget/patches/patch-nzbget_conf
+++ b/news/nzbget/patches/patch-nzbget_conf
@@ -1,5 +1,3 @@
-$OpenBSD: patch-nzbget_conf,v 1.3 2019/05/05 08:14:11 bket Exp $
-
 Index: nzbget.conf
 --- nzbget.conf.orig
 +++ nzbget.conf
diff --git a/news/nzbget/pkg/PLIST b/news/nzbget/pkg/PLIST
index 27af208cd88..e967978ec2e 100644
--- a/news/nzbget/pkg/PLIST
+++ b/news/nzbget/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/06/07 15:30:59 bket Exp $
 @newgroup _nzbget:805
 @newuser _nzbget:805:805:daemon:NZBGet Account:${LOCALSTATEDIR}/nzbget:/sbin/nologin
 @rcscript ${RCDIR}/nzbget
diff --git a/news/nzbget/pkg/nzbget.rc b/news/nzbget/pkg/nzbget.rc
index 87031f0d0c8..59bbc726b67 100644
--- a/news/nzbget/pkg/nzbget.rc
+++ b/news/nzbget/pkg/nzbget.rc
@@ -1,7 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: nzbget.rc,v 1.1.1.1 2018/04/03 17:45:43 bket Exp $
-
 daemon="${TRUEPREFIX}/bin/nzbget -D"
 
 . /etc/rc.d/rc.subr
diff --git a/news/sabnzbd/Makefile b/news/sabnzbd/Makefile
index f8f2650dbda..ebbd669f437 100644
--- a/news/sabnzbd/Makefile
+++ b/news/sabnzbd/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.37 2022/02/22 17:07:24 bket Exp $
-
 COMMENT =			retrieve and process nzb-files via web interface
 
 VERSION =			3.5.1
diff --git a/news/sabnzbd/pkg/PLIST b/news/sabnzbd/pkg/PLIST
index 11205d374ff..0ece69cc276 100644
--- a/news/sabnzbd/pkg/PLIST
+++ b/news/sabnzbd/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.12 2021/10/12 04:32:17 bket Exp $
 @newgroup _sabnzbd:810
 @newuser _sabnzbd:810:_sabnzbd:daemon:Sabnzbd:/var/sabnzbd:/bin/sh
 @owner _sabnzbd
diff --git a/news/sabnzbd/pkg/sabnzbd.rc b/news/sabnzbd/pkg/sabnzbd.rc
index 7454feb7cc7..ae4bd5819ed 100644
--- a/news/sabnzbd/pkg/sabnzbd.rc
+++ b/news/sabnzbd/pkg/sabnzbd.rc
@@ -1,7 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: sabnzbd.rc,v 1.5 2019/05/06 18:29:59 bket Exp $
-
 daemon="${MODPY_BIN} ${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py -d"
 daemon_flags="-b 0 -f /var/sabnzbd"
 daemon_timeout=120
diff --git a/security/lastpass-cli/Makefile b/security/lastpass-cli/Makefile
index 0af15219270..bb9197d089a 100644
--- a/security/lastpass-cli/Makefile
+++ b/security/lastpass-cli/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.22 2021/11/13 19:41:10 tb Exp $
-
 COMMENT =	LastPass command line interface tool
 
 V =		1.3.3
diff --git a/security/lastpass-cli/patches/patch-CMakeLists_txt b/security/lastpass-cli/patches/patch-CMakeLists_txt
index 7d2630d6438..0afffe20765 100644
--- a/security/lastpass-cli/patches/patch-CMakeLists_txt
+++ b/security/lastpass-cli/patches/patch-CMakeLists_txt
@@ -1,4 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2019/03/24 16:27:13 bket Exp $
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
diff --git a/security/lastpass-cli/patches/patch-cmake_extras_install_doc_cmake b/security/lastpass-cli/patches/patch-cmake_extras_install_doc_cmake
index ea39c186a5c..9417e7703c4 100644
--- a/security/lastpass-cli/patches/patch-cmake_extras_install_doc_cmake
+++ b/security/lastpass-cli/patches/patch-cmake_extras_install_doc_cmake
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cmake_extras_install_doc_cmake,v 1.1 2018/03/16 17:15:46 bket Exp $
-
 Index: cmake_extras/install_doc.cmake
 --- cmake_extras/install_doc.cmake.orig
 +++ cmake_extras/install_doc.cmake
diff --git a/security/lastpass-cli/patches/patch-pbkdf2_c b/security/lastpass-cli/patches/patch-pbkdf2_c
index 344598d4d57..9e3a37abff2 100644
--- a/security/lastpass-cli/patches/patch-pbkdf2_c
+++ b/security/lastpass-cli/patches/patch-pbkdf2_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-pbkdf2_c,v 1.3 2021/11/13 19:41:10 tb Exp $
-
 Do not use the pre-1.1 workaround for LibreSSL.
 
 Index: pbkdf2.c
diff --git a/security/lastpass-cli/patches/patch-process_c b/security/lastpass-cli/patches/patch-process_c
index 72b7d9d995a..ebd4af7a64d 100644
--- a/security/lastpass-cli/patches/patch-process_c
+++ b/security/lastpass-cli/patches/patch-process_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-process_c,v 1.1 2021/02/03 15:27:00 bket Exp $
-
 Fix -fno-common build failure. Taken from
 https://github.com/lastpass/lastpass-cli/pull/576
 
diff --git a/security/lastpass-cli/patches/patch-process_h b/security/lastpass-cli/patches/patch-process_h
index 7b630b0762e..4edb74edc26 100644
--- a/security/lastpass-cli/patches/patch-process_h
+++ b/security/lastpass-cli/patches/patch-process_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-process_h,v 1.1 2021/02/03 15:27:00 bket Exp $
-
 Fix -fno-common build failure. Taken from
 https://github.com/lastpass/lastpass-cli/pull/576
 
diff --git a/security/lastpass-cli/patches/patch-upload-queue_c b/security/lastpass-cli/patches/patch-upload-queue_c
index bf43011c08a..423d6058f27 100644
--- a/security/lastpass-cli/patches/patch-upload-queue_c
+++ b/security/lastpass-cli/patches/patch-upload-queue_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-upload-queue_c,v 1.5 2016/08/27 09:06:12 danj Exp $
-
 cope with 64-bit time_t on 32-bit arches
 
 --- upload-queue.c.orig	Wed Jul 20 14:46:49 2016
diff --git a/security/lastpass-cli/pkg/PLIST b/security/lastpass-cli/pkg/PLIST
index 7c9c4c97f98..e2b7dfc8f1c 100644
--- a/security/lastpass-cli/pkg/PLIST
+++ b/security/lastpass-cli/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/05/15 14:46:37 ajacoutot Exp $
 @bin bin/lpass
 @man man/man1/lpass.1
 share/bash-completion/
diff --git a/security/libb2/Makefile b/security/libb2/Makefile
index 3f1d2997094..ce7983576cd 100644
--- a/security/libb2/Makefile
+++ b/security/libb2/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.4 2019/07/12 20:49:04 sthen Exp $
-
 COMMENT =	library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
 
 V =		0.98.1
diff --git a/security/libb2/patches/patch-configure_ac b/security/libb2/patches/patch-configure_ac
index d564546d297..a006ec1809e 100644
--- a/security/libb2/patches/patch-configure_ac
+++ b/security/libb2/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.2 2019/03/12 04:21:56 bket Exp $
-
 Do not hardcode optimization flags.
 
 Index: configure.ac
diff --git a/security/libb2/pkg/PLIST b/security/libb2/pkg/PLIST
index 5817398a554..ffe6a390392 100644
--- a/security/libb2/pkg/PLIST
+++ b/security/libb2/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/03/12 04:21:56 bket Exp $
 include/blake2.h
 lib/libb2.a
 lib/libb2.la
diff --git a/security/rhash/Makefile b/security/rhash/Makefile
index 8be1d590149..b49615f6c03 100644
--- a/security/rhash/Makefile
+++ b/security/rhash/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.10 2021/12/11 11:50:55 bket Exp $
-
 COMMENT =	utility and library for computing hash sums
 
 DISTNAME =	rhash-1.4.2-src
diff --git a/security/rhash/patches/patch-Makefile b/security/rhash/patches/patch-Makefile
index ab59503931d..3b93415ad81 100644
--- a/security/rhash/patches/patch-Makefile
+++ b/security/rhash/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.4 2019/12/26 04:02:11 bket Exp $
-
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/security/rhash/patches/patch-common_func_h b/security/rhash/patches/patch-common_func_h
index 499427cee11..82f9a26c736 100644
--- a/security/rhash/patches/patch-common_func_h
+++ b/security/rhash/patches/patch-common_func_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-common_func_h,v 1.3 2019/11/24 04:43:26 bket Exp $
-
 Index: common_func.h
 --- common_func.h.orig
 +++ common_func.h
diff --git a/security/rhash/patches/patch-configure b/security/rhash/patches/patch-configure
index d50732469be..8c39893827e 100644
--- a/security/rhash/patches/patch-configure
+++ b/security/rhash/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.4 2021/12/11 11:50:55 bket Exp $
-
 Fix clang detection. Taken from
 https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc
 
diff --git a/security/rhash/pkg/PLIST b/security/rhash/pkg/PLIST
index f4fcd3dffbc..c58ffa7d4f3 100644
--- a/security/rhash/pkg/PLIST
+++ b/security/rhash/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2019/12/26 04:02:11 bket Exp $
 bin/ed2k-link
 bin/edonr256-hash
 bin/edonr512-hash
diff --git a/sysutils/borgbackup/1.1/Makefile b/sysutils/borgbackup/1.1/Makefile
index d6813081299..30c1ea92c38 100644
--- a/sysutils/borgbackup/1.1/Makefile
+++ b/sysutils/borgbackup/1.1/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2022/02/24 05:23:01 bket Exp $
-
 PORTROACH =		limit:^1\.1\.
 
 MODPY_EGG_VERSION =	1.1.17
diff --git a/sysutils/borgbackup/1.1/patches/patch-setup_py b/sysutils/borgbackup/1.1/patches/patch-setup_py
index 5eb0459e328..a90a9972bd0 100644
--- a/sysutils/borgbackup/1.1/patches/patch-setup_py
+++ b/sysutils/borgbackup/1.1/patches/patch-setup_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.1 2022/02/23 18:23:07 bket Exp $
-
 do not package source files
 
 Index: setup.py
diff --git a/sysutils/borgbackup/1.1/patches/patch-src_borg__endian_h b/sysutils/borgbackup/1.1/patches/patch-src_borg__endian_h
index dae8b7f0fb3..8f94ecbf40b 100644
--- a/sysutils/borgbackup/1.1/patches/patch-src_borg__endian_h
+++ b/sysutils/borgbackup/1.1/patches/patch-src_borg__endian_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_borg__endian_h,v 1.1 2022/02/23 18:23:07 bket Exp $
-
 __builtin_bswap32 unavailable at least on sparc64
 
 Index: src/borg/_endian.h
diff --git a/sysutils/borgbackup/1.1/pkg/PLIST b/sysutils/borgbackup/1.1/pkg/PLIST
index 65b6a447cbc..d5875a7b4dc 100644
--- a/sysutils/borgbackup/1.1/pkg/PLIST
+++ b/sysutils/borgbackup/1.1/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1 2022/02/23 18:23:07 bket Exp $
 @option is-branch
 @pkgpath sysutils/borgbackup
 bin/borg
diff --git a/sysutils/borgbackup/1.2/Makefile b/sysutils/borgbackup/1.2/Makefile
index c9535648b0b..2e56db4ccc3 100644
--- a/sysutils/borgbackup/1.2/Makefile
+++ b/sysutils/borgbackup/1.2/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1 2022/02/23 18:23:07 bket Exp $
-
 MODPY_EGG_VERSION =	1.2.0
 
 WANTLIB =		pthread
diff --git a/sysutils/borgbackup/1.2/patches/patch-src_borg__endian_h b/sysutils/borgbackup/1.2/patches/patch-src_borg__endian_h
index 9e751448ac2..330a828b2ed 100644
--- a/sysutils/borgbackup/1.2/patches/patch-src_borg__endian_h
+++ b/sysutils/borgbackup/1.2/patches/patch-src_borg__endian_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_borg__endian_h,v 1.1 2022/02/23 18:23:07 bket Exp $
-
 __builtin_bswap32 unavailable at least on sparc64
 
 Index: src/borg/_endian.h
diff --git a/sysutils/borgbackup/1.2/pkg/PLIST b/sysutils/borgbackup/1.2/pkg/PLIST
index 6adf901de0d..616245f7acb 100644
--- a/sysutils/borgbackup/1.2/pkg/PLIST
+++ b/sysutils/borgbackup/1.2/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1 2022/02/23 18:23:07 bket Exp $
 @option is-branch
 bin/borg
 bin/borgfs
diff --git a/sysutils/borgbackup/Makefile b/sysutils/borgbackup/Makefile
index c9a16a7da97..463374aceab 100644
--- a/sysutils/borgbackup/Makefile
+++ b/sysutils/borgbackup/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.44 2022/02/23 18:23:07 bket Exp $
-
 SUBDIR =
 SUBDIR += 1.1
 SUBDIR += 1.2
diff --git a/sysutils/borgbackup/Makefile.inc b/sysutils/borgbackup/Makefile.inc
index 2f863791ecb..f1bf0639d6a 100644
--- a/sysutils/borgbackup/Makefile.inc
+++ b/sysutils/borgbackup/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.2 2022/02/28 11:01:14 bket Exp $
-
 COMMENT =		deduplicating backup program
 
 DISTNAME =		borgbackup-${MODPY_EGG_VERSION}
diff --git a/sysutils/bupstash/Makefile b/sysutils/bupstash/Makefile
index e53f89efaf3..1cab3a185b3 100644
--- a/sysutils/bupstash/Makefile
+++ b/sysutils/bupstash/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2021/10/27 07:24:07 bket Exp $
-
 COMMENT =		encrypted and deduplicated backup tool
 
 V =			0.10.3
diff --git a/sysutils/bupstash/pkg/PLIST b/sysutils/bupstash/pkg/PLIST
index 77837650f59..ee349fbd4db 100644
--- a/sysutils/bupstash/pkg/PLIST
+++ b/sysutils/bupstash/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/08/01 17:08:41 bket Exp $
 @bin bin/bupstash
 @man man/man1/bupstash-diff.1
 @man man/man1/bupstash-gc.1
diff --git a/sysutils/rclone/Makefile b/sysutils/rclone/Makefile
index 11790e2f43e..228cb40870d 100644
--- a/sysutils/rclone/Makefile
+++ b/sysutils/rclone/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.32 2022/01/08 11:57:04 ajacoutot Exp $
-
 BROKEN-aarch64 =	SIGILL when running rclone
 BROKEN-arm =		SIGBUS when running rclone
 
diff --git a/sysutils/rclone/pkg/PLIST b/sysutils/rclone/pkg/PLIST
index 3ca8287c414..1b545c3d539 100644
--- a/sysutils/rclone/pkg/PLIST
+++ b/sysutils/rclone/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2022/01/08 11:57:04 ajacoutot Exp $
 @bin bin/rclone
 @man man/man1/rclone.1
 share/bash-completion/
diff --git a/sysutils/unionfs-fuse/Makefile b/sysutils/unionfs-fuse/Makefile
index 7841f243add..ad69c8aff10 100644
--- a/sysutils/unionfs-fuse/Makefile
+++ b/sysutils/unionfs-fuse/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2021/10/04 04:27:06 bket Exp $
-
 COMMENT =	unionfs filesystem implementation
 
 GH_ACCOUNT =	rpodgorny
diff --git a/sysutils/unionfs-fuse/patches/patch-src_Makefile b/sysutils/unionfs-fuse/patches/patch-src_Makefile
index 01f2d3ea659..f2f9d2bf6e9 100644
--- a/sysutils/unionfs-fuse/patches/patch-src_Makefile
+++ b/sysutils/unionfs-fuse/patches/patch-src_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Makefile,v 1.2 2020/05/14 19:36:05 bket Exp $
-
 Index: src/Makefile
 --- src/Makefile.orig
 +++ src/Makefile
diff --git a/sysutils/unionfs-fuse/patches/patch-src_unionfs_h b/sysutils/unionfs-fuse/patches/patch-src_unionfs_h
index baebba14057..74fcd819529 100644
--- a/sysutils/unionfs-fuse/patches/patch-src_unionfs_h
+++ b/sysutils/unionfs-fuse/patches/patch-src_unionfs_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_unionfs_h,v 1.1.1.1 2019/11/12 15:15:09 bket Exp $
-
 Index: src/unionfs.h
 --- src/unionfs.h.orig
 +++ src/unionfs.h
diff --git a/sysutils/unionfs-fuse/patches/patch-src_usyslog_c b/sysutils/unionfs-fuse/patches/patch-src_usyslog_c
index 69765ff73ac..89d3faa96cd 100644
--- a/sysutils/unionfs-fuse/patches/patch-src_usyslog_c
+++ b/sysutils/unionfs-fuse/patches/patch-src_usyslog_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_usyslog_c,v 1.1.1.1 2019/11/12 15:15:09 bket Exp $
-
 Index: src/usyslog.c
 --- src/usyslog.c.orig
 +++ src/usyslog.c
diff --git a/sysutils/unionfs-fuse/patches/patch-test_legacy_sh b/sysutils/unionfs-fuse/patches/patch-test_legacy_sh
index 713bf964054..474cb726089 100644
--- a/sysutils/unionfs-fuse/patches/patch-test_legacy_sh
+++ b/sysutils/unionfs-fuse/patches/patch-test_legacy_sh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-test_legacy_sh,v 1.1 2020/05/14 19:36:05 bket Exp $
-
 Index: test_legacy.sh
 --- test_legacy.sh.orig
 +++ test_legacy.sh
diff --git a/sysutils/unionfs-fuse/pkg/PLIST b/sysutils/unionfs-fuse/pkg/PLIST
index adfc6ffa75d..73cc3890340 100644
--- a/sysutils/unionfs-fuse/pkg/PLIST
+++ b/sysutils/unionfs-fuse/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/12 15:15:09 bket Exp $
 @bin bin/unionfs
 @bin bin/unionfsctl
 @man man/man8/unionfs.8
diff --git a/sysutils/xxhash/Makefile b/sysutils/xxhash/Makefile
index 646121d0bb9..0d84302adb7 100644
--- a/sysutils/xxhash/Makefile
+++ b/sysutils/xxhash/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.11 2021/12/03 06:21:48 bket Exp $
-
 COMMENT =	extremely fast non-cryptographic hash algorithm
 
 GH_ACCOUNT =	Cyan4973
diff --git a/sysutils/xxhash/patches/patch-Makefile b/sysutils/xxhash/patches/patch-Makefile
index d562d7e4d2b..d338d238b9a 100644
--- a/sysutils/xxhash/patches/patch-Makefile
+++ b/sysutils/xxhash/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.11 2021/12/03 06:21:48 bket Exp $
-
 Don't create symbolic links pointing to the shared lib.
 
 Index: Makefile
diff --git a/sysutils/xxhash/pkg/PLIST b/sysutils/xxhash/pkg/PLIST
index 1d3df1b05ab..7b095c82a1e 100644
--- a/sysutils/xxhash/pkg/PLIST
+++ b/sysutils/xxhash/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/03/06 04:22:13 bket Exp $
 bin/xxh128sum
 bin/xxh32sum
 bin/xxh64sum
diff --git a/x11/spectrwm/Makefile b/x11/spectrwm/Makefile
index 478534d1a85..617ac99f6dd 100644
--- a/x11/spectrwm/Makefile
+++ b/x11/spectrwm/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.38 2021/12/19 13:58:26 sdk Exp $
-
 COMMENT=		small tiling window manager
 
 V=			3.4.1
diff --git a/x11/spectrwm/patches/patch-Makefile b/x11/spectrwm/patches/patch-Makefile
index 856f2ef8893..1eebcf66344 100644
--- a/x11/spectrwm/patches/patch-Makefile
+++ b/x11/spectrwm/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.10 2019/12/02 14:35:35 bket Exp $
-
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/x11/spectrwm/patches/patch-baraction_sh b/x11/spectrwm/patches/patch-baraction_sh
index 3e1a7353139..fde47f538cc 100644
--- a/x11/spectrwm/patches/patch-baraction_sh
+++ b/x11/spectrwm/patches/patch-baraction_sh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-baraction_sh,v 1.1 2021/01/24 15:41:38 mglocker Exp $
-
 Index: baraction.sh
 --- baraction.sh.orig
 +++ baraction.sh
diff --git a/x11/spectrwm/patches/patch-lib_Makefile b/x11/spectrwm/patches/patch-lib_Makefile
index f9065b6a16d..b7f9931e564 100644
--- a/x11/spectrwm/patches/patch-lib_Makefile
+++ b/x11/spectrwm/patches/patch-lib_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_Makefile,v 1.2 2019/12/02 14:35:35 bket Exp $
-
 Index: lib/Makefile
 --- lib/Makefile.orig
 +++ lib/Makefile
diff --git a/x11/spectrwm/patches/patch-spectrwm_1 b/x11/spectrwm/patches/patch-spectrwm_1
index 569ae0ea517..e51ea5f92c1 100644
--- a/x11/spectrwm/patches/patch-spectrwm_1
+++ b/x11/spectrwm/patches/patch-spectrwm_1
@@ -1,5 +1,3 @@
-$OpenBSD: patch-spectrwm_1,v 1.3 2020/06/18 09:18:39 gonzalo Exp $
-
 Index: spectrwm.1
 --- spectrwm.1.orig
 +++ spectrwm.1
diff --git a/x11/spectrwm/patches/patch-spectrwm_c b/x11/spectrwm/patches/patch-spectrwm_c
index 138b9af54fc..03d2f210d29 100644
--- a/x11/spectrwm/patches/patch-spectrwm_c
+++ b/x11/spectrwm/patches/patch-spectrwm_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-spectrwm_c,v 1.17 2021/12/19 13:58:26 sdk Exp $
-
 Needs wpath pledge. Tahen from https://github.com/conformal/spectrwm/pull/425
 Let spectrwm quit when X dies. Taken from https://github.com/conformal/spectrwm/pull/478
 
diff --git a/x11/spectrwm/pkg/PLIST b/x11/spectrwm/pkg/PLIST
index 8e20129c954..b561e144e9b 100644
--- a/x11/spectrwm/pkg/PLIST
+++ b/x11/spectrwm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2019/12/02 14:35:35 bket Exp $
 @conflict scrotwm-*
 @pkgpath x11/scrotwm
 bin/scrotwm
diff --git a/x11/xdrawchem/Makefile b/x11/xdrawchem/Makefile
index e979d0ae0ae..6eb1adddfca 100644
--- a/x11/xdrawchem/Makefile
+++ b/x11/xdrawchem/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2019/08/18 06:47:04 bket Exp $
-
 COMMENT=	two-dimensional molecule drawing program
 
 DISTNAME=	xdrawchem-1.10.2
diff --git a/x11/xdrawchem/patches/patch-xdrawchem_pro b/x11/xdrawchem/patches/patch-xdrawchem_pro
index c5ae0516c21..7a50ee5206a 100644
--- a/x11/xdrawchem/patches/patch-xdrawchem_pro
+++ b/x11/xdrawchem/patches/patch-xdrawchem_pro
@@ -1,5 +1,3 @@
-$OpenBSD: patch-xdrawchem_pro,v 1.1 2018/04/22 05:08:17 bket Exp $
-
 Index: xdrawchem.pro
 --- xdrawchem.pro.orig
 +++ xdrawchem.pro
diff --git a/x11/xdrawchem/patches/patch-xdrawchem_render2d_text_cpp b/x11/xdrawchem/patches/patch-xdrawchem_render2d_text_cpp
index a5277aaada6..e52b17b6c0d 100644
--- a/x11/xdrawchem/patches/patch-xdrawchem_render2d_text_cpp
+++ b/x11/xdrawchem/patches/patch-xdrawchem_render2d_text_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-xdrawchem_render2d_text_cpp,v 1.1 2019/08/18 06:47:05 bket Exp $
-
 Fix segfault when using (hot)key on bond twice in a row. Taken from
 https://github.com/bryanherger/xdrawchem/pull/12
 
diff --git a/x11/xdrawchem/pkg/PLIST b/x11/xdrawchem/pkg/PLIST
index 4b461694d6a..651a84392b1 100644
--- a/x11/xdrawchem/pkg/PLIST
+++ b/x11/xdrawchem/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/04/22 05:08:17 bket Exp $
 @bin bin/xdrawchem
 share/xdrawchem/
 share/xdrawchem/6ring_boat.cml