diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 343ebe44865..93c087c29b4 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.66 2019/07/14 00:39:38 naddy Exp $
-
 COMMENT=	format files for printing on PostScript printers
 
 DISTNAME=	a2ps-4.14
diff --git a/print/a2ps/patches/patch-configure b/print/a2ps/patches/patch-configure
index 5f4f0269409..3246e6d4b53 100644
--- a/print/a2ps/patches/patch-configure
+++ b/print/a2ps/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.4 2013/11/02 08:44:19 ajacoutot Exp $
 --- configure.orig	Sat Dec 29 04:28:03 2007
 +++ configure	Sat Nov  2 08:45:49 2013
 @@ -2519,7 +2519,7 @@ ac_config_headers="$ac_config_headers config.h"
diff --git a/print/a2ps/patches/patch-contrib_sample_Makefile_in b/print/a2ps/patches/patch-contrib_sample_Makefile_in
index f4e33967fa8..94b89fcf6f4 100644
--- a/print/a2ps/patches/patch-contrib_sample_Makefile_in
+++ b/print/a2ps/patches/patch-contrib_sample_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-contrib_sample_Makefile_in,v 1.2 2008/11/23 20:28:32 ajacoutot Exp $
 --- contrib/sample/Makefile.in.orig	Wed Nov 19 19:28:30 2008
 +++ contrib/sample/Makefile.in	Wed Nov 19 19:29:01 2008
 @@ -297,7 +297,7 @@ target_alias = @target_alias@
diff --git a/print/a2ps/patches/patch-etc_a2ps-site_cfg_in b/print/a2ps/patches/patch-etc_a2ps-site_cfg_in
index efad07dca79..d19f4f18836 100644
--- a/print/a2ps/patches/patch-etc_a2ps-site_cfg_in
+++ b/print/a2ps/patches/patch-etc_a2ps-site_cfg_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-etc_a2ps-site_cfg_in,v 1.1 2017/09/26 08:57:19 ajacoutot Exp $
-
 Index: etc/a2ps-site.cfg.in
 --- etc/a2ps-site.cfg.in.orig
 +++ etc/a2ps-site.cfg.in
diff --git a/print/a2ps/patches/patch-etc_a2ps_cfg_in b/print/a2ps/patches/patch-etc_a2ps_cfg_in
index cc3e075204b..c3a49dc2baf 100644
--- a/print/a2ps/patches/patch-etc_a2ps_cfg_in
+++ b/print/a2ps/patches/patch-etc_a2ps_cfg_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-etc_a2ps_cfg_in,v 1.3 2015/04/06 21:05:07 ajacoutot Exp $
 --- etc/a2ps_cfg.in.orig	Sat Nov  2 09:33:46 2013
 +++ etc/a2ps_cfg.in	Sat Nov  2 09:33:57 2013
 @@ -72,7 +72,7 @@ LibraryPath: @libpath@
diff --git a/print/a2ps/patches/patch-lib_Makefile_in b/print/a2ps/patches/patch-lib_Makefile_in
index b55f44626b0..e29a5cb52f7 100644
--- a/print/a2ps/patches/patch-lib_Makefile_in
+++ b/print/a2ps/patches/patch-lib_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.2 2008/11/23 20:28:32 ajacoutot Exp $
 --- lib/Makefile.in.orig	Wed Nov 19 19:29:56 2008
 +++ lib/Makefile.in	Wed Nov 19 19:30:28 2008
 @@ -318,7 +318,7 @@ AUTOMAKE_OPTIONS = $(top_builddir)/lib/ansi2knr
diff --git a/print/a2ps/patches/patch-lib_argmatch_c b/print/a2ps/patches/patch-lib_argmatch_c
index a2e0184c2fb..c400107c539 100644
--- a/print/a2ps/patches/patch-lib_argmatch_c
+++ b/print/a2ps/patches/patch-lib_argmatch_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_argmatch_c,v 1.1 2013/11/02 08:44:19 ajacoutot Exp $
 --- lib/argmatch.c.orig	Sat Nov  2 09:01:28 2013
 +++ lib/argmatch.c	Sat Nov  2 09:01:37 2013
 @@ -20,6 +20,14 @@
diff --git a/print/a2ps/patches/patch-lib_obstack_c b/print/a2ps/patches/patch-lib_obstack_c
index bb87f88aeea..d0842018316 100644
--- a/print/a2ps/patches/patch-lib_obstack_c
+++ b/print/a2ps/patches/patch-lib_obstack_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_obstack_c,v 1.2 2013/11/02 08:44:19 ajacoutot Exp $
 --- lib/obstack.c.orig	Sat Dec 29 02:37:54 2007
 +++ lib/obstack.c	Sat Nov  2 09:04:48 2013
 @@ -21,6 +21,14 @@
diff --git a/print/a2ps/patches/patch-lib_output_c b/print/a2ps/patches/patch-lib_output_c
index 0435032eeb2..2ad88f6f931 100644
--- a/print/a2ps/patches/patch-lib_output_c
+++ b/print/a2ps/patches/patch-lib_output_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_output_c,v 1.1 2015/11/17 08:38:52 ajacoutot Exp $
-
 Fix for CVE-2015-8107:
 http://www.openwall.com/lists/oss-security/2015/11/16/4
 
diff --git a/print/a2ps/patches/patch-lib_path-concat_c b/print/a2ps/patches/patch-lib_path-concat_c
index c12e20aca37..1bcec9d3c66 100644
--- a/print/a2ps/patches/patch-lib_path-concat_c
+++ b/print/a2ps/patches/patch-lib_path-concat_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_path-concat_c,v 1.1 2009/01/07 17:51:16 jasper Exp $
 --- lib/path-concat.c.orig	Wed Jan  7 18:27:53 2009
 +++ lib/path-concat.c	Wed Jan  7 18:28:12 2009
 @@ -31,6 +31,8 @@
diff --git a/print/a2ps/patches/patch-lib_quotearg_c b/print/a2ps/patches/patch-lib_quotearg_c
index 12e990e7c02..0efb8789e72 100644
--- a/print/a2ps/patches/patch-lib_quotearg_c
+++ b/print/a2ps/patches/patch-lib_quotearg_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_quotearg_c,v 1.1 2009/01/07 17:51:16 jasper Exp $
 --- lib/quotearg.c.orig	Wed Jan  7 18:33:26 2009
 +++ lib/quotearg.c	Wed Jan  7 18:34:52 2009
 @@ -67,6 +67,10 @@
diff --git a/print/a2ps/patches/patch-lib_routines_c b/print/a2ps/patches/patch-lib_routines_c
index 86cd5f27516..83882e9ec30 100644
--- a/print/a2ps/patches/patch-lib_routines_c
+++ b/print/a2ps/patches/patch-lib_routines_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_routines_c,v 1.2 2014/02/05 15:09:45 jasper Exp $
-
 Security fix for CVE-2001-1593
 https://bugzilla.redhat.com/show_bug.cgi?id=1060630
 
diff --git a/print/a2ps/patches/patch-lib_routines_h b/print/a2ps/patches/patch-lib_routines_h
index 83e73e75d14..90c6feb7c94 100644
--- a/print/a2ps/patches/patch-lib_routines_h
+++ b/print/a2ps/patches/patch-lib_routines_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_routines_h,v 1.2 2014/02/05 15:09:45 jasper Exp $
-
 Security fix for CVE-2001-1593
 https://bugzilla.redhat.com/show_bug.cgi?id=1060630
 
diff --git a/print/a2ps/patches/patch-lib_title_c b/print/a2ps/patches/patch-lib_title_c
index d9119cc9dcd..cdf4217b414 100644
--- a/print/a2ps/patches/patch-lib_title_c
+++ b/print/a2ps/patches/patch-lib_title_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_title_c,v 1.1 2009/01/07 17:51:16 jasper Exp $
 --- lib/title.c.orig	Wed Jan  7 18:35:10 2009
 +++ lib/title.c	Wed Jan  7 18:35:34 2009
 @@ -27,6 +27,10 @@
diff --git a/print/a2ps/patches/patch-src_Makefile_in b/print/a2ps/patches/patch-src_Makefile_in
index ccf720d1c06..0c793944987 100644
--- a/print/a2ps/patches/patch-src_Makefile_in
+++ b/print/a2ps/patches/patch-src_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2008/11/23 20:28:32 ajacoutot Exp $
 --- src/Makefile.in.orig	Wed Nov 19 19:30:38 2008
 +++ src/Makefile.in	Wed Nov 19 19:30:48 2008
 @@ -304,7 +304,7 @@ BUILT_SOURCES = parsessh.c parsessh.h
diff --git a/print/a2ps/patches/patch-src_long-options_c b/print/a2ps/patches/patch-src_long-options_c
index 38571b7ed75..6d7a6faf728 100644
--- a/print/a2ps/patches/patch-src_long-options_c
+++ b/print/a2ps/patches/patch-src_long-options_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_long-options_c,v 1.1 2013/11/02 08:44:19 ajacoutot Exp $
 --- src/long-options.c.orig	Sat Nov  2 09:01:46 2013
 +++ src/long-options.c	Sat Nov  2 09:03:50 2013
 @@ -21,6 +21,10 @@
diff --git a/print/a2ps/patches/patch-src_select_c b/print/a2ps/patches/patch-src_select_c
index 92fefaa49ea..9f1b0aad72b 100644
--- a/print/a2ps/patches/patch-src_select_c
+++ b/print/a2ps/patches/patch-src_select_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_select_c,v 1.1 2013/11/02 08:44:19 ajacoutot Exp $
-
 warning: passing argument 1 of 'free' discards qualifiers from pointer target type
 
 --- src/select.c.orig	Sat Nov  2 09:10:01 2013
diff --git a/print/a2ps/pkg/PLIST b/print/a2ps/pkg/PLIST
index 233b1ed11c8..df17e9faa81 100644
--- a/print/a2ps/pkg/PLIST
+++ b/print/a2ps/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.21 2018/09/04 12:46:20 espie Exp $
 @pkgpath print/a2ps[,a4][,a4dj][,letter][,letterdj]
 @bin bin/a2ps
 bin/card
diff --git a/print/a2ps/pkg/README b/print/a2ps/pkg/README
index af567adeb66..77a283f5084 100644
--- a/print/a2ps/pkg/README
+++ b/print/a2ps/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.3 2018/09/04 12:46:20 espie Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index f20c0ca8587..a26096536e0 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.21 2019/07/12 20:48:54 sthen Exp $
-
 COMMENT=		filter to print a wide range of file formats
 
 DISTNAME=		apsfilter-7.2.8
diff --git a/print/apsfilter/patches/patch-Makefile_in b/print/apsfilter/patches/patch-Makefile_in
index f1d96ce6b4d..d7e7f43b490 100644
--- a/print/apsfilter/patches/patch-Makefile_in
+++ b/print/apsfilter/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2007/04/08 15:19:31 sturm Exp $
 --- Makefile.in.orig	Sun Jul  9 17:54:22 2006
 +++ Makefile.in	Sat Apr  7 15:59:47 2007
 @@ -11,6 +11,7 @@ mandir=${DESTDIR}@mandir@
diff --git a/print/apsfilter/patches/patch-SETUP_in b/print/apsfilter/patches/patch-SETUP_in
index 29da0f6612d..7a5d494ec06 100644
--- a/print/apsfilter/patches/patch-SETUP_in
+++ b/print/apsfilter/patches/patch-SETUP_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-SETUP_in,v 1.1 2007/04/08 15:19:31 sturm Exp $
 --- SETUP.in.orig	Sat Apr  7 16:18:36 2007
 +++ SETUP.in	Sat Apr  7 16:20:28 2007
 @@ -243,6 +243,8 @@ do_check_gs_version()
diff --git a/print/apsfilter/patches/patch-bin_apsfilter_in b/print/apsfilter/patches/patch-bin_apsfilter_in
index ebf8f04e49a..1a81ca4ba97 100644
--- a/print/apsfilter/patches/patch-bin_apsfilter_in
+++ b/print/apsfilter/patches/patch-bin_apsfilter_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-bin_apsfilter_in,v 1.1 2007/04/08 15:19:31 sturm Exp $
 --- bin/apsfilter.in.orig	Sun Jul  9 17:54:24 2006
 +++ bin/apsfilter.in	Sat Apr  7 18:25:03 2007
 @@ -277,12 +277,14 @@ play_mp3()
diff --git a/print/apsfilter/pkg/PLIST b/print/apsfilter/pkg/PLIST
index 36b7b4bdffa..048ed801a00 100644
--- a/print/apsfilter/pkg/PLIST
+++ b/print/apsfilter/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/09/04 12:46:20 espie Exp $
 @unexec rm -f ${SYSCONFDIR}/apsfilter/basedir
 bin/aps2file
 bin/apsfilter-bug
diff --git a/print/apsfilter/pkg/README b/print/apsfilter/pkg/README
index 8e0d1247284..37b4475f21b 100644
--- a/print/apsfilter/pkg/README
+++ b/print/apsfilter/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.2 2018/09/04 12:46:20 espie Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/apvlv/Makefile b/print/apvlv/Makefile
index c310e6e29eb..fbf50e08b6d 100644
--- a/print/apvlv/Makefile
+++ b/print/apvlv/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.21 2019/07/12 21:02:24 sthen Exp $
-
 COMMENT=	lightweight PDF document viewer with vi bindings
 
 GH_ACCOUNT =	naihe2010
diff --git a/print/apvlv/patches/patch-CMakeLists_txt b/print/apvlv/patches/patch-CMakeLists_txt
index d355522b059..49da50e33ea 100644
--- a/print/apvlv/patches/patch-CMakeLists_txt
+++ b/print/apvlv/patches/patch-CMakeLists_txt
@@ -1,4 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2017/04/27 21:37:05 landry Exp $
 --- CMakeLists.txt.orig	Mon Feb 13 10:28:46 2017
 +++ CMakeLists.txt	Mon Feb 13 10:29:37 2017
 @@ -66,7 +66,7 @@ IF (WIN32)
diff --git a/print/apvlv/patches/patch-src_ApvlvCmds_cc b/print/apvlv/patches/patch-src_ApvlvCmds_cc
index c977e08db1a..7580d1980e4 100644
--- a/print/apvlv/patches/patch-src_ApvlvCmds_cc
+++ b/print/apvlv/patches/patch-src_ApvlvCmds_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_ApvlvCmds_cc,v 1.1 2018/04/08 13:02:26 jasper Exp $
-
 From 9da539016cb6c317388020f4ebce1793077aa126 Mon Sep 17 00:00:00 2001
 From: Ryan Reno <ryan.reno@outlook.com>
 Date: Fri, 23 Jun 2017 21:56:22 -0700
diff --git a/print/apvlv/patches/patch-src_ApvlvCore_cc b/print/apvlv/patches/patch-src_ApvlvCore_cc
index 22d5d8ca477..70060f3a236 100644
--- a/print/apvlv/patches/patch-src_ApvlvCore_cc
+++ b/print/apvlv/patches/patch-src_ApvlvCore_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_ApvlvCore_cc,v 1.1 2018/04/08 13:02:26 jasper Exp $
-
 From 9da539016cb6c317388020f4ebce1793077aa126 Mon Sep 17 00:00:00 2001
 From: Ryan Reno <ryan.reno@outlook.com>
 Date: Fri, 23 Jun 2017 21:56:22 -0700
diff --git a/print/apvlv/patches/patch-src_ApvlvPdf_cc b/print/apvlv/patches/patch-src_ApvlvPdf_cc
index d68333c60fe..36efe6ef385 100644
--- a/print/apvlv/patches/patch-src_ApvlvPdf_cc
+++ b/print/apvlv/patches/patch-src_ApvlvPdf_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_ApvlvPdf_cc,v 1.1 2019/01/11 20:13:59 kili Exp $
-
 Let it build with poppler-0.73.0.
 
 Funny enough, neither any of the types defined in goo/gtypes.h nor the
diff --git a/print/apvlv/pkg/PLIST b/print/apvlv/pkg/PLIST
index 5ce571512a8..52294bb2e46 100644
--- a/print/apvlv/pkg/PLIST
+++ b/print/apvlv/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/06/27 21:04:01 espie Exp $
 @bin bin/apvlv
 @man man/man1/apvlv.1
 share/applications/apvlv.desktop
diff --git a/print/bg5ps/Makefile b/print/bg5ps/Makefile
index 49557801a1e..7bf086c93c0 100644
--- a/print/bg5ps/Makefile
+++ b/print/bg5ps/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.4 2021/02/23 19:39:35 sthen Exp $
-
 COMMENT=	convert Big5/GB encoded files to postscript
 
 DISTNAME=	bg5ps-1.3.0
diff --git a/print/bg5ps/patches/patch-bg5ps_conf b/print/bg5ps/patches/patch-bg5ps_conf
index 0b6fd9ed085..1aa36d95b1a 100644
--- a/print/bg5ps/patches/patch-bg5ps_conf
+++ b/print/bg5ps/patches/patch-bg5ps_conf
@@ -1,4 +1,3 @@
-$OpenBSD: patch-bg5ps_conf,v 1.1.1.1 2018/12/26 10:02:49 bentley Exp $
 --- bg5ps.conf.orig	Mon Feb 14 21:28:35 2000
 +++ bg5ps.conf	Fri Jul  8 11:33:55 2011
 @@ -4,7 +4,7 @@
diff --git a/print/bg5ps/patches/patch-ttf2psm_c b/print/bg5ps/patches/patch-ttf2psm_c
index 2d75ee4d825..f91a4605982 100644
--- a/print/bg5ps/patches/patch-ttf2psm_c
+++ b/print/bg5ps/patches/patch-ttf2psm_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-ttf2psm_c,v 1.1.1.1 2018/12/26 10:02:49 bentley Exp $
 --- ttf2psm.c.orig	Tue Sep  7 18:35:36 2010
 +++ ttf2psm.c	Tue Sep  7 18:36:05 2010
 @@ -18,6 +18,7 @@
diff --git a/print/bg5ps/pkg/PLIST b/print/bg5ps/pkg/PLIST
index 33d6fd3dcb5..fc02e1a8fd0 100644
--- a/print/bg5ps/pkg/PLIST
+++ b/print/bg5ps/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/12/26 10:02:49 bentley Exp $
 @pkgpath chinese/bg5ps
 @pkgpath fonts/zh-bg5ps
 bin/bg5ps
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index f8ea854ec35..f799738ab2d 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.28 2019/07/12 20:48:54 sthen Exp $
-
 COMMENT=	GUI for manipulating BibTeX bibliography databases
 
 DISTNAME=	bibview-2.2
diff --git a/print/bibview/patches/patch-BibView_eng_ad b/print/bibview/patches/patch-BibView_eng_ad
index 82b0f15c8d2..4318dd0bb3d 100644
--- a/print/bibview/patches/patch-BibView_eng_ad
+++ b/print/bibview/patches/patch-BibView_eng_ad
@@ -1,5 +1,3 @@
-$OpenBSD: patch-BibView_eng_ad,v 1.1 2018/11/09 11:06:24 sthen Exp $
-
 Remove trailing tab causing UI glitch
 
 Index: BibView.eng.ad
diff --git a/print/bibview/patches/patch-ComboBo_h b/print/bibview/patches/patch-ComboBo_h
index 68750f11e17..f720fc20d9b 100644
--- a/print/bibview/patches/patch-ComboBo_h
+++ b/print/bibview/patches/patch-ComboBo_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ComboBo_h,v 1.2 2018/11/09 11:03:25 sthen Exp $
-
 Index: ComboBo.h
 --- ComboBo.h.orig
 +++ ComboBo.h
diff --git a/print/bibview/patches/patch-FileNom_c b/print/bibview/patches/patch-FileNom_c
index 6a00691f963..52849c67784 100644
--- a/print/bibview/patches/patch-FileNom_c
+++ b/print/bibview/patches/patch-FileNom_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-FileNom_c,v 1.2 2018/11/09 11:03:25 sthen Exp $
-
 Index: FileNom.c
 --- FileNom.c.orig
 +++ FileNom.c
diff --git a/print/bibview/patches/patch-FileNom_h b/print/bibview/patches/patch-FileNom_h
index 376cf5f44fa..121b0dfe41b 100644
--- a/print/bibview/patches/patch-FileNom_h
+++ b/print/bibview/patches/patch-FileNom_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-FileNom_h,v 1.2 2018/11/09 11:03:25 sthen Exp $
-
 Index: FileNom.h
 --- FileNom.h.orig
 +++ FileNom.h
diff --git a/print/bibview/patches/patch-Imakefile b/print/bibview/patches/patch-Imakefile
index 30fb2a6f3ff..1468e0ae21e 100644
--- a/print/bibview/patches/patch-Imakefile
+++ b/print/bibview/patches/patch-Imakefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Imakefile,v 1.3 2018/11/09 11:03:25 sthen Exp $
-
 Index: Imakefile
 --- Imakefile.orig
 +++ Imakefile
diff --git a/print/bibview/patches/patch-bib_file_c b/print/bibview/patches/patch-bib_file_c
index 292832c1529..3756331aa1c 100644
--- a/print/bibview/patches/patch-bib_file_c
+++ b/print/bibview/patches/patch-bib_file_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-bib_file_c,v 1.3 2018/11/09 11:06:24 sthen Exp $
-
 Index: bib_file.c
 --- bib_file.c.orig
 +++ bib_file.c
diff --git a/print/bibview/patches/patch-bib_flex_c b/print/bibview/patches/patch-bib_flex_c
index 8146ff2f9fe..403994f3834 100644
--- a/print/bibview/patches/patch-bib_flex_c
+++ b/print/bibview/patches/patch-bib_flex_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-bib_flex_c,v 1.1 2018/11/09 11:06:24 sthen Exp $
-
 Index: bib_flex.c
 --- bib_flex.c.orig
 +++ bib_flex.c
diff --git a/print/bibview/patches/patch-bibview_c b/print/bibview/patches/patch-bibview_c
index e12db85fbe5..36aa39bfe15 100644
--- a/print/bibview/patches/patch-bibview_c
+++ b/print/bibview/patches/patch-bibview_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-bibview_c,v 1.3 2018/11/09 11:06:24 sthen Exp $
-
 Index: bibview.c
 --- bibview.c.orig
 +++ bibview.c
diff --git a/print/bibview/patches/patch-ctl_card_c b/print/bibview/patches/patch-ctl_card_c
index 7e45646bce2..87601dc8a04 100644
--- a/print/bibview/patches/patch-ctl_card_c
+++ b/print/bibview/patches/patch-ctl_card_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ctl_card_c,v 1.2 2018/11/09 11:03:25 sthen Exp $
-
 Index: ctl_card.c
 --- ctl_card.c.orig
 +++ ctl_card.c
diff --git a/print/bibview/patches/patch-ctl_open_c b/print/bibview/patches/patch-ctl_open_c
index 06ac341dac6..4ed1a2ede3c 100644
--- a/print/bibview/patches/patch-ctl_open_c
+++ b/print/bibview/patches/patch-ctl_open_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ctl_open_c,v 1.3 2018/11/09 11:06:24 sthen Exp $
-
 Index: ctl_open.c
 --- ctl_open.c.orig
 +++ ctl_open.c
diff --git a/print/bibview/patches/patch-ctl_serv_c b/print/bibview/patches/patch-ctl_serv_c
index 9e44c03f5db..7f09fcdf860 100644
--- a/print/bibview/patches/patch-ctl_serv_c
+++ b/print/bibview/patches/patch-ctl_serv_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ctl_serv_c,v 1.3 2018/11/09 11:06:24 sthen Exp $
-
 Index: ctl_serv.c
 --- ctl_serv.c.orig
 +++ ctl_serv.c
diff --git a/print/bibview/patches/patch-globdata_c b/print/bibview/patches/patch-globdata_c
index 538b76d1d80..f93034535d6 100644
--- a/print/bibview/patches/patch-globdata_c
+++ b/print/bibview/patches/patch-globdata_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-globdata_c,v 1.1 2018/11/09 11:06:24 sthen Exp $
-
 Index: globdata.c
 --- globdata.c.orig
 +++ globdata.c
diff --git a/print/bibview/patches/patch-gui_card_c b/print/bibview/patches/patch-gui_card_c
index 1126106e0f0..c892bfbd153 100644
--- a/print/bibview/patches/patch-gui_card_c
+++ b/print/bibview/patches/patch-gui_card_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gui_card_c,v 1.2 2018/11/09 11:03:25 sthen Exp $
-
 Index: gui_card.c
 --- gui_card.c.orig
 +++ gui_card.c
diff --git a/print/bibview/patches/patch-gui_widg_c b/print/bibview/patches/patch-gui_widg_c
index cc3fd50cc21..876cf4f007d 100644
--- a/print/bibview/patches/patch-gui_widg_c
+++ b/print/bibview/patches/patch-gui_widg_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gui_widg_c,v 1.2 2018/11/09 11:03:25 sthen Exp $
-
 Index: gui_widg.c
 --- gui_widg.c.orig
 +++ gui_widg.c
diff --git a/print/bibview/patches/patch-rc_file_c b/print/bibview/patches/patch-rc_file_c
index e7cac732299..db7392d0042 100644
--- a/print/bibview/patches/patch-rc_file_c
+++ b/print/bibview/patches/patch-rc_file_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-rc_file_c,v 1.1 2018/11/09 11:06:24 sthen Exp $
-
 Index: rc_file.c
 --- rc_file.c.orig
 +++ rc_file.c
diff --git a/print/bibview/pkg/PLIST b/print/bibview/pkg/PLIST
index 91abd0d7e56..54fc813650a 100644
--- a/print/bibview/pkg/PLIST
+++ b/print/bibview/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2013/10/11 20:39:45 naddy Exp $
 @bin bin/bibview
 lib/X11/app-defaults/BibView
 lib/X11/app-defaults/BibView-color
diff --git a/print/brlaser/Makefile b/print/brlaser/Makefile
index 397e38dbe3b..1678f6e5fa5 100644
--- a/print/brlaser/Makefile
+++ b/print/brlaser/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2019/09/27 12:49:57 ajacoutot Exp $
-
 COMMENT=	CUPS printer driver for some Brother laser printers
 
 GH_ACCOUNT=	pdewacht
diff --git a/print/brlaser/pkg/PLIST b/print/brlaser/pkg/PLIST
index 3728151f68f..9981cc912a9 100644
--- a/print/brlaser/pkg/PLIST
+++ b/print/brlaser/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/10/26 13:57:08 jcs Exp $
 @bin libexec/cups/filter/rastertobrlaser
 share/cups/drv/brlaser.drv
 share/doc/pkg-readmes/${PKGSTEM}
diff --git a/print/brlaser/pkg/README b/print/brlaser/pkg/README
index bf13a0376e8..76c7fb89ed0 100644
--- a/print/brlaser/pkg/README
+++ b/print/brlaser/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.2 2018/10/26 17:06:19 ajacoutot Exp $
-
 +-------------------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-------------------------------------------------------------------------------
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index b6be7ceb2de..2eaaff0c1f6 100644
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2021/06/15 19:48:44 tb Exp $
-
 COMMENT=		BJNP protocol backend for CUPS
 
 DISTNAME=		cups-bjnp-2.0.3
diff --git a/print/cups-bjnp/patches/patch-bjnp-commands_c b/print/cups-bjnp/patches/patch-bjnp-commands_c
index 48c3aae37df..e518d2bec34 100644
--- a/print/cups-bjnp/patches/patch-bjnp-commands_c
+++ b/print/cups-bjnp/patches/patch-bjnp-commands_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-bjnp-commands_c,v 1.2 2021/02/07 19:27:18 ajacoutot Exp $
-
 bjnp-commands.c:188:9: error: comparison of array 'printer_id' not equal to a null pointer is always true [-Werror,-Wtautological-pointer-compare]
     if (printer_id != NULL) {
         ^~~~~~~~~~    ~~~~
diff --git a/print/cups-bjnp/patches/patch-bjnp-io_c b/print/cups-bjnp/patches/patch-bjnp-io_c
index d0858f83761..e65312049fe 100644
--- a/print/cups-bjnp/patches/patch-bjnp-io_c
+++ b/print/cups-bjnp/patches/patch-bjnp-io_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-bjnp-io_c,v 1.3 2021/06/15 19:48:44 tb Exp $
-
 Fix build with base-gcc:
 bjnp-io.c:174: warning: comparison is always false due to limited range of data type
 
diff --git a/print/cups-bjnp/patches/patch-configure b/print/cups-bjnp/patches/patch-configure
index 20a06d41f80..ea32920f8c8 100644
--- a/print/cups-bjnp/patches/patch-configure
+++ b/print/cups-bjnp/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.3 2021/02/07 19:27:18 ajacoutot Exp $
-
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/print/cups-bjnp/pkg/PLIST b/print/cups-bjnp/pkg/PLIST
index 801d8a9530a..c77dc2f8a2c 100644
--- a/print/cups-bjnp/pkg/PLIST
+++ b/print/cups-bjnp/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/02/07 19:27:19 ajacoutot Exp $
 @bin libexec/cups/backend/bjnp
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 46f6c387329..76ae7e0014a 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.194 2022/02/18 07:38:03 ajacoutot Exp $
-
 BROKEN-alpha=	ICE in cupsfilters/image-jpeg.c:316
 BROKEN-hppa=	ICE on filter/pdftopdf/qpdf_pdftopdf.cc:147
 
diff --git a/print/cups-filters/pkg/PLIST b/print/cups-filters/pkg/PLIST
index 3b38ec9c99a..dbec8f1b50a 100644
--- a/print/cups-filters/pkg/PLIST
+++ b/print/cups-filters/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.41 2021/08/18 06:42:30 ajacoutot Exp $
 @conflict cups-<1.6.0
 @conflict ghostscript-<9.06p3
 @conflict foomatic-filters-*
diff --git a/print/cups-filters/pkg/README b/print/cups-filters/pkg/README
index 223da845911..6df5d5d5bec 100644
--- a/print/cups-filters/pkg/README
+++ b/print/cups-filters/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.12 2020/09/20 09:32:07 ajacoutot Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/cups-filters/pkg/cups_browsed.rc b/print/cups-filters/pkg/cups_browsed.rc
index 1cc7cf20b2c..8b806a755f5 100644
--- a/print/cups-filters/pkg/cups_browsed.rc
+++ b/print/cups-filters/pkg/cups_browsed.rc
@@ -1,6 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: cups_browsed.rc,v 1.4 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/cups-browsed"
 
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index c219b0ffb24..6cdc2a844df 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.19 2019/07/12 20:48:54 sthen Exp $
-
 COMMENT=		PDF backend for CUPS
 
 DISTNAME=		cups-pdf-3.0.1
diff --git a/print/cups-pdf/patches/patch-extra_cups-pdf_conf b/print/cups-pdf/patches/patch-extra_cups-pdf_conf
index ebfce38ec96..fab518d7025 100644
--- a/print/cups-pdf/patches/patch-extra_cups-pdf_conf
+++ b/print/cups-pdf/patches/patch-extra_cups-pdf_conf
@@ -1,4 +1,3 @@
-$OpenBSD: patch-extra_cups-pdf_conf,v 1.5 2017/07/22 20:41:10 ajacoutot Exp $
 Index: extra/cups-pdf.conf
 --- extra/cups-pdf.conf.orig
 +++ extra/cups-pdf.conf
diff --git a/print/cups-pdf/patches/patch-src_cups-pdf_h b/print/cups-pdf/patches/patch-src_cups-pdf_h
index ba096566b9f..82a722733eb 100644
--- a/print/cups-pdf/patches/patch-src_cups-pdf_h
+++ b/print/cups-pdf/patches/patch-src_cups-pdf_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_cups-pdf_h,v 1.5 2017/07/22 20:41:10 ajacoutot Exp $
 Index: src/cups-pdf.h
 --- src/cups-pdf.h.orig
 +++ src/cups-pdf.h
diff --git a/print/cups-pdf/pkg/PLIST b/print/cups-pdf/pkg/PLIST
index 9c1ada5650e..55dcc3b0259 100644
--- a/print/cups-pdf/pkg/PLIST
+++ b/print/cups-pdf/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2018/09/04 12:46:20 espie Exp $
 @extraunexec rm -rf /var/spool/cups-pdf/
 @mode 0700
 @bin libexec/cups/backend/cups-pdf
diff --git a/print/cups-pdf/pkg/README b/print/cups-pdf/pkg/README
index b33c2dc8725..58942b7797a 100644
--- a/print/cups-pdf/pkg/README
+++ b/print/cups-pdf/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.3 2018/09/04 12:46:20 espie Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 27ab99ea5d6..1937b82504d 100755
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2021/09/05 12:12:43 ajacoutot Exp $
-
 COMMENT=	fine-grained privileges PolicyKit helper for CUPS
 
 DISTNAME=	cups-pk-helper-0.2.6
diff --git a/print/cups-pk-helper/pkg/PLIST b/print/cups-pk-helper/pkg/PLIST
index c1d5efb4759..a676fcb1d41 100644
--- a/print/cups-pk-helper/pkg/PLIST
+++ b/print/cups-pk-helper/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2021/09/05 12:12:43 ajacoutot Exp $
 @bin libexec/cups-pk-helper-mechanism
 share/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service
 share/examples/cups-pk-helper/
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ddd44571f32..5c50593b90b 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.265 2022/01/28 09:44:22 ajacoutot Exp $
-
 COMMENT-main=		Common Unix Printing System
 COMMENT-libs=		CUPS libraries and headers
 
diff --git a/print/cups/patches/patch-Makedefs_in b/print/cups/patches/patch-Makedefs_in
index 5eac5e4baed..5acadd9bca0 100644
--- a/print/cups/patches/patch-Makedefs_in
+++ b/print/cups/patches/patch-Makedefs_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makedefs_in,v 1.19 2021/12/04 08:14:02 ajacoutot Exp $
-
 BSD_INSTALL_PROGRAM is used to respect INSTALL_STRIP.
 
 Index: Makedefs.in
diff --git a/print/cups/patches/patch-backend_ipp_c b/print/cups/patches/patch-backend_ipp_c
index e13b56c67d5..f460aade1aa 100644
--- a/print/cups/patches/patch-backend_ipp_c
+++ b/print/cups/patches/patch-backend_ipp_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-backend_ipp_c,v 1.24 2021/12/04 08:14:02 ajacoutot Exp $
-
 Increase timeout for the PPD file to be copied so that it doesn't fail
 on low-end configurations.
 
diff --git a/print/cups/patches/patch-config-scripts_cups-common_m4 b/print/cups/patches/patch-config-scripts_cups-common_m4
index 06ecba28ece..4e4f96a81c7 100644
--- a/print/cups/patches/patch-config-scripts_cups-common_m4
+++ b/print/cups/patches/patch-config-scripts_cups-common_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-config-scripts_cups-common_m4,v 1.20 2021/12/04 08:14:02 ajacoutot Exp $
-
 Our <sys/ucred.h> does not provide xucred.
 
 Index: config-scripts/cups-common.m4
diff --git a/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4 b/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
index d2cf360c7b7..3c45ea5a2dc 100644
--- a/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
+++ b/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-config-scripts_cups-sharedlibs_m4,v 1.14 2021/12/04 08:14:02 ajacoutot Exp $
-
 Index: config-scripts/cups-sharedlibs.m4
 --- config-scripts/cups-sharedlibs.m4.orig
 +++ config-scripts/cups-sharedlibs.m4
diff --git a/print/cups/patches/patch-cups_Makefile b/print/cups/patches/patch-cups_Makefile
index b8bdc26f70d..093263feb40 100644
--- a/print/cups/patches/patch-cups_Makefile
+++ b/print/cups/patches/patch-cups_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cups_Makefile,v 1.22 2022/01/28 09:44:22 ajacoutot Exp $
-
 Index: cups/Makefile
 --- cups/Makefile.orig
 +++ cups/Makefile
diff --git a/print/cups/patches/patch-cups_getifaddrs-internal_h b/print/cups/patches/patch-cups_getifaddrs-internal_h
index a206b014e16..c6580c9803a 100644
--- a/print/cups/patches/patch-cups_getifaddrs-internal_h
+++ b/print/cups/patches/patch-cups_getifaddrs-internal_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cups_getifaddrs-internal_h,v 1.3 2021/12/04 08:14:02 ajacoutot Exp $
-
 In file included from getifaddrs.c:15:
 In file included from ./getifaddrs-internal.h:42:
 /usr/include/resolv.h:137:14: error: array has incomplete element type 'struct sockaddr_in'
diff --git a/print/cups/patches/patch-notifier_Makefile b/print/cups/patches/patch-notifier_Makefile
index 33a973c2c35..955d16ab01a 100644
--- a/print/cups/patches/patch-notifier_Makefile
+++ b/print/cups/patches/patch-notifier_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-notifier_Makefile,v 1.5 2019/08/25 09:59:18 ajacoutot Exp $
-
 Index: notifier/Makefile
 --- notifier/Makefile.orig
 +++ notifier/Makefile
diff --git a/print/cups/patches/patch-scheduler_Makefile b/print/cups/patches/patch-scheduler_Makefile
index 0fc69c01a63..54c00ba9b03 100644
--- a/print/cups/patches/patch-scheduler_Makefile
+++ b/print/cups/patches/patch-scheduler_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scheduler_Makefile,v 1.18 2021/01/05 07:43:02 ajacoutot Exp $
-
 Index: scheduler/Makefile
 --- scheduler/Makefile.orig
 +++ scheduler/Makefile
diff --git a/print/cups/patches/patch-scheduler_auth_c b/print/cups/patches/patch-scheduler_auth_c
index d8a1d9e1e4b..a2c20ff5fbd 100644
--- a/print/cups/patches/patch-scheduler_auth_c
+++ b/print/cups/patches/patch-scheduler_auth_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scheduler_auth_c,v 1.13 2021/12/04 08:14:02 ajacoutot Exp $
-
 Index: scheduler/auth.c
 --- scheduler/auth.c.orig
 +++ scheduler/auth.c
diff --git a/print/cups/patches/patch-scheduler_ipp_c b/print/cups/patches/patch-scheduler_ipp_c
index 4570ba42f8a..5200d50b3e7 100644
--- a/print/cups/patches/patch-scheduler_ipp_c
+++ b/print/cups/patches/patch-scheduler_ipp_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scheduler_ipp_c,v 1.30 2021/12/04 08:14:02 ajacoutot Exp $
-
 Increase timeout for the PPD file to be copied so that it doesn't fail
 on low-end configurations.
 
diff --git a/print/cups/patches/patch-test_run-stp-tests_sh b/print/cups/patches/patch-test_run-stp-tests_sh
index 56b2efd0557..71a961b7896 100644
--- a/print/cups/patches/patch-test_run-stp-tests_sh
+++ b/print/cups/patches/patch-test_run-stp-tests_sh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-test_run-stp-tests_sh,v 1.25 2021/02/02 11:49:22 ajacoutot Exp $
-
 Index: test/run-stp-tests.sh
 --- test/run-stp-tests.sh.orig
 +++ test/run-stp-tests.sh
diff --git a/print/cups/pkg/PLIST-libs b/print/cups/pkg/PLIST-libs
index c50d249e1c5..c49ed8d0e4c 100644
--- a/print/cups/pkg/PLIST-libs
+++ b/print/cups/pkg/PLIST-libs
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-libs,v 1.11 2021/12/04 08:14:02 ajacoutot Exp $
 @conflict cups-<1.6.0
 @newgroup _cups:541
 @newuser _cups:541:541:daemon:CUPS printer spooler daemon:/nonexistent:/sbin/nologin
diff --git a/print/cups/pkg/PLIST-main b/print/cups/pkg/PLIST-main
index 52b2bf17621..34185219f6a 100644
--- a/print/cups/pkg/PLIST-main
+++ b/print/cups/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.32 2021/12/04 08:14:02 ajacoutot Exp $
 @conflict LPRng-*
 @pkgpath print/cups
 @pkgpath print/cups,ldap
diff --git a/print/cups/pkg/README-main b/print/cups/pkg/README-main
index 66638fde850..3b77e4cf1b6 100644
--- a/print/cups/pkg/README-main
+++ b/print/cups/pkg/README-main
@@ -1,5 +1,3 @@
-$OpenBSD: README-main,v 1.26 2021/09/15 12:48:52 ajacoutot Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/cups/pkg/cupsd.rc b/print/cups/pkg/cupsd.rc
index 0a7901fe607..71cf08cc23e 100755
--- a/print/cups/pkg/cupsd.rc
+++ b/print/cups/pkg/cupsd.rc
@@ -1,6 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: cupsd.rc,v 1.30 2019/01/19 21:37:46 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/cupsd"
 
diff --git a/print/detex/Makefile b/print/detex/Makefile
index 718cc15fdfc..7ca205572d0 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.33 2019/07/12 20:48:54 sthen Exp $
-
 COMMENT=		strip TeX/LaTeX codes from a file
 
 DISTNAME=		opendetex-2.8.1
diff --git a/print/detex/pkg/PLIST b/print/detex/pkg/PLIST
index a8f3def9bf9..d643d091c04 100644
--- a/print/detex/pkg/PLIST
+++ b/print/detex/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2016/02/28 14:59:14 czarkoff Exp $
 @conflict texlive_texmf-minimal-<=2012p0
 @bin bin/detex
 @man man/man1/detex.1
diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile
index 5a1457c710c..e86a52bca4e 100644
--- a/print/dvi2tty/Makefile
+++ b/print/dvi2tty/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:54 sthen Exp $
-
 COMMENT=		converts .dvi files to plain text
 
 DISTNAME=		dvi2tty-5.3.1
diff --git a/print/dvi2tty/patches/patch-disdvi_c b/print/dvi2tty/patches/patch-disdvi_c
index a65ae18cf5e..ed8aa177ea8 100644
--- a/print/dvi2tty/patches/patch-disdvi_c
+++ b/print/dvi2tty/patches/patch-disdvi_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-disdvi_c,v 1.2 2010/05/11 06:36:59 espie Exp $
 --- disdvi.c.orig	Thu Jan 23 11:31:00 2003
 +++ disdvi.c	Tue May 11 08:35:29 2010
 @@ -107,15 +107,7 @@ char * progname;
diff --git a/print/dvi2tty/patches/patch-dvi2tty_c b/print/dvi2tty/patches/patch-dvi2tty_c
index 82de407ef6f..9a81cfd0b55 100644
--- a/print/dvi2tty/patches/patch-dvi2tty_c
+++ b/print/dvi2tty/patches/patch-dvi2tty_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-dvi2tty_c,v 1.2 2010/05/11 06:36:59 espie Exp $
 --- dvi2tty.c.orig	Thu Jan 23 11:28:30 2003
 +++ dvi2tty.c	Tue May 11 07:06:36 2010
 @@ -180,7 +180,7 @@
diff --git a/print/dvi2tty/patches/patch-dvistuff_c b/print/dvi2tty/patches/patch-dvistuff_c
index 5044916c831..1e7baca4166 100644
--- a/print/dvi2tty/patches/patch-dvistuff_c
+++ b/print/dvi2tty/patches/patch-dvistuff_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-dvistuff_c,v 1.1 2012/03/17 18:55:18 naddy Exp $
 --- dvistuff.c.orig	Sat Mar 17 12:48:59 2012
 +++ dvistuff.c	Sat Mar 17 12:51:00 2012
 @@ -179,7 +179,7 @@ void            rule            (bool, long, long);
diff --git a/print/dvi2tty/pkg/PLIST b/print/dvi2tty/pkg/PLIST
index ed7eb8d9b3f..b3e0104cb9f 100644
--- a/print/dvi2tty/pkg/PLIST
+++ b/print/dvi2tty/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:32:13 espie Exp $
 bin/disdvi
 bin/dvi2tty
 @man man/man1/disdvi.1
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 0e23de3c09a..9bd1c81d491 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.37 2019/07/12 20:48:54 sthen Exp $
-
 COMMENT=		convert ASCII files to PostScript
 
 DISTNAME=		enscript-1.6.6
diff --git a/print/enscript/patches/patch-compat_getopt_c b/print/enscript/patches/patch-compat_getopt_c
index 5178572fd77..d90097c6809 100644
--- a/print/enscript/patches/patch-compat_getopt_c
+++ b/print/enscript/patches/patch-compat_getopt_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-compat_getopt_c,v 1.1 2015/05/02 09:39:05 ajacoutot Exp $
-
 warning: incompatible implicit declaration of built-in function 'strlen'
 
 --- compat/getopt.c.orig	Sat May  2 10:41:42 2015
diff --git a/print/enscript/pkg/PLIST b/print/enscript/pkg/PLIST
index 57fd013a4eb..b6a605248f5 100644
--- a/print/enscript/pkg/PLIST
+++ b/print/enscript/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.12 2015/07/20 00:50:27 naddy Exp $
 @pkgpath print/enscript,a4
 bin/diffpp
 @bin bin/enscript
diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile
index a56b71cf8f6..99bac7b8680 100644
--- a/print/epson-inkjet-printer-escpr/Makefile
+++ b/print/epson-inkjet-printer-escpr/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2022/02/03 09:40:11 ajacoutot Exp $
-
 # MASTER_SITES changes at each version; when looking for updates, try searching
 # ${HOMEPAGE} for a linux driver, for e.g. sx200
 PORTROACH=		ignore:1
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api-private_h b/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api-private_h
index 5802f6c042b..2e263d2b542 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api-private_h
+++ b/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api-private_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_epson-escpr-api-private_h,v 1.1.1.1 2019/09/29 13:22:28 ajacoutot Exp $
-
 Index: lib/epson-escpr-api-private.h
 --- lib/epson-escpr-api-private.h.orig
 +++ lib/epson-escpr-api-private.h
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api_c b/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api_c
index c6c071e634e..b3dfa8c47d0 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api_c
+++ b/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-escpr-api_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_epson-escpr-api_c,v 1.1.1.1 2019/09/29 13:22:28 ajacoutot Exp $
-
 Index: lib/epson-escpr-api.c
 --- lib/epson-escpr-api.c.orig
 +++ lib/epson-escpr-api.c
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-usb_c b/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-usb_c
index b21daa82d9a..ec321aab0a2 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-usb_c
+++ b/print/epson-inkjet-printer-escpr/patches/patch-lib_epson-usb_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_epson-usb_c,v 1.1.1.1 2019/09/29 13:22:28 ajacoutot Exp $
-
 Index: lib/epson-usb.c
 --- lib/epson-usb.c.orig
 +++ lib/epson-usb.c
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-src_filter_c b/print/epson-inkjet-printer-escpr/patches/patch-src_filter_c
index 3db5c5ca111..5c79039bf51 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-src_filter_c
+++ b/print/epson-inkjet-printer-escpr/patches/patch-src_filter_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_filter_c,v 1.2 2020/10/25 20:47:53 ajacoutot Exp $
-
 Index: src/filter.c
 --- src/filter.c.orig
 +++ src/filter.c
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-src_linux_cmn_c b/print/epson-inkjet-printer-escpr/patches/patch-src_linux_cmn_c
index 20d0c1f1806..406e8d025ab 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-src_linux_cmn_c
+++ b/print/epson-inkjet-printer-escpr/patches/patch-src_linux_cmn_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_linux_cmn_c,v 1.1.1.1 2019/09/29 13:22:28 ajacoutot Exp $
-
 Index: src/linux_cmn.c
 --- src/linux_cmn.c.orig
 +++ src/linux_cmn.c
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-src_mem_c b/print/epson-inkjet-printer-escpr/patches/patch-src_mem_c
index 199a1b35718..bc1f47afb6a 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-src_mem_c
+++ b/print/epson-inkjet-printer-escpr/patches/patch-src_mem_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mem_c,v 1.1.1.1 2019/09/29 13:22:28 ajacoutot Exp $
-
 Index: src/mem.c
 --- src/mem.c.orig
 +++ src/mem.c
diff --git a/print/epson-inkjet-printer-escpr/patches/patch-src_wrapper_c b/print/epson-inkjet-printer-escpr/patches/patch-src_wrapper_c
index 7fc17da68c5..419b4c97bbf 100644
--- a/print/epson-inkjet-printer-escpr/patches/patch-src_wrapper_c
+++ b/print/epson-inkjet-printer-escpr/patches/patch-src_wrapper_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_wrapper_c,v 1.2 2021/05/07 17:36:14 ajacoutot Exp $
-
 Index: src/wrapper.c
 --- src/wrapper.c.orig
 +++ src/wrapper.c
diff --git a/print/epson-inkjet-printer-escpr/pkg/PLIST b/print/epson-inkjet-printer-escpr/pkg/PLIST
index 230f0f7648a..ca5ce40a6ba 100644
--- a/print/epson-inkjet-printer-escpr/pkg/PLIST
+++ b/print/epson-inkjet-printer-escpr/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.11 2022/02/03 09:40:11 ajacoutot Exp $
 @static-lib lib/libescpr.a
 lib/libescpr.la
 @lib lib/libescpr.so.${LIBescpr_VERSION}
diff --git a/print/foiltex/Makefile b/print/foiltex/Makefile
index 3eede1227b2..35eb6e15322 100644
--- a/print/foiltex/Makefile
+++ b/print/foiltex/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2019/07/14 00:39:39 naddy Exp $
-
 COMMENT=	LaTeX2e class for overhead transparencies
 
 DISTNAME=	foiltex-2.1.4b
diff --git a/print/foiltex/pkg/PLIST b/print/foiltex/pkg/PLIST
index 4d1c527e401..12a4a4e33ac 100644
--- a/print/foiltex/pkg/PLIST
+++ b/print/foiltex/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/07/01 09:02:41 espie Exp $
 share/texmf-local/
 share/texmf-local/doc/
 share/texmf-local/doc/latex/
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index f967858f4b7..a7143d3d79d 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.49 2021/06/09 21:52:24 kili Exp $
-
 BROKEN-i386=		hangs at runtime. started after switch to clang
 
 COMMENT=		vector font editor/converter
diff --git a/print/fontforge/patches/patch-Makefile_dynamic_in b/print/fontforge/patches/patch-Makefile_dynamic_in
index dccfe497f8f..d5fb08bd58a 100644
--- a/print/fontforge/patches/patch-Makefile_dynamic_in
+++ b/print/fontforge/patches/patch-Makefile_dynamic_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_dynamic_in,v 1.5 2014/01/14 17:16:07 jasper Exp $
 --- Makefile.dynamic.in.orig	Thu Aug  2 17:09:08 2012
 +++ Makefile.dynamic.in	Sat Jan  4 21:42:37 2014
 @@ -77,7 +77,6 @@ install_libs: libs
diff --git a/print/fontforge/patches/patch-Unicode_Makefile_dynamic_in b/print/fontforge/patches/patch-Unicode_Makefile_dynamic_in
index 67801373dc1..c0e1d23f963 100644
--- a/print/fontforge/patches/patch-Unicode_Makefile_dynamic_in
+++ b/print/fontforge/patches/patch-Unicode_Makefile_dynamic_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Unicode_Makefile_dynamic_in,v 1.4 2014/01/14 17:16:07 jasper Exp $
 --- Unicode/Makefile.dynamic.in.orig	Thu Aug  2 17:09:08 2012
 +++ Unicode/Makefile.dynamic.in	Sat Jan  4 21:42:37 2014
 @@ -20,7 +20,7 @@ libgunicode_OBJECTS =  ArabicForms.lo alphabet.lo back
diff --git a/print/fontforge/patches/patch-fontforge_Makefile_dynamic_in b/print/fontforge/patches/patch-fontforge_Makefile_dynamic_in
index 5ec2bebed9f..4abad716f65 100644
--- a/print/fontforge/patches/patch-fontforge_Makefile_dynamic_in
+++ b/print/fontforge/patches/patch-fontforge_Makefile_dynamic_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-fontforge_Makefile_dynamic_in,v 1.3 2014/01/14 17:16:07 jasper Exp $
 --- fontforge/Makefile.dynamic.in.orig	Thu Aug  2 17:09:08 2012
 +++ fontforge/Makefile.dynamic.in	Sat Jan  4 21:42:37 2014
 @@ -138,12 +138,12 @@ splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir
diff --git a/print/fontforge/patches/patch-fontforge_cvexport_c b/print/fontforge/patches/patch-fontforge_cvexport_c
index 0efe788c3fb..eb398c53ecb 100644
--- a/print/fontforge/patches/patch-fontforge_cvexport_c
+++ b/print/fontforge/patches/patch-fontforge_cvexport_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-fontforge_cvexport_c,v 1.2 2014/01/14 17:16:07 jasper Exp $
 --- fontforge/cvexport.c.orig	Thu Aug  2 17:09:08 2012
 +++ fontforge/cvexport.c	Sat Jan  4 21:42:37 2014
 @@ -220,15 +220,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) {
diff --git a/print/fontforge/patches/patch-fontforge_print_c b/print/fontforge/patches/patch-fontforge_print_c
index 9e71253554e..192e01446c1 100644
--- a/print/fontforge/patches/patch-fontforge_print_c
+++ b/print/fontforge/patches/patch-fontforge_print_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-fontforge_print_c,v 1.2 2014/01/14 17:16:07 jasper Exp $
 --- fontforge/print.c.orig	Thu Aug  2 17:09:09 2012
 +++ fontforge/print.c	Sat Jan  4 21:42:37 2014
 @@ -1143,10 +1143,7 @@ static void dump_pdfprologue(PI *pi) {
diff --git a/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in b/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in
index 32d8c62061f..87ad2171b7d 100644
--- a/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in
+++ b/print/fontforge/patches/patch-gdraw_Makefile_dynamic_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-gdraw_Makefile_dynamic_in,v 1.6 2014/01/14 17:16:07 jasper Exp $
 --- gdraw/Makefile.dynamic.in.orig	Thu Aug  2 17:09:09 2012
 +++ gdraw/Makefile.dynamic.in	Sat Jan  4 21:42:37 2014
 @@ -36,7 +36,7 @@ libgdraw_OBJECTS =  choosericons.lo ctlvalues.lo drawb
diff --git a/print/fontforge/patches/patch-gutils_gimagereadgif_c b/print/fontforge/patches/patch-gutils_gimagereadgif_c
index 351846da09c..bba345222c0 100644
--- a/print/fontforge/patches/patch-gutils_gimagereadgif_c
+++ b/print/fontforge/patches/patch-gutils_gimagereadgif_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gutils_gimagereadgif_c,v 1.2 2015/03/28 17:59:17 sthen Exp $
-
 giflib 5.0+
 
 --- gutils/gimagereadgif.c.orig	Thu Aug  2 16:09:09 2012
diff --git a/print/fontforge/pkg/PLIST b/print/fontforge/pkg/PLIST
index 6daf8ba0230..02d0b3dbaf0 100644
--- a/print/fontforge/pkg/PLIST
+++ b/print/fontforge/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.9 2014/01/14 17:16:07 jasper Exp $
 @bin bin/fontforge
 bin/fontimage
 bin/fontlint
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index c7a5b979b95..38aed03af0f 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.70 2020/10/22 08:23:40 ajacoutot Exp $
-
 COMMENT=	driver for ZjStream wire protocol compatible printers
 
 VERSION=	20200610
diff --git a/print/foo2zjs/patches/patch-Makefile b/print/foo2zjs/patches/patch-Makefile
index 45022c0abeb..19034127bb7 100644
--- a/print/foo2zjs/patches/patch-Makefile
+++ b/print/foo2zjs/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.32 2020/10/22 08:23:40 ajacoutot Exp $
-
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/print/foo2zjs/patches/patch-foo2zjs-pstops_sh b/print/foo2zjs/patches/patch-foo2zjs-pstops_sh
index edebc8e3e08..f0837db63bb 100644
--- a/print/foo2zjs/patches/patch-foo2zjs-pstops_sh
+++ b/print/foo2zjs/patches/patch-foo2zjs-pstops_sh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-foo2zjs-pstops_sh,v 1.2 2020/10/22 08:23:40 ajacoutot Exp $
-
 Index: foo2zjs-pstops.sh
 --- foo2zjs-pstops.sh.orig
 +++ foo2zjs-pstops.sh
diff --git a/print/foo2zjs/patches/patch-getweb_in b/print/foo2zjs/patches/patch-getweb_in
index c4750a31cac..9d81adb0e49 100644
--- a/print/foo2zjs/patches/patch-getweb_in
+++ b/print/foo2zjs/patches/patch-getweb_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-getweb_in,v 1.32 2020/10/22 08:23:40 ajacoutot Exp $
-
 Index: getweb.in
 --- getweb.in.orig
 +++ getweb.in
diff --git a/print/foo2zjs/patches/patch-icc2ps_Makefile b/print/foo2zjs/patches/patch-icc2ps_Makefile
index 7102efe5b87..a9b5a795722 100644
--- a/print/foo2zjs/patches/patch-icc2ps_Makefile
+++ b/print/foo2zjs/patches/patch-icc2ps_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-icc2ps_Makefile,v 1.5 2020/10/22 08:23:40 ajacoutot Exp $
-
 --- icc2ps/Makefile.orig	Sat Nov 27 11:04:56 2010
 +++ icc2ps/Makefile	Thu Dec  9 08:01:15 2010
 @@ -1,15 +1,12 @@
diff --git a/print/foo2zjs/pkg/PLIST b/print/foo2zjs/pkg/PLIST
index fa0960e5149..1e2559276f5 100644
--- a/print/foo2zjs/pkg/PLIST
+++ b/print/foo2zjs/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.23 2019/09/29 13:41:11 ajacoutot Exp $
 @conflict foomatic-db-<4.0.20091207p1
 @conflict foo2zjs-cup-*
 @pkgpath print/foo2zjs,-cups
diff --git a/print/foo2zjs/pkg/README b/print/foo2zjs/pkg/README
index 76d0386bc8f..3764746673e 100644
--- a/print/foo2zjs/pkg/README
+++ b/print/foo2zjs/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.7 2018/09/04 12:46:20 espie Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index e8050812549..227dcf7b14b 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.43 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT=		Foomatic PPD generator
 
 DISTNAME=		foomatic-db-engine-4.0.13
diff --git a/print/foomatic-db-engine/patches/patch-Makefile_in b/print/foomatic-db-engine/patches/patch-Makefile_in
index cc609f5e489..ba474210a69 100644
--- a/print/foomatic-db-engine/patches/patch-Makefile_in
+++ b/print/foomatic-db-engine/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2011/04/15 18:50:06 ajacoutot Exp $
 --- Makefile.in.orig	Fri Feb 18 13:30:22 2011
 +++ Makefile.in	Fri Apr 15 20:45:20 2011
 @@ -187,13 +187,9 @@ check-config:
diff --git a/print/foomatic-db-engine/patches/patch-configure b/print/foomatic-db-engine/patches/patch-configure
index e16de4b6ae1..22c5e12f110 100644
--- a/print/foomatic-db-engine/patches/patch-configure
+++ b/print/foomatic-db-engine/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.9 2018/03/04 09:33:07 ajacoutot Exp $
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/print/foomatic-db-engine/patches/patch-foomatic-combo-xml_c b/print/foomatic-db-engine/patches/patch-foomatic-combo-xml_c
index eaac9b1a257..0433e505ba3 100644
--- a/print/foomatic-db-engine/patches/patch-foomatic-combo-xml_c
+++ b/print/foomatic-db-engine/patches/patch-foomatic-combo-xml_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-foomatic-combo-xml_c,v 1.4 2011/04/15 18:50:06 ajacoutot Exp $
 --- foomatic-combo-xml.c.orig	Fri Feb 18 13:30:22 2011
 +++ foomatic-combo-xml.c	Fri Apr 15 20:45:20 2011
 @@ -2225,7 +2225,7 @@ main(int  argc,     /* I - Number of command-line argu
diff --git a/print/foomatic-db-engine/patches/patch-foomatic-kitload_in b/print/foomatic-db-engine/patches/patch-foomatic-kitload_in
index 13e55dd0e65..e450ca8943d 100644
--- a/print/foomatic-db-engine/patches/patch-foomatic-kitload_in
+++ b/print/foomatic-db-engine/patches/patch-foomatic-kitload_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-foomatic-kitload_in,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
 --- foomatic-kitload.in.orig	Thu Oct 10 18:16:12 2002
 +++ foomatic-kitload.in	Mon Jun 21 23:55:22 2004
 @@ -54,7 +54,7 @@ $ENV{'LC_ALL'} = "C";
diff --git a/print/foomatic-db-engine/pkg/PLIST b/print/foomatic-db-engine/pkg/PLIST
index 171fe30f67a..f4dfd6d8cbc 100644
--- a/print/foomatic-db-engine/pkg/PLIST
+++ b/print/foomatic-db-engine/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.9 2018/09/04 12:46:20 espie Exp $
 @bin bin/foomatic-combo-xml
 bin/foomatic-compiledb
 bin/foomatic-configure
diff --git a/print/foomatic-db-engine/pkg/README b/print/foomatic-db-engine/pkg/README
index b1da79c10a4..fc25ece8d2d 100644
--- a/print/foomatic-db-engine/pkg/README
+++ b/print/foomatic-db-engine/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.11 2018/09/04 12:46:20 espie Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 7c4be38ea4e..baea32adf50 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.52 2020/12/11 12:57:33 ajacoutot Exp $
-
 PKG_ARCH=		*
 
 COMMENT=		Foomatic PPD data
diff --git a/print/foomatic-db/patches/patch-Makefile_in b/print/foomatic-db/patches/patch-Makefile_in
index d02634b6767..cef693ba109 100644
--- a/print/foomatic-db/patches/patch-Makefile_in
+++ b/print/foomatic-db/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2012/01/12 16:47:06 ajacoutot Exp $
 --- Makefile.in.orig	Thu Jan 12 01:40:32 2012
 +++ Makefile.in	Thu Jan 12 17:35:06 2012
 @@ -74,8 +74,10 @@ install-db:
diff --git a/print/foomatic-db/patches/patch-configure b/print/foomatic-db/patches/patch-configure
index 224dedde928..2f97c1a05e1 100644
--- a/print/foomatic-db/patches/patch-configure
+++ b/print/foomatic-db/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.5 2015/06/08 09:44:42 ajacoutot Exp $
 --- configure.orig	Thu Apr 16 01:17:52 2015
 +++ configure	Mon Jun  8 11:38:01 2015
 @@ -1849,9 +1849,9 @@ $as_echo "no" >&6; }
diff --git a/print/foomatic-db/pkg/PLIST b/print/foomatic-db/pkg/PLIST
index d0ac41945ad..89fca37fc0d 100644
--- a/print/foomatic-db/pkg/PLIST
+++ b/print/foomatic-db/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.34 2020/12/11 12:57:33 ajacoutot Exp $
 share/cups/
 share/cups/model/
 share/cups/model/foomatic-db-ppds
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index ac36c39efdd..3d74c6efe5e 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.50 2019/07/12 20:48:55 sthen Exp $
-
 # this is freetype1; freetype2 is in xenocara.
 PORTROACH=	limit:^1\.
 
diff --git a/print/freetype/patches/patch-Makefile_in b/print/freetype/patches/patch-Makefile_in
index 0246e3e4dfd..8011f61bbd3 100644
--- a/print/freetype/patches/patch-Makefile_in
+++ b/print/freetype/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2001/02/19 20:04:09 danh Exp $
 --- Makefile.in.orig	Wed Aug 19 21:59:56 1998
 +++ Makefile.in	Mon Feb 19 14:57:25 2001
 @@ -8,9 +8,9 @@ FTLIBDIR = lib
diff --git a/print/freetype/patches/patch-ft_conf_h_in b/print/freetype/patches/patch-ft_conf_h_in
index 6e04543b324..71c4dfb6895 100644
--- a/print/freetype/patches/patch-ft_conf_h_in
+++ b/print/freetype/patches/patch-ft_conf_h_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-ft_conf_h_in,v 1.1 2003/09/02 18:35:33 pvalchev Exp $
 --- ft_conf.h.in.orig	2003-09-02 12:27:10.000000000 -0600
 +++ ft_conf.h.in	2003-09-02 12:27:53.000000000 -0600
 @@ -93,7 +93,7 @@
diff --git a/print/freetype/pkg/PLIST-doc b/print/freetype/pkg/PLIST-doc
index 4afa22ab7b0..d0eb3a89e1c 100644
--- a/print/freetype/pkg/PLIST-doc
+++ b/print/freetype/pkg/PLIST-doc
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-doc,v 1.2 2004/09/15 18:32:14 espie Exp $
 share/doc/freetype/
 share/doc/freetype/FAQ
 share/doc/freetype/TODO
diff --git a/print/freetype/pkg/PLIST-main b/print/freetype/pkg/PLIST-main
index fee2a9fa42e..c309fc59527 100644
--- a/print/freetype/pkg/PLIST-main
+++ b/print/freetype/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2015/03/19 20:25:27 naddy Exp $
 @pkgpath print/freetype
 include/freetype1/
 include/freetype1/freetype/
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index c17df5d5357..42148574c8a 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2010/02/01 17:00:14 espie Exp $
-
     SUBDIR =
     SUBDIR += gnu
     SUBDIR += gnu,a4
diff --git a/print/ghostscript/gnu-fonts/Makefile b/print/ghostscript/gnu-fonts/Makefile
index f96ac0458ac..d3a6f02fcf6 100644
--- a/print/ghostscript/gnu-fonts/Makefile
+++ b/print/ghostscript/gnu-fonts/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.16 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT=		35 standard PostScript fonts with Adobe name aliases
 
 DISTNAME=		ghostscript-fonts-std-8.11
diff --git a/print/ghostscript/gnu-fonts/pkg/PLIST b/print/ghostscript/gnu-fonts/pkg/PLIST
index 49ac6e0df27..17b477bb363 100644
--- a/print/ghostscript/gnu-fonts/pkg/PLIST
+++ b/print/ghostscript/gnu-fonts/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2015/04/06 21:04:30 ajacoutot Exp $
 share/fonts/
 @fontdir share/fonts/ghostscript/
 share/fonts/ghostscript/a010013l.afm
diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile
index 2ece3010572..0d3272a3a93 100644
--- a/print/ghostscript/gnu/Makefile
+++ b/print/ghostscript/gnu/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.121 2022/01/30 15:08:08 ajacoutot Exp $
-
 COMMENT =	PostScript and PDF interpreter
 
 VERSION =	9.55.0
diff --git a/print/ghostscript/gnu/patches/patch-configure b/print/ghostscript/gnu/patches/patch-configure
index b03e4f946a9..db366636e67 100644
--- a/print/ghostscript/gnu/patches/patch-configure
+++ b/print/ghostscript/gnu/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.2 2022/01/29 07:37:14 ajacoutot Exp $
-
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/print/ghostscript/gnu/pkg/PFRAG.gtk b/print/ghostscript/gnu/pkg/PFRAG.gtk
index 2b361354e04..550f3eb780c 100644
--- a/print/ghostscript/gnu/pkg/PFRAG.gtk
+++ b/print/ghostscript/gnu/pkg/PFRAG.gtk
@@ -1,2 +1 @@
-@comment $OpenBSD: PFRAG.gtk,v 1.9 2022/01/30 15:08:08 ajacoutot Exp $
 @bin bin/gsx
diff --git a/print/ghostscript/gnu/pkg/PLIST b/print/ghostscript/gnu/pkg/PLIST
index adf4c9c623e..801134a7b8b 100644
--- a/print/ghostscript/gnu/pkg/PLIST
+++ b/print/ghostscript/gnu/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.31 2022/01/30 15:08:08 ajacoutot Exp $
 bin/dvipdf
 bin/eps2eps
 @bin bin/gs
diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile
index 5a7503e8478..4e7bb78e37d 100644
--- a/print/gl2ps/Makefile
+++ b/print/gl2ps/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2020/04/11 04:44:37 feinerer Exp $
-
 COMMENT =		OpenGL to PostScript printing library
 
 DISTNAME =		gl2ps-1.4.2
diff --git a/print/gl2ps/pkg/PLIST b/print/gl2ps/pkg/PLIST
index c838747b342..f68f8306352 100644
--- a/print/gl2ps/pkg/PLIST
+++ b/print/gl2ps/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/04/05 07:26:59 feinerer Exp $
 include/gl2ps.h
 @static-lib lib/libgl2ps.a
 @lib lib/libgl2ps.so.${LIBgl2ps_VERSION}
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index ff393490c42..cc67e48230e 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.44 2021/02/05 12:39:00 ajacoutot Exp $
-
 COMMENT=		GTK+ frontend to CUPS
 
 DISTNAME=		gtklp-1.3.4
diff --git a/print/gtklp/patches/patch-gtklp_gtklp_c b/print/gtklp/patches/patch-gtklp_gtklp_c
index 125291c3e6a..ba52dc94dbc 100644
--- a/print/gtklp/patches/patch-gtklp_gtklp_c
+++ b/print/gtklp/patches/patch-gtklp_gtklp_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gtklp_gtklp_c,v 1.3 2021/02/05 12:39:00 ajacoutot Exp $
-
 Fix for -fno-common.
 
 Index: gtklp/gtklp.c
diff --git a/print/gtklp/patches/patch-gtklp_gtklp_functions_c b/print/gtklp/patches/patch-gtklp_gtklp_functions_c
index a7c1154e724..3b91a90c131 100644
--- a/print/gtklp/patches/patch-gtklp_gtklp_functions_c
+++ b/print/gtklp/patches/patch-gtklp_gtklp_functions_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gtklp_gtklp_functions_c,v 1.3 2021/02/05 12:39:00 ajacoutot Exp $
-
 Fix for -fno-common.
 
 Index: gtklp/gtklp_functions.c
diff --git a/print/gtklp/patches/patch-gtklpq_gtklpq_c b/print/gtklp/patches/patch-gtklpq_gtklpq_c
index 96d93a07f82..7ff170a86f7 100644
--- a/print/gtklp/patches/patch-gtklpq_gtklpq_c
+++ b/print/gtklp/patches/patch-gtklpq_gtklpq_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gtklpq_gtklpq_c,v 1.1 2021/02/05 12:39:00 ajacoutot Exp $
-
 Fix for -fno-common.
 
 Index: gtklpq/gtklpq.c
diff --git a/print/gtklp/patches/patch-libgtklp_libgtklp_h b/print/gtklp/patches/patch-libgtklp_libgtklp_h
index 24fecbdd2ec..df3dc4fcb97 100644
--- a/print/gtklp/patches/patch-libgtklp_libgtklp_h
+++ b/print/gtklp/patches/patch-libgtklp_libgtklp_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libgtklp_libgtklp_h,v 1.4 2021/02/05 12:39:00 ajacoutot Exp $
-
 Fix for -fno-common.
 
 Index: libgtklp/libgtklp.h
diff --git a/print/gtklp/pkg/PLIST b/print/gtklp/pkg/PLIST
index f24946d1c9a..9ba9241baa8 100644
--- a/print/gtklp/pkg/PLIST
+++ b/print/gtklp/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/11/02 12:01:13 ajacoutot Exp $
 @bin bin/gtklp
 @bin bin/gtklpq
 @man man/man1/gtklp.1
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index 93f867fffe5..dc05520eabc 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.55 2022/01/16 20:10:33 kmos Exp $
-
 COMMENT=		high quality print drivers for foomatic and CUPS
 
 V=			5.3.4
diff --git a/print/gutenprint/patches/patch-configure b/print/gutenprint/patches/patch-configure
index ba4cd1bfd0a..7111a5f00d4 100644
--- a/print/gutenprint/patches/patch-configure
+++ b/print/gutenprint/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.13 2021/01/24 16:08:23 ajacoutot Exp $
-
 Don't set POSIX_C_SOURCE, this interferes with BSD_VISIBLE;
 see patch-src_escputil_escputil_c
 
diff --git a/print/gutenprint/patches/patch-src_cups_backend_common_h b/print/gutenprint/patches/patch-src_cups_backend_common_h
index bc80d190e8b..03842c81d68 100644
--- a/print/gutenprint/patches/patch-src_cups_backend_common_h
+++ b/print/gutenprint/patches/patch-src_cups_backend_common_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_cups_backend_common_h,v 1.3 2021/01/24 16:08:23 ajacoutot Exp $
-
 Index: src/cups/backend_common.h
 --- src/cups/backend_common.h.orig
 +++ src/cups/backend_common.h
diff --git a/print/gutenprint/patches/patch-src_escputil_escputil_c b/print/gutenprint/patches/patch-src_escputil_escputil_c
index e6c4314e7d9..4750bfdcfe4 100644
--- a/print/gutenprint/patches/patch-src_escputil_escputil_c
+++ b/print/gutenprint/patches/patch-src_escputil_escputil_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_escputil_escputil_c,v 1.1 2021/01/24 16:08:23 ajacoutot Exp $
-
 escputil.c:350:15: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
               printf(_("You may only specify one printer or raw device."));
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/print/gutenprint/patches/patch-src_gutenprintui2_plist_c b/print/gutenprint/patches/patch-src_gutenprintui2_plist_c
index ef622b77f5c..04ad3addd44 100644
--- a/print/gutenprint/patches/patch-src_gutenprintui2_plist_c
+++ b/print/gutenprint/patches/patch-src_gutenprintui2_plist_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_gutenprintui2_plist_c,v 1.5 2021/01/24 16:08:23 ajacoutot Exp $
-
 Index: src/gutenprintui2/plist.c
 --- src/gutenprintui2/plist.c.orig
 +++ src/gutenprintui2/plist.c
diff --git a/print/gutenprint/pkg/PLIST b/print/gutenprint/pkg/PLIST
index 2d09b22738c..a0f8528437e 100644
--- a/print/gutenprint/pkg/PLIST
+++ b/print/gutenprint/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.10 2021/01/24 16:08:23 ajacoutot Exp $
 @conflict foomatic-db-gutenprint-<5.2.4p1
 @conflict foomatic-db-gutenprint-*
 @pkgpath print/gutenprint,-foomatic
diff --git a/print/gv/Makefile b/print/gv/Makefile
index f15ce70c50e..dfc26c745e8 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.44 2019/07/16 21:29:41 sthen Exp $
-
 COMMENT= 	PostScript and PDF previewer
 
 DISTNAME=	gv-3.7.4
diff --git a/print/gv/patches/patch-src_Makefile_in b/print/gv/patches/patch-src_Makefile_in
index 953a2f88ebf..6e0e3b8ea00 100644
--- a/print/gv/patches/patch-src_Makefile_in
+++ b/print/gv/patches/patch-src_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2016/03/05 17:42:01 sthen Exp $
-
 - Fix linking (needs libiconv)
 
 --- src/Makefile.in.orig	Sun Mar 17 11:20:10 2013
diff --git a/print/gv/pkg/PLIST b/print/gv/pkg/PLIST
index abbbf4ca28b..d3d8d221fbd 100644
--- a/print/gv/pkg/PLIST
+++ b/print/gv/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2016/03/05 17:42:01 sthen Exp $
 @bin bin/gv
 bin/gv-update-userconfig
 @info info/gv.info
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 34cea9f603a..a7d4de73344 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.198 2022/02/28 09:49:55 ajacoutot Exp $
-
 PORTROACH=		skipv:${V}_py2.5
 
 COMMENT-main=		HP Linux Imaging and Printing
diff --git a/print/hplip/patches/patch-Makefile_in b/print/hplip/patches/patch-Makefile_in
index 697582db493..2edd5576c4b 100644
--- a/print/hplip/patches/patch-Makefile_in
+++ b/print/hplip/patches/patch-Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.67 2022/02/28 09:49:55 ajacoutot Exp $
-
 https://sources.debian.org/src/hplip/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch/
 
 Index: Makefile.in
diff --git a/print/hplip/patches/patch-base_codes_py b/print/hplip/patches/patch-base_codes_py
index cd5da17b700..528a7aa6ec3 100644
--- a/print/hplip/patches/patch-base_codes_py
+++ b/print/hplip/patches/patch-base_codes_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_codes_py,v 1.17 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- base/codes.py.orig	Wed May  4 07:23:22 2016
 +++ base/codes.py	Thu May  5 10:02:31 2016
 @@ -335,7 +335,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001
diff --git a/print/hplip/patches/patch-base_g_py b/print/hplip/patches/patch-base_g_py
index 5ba821d7d07..fe6b90e16dd 100644
--- a/print/hplip/patches/patch-base_g_py
+++ b/print/hplip/patches/patch-base_g_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_g_py,v 1.13 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- base/g.py.orig	Mon Feb  8 10:42:52 2016
 +++ base/g.py	Wed Feb 10 09:14:55 2016
 @@ -182,16 +182,16 @@ class ConfigBase(object):
diff --git a/print/hplip/patches/patch-base_magic_py b/print/hplip/patches/patch-base_magic_py
index 6137ada67e4..3529d07ed06 100644
--- a/print/hplip/patches/patch-base_magic_py
+++ b/print/hplip/patches/patch-base_magic_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_magic_py,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- base/magic.py.orig	Thu Jan 29 13:20:35 2015
 +++ base/magic.py	Thu Feb  5 14:32:58 2015
 @@ -255,10 +255,10 @@ magic = [
diff --git a/print/hplip/patches/patch-base_mdns_py b/print/hplip/patches/patch-base_mdns_py
index 492923ddf48..73daf633dd6 100644
--- a/print/hplip/patches/patch-base_mdns_py
+++ b/print/hplip/patches/patch-base_mdns_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_mdns_py,v 1.6 2015/02/05 17:34:33 ajacoutot Exp $
-
 IP_MULTICAST_TTL socket option on OpenBSD currently doesn't accept
 int, only unsigned char:
 Unable to setup multicast socket... [Errno 22] Invalid argument
diff --git a/print/hplip/patches/patch-base_password_py b/print/hplip/patches/patch-base_password_py
index 7d379538b52..46c6d434143 100644
--- a/print/hplip/patches/patch-base_password_py
+++ b/print/hplip/patches/patch-base_password_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_password_py,v 1.13 2022/02/28 09:49:55 ajacoutot Exp $
-
 Index: base/password.py
 --- base/password.py.orig
 +++ base/password.py
diff --git a/print/hplip/patches/patch-base_queues_py b/print/hplip/patches/patch-base_queues_py
index c21a4df9a36..a69ec884bd4 100644
--- a/print/hplip/patches/patch-base_queues_py
+++ b/print/hplip/patches/patch-base_queues_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_queues_py,v 1.8 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- base/queues.py.orig	Wed May  4 07:23:22 2016
 +++ base/queues.py	Thu May  5 10:02:31 2016
 @@ -128,7 +128,7 @@ def parseQueues(mode):
diff --git a/print/hplip/patches/patch-base_services_py b/print/hplip/patches/patch-base_services_py
index 6752b9ba654..ac4e908b285 100644
--- a/print/hplip/patches/patch-base_services_py
+++ b/print/hplip/patches/patch-base_services_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_services_py,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- base/services.py.orig	Fri Oct 11 11:40:14 2013
 +++ base/services.py	Tue Oct 15 15:42:07 2013
 @@ -67,6 +67,9 @@ def restart_cups():
diff --git a/print/hplip/patches/patch-base_slp_py b/print/hplip/patches/patch-base_slp_py
index 6ddd3d0b8a6..76cd806ce50 100644
--- a/print/hplip/patches/patch-base_slp_py
+++ b/print/hplip/patches/patch-base_slp_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_slp_py,v 1.6 2015/02/05 17:34:33 ajacoutot Exp $
-
 IP_MULTICAST_TTL socket option on OpenBSD currently doesn't accept
 int, only unsigned char:
 Unable to setup multicast socket... [Errno 22] Invalid argument
diff --git a/print/hplip/patches/patch-base_utils_py b/print/hplip/patches/patch-base_utils_py
index f3aa0d23ef6..c013b3bf802 100644
--- a/print/hplip/patches/patch-base_utils_py
+++ b/print/hplip/patches/patch-base_utils_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-base_utils_py,v 1.23 2021/12/18 09:52:25 ajacoutot Exp $
-
 From Fedora (getPhoneNum, getStationName):
 python3 - recent HP release removed encoding/decoding to utf-8 in fax/pmlfax.py -
 that results in text string going into translate function in base/utils.py, which
diff --git a/print/hplip/patches/patch-check_py b/print/hplip/patches/patch-check_py
index 4e9c3214660..b351178c357 100644
--- a/print/hplip/patches/patch-check_py
+++ b/print/hplip/patches/patch-check_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-check_py,v 1.19 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- check.py.orig	Wed May  4 07:23:31 2016
 +++ check.py	Thu May  5 10:02:31 2016
 @@ -139,9 +139,9 @@ def get_comment(package, Inst_status, installed_ver):
diff --git a/print/hplip/patches/patch-clean_py b/print/hplip/patches/patch-clean_py
index 8e3b1985ee0..92f90f54d08 100644
--- a/print/hplip/patches/patch-clean_py
+++ b/print/hplip/patches/patch-clean_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-clean_py,v 1.1 2020/02/22 15:02:05 ajacoutot Exp $
-
 https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 
 Index: clean.py
diff --git a/print/hplip/patches/patch-common_utils_c b/print/hplip/patches/patch-common_utils_c
index 5a93b02730c..0bcedf3d0ea 100644
--- a/print/hplip/patches/patch-common_utils_c
+++ b/print/hplip/patches/patch-common_utils_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-common_utils_c,v 1.5 2018/10/31 14:14:30 ajacoutot Exp $
-
 implicit declaration of function 'mkstemp'
 
 Index: common/utils.c
diff --git a/print/hplip/patches/patch-common_utils_h b/print/hplip/patches/patch-common_utils_h
index 817936e3770..286fcda6f8d 100644
--- a/print/hplip/patches/patch-common_utils_h
+++ b/print/hplip/patches/patch-common_utils_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-common_utils_h,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 Index: common/utils.h
 --- common/utils.h.orig
 +++ common/utils.h
diff --git a/print/hplip/patches/patch-configure b/print/hplip/patches/patch-configure
index e4927daf701..7d0d0a3d460 100644
--- a/print/hplip/patches/patch-configure
+++ b/print/hplip/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.24 2021/12/18 09:52:25 ajacoutot Exp $
-
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/print/hplip/patches/patch-createPPD_sh b/print/hplip/patches/patch-createPPD_sh
index 973bb15c27a..63a303f531a 100644
--- a/print/hplip/patches/patch-createPPD_sh
+++ b/print/hplip/patches/patch-createPPD_sh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-createPPD_sh,v 1.2 2018/11/03 10:41:33 ajacoutot Exp $
-
 Index: createPPD.sh
 --- createPPD.sh.orig
 +++ createPPD.sh
diff --git a/print/hplip/patches/patch-doc_troubleshooting_html b/print/hplip/patches/patch-doc_troubleshooting_html
index d1d54473c2e..73f5774f04d 100644
--- a/print/hplip/patches/patch-doc_troubleshooting_html
+++ b/print/hplip/patches/patch-doc_troubleshooting_html
@@ -1,5 +1,3 @@
-$OpenBSD: patch-doc_troubleshooting_html,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- doc/troubleshooting.html.orig	Thu Jun 25 21:04:33 2009
 +++ doc/troubleshooting.html	Thu Jul  2 17:28:48 2009
 @@ -25,7 +25,7 @@ section describes what is currently enabled or disable
diff --git a/print/hplip/patches/patch-doc_uninstalling_html b/print/hplip/patches/patch-doc_uninstalling_html
index 684253ade43..746c8e67f43 100644
--- a/print/hplip/patches/patch-doc_uninstalling_html
+++ b/print/hplip/patches/patch-doc_uninstalling_html
@@ -1,5 +1,3 @@
-$OpenBSD: patch-doc_uninstalling_html,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- doc/uninstalling.html.orig	Thu Jul  2 17:28:54 2009
 +++ doc/uninstalling.html	Thu Jul  2 17:29:17 2009
 @@ -17,7 +17,7 @@
diff --git a/print/hplip/patches/patch-doc_upgrading_html b/print/hplip/patches/patch-doc_upgrading_html
index 025856cbbfe..0490e26a20f 100644
--- a/print/hplip/patches/patch-doc_upgrading_html
+++ b/print/hplip/patches/patch-doc_upgrading_html
@@ -1,5 +1,3 @@
-$OpenBSD: patch-doc_upgrading_html,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- doc/upgrading.html.orig	Thu Jul  2 17:27:36 2009
 +++ doc/upgrading.html	Thu Jul  2 17:27:51 2009
 @@ -17,7 +17,7 @@
diff --git a/print/hplip/patches/patch-fax_backend_hpfax_py b/print/hplip/patches/patch-fax_backend_hpfax_py
index c47e8148777..fb2e7b0de17 100644
--- a/print/hplip/patches/patch-fax_backend_hpfax_py
+++ b/print/hplip/patches/patch-fax_backend_hpfax_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fax_backend_hpfax_py,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- fax/backend/hpfax.py.orig	Thu Jan 29 13:20:35 2015
 +++ fax/backend/hpfax.py	Thu Feb  5 14:28:00 2015
 @@ -49,7 +49,7 @@ PIPE_BUF = 4096
diff --git a/print/hplip/patches/patch-fax_coverpages_py b/print/hplip/patches/patch-fax_coverpages_py
index ca3ecad7d6f..9217bb30724 100644
--- a/print/hplip/patches/patch-fax_coverpages_py
+++ b/print/hplip/patches/patch-fax_coverpages_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fax_coverpages_py,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- fax/coverpages.py.orig	Thu Jul  2 17:30:02 2009
 +++ fax/coverpages.py	Thu Jul  2 17:31:08 2009
 @@ -73,7 +73,7 @@ def createStandardCoverPage(page_size=PAGE_SIZE_LETTER
diff --git a/print/hplip/patches/patch-fax_filters_pstotiff b/print/hplip/patches/patch-fax_filters_pstotiff
index eaede87ca69..f8fc47553f3 100644
--- a/print/hplip/patches/patch-fax_filters_pstotiff
+++ b/print/hplip/patches/patch-fax_filters_pstotiff
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fax_filters_pstotiff,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- fax/filters/pstotiff.orig	Thu Jan 29 13:20:35 2015
 +++ fax/filters/pstotiff	Thu Feb  5 14:28:00 2015
 @@ -18,10 +18,10 @@ if (len(sys.argv) > 6):
diff --git a/print/hplip/patches/patch-fax_pmlfax_py b/print/hplip/patches/patch-fax_pmlfax_py
index 57da035b4cc..996114e537a 100644
--- a/print/hplip/patches/patch-fax_pmlfax_py
+++ b/print/hplip/patches/patch-fax_pmlfax_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fax_pmlfax_py,v 1.1 2020/02/22 15:02:05 ajacoutot Exp $
-
 From Fedora:
 python3 - recent HP release removed encoding/decoding to utf-8 in fax/pmlfax.py -
 that results in text string going into translate function in base/utils.py, which
diff --git a/print/hplip/patches/patch-hp-uiscan_desktop_in b/print/hplip/patches/patch-hp-uiscan_desktop_in
index 895aa6d4a3e..c9d3577def5 100644
--- a/print/hplip/patches/patch-hp-uiscan_desktop_in
+++ b/print/hplip/patches/patch-hp-uiscan_desktop_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-hp-uiscan_desktop_in,v 1.1 2020/11/09 12:38:27 kirby Exp $
 # Bug report https://bugs.launchpad.net/hplip/+bug/1833510
 
 Index: hp-uiscan.desktop.in
diff --git a/print/hplip/patches/patch-installer_core_install_py b/print/hplip/patches/patch-installer_core_install_py
index c69f1429eb4..9d2e5a72e69 100644
--- a/print/hplip/patches/patch-installer_core_install_py
+++ b/print/hplip/patches/patch-installer_core_install_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-installer_core_install_py,v 1.35 2022/02/28 09:49:55 ajacoutot Exp $
-
 Index: installer/core_install.py
 --- installer/core_install.py.orig
 +++ installer/core_install.py
diff --git a/print/hplip/patches/patch-installer_dcheck_py b/print/hplip/patches/patch-installer_dcheck_py
index d49c677a949..d07d3dd61f8 100644
--- a/print/hplip/patches/patch-installer_dcheck_py
+++ b/print/hplip/patches/patch-installer_dcheck_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-installer_dcheck_py,v 1.11 2020/05/23 07:58:58 ajacoutot Exp $
-
 Index: installer/dcheck.py
 --- installer/dcheck.py.orig
 +++ installer/dcheck.py
diff --git a/print/hplip/patches/patch-installer_pluginhandler_py b/print/hplip/patches/patch-installer_pluginhandler_py
index 5c5d3c8d6a1..234f67d0e33 100644
--- a/print/hplip/patches/patch-installer_pluginhandler_py
+++ b/print/hplip/patches/patch-installer_pluginhandler_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-installer_pluginhandler_py,v 1.7 2021/05/15 17:06:01 ajacoutot Exp $
-
 Index: installer/pluginhandler.py
 --- installer/pluginhandler.py.orig
 +++ installer/pluginhandler.py
diff --git a/print/hplip/patches/patch-io_hpmud_jd_c b/print/hplip/patches/patch-io_hpmud_jd_c
index e636b552ce7..c17e9fb00cf 100644
--- a/print/hplip/patches/patch-io_hpmud_jd_c
+++ b/print/hplip/patches/patch-io_hpmud_jd_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-io_hpmud_jd_c,v 1.3 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- io/hpmud/jd.c.orig	Thu Jan 29 13:20:45 2015
 +++ io/hpmud/jd.c	Thu Feb  5 14:28:00 2015
 @@ -31,6 +31,8 @@
diff --git a/print/hplip/patches/patch-io_hpmud_musb_c b/print/hplip/patches/patch-io_hpmud_musb_c
index 7fe66bd246f..6fc276d2a06 100644
--- a/print/hplip/patches/patch-io_hpmud_musb_c
+++ b/print/hplip/patches/patch-io_hpmud_musb_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-io_hpmud_musb_c,v 1.11 2016/10/27 08:35:26 ajacoutot Exp $
-
 backwards memcpy
 
 --- io/hpmud/musb.c.orig	Fri Oct 21 12:48:40 2016
diff --git a/print/hplip/patches/patch-logcapture_py b/print/hplip/patches/patch-logcapture_py
index 76088d4111a..99df91bc0ba 100644
--- a/print/hplip/patches/patch-logcapture_py
+++ b/print/hplip/patches/patch-logcapture_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-logcapture_py,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- logcapture.py.orig	Sun Jun  7 21:25:33 2015
 +++ logcapture.py	Thu Jun 11 08:11:35 2015
 @@ -37,8 +37,8 @@ from base.sixext import to_string_utf8
diff --git a/print/hplip/patches/patch-prnt_cups_py b/print/hplip/patches/patch-prnt_cups_py
index c5af0f0f9a6..83a71b0c194 100644
--- a/print/hplip/patches/patch-prnt_cups_py
+++ b/print/hplip/patches/patch-prnt_cups_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_cups_py,v 1.11 2021/05/15 17:06:01 ajacoutot Exp $
-
 Index: prnt/cups.py
 --- prnt/cups.py.orig
 +++ prnt/cups.py
diff --git a/print/hplip/patches/patch-prnt_cupsext_cupsext_c b/print/hplip/patches/patch-prnt_cupsext_cupsext_c
index 3b2e7b870ea..f9d73b48696 100644
--- a/print/hplip/patches/patch-prnt_cupsext_cupsext_c
+++ b/print/hplip/patches/patch-prnt_cupsext_cupsext_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_cupsext_cupsext_c,v 1.7 2021/12/18 09:52:25 ajacoutot Exp $
-
 Backwards memcpy, triggered by changing default page size in hp-toolbox
 
 Index: prnt/cupsext/cupsext.c
diff --git a/print/hplip/patches/patch-prnt_filters_hpps b/print/hplip/patches/patch-prnt_filters_hpps
index 32902225c4f..0bac1b07241 100644
--- a/print/hplip/patches/patch-prnt_filters_hpps
+++ b/print/hplip/patches/patch-prnt_filters_hpps
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_filters_hpps,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- prnt/filters/hpps.orig	Thu Jan 29 13:20:42 2015
 +++ prnt/filters/hpps	Thu Feb  5 16:56:22 2015
 @@ -48,7 +48,7 @@ output_fd = 1
diff --git a/print/hplip/patches/patch-prnt_hpcups_ErnieFilter_cpp b/print/hplip/patches/patch-prnt_hpcups_ErnieFilter_cpp
index d39d2e80d1a..eb5378e8d28 100644
--- a/print/hplip/patches/patch-prnt_hpcups_ErnieFilter_cpp
+++ b/print/hplip/patches/patch-prnt_hpcups_ErnieFilter_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_hpcups_ErnieFilter_cpp,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- prnt/hpcups/ErnieFilter.cpp.orig	Thu Oct 31 12:42:20 2013
 +++ prnt/hpcups/ErnieFilter.cpp	Thu Nov 14 15:44:07 2013
 @@ -50,7 +50,7 @@
diff --git a/print/hplip/patches/patch-prnt_hpcups_genJPEGStrips_cpp b/print/hplip/patches/patch-prnt_hpcups_genJPEGStrips_cpp
index f0f9b948715..7868adc2e51 100644
--- a/print/hplip/patches/patch-prnt_hpcups_genJPEGStrips_cpp
+++ b/print/hplip/patches/patch-prnt_hpcups_genJPEGStrips_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_hpcups_genJPEGStrips_cpp,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
-
 Index: prnt/hpcups/genJPEGStrips.cpp
 --- prnt/hpcups/genJPEGStrips.cpp.orig
 +++ prnt/hpcups/genJPEGStrips.cpp
diff --git a/print/hplip/patches/patch-prnt_hpijs_globals_cpp b/print/hplip/patches/patch-prnt_hpijs_globals_cpp
index 1fec71c87b3..757183e4b24 100644
--- a/print/hplip/patches/patch-prnt_hpijs_globals_cpp
+++ b/print/hplip/patches/patch-prnt_hpijs_globals_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_hpijs_globals_cpp,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- prnt/hpijs/globals.cpp.orig	Thu Feb 25 00:10:32 2010
 +++ prnt/hpijs/globals.cpp	Fri Mar 12 13:40:17 2010
 @@ -251,7 +251,7 @@ void *LoadPlugin (const char *szPluginName)
diff --git a/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp b/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp
index 88414cf8f17..f3d42198864 100644
--- a/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp
+++ b/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_hpijs_hpcupsfax_cpp,v 1.6 2016/09/19 09:17:45 ajacoutot Exp $
-
 Fix build with cups>=2.2.0
 
 --- prnt/hpijs/hpcupsfax.cpp.orig	Fri Aug 26 12:03:15 2016
diff --git a/print/hplip/patches/patch-prnt_hpijs_hpijs_cpp b/print/hplip/patches/patch-prnt_hpijs_hpijs_cpp
index f4b683e0a47..0efd81f2f4d 100644
--- a/print/hplip/patches/patch-prnt_hpijs_hpijs_cpp
+++ b/print/hplip/patches/patch-prnt_hpijs_hpijs_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_hpijs_hpijs_cpp,v 1.4 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- prnt/hpijs/hpijs.cpp.orig	Fri Oct 11 11:35:57 2013
 +++ prnt/hpijs/hpijs.cpp	Tue Oct 15 15:42:07 2013
 @@ -77,7 +77,7 @@ void setLogLevel(UXServices *pSS, char*user_name)
diff --git a/print/hplip/patches/patch-prnt_hpps_hppsfilter_c b/print/hplip/patches/patch-prnt_hpps_hppsfilter_c
index f8372e4c6b2..9c93b08cab7 100644
--- a/print/hplip/patches/patch-prnt_hpps_hppsfilter_c
+++ b/print/hplip/patches/patch-prnt_hpps_hppsfilter_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-prnt_hpps_hppsfilter_c,v 1.4 2021/09/11 08:39:12 ajacoutot Exp $
-
 prnt/hpps/hppsfilter.c:107:13: error: void function 'open_tempbookletfile' should not return a value [-Wreturn-type]
             return 1;
 
diff --git a/print/hplip/patches/patch-scan_py b/print/hplip/patches/patch-scan_py
index 6ccb9892089..f233c2fde21 100644
--- a/print/hplip/patches/patch-scan_py
+++ b/print/hplip/patches/patch-scan_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_py,v 1.21 2021/12/18 09:52:25 ajacoutot Exp $
-
 Index: scan.py
 --- scan.py.orig
 +++ scan.py
diff --git a/print/hplip/patches/patch-scan_sane_OrbliteScan_LinuxCommon_h b/print/hplip/patches/patch-scan_sane_OrbliteScan_LinuxCommon_h
index d88ca611530..cabd05e7349 100644
--- a/print/hplip/patches/patch-scan_sane_OrbliteScan_LinuxCommon_h
+++ b/print/hplip/patches/patch-scan_sane_OrbliteScan_LinuxCommon_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_OrbliteScan_LinuxCommon_h,v 1.2 2021/02/26 18:20:36 naddy Exp $
-
 Index: scan/sane/OrbliteScan/LinuxCommon.h
 --- scan/sane/OrbliteScan/LinuxCommon.h.orig
 +++ scan/sane/OrbliteScan/LinuxCommon.h
diff --git a/print/hplip/patches/patch-scan_sane_OrbliteScan_MacCommon_h b/print/hplip/patches/patch-scan_sane_OrbliteScan_MacCommon_h
index b149930d710..bba522f78a2 100644
--- a/print/hplip/patches/patch-scan_sane_OrbliteScan_MacCommon_h
+++ b/print/hplip/patches/patch-scan_sane_OrbliteScan_MacCommon_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_OrbliteScan_MacCommon_h,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
-
 Index: scan/sane/OrbliteScan/MacCommon.h
 --- scan/sane/OrbliteScan/MacCommon.h.orig
 +++ scan/sane/OrbliteScan/MacCommon.h
diff --git a/print/hplip/patches/patch-scan_sane_bb_ledm_c b/print/hplip/patches/patch-scan_sane_bb_ledm_c
index 6519705b91a..2eb87ac335e 100644
--- a/print/hplip/patches/patch-scan_sane_bb_ledm_c
+++ b/print/hplip/patches/patch-scan_sane_bb_ledm_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_bb_ledm_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- scan/sane/bb_ledm.c.orig	Tue Jun 26 07:48:50 2012
 +++ scan/sane/bb_ledm.c	Tue Jun 26 07:49:17 2012
 @@ -16,6 +16,7 @@
diff --git a/print/hplip/patches/patch-scan_sane_hpaio_c b/print/hplip/patches/patch-scan_sane_hpaio_c
index fde182c8919..e08258b9e18 100644
--- a/print/hplip/patches/patch-scan_sane_hpaio_c
+++ b/print/hplip/patches/patch-scan_sane_hpaio_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_hpaio_c,v 1.5 2020/12/04 12:36:50 ajacoutot Exp $
-
 scan/sane/hpaio.c:555:8: error: void function 'sane_hpaio_cancel' should not return a value [-Wreturn-type]
        return orblite_cancel(handle)
 
diff --git a/print/hplip/patches/patch-scan_sane_http_c b/print/hplip/patches/patch-scan_sane_http_c
index 7cc25d2756a..93ee20dc4ba 100644
--- a/print/hplip/patches/patch-scan_sane_http_c
+++ b/print/hplip/patches/patch-scan_sane_http_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_http_c,v 1.1 2018/10/31 14:14:30 ajacoutot Exp $
-
 Index: scan/sane/http.c
 --- scan/sane/http.c.orig
 +++ scan/sane/http.c
diff --git a/print/hplip/patches/patch-scan_sane_marvell_c b/print/hplip/patches/patch-scan_sane_marvell_c
index 4bfdb98dff0..eaa1e76fa88 100644
--- a/print/hplip/patches/patch-scan_sane_marvell_c
+++ b/print/hplip/patches/patch-scan_sane_marvell_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_marvell_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- scan/sane/marvell.c.orig	Thu Jul  2 14:35:52 2009
 +++ scan/sane/marvell.c	Thu Jul  2 14:36:00 2009
 @@ -29,13 +29,13 @@
diff --git a/print/hplip/patches/patch-scan_sane_orblite_c b/print/hplip/patches/patch-scan_sane_orblite_c
index 1ac8a3971da..2e06e0cebd8 100644
--- a/print/hplip/patches/patch-scan_sane_orblite_c
+++ b/print/hplip/patches/patch-scan_sane_orblite_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_orblite_c,v 1.2 2021/02/26 18:20:36 naddy Exp $
-
 Index: scan/sane/orblite.c
 --- scan/sane/orblite.c.orig
 +++ scan/sane/orblite.c
diff --git a/print/hplip/patches/patch-scan_sane_soapht_c b/print/hplip/patches/patch-scan_sane_soapht_c
index b93f3904db4..25c21366c94 100644
--- a/print/hplip/patches/patch-scan_sane_soapht_c
+++ b/print/hplip/patches/patch-scan_sane_soapht_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scan_sane_soapht_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- scan/sane/soapht.c.orig	Tue Jun 17 10:32:52 2014
 +++ scan/sane/soapht.c	Tue Jun 17 10:33:11 2014
 @@ -62,7 +62,7 @@ static int bb_load(struct soap_session *ps, const char
diff --git a/print/hplip/patches/patch-setup_py b/print/hplip/patches/patch-setup_py
index 33c23d68a7a..be3be30af60 100644
--- a/print/hplip/patches/patch-setup_py
+++ b/print/hplip/patches/patch-setup_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.15 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- setup.py.orig	Fri Oct 21 12:46:25 2016
 +++ setup.py	Mon Nov 14 15:23:47 2016
 @@ -919,7 +919,7 @@ else: # INTERACTIVE_MODE
diff --git a/print/hplip/patches/patch-ui4_devmgr5_py b/print/hplip/patches/patch-ui4_devmgr5_py
index a92af4bb536..862744076b9 100644
--- a/print/hplip/patches/patch-ui4_devmgr5_py
+++ b/print/hplip/patches/patch-ui4_devmgr5_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui4_devmgr5_py,v 1.14 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- ui4/devmgr5.py.orig	Thu Jan 29 13:20:15 2015
 +++ ui4/devmgr5.py	Thu Feb  5 14:35:07 2015
 @@ -1023,7 +1023,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindow):
diff --git a/print/hplip/patches/patch-ui4_nodevicesdialog_py b/print/hplip/patches/patch-ui4_nodevicesdialog_py
index a3bce8626b3..7449223ebaa 100644
--- a/print/hplip/patches/patch-ui4_nodevicesdialog_py
+++ b/print/hplip/patches/patch-ui4_nodevicesdialog_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui4_nodevicesdialog_py,v 1.5 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- ui4/nodevicesdialog.py.orig	Wed Feb 13 17:35:05 2013
 +++ ui4/nodevicesdialog.py	Fri Feb 22 15:05:19 2013
 @@ -53,7 +53,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base
diff --git a/print/hplip/patches/patch-ui4_wifisetupdialog_py b/print/hplip/patches/patch-ui4_wifisetupdialog_py
index 7f93835113e..2ac07c214cb 100644
--- a/print/hplip/patches/patch-ui4_wifisetupdialog_py
+++ b/print/hplip/patches/patch-ui4_wifisetupdialog_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui4_wifisetupdialog_py,v 1.2 2022/02/28 09:49:55 ajacoutot Exp $
-
 https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 
 Index: ui4/wifisetupdialog.py
diff --git a/print/hplip/patches/patch-ui5_wifisetupdialog_py b/print/hplip/patches/patch-ui5_wifisetupdialog_py
index cd1d3d0fd09..5260a5582c5 100644
--- a/print/hplip/patches/patch-ui5_wifisetupdialog_py
+++ b/print/hplip/patches/patch-ui5_wifisetupdialog_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui5_wifisetupdialog_py,v 1.2 2022/02/28 09:49:55 ajacoutot Exp $
-
 https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 
 Index: ui5/wifisetupdialog.py
diff --git a/print/hplip/patches/patch-ui_devmgr4_py b/print/hplip/patches/patch-ui_devmgr4_py
index d2ae8882181..dbbb1cb96fd 100644
--- a/print/hplip/patches/patch-ui_devmgr4_py
+++ b/print/hplip/patches/patch-ui_devmgr4_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui_devmgr4_py,v 1.14 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- ui/devmgr4.py.orig	Thu Jan 29 13:20:22 2015
 +++ ui/devmgr4.py	Thu Feb  5 16:41:34 2015
 @@ -1226,7 +1226,7 @@ class DevMgr4(DevMgr4_base):
diff --git a/print/hplip/patches/patch-ui_nodevicesform_py b/print/hplip/patches/patch-ui_nodevicesform_py
index 5bb261ca8d9..cee97315394 100644
--- a/print/hplip/patches/patch-ui_nodevicesform_py
+++ b/print/hplip/patches/patch-ui_nodevicesform_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui_nodevicesform_py,v 1.5 2018/10/31 14:14:30 ajacoutot Exp $
-
 --- ui/nodevicesform.py.orig	Wed Feb 13 17:35:09 2013
 +++ ui/nodevicesform.py	Fri Feb 22 15:05:19 2013
 @@ -56,7 +56,7 @@ class NoDevicesForm(NoDevicesForm_base):
diff --git a/print/hplip/patches/patch-ui_scrollunload_py b/print/hplip/patches/patch-ui_scrollunload_py
index b9ed4cbf83b..fde03269056 100644
--- a/print/hplip/patches/patch-ui_scrollunload_py
+++ b/print/hplip/patches/patch-ui_scrollunload_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ui_scrollunload_py,v 1.1 2020/02/22 15:02:05 ajacoutot Exp $
-
 https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 
 Index: ui/scrollunload.py
diff --git a/print/hplip/pkg/PLIST-common b/print/hplip/pkg/PLIST-common
index ec446ac4b5e..7a273c67d41 100644
--- a/print/hplip/pkg/PLIST-common
+++ b/print/hplip/pkg/PLIST-common
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-common,v 1.7 2019/11/17 20:42:44 ajacoutot Exp $
 @conflict hplip-libs-*
 @conflict hplip-<3.13.7p4
 @pkgpath print/hplip,-libs
diff --git a/print/hplip/pkg/PLIST-gui b/print/hplip/pkg/PLIST-gui
index ff3f8723428..fd7220aba3c 100644
--- a/print/hplip/pkg/PLIST-gui
+++ b/print/hplip/pkg/PLIST-gui
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-gui,v 1.14 2020/02/22 15:02:05 ajacoutot Exp $
 @conflict hplip-<3.11.3p0
 bin/hp-align
 bin/hp-colorcal
diff --git a/print/hplip/pkg/PLIST-hpaio b/print/hplip/pkg/PLIST-hpaio
index 4efe1b2a320..5368cd15b17 100644
--- a/print/hplip/pkg/PLIST-hpaio
+++ b/print/hplip/pkg/PLIST-hpaio
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-hpaio,v 1.7 2019/11/17 20:42:44 ajacoutot Exp $
 @conflict hplip-<3.13.7p2
 @so lib/python${MODPY_VERSION}/site-packages/scanext.so
 @so lib/sane/libsane-hpaio.so
diff --git a/print/hplip/pkg/PLIST-hpcups b/print/hplip/pkg/PLIST-hpcups
index c69f5e14b2e..b3d6be9a81c 100644
--- a/print/hplip/pkg/PLIST-hpcups
+++ b/print/hplip/pkg/PLIST-hpcups
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-hpcups,v 1.12 2017/07/26 08:15:54 ajacoutot Exp $
 @conflict hpijs-<=3.2.11
 @conflict hplip-<3.13.8p1
 @mode 0700
diff --git a/print/hplip/pkg/PLIST-hpijs b/print/hplip/pkg/PLIST-hpijs
index d3648483a41..218849f0f81 100644
--- a/print/hplip/pkg/PLIST-hpijs
+++ b/print/hplip/pkg/PLIST-hpijs
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-hpijs,v 1.71 2022/02/28 09:49:55 ajacoutot Exp $
 @conflict hplip-libs-<=3.9.8
 @conflict hpcups-<=3.2.11
 @pkgpath print/hpijs
diff --git a/print/hplip/pkg/PLIST-main b/print/hplip/pkg/PLIST-main
index fde5d409bd3..2d7655104d9 100644
--- a/print/hplip/pkg/PLIST-main
+++ b/print/hplip/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.35 2020/12/04 12:36:50 ajacoutot Exp $
 @conflict hplip-docs-*
 @conflict hplip-gui-<3.13.7p2
 @extraunexec rm -rf ${PREFIX}/share/hplip/data/firmware
diff --git a/print/hplip/pkg/README-common b/print/hplip/pkg/README-common
index 1becfdeaa24..527aebf5023 100644
--- a/print/hplip/pkg/README-common
+++ b/print/hplip/pkg/README-common
@@ -1,5 +1,3 @@
-$OpenBSD: README-common,v 1.11 2021/09/03 11:48:54 ajacoutot Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/htmldoc/Makefile b/print/htmldoc/Makefile
index 1f8af1e5063..f6926cac6d3 100644
--- a/print/htmldoc/Makefile
+++ b/print/htmldoc/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.54 2022/02/10 08:47:48 benoit Exp $
-
 COMMENT =		convert HTML pages to PDF/PS format
 
 V =			1.9.15
diff --git a/print/htmldoc/patches/patch-Makedefs_in b/print/htmldoc/patches/patch-Makedefs_in
index 26f2ff187ef..73175eac74d 100644
--- a/print/htmldoc/patches/patch-Makedefs_in
+++ b/print/htmldoc/patches/patch-Makedefs_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makedefs_in,v 1.5 2020/02/16 08:30:08 benoit Exp $
 Index: Makedefs.in
 --- Makedefs.in.orig
 +++ Makedefs.in
diff --git a/print/htmldoc/patches/patch-configure b/print/htmldoc/patches/patch-configure
index 22839c1e53f..12d6f24fd74 100644
--- a/print/htmldoc/patches/patch-configure
+++ b/print/htmldoc/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.7 2021/06/12 13:32:39 benoit Exp $
 --- configure.orig	Tue May 18 02:50:17 2021
 +++ configure	Sat Jun 12 15:24:27 2021
 @@ -6318,7 +6318,7 @@
diff --git a/print/htmldoc/patches/patch-htmldoc_file_c b/print/htmldoc/patches/patch-htmldoc_file_c
index 1b285889931..c6ab83f834d 100644
--- a/print/htmldoc/patches/patch-htmldoc_file_c
+++ b/print/htmldoc/patches/patch-htmldoc_file_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-htmldoc_file_c,v 1.7 2020/06/13 15:11:39 benoit Exp $
 Index: htmldoc/file.c
 --- htmldoc/file.c.orig
 +++ htmldoc/file.c
diff --git a/print/htmldoc/patches/patch-htmldoc_http_c b/print/htmldoc/patches/patch-htmldoc_http_c
index 186b7d769ba..e2c16866b91 100644
--- a/print/htmldoc/patches/patch-htmldoc_http_c
+++ b/print/htmldoc/patches/patch-htmldoc_http_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-htmldoc_http_c,v 1.3 2020/02/16 08:30:08 benoit Exp $
 Index: htmldoc/http.c
 --- htmldoc/http.c.orig
 +++ htmldoc/http.c
diff --git a/print/htmldoc/patches/patch-htmldoc_ps-pdf_cxx b/print/htmldoc/patches/patch-htmldoc_ps-pdf_cxx
index 3de87d34eb3..254cbe4a4ca 100644
--- a/print/htmldoc/patches/patch-htmldoc_ps-pdf_cxx
+++ b/print/htmldoc/patches/patch-htmldoc_ps-pdf_cxx
@@ -1,5 +1,3 @@
-$OpenBSD: patch-htmldoc_ps-pdf_cxx,v 1.2 2020/02/16 08:30:08 benoit Exp $
-
 Work around an LLVM 8.0.0 optimizer bug that causes htmldoc to spin.
 https://github.com/michaelrsweet/htmldoc/issues/349
 https://bugs.llvm.org/show_bug.cgi?id=41998
diff --git a/print/htmldoc/pkg/PLIST b/print/htmldoc/pkg/PLIST
index e47036cf517..9ebe290f146 100644
--- a/print/htmldoc/pkg/PLIST
+++ b/print/htmldoc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2014/11/07 13:33:40 benoit Exp $
 @pkgpath print/htmldoc,no_x11
 @bin bin/htmldoc
 @man man/man1/htmldoc.1
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 3bddc001f5f..090b0d3e20c 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT=		raster image transmission library
 
 DISTNAME=		ijs-0.35
diff --git a/print/ijs/patches/patch-Makefile_in b/print/ijs/patches/patch-Makefile_in
index 7d5284d4a95..6da1bcc68f9 100644
--- a/print/ijs/patches/patch-Makefile_in
+++ b/print/ijs/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/09/03 09:20:54 ajacoutot Exp $
 --- Makefile.in.orig	Wed Feb 11 12:51:54 2004
 +++ Makefile.in	Mon Sep  3 10:52:19 2007
 @@ -129,7 +129,7 @@ pkginclude_HEADERS = \
diff --git a/print/ijs/pkg/PLIST b/print/ijs/pkg/PLIST
index c3dc3fd107b..0d06695b88b 100644
--- a/print/ijs/pkg/PLIST
+++ b/print/ijs/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:53 naddy Exp $
 bin/ijs-config
 include/ijs/
 include/ijs/ijs.h
diff --git a/print/l2a/Makefile b/print/l2a/Makefile
index e3fcc14ff52..da6c93208d5 100644
--- a/print/l2a/Makefile
+++ b/print/l2a/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT=		filter for removing (La)TeX markup
 
 DISTNAME=		l2a-1.2
diff --git a/print/l2a/pkg/PLIST b/print/l2a/pkg/PLIST
index 3b4ca49a88f..cacafb2771e 100644
--- a/print/l2a/pkg/PLIST
+++ b/print/l2a/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:32:14 espie Exp $
 bin/l2a
 @man man/man1/l2a.1
diff --git a/print/latex-mk/Makefile b/print/latex-mk/Makefile
index 74c862d799f..0e7c27f4aea 100644
--- a/print/latex-mk/Makefile
+++ b/print/latex-mk/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT=	set of Makefile fragments to manage LaTeX documents
 
 DISTNAME=	latex-mk-1.9.1
diff --git a/print/latex-mk/patches/patch-Makefile_in b/print/latex-mk/patches/patch-Makefile_in
index 990e8129ff0..e3336ed01e1 100644
--- a/print/latex-mk/patches/patch-Makefile_in
+++ b/print/latex-mk/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2009/08/24 07:03:02 jasper Exp $
 --- Makefile.in.orig	Mon Aug 27 18:16:05 2007
 +++ Makefile.in	Mon Aug 24 00:46:46 2009
 @@ -196,7 +196,7 @@ MKSRCS = latex.mk.in latex.subdir.mk.in lgrind.mk.in m
diff --git a/print/latex-mk/patches/patch-doc_Makefile_in b/print/latex-mk/patches/patch-doc_Makefile_in
index f1c25045c43..4be6b2ea687 100644
--- a/print/latex-mk/patches/patch-doc_Makefile_in
+++ b/print/latex-mk/patches/patch-doc_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.2 2009/08/24 07:03:02 jasper Exp $
 --- doc/Makefile.in.orig	Mon Aug 27 18:15:54 2007
 +++ doc/Makefile.in	Mon Aug 24 00:46:46 2009
 @@ -17,7 +17,7 @@
diff --git a/print/latex-mk/patches/patch-example_Makefile_in b/print/latex-mk/patches/patch-example_Makefile_in
index 885c12f348a..d6ab2f4f7b9 100644
--- a/print/latex-mk/patches/patch-example_Makefile_in
+++ b/print/latex-mk/patches/patch-example_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-example_Makefile_in,v 1.2 2009/08/24 07:03:02 jasper Exp $
 --- example/Makefile.in.orig	Mon Aug 27 18:15:55 2007
 +++ example/Makefile.in	Mon Aug 24 00:46:46 2009
 @@ -17,7 +17,7 @@
diff --git a/print/latex-mk/patches/patch-example_tgif_Makefile_in b/print/latex-mk/patches/patch-example_tgif_Makefile_in
index 2370bef8efb..ebcb3e18eeb 100644
--- a/print/latex-mk/patches/patch-example_tgif_Makefile_in
+++ b/print/latex-mk/patches/patch-example_tgif_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-example_tgif_Makefile_in,v 1.2 2009/08/24 07:03:02 jasper Exp $
 --- example/tgif/Makefile.in.orig	Mon Aug 27 18:15:57 2007
 +++ example/tgif/Makefile.in	Mon Aug 24 00:46:46 2009
 @@ -17,7 +17,7 @@
diff --git a/print/latex-mk/patches/patch-testsuite_bmake_ref_subdir4_ref b/print/latex-mk/patches/patch-testsuite_bmake_ref_subdir4_ref
index 945f1d9b949..3cfb3f96af3 100644
--- a/print/latex-mk/patches/patch-testsuite_bmake_ref_subdir4_ref
+++ b/print/latex-mk/patches/patch-testsuite_bmake_ref_subdir4_ref
@@ -1,4 +1,3 @@
-$OpenBSD: patch-testsuite_bmake_ref_subdir4_ref,v 1.1.1.1 2007/01/31 22:38:03 steven Exp $
 --- testsuite/bmake_ref/subdir4.ref.orig	Tue Jan 30 17:24:53 2007
 +++ testsuite/bmake_ref/subdir4.ref	Tue Jan 30 17:25:02 2007
 @@ -1,8 +1,4 @@
diff --git a/print/latex-mk/patches/patch-xfig_mk_in_in b/print/latex-mk/patches/patch-xfig_mk_in_in
index a98566bf99f..cc78ebde798 100644
--- a/print/latex-mk/patches/patch-xfig_mk_in_in
+++ b/print/latex-mk/patches/patch-xfig_mk_in_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-xfig_mk_in_in,v 1.1 2010/03/24 16:15:06 oga Exp $
 --- xfig.mk.in.in.orig	Wed Mar 17 18:10:29 2010
 +++ xfig.mk.in.in	Wed Mar 17 18:10:36 2010
 @@ -192,6 +192,6 @@ BMK:	$(FIG2DEV:Q) $(FIG2DEV_FLAGS) $(FIG2DEV_EPS_FLAGS
diff --git a/print/latex-mk/pkg/PLIST b/print/latex-mk/pkg/PLIST
index 5cbec126c63..7fe5467126c 100644
--- a/print/latex-mk/pkg/PLIST
+++ b/print/latex-mk/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/08/24 07:03:02 jasper Exp $
 @comment bin/ieee-copyout
 bin/latex-mk
 @info info/latex-mk.info
diff --git a/print/lcdf-typetools/Makefile b/print/lcdf-typetools/Makefile
index fe7104c0347..9dfc9e91235 100644
--- a/print/lcdf-typetools/Makefile
+++ b/print/lcdf-typetools/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2021/09/12 20:00:26 naddy Exp $
-
 COMMENT =	tools to manipulate font files
 
 DISTNAME =	lcdf-typetools-2.108
diff --git a/print/lcdf-typetools/patches/patch-liblcdf_permstr_cc b/print/lcdf-typetools/patches/patch-liblcdf_permstr_cc
index 2666946a27a..d02853e9b0f 100644
--- a/print/lcdf-typetools/patches/patch-liblcdf_permstr_cc
+++ b/print/lcdf-typetools/patches/patch-liblcdf_permstr_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-liblcdf_permstr_cc,v 1.1 2021/09/12 20:00:26 naddy Exp $
-
 Index: liblcdf/permstr.cc
 --- liblcdf/permstr.cc.orig
 +++ liblcdf/permstr.cc
diff --git a/print/lcdf-typetools/pkg/PLIST b/print/lcdf-typetools/pkg/PLIST
index 6338f0eabad..3542a83ae37 100644
--- a/print/lcdf-typetools/pkg/PLIST
+++ b/print/lcdf-typetools/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/09/02 10:34:28 bentley Exp $
 @conflict texlive_base-<2020p0
 @conflict texlive_texmf-minimal-<2020p0
 @bin bin/cfftot1
diff --git a/print/libXp/Makefile b/print/libXp/Makefile
index 4687e337f93..b52dcc2a2bc 100644
--- a/print/libXp/Makefile
+++ b/print/libXp/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT =		X11 printing system
 
 DISTNAME =		libXp-1.0.1
diff --git a/print/libXp/pkg/PLIST b/print/libXp/pkg/PLIST
index d7704922854..8a3e3cc5c26 100644
--- a/print/libXp/pkg/PLIST
+++ b/print/libXp/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/05/22 11:31:17 ajacoutot Exp $
 lib/libXp.a
 lib/libXp.la
 @lib lib/libXp.so.${LIBXp_VERSION}
diff --git a/print/libharu/Makefile b/print/libharu/Makefile
index 2dca174d167..41085d94e88 100644
--- a/print/libharu/Makefile
+++ b/print/libharu/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/11/09 12:19:15 ajacoutot Exp $
-
 COMMENT =	PDF creation library
 
 VERSION =	2_3_0
diff --git a/print/libharu/patches/patch-src_Makefile_am b/print/libharu/patches/patch-src_Makefile_am
index 99694786cd5..7b4df1f3ec2 100644
--- a/print/libharu/patches/patch-src_Makefile_am
+++ b/print/libharu/patches/patch-src_Makefile_am
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_Makefile_am,v 1.1.1.1 2013/03/20 21:45:55 landry Exp $
 --- src/Makefile.am.orig	Sat Mar 16 13:32:31 2013
 +++ src/Makefile.am	Sat Mar 16 13:34:23 2013
 @@ -19,5 +19,5 @@ libhpdf_la_SOURCES =	hpdf_annotation.c hpdf_array.c hp
diff --git a/print/libharu/pkg/PLIST b/print/libharu/pkg/PLIST
index 9122eb58a35..7206036dc87 100644
--- a/print/libharu/pkg/PLIST
+++ b/print/libharu/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2013/03/20 21:45:55 landry Exp $
 include/hpdf.h
 include/hpdf_3dmeasure.h
 include/hpdf_annotation.h
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index a43de91aba3..d4fe7ea260c 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.22 2019/06/29 09:59:08 ajacoutot Exp $
-
 COMMENT=		library for handling paper characteristics
 
 DISTNAME=		libpaper_1.1.28
diff --git a/print/libpaper/pkg/PLIST b/print/libpaper/pkg/PLIST
index af364409bbb..90a79d89cb1 100644
--- a/print/libpaper/pkg/PLIST
+++ b/print/libpaper/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2013/11/01 23:10:19 ajacoutot Exp $
 @bin bin/paperconf
 include/paper.h
 lib/libpaper.a
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index ec8122c74ef..3d4df24cf8d 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.33 2022/02/13 08:52:26 ajacoutot Exp $
-
 # libgs from ghostscript is only provided on shared libs archs
 
 COMMENT=	library for rendering Postscript documents
diff --git a/print/libspectre/pkg/PLIST b/print/libspectre/pkg/PLIST
index cf52c27a5ef..39eb1ca2cbc 100644
--- a/print/libspectre/pkg/PLIST
+++ b/print/libspectre/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/09/11 09:19:19 ajacoutot Exp $
 include/libspectre/
 include/libspectre/spectre-document.h
 include/libspectre/spectre-exporter.h
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 7b9562a283b..3e6aee3ae10 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.53 2021/02/23 19:39:36 sthen Exp $
-
 COMMENT-main=		text based music notation system
 COMMENT-docs=		lilypond documentation
 
diff --git a/print/lilypond/patches/patch-aclocal_m4 b/print/lilypond/patches/patch-aclocal_m4
index f2107895968..0da9a5d3dc3 100644
--- a/print/lilypond/patches/patch-aclocal_m4
+++ b/print/lilypond/patches/patch-aclocal_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2014/05/27 20:43:50 kili Exp $
-
 - Fix version comparision for large version numbers.
 
 - Allow older (buggy?) metapost.
diff --git a/print/lilypond/patches/patch-configure_ac b/print/lilypond/patches/patch-configure_ac
index 436ca08941a..77b0077f5a6 100644
--- a/print/lilypond/patches/patch-configure_ac
+++ b/print/lilypond/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.1 2014/05/27 20:43:50 kili Exp $
-
 # Builds fine with gcc 3.3.5 and without makeinfo (unless you try to
 # build the documentation).
 
diff --git a/print/lilypond/patches/patch-lily_include_open-type-font_hh b/print/lilypond/patches/patch-lily_include_open-type-font_hh
index 51714bd3f31..4ed0b29418d 100644
--- a/print/lilypond/patches/patch-lily_include_open-type-font_hh
+++ b/print/lilypond/patches/patch-lily_include_open-type-font_hh
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lily_include_open-type-font_hh,v 1.3 2014/05/27 20:43:50 kili Exp $
 --- lily/include/open-type-font.hh.orig	Tue May 13 10:13:58 2014
 +++ lily/include/open-type-font.hh	Tue May 13 10:15:05 2014
 @@ -23,8 +23,8 @@
diff --git a/print/lilypond/patches/patch-lily_music-iterator_cc b/print/lilypond/patches/patch-lily_music-iterator_cc
index d6523a80268..cbd822aaef8 100644
--- a/print/lilypond/patches/patch-lily_music-iterator_cc
+++ b/print/lilypond/patches/patch-lily_music-iterator_cc
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lily_music-iterator_cc,v 1.3 2014/05/27 20:43:50 kili Exp $
 --- lily/music-iterator.cc.orig	Tue May 13 10:19:28 2014
 +++ lily/music-iterator.cc	Tue May 13 10:19:59 2014
 @@ -224,7 +224,7 @@ Music_iterator::print_smob (SCM sm, SCM port, scm_prin
diff --git a/print/lilypond/patches/patch-lily_pango-font_cc b/print/lilypond/patches/patch-lily_pango-font_cc
index 689540cb2ff..23b154ccda1 100644
--- a/print/lilypond/patches/patch-lily_pango-font_cc
+++ b/print/lilypond/patches/patch-lily_pango-font_cc
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lily_pango-font_cc,v 1.4 2014/05/27 20:43:50 kili Exp $
 --- lily/pango-font.cc.orig	Tue May 13 10:22:35 2014
 +++ lily/pango-font.cc	Tue May 13 10:26:47 2014
 @@ -116,19 +116,21 @@ Pango_font::derived_mark () const
diff --git a/print/lilypond/patches/patch-lily_ttf_cc b/print/lilypond/patches/patch-lily_ttf_cc
index 4b1e1373cfd..a55f3f6916e 100644
--- a/print/lilypond/patches/patch-lily_ttf_cc
+++ b/print/lilypond/patches/patch-lily_ttf_cc
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lily_ttf_cc,v 1.6 2014/05/27 20:43:50 kili Exp $
 --- lily/ttf.cc.orig	Tue May 13 10:25:46 2014
 +++ lily/ttf.cc	Tue May 13 10:26:24 2014
 @@ -439,7 +439,7 @@ print_trailer (void *out,
diff --git a/print/lilypond/pkg/PLIST-docs b/print/lilypond/pkg/PLIST-docs
index 438a6706b90..cd9de185920 100644
--- a/print/lilypond/pkg/PLIST-docs
+++ b/print/lilypond/pkg/PLIST-docs
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-docs,v 1.9 2017/11/13 15:38:07 naddy Exp $
 share/doc/lilypond/
 share/doc/lilypond/${VERSION}/
 share/doc/lilypond/${VERSION}/Documentation/
diff --git a/print/lilypond/pkg/PLIST-main b/print/lilypond/pkg/PLIST-main
index 0ed6f3a2351..08d47e251fe 100644
--- a/print/lilypond/pkg/PLIST-main
+++ b/print/lilypond/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2017/11/13 15:38:07 naddy Exp $
 @pkgpath print/lilypond
 bin/abc2ly
 bin/convert-ly
diff --git a/print/lout/Makefile b/print/lout/Makefile
index bbf523ae36b..db847d75799 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:55 sthen Exp $
-
 COMMENT=	object oriented type setting language
 
 DISTNAME=	lout-3.40
diff --git a/print/lout/patches/patch-doc_user_README b/print/lout/patches/patch-doc_user_README
index 4caf9d47fcf..811aa3a1514 100644
--- a/print/lout/patches/patch-doc_user_README
+++ b/print/lout/patches/patch-doc_user_README
@@ -1,4 +1,3 @@
-$OpenBSD: patch-doc_user_README,v 1.2 2013/10/19 10:35:00 jung Exp $
 --- doc/user/README.orig	Wed Jun 26 01:43:24 2013
 +++ doc/user/README	Wed Jun 26 13:39:48 2013
 @@ -6,7 +6,7 @@ final PostScript output file (A4 paper size) is stored
diff --git a/print/lout/pkg/PLIST b/print/lout/pkg/PLIST
index ddfaea0f0fa..76321f8a0da 100644
--- a/print/lout/pkg/PLIST
+++ b/print/lout/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2013/10/19 10:35:01 jung Exp $
 @pkgpath print/lout,-main
 @pkgpath print/lout,-doc
 @conflict lout-doc-*
diff --git a/print/lss/Makefile b/print/lss/Makefile
index ace1cbe3058..61baa798676 100644
--- a/print/lss/Makefile
+++ b/print/lss/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT=		LaTeX symbols selector
 
 DISTNAME=		lss-0.1.6
diff --git a/print/lss/patches/patch-src_send_c b/print/lss/patches/patch-src_send_c
index 78cc51fbb91..4abb9b2c2e0 100644
--- a/print/lss/patches/patch-src_send_c
+++ b/print/lss/patches/patch-src_send_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_send_c,v 1.1.1.1 2008/04/13 17:45:43 jasper Exp $
 --- src/send.c.orig	Sun Apr 13 19:06:53 2008
 +++ src/send.c	Sun Apr 13 19:23:47 2008
 @@ -83,9 +83,9 @@ GtkTargetEntry source_table[] = {
diff --git a/print/lss/pkg/PLIST b/print/lss/pkg/PLIST
index e2da9f2d5d4..871fa88c0c2 100644
--- a/print/lss/pkg/PLIST
+++ b/print/lss/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/06/27 21:04:01 espie Exp $
 bin/lss
 share/applications/lss.desktop
 share/locale/pl/LC_MESSAGES/lss.mo
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 39d21f0c868..29c3b9a554c 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.98 2021/11/02 00:01:54 sthen Exp $
-
 PORTROACH=	skipv:2.3.x
 
 COMMENT=	graphical frontend for LaTeX (nearly WYSIWYG)
diff --git a/print/lyx/patches/patch-config_h_in b/print/lyx/patches/patch-config_h_in
index 81db0907009..c2f09b054f7 100644
--- a/print/lyx/patches/patch-config_h_in
+++ b/print/lyx/patches/patch-config_h_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-config_h_in,v 1.1 2018/11/29 14:22:04 sthen Exp $
-
 Index: config.h.in
 --- config.h.in.orig
 +++ config.h.in
diff --git a/print/lyx/pkg/PLIST b/print/lyx/pkg/PLIST
index 11a8024f3a3..abf148485d0 100644
--- a/print/lyx/pkg/PLIST
+++ b/print/lyx/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.30 2020/12/15 23:07:33 mariani Exp $
 @pkgpath print/lyx,qt
 @pkgpath print/lyx,xforms
 @bin bin/lyx
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index b75d4879303..ae3755b38b4 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.17 2021/02/23 19:39:36 sthen Exp $
-
 COMMENT=	scalable PostScript fonts generator for MetaFont
 
 CATEGORIES=	fonts print
diff --git a/print/mftrace/patches/patch-GNUmakefile_in b/print/mftrace/patches/patch-GNUmakefile_in
index 601b7b41183..e98745073c6 100644
--- a/print/mftrace/patches/patch-GNUmakefile_in
+++ b/print/mftrace/patches/patch-GNUmakefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-GNUmakefile_in,v 1.4 2018/12/26 09:37:06 bentley Exp $
 --- GNUmakefile.in.orig	Sat Feb  3 02:34:52 2007
 +++ GNUmakefile.in	Wed Aug 12 11:56:02 2009
 @@ -8,7 +8,7 @@ FILES= mftrace.py GNUmakefile.in \
diff --git a/print/mftrace/patches/patch-gf2pbm_c b/print/mftrace/patches/patch-gf2pbm_c
index ca0682db82c..f00b8db2483 100644
--- a/print/mftrace/patches/patch-gf2pbm_c
+++ b/print/mftrace/patches/patch-gf2pbm_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-gf2pbm_c,v 1.3 2018/12/26 09:37:06 bentley Exp $
 --- gf2pbm.c.orig	Mon Jun 19 13:03:11 2006
 +++ gf2pbm.c	Mon Jun 19 13:03:23 2006
 @@ -694,7 +694,7 @@ main (int argc, char * argv [])
diff --git a/print/mftrace/pkg/PLIST b/print/mftrace/pkg/PLIST
index 7f21763e164..f44b2e92b3c 100644
--- a/print/mftrace/pkg/PLIST
+++ b/print/mftrace/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/12/26 09:37:06 bentley Exp $
 @pkgpath fonts/mftrace
 @bin bin/gf2pbm
 bin/mftrace
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 92922363fe0..ab4355c284d 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.36 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT=	print multiple pages per sheet on PostScript printer
 
 DISTNAME=	mpage-2.5.7
diff --git a/print/mpage/patches/patch-args_c b/print/mpage/patches/patch-args_c
index 626c0899ec7..e4b0b190f7a 100644
--- a/print/mpage/patches/patch-args_c
+++ b/print/mpage/patches/patch-args_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-args_c,v 1.6 2017/08/23 07:45:00 jca Exp $
 Index: args.c
 --- args.c.orig
 +++ args.c
diff --git a/print/mpage/patches/patch-file_c b/print/mpage/patches/patch-file_c
index 9ecfe06bc4f..202c53bdc99 100644
--- a/print/mpage/patches/patch-file_c
+++ b/print/mpage/patches/patch-file_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-file_c,v 1.4 2017/08/23 07:45:00 jca Exp $
 Index: file.c
 --- file.c.orig
 +++ file.c
diff --git a/print/mpage/patches/patch-mpage_1_in b/print/mpage/patches/patch-mpage_1_in
index 7dfe18a3f91..91bcc11288c 100644
--- a/print/mpage/patches/patch-mpage_1_in
+++ b/print/mpage/patches/patch-mpage_1_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mpage_1_in,v 1.3 2010/05/26 13:53:16 jasper Exp $
 --- mpage.1.in.orig	Mon Jan 14 23:54:28 2008
 +++ mpage.1.in	Wed Mar 24 12:13:27 2010
 @@ -546,7 +546,7 @@ and 
diff --git a/print/mpage/patches/patch-mpage_c b/print/mpage/patches/patch-mpage_c
index d50fb722283..8f0e506875b 100644
--- a/print/mpage/patches/patch-mpage_c
+++ b/print/mpage/patches/patch-mpage_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mpage_c,v 1.3 2017/08/23 07:45:00 jca Exp $
 Index: mpage.c
 --- mpage.c.orig
 +++ mpage.c
diff --git a/print/mpage/patches/patch-mpage_h b/print/mpage/patches/patch-mpage_h
index 19d33ab2902..efd7ec7fa1e 100644
--- a/print/mpage/patches/patch-mpage_h
+++ b/print/mpage/patches/patch-mpage_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mpage_h,v 1.3 2017/08/23 07:45:00 jca Exp $
 Index: mpage.h
 --- mpage.h.orig
 +++ mpage.h
diff --git a/print/mpage/patches/patch-post_c b/print/mpage/patches/patch-post_c
index 27472c74f76..02d10dab6e4 100644
--- a/print/mpage/patches/patch-post_c
+++ b/print/mpage/patches/patch-post_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-post_c,v 1.4 2017/08/23 07:45:00 jca Exp $
 Index: post.c
 --- post.c.orig
 +++ post.c
diff --git a/print/mpage/pkg/PLIST b/print/mpage/pkg/PLIST
index 2abad2b2d7c..53173493e9b 100644
--- a/print/mpage/pkg/PLIST
+++ b/print/mpage/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2013/11/02 08:51:22 ajacoutot Exp $
 @pkgpath print/mpage[,a4][,legal][,letter]
 @bin bin/mpage
 @man man/man1/mpage.1
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index c92018026ba..28e891172fe 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT =	pretty printing of your mails
 
 DISTNAME =	muttprint-0.73
diff --git a/print/muttprint/patches/patch-pics_Makefile_am b/print/muttprint/patches/patch-pics_Makefile_am
index af92d63a086..9242cb22e4a 100644
--- a/print/muttprint/patches/patch-pics_Makefile_am
+++ b/print/muttprint/patches/patch-pics_Makefile_am
@@ -1,4 +1,3 @@
-$OpenBSD: patch-pics_Makefile_am,v 1.1.1.1 2016/04/26 14:19:03 feinerer Exp $
 --- pics/Makefile.am.orig	Fri Apr 15 13:05:28 2016
 +++ pics/Makefile.am	Fri Apr 15 13:05:54 2016
 @@ -1,16 +1,9 @@
diff --git a/print/muttprint/pkg/PLIST b/print/muttprint/pkg/PLIST
index 38b28395fc7..ddd0ab8ce26 100644
--- a/print/muttprint/pkg/PLIST
+++ b/print/muttprint/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2016/04/26 14:19:03 feinerer Exp $
 bin/muttprint
 @bin bin/muttprint-langinfo
 @man man/de/man1/muttprint.1
diff --git a/print/openclipart/Makefile b/print/openclipart/Makefile
index 4fa664601b9..78a4691af8b 100644
--- a/print/openclipart/Makefile
+++ b/print/openclipart/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2020/03/20 16:44:27 naddy Exp $
-
 COMMENT=	desktop publishing clip-art
 
 V=		2.0
diff --git a/print/openclipart/pkg/PLIST b/print/openclipart/pkg/PLIST
index fefb8476031..065eef8837c 100644
--- a/print/openclipart/pkg/PLIST
+++ b/print/openclipart/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/03/29 12:23:24 jasper Exp $
 share/openclipart/
 share/openclipart/AUTHORS
 share/openclipart/AUTHORS.in
diff --git a/print/p5-Poppler/Makefile b/print/p5-Poppler/Makefile
index 2f6dd992de7..9cb0b064f74 100644
--- a/print/p5-Poppler/Makefile
+++ b/print/p5-Poppler/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT=	PDF manipulation library
 
 DISTNAME=	Poppler-1.0101
diff --git a/print/p5-Poppler/patches/patch-lib_Poppler_pm b/print/p5-Poppler/patches/patch-lib_Poppler_pm
index e234c0e2dcb..2c18c134b42 100644
--- a/print/p5-Poppler/patches/patch-lib_Poppler_pm
+++ b/print/p5-Poppler/patches/patch-lib_Poppler_pm
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_Poppler_pm,v 1.2 2016/01/12 16:34:12 sthen Exp $
 --- lib/Poppler.pm.orig	Thu Jan  7 15:15:21 2016
 +++ lib/Poppler.pm	Tue Jan 12 16:17:40 2016
 @@ -101,7 +101,6 @@ use warnings;
diff --git a/print/p5-Poppler/pkg/PLIST b/print/p5-Poppler/pkg/PLIST
index b75a754a73d..aab8b52c651 100644
--- a/print/p5-Poppler/pkg/PLIST
+++ b/print/p5-Poppler/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/01/11 10:27:30 sthen Exp $
 ${P5SITE}/Poppler/
 ${P5SITE}/Poppler.pm
 ${P5SITE}/Poppler/Page/
diff --git a/print/p5-PostScript-MailLabels/Makefile b/print/p5-PostScript-MailLabels/Makefile
index 06f7164a9d4..f488331b2ca 100644
--- a/print/p5-PostScript-MailLabels/Makefile
+++ b/print/p5-PostScript-MailLabels/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2020/07/03 21:45:39 sthen Exp $
-
 COMMENT=	create PostScript files of mailing address labels
 
 MODULES=	cpan
diff --git a/print/p5-PostScript-MailLabels/patches/patch-Makefile_PL b/print/p5-PostScript-MailLabels/patches/patch-Makefile_PL
index 73f9cc3e1bb..9b8c0d205ff 100644
--- a/print/p5-PostScript-MailLabels/patches/patch-Makefile_PL
+++ b/print/p5-PostScript-MailLabels/patches/patch-Makefile_PL
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile_PL,v 1.2 2013/03/19 12:30:57 sthen Exp $
-
 Don't install demo script that needs additional files to be installed.
 
 --- Makefile.PL.orig	Wed Dec 14 15:16:58 2011
diff --git a/print/p5-PostScript-MailLabels/pkg/PLIST b/print/p5-PostScript-MailLabels/pkg/PLIST
index 118a0cad4ae..53d88492baa 100644
--- a/print/p5-PostScript-MailLabels/pkg/PLIST
+++ b/print/p5-PostScript-MailLabels/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/12/14 14:23:53 jasper Exp $
 ${P5SITE}/PostScript/
 ${P5SITE}/PostScript/MailLabels/
 ${P5SITE}/PostScript/MailLabels.pm
diff --git a/print/pdfarranger/Makefile b/print/pdfarranger/Makefile
index e0ef87c4c07..4fee7fe0001 100644
--- a/print/pdfarranger/Makefile
+++ b/print/pdfarranger/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2021/11/14 13:52:59 sthen Exp $
-
 COMMENT =		GUI tool to rearrange and modify PDF files
 
 MODPY_EGG_VERSION =	1.8.0
diff --git a/print/pdfarranger/patches/patch-setup_py b/print/pdfarranger/patches/patch-setup_py
index 7293fe3c6b4..6d5ee0b8e1f 100644
--- a/print/pdfarranger/patches/patch-setup_py
+++ b/print/pdfarranger/patches/patch-setup_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2020/11/02 19:52:43 jca Exp $
-
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
diff --git a/print/pdfarranger/pkg/PLIST b/print/pdfarranger/pkg/PLIST
index dd6f3f6d399..f1b1d86c678 100644
--- a/print/pdfarranger/pkg/PLIST
+++ b/print/pdfarranger/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/11/14 13:52:59 sthen Exp $
 bin/pdfarranger
 lib/python${MODPY_VERSION}/site-packages/pdfarranger/
 lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/print/poppler-data/Makefile b/print/poppler-data/Makefile
index 9248b48b0b7..5a927972d20 100644
--- a/print/poppler-data/Makefile
+++ b/print/poppler-data/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2021/11/01 18:32:43 kili Exp $
-
 COMMENT =		encoding files for poppler
 DISTNAME =		poppler-data-0.4.11
 CATEGORIES =		print
diff --git a/print/poppler-data/pkg/PLIST b/print/poppler-data/pkg/PLIST
index 9c4797868d7..dc160fa20f5 100644
--- a/print/poppler-data/pkg/PLIST
+++ b/print/poppler-data/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2021/09/08 17:49:54 kili Exp $
 share/pkgconfig/poppler-data.pc
 share/poppler/
 share/poppler/cMap/
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 53f89496e8a..6f25c5bc190 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.170 2021/12/24 10:09:02 kili Exp $
-
 COMMENT-main=	PDF rendering library
 COMMENT-qt5=	Qt5 interface to PDF rendering library
 COMMENT-qt6=	Qt6 interface to PDF rendering library
diff --git a/print/poppler/patches/patch-CMakeLists_txt b/print/poppler/patches/patch-CMakeLists_txt
index 4c61fbd7878..24d4ab2a3a7 100644
--- a/print/poppler/patches/patch-CMakeLists_txt
+++ b/print/poppler/patches/patch-CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2021/12/24 10:09:02 kili Exp $
-
 Allow to build against qt-6.0.
 
 Index: CMakeLists.txt
diff --git a/print/poppler/patches/patch-cpp_CMakeLists_txt b/print/poppler/patches/patch-cpp_CMakeLists_txt
index f5700769f26..d7c675edc98 100644
--- a/print/poppler/patches/patch-cpp_CMakeLists_txt
+++ b/print/poppler/patches/patch-cpp_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cpp_CMakeLists_txt,v 1.2 2021/05/19 19:57:03 kili Exp $
-
 - Remove hardcoded SOVERSION
 
 Index: cpp/CMakeLists.txt
diff --git a/print/poppler/patches/patch-glib_CMakeLists_txt b/print/poppler/patches/patch-glib_CMakeLists_txt
index 2cb43efaa56..4e4e707cb58 100644
--- a/print/poppler/patches/patch-glib_CMakeLists_txt
+++ b/print/poppler/patches/patch-glib_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-glib_CMakeLists_txt,v 1.11 2021/12/24 10:09:02 kili Exp $
-
 - Remove hardcoded SOVERSION
 
 Index: glib/CMakeLists.txt
diff --git a/print/poppler/patches/patch-poppler_Form_cc b/print/poppler/patches/patch-poppler_Form_cc
index 1da00e144bf..a3c816c4450 100644
--- a/print/poppler/patches/patch-poppler_Form_cc
+++ b/print/poppler/patches/patch-poppler_Form_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-poppler_Form_cc,v 1.11 2021/12/24 10:09:02 kili Exp $
-
 Index: poppler/Form.cc
 --- poppler/Form.cc.orig
 +++ poppler/Form.cc
diff --git a/print/poppler/patches/patch-poppler_XRef_cc b/print/poppler/patches/patch-poppler_XRef_cc
index 0b873cbe682..b9b4a287053 100644
--- a/print/poppler/patches/patch-poppler_XRef_cc
+++ b/print/poppler/patches/patch-poppler_XRef_cc
@@ -1,4 +1,3 @@
-$OpenBSD: patch-poppler_XRef_cc,v 1.27 2021/12/24 10:09:02 kili Exp $
 Index: poppler/XRef.cc
 --- poppler/XRef.cc.orig
 +++ poppler/XRef.cc
diff --git a/print/poppler/patches/patch-qt5_src_CMakeLists_txt b/print/poppler/patches/patch-qt5_src_CMakeLists_txt
index 6e392d90a9e..1de8f47116c 100644
--- a/print/poppler/patches/patch-qt5_src_CMakeLists_txt
+++ b/print/poppler/patches/patch-qt5_src_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-qt5_src_CMakeLists_txt,v 1.7 2021/11/01 18:33:25 kili Exp $
-
 - Remove hardcoded SOVERSION
 
 Index: qt5/src/CMakeLists.txt
diff --git a/print/poppler/patches/patch-qt6_src_CMakeLists_txt b/print/poppler/patches/patch-qt6_src_CMakeLists_txt
index f4407882f25..4711be4b3fb 100644
--- a/print/poppler/patches/patch-qt6_src_CMakeLists_txt
+++ b/print/poppler/patches/patch-qt6_src_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-qt6_src_CMakeLists_txt,v 1.4 2021/11/01 18:33:25 kili Exp $
-
 - Remove hardcoded SOVERSION
 
 Index: qt6/src/CMakeLists.txt
diff --git a/print/poppler/patches/patch-utils_CMakeLists_txt b/print/poppler/patches/patch-utils_CMakeLists_txt
index d8bce053e54..f58e5091df1 100644
--- a/print/poppler/patches/patch-utils_CMakeLists_txt
+++ b/print/poppler/patches/patch-utils_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-utils_CMakeLists_txt,v 1.6 2021/09/08 17:50:37 kili Exp $
-
 For utils/pdftocairo, move common_libs to the front to avoid picking
 up any already installed older version of libpoppler.so.
 
diff --git a/print/poppler/pkg/PLIST-main b/print/poppler/pkg/PLIST-main
index 084be7d42af..7dd517d69b2 100644
--- a/print/poppler/pkg/PLIST-main
+++ b/print/poppler/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.42 2021/12/24 10:09:02 kili Exp $
 @conflict poppler-qt-<0.5.4p0
 @pkgpath print/poppler
 include/poppler/
diff --git a/print/poppler/pkg/PLIST-qt5 b/print/poppler/pkg/PLIST-qt5
index f609190d402..83b36559b7f 100644
--- a/print/poppler/pkg/PLIST-qt5
+++ b/print/poppler/pkg/PLIST-qt5
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-qt5,v 1.4 2019/01/11 21:31:52 kili Exp $
 include/poppler/qt5/
 include/poppler/qt5/poppler-annotation.h
 include/poppler/qt5/poppler-export.h
diff --git a/print/poppler/pkg/PLIST-qt6 b/print/poppler/pkg/PLIST-qt6
index 2a20d91276f..2ca7bf2e2d7 100644
--- a/print/poppler/pkg/PLIST-qt6
+++ b/print/poppler/pkg/PLIST-qt6
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-qt6,v 1.1 2021/05/07 07:25:15 rsadowski Exp $
 include/poppler/qt6/
 include/poppler/qt6/poppler-annotation.h
 include/poppler/qt6/poppler-export.h
diff --git a/print/poppler/pkg/PLIST-utils b/print/poppler/pkg/PLIST-utils
index 4dbb2953a7c..05de50d117a 100644
--- a/print/poppler/pkg/PLIST-utils
+++ b/print/poppler/pkg/PLIST-utils
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-utils,v 1.5 2019/04/21 23:27:53 kili Exp $
 @conflict xpdf-utils-*
 @conflict poppler-<0.18.4p0
 @pkgpath textproc/xpdf,-utils
diff --git a/print/printrun/Makefile b/print/printrun/Makefile
index f9c9e086b36..692b36630fe 100644
--- a/print/printrun/Makefile
+++ b/print/printrun/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2021/06/14 01:02:27 daniel Exp $
-
 COMMENT =		3D printing host suite
 
 MODPY_EGG_VERSION =	1.6.0
diff --git a/print/printrun/patches/patch-plater_desktop b/print/printrun/patches/patch-plater_desktop
index a184585835a..d1b905e5492 100644
--- a/print/printrun/patches/patch-plater_desktop
+++ b/print/printrun/patches/patch-plater_desktop
@@ -1,4 +1,3 @@
-$OpenBSD: patch-plater_desktop,v 1.1.1.1 2016/01/26 23:10:08 abieber Exp $
 --- plater.desktop.orig	Wed Jan 20 18:37:37 2016
 +++ plater.desktop	Wed Jan 20 18:38:22 2016
 @@ -3,8 +3,8 @@ Type=Application
diff --git a/print/printrun/patches/patch-printrun_settings_py b/print/printrun/patches/patch-printrun_settings_py
index 15db02f4f12..2beb3643421 100644
--- a/print/printrun/patches/patch-printrun_settings_py
+++ b/print/printrun/patches/patch-printrun_settings_py
@@ -1,4 +1,3 @@
-$OpenBSD: patch-printrun_settings_py,v 1.1.1.1 2016/01/26 23:10:08 abieber Exp $
 --- printrun/settings.py.orig	Tue Jan 26 15:21:11 2016
 +++ printrun/settings.py	Tue Jan 26 15:21:48 2016
 @@ -271,8 +271,8 @@ class Settings(object):
diff --git a/print/printrun/patches/patch-pronsole_desktop b/print/printrun/patches/patch-pronsole_desktop
index 0cf8a4699a3..47e2d2121c0 100644
--- a/print/printrun/patches/patch-pronsole_desktop
+++ b/print/printrun/patches/patch-pronsole_desktop
@@ -1,4 +1,3 @@
-$OpenBSD: patch-pronsole_desktop,v 1.1.1.1 2016/01/26 23:10:08 abieber Exp $
 --- pronsole.desktop.orig	Wed Jan 20 18:37:37 2016
 +++ pronsole.desktop	Wed Jan 20 18:38:52 2016
 @@ -3,8 +3,8 @@ Type=Application
diff --git a/print/printrun/patches/patch-pronterface_desktop b/print/printrun/patches/patch-pronterface_desktop
index 7234293ca33..005d0b7a296 100644
--- a/print/printrun/patches/patch-pronterface_desktop
+++ b/print/printrun/patches/patch-pronterface_desktop
@@ -1,4 +1,3 @@
-$OpenBSD: patch-pronterface_desktop,v 1.1.1.1 2016/01/26 23:10:08 abieber Exp $
 --- pronterface.desktop.orig	Wed Jan 20 18:37:37 2016
 +++ pronterface.desktop	Wed Jan 20 18:39:30 2016
 @@ -3,9 +3,9 @@ Type=Application
diff --git a/print/printrun/patches/patch-setup_py b/print/printrun/patches/patch-setup_py
index ce3d3d260bb..b4bcfabf3eb 100644
--- a/print/printrun/patches/patch-setup_py
+++ b/print/printrun/patches/patch-setup_py
@@ -1,4 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.2 2021/01/02 19:09:55 daniel Exp $
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
diff --git a/print/printrun/pkg/PLIST b/print/printrun/pkg/PLIST
index 34f813259a6..2535da66015 100644
--- a/print/printrun/pkg/PLIST
+++ b/print/printrun/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/01/02 19:09:55 daniel Exp $
 bin/plater
 bin/printcore
 bin/pronsole
diff --git a/print/ps2eps/Makefile b/print/ps2eps/Makefile
index 7b9f948125d..5d4a2b47710 100644
--- a/print/ps2eps/Makefile
+++ b/print/ps2eps/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT=	convert Postscript to Encapsulated Postscript
 
 DISTNAME=	ps2eps-1.68
diff --git a/print/ps2eps/pkg/PLIST b/print/ps2eps/pkg/PLIST
index 6b408017398..a5a70e3cbc7 100644
--- a/print/ps2eps/pkg/PLIST
+++ b/print/ps2eps/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/02/01 16:27:59 espie Exp $
 @conflict texlive_texmf-minimal-<=2012p0
 @bin bin/bbox
 bin/ps2eps
diff --git a/print/pscal/Makefile b/print/pscal/Makefile
index dce44d0b79a..cd7d3069737 100644
--- a/print/pscal/Makefile
+++ b/print/pscal/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT=	utility for generating PostScript calendars
 
 DISTNAME=	pscal-1.16
diff --git a/print/pscal/pkg/PLIST b/print/pscal/pkg/PLIST
index 6582b7102b9..3b8a9528a01 100644
--- a/print/pscal/pkg/PLIST
+++ b/print/pscal/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:32:14 espie Exp $
 bin/pscal
 share/doc/pscal/
 share/doc/pscal/README
diff --git a/print/psdim/Makefile b/print/psdim/Makefile
index 1a175d56f0d..8d69abff7d5 100644
--- a/print/psdim/Makefile
+++ b/print/psdim/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.11 2019/07/12 20:48:56 sthen Exp $
-
 COMMENT=		intelligent n-up printing
 
 DISTNAME=		psdim-1.4
diff --git a/print/psdim/patches/patch-src_psdim_c b/print/psdim/patches/patch-src_psdim_c
index 70b36766356..4a28ccb1f97 100644
--- a/print/psdim/patches/patch-src_psdim_c
+++ b/print/psdim/patches/patch-src_psdim_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_psdim_c,v 1.1.1.1 2005/11/01 00:19:17 alek Exp $
 --- src/psdim.c.orig	Thu Mar 31 05:20:13 2005
 +++ src/psdim.c	Sat Oct 22 14:33:58 2005
 @@ -52,10 +52,11 @@ int x2list[] = { 0, 8, 7, 8, 6, 8, 7, 8,
diff --git a/print/psdim/pkg/PLIST b/print/psdim/pkg/PLIST
index 0e09fe7002d..0443cacead0 100644
--- a/print/psdim/pkg/PLIST
+++ b/print/psdim/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/01 00:19:17 alek Exp $
 bin/psdim
 @man man/man1/psdim.1
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 9cc0f89a46b..1659661fe53 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.56 2022/03/11 16:13:58 claudio Exp $
-
 PKG_ARCH=	*
 
 COMMENT=	utilities for manipulating PostScript documents
diff --git a/print/psutils/patches/patch-PSUtils_pm b/print/psutils/patches/patch-PSUtils_pm
index e5fd64c94f5..6e7bb6723d1 100644
--- a/print/psutils/patches/patch-PSUtils_pm
+++ b/print/psutils/patches/patch-PSUtils_pm
@@ -1,5 +1,3 @@
-$OpenBSD: patch-PSUtils_pm,v 1.8 2022/03/11 16:13:58 claudio Exp $
-
 https://bugzilla.redhat.com/show_bug.cgi?id=1072371
 
 Index: PSUtils.pm
diff --git a/print/psutils/pkg/PLIST b/print/psutils/pkg/PLIST
index ed12e4c2f1f..ec886ebaadc 100644
--- a/print/psutils/pkg/PLIST
+++ b/print/psutils/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.14 2019/12/17 08:17:15 ajacoutot Exp $
 @conflict texlive_texmf-minimal-<=2012p0
 @pkgpath print/psutils[,a3][,a4][,a5][,b5][,b4][,letter][,legal]
 @pkgpath print/psutils[,ledger][,tabloid][,statement][,executive]
diff --git a/print/ptouch-driver/Makefile b/print/ptouch-driver/Makefile
index b7616ae9c04..69f31e45455 100644
--- a/print/ptouch-driver/Makefile
+++ b/print/ptouch-driver/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2021/04/02 08:40:26 ajacoutot Exp $
-
 COMMENT=		Brother P-touch CUPS driver
 
 GH_TAGNAME=		v1.6
diff --git a/print/ptouch-driver/patches/patch-driver_ptouch-pt_xml b/print/ptouch-driver/patches/patch-driver_ptouch-pt_xml
index 9e1dbe11620..0d18fa06349 100644
--- a/print/ptouch-driver/patches/patch-driver_ptouch-pt_xml
+++ b/print/ptouch-driver/patches/patch-driver_ptouch-pt_xml
@@ -1,5 +1,3 @@
-$OpenBSD: patch-driver_ptouch-pt_xml,v 1.1 2020/05/28 08:47:38 ajacoutot Exp $
-
 Index: driver/ptouch-pt.xml
 --- driver/ptouch-pt.xml.orig
 +++ driver/ptouch-pt.xml
diff --git a/print/ptouch-driver/pkg/PLIST b/print/ptouch-driver/pkg/PLIST
index c707d92f1bf..e6c6d97576b 100644
--- a/print/ptouch-driver/pkg/PLIST
+++ b/print/ptouch-driver/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/04/02 08:40:26 ajacoutot Exp $
 @conflict foomatic-db-<4.0.20110101p0
 @bin libexec/cups/filter/rastertoptch
 share/foomatic/db/source/driver/ptouch-pt.xml
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index d9ebccfc4fc..32676e3e144 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.38 2021/11/02 00:01:54 sthen Exp $
-
 COMMENT=		CUPS bindings for Python
 
 MODPY_EGG_VERSION=	2.0.1
diff --git a/print/py-cups/patches/patch-setup_py b/print/py-cups/patches/patch-setup_py
index 71c116f4e93..21f14f7cc75 100644
--- a/print/py-cups/patches/patch-setup_py
+++ b/print/py-cups/patches/patch-setup_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.10 2019/04/16 08:16:14 ajacoutot Exp $
-
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
diff --git a/print/py-cups/pkg/PLIST b/print/py-cups/pkg/PLIST
index cc6ccdfadaa..8027d630bd8 100644
--- a/print/py-cups/pkg/PLIST
+++ b/print/py-cups/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2021/01/04 14:06:36 sthen Exp $
 @conflict py-cups-*
 @pkgpath print/py-cups
 @so lib/python${MODPY_VERSION}/site-packages/cups.${MODPY_PYC_MAGIC_TAG}so
diff --git a/print/py-pikepdf/Makefile b/print/py-pikepdf/Makefile
index efb9070b9f5..a37c9a301b1 100644
--- a/print/py-pikepdf/Makefile
+++ b/print/py-pikepdf/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2021/11/23 11:13:25 sthen Exp $
-
 COMMENT =		Python library for reading and writing PDF files
 
 MODPY_EGG_VERSION =	4.0.2
diff --git a/print/py-pikepdf/patches/patch-tests_test_io_py b/print/py-pikepdf/patches/patch-tests_test_io_py
index 1970b893d89..fe9abdfce99 100644
--- a/print/py-pikepdf/patches/patch-tests_test_io_py
+++ b/print/py-pikepdf/patches/patch-tests_test_io_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-tests_test_io_py,v 1.1 2021/07/22 09:33:24 sthen Exp $
-
 Index: tests/test_io.py
 --- tests/test_io.py.orig
 +++ tests/test_io.py
diff --git a/print/py-pikepdf/pkg/PLIST b/print/py-pikepdf/pkg/PLIST
index 99370805d7a..61e924951c2 100644
--- a/print/py-pikepdf/pkg/PLIST
+++ b/print/py-pikepdf/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/07/22 09:33:24 sthen Exp $
 lib/python${MODPY_VERSION}/site-packages/pikepdf/
 lib/python${MODPY_VERSION}/site-packages/pikepdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pikepdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/print/py-pylatex/Makefile b/print/py-pylatex/Makefile
index b053eaf2b54..9d5b304d69e 100644
--- a/print/py-pylatex/Makefile
+++ b/print/py-pylatex/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/11/20 08:20:05 landry Exp $
-
 COMMENT=		Python interface for LaTeX
 
 MODPY_EGG_VERSION=	1.4.1
diff --git a/print/py-pylatex/pkg/PLIST b/print/py-pylatex/pkg/PLIST
index a5e8c328a46..dc8b552802d 100644
--- a/print/py-pylatex/pkg/PLIST
+++ b/print/py-pylatex/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/11/20 08:20:05 landry Exp $
 lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 562d63d3507..190c55e82c6 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.18 2021/12/07 10:43:03 sthen Exp $
-
 COMMENT=		PDF-generating toolkit for Python
 
 # XXX 3.6.x drops py2 support; graphics/sk1 needs it
diff --git a/print/py-reportlab/patches/patch-docs_genAll_py b/print/py-reportlab/patches/patch-docs_genAll_py
index be68e9fc118..c512a9f40c8 100644
--- a/print/py-reportlab/patches/patch-docs_genAll_py
+++ b/print/py-reportlab/patches/patch-docs_genAll_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-docs_genAll_py,v 1.1 2016/01/05 13:21:49 ajacoutot Exp $
-
 Needs itself to renerate de PDF documentation.
 
 --- docs/genAll.py.orig	Wed Mar 26 21:17:14 2014
diff --git a/print/py-reportlab/patches/patch-docs_userguide_genuserguide_py b/print/py-reportlab/patches/patch-docs_userguide_genuserguide_py
index 1ca1630259f..007a34cae05 100644
--- a/print/py-reportlab/patches/patch-docs_userguide_genuserguide_py
+++ b/print/py-reportlab/patches/patch-docs_userguide_genuserguide_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-docs_userguide_genuserguide_py,v 1.1 2016/01/05 13:21:49 ajacoutot Exp $
-
 Needs itself to renerate de PDF documentation.
 
 --- docs/userguide/genuserguide.py.orig	Wed Mar 26 21:17:14 2014
diff --git a/print/py-reportlab/patches/patch-setup_py b/print/py-reportlab/patches/patch-setup_py
index d00ad307612..327536e9162 100644
--- a/print/py-reportlab/patches/patch-setup_py
+++ b/print/py-reportlab/patches/patch-setup_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.2 2021/12/07 10:43:03 sthen Exp $
-
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
diff --git a/print/py-reportlab/patches/patch-src_rl_addons_renderPM_gt1_gt1-misc_h b/print/py-reportlab/patches/patch-src_rl_addons_renderPM_gt1_gt1-misc_h
index 75c980fc15f..800c467fd2d 100644
--- a/print/py-reportlab/patches/patch-src_rl_addons_renderPM_gt1_gt1-misc_h
+++ b/print/py-reportlab/patches/patch-src_rl_addons_renderPM_gt1_gt1-misc_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_rl_addons_renderPM_gt1_gt1-misc_h,v 1.2 2021/12/07 10:43:03 sthen Exp $
-
 Index: src/rl_addons/renderPM/gt1/gt1-misc.h
 --- src/rl_addons/renderPM/gt1/gt1-misc.h.orig
 +++ src/rl_addons/renderPM/gt1/gt1-misc.h
diff --git a/print/py-reportlab/pkg/PLIST b/print/py-reportlab/pkg/PLIST
index b16dfe6ec90..c384df689b8 100644
--- a/print/py-reportlab/pkg/PLIST
+++ b/print/py-reportlab/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/12/07 10:43:03 sthen Exp $
 @conflict py-reportlab-barcode-*
 @conflict py-reportlab-renderPM-*
 @pkgpath print/py-reportlab/plugins/renderPM
diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile
index 576d8b6bb69..c1f8c68dd73 100755
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.50 2022/02/17 09:27:12 ajacoutot Exp $
-
 # XXX usually fails to build when an earlier version is installed
 
 COMMENT=	PDF transformation and inspection utility
diff --git a/print/qpdf/patches/patch-configure b/print/qpdf/patches/patch-configure
index b766b8c7783..f391b1c88be 100644
--- a/print/qpdf/patches/patch-configure
+++ b/print/qpdf/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.11 2022/02/10 15:55:05 ajacoutot Exp $
-
 Don't pick up libatomic from ports gcc if it happens to be installed.
 
 Index: configure
diff --git a/print/qpdf/patches/patch-make_libtool_mk b/print/qpdf/patches/patch-make_libtool_mk
index 13cb3b27aa3..2a6a9bcd912 100644
--- a/print/qpdf/patches/patch-make_libtool_mk
+++ b/print/qpdf/patches/patch-make_libtool_mk
@@ -1,5 +1,3 @@
-$OpenBSD: patch-make_libtool_mk,v 1.2 2019/01/08 12:14:44 ajacoutot Exp $
-
 Index: make/libtool.mk
 --- make/libtool.mk.orig
 +++ make/libtool.mk
diff --git a/print/qpdf/pkg/PLIST b/print/qpdf/pkg/PLIST
index 481ce4ce6c8..1823edd671a 100644
--- a/print/qpdf/pkg/PLIST
+++ b/print/qpdf/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.18 2022/02/10 15:55:05 ajacoutot Exp $
 @bin bin/fix-qdf
 @bin bin/qpdf
 @bin bin/zlib-flate
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index c42e13d7dd2..5b8c4064d8c 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.80 2021/11/02 00:01:54 sthen Exp $
-
 DPB_PROPERTIES=	parallel
 
 COMMENT=	desktop publishing program
diff --git a/print/scribus/patches/patch-resources_manpages_CMakeLists_txt b/print/scribus/patches/patch-resources_manpages_CMakeLists_txt
index 79c663bf471..c09a531d406 100644
--- a/print/scribus/patches/patch-resources_manpages_CMakeLists_txt
+++ b/print/scribus/patches/patch-resources_manpages_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-resources_manpages_CMakeLists_txt,v 1.1 2020/02/19 12:15:45 landry Exp $
-
 Index: resources/manpages/CMakeLists.txt
 --- resources/manpages/CMakeLists.txt.orig
 +++ resources/manpages/CMakeLists.txt
diff --git a/print/scribus/patches/patch-scribus_fonts_sfnt_cpp b/print/scribus/patches/patch-scribus_fonts_sfnt_cpp
index c0d3e4f7e29..ee1ef938874 100644
--- a/print/scribus/patches/patch-scribus_fonts_sfnt_cpp
+++ b/print/scribus/patches/patch-scribus_fonts_sfnt_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scribus_fonts_sfnt_cpp,v 1.1 2021/10/06 14:36:11 ajacoutot Exp $
-
 From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
 From: Jean Ghali <jghali@libertysurf.fr>
 Date: Sat, 21 Aug 2021 20:05:43 +0000
diff --git a/print/scribus/patches/patch-scribus_third_party_lib2geom_path_h b/print/scribus/patches/patch-scribus_third_party_lib2geom_path_h
index 442667c3ccf..f8565e455f8 100644
--- a/print/scribus/patches/patch-scribus_third_party_lib2geom_path_h
+++ b/print/scribus/patches/patch-scribus_third_party_lib2geom_path_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scribus_third_party_lib2geom_path_h,v 1.1 2020/08/18 18:21:32 rsadowski Exp $
-
 Unbreak LLVM10 build
 
 Index: scribus/third_party/lib2geom/path.h
diff --git a/print/scribus/patches/patch-scribus_ui_colorlistmodel_cpp b/print/scribus/patches/patch-scribus_ui_colorlistmodel_cpp
index aa3d2b8147c..bc1392eb697 100644
--- a/print/scribus/patches/patch-scribus_ui_colorlistmodel_cpp
+++ b/print/scribus/patches/patch-scribus_ui_colorlistmodel_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scribus_ui_colorlistmodel_cpp,v 1.2 2021/04/07 14:08:35 sthen Exp $
-
 avoid segfault caused by CommonStrings::None by removing m_NoneColor, which is
 unused anyways
 
diff --git a/print/scribus/patches/patch-scribus_ui_colorlistmodel_h b/print/scribus/patches/patch-scribus_ui_colorlistmodel_h
index 40c10fd0a95..060b2a61ee9 100644
--- a/print/scribus/patches/patch-scribus_ui_colorlistmodel_h
+++ b/print/scribus/patches/patch-scribus_ui_colorlistmodel_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scribus_ui_colorlistmodel_h,v 1.1 2020/02/19 12:15:45 landry Exp $
-
 avoid segfault caused by CommonStrings::None by removing m_NoneColor, which is
 unused anyways
 
diff --git a/print/scribus/patches/patch-scribus_util_cpp b/print/scribus/patches/patch-scribus_util_cpp
index c14a804fd1d..ff1bc13e6de 100644
--- a/print/scribus/patches/patch-scribus_util_cpp
+++ b/print/scribus/patches/patch-scribus_util_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-scribus_util_cpp,v 1.3 2021/04/07 14:08:35 sthen Exp $
-
 Index: scribus/util.cpp
 --- scribus/util.cpp.orig
 +++ scribus/util.cpp
diff --git a/print/scribus/pkg/PLIST b/print/scribus/pkg/PLIST
index eb12eadae2e..b46c12049c5 100644
--- a/print/scribus/pkg/PLIST
+++ b/print/scribus/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.21 2021/10/04 11:12:22 solene Exp $
 @bin bin/scribus
 lib/scribus/
 lib/scribus/plugins/
diff --git a/print/sile/Makefile b/print/sile/Makefile
index 7b9caf27e75..b22c3e11dc0 100644
--- a/print/sile/Makefile
+++ b/print/sile/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.11 2019/07/12 20:48:57 sthen Exp $
-
 COMMENT =	typesetting system and improved layout engine
 
 V =		0.9.4
diff --git a/print/sile/patches/patch-core_font_lua b/print/sile/patches/patch-core_font_lua
index 3519e0225db..37de03db089 100644
--- a/print/sile/patches/patch-core_font_lua
+++ b/print/sile/patches/patch-core_font_lua
@@ -1,4 +1,3 @@
-$OpenBSD: patch-core_font_lua,v 1.1.1.1 2017/01/27 08:34:57 bentley Exp $
 From upstream 1f2a7b3b94f0d7e60cb7fef668a5542be2486a8e.
 --- core/font.lua.orig	Wed Jan 25 01:44:35 2017
 +++ core/font.lua	Wed Jan 25 01:44:39 2017
diff --git a/print/sile/pkg/PLIST b/print/sile/pkg/PLIST
index 40f41ea1736..d8e6c768d06 100644
--- a/print/sile/pkg/PLIST
+++ b/print/sile/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/01/27 08:34:57 bentley Exp $
 bin/sile
 include/libtexpdf/
 include/libtexpdf/agl.h
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 4b6a1652294..cbd50d1fba5 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.25 2019/09/29 13:36:28 ajacoutot Exp $
-
 COMMENT=	CUPS drivers for SPL printers
 
 V=		2.0.1.20130902
diff --git a/print/splix/patches/patch-Makefile b/print/splix/patches/patch-Makefile
index abfb65f5266..22f2a334994 100644
--- a/print/splix/patches/patch-Makefile
+++ b/print/splix/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.2 2019/09/29 13:36:28 ajacoutot Exp $
-
 --- Makefile.orig	Fri Feb  6 12:49:10 2009
 +++ Makefile	Tue Mar 17 18:22:12 2009
 @@ -55,8 +55,8 @@
diff --git a/print/splix/patches/patch-ppd_samsung_drv_in b/print/splix/patches/patch-ppd_samsung_drv_in
index 66f1db2f6d7..2ccde22ca80 100644
--- a/print/splix/patches/patch-ppd_samsung_drv_in
+++ b/print/splix/patches/patch-ppd_samsung_drv_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ppd_samsung_drv_in,v 1.1 2019/09/29 13:36:28 ajacoutot Exp $
-
 Index: ppd/samsung.drv.in
 --- ppd/samsung.drv.in.orig
 +++ ppd/samsung.drv.in
diff --git a/print/splix/patches/patch-ppd_xerox_drv_in b/print/splix/patches/patch-ppd_xerox_drv_in
index 12eea984fb9..16921e0d825 100644
--- a/print/splix/patches/patch-ppd_xerox_drv_in
+++ b/print/splix/patches/patch-ppd_xerox_drv_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ppd_xerox_drv_in,v 1.1 2019/09/29 13:36:28 ajacoutot Exp $
-
 Index: ppd/xerox.drv.in
 --- ppd/xerox.drv.in.orig
 +++ ppd/xerox.drv.in
diff --git a/print/splix/patches/patch-rules_mk b/print/splix/patches/patch-rules_mk
index f17f90bfe17..03871499e8d 100644
--- a/print/splix/patches/patch-rules_mk
+++ b/print/splix/patches/patch-rules_mk
@@ -1,5 +1,3 @@
-$OpenBSD: patch-rules_mk,v 1.2 2019/09/29 13:36:28 ajacoutot Exp $
-
 Index: rules.mk
 --- rules.mk.orig
 +++ rules.mk
diff --git a/print/splix/pkg/PLIST b/print/splix/pkg/PLIST
index 93d78cb0eba..b2a8f5b355f 100644
--- a/print/splix/pkg/PLIST
+++ b/print/splix/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/09/04 12:46:20 espie Exp $
 @bin libexec/cups/filter/pstoqpdl
 @bin libexec/cups/filter/rastertoqpdl
 share/cups/drv/splix/
diff --git a/print/splix/pkg/README b/print/splix/pkg/README
index e470910070f..4ae0c8ce0e7 100644
--- a/print/splix/pkg/README
+++ b/print/splix/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.6 2018/09/04 12:46:20 espie Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index a490e9fa02f..a8485353b0d 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.63 2022/02/21 09:17:20 ajacoutot Exp $
-
 COMMENT=		printer (CUPS) administration tool
 
 V=			1.5.16
diff --git a/print/system-config-printer/patches/patch-Makefile_in b/print/system-config-printer/patches/patch-Makefile_in
index af5475db90b..1d008870a41 100644
--- a/print/system-config-printer/patches/patch-Makefile_in
+++ b/print/system-config-printer/patches/patch-Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.14 2022/02/21 09:17:20 ajacoutot Exp $
-
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
diff --git a/print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py b/print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py
index 0d5e4f893e8..14da0416c81 100644
--- a/print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py
+++ b/print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.12 2019/11/23 16:50:24 ajacoutot Exp $
-
 Index: cupshelpers/cupshelpers.py
 --- cupshelpers/cupshelpers.py.orig
 +++ cupshelpers/cupshelpers.py
diff --git a/print/system-config-printer/patches/patch-firewallsettings_py b/print/system-config-printer/patches/patch-firewallsettings_py
index c39ce5bb6b2..8dac4e1bfdf 100644
--- a/print/system-config-printer/patches/patch-firewallsettings_py
+++ b/print/system-config-printer/patches/patch-firewallsettings_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-firewallsettings_py,v 1.2 2018/01/25 08:59:59 ajacoutot Exp $
-
 Disable Linux specific firewall checks.
 
 Index: firewallsettings.py
diff --git a/print/system-config-printer/patches/patch-system-config-printer_desktop_in b/print/system-config-printer/patches/patch-system-config-printer_desktop_in
index 6b905b5ef5e..1e95ab14d0a 100644
--- a/print/system-config-printer/patches/patch-system-config-printer_desktop_in
+++ b/print/system-config-printer/patches/patch-system-config-printer_desktop_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-system-config-printer_desktop_in,v 1.7 2018/01/25 08:59:59 ajacoutot Exp $
-
 GNOME already comes with a CUPS configuration tool in gnome-control-center.
 
 Index: system-config-printer.desktop.in
diff --git a/print/system-config-printer/pkg/PLIST b/print/system-config-printer/pkg/PLIST
index 71d782f8f4a..26110051f34 100644
--- a/print/system-config-printer/pkg/PLIST
+++ b/print/system-config-printer/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.19 2021/01/07 10:52:10 ajacoutot Exp $
 bin/install-printerdriver
 bin/scp-dbus-service
 bin/system-config-printer
diff --git a/print/t1utils/Makefile b/print/t1utils/Makefile
index f9b54c32d51..a43e4711995 100644
--- a/print/t1utils/Makefile
+++ b/print/t1utils/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.11 2020/12/30 18:22:06 fcambus Exp $
-
 COMMENT=		utilities for PostScript Type 1 fonts
 DISTNAME=		t1utils-1.42
 CATEGORIES=		print fonts
diff --git a/print/t1utils/pkg/PLIST b/print/t1utils/pkg/PLIST
index a6b349d5d6d..53b6363080d 100644
--- a/print/t1utils/pkg/PLIST
+++ b/print/t1utils/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/12/04 23:59:35 sthen Exp $
 @bin bin/t1ascii
 @bin bin/t1asm
 @bin bin/t1binary
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index b90987925fb..5ba2d3f0877 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2019/11/04 10:00:48 feinerer Exp $
-
 COMMENT =		official documentation format of the GNU project
 
 DISTNAME =		texinfo-6.5
diff --git a/print/texinfo/patches/patch-tp_Texinfo_Parser_pm b/print/texinfo/patches/patch-tp_Texinfo_Parser_pm
index 8fc5ee52017..05359026d5a 100644
--- a/print/texinfo/patches/patch-tp_Texinfo_Parser_pm
+++ b/print/texinfo/patches/patch-tp_Texinfo_Parser_pm
@@ -1,5 +1,3 @@
-$OpenBSD: patch-tp_Texinfo_Parser_pm,v 1.1 2019/04/04 02:08:33 naddy Exp $
-
 Index: tp/Texinfo/Parser.pm
 --- tp/Texinfo/Parser.pm.orig
 +++ tp/Texinfo/Parser.pm
diff --git a/print/texinfo/pkg/PLIST b/print/texinfo/pkg/PLIST
index e162f3cf764..95bacf5ccdb 100644
--- a/print/texinfo/pkg/PLIST
+++ b/print/texinfo/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2018/07/01 09:02:41 espie Exp $
 @bin bin/ginfo
 @bin bin/ginstall-info
 bin/gmakeinfo
diff --git a/print/texlive/Makefile b/print/texlive/Makefile
index 8885cfd437e..eef5c81c381 100755
--- a/print/texlive/Makefile
+++ b/print/texlive/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2011/03/08 00:09:42 edd Exp $
-
 SUBDIR =
 SUBDIR += base
 SUBDIR += texmf
diff --git a/print/texlive/Makefile.inc b/print/texlive/Makefile.inc
index 41415631b1d..43906bd17a1 100644
--- a/print/texlive/Makefile.inc
+++ b/print/texlive/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.24 2021/10/26 12:50:54 edd Exp $
-
 CATEGORIES ?=	print
 HOMEPAGE ?=	http://tug.org/texlive/
 MAINTAINER ?=	Edd Barrett <edd@openbsd.org>
diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile
index 9506909e724..79d9487759b 100755
--- a/print/texlive/base/Makefile
+++ b/print/texlive/base/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.116 2021/10/26 12:51:59 edd Exp $
-
 COMMENT-main =		base binaries for TeXLive typesetting distribution
 COMMENT-mktexlsr =	mktexlsr for TeXLive typesetting distribution
 COMMENT-synctex =	synctex for TeXLive typesetting distribution
diff --git a/print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_src_Makefile_in b/print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_src_Makefile_in
index c653285f2e0..7b9317dffb2 100644
--- a/print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_src_Makefile_in
+++ b/print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_src_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texk_dvisvgm_dvisvgm-src_src_Makefile_in,v 1.2 2020/08/18 18:40:15 edd Exp $
-
 Index: texk/dvisvgm/dvisvgm-src/src/Makefile.in
 --- texk/dvisvgm/dvisvgm-src/src/Makefile.in.orig
 +++ texk/dvisvgm/dvisvgm-src/src/Makefile.in
diff --git a/print/texlive/base/pkg/PFRAG.xindy-main b/print/texlive/base/pkg/PFRAG.xindy-main
index da517d361e8..de68d4bf2b0 100644
--- a/print/texlive/base/pkg/PFRAG.xindy-main
+++ b/print/texlive/base/pkg/PFRAG.xindy-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.xindy-main,v 1.1 2018/07/01 08:59:32 espie Exp $
 @bin bin/tex2xindy
 bin/texindy
 bin/xindy
diff --git a/print/texlive/base/pkg/PLIST-main b/print/texlive/base/pkg/PLIST-main
index 4298ff92b27..6ca716d03d7 100644
--- a/print/texlive/base/pkg/PLIST-main
+++ b/print/texlive/base/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2021/10/26 12:52:09 edd Exp $
 @conflict teTeX_base-*
 @conflict pdfjam-*
 @conflict ht-<2
diff --git a/print/texlive/base/pkg/PLIST-mktexlsr b/print/texlive/base/pkg/PLIST-mktexlsr
index 2ba5e1f42bc..87d0736ebda 100644
--- a/print/texlive/base/pkg/PLIST-mktexlsr
+++ b/print/texlive/base/pkg/PLIST-mktexlsr
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-mktexlsr,v 1.6 2021/10/26 12:52:09 edd Exp $
 @conflict teTeX_base-*
 @conflict pdfjam-*
 @conflict ht-<2
diff --git a/print/texlive/base/pkg/PLIST-synctex b/print/texlive/base/pkg/PLIST-synctex
index 178d9aabdd7..29d3825904b 100644
--- a/print/texlive/base/pkg/PLIST-synctex
+++ b/print/texlive/base/pkg/PLIST-synctex
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-synctex,v 1.4 2021/10/26 12:52:09 edd Exp $
 @conflict texlive_base-<2021
 @bin bin/synctex
 include/synctex/
diff --git a/print/texlive/base/pkg/README-main b/print/texlive/base/pkg/README-main
index 3d1d6b421dd..671e241429b 100644
--- a/print/texlive/base/pkg/README-main
+++ b/print/texlive/base/pkg/README-main
@@ -1,5 +1,3 @@
-$OpenBSD: README-main,v 1.6 2021/10/26 12:52:09 edd Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/print/texlive/texmf/Makefile b/print/texlive/texmf/Makefile
index 838b8a94de5..d0594125090 100644
--- a/print/texlive/texmf/Makefile
+++ b/print/texlive/texmf/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.63 2021/10/26 12:52:10 edd Exp $
-
 COMMENT-context =	texlive texmf for conTeXt
 COMMENT-docs =		texlive documentation
 COMMENT-full =		texlive texmf for extra macros
diff --git a/print/texlive/texmf/adj.mk b/print/texlive/texmf/adj.mk
index c36eb052b48..ae504361e1a 100644
--- a/print/texlive/texmf/adj.mk
+++ b/print/texlive/texmf/adj.mk
@@ -1,5 +1,3 @@
-# $OpenBSD: adj.mk,v 1.9 2021/10/26 12:52:10 edd Exp $
-#
 # This file is automatically generated. Do not edit.
 
 
diff --git a/print/texlive/texmf/files/mk_adj.py b/print/texlive/texmf/files/mk_adj.py
index 671abfb39e0..5ca1a9e2d4d 100644
--- a/print/texlive/texmf/files/mk_adj.py
+++ b/print/texlive/texmf/files/mk_adj.py
@@ -123,8 +123,6 @@ def main(root_dir, strip_prefix):
             except UnknownInterpreterError as e:
                 unknown_interp_files.append(e.args)
 
-    print("# $OpenBSD: mk_adj.py,v 1.2 2019/11/11 22:54:17 edd Exp $")
-    print("#")
     print("# This file is automatically generated. Do not edit.\n")
 
     for subst_var, paths in sorted(substs.items(), key=lambda t: t[0]):
diff --git a/print/texlive/texmf/files/tlpdb.py b/print/texlive/texmf/files/tlpdb.py
index 131bb532dbd..8749212b10c 100644
--- a/print/texlive/texmf/files/tlpdb.py
+++ b/print/texlive/texmf/files/tlpdb.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# $OpenBSD: tlpdb.py,v 1.3 2019/11/11 22:54:17 edd Exp $
 """Lightweight TeX Live TLPDB parser."""
 
 
diff --git a/print/texlive/texmf/files/update_plist_hints.py b/print/texlive/texmf/files/update_plist_hints.py
index f1e3155a816..f0e6582a38a 100644
--- a/print/texlive/texmf/files/update_plist_hints.py
+++ b/print/texlive/texmf/files/update_plist_hints.py
@@ -325,7 +325,6 @@ def walk_fake(file_map, commented_files):
 def process_symlinks(symlink_map):
     sys.stderr.write("writing symlinks.mk...\n")
     with open("symlinks.mk", "w") as fh:
-        fh.write("# $OpenBSD" "$\n")  # split to prevent CVS tag expanding.
         fh.write("# This file is autogenerated. Do not edit.\n\n")
 
         for target_plist, (make_target, symlinks) in symlink_map.items():
diff --git a/print/texlive/texmf/files/write_plists.py b/print/texlive/texmf/files/write_plists.py
index a757437a2f2..2421edb6a8b 100644
--- a/print/texlive/texmf/files/write_plists.py
+++ b/print/texlive/texmf/files/write_plists.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# $OpenBSD: write_plists.py,v 1.4 2021/10/26 12:52:12 edd Exp $
 """
 Write PLISTs based on the output of update_plist_hints.py.
 
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_doc_info_texdraw_info b/print/texlive/texmf/patches/patch-texmf-dist_doc_info_texdraw_info
index 39f54fb53ec..cb70c7e29fd 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_doc_info_texdraw_info
+++ b/print/texlive/texmf/patches/patch-texmf-dist_doc_info_texdraw_info
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texmf-dist_doc_info_texdraw_info,v 1.6 2020/08/18 18:40:21 edd Exp $
-
 Add dir info entry to silence pkg_{add,delete} warning.
 
 Index: texmf-dist/doc/info/texdraw.info
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_mathspic_1 b/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_mathspic_1
index 83537206736..fa9199f41d0 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_mathspic_1
+++ b/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_mathspic_1
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texmf-dist_doc_man_man1_mathspic_1,v 1.1 2019/01/20 11:17:51 edd Exp $
-
 Index: texmf-dist/doc/man/man1/mathspic.1
 --- texmf-dist/doc/man/man1/mathspic.1.orig
 +++ texmf-dist/doc/man/man1/mathspic.1
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_xml2pmx_1 b/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_xml2pmx_1
index 1947fb3dfe1..aa6749c94bd 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_xml2pmx_1
+++ b/print/texlive/texmf/patches/patch-texmf-dist_doc_man_man1_xml2pmx_1
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texmf-dist_doc_man_man1_xml2pmx_1,v 1.1 2021/10/26 12:52:13 edd Exp $
-
 Index: texmf-dist/doc/man/man1/xml2pmx.1
 --- texmf-dist/doc/man/man1/xml2pmx.1.orig
 +++ texmf-dist/doc/man/man1/xml2pmx.1
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh b/print/texlive/texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh
index 4f59f3773d1..0e04e4b7d06 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh
+++ b/print/texlive/texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh
@@ -1,4 +1,3 @@
-$OpenBSD: patch-texmf-dist_scripts_bibexport_bibexport_sh,v 1.4 2019/11/11 22:54:20 edd Exp $
 Index: texmf-dist/scripts/bibexport/bibexport.sh
 --- texmf-dist/scripts/bibexport/bibexport.sh.orig
 +++ texmf-dist/scripts/bibexport/bibexport.sh
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun b/print/texlive/texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun
index b7948d6dc0e..f975efd4dc6 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun
+++ b/print/texlive/texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun
@@ -1,4 +1,3 @@
-$OpenBSD: patch-texmf-dist_scripts_context_stubs_unix_mtxrun,v 1.9 2021/10/26 12:52:13 edd Exp $
 Index: texmf-dist/scripts/context/stubs/unix/mtxrun
 --- texmf-dist/scripts/context/stubs/unix/mtxrun.orig
 +++ texmf-dist/scripts/context/stubs/unix/mtxrun
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl b/print/texlive/texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl
index 53661fad387..e05451963c5 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl
+++ b/print/texlive/texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl
@@ -1,4 +1,3 @@
-$OpenBSD: patch-texmf-dist_scripts_installfont_installfont-tl,v 1.2 2015/05/18 21:38:04 edd Exp $
 --- texmf-dist/scripts/installfont/installfont-tl.origy	Mon Jul 15 23:47:34 2013
 +++ texmf-dist/scripts/installfont/installfont-tl	Fri Jan  2 16:38:59 2015
 @@ -1,4 +1,4 @@
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion b/print/texlive/texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
index 1b288c45a5a..c5505194bc0 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
+++ b/print/texlive/texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
@@ -1,4 +1,3 @@
-$OpenBSD: patch-texmf-dist_scripts_latexfileversion_latexfileversion,v 1.2 2015/05/18 21:38:04 edd Exp $
 --- texmf-dist/scripts/latexfileversion/latexfileversion.origy	Tue Mar 12 00:01:41 2013
 +++ texmf-dist/scripts/latexfileversion/latexfileversion	Fri Jan  2 16:39:48 2015
 @@ -1,4 +1,4 @@
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_scripts_pdfjam_pdfjam b/print/texlive/texmf/patches/patch-texmf-dist_scripts_pdfjam_pdfjam
index 6c5366d50a7..29a2c03d714 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_scripts_pdfjam_pdfjam
+++ b/print/texlive/texmf/patches/patch-texmf-dist_scripts_pdfjam_pdfjam
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texmf-dist_scripts_pdfjam_pdfjam,v 1.1 2020/09/27 18:45:13 edd Exp $
-
 Index: texmf-dist/scripts/pdfjam/pdfjam
 --- texmf-dist/scripts/pdfjam/pdfjam.orig
 +++ texmf-dist/scripts/pdfjam/pdfjam
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_tex_latex_lstaddons_lstlinebgrd_sty b/print/texlive/texmf/patches/patch-texmf-dist_tex_latex_lstaddons_lstlinebgrd_sty
index 4576a2e0576..e3f0a52f37e 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_tex_latex_lstaddons_lstlinebgrd_sty
+++ b/print/texlive/texmf/patches/patch-texmf-dist_tex_latex_lstaddons_lstlinebgrd_sty
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texmf-dist_tex_latex_lstaddons_lstlinebgrd_sty,v 1.1 2020/08/18 18:40:21 edd Exp $
-
 Fix lstlinebgrd.
 
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930850
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmf_cnf b/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmf_cnf
index 3252afa5a76..b4ed1f345b5 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmf_cnf
+++ b/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmf_cnf
@@ -1,4 +1,3 @@
-$OpenBSD: patch-texmf-dist_web2c_texmf_cnf,v 1.9 2020/08/18 18:40:21 edd Exp $
 Index: texmf-dist/web2c/texmf.cnf
 --- texmf-dist/web2c/texmf.cnf.orig
 +++ texmf-dist/web2c/texmf.cnf
diff --git a/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmfcnf_lua b/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmfcnf_lua
index 093f6d3d9e5..2fe0ac5400a 100644
--- a/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmfcnf_lua
+++ b/print/texlive/texmf/patches/patch-texmf-dist_web2c_texmfcnf_lua
@@ -1,5 +1,3 @@
-$OpenBSD: patch-texmf-dist_web2c_texmfcnf_lua,v 1.10 2021/10/26 12:52:13 edd Exp $
-
 Index: texmf-dist/web2c/texmfcnf.lua
 --- texmf-dist/web2c/texmfcnf.lua.orig
 +++ texmf-dist/web2c/texmfcnf.lua
diff --git a/print/texlive/texmf/pkg/PLIST-buildset b/print/texlive/texmf/pkg/PLIST-buildset
index 48f1631befd..b10a503f309 100644
--- a/print/texlive/texmf/pkg/PLIST-buildset
+++ b/print/texlive/texmf/pkg/PLIST-buildset
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-buildset,v 1.15 2021/10/26 12:52:15 edd Exp $
 @conflict teTeX_texmf-*
 @conflict texlive_base-<2021
 @conflict texlive_texmf-docs-<2021
diff --git a/print/texlive/texmf/pkg/PLIST-context b/print/texlive/texmf/pkg/PLIST-context
index 0322f981410..b1d9d7c6523 100644
--- a/print/texlive/texmf/pkg/PLIST-context
+++ b/print/texlive/texmf/pkg/PLIST-context
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-context,v 1.16 2021/10/26 12:52:15 edd Exp $
 @conflict teTeX_texmf-*
 @conflict texlive_base-<2021
 @conflict texlive_texmf-docs-<2021
diff --git a/print/texlive/texmf/pkg/PLIST-docs b/print/texlive/texmf/pkg/PLIST-docs
index 6337f1b7a54..156c079f45d 100644
--- a/print/texlive/texmf/pkg/PLIST-docs
+++ b/print/texlive/texmf/pkg/PLIST-docs
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-docs,v 1.25 2021/10/26 12:52:15 edd Exp $
 @conflict teTeX_texmf-doc-*
 @conflict texlive_base-<2021
 @conflict texlive_texmf-minimal-<2021
diff --git a/print/texlive/texmf/pkg/PLIST-full b/print/texlive/texmf/pkg/PLIST-full
index ecfa264f476..233bd144de6 100644
--- a/print/texlive/texmf/pkg/PLIST-full
+++ b/print/texlive/texmf/pkg/PLIST-full
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-full,v 1.29 2021/10/26 12:52:15 edd Exp $
 @conflict teTeX_texmf-*
 @conflict texlive_base-<2021
 @conflict texlive_texmf-docs-<2021
diff --git a/print/texlive/texmf/pkg/PLIST-main b/print/texlive/texmf/pkg/PLIST-main
index 0ca5be4a9aa..71037f7048d 100644
--- a/print/texlive/texmf/pkg/PLIST-main
+++ b/print/texlive/texmf/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.30 2021/10/26 12:52:16 edd Exp $
 @conflict teTeX_texmf-*
 @conflict texlive_base-<2021
 @conflict texlive_texmf-docs-<2021
diff --git a/print/texlive/texmf/symlinks.mk b/print/texlive/texmf/symlinks.mk
index 98c5a3702f1..e23f8b7a904 100644
--- a/print/texlive/texmf/symlinks.mk
+++ b/print/texlive/texmf/symlinks.mk
@@ -1,4 +1,3 @@
-# $OpenBSD: symlinks.mk,v 1.3 2021/10/26 12:52:10 edd Exp $
 # This file is autogenerated. Do not edit.
 
 tl-symlinks-buildset:
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 275b3a015a4..63c1e9f29cf 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.50 2021/08/30 13:56:26 fcambus Exp $
-
 COMMENT=	tools to convert Xfig's .fig files  #'
 
 VERSION=	3.2.7b
diff --git a/print/transfig/patches/patch-fig2dev_Makefile_in b/print/transfig/patches/patch-fig2dev_Makefile_in
index 2f85eee76d0..8ba3108d0ff 100644
--- a/print/transfig/patches/patch-fig2dev_Makefile_in
+++ b/print/transfig/patches/patch-fig2dev_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fig2dev_Makefile_in,v 1.2 2019/11/13 15:24:11 fcambus Exp $
-
 Index: fig2dev/Makefile.in
 --- fig2dev/Makefile.in.orig
 +++ fig2dev/Makefile.in
diff --git a/print/transfig/patches/patch-fig2dev_fig2dev_c b/print/transfig/patches/patch-fig2dev_fig2dev_c
index 808cfa78219..6f9e869b6a2 100644
--- a/print/transfig/patches/patch-fig2dev_fig2dev_c
+++ b/print/transfig/patches/patch-fig2dev_fig2dev_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fig2dev_fig2dev_c,v 1.2 2019/11/13 15:24:11 fcambus Exp $
-
 Index: fig2dev/fig2dev.c
 --- fig2dev/fig2dev.c.orig
 +++ fig2dev/fig2dev.c
diff --git a/print/transfig/patches/patch-fig2dev_read_c b/print/transfig/patches/patch-fig2dev_read_c
index 61035145690..b6b3012c549 100644
--- a/print/transfig/patches/patch-fig2dev_read_c
+++ b/print/transfig/patches/patch-fig2dev_read_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-fig2dev_read_c,v 1.1 2019/12/04 22:07:50 fcambus Exp $
-
 Fix for CVE-2019-19555.
 
 - Stack-based buffer overflow in read_textobject()
diff --git a/print/transfig/pkg/PLIST b/print/transfig/pkg/PLIST
index 55ab76e5230..cb8f60fc306 100644
--- a/print/transfig/pkg/PLIST
+++ b/print/transfig/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.11 2019/11/13 15:24:11 fcambus Exp $
 @bin bin/fig2dev
 bin/fig2ps2tex
 bin/pic2tpic
diff --git a/print/unpaper/Makefile b/print/unpaper/Makefile
index 27601b14864..c5f43e6b32a 100755
--- a/print/unpaper/Makefile
+++ b/print/unpaper/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:57 sthen Exp $
-
 COMMENT=		post-processing tool for scanned paper sheets
 
 DISTNAME=		unpaper-6.1
diff --git a/print/unpaper/patches/patch-file_c b/print/unpaper/patches/patch-file_c
index d40547016a6..0c4ce23298b 100644
--- a/print/unpaper/patches/patch-file_c
+++ b/print/unpaper/patches/patch-file_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-file_c,v 1.1 2016/11/10 09:03:26 ajacoutot Exp $
-
 https://github.com/Flameeyes/unpaper/pull/42
 
 --- file.c.orig	Sun Oct 26 23:35:38 2014
diff --git a/print/unpaper/patches/patch-tests_runtestG3_sh b/print/unpaper/patches/patch-tests_runtestG3_sh
index e5862365874..abad2e692b8 100644
--- a/print/unpaper/patches/patch-tests_runtestG3_sh
+++ b/print/unpaper/patches/patch-tests_runtestG3_sh
@@ -1,4 +1,3 @@
-$OpenBSD: patch-tests_runtestG3_sh,v 1.1 2016/11/10 09:03:26 ajacoutot Exp $
 --- tests/runtestG3.sh.orig	Wed Nov  9 17:01:15 2016
 +++ tests/runtestG3.sh	Wed Nov  9 17:01:38 2016
 @@ -8,7 +8,7 @@ set -x
diff --git a/print/unpaper/pkg/PLIST b/print/unpaper/pkg/PLIST
index 3b61eb036a2..7288165bdf1 100644
--- a/print/unpaper/pkg/PLIST
+++ b/print/unpaper/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/11/10 09:03:26 ajacoutot Exp $
 @bin bin/unpaper
 @man man/man1/unpaper.1
diff --git a/print/xournal/Makefile b/print/xournal/Makefile
index c2a3142b41d..bba2e79aa7c 100644
--- a/print/xournal/Makefile
+++ b/print/xournal/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:57 sthen Exp $
-
 COMMENT =		application for notetaking & annotating PDF files
 DISTNAME =		xournal-0.4.8
 CATEGORIES =		print
diff --git a/print/xournal/patches/patch-Makefile_in b/print/xournal/patches/patch-Makefile_in
index 791d736ba1c..fe6f2adad20 100644
--- a/print/xournal/patches/patch-Makefile_in
+++ b/print/xournal/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2014/07/14 20:17:17 edd Exp $
 --- Makefile.in.orig	Sun Jun 29 07:53:20 2014
 +++ Makefile.in	Tue Jul  8 16:24:52 2014
 @@ -820,7 +820,7 @@ desktop-install:
diff --git a/print/xournal/pkg/PLIST b/print/xournal/pkg/PLIST
index 27b7e14af74..9a97493defa 100644
--- a/print/xournal/pkg/PLIST
+++ b/print/xournal/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/07/01 18:33:37 espie Exp $
 @bin bin/xournal
 share/applications/xournal.desktop
 share/doc/xournal/
diff --git a/print/xprintproto/Makefile b/print/xprintproto/Makefile
index 3edbe9a45ce..7b27d18dd05 100644
--- a/print/xprintproto/Makefile
+++ b/print/xprintproto/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:57 sthen Exp $
-
 COMMENT =		X11 printing headers
 
 V =			1.0.5
diff --git a/print/xprintproto/pkg/PLIST b/print/xprintproto/pkg/PLIST
index b9114b833f7..0717cea1f00 100644
--- a/print/xprintproto/pkg/PLIST
+++ b/print/xprintproto/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/05/22 11:31:18 ajacoutot Exp $
 include/X11/extensions/
 include/X11/extensions/Print.h
 include/X11/extensions/Printstr.h