diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 8e560508c4d..be73bd6de7c 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.13 2022/02/23 21:48:09 sthen Exp $
-
 COMMENT=	Alliance for Open Media AV1 video codec
 
 GH_ACCOUNT=	jbeich
diff --git a/multimedia/aom/patches/patch-CMakeLists_txt b/multimedia/aom/patches/patch-CMakeLists_txt
index 84652310f97..cfcad96b16e 100644
--- a/multimedia/aom/patches/patch-CMakeLists_txt
+++ b/multimedia/aom/patches/patch-CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2022/01/03 08:10:50 rsadowski Exp $
-
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
diff --git a/multimedia/aom/patches/patch-aom_ports_arm_cpudetect_c b/multimedia/aom/patches/patch-aom_ports_arm_cpudetect_c
index 27943c4e5dd..e9a9b6fc72e 100644
--- a/multimedia/aom/patches/patch-aom_ports_arm_cpudetect_c
+++ b/multimedia/aom/patches/patch-aom_ports_arm_cpudetect_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-aom_ports_arm_cpudetect_c,v 1.3 2021/04/23 21:12:07 sthen Exp $
-
 Allow ARM CPU runtime detection code to build on OpenBSD.
 
 Index: aom_ports/arm_cpudetect.c
diff --git a/multimedia/aom/patches/patch-aom_ports_ppc_cpudetect_c b/multimedia/aom/patches/patch-aom_ports_ppc_cpudetect_c
index 4281b148b67..442d72a939c 100644
--- a/multimedia/aom/patches/patch-aom_ports_ppc_cpudetect_c
+++ b/multimedia/aom/patches/patch-aom_ports_ppc_cpudetect_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-aom_ports_ppc_cpudetect_c,v 1.2 2019/09/22 08:45:58 ajacoutot Exp $
-
 Allow PowerPC CPU runtime detection code to build on OpenBSD.
 
 Index: aom_ports/ppc_cpudetect.c
diff --git a/multimedia/aom/patches/patch-build_cmake_aom_configure_cmake b/multimedia/aom/patches/patch-build_cmake_aom_configure_cmake
index 88dcfb308a3..236ebe98eca 100644
--- a/multimedia/aom/patches/patch-build_cmake_aom_configure_cmake
+++ b/multimedia/aom/patches/patch-build_cmake_aom_configure_cmake
@@ -1,5 +1,3 @@
-$OpenBSD: patch-build_cmake_aom_configure_cmake,v 1.6 2021/04/23 21:12:07 sthen Exp $
-
 ARM uses compiler intrinsics, so don't require GNU as.
 
 Index: build/cmake/aom_configure.cmake
diff --git a/multimedia/aom/pkg/PLIST b/multimedia/aom/pkg/PLIST
index e70ef0b7c68..4eb80ab87a5 100644
--- a/multimedia/aom/pkg/PLIST
+++ b/multimedia/aom/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2022/01/03 08:10:50 rsadowski Exp $
 @bin bin/aomdec
 @bin bin/aomenc
 include/aom/
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 8c5c3920581..22a1fdd6788 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2021/07/04 14:35:05 tb Exp $
-
 COMMENT =	open asset import library
 CATEGORIES =	multimedia
 
diff --git a/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in b/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in
index f0b9e269046..bcb5dbbdd30 100644
--- a/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in
+++ b/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-assimpTargets-debug_cmake_in,v 1.1 2021/03/21 16:03:51 rsadowski Exp $
-
 Index: assimpTargets-debug.cmake.in
 --- assimpTargets-debug.cmake.in.orig
 +++ assimpTargets-debug.cmake.in
diff --git a/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in b/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in
index 24fb6506e34..e45dcea0970 100644
--- a/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in
+++ b/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-assimpTargets-release_cmake_in,v 1.1 2021/03/21 16:03:51 rsadowski Exp $
-
 Index: assimpTargets-release.cmake.in
 --- assimpTargets-release.cmake.in.orig
 +++ assimpTargets-release.cmake.in
diff --git a/multimedia/assimp/pkg/PLIST b/multimedia/assimp/pkg/PLIST
index eb01cb27bfa..2d01b50a55a 100644
--- a/multimedia/assimp/pkg/PLIST
+++ b/multimedia/assimp/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2019/11/24 19:48:08 bcallah Exp $
 @bin bin/assimp
 include/assimp/
 include/assimp/BaseImporter.h
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index 4e79e7dcb78..ce464c21c52 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2021/07/25 22:53:09 cwen Exp $
-
 COMMENT=	read and set MPEG-4/3GPP metadata tags
 
 GH_ACCOUNT=	wez
diff --git a/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h b/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h
index f6efcbea648..31eb73468bc 100644
--- a/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h
+++ b/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_AtomicParsley_h,v 1.1 2021/07/25 22:53:09 cwen Exp $
-
 Fix potential bug on unsigned char archs
 See https://github.com/wez/atomicparsley/pull/41
 
diff --git a/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp b/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp
index ddcd8808d5c..1f6f5e820ac 100644
--- a/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp
+++ b/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_CDtoc_cpp,v 1.2 2021/07/25 22:53:09 cwen Exp $
 Index: src/CDtoc.cpp
 --- src/CDtoc.cpp.orig
 +++ src/CDtoc.cpp
diff --git a/multimedia/atomicparsley/patches/patch-src_parsley_cpp b/multimedia/atomicparsley/patches/patch-src_parsley_cpp
index d8ff0a14e30..ed8011942d1 100644
--- a/multimedia/atomicparsley/patches/patch-src_parsley_cpp
+++ b/multimedia/atomicparsley/patches/patch-src_parsley_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_parsley_cpp,v 1.1 2021/07/25 22:53:09 cwen Exp $
-
 Fix potential bug on unsigned char archs
 See https://github.com/wez/atomicparsley/pull/41
 
diff --git a/multimedia/atomicparsley/pkg/PLIST b/multimedia/atomicparsley/pkg/PLIST
index 4f6c7882582..dbe13a9b6a1 100644
--- a/multimedia/atomicparsley/pkg/PLIST
+++ b/multimedia/atomicparsley/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/11/06 14:29:14 sthen Exp $
 @bin bin/AtomicParsley
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile
index 47ad380d42b..6959fc335b6 100644
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2019/07/12 20:47:55 sthen Exp $
-
 MAINTAINER = 	Marc Espie <espie@openbsd.org>
 CATEGORIES =	multimedia
 COMMENT =	closed caption subtitles extractor
diff --git a/multimedia/ccextractor/patches/patch-src_ccextractor_h b/multimedia/ccextractor/patches/patch-src_ccextractor_h
index 81f3299afd2..4ec287e400e 100644
--- a/multimedia/ccextractor/patches/patch-src_ccextractor_h
+++ b/multimedia/ccextractor/patches/patch-src_ccextractor_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_ccextractor_h,v 1.1.1.1 2011/08/16 14:12:58 espie Exp $
 --- src/ccextractor.h.orig	Sun Jul 31 14:43:33 2011
 +++ src/ccextractor.h	Sun Jul 31 14:43:41 2011
 @@ -32,6 +32,15 @@ typedef int64_t LLONG;
diff --git a/multimedia/ccextractor/pkg/PLIST b/multimedia/ccextractor/pkg/PLIST
index f8bf6830c79..712b54d6d38 100644
--- a/multimedia/ccextractor/pkg/PLIST
+++ b/multimedia/ccextractor/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/08/16 14:12:58 espie Exp $
 @bin bin/ccextractor
 share/doc/ccextractor/
 share/doc/ccextractor/BINARY_FILE_FORMAT.TXT
diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile
index b01ea6de503..0298500889c 100644
--- a/multimedia/dav1d/Makefile
+++ b/multimedia/dav1d/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.28 2021/09/11 18:16:04 rsadowski Exp $
-
 COMMENT=	small and fast AV1 decoder
 
 VER=		0.9.2
diff --git a/multimedia/dav1d/pkg/PLIST b/multimedia/dav1d/pkg/PLIST
index d7c4f68bb40..6251e214f90 100644
--- a/multimedia/dav1d/pkg/PLIST
+++ b/multimedia/dav1d/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/07/05 07:36:19 ajacoutot Exp $
 @bin bin/dav1d
 include/dav1d/
 include/dav1d/common.h
diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index ef0326032c7..58980acd19d 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.53 2021/11/02 00:01:37 sthen Exp $
-
 COMMENT=		video DVDs and CDs creation tool
 
 MODPY_EGG_VERSION=	${GH_TAGNAME}
diff --git a/multimedia/devede/patches/patch-setup_py b/multimedia/devede/patches/patch-setup_py
index cf3eacd49d5..e3f4fc0f7e8 100644
--- a/multimedia/devede/patches/patch-setup_py
+++ b/multimedia/devede/patches/patch-setup_py
@@ -1,4 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.4 2017/07/22 15:18:24 ajacoutot Exp $
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
diff --git a/multimedia/devede/patches/patch-src_devedeng_configuration_data_py b/multimedia/devede/patches/patch-src_devedeng_configuration_data_py
index 31565732042..30b8a4ff729 100644
--- a/multimedia/devede/patches/patch-src_devedeng_configuration_data_py
+++ b/multimedia/devede/patches/patch-src_devedeng_configuration_data_py
@@ -1,4 +1,3 @@
- $OpenBSD: patch-src_devedeng_configuration_data_py,v 1.4 2017/07/22 15:18:24 ajacoutot Exp $
 Index: src/devedeng/configuration_data.py
 --- src/devedeng/configuration_data.py.orig
 +++ src/devedeng/configuration_data.py
diff --git a/multimedia/devede/pkg/PLIST b/multimedia/devede/pkg/PLIST
index 93cc7d39329..00947e85261 100644
--- a/multimedia/devede/pkg/PLIST
+++ b/multimedia/devede/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.21 2018/06/27 21:03:57 espie Exp $
 bin/copy_files_verbose.py
 bin/devede
 bin/devede_ng.py
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index e4b6ab98330..59f22a5a720 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2019/07/12 20:47:55 sthen Exp $
-
 COMMENT=	creates DVD file structures
 
 DISTNAME=	dvdauthor-0.7.2
diff --git a/multimedia/dvdauthor/pkg/PLIST b/multimedia/dvdauthor/pkg/PLIST
index ff5ee2568e0..c362d734684 100644
--- a/multimedia/dvdauthor/pkg/PLIST
+++ b/multimedia/dvdauthor/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2017/07/22 19:11:31 ajacoutot Exp $
 @bin bin/dvdauthor
 bin/dvddirdel
 @bin bin/dvdunauthor
diff --git a/multimedia/dvdbackup/Makefile b/multimedia/dvdbackup/Makefile
index da5e2611b00..f79720be655 100644
--- a/multimedia/dvdbackup/Makefile
+++ b/multimedia/dvdbackup/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2019/07/12 20:47:55 sthen Exp $
-
 COMMENT=		DVD ripper
 
 DISTNAME=		dvdbackup-0.1.1
diff --git a/multimedia/dvdbackup/patches/patch-src_dvdbackup_c b/multimedia/dvdbackup/patches/patch-src_dvdbackup_c
index 33f85a603a3..5a812183a99 100644
--- a/multimedia/dvdbackup/patches/patch-src_dvdbackup_c
+++ b/multimedia/dvdbackup/patches/patch-src_dvdbackup_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_dvdbackup_c,v 1.3 2009/07/30 19:10:28 jakemsr Exp $
 --- src/dvdbackup.c.orig	Sun Aug  4 23:08:39 2002
 +++ src/dvdbackup.c	Mon Jul 13 16:58:47 2009
 @@ -30,6 +30,7 @@
diff --git a/multimedia/dvdbackup/pkg/PLIST b/multimedia/dvdbackup/pkg/PLIST
index 0aad78114b7..9467d30bd18 100644
--- a/multimedia/dvdbackup/pkg/PLIST
+++ b/multimedia/dvdbackup/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/03 07:46:02 jakemsr Exp $
 bin/dvdbackup
 share/doc/dvdbackup/
 share/doc/dvdbackup/README
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 675cd9e27c1..2dcacced937 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.46 2021/02/27 06:58:09 ajacoutot Exp $
-
 COMMENT=		DVD authoring application
 
 DISTNAME=		DVDStyler-3.1
diff --git a/multimedia/dvdstyler/patches/patch-src_Menu_cpp b/multimedia/dvdstyler/patches/patch-src_Menu_cpp
index 45c1d6b07e8..449f82c9f89 100644
--- a/multimedia/dvdstyler/patches/patch-src_Menu_cpp
+++ b/multimedia/dvdstyler/patches/patch-src_Menu_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Menu_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
-
 Fix build with wxWidgets-gtk3 >=3.1.X
 
 Index: src/Menu.cpp
diff --git a/multimedia/dvdstyler/patches/patch-src_Pgc_h b/multimedia/dvdstyler/patches/patch-src_Pgc_h
index 94ea564feba..da02acda3a8 100644
--- a/multimedia/dvdstyler/patches/patch-src_Pgc_h
+++ b/multimedia/dvdstyler/patches/patch-src_Pgc_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Pgc_h,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
-
 Fix build with wxWidgets-gtk3 >=3.1.X
 
 Index: src/Pgc.h
diff --git a/multimedia/dvdstyler/patches/patch-src_TitlePropDlg_cpp b/multimedia/dvdstyler/patches/patch-src_TitlePropDlg_cpp
index d7ecd621406..8d8e5cde1a3 100644
--- a/multimedia/dvdstyler/patches/patch-src_TitlePropDlg_cpp
+++ b/multimedia/dvdstyler/patches/patch-src_TitlePropDlg_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_TitlePropDlg_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
-
 Fix build with wxWidgets-gtk3 >=3.1.X
 
 Index: src/TitlePropDlg.cpp
diff --git a/multimedia/dvdstyler/patches/patch-src_TitlesetManager_cpp b/multimedia/dvdstyler/patches/patch-src_TitlesetManager_cpp
index b50bde16a3f..a636c0a445f 100644
--- a/multimedia/dvdstyler/patches/patch-src_TitlesetManager_cpp
+++ b/multimedia/dvdstyler/patches/patch-src_TitlesetManager_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_TitlesetManager_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
-
 Fix build with wxWidgets-gtk3 >=3.1.X
 
 Index: src/TitlesetManager.cpp
diff --git a/multimedia/dvdstyler/patches/patch-src_Vob_cpp b/multimedia/dvdstyler/patches/patch-src_Vob_cpp
index 068733f9db1..50735a3596a 100644
--- a/multimedia/dvdstyler/patches/patch-src_Vob_cpp
+++ b/multimedia/dvdstyler/patches/patch-src_Vob_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Vob_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
-
 Fix build with wxWidgets-gtk3 >=3.1.X
 
 Index: src/Vob.cpp
diff --git a/multimedia/dvdstyler/patches/patch-wxVillaLib_Thumbnails_cpp b/multimedia/dvdstyler/patches/patch-wxVillaLib_Thumbnails_cpp
index 2c2c626755b..ed3781c082c 100644
--- a/multimedia/dvdstyler/patches/patch-wxVillaLib_Thumbnails_cpp
+++ b/multimedia/dvdstyler/patches/patch-wxVillaLib_Thumbnails_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-wxVillaLib_Thumbnails_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
-
 Fix build with wxWidgets-gtk3 >=3.1.X
 
 Index: wxVillaLib/Thumbnails.cpp
diff --git a/multimedia/dvdstyler/pkg/PLIST b/multimedia/dvdstyler/pkg/PLIST
index f8f06d73fd9..e61bebb9938 100644
--- a/multimedia/dvdstyler/pkg/PLIST
+++ b/multimedia/dvdstyler/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.13 2021/02/27 06:58:09 ajacoutot Exp $
 @bin bin/dvdstyler
 @man man/man1/dvdstyler.1
 share/applications/dvdstyler.desktop
diff --git a/multimedia/frei0r-plugins/Makefile b/multimedia/frei0r-plugins/Makefile
index 59de917060e..759dd564e4b 100644
--- a/multimedia/frei0r-plugins/Makefile
+++ b/multimedia/frei0r-plugins/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.4 2020/03/07 15:09:49 cwen Exp $
-
 COMMENT =	minimalistic plugin API for video effects
 CATEGORIES =	graphics multimedia
 
diff --git a/multimedia/frei0r-plugins/pkg/PLIST b/multimedia/frei0r-plugins/pkg/PLIST
index 9b4ea8ecf6d..295d54f800f 100644
--- a/multimedia/frei0r-plugins/pkg/PLIST
+++ b/multimedia/frei0r-plugins/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/03/04 20:00:56 rapha Exp $
 include/frei0r.h
 lib/frei0r-1/
 @so lib/frei0r-1/3dflippo.so
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index 8d3d403514f..d0da7475f2e 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2022/01/03 09:12:34 op Exp $
-
 COMMENT =	editor for text-based subtitle files
 
 MODPY_EGG_VERSION =	1.10.1
diff --git a/multimedia/gaupol/pkg/PLIST b/multimedia/gaupol/pkg/PLIST
index f3d46c36a35..0f01bf96748 100644
--- a/multimedia/gaupol/pkg/PLIST
+++ b/multimedia/gaupol/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/09/06 09:40:47 bentley Exp $
 bin/gaupol
 lib/python${MODPY_VERSION}/site-packages/aeidon/
 lib/python${MODPY_VERSION}/site-packages/aeidon/__init__.py
diff --git a/multimedia/get_flash_videos/Makefile b/multimedia/get_flash_videos/Makefile
index a0165dd8f7e..2e03c6a31fe 100644
--- a/multimedia/get_flash_videos/Makefile
+++ b/multimedia/get_flash_videos/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.36 2020/03/22 18:13:36 naddy Exp $
-
 COMMENT=	download flash video files from various sites
 
 V=	1.25.99
diff --git a/multimedia/get_flash_videos/pkg/PLIST b/multimedia/get_flash_videos/pkg/PLIST
index dcfc850247c..d430eb564c5 100644
--- a/multimedia/get_flash_videos/pkg/PLIST
+++ b/multimedia/get_flash_videos/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.13 2018/02/28 14:08:36 nigel Exp $
 bin/get_flash_videos
 ${P5SITE}/FlashVideo/
 ${P5SITE}/FlashVideo/DASHDownloader.pm
diff --git a/multimedia/gnome-twitch/Makefile b/multimedia/gnome-twitch/Makefile
index 6cb6e2cff16..b49f85cf4e6 100644
--- a/multimedia/gnome-twitch/Makefile
+++ b/multimedia/gnome-twitch/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2020/09/12 19:36:59 phessler Exp $
-
 BROKEN =	twitch changed their API
 
 COMMENT =	desktop Twitch.tv client
diff --git a/multimedia/gnome-twitch/patches/patch-print_git_version_py b/multimedia/gnome-twitch/patches/patch-print_git_version_py
index 9f9bb57df63..af54108c529 100644
--- a/multimedia/gnome-twitch/patches/patch-print_git_version_py
+++ b/multimedia/gnome-twitch/patches/patch-print_git_version_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-print_git_version_py,v 1.1.1.1 2017/10/15 11:32:43 bcallah Exp $
-
 Don't do this git stuff.
 
 Index: print_git_version.py
diff --git a/multimedia/gnome-twitch/pkg/PLIST b/multimedia/gnome-twitch/pkg/PLIST
index 2d5b100a415..764d46db90c 100644
--- a/multimedia/gnome-twitch/pkg/PLIST
+++ b/multimedia/gnome-twitch/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/07/06 06:04:43 espie Exp $
 @bin bin/gnome-twitch
 include/gnome-twitch/
 include/gnome-twitch/gt-log.h
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 55700fcc422..49b878babf9 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2020/10/28 15:42:14 ajacoutot Exp $
-
     SUBDIR =
     SUBDIR += core
     SUBDIR += mm
diff --git a/multimedia/gstreamer1/Makefile.inc b/multimedia/gstreamer1/Makefile.inc
index 60a2b3970cc..a195f1a9407 100644
--- a/multimedia/gstreamer1/Makefile.inc
+++ b/multimedia/gstreamer1/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.73 2022/02/05 14:49:40 ajacoutot Exp $
-
 # Most frequent usage of the GStreamer packages:
 # core		base library
 # plugins-base	minimal set: audio (sndio), gio, playback, Ogg Vorbis
diff --git a/multimedia/gstreamer1/core/Makefile b/multimedia/gstreamer1/core/Makefile
index 9f8d32834ee..150621339e0 100644
--- a/multimedia/gstreamer1/core/Makefile
+++ b/multimedia/gstreamer1/core/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.67 2022/02/05 14:49:40 ajacoutot Exp $
-
 COMMENT=		framework for streaming media
 
 DISTNAME=		gstreamer-${V}
diff --git a/multimedia/gstreamer1/core/pkg/PLIST b/multimedia/gstreamer1/core/pkg/PLIST
index b976eb7e1cd..84327697168 100644
--- a/multimedia/gstreamer1/core/pkg/PLIST
+++ b/multimedia/gstreamer1/core/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.30 2022/02/05 14:49:40 ajacoutot Exp $
 @bin bin/gst-inspect-${API}
 @bin bin/gst-launch-${API}
 @bin bin/gst-stats-${API}
diff --git a/multimedia/gstreamer1/mm/Makefile b/multimedia/gstreamer1/mm/Makefile
index 2c19bb23e92..fb9cd94d5f9 100644
--- a/multimedia/gstreamer1/mm/Makefile
+++ b/multimedia/gstreamer1/mm/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.26 2022/02/03 09:35:18 ajacoutot Exp $
-
 COMMENT=		C++ bindings for GStreamer
 
 GNOME_PROJECT=		gstreamermm
diff --git a/multimedia/gstreamer1/mm/patches/patch-gstreamer_gstreamermm_register_h b/multimedia/gstreamer1/mm/patches/patch-gstreamer_gstreamermm_register_h
index 7a29d1d2fec..57dba256ccf 100644
--- a/multimedia/gstreamer1/mm/patches/patch-gstreamer_gstreamermm_register_h
+++ b/multimedia/gstreamer1/mm/patches/patch-gstreamer_gstreamermm_register_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gstreamer_gstreamermm_register_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
-
 Fix build with GLib >=2.68
 
 Index: gstreamer/gstreamermm/register.h
diff --git a/multimedia/gstreamer1/mm/pkg/PLIST b/multimedia/gstreamer1/mm/pkg/PLIST
index a23ce57cedf..0b8c6841931 100644
--- a/multimedia/gstreamer1/mm/pkg/PLIST
+++ b/multimedia/gstreamer1/mm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2022/02/03 09:35:18 ajacoutot Exp $
 include/gstreamermm-${API}/
 include/gstreamermm-${API}/gstreamermm/
 include/gstreamermm-${API}/gstreamermm.h
diff --git a/multimedia/gstreamer1/plugins-bad/Makefile b/multimedia/gstreamer1/plugins-bad/Makefile
index 8b32f5875ff..49ca3016571 100644
--- a/multimedia/gstreamer1/plugins-bad/Makefile
+++ b/multimedia/gstreamer1/plugins-bad/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.88 2022/02/05 14:59:10 ajacoutot Exp $
-
 COMMENT=		bad elements for GStreamer
 
 DISTNAME=		gst-plugins-bad-${V}
diff --git a/multimedia/gstreamer1/plugins-bad/pkg/PLIST b/multimedia/gstreamer1/plugins-bad/pkg/PLIST
index a59e8b47bed..2e8ec6689d5 100644
--- a/multimedia/gstreamer1/plugins-bad/pkg/PLIST
+++ b/multimedia/gstreamer1/plugins-bad/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.35 2022/02/05 14:59:10 ajacoutot Exp $
 @bin bin/gst-transcoder-${API}
 include/gstreamer-${API}/gst/audio/audio-bad-prelude.h
 include/gstreamer-${API}/gst/audio/gstnonstreamaudiodecoder.h
diff --git a/multimedia/gstreamer1/plugins-base/Makefile b/multimedia/gstreamer1/plugins-base/Makefile
index 3faa5e7a045..6ab1872e7aa 100644
--- a/multimedia/gstreamer1/plugins-base/Makefile
+++ b/multimedia/gstreamer1/plugins-base/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.84 2022/02/05 14:49:40 ajacoutot Exp $
-
 COMMENT=		base elements for GStreamer
 
 DISTNAME=		gst-plugins-base-${V}
diff --git a/multimedia/gstreamer1/plugins-base/patches/patch-ext_cdparanoia_gstcdparanoiasrc_c b/multimedia/gstreamer1/plugins-base/patches/patch-ext_cdparanoia_gstcdparanoiasrc_c
index 66e4dbc8e68..203fc05240b 100644
--- a/multimedia/gstreamer1/plugins-base/patches/patch-ext_cdparanoia_gstcdparanoiasrc_c
+++ b/multimedia/gstreamer1/plugins-base/patches/patch-ext_cdparanoia_gstcdparanoiasrc_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ext_cdparanoia_gstcdparanoiasrc_c,v 1.5 2022/02/05 14:49:40 ajacoutot Exp $
-
 XXX old cdparanoia-3.a9.8 (cdparanoia-III-9.8) does not have cache control.
 
 Index: ext/cdparanoia/gstcdparanoiasrc.c
diff --git a/multimedia/gstreamer1/plugins-base/patches/patch-ext_meson_build b/multimedia/gstreamer1/plugins-base/patches/patch-ext_meson_build
index ab0023a8108..49431534240 100644
--- a/multimedia/gstreamer1/plugins-base/patches/patch-ext_meson_build
+++ b/multimedia/gstreamer1/plugins-base/patches/patch-ext_meson_build
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ext_meson_build,v 1.1 2019/04/21 08:49:42 ajacoutot Exp $
-
 Index: ext/meson.build
 --- ext/meson.build.orig
 +++ ext/meson.build
diff --git a/multimedia/gstreamer1/plugins-base/patches/patch-gst_tcp_gstmultihandlesink_c b/multimedia/gstreamer1/plugins-base/patches/patch-gst_tcp_gstmultihandlesink_c
index 655299db290..5f58faec148 100644
--- a/multimedia/gstreamer1/plugins-base/patches/patch-gst_tcp_gstmultihandlesink_c
+++ b/multimedia/gstreamer1/plugins-base/patches/patch-gst_tcp_gstmultihandlesink_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gst_tcp_gstmultihandlesink_c,v 1.6 2020/09/14 06:03:13 ajacoutot Exp $
-
 gstmultihandlesink.c:542: error: field 'sa' has incomplete type
 gstmultihandlesink.c:544: error: field 'sa_stor' has incomplete type
 
diff --git a/multimedia/gstreamer1/plugins-base/patches/patch-meson_options_txt b/multimedia/gstreamer1/plugins-base/patches/patch-meson_options_txt
index 18a11b17fe8..6e7f9b51223 100644
--- a/multimedia/gstreamer1/plugins-base/patches/patch-meson_options_txt
+++ b/multimedia/gstreamer1/plugins-base/patches/patch-meson_options_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-meson_options_txt,v 1.2 2020/09/14 06:03:13 ajacoutot Exp $
-
 Index: meson_options.txt
 --- meson_options.txt.orig
 +++ meson_options.txt
diff --git a/multimedia/gstreamer1/plugins-base/pkg/PLIST b/multimedia/gstreamer1/plugins-base/pkg/PLIST
index f825cea43a5..000264df9de 100644
--- a/multimedia/gstreamer1/plugins-base/pkg/PLIST
+++ b/multimedia/gstreamer1/plugins-base/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.21 2022/02/05 14:49:40 ajacoutot Exp $
 @conflict gstreamer1-plugins-bad-<1.14.0
 @bin bin/gst-device-monitor-${API}
 @bin bin/gst-discoverer-${API}
diff --git a/multimedia/gstreamer1/plugins-good/Makefile b/multimedia/gstreamer1/plugins-good/Makefile
index ff0c22731e4..4ea03564b34 100644
--- a/multimedia/gstreamer1/plugins-good/Makefile
+++ b/multimedia/gstreamer1/plugins-good/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.74 2022/02/05 14:49:41 ajacoutot Exp $
-
 # Reenable that port on non-rust archs at the cost of pulseaudio support:
 # pulseaudio -> [...] -> spidermonkey>=78 -> rust
 ONLY_FOR_ARCHS-pulse=	${RUST_ARCHS}
diff --git a/multimedia/gstreamer1/plugins-good/patches/patch-ext_soup_gstsouploader_c b/multimedia/gstreamer1/plugins-good/patches/patch-ext_soup_gstsouploader_c
index d7a9eaa4b2e..866d3a96907 100644
--- a/multimedia/gstreamer1/plugins-good/patches/patch-ext_soup_gstsouploader_c
+++ b/multimedia/gstreamer1/plugins-good/patches/patch-ext_soup_gstsouploader_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ext_soup_gstsouploader_c,v 1.1 2022/02/05 14:49:41 ajacoutot Exp $
-
 Index: ext/soup/gstsouploader.c
 --- ext/soup/gstsouploader.c.orig
 +++ ext/soup/gstsouploader.c
diff --git a/multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_v4l2_calls_c b/multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_v4l2_calls_c
index 92e61b09675..00714b33493 100644
--- a/multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_v4l2_calls_c
+++ b/multimedia/gstreamer1/plugins-good/patches/patch-sys_v4l2_v4l2_calls_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-sys_v4l2_v4l2_calls_c,v 1.3 2022/02/05 14:49:41 ajacoutot Exp $
-
 Index: sys/v4l2/v4l2_calls.c
 --- sys/v4l2/v4l2_calls.c.orig
 +++ sys/v4l2/v4l2_calls.c
diff --git a/multimedia/gstreamer1/plugins-good/pkg/PLIST-main b/multimedia/gstreamer1/plugins-good/pkg/PLIST-main
index 996e45dd437..956adfad908 100644
--- a/multimedia/gstreamer1/plugins-good/pkg/PLIST-main
+++ b/multimedia/gstreamer1/plugins-good/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.21 2022/02/05 14:49:41 ajacoutot Exp $
 @conflict gstreamer1-plugins-bad-<1.14.0
 @conflict gstreamer1-plugins-ugly-<1.14.0
 @so lib/gstreamer-${API}/libgstalaw.so
diff --git a/multimedia/gstreamer1/plugins-good/pkg/PLIST-pulse b/multimedia/gstreamer1/plugins-good/pkg/PLIST-pulse
index ae1adebf21e..166f4187d34 100644
--- a/multimedia/gstreamer1/plugins-good/pkg/PLIST-pulse
+++ b/multimedia/gstreamer1/plugins-good/pkg/PLIST-pulse
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST-pulse,v 1.4 2019/12/08 10:16:18 ajacoutot Exp $
 @so lib/gstreamer-${API}/libgstpulseaudio.so
diff --git a/multimedia/gstreamer1/plugins-libav/Makefile b/multimedia/gstreamer1/plugins-libav/Makefile
index 2090c0f712a..baf85f3b0d9 100644
--- a/multimedia/gstreamer1/plugins-libav/Makefile
+++ b/multimedia/gstreamer1/plugins-libav/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.45 2019/12/08 10:16:18 ajacoutot Exp $
-
 COMMENT=		ffmpeg elements for GStreamer
 
 DISTNAME=		gst-libav-${V}
diff --git a/multimedia/gstreamer1/plugins-libav/pkg/PLIST b/multimedia/gstreamer1/plugins-libav/pkg/PLIST
index ccc0a4642a1..0656e2f7196 100644
--- a/multimedia/gstreamer1/plugins-libav/pkg/PLIST
+++ b/multimedia/gstreamer1/plugins-libav/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/12/08 10:16:18 ajacoutot Exp $
 @so lib/gstreamer-${API}/libgstlibav.so
diff --git a/multimedia/gstreamer1/plugins-ugly/Makefile b/multimedia/gstreamer1/plugins-ugly/Makefile
index 3f6167e9e1d..8a183d31819 100644
--- a/multimedia/gstreamer1/plugins-ugly/Makefile
+++ b/multimedia/gstreamer1/plugins-ugly/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.42 2022/02/05 14:49:41 ajacoutot Exp $
-
 COMMENT=		ugly elements for GStreamer
 
 DISTNAME=		gst-plugins-ugly-${V}
diff --git a/multimedia/gstreamer1/plugins-ugly/pkg/PLIST b/multimedia/gstreamer1/plugins-ugly/pkg/PLIST
index 33b628c2c09..e5af1f37ab8 100644
--- a/multimedia/gstreamer1/plugins-ugly/pkg/PLIST
+++ b/multimedia/gstreamer1/plugins-ugly/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.16 2022/02/05 14:49:41 ajacoutot Exp $
 @so lib/gstreamer-${API}/libgstasf.so
 @so lib/gstreamer-${API}/libgstcdio.so
 @so lib/gstreamer-${API}/libgstdvdlpcmdec.so
diff --git a/multimedia/gstreamer1/py-gstreamer/Makefile b/multimedia/gstreamer1/py-gstreamer/Makefile
index 95c75c89f95..ec18a573d5e 100644
--- a/multimedia/gstreamer1/py-gstreamer/Makefile
+++ b/multimedia/gstreamer1/py-gstreamer/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.23 2022/02/03 09:35:19 ajacoutot Exp $
-
 COMMENT=		overrides for the gobject-introspection-based pygst bindings
 
 DISTNAME=		gst-python-${V}
diff --git a/multimedia/gstreamer1/py-gstreamer/pkg/PLIST b/multimedia/gstreamer1/py-gstreamer/pkg/PLIST
index cccbe2f50a1..94c73dc5edd 100644
--- a/multimedia/gstreamer1/py-gstreamer/pkg/PLIST
+++ b/multimedia/gstreamer1/py-gstreamer/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2022/02/05 14:49:41 ajacoutot Exp $
 @pkgpath multimedia/gstreamer1/py-gstreamer
 @so lib/gstreamer-${API}/libgstpython.so
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gst.py
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index cc57e30521b..c8d77b5ce64 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.11 2021/03/07 02:30:46 daniel Exp $
-
 V = 		1.3.3
 COMMENT =	open source video transcoder
 DISTNAME =	HandBrake-${V}-source
diff --git a/multimedia/handbrake/patches/patch-gtk_configure_ac b/multimedia/handbrake/patches/patch-gtk_configure_ac
index 2cdd52e86fc..fdf1ef3b866 100644
--- a/multimedia/handbrake/patches/patch-gtk_configure_ac
+++ b/multimedia/handbrake/patches/patch-gtk_configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gtk_configure_ac,v 1.4 2020/05/20 14:57:18 bcallah Exp $
-
 Get the proper library directory for -lhandbrake.
 No -ldl on OpenBSD.
 
diff --git a/multimedia/handbrake/patches/patch-gtk_src_callbacks_c b/multimedia/handbrake/patches/patch-gtk_src_callbacks_c
index 4813487381a..248b70d859e 100644
--- a/multimedia/handbrake/patches/patch-gtk_src_callbacks_c
+++ b/multimedia/handbrake/patches/patch-gtk_src_callbacks_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gtk_src_callbacks_c,v 1.2 2019/12/16 17:23:58 bcallah Exp $
-
 We need this include too.
 
 Index: gtk/src/callbacks.c
diff --git a/multimedia/handbrake/patches/patch-libhb_decsrtsub_c b/multimedia/handbrake/patches/patch-libhb_decsrtsub_c
index 32cb3260628..577eaea2bf1 100644
--- a/multimedia/handbrake/patches/patch-libhb_decsrtsub_c
+++ b/multimedia/handbrake/patches/patch-libhb_decsrtsub_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libhb_decsrtsub_c,v 1.2 2019/12/16 17:23:58 bcallah Exp $
-
 iconv* => libiconv* for use with our libiconv
 
 Index: libhb/decsrtsub.c
diff --git a/multimedia/handbrake/patches/patch-libhb_fifo_c b/multimedia/handbrake/patches/patch-libhb_fifo_c
index 7138b167fee..dffccbd22d2 100644
--- a/multimedia/handbrake/patches/patch-libhb_fifo_c
+++ b/multimedia/handbrake/patches/patch-libhb_fifo_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libhb_fifo_c,v 1.3 2020/02/01 01:03:51 bcallah Exp $
-
 Add OpenBSD where appropriate.
 
 Index: libhb/fifo.c
diff --git a/multimedia/handbrake/patches/patch-make_configure_py b/multimedia/handbrake/patches/patch-make_configure_py
index 5771a52535b..b63c102a855 100644
--- a/multimedia/handbrake/patches/patch-make_configure_py
+++ b/multimedia/handbrake/patches/patch-make_configure_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-make_configure_py,v 1.3 2020/05/20 14:57:18 bcallah Exp $
-
 Add OpenBSD to the configure args we need.
 Do not look for CMake; we don't need it.
 
diff --git a/multimedia/handbrake/patches/patch-make_include_gcc_defs b/multimedia/handbrake/patches/patch-make_include_gcc_defs
index 3ebe99f9f8a..8afcd3ed7a0 100644
--- a/multimedia/handbrake/patches/patch-make_include_gcc_defs
+++ b/multimedia/handbrake/patches/patch-make_include_gcc_defs
@@ -1,5 +1,3 @@
-$OpenBSD: patch-make_include_gcc_defs,v 1.2 2019/12/16 17:23:58 bcallah Exp $
-
 Remove hardcoded optimization flags.
 Proper -I and -L dirs.
 
diff --git a/multimedia/handbrake/patches/patch-make_include_main_defs b/multimedia/handbrake/patches/patch-make_include_main_defs
index 7210b6257fd..0bf75f5e8ec 100644
--- a/multimedia/handbrake/patches/patch-make_include_main_defs
+++ b/multimedia/handbrake/patches/patch-make_include_main_defs
@@ -1,5 +1,3 @@
-$OpenBSD: patch-make_include_main_defs,v 1.2 2019/12/16 17:23:58 bcallah Exp $
-
 Rip out all the optional dependencies.
 We'll let the ports tree handle it.
 
diff --git a/multimedia/handbrake/patches/patch-make_variant_freebsd_defs b/multimedia/handbrake/patches/patch-make_variant_freebsd_defs
index 4c06f216ac8..73c1a7865c4 100644
--- a/multimedia/handbrake/patches/patch-make_variant_freebsd_defs
+++ b/multimedia/handbrake/patches/patch-make_variant_freebsd_defs
@@ -1,5 +1,3 @@
-$OpenBSD: patch-make_variant_freebsd_defs,v 1.1 2019/08/07 19:23:10 bcallah Exp $
-
 Index: make/variant/freebsd.defs
 --- make/variant/freebsd.defs.orig
 +++ make/variant/freebsd.defs
diff --git a/multimedia/handbrake/pkg/PLIST b/multimedia/handbrake/pkg/PLIST
index 0aad95b73e4..f700fda1c2e 100644
--- a/multimedia/handbrake/pkg/PLIST
+++ b/multimedia/handbrake/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/06/20 21:12:38 bcallah Exp $
 bin/HandBrake
 @bin bin/HandBrakeCLI
 @bin bin/ghb
diff --git a/multimedia/hdhomerun/Makefile b/multimedia/hdhomerun/Makefile
index c5ab5fc6837..3b142d1025c 100644
--- a/multimedia/hdhomerun/Makefile
+++ b/multimedia/hdhomerun/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.16 2019/07/12 20:47:56 sthen Exp $
-
 V=		20140604
 COMMENT=	HDHomeRun Config CLI utility & firmware
 FW=		hdhomerun_atsc_firmware_$V.bin \
diff --git a/multimedia/hdhomerun/patches/patch-Makefile b/multimedia/hdhomerun/patches/patch-Makefile
index cf3ed5e2aef..b3a3a68715a 100644
--- a/multimedia/hdhomerun/patches/patch-Makefile
+++ b/multimedia/hdhomerun/patches/patch-Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.7 2014/07/19 21:09:19 sthen Exp $
 --- Makefile.orig	Thu Sep 30 12:41:44 2010
 +++ Makefile	Tue Aug 21 09:03:15 2012
 @@ -11,10 +11,10 @@ LIBSRCS += hdhomerun_pkt.c
diff --git a/multimedia/hdhomerun/patches/patch-hdhomerun_os_posix_h b/multimedia/hdhomerun/patches/patch-hdhomerun_os_posix_h
index 9e31b899b5d..ed7e0e0085a 100644
--- a/multimedia/hdhomerun/patches/patch-hdhomerun_os_posix_h
+++ b/multimedia/hdhomerun/patches/patch-hdhomerun_os_posix_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-hdhomerun_os_posix_h,v 1.3 2014/07/19 21:09:19 sthen Exp $
 --- hdhomerun_os_posix.h.orig	Fri Jul 18 13:52:20 2014
 +++ hdhomerun_os_posix.h	Fri Jul 18 13:52:52 2014
 @@ -30,7 +30,6 @@
diff --git a/multimedia/hdhomerun/pkg/PLIST b/multimedia/hdhomerun/pkg/PLIST
index e0ffc5a2b1f..a1fded2f684 100644
--- a/multimedia/hdhomerun/pkg/PLIST
+++ b/multimedia/hdhomerun/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.12 2014/07/19 21:09:19 sthen Exp $
 @bin bin/hdhomerun_config
 share/hdhomerun/
 share/hdhomerun/hdhomerun3_atsc_firmware_${V}.bin
diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile
index 3f863c7231a..83244540344 100644
--- a/multimedia/imagination/Makefile
+++ b/multimedia/imagination/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2019/07/12 20:47:56 sthen Exp $
-
 COMMENT =		lightweight and simple DVD slide show maker
 DISTNAME =		imagination-3.0
 REVISION =		12
diff --git a/multimedia/imagination/patches/patch-Makefile_in b/multimedia/imagination/patches/patch-Makefile_in
index ad4a57cfad9..8ca8c4ddc08 100644
--- a/multimedia/imagination/patches/patch-Makefile_in
+++ b/multimedia/imagination/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
 --- Makefile.in.orig	Sun Mar  6 21:06:48 2011
 +++ Makefile.in	Mon Apr 15 16:34:39 2013
 @@ -276,7 +276,7 @@ target_alias = @target_alias@
diff --git a/multimedia/imagination/patches/patch-src_audio_c b/multimedia/imagination/patches/patch-src_audio_c
index e4e4ae64782..35fd7583f2d 100644
--- a/multimedia/imagination/patches/patch-src_audio_c
+++ b/multimedia/imagination/patches/patch-src_audio_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_audio_c,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
 --- src/audio.c.orig	Mon Apr 15 16:00:27 2013
 +++ src/audio.c	Mon Apr 15 16:00:43 2013
 @@ -17,6 +17,7 @@
diff --git a/multimedia/imagination/patches/patch-src_callbacks_c b/multimedia/imagination/patches/patch-src_callbacks_c
index 1dbc87308a9..1acb9abf68d 100644
--- a/multimedia/imagination/patches/patch-src_callbacks_c
+++ b/multimedia/imagination/patches/patch-src_callbacks_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_callbacks_c,v 1.2 2013/04/17 13:00:26 giovanni Exp $
 --- src/callbacks.c.orig	Mon Apr 15 16:00:51 2013
 +++ src/callbacks.c	Mon Apr 15 16:01:08 2013
 @@ -19,6 +19,7 @@
diff --git a/multimedia/imagination/patches/patch-src_main-window_c b/multimedia/imagination/patches/patch-src_main-window_c
index 8f295676022..00fdebe8006 100644
--- a/multimedia/imagination/patches/patch-src_main-window_c
+++ b/multimedia/imagination/patches/patch-src_main-window_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_main-window_c,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
 --- src/main-window.c.orig	Mon Apr 15 16:01:14 2013
 +++ src/main-window.c	Mon Apr 15 16:01:30 2013
 @@ -23,6 +23,7 @@
diff --git a/multimedia/imagination/patches/patch-src_support_h b/multimedia/imagination/patches/patch-src_support_h
index fe847bf58eb..009d02a6a24 100644
--- a/multimedia/imagination/patches/patch-src_support_h
+++ b/multimedia/imagination/patches/patch-src_support_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_support_h,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
 --- src/support.h.orig	Mon Apr 15 15:59:33 2013
 +++ src/support.h	Mon Apr 15 16:03:37 2013
 @@ -20,7 +20,7 @@
diff --git a/multimedia/imagination/pkg/PLIST b/multimedia/imagination/pkg/PLIST
index 6aff789d1d7..a9819b58ea9 100644
--- a/multimedia/imagination/pkg/PLIST
+++ b/multimedia/imagination/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/06/29 22:16:18 espie Exp $
 @bin bin/imagination
 lib/imagination/
 lib/imagination/bar_wipe.so
diff --git a/multimedia/kguitar/Makefile b/multimedia/kguitar/Makefile
index 4727cd01560..94596f6541e 100644
--- a/multimedia/kguitar/Makefile
+++ b/multimedia/kguitar/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2020/03/23 18:01:13 rsadowski Exp $
-
 COMMENT =	guitar tab editor
 
 GH_ACCOUNT =	pavelliavonau
diff --git a/multimedia/kguitar/patches/patch-kguitar_global_h b/multimedia/kguitar/patches/patch-kguitar_global_h
index cd51d348149..fd7a93acbf7 100644
--- a/multimedia/kguitar/patches/patch-kguitar_global_h
+++ b/multimedia/kguitar/patches/patch-kguitar_global_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-kguitar_global_h,v 1.1 2017/10/31 21:23:01 rsadowski Exp $
-
 Index: kguitar/global.h
 --- kguitar/global.h.orig
 +++ kguitar/global.h
diff --git a/multimedia/kguitar/patches/patch-kguitar_shell_org_kde_kguitar_desktop b/multimedia/kguitar/patches/patch-kguitar_shell_org_kde_kguitar_desktop
index 8af73c895d0..db2bbce3e2f 100644
--- a/multimedia/kguitar/patches/patch-kguitar_shell_org_kde_kguitar_desktop
+++ b/multimedia/kguitar/patches/patch-kguitar_shell_org_kde_kguitar_desktop
@@ -1,5 +1,3 @@
-$OpenBSD: patch-kguitar_shell_org_kde_kguitar_desktop,v 1.1 2017/10/31 21:23:01 rsadowski Exp $
-
 fix: Could not parse file "org.kde.kguitar.desktop":
 Key file does not have group ?Desktop Entry?
 
diff --git a/multimedia/kguitar/patches/patch-kguitar_songview_cpp b/multimedia/kguitar/patches/patch-kguitar_songview_cpp
index ab2c379db2e..a06cc053942 100644
--- a/multimedia/kguitar/patches/patch-kguitar_songview_cpp
+++ b/multimedia/kguitar/patches/patch-kguitar_songview_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-kguitar_songview_cpp,v 1.1 2020/03/14 14:24:35 rsadowski Exp $
-
 Index: kguitar/songview.cpp
 --- kguitar/songview.cpp.orig
 +++ kguitar/songview.cpp
diff --git a/multimedia/kguitar/patches/patch-kguitar_trackview_cpp b/multimedia/kguitar/patches/patch-kguitar_trackview_cpp
index bf40669a9a1..f68fc486edd 100644
--- a/multimedia/kguitar/patches/patch-kguitar_trackview_cpp
+++ b/multimedia/kguitar/patches/patch-kguitar_trackview_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-kguitar_trackview_cpp,v 1.1 2020/03/14 14:24:35 rsadowski Exp $
-
 Index: kguitar/trackview.cpp
 --- kguitar/trackview.cpp.orig
 +++ kguitar/trackview.cpp
diff --git a/multimedia/kguitar/pkg/PLIST b/multimedia/kguitar/pkg/PLIST
index 321f490d9ec..05ee0c332f4 100644
--- a/multimedia/kguitar/pkg/PLIST
+++ b/multimedia/kguitar/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2020/03/23 18:01:13 rsadowski Exp $
 @bin bin/kguitar
 @so lib/qt5/plugins/libkguitarpart.so
 share/applications/org.kde.kguitar.desktop
diff --git a/multimedia/kid3/Makefile b/multimedia/kid3/Makefile
index 962da115037..838b5a86aa6 100644
--- a/multimedia/kid3/Makefile
+++ b/multimedia/kid3/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2021/11/02 00:01:38 sthen Exp $
-
 COMMENT =	multimedia files tag editor
 DISTNAME =	kid3-3.8.5
 CATEGORIES =	multimedia x11
diff --git a/multimedia/kid3/pkg/PLIST b/multimedia/kid3/pkg/PLIST
index 83dbeb4d649..4fb55651386 100644
--- a/multimedia/kid3/pkg/PLIST
+++ b/multimedia/kid3/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/02/04 20:53:26 rsadowski Exp $
 @bin bin/kid3
 @bin bin/kid3-cli
 @bin bin/kid3-qt
diff --git a/multimedia/lebiniou-data/Makefile b/multimedia/lebiniou-data/Makefile
index 0fa3bb535e8..8d883908965 100644
--- a/multimedia/lebiniou-data/Makefile
+++ b/multimedia/lebiniou-data/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2022/02/09 10:23:23 landry Exp $
-
 COMMENT =	data files for use with lebiniou
 
 PKGNAME =	${DISTNAME:S/-version//}
diff --git a/multimedia/lebiniou-data/pkg/PLIST b/multimedia/lebiniou-data/pkg/PLIST
index 296742637c2..a82ce528aea 100644
--- a/multimedia/lebiniou-data/pkg/PLIST
+++ b/multimedia/lebiniou-data/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2022/02/09 09:57:14 landry Exp $
 share/lebiniou/
 share/lebiniou/colormaps/
 share/lebiniou/colormaps/!pm.gpl
diff --git a/multimedia/lebiniou/Makefile b/multimedia/lebiniou/Makefile
index e2840403307..6143d0b20a4 100644
--- a/multimedia/lebiniou/Makefile
+++ b/multimedia/lebiniou/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2022/02/18 20:51:13 kmos Exp $
-
 COMMENT =	music visualization & VJing tool
 
 PKGNAME =	${DISTNAME:S/-version//}
diff --git a/multimedia/lebiniou/patches/patch-configure_ac b/multimedia/lebiniou/patches/patch-configure_ac
index 055b1f0d4cc..c8d3fb7e59a 100644
--- a/multimedia/lebiniou/patches/patch-configure_ac
+++ b/multimedia/lebiniou/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2022/02/09 09:58:58 landry Exp $
-
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/multimedia/lebiniou/patches/patch-src_Makefile_am b/multimedia/lebiniou/patches/patch-src_Makefile_am
index b5536271cb3..6c208f2381a 100644
--- a/multimedia/lebiniou/patches/patch-src_Makefile_am
+++ b/multimedia/lebiniou/patches/patch-src_Makefile_am
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_Makefile_am,v 1.3 2022/02/18 20:51:13 kmos Exp $
-
 Index: src/Makefile.am
 --- src/Makefile.am.orig
 +++ src/Makefile.am
diff --git a/multimedia/lebiniou/patches/patch-src_bulfius_post_c b/multimedia/lebiniou/patches/patch-src_bulfius_post_c
index a7258d9a084..6599adbad6b 100644
--- a/multimedia/lebiniou/patches/patch-src_bulfius_post_c
+++ b/multimedia/lebiniou/patches/patch-src_bulfius_post_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_bulfius_post_c,v 1.1.1.1 2022/02/09 09:58:58 landry Exp $
 Disable statistic reporting.
 
 Index: src/bulfius_post.c
diff --git a/multimedia/lebiniou/pkg/PLIST b/multimedia/lebiniou/pkg/PLIST
index f1b8999771b..315a3cfb8ed 100644
--- a/multimedia/lebiniou/pkg/PLIST
+++ b/multimedia/lebiniou/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2022/02/09 09:58:58 landry Exp $
 @bin bin/lebiniou
 lib/lebiniou/
 lib/lebiniou/plugins/
diff --git a/multimedia/libaacs/Makefile b/multimedia/libaacs/Makefile
index 01a0eecf39b..4f20d8cde1c 100644
--- a/multimedia/libaacs/Makefile
+++ b/multimedia/libaacs/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.18 2022/02/28 10:53:49 sthen Exp $
-
 COMMENT =		AACS support library for Blu-ray playback
 
 V =			0.11.1
diff --git a/multimedia/libaacs/pkg/PLIST b/multimedia/libaacs/pkg/PLIST
index b5dcd5243a8..2bb360b236c 100644
--- a/multimedia/libaacs/pkg/PLIST
+++ b/multimedia/libaacs/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/12/21 06:18:23 rsadowski Exp $
 @bin bin/aacs_info
 include/libaacs/
 include/libaacs/aacs-version.h
diff --git a/multimedia/libass/Makefile b/multimedia/libass/Makefile
index fab64203d1c..bda4e7357d9 100644
--- a/multimedia/libass/Makefile
+++ b/multimedia/libass/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.27 2021/10/04 05:46:11 rsadowski Exp $
-
 COMMENT=	portable ASS/SSA subtitle renderer
 
 VER=		0.15.2
diff --git a/multimedia/libass/patches/patch-libass_Makefile_in b/multimedia/libass/patches/patch-libass_Makefile_in
index 4b4e1efe3a1..08a4361ea96 100644
--- a/multimedia/libass/patches/patch-libass_Makefile_in
+++ b/multimedia/libass/patches/patch-libass_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libass_Makefile_in,v 1.2 2021/10/04 05:46:11 rsadowski Exp $
-
 Use a libtool-wrapper script for NASM.
 
 Libtool thinks NASM acts just like the C-compiler, which isn't true
diff --git a/multimedia/libass/patches/patch-ltnasm_sh b/multimedia/libass/patches/patch-ltnasm_sh
index 9bada307038..cc88d426431 100644
--- a/multimedia/libass/patches/patch-ltnasm_sh
+++ b/multimedia/libass/patches/patch-ltnasm_sh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ltnasm_sh,v 1.2 2021/10/04 05:46:11 rsadowski Exp $
-
 Use a libtool-wrapper script for NASM.
 
 Libtool thinks NASM acts just like the C-compiler, which isn't true
diff --git a/multimedia/libass/pkg/PLIST b/multimedia/libass/pkg/PLIST
index b0794f7fff1..bdb015e4d6b 100644
--- a/multimedia/libass/pkg/PLIST
+++ b/multimedia/libass/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/12/14 15:56:36 rsadowski Exp $
 include/ass/
 include/ass/ass.h
 include/ass/ass_types.h
diff --git a/multimedia/libbdplus/Makefile b/multimedia/libbdplus/Makefile
index 94d911dd512..8d97025eada 100644
--- a/multimedia/libbdplus/Makefile
+++ b/multimedia/libbdplus/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.4 2019/07/14 00:39:38 naddy Exp $
-
 COMMENT =		BD+ support library for Blu-ray playback
 
 V =			0.1.2
diff --git a/multimedia/libbdplus/patches/patch-src_examples_convtab_dump_c b/multimedia/libbdplus/patches/patch-src_examples_convtab_dump_c
index 713b9e1220c..7ae404a814f 100644
--- a/multimedia/libbdplus/patches/patch-src_examples_convtab_dump_c
+++ b/multimedia/libbdplus/patches/patch-src_examples_convtab_dump_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_examples_convtab_dump_c,v 1.1.1.1 2015/06/15 07:15:29 ajacoutot Exp $
-
 convtab_dump.c:32: error: 'index' redeclared as different kind of symbol
 
 --- src/examples/convtab_dump.c.orig	Mon Jun 15 00:37:26 2015
diff --git a/multimedia/libbdplus/pkg/PLIST b/multimedia/libbdplus/pkg/PLIST
index a8dd2b24a52..ab74bd94edf 100644
--- a/multimedia/libbdplus/pkg/PLIST
+++ b/multimedia/libbdplus/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/15 07:15:29 ajacoutot Exp $
 include/libbdplus/
 include/libbdplus/bdplus-version.h
 include/libbdplus/bdplus.h
diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index 6770fd2c776..8f1861c41b0 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2022/02/27 12:43:24 sthen Exp $
-
 COMMENT =		library supporting Blu-ray playback
 
 V =			1.3.0
diff --git a/multimedia/libbluray/patches/patch-Makefile_am b/multimedia/libbluray/patches/patch-Makefile_am
index ed5000264e4..9e3f61eff60 100644
--- a/multimedia/libbluray/patches/patch-Makefile_am
+++ b/multimedia/libbluray/patches/patch-Makefile_am
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile_am,v 1.1 2020/12/14 16:06:00 rsadowski Exp $
-
 - Allow libbluray to be able to find mount points using the getfsstat() API.
 - Remove setting _POSIX_C_SOURCE as that breaks building some of the BSD headers
   due to BSD types.
diff --git a/multimedia/libbluray/patches/patch-jni_jni_h b/multimedia/libbluray/patches/patch-jni_jni_h
index d2cdb6a739f..ff05e722168 100644
--- a/multimedia/libbluray/patches/patch-jni_jni_h
+++ b/multimedia/libbluray/patches/patch-jni_jni_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-jni_jni_h,v 1.1 2019/11/24 17:59:04 bcallah Exp $
-
 Point to a real file
 
 Index: jni/jni.h
diff --git a/multimedia/libbluray/patches/patch-src_file_dl_posix_c b/multimedia/libbluray/patches/patch-src_file_dl_posix_c
index db08d64b9ce..e3a95ccc2b0 100644
--- a/multimedia/libbluray/patches/patch-src_file_dl_posix_c
+++ b/multimedia/libbluray/patches/patch-src_file_dl_posix_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_file_dl_posix_c,v 1.2 2021/10/16 17:57:34 rsadowski Exp $
-
 Fix loading dlopen'd libraries on OpenBSD.
 7bc73fd5cbd567ba128eec1f061323bed7a9c5d7
 
diff --git a/multimedia/libbluray/patches/patch-src_file_mount_getfsstat_c b/multimedia/libbluray/patches/patch-src_file_mount_getfsstat_c
index 58901a00ebb..8d3e316d033 100644
--- a/multimedia/libbluray/patches/patch-src_file_mount_getfsstat_c
+++ b/multimedia/libbluray/patches/patch-src_file_mount_getfsstat_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_file_mount_getfsstat_c,v 1.1 2020/12/14 16:06:00 rsadowski Exp $
-
 Re-add the old Darwin code which utilized getfsstat().
 
 Index: src/file/mount_getfsstat.c
diff --git a/multimedia/libbluray/patches/patch-src_libbluray_bluray_c b/multimedia/libbluray/patches/patch-src_libbluray_bluray_c
index 85ab8d65981..151c3d6e0d3 100644
--- a/multimedia/libbluray/patches/patch-src_libbluray_bluray_c
+++ b/multimedia/libbluray/patches/patch-src_libbluray_bluray_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_libbluray_bluray_c,v 1.1 2022/02/27 12:43:24 sthen Exp $
-
 - Fix dec_start() without menus
   8412dc1ee24b186a161902de1dd9f15f712041f5
 - Drop "WARNING: BluRay profile 6 BD-J menu support is experimental"
diff --git a/multimedia/libbluray/patches/patch-src_libbluray_disc_bdplus_c b/multimedia/libbluray/patches/patch-src_libbluray_disc_bdplus_c
index 42649680381..eb917561e2b 100644
--- a/multimedia/libbluray/patches/patch-src_libbluray_disc_bdplus_c
+++ b/multimedia/libbluray/patches/patch-src_libbluray_disc_bdplus_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_libbluray_disc_bdplus_c,v 1.1 2022/02/27 12:43:24 sthen Exp $
-
 Fix dec_start() without menus
 8412dc1ee24b186a161902de1dd9f15f712041f5
 
diff --git a/multimedia/libbluray/patches/patch-src_libbluray_disc_dec_c b/multimedia/libbluray/patches/patch-src_libbluray_disc_dec_c
index a55bbc6e470..ffcd180ed48 100644
--- a/multimedia/libbluray/patches/patch-src_libbluray_disc_dec_c
+++ b/multimedia/libbluray/patches/patch-src_libbluray_disc_dec_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_libbluray_disc_dec_c,v 1.1 2022/02/27 12:43:24 sthen Exp $
-
 Fix dec_start() without menus
 8412dc1ee24b186a161902de1dd9f15f712041f5
 
diff --git a/multimedia/libbluray/pkg/PLIST b/multimedia/libbluray/pkg/PLIST
index 529e1f367ae..8c481abdc97 100644
--- a/multimedia/libbluray/pkg/PLIST
+++ b/multimedia/libbluray/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2020/12/14 16:06:00 rsadowski Exp $
 @bin bin/bd_info
 @bin bin/bd_list_titles
 @bin bin/bd_splice
diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile
index 5fb4ac70af9..7b1db317728 100644
--- a/multimedia/libde265/Makefile
+++ b/multimedia/libde265/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2020/12/14 15:59:33 rsadowski Exp $
-
 COMMENT-main=	open H.265 video codec implementation
 COMMENT-tools=	tools for libde265 open H.265 video codec
 
diff --git a/multimedia/libde265/patches/patch-acceleration-speed_Makefile_in b/multimedia/libde265/patches/patch-acceleration-speed_Makefile_in
index 70bd11faef5..4319b1b4c4f 100644
--- a/multimedia/libde265/patches/patch-acceleration-speed_Makefile_in
+++ b/multimedia/libde265/patches/patch-acceleration-speed_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-acceleration-speed_Makefile_in,v 1.1 2020/02/26 22:46:03 sthen Exp $
-
 Index: acceleration-speed/Makefile.in
 --- acceleration-speed/Makefile.in.orig
 +++ acceleration-speed/Makefile.in
diff --git a/multimedia/libde265/patches/patch-dec265_Makefile_in b/multimedia/libde265/patches/patch-dec265_Makefile_in
index dce7a03558b..edd6b32c2d0 100644
--- a/multimedia/libde265/patches/patch-dec265_Makefile_in
+++ b/multimedia/libde265/patches/patch-dec265_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-dec265_Makefile_in,v 1.1 2020/02/26 22:46:03 sthen Exp $
-
 Index: dec265/Makefile.in
 --- dec265/Makefile.in.orig
 +++ dec265/Makefile.in
diff --git a/multimedia/libde265/patches/patch-enc265_Makefile_in b/multimedia/libde265/patches/patch-enc265_Makefile_in
index b74df935915..c281e854e41 100644
--- a/multimedia/libde265/patches/patch-enc265_Makefile_in
+++ b/multimedia/libde265/patches/patch-enc265_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-enc265_Makefile_in,v 1.1 2020/02/26 22:46:03 sthen Exp $
-
 Index: enc265/Makefile.in
 --- enc265/Makefile.in.orig
 +++ enc265/Makefile.in
diff --git a/multimedia/libde265/patches/patch-libde265_pc_in b/multimedia/libde265/patches/patch-libde265_pc_in
index 9f4bb7f655e..bc264cafb93 100644
--- a/multimedia/libde265/patches/patch-libde265_pc_in
+++ b/multimedia/libde265/patches/patch-libde265_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libde265_pc_in,v 1.1 2020/02/26 22:46:03 sthen Exp $
-
 Index: libde265.pc.in
 --- libde265.pc.in.orig
 +++ libde265.pc.in
diff --git a/multimedia/libde265/patches/patch-sherlock265_Makefile_in b/multimedia/libde265/patches/patch-sherlock265_Makefile_in
index 5f7d131a185..a5e723f8e9b 100644
--- a/multimedia/libde265/patches/patch-sherlock265_Makefile_in
+++ b/multimedia/libde265/patches/patch-sherlock265_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-sherlock265_Makefile_in,v 1.1 2020/02/26 22:46:03 sthen Exp $
-
 Index: sherlock265/Makefile.in
 --- sherlock265/Makefile.in.orig
 +++ sherlock265/Makefile.in
diff --git a/multimedia/libde265/patches/patch-tools_Makefile_in b/multimedia/libde265/patches/patch-tools_Makefile_in
index b9c4ba7ccc1..06b879acb16 100644
--- a/multimedia/libde265/patches/patch-tools_Makefile_in
+++ b/multimedia/libde265/patches/patch-tools_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.1 2020/02/26 22:46:03 sthen Exp $
-
 Index: tools/Makefile.in
 --- tools/Makefile.in.orig
 +++ tools/Makefile.in
diff --git a/multimedia/libde265/pkg/PLIST-main b/multimedia/libde265/pkg/PLIST-main
index 0b3120e0616..32e42c6a2f2 100644
--- a/multimedia/libde265/pkg/PLIST-main
+++ b/multimedia/libde265/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2020/02/25 13:15:45 sthen Exp $
 @pkgpath multimedia/libde265
 include/libde265/
 include/libde265/de265-version.h
diff --git a/multimedia/libde265/pkg/PLIST-tools b/multimedia/libde265/pkg/PLIST-tools
index 4dcbb7f9c29..aecc166ab72 100644
--- a/multimedia/libde265/pkg/PLIST-tools
+++ b/multimedia/libde265/pkg/PLIST-tools
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-tools,v 1.1 2020/02/25 13:15:45 sthen Exp $
 @conflict libde265-1.0.5
 @bin bin/acceleration_speed
 @bin bin/bjoentegaard
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 8b47f549a34..10390fad1bb 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.25 2019/07/12 20:47:56 sthen Exp $
-
 COMMENT=		Quasar DV codec
 
 DISTNAME=		libdv-1.0.0
diff --git a/multimedia/libdv/patches/patch-encodedv_dvconnect_c b/multimedia/libdv/patches/patch-encodedv_dvconnect_c
index 4e6926862ba..5c337ce4f63 100644
--- a/multimedia/libdv/patches/patch-encodedv_dvconnect_c
+++ b/multimedia/libdv/patches/patch-encodedv_dvconnect_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-encodedv_dvconnect_c,v 1.3 2012/03/30 06:09:54 ajacoutot Exp $
 --- encodedv/dvconnect.c.orig	Sat Mar 24 10:10:08 2012
 +++ encodedv/dvconnect.c	Sat Mar 24 10:13:34 2012
 @@ -857,7 +857,7 @@ int send_raw(const char*const* filenames, int channel,
diff --git a/multimedia/libdv/pkg/PLIST b/multimedia/libdv/pkg/PLIST
index d1fcd7e812f..8ce9c4ba63c 100644
--- a/multimedia/libdv/pkg/PLIST
+++ b/multimedia/libdv/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:51 naddy Exp $
 @bin bin/dubdv
 @comment bin/dvconnect
 @bin bin/encodedv
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 06b9985a1bf..796fe06d1e8 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.30 2021/10/11 06:11:31 rsadowski Exp $
-
 COMMENT=	DVD navigation library
 
 VER=		6.1.1
diff --git a/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in b/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
index fb87ac782b9..fed92dba949 100644
--- a/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
+++ b/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-misc_dvdnav_pc_in,v 1.5 2020/12/15 18:57:43 rsadowski Exp $
-
 Index: misc/dvdnav.pc.in
 --- misc/dvdnav.pc.in.orig
 +++ misc/dvdnav.pc.in
diff --git a/multimedia/libdvdnav/pkg/PLIST b/multimedia/libdvdnav/pkg/PLIST
index 22391ab5e67..b653e24fb57 100644
--- a/multimedia/libdvdnav/pkg/PLIST
+++ b/multimedia/libdvdnav/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2020/12/15 18:57:43 rsadowski Exp $
 include/dvdnav/
 include/dvdnav/dvd_types.h
 include/dvdnav/dvdnav.h
diff --git a/multimedia/libheif/Makefile b/multimedia/libheif/Makefile
index 234dc566ace..2568d5e118f 100644
--- a/multimedia/libheif/Makefile
+++ b/multimedia/libheif/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2021/08/20 21:24:48 sthen Exp $
-
 COMMENT=	HEIF and AVIF file format decoder and encoder
 
 V=		1.12.0
diff --git a/multimedia/libheif/pkg/PLIST b/multimedia/libheif/pkg/PLIST
index cb5a29d7900..71f490a3b76 100644
--- a/multimedia/libheif/pkg/PLIST
+++ b/multimedia/libheif/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/12/21 06:21:35 rsadowski Exp $
 @bin bin/heif-convert
 @bin bin/heif-enc
 @bin bin/heif-info
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index ea11fc49f61..a6e3e09d8b8 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.31 2021/02/20 06:34:33 rsadowski Exp $
-
 COMMENT=	extensible open standard audio/video container library
 
 DISTNAME=	libmatroska-1.6.3
diff --git a/multimedia/libmatroska/patches/patch-CMakeLists_txt b/multimedia/libmatroska/patches/patch-CMakeLists_txt
index 3837b4091e3..764e4a24765 100644
--- a/multimedia/libmatroska/patches/patch-CMakeLists_txt
+++ b/multimedia/libmatroska/patches/patch-CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.4 2021/02/20 06:34:33 rsadowski Exp $
-
 Add options for building and installing shared, static libraries
 
 Index: CMakeLists.txt
diff --git a/multimedia/libmatroska/pkg/PLIST b/multimedia/libmatroska/pkg/PLIST
index 01557b1508a..d49558fcc71 100644
--- a/multimedia/libmatroska/pkg/PLIST
+++ b/multimedia/libmatroska/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2020/12/02 06:44:07 rsadowski Exp $
 include/matroska/
 include/matroska/FileKax.h
 include/matroska/KaxAttached.h
diff --git a/multimedia/libmms/Makefile b/multimedia/libmms/Makefile
index 81d1d9bd951..86775bdf270 100644
--- a/multimedia/libmms/Makefile
+++ b/multimedia/libmms/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/12 20:47:56 sthen Exp $
-
 COMMENT =	library for parsing mms:// and mmsh:// type network streams
 
 DISTNAME =	libmms-0.6.2
diff --git a/multimedia/libmms/patches/patch-src_mms-common_h b/multimedia/libmms/patches/patch-src_mms-common_h
index 727e061d2ba..64f1f3a813c 100644
--- a/multimedia/libmms/patches/patch-src_mms-common_h
+++ b/multimedia/libmms/patches/patch-src_mms-common_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_mms-common_h,v 1.1 2011/11/24 10:45:36 ajacoutot Exp $
 --- src/mms-common.h.orig	Fri Oct 28 01:40:30 2011
 +++ src/mms-common.h	Fri Oct 28 01:41:45 2011
 @@ -38,16 +38,17 @@
diff --git a/multimedia/libmms/patches/patch-src_mmsh_c b/multimedia/libmms/patches/patch-src_mmsh_c
index 36197e5601b..83d97ad88bf 100644
--- a/multimedia/libmms/patches/patch-src_mmsh_c
+++ b/multimedia/libmms/patches/patch-src_mmsh_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mmsh_c,v 1.1 2014/05/22 11:53:36 jasper Exp $
-
 Security fix for CVE-2014-2892, heap-based buffer overflow
 http://sourceforge.net/p/libmms/code/ci/03bcfccc22919c72742b7338d02859962861e0e8
 
diff --git a/multimedia/libmms/pkg/PLIST b/multimedia/libmms/pkg/PLIST
index e11829cf09b..551e9eaa60e 100644
--- a/multimedia/libmms/pkg/PLIST
+++ b/multimedia/libmms/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:51 naddy Exp $
 include/libmms/
 include/libmms/mms.h
 include/libmms/mms_config.h
diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile
index 8cb88067354..eb6e4d6c9c1 100644
--- a/multimedia/libmp4v2/Makefile
+++ b/multimedia/libmp4v2/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.22 2020/01/26 11:14:32 jasper Exp $
-
 COMMENT =		read and manipulate the MP4 container format
 
 DISTNAME =		mp4v2-1.9.1
diff --git a/multimedia/libmp4v2/patches/patch-src_bmff_typebmff_cpp b/multimedia/libmp4v2/patches/patch-src_bmff_typebmff_cpp
index a6bbcbcabb0..91dd84c61ee 100644
--- a/multimedia/libmp4v2/patches/patch-src_bmff_typebmff_cpp
+++ b/multimedia/libmp4v2/patches/patch-src_bmff_typebmff_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_bmff_typebmff_cpp,v 1.1 2017/05/18 13:41:33 espie Exp $
 namespace correctness, stolen from git commit e065581
 
 Index: src/bmff/typebmff.cpp
diff --git a/multimedia/libmp4v2/patches/patch-src_itmf_type_cpp b/multimedia/libmp4v2/patches/patch-src_itmf_type_cpp
index 457827e571b..d953d19e740 100644
--- a/multimedia/libmp4v2/patches/patch-src_itmf_type_cpp
+++ b/multimedia/libmp4v2/patches/patch-src_itmf_type_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_itmf_type_cpp,v 1.1 2017/05/18 13:41:33 espie Exp $
 namespace correctness, stolen from git commit e065581
 
 Index: src/itmf/type.cpp
diff --git a/multimedia/libmp4v2/pkg/PLIST b/multimedia/libmp4v2/pkg/PLIST
index 4bfc87c0740..3b87a7f2bac 100644
--- a/multimedia/libmp4v2/pkg/PLIST
+++ b/multimedia/libmp4v2/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:51 naddy Exp $
 @conflict faad-<2.6.1
 @bin bin/mp4art
 @bin bin/mp4chaps
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 851c0b279fc..07d85930e97 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.63 2020/03/20 16:44:25 naddy Exp $
-
 COMMENT=	library for reading and writing QuickTime files
 
 DISTNAME=	libquicktime-1.2.4
diff --git a/multimedia/libquicktime/patches/patch-configure b/multimedia/libquicktime/patches/patch-configure
index 455742b65d5..19e5b893eea 100644
--- a/multimedia/libquicktime/patches/patch-configure
+++ b/multimedia/libquicktime/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.13 2012/04/22 12:12:30 jasper Exp $
 --- configure.orig	Thu Mar 29 15:45:15 2012
 +++ configure	Mon Apr  2 19:49:37 2012
 @@ -14951,7 +14951,7 @@ fi
diff --git a/multimedia/libquicktime/patches/patch-include_lqt_funcprotos_h b/multimedia/libquicktime/patches/patch-include_lqt_funcprotos_h
index 91854544956..550fbd0873b 100644
--- a/multimedia/libquicktime/patches/patch-include_lqt_funcprotos_h
+++ b/multimedia/libquicktime/patches/patch-include_lqt_funcprotos_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-include_lqt_funcprotos_h,v 1.1 2019/02/08 10:57:01 sthen Exp $
-
 CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126,
 CVE-2017-9127, CVE-2017-9128
 
diff --git a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_audio_c b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_audio_c
index 1623a0455ea..fd982a256d2 100644
--- a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_audio_c
+++ b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_audio_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-plugins_ffmpeg_audio_c,v 1.2 2019/02/09 19:31:43 kn Exp $
-
 Deal with newer FFmpeg API.
 
 Index: plugins/ffmpeg/audio.c
diff --git a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_lqt_ffmpeg_c b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_lqt_ffmpeg_c
index f79c4c12c23..ef45bb28fbd 100644
--- a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_lqt_ffmpeg_c
+++ b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_lqt_ffmpeg_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-plugins_ffmpeg_lqt_ffmpeg_c,v 1.1 2019/02/09 19:31:43 kn Exp $
-
 Deal with newer FFmpeg API.
 
 Index: plugins/ffmpeg/lqt_ffmpeg.c
diff --git a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_c b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_c
index 7d5ee285ad5..9ac0df1dfb8 100644
--- a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_c
+++ b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-plugins_ffmpeg_params_c,v 1.4 2019/02/09 19:31:43 kn Exp $
-
 Deal with newer FFmpeg API.
 
 Index: plugins/ffmpeg/params.c
diff --git a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_h b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_h
index 8056a8939b5..ad9f873d392 100644
--- a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_h
+++ b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-plugins_ffmpeg_params_h,v 1.1 2019/02/09 19:31:43 kn Exp $
-
 Deal with newer FFmpeg API.
 
 Index: plugins/ffmpeg/params.h
diff --git a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_video_c b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_video_c
index f63eb28ce61..c4718e78ebf 100644
--- a/multimedia/libquicktime/patches/patch-plugins_ffmpeg_video_c
+++ b/multimedia/libquicktime/patches/patch-plugins_ffmpeg_video_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-plugins_ffmpeg_video_c,v 1.4 2019/02/09 19:31:43 kn Exp $
-
 Deal with newer FFmpeg API.
 
 Index: plugins/ffmpeg/video.c
diff --git a/multimedia/libquicktime/patches/patch-src_atom_c b/multimedia/libquicktime/patches/patch-src_atom_c
index 5258cc8a342..dc55e773302 100644
--- a/multimedia/libquicktime/patches/patch-src_atom_c
+++ b/multimedia/libquicktime/patches/patch-src_atom_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_atom_c,v 1.1 2019/02/08 10:57:01 sthen Exp $
-
 CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126,
 CVE-2017-9127, CVE-2017-9128
 
diff --git a/multimedia/libquicktime/patches/patch-src_lqt_quicktime_c b/multimedia/libquicktime/patches/patch-src_lqt_quicktime_c
index 32fa22c2259..06a35408a93 100644
--- a/multimedia/libquicktime/patches/patch-src_lqt_quicktime_c
+++ b/multimedia/libquicktime/patches/patch-src_lqt_quicktime_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_lqt_quicktime_c,v 1.1 2019/02/08 10:57:01 sthen Exp $
-
 CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126,
 CVE-2017-9127, CVE-2017-9128
 
diff --git a/multimedia/libquicktime/patches/patch-src_moov_c b/multimedia/libquicktime/patches/patch-src_moov_c
index c8912fb9680..475c55b76ec 100644
--- a/multimedia/libquicktime/patches/patch-src_moov_c
+++ b/multimedia/libquicktime/patches/patch-src_moov_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_moov_c,v 1.1 2019/02/08 10:57:01 sthen Exp $
-
 CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126,
 CVE-2017-9127, CVE-2017-9128
 
diff --git a/multimedia/libquicktime/patches/patch-src_trak_c b/multimedia/libquicktime/patches/patch-src_trak_c
index e7dc6974173..a9708f525ca 100644
--- a/multimedia/libquicktime/patches/patch-src_trak_c
+++ b/multimedia/libquicktime/patches/patch-src_trak_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_trak_c,v 1.1 2019/02/08 10:57:01 sthen Exp $
-
 CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126,
 CVE-2017-9127, CVE-2017-9128
 
diff --git a/multimedia/libquicktime/patches/patch-src_util_c b/multimedia/libquicktime/patches/patch-src_util_c
index d01f8eae026..976547ed18e 100644
--- a/multimedia/libquicktime/patches/patch-src_util_c
+++ b/multimedia/libquicktime/patches/patch-src_util_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_util_c,v 1.1 2019/02/08 10:57:01 sthen Exp $
-
 - Integer overflow in the quicktime_read_pascal function
   CVE-2016-2399
 - CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126,
diff --git a/multimedia/libquicktime/pkg/PLIST b/multimedia/libquicktime/pkg/PLIST
index 9d3dfd51bfd..fa2902ad476 100644
--- a/multimedia/libquicktime/pkg/PLIST
+++ b/multimedia/libquicktime/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.16 2017/01/31 09:55:05 sthen Exp $
 @bin bin/libquicktime_config
 @bin bin/lqt_transcode
 @bin bin/lqtplay
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 7aac8deea64..74dcd189946 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.26 2019/08/19 06:04:22 ajacoutot Exp $
-
 COMMENT=	open video codec
 
 # e5d205b from github, plus generated configure scripts
diff --git a/multimedia/libtheora/patches/patch-configure_ac b/multimedia/libtheora/patches/patch-configure_ac
index d4fef289071..be658b3b2da 100644
--- a/multimedia/libtheora/patches/patch-configure_ac
+++ b/multimedia/libtheora/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.2 2019/06/13 21:58:12 sthen Exp $
-
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/multimedia/libtheora/patches/patch-theora_pc_in b/multimedia/libtheora/patches/patch-theora_pc_in
index 458329aa7ec..76dd3bb25ec 100644
--- a/multimedia/libtheora/patches/patch-theora_pc_in
+++ b/multimedia/libtheora/patches/patch-theora_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-theora_pc_in,v 1.2 2019/06/13 21:58:12 sthen Exp $
-
 Correct pkg-config file for overlinking.
 
 Index: theora.pc.in
diff --git a/multimedia/libtheora/patches/patch-theoradec_pc_in b/multimedia/libtheora/patches/patch-theoradec_pc_in
index 0f081c8bab9..49d2b234308 100644
--- a/multimedia/libtheora/patches/patch-theoradec_pc_in
+++ b/multimedia/libtheora/patches/patch-theoradec_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-theoradec_pc_in,v 1.2 2019/06/13 21:58:12 sthen Exp $
-
 Correct pkg-config file for overlinking.
 
 Index: theoradec.pc.in
diff --git a/multimedia/libtheora/patches/patch-theoraenc_pc_in b/multimedia/libtheora/patches/patch-theoraenc_pc_in
index 5344b03bc9a..9bf794399a4 100644
--- a/multimedia/libtheora/patches/patch-theoraenc_pc_in
+++ b/multimedia/libtheora/patches/patch-theoraenc_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-theoraenc_pc_in,v 1.2 2019/06/13 21:58:12 sthen Exp $
-
 Correct pkg-config file for overlinking.
 
 Index: theoraenc.pc.in
diff --git a/multimedia/libtheora/pkg/PLIST b/multimedia/libtheora/pkg/PLIST
index 5298d3003ff..48d9e20d5b2 100644
--- a/multimedia/libtheora/pkg/PLIST
+++ b/multimedia/libtheora/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:51 naddy Exp $
 include/theora/
 include/theora/codec.h
 include/theora/theora.h
diff --git a/multimedia/libtheorafile/Makefile b/multimedia/libtheorafile/Makefile
index 327b385f2bd..0a887c93c6e 100644
--- a/multimedia/libtheorafile/Makefile
+++ b/multimedia/libtheorafile/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2021/11/22 20:53:22 thfr Exp $
-
 COMMENT =	Ogg Theora Video Decoder Library
 
 # stable release binary packages are only available as part of FNA
diff --git a/multimedia/libtheorafile/patches/patch-Makefile b/multimedia/libtheorafile/patches/patch-Makefile
index 6da47c83f74..63dec4e97da 100644
--- a/multimedia/libtheorafile/patches/patch-Makefile
+++ b/multimedia/libtheorafile/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.3 2021/11/22 20:53:22 thfr Exp $
-
 add ${LOCALBASE}/lib to linker path
 add local include path
 add -o to create binary 'theorafile-test' rather than 'a.out'
diff --git a/multimedia/libtheorafile/pkg/PLIST b/multimedia/libtheorafile/pkg/PLIST
index 52f73dd689f..49287dcdddb 100644
--- a/multimedia/libtheorafile/pkg/PLIST
+++ b/multimedia/libtheorafile/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/02/22 07:54:51 bentley Exp $
 include/theorafile.h
 @lib lib/libtheorafile.so.${LIBtheorafile_VERSION}
diff --git a/multimedia/libtheoraplay/Makefile b/multimedia/libtheoraplay/Makefile
index e5c1e3dd7f5..8843546b4a0 100644
--- a/multimedia/libtheoraplay/Makefile
+++ b/multimedia/libtheoraplay/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2020/08/13 21:18:45 naddy Exp $
-
 COMMENT =	simple library to make decoding of Ogg Theora videos easier
 
 # HG_CHANGESET and HG_COMMIT must be kept in sync.
diff --git a/multimedia/libtheoraplay/pkg/PLIST b/multimedia/libtheoraplay/pkg/PLIST
index 5b063530fd8..1625901cca9 100644
--- a/multimedia/libtheoraplay/pkg/PLIST
+++ b/multimedia/libtheoraplay/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/02/22 07:56:11 bentley Exp $
 include/theoraplay.h
 include/theoraplay_cvtrgb.h
 @lib lib/libtheoraplay.so.${LIBtheoraplay_VERSION}
diff --git a/multimedia/libudfread/Makefile b/multimedia/libudfread/Makefile
index 9e914a94f4c..43c053da5c7 100644
--- a/multimedia/libudfread/Makefile
+++ b/multimedia/libudfread/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/10/18 04:12:14 rsadowski Exp $
-
 COMMENT=	library for reading UDF from raw devices and image files
 
 DISTNAME=	libudfread-1.1.2
diff --git a/multimedia/libudfread/pkg/PLIST b/multimedia/libudfread/pkg/PLIST
index 6a96e013d09..87b902fb592 100644
--- a/multimedia/libudfread/pkg/PLIST
+++ b/multimedia/libudfread/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/10/18 04:12:14 rsadowski Exp $
 include/udfread/
 include/udfread/blockinput.h
 include/udfread/udfread-version.h
diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile
index 2c23172d6fd..66dbb702d53 100644
--- a/multimedia/libv4l/Makefile
+++ b/multimedia/libv4l/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.27 2021/12/15 15:37:26 kn Exp $
-
 COMMENT =		libv4l userspace library
 
 VERSION =		1.20.0
diff --git a/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in b/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in
index 8420211f60d..b0e8a909924 100644
--- a/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in
+++ b/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_libv4lconvert_Makefile_in,v 1.9 2020/05/26 09:54:56 feinerer Exp $
-
 OpenBSD does not have an rt library.
 
 Index: lib/libv4lconvert/Makefile.in
diff --git a/multimedia/libv4l/patches/patch-lib_libv4lconvert_libv4lconvert_pc_in b/multimedia/libv4l/patches/patch-lib_libv4lconvert_libv4lconvert_pc_in
index 5d7a298401f..f12fd498374 100644
--- a/multimedia/libv4l/patches/patch-lib_libv4lconvert_libv4lconvert_pc_in
+++ b/multimedia/libv4l/patches/patch-lib_libv4lconvert_libv4lconvert_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lib_libv4lconvert_libv4lconvert_pc_in,v 1.1 2016/01/23 14:03:11 feinerer Exp $
-
 OpenBSD does not have an rt library.
 
 --- lib/libv4lconvert/libv4lconvert.pc.in.orig	Sat Jan 23 04:40:50 2016
diff --git a/multimedia/libv4l/pkg/PLIST b/multimedia/libv4l/pkg/PLIST
index dd505ff6c18..5e204ee431d 100644
--- a/multimedia/libv4l/pkg/PLIST
+++ b/multimedia/libv4l/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2020/05/15 09:55:55 feinerer Exp $
 include/libv4l-plugin.h
 include/libv4l1-videodev.h
 include/libv4l1.h
diff --git a/multimedia/libvidstab/Makefile b/multimedia/libvidstab/Makefile
index 2cf353c581c..46f35a64313 100644
--- a/multimedia/libvidstab/Makefile
+++ b/multimedia/libvidstab/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/07/25 13:29:37 espie Exp $
-
 COMMENT =	video stabilization library
 
 V = 		1.1.0
diff --git a/multimedia/libvidstab/patches/patch-CMakeLists_txt b/multimedia/libvidstab/patches/patch-CMakeLists_txt
index 46ab7f23536..4f7398db7e6 100644
--- a/multimedia/libvidstab/patches/patch-CMakeLists_txt
+++ b/multimedia/libvidstab/patches/patch-CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2021/07/25 13:29:37 espie Exp $
-
 Remove hardcoded compilation flags
 
 Index: CMakeLists.txt
diff --git a/multimedia/libvidstab/patches/patch-src_serialize_c b/multimedia/libvidstab/patches/patch-src_serialize_c
index f7f04ca74fc..0dd8b2bdc20 100644
--- a/multimedia/libvidstab/patches/patch-src_serialize_c
+++ b/multimedia/libvidstab/patches/patch-src_serialize_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_serialize_c,v 1.1.1.1 2021/07/25 13:29:37 espie Exp $
-
 Fix infinite loops on archs where char is unsigned by default (arm* and powerpc),
 because EOF cannot be reached with an unsigned char there.
 
diff --git a/multimedia/libvidstab/pkg/PLIST b/multimedia/libvidstab/pkg/PLIST
index 42e9c72e1c6..65322d52fc5 100644
--- a/multimedia/libvidstab/pkg/PLIST
+++ b/multimedia/libvidstab/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/07/25 13:29:37 espie Exp $
 include/vid.stab/
 include/vid.stab/boxblur.h
 include/vid.stab/frameinfo.h
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 312f30cbe03..5bc66e76ca2 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.46 2021/10/16 07:53:10 rsadowski Exp $
-
 COMMENT=	Google VP8/VP9 video codec
 
 GH_ACCOUNT=	webmproject
diff --git a/multimedia/libvpx/patches/patch-build_make_Makefile b/multimedia/libvpx/patches/patch-build_make_Makefile
index 11ba206a7ed..ae59b194317 100644
--- a/multimedia/libvpx/patches/patch-build_make_Makefile
+++ b/multimedia/libvpx/patches/patch-build_make_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-build_make_Makefile,v 1.15 2021/04/29 04:07:21 rsadowski Exp $
-
 Index: build/make/Makefile
 --- build/make/Makefile.orig
 +++ build/make/Makefile
diff --git a/multimedia/libvpx/patches/patch-configure b/multimedia/libvpx/patches/patch-configure
index bfddd07221a..94be9d51d50 100644
--- a/multimedia/libvpx/patches/patch-configure
+++ b/multimedia/libvpx/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.22 2021/04/29 04:07:21 rsadowski Exp $
-
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/multimedia/libvpx/patches/patch-examples_mk b/multimedia/libvpx/patches/patch-examples_mk
index 13710bd1f1c..43114bbc561 100644
--- a/multimedia/libvpx/patches/patch-examples_mk
+++ b/multimedia/libvpx/patches/patch-examples_mk
@@ -1,5 +1,3 @@
-$OpenBSD: patch-examples_mk,v 1.10 2020/10/03 13:19:37 sthen Exp $
-
 Index: examples.mk
 --- examples.mk.orig
 +++ examples.mk
diff --git a/multimedia/libvpx/patches/patch-libs_mk b/multimedia/libvpx/patches/patch-libs_mk
index 44bf168b726..298a9853422 100644
--- a/multimedia/libvpx/patches/patch-libs_mk
+++ b/multimedia/libvpx/patches/patch-libs_mk
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libs_mk,v 1.20 2021/04/29 04:07:21 rsadowski Exp $
-
 Index: libs.mk
 --- libs.mk.orig
 +++ libs.mk
diff --git a/multimedia/libvpx/patches/patch-vpx_ports_arm_cpudetect_c b/multimedia/libvpx/patches/patch-vpx_ports_arm_cpudetect_c
index a4e285fd141..8824cabf28f 100644
--- a/multimedia/libvpx/patches/patch-vpx_ports_arm_cpudetect_c
+++ b/multimedia/libvpx/patches/patch-vpx_ports_arm_cpudetect_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-vpx_ports_arm_cpudetect_c,v 1.2 2019/09/15 16:03:31 ajacoutot Exp $
-
 Allow ARM CPU runtime detection code to build on OpenBSD.
 
 Index: vpx_ports/arm_cpudetect.c
diff --git a/multimedia/libvpx/patches/patch-vpx_ports_ppc_cpudetect_c b/multimedia/libvpx/patches/patch-vpx_ports_ppc_cpudetect_c
index dd8d378e8a0..7dc4b381346 100644
--- a/multimedia/libvpx/patches/patch-vpx_ports_ppc_cpudetect_c
+++ b/multimedia/libvpx/patches/patch-vpx_ports_ppc_cpudetect_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-vpx_ports_ppc_cpudetect_c,v 1.1 2018/10/17 08:22:29 ajacoutot Exp $
-
 Allow PowerPC CPU runtime detection code to build on OpenBSD.
 
 Index: vpx_ports/ppc_cpudetect.c
diff --git a/multimedia/libvpx/pkg/PLIST b/multimedia/libvpx/pkg/PLIST
index 5d269f08fe0..1f515c2b469 100644
--- a/multimedia/libvpx/pkg/PLIST
+++ b/multimedia/libvpx/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.9 2021/04/29 04:07:21 rsadowski Exp $
 @bin bin/vpxdec
 @bin bin/vpxenc
 include/vpx/
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index c89629310ab..f65d42f0ee3 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.16 2019/07/12 20:47:56 sthen Exp $
-
 COMMENT=		print information about the content and structure of a DVD
 
 DISTNAME=		lsdvd-0.17
diff --git a/multimedia/lsdvd/patches/patch-lsdvd_c b/multimedia/lsdvd/patches/patch-lsdvd_c
index 4f210308641..5ca4c426642 100644
--- a/multimedia/lsdvd/patches/patch-lsdvd_c
+++ b/multimedia/lsdvd/patches/patch-lsdvd_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lsdvd_c,v 1.7 2015/05/02 19:58:47 ajacoutot Exp $
 --- lsdvd.c.orig	Sat Oct  4 07:09:14 2014
 +++ lsdvd.c	Sat May  2 21:56:45 2015
 @@ -21,6 +21,7 @@
diff --git a/multimedia/lsdvd/pkg/PLIST b/multimedia/lsdvd/pkg/PLIST
index 5537aa85b4f..6f9c1ba24d6 100644
--- a/multimedia/lsdvd/pkg/PLIST
+++ b/multimedia/lsdvd/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/05/03 08:14:59 ajacoutot Exp $
 @bin bin/lsdvd
 @man man/man1/lsdvd.1
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index 5ad67b958d3..7b3a0a61922 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.35 2021/10/16 15:38:13 edd Exp $
-
 COMMENT=	lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
 
 DISTNAME=	minidlna-1.3.0
diff --git a/multimedia/minidlna/patches/patch-icons_c b/multimedia/minidlna/patches/patch-icons_c
index 2036f6fe525..5a994812725 100644
--- a/multimedia/minidlna/patches/patch-icons_c
+++ b/multimedia/minidlna/patches/patch-icons_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-icons_c,v 1.3 2014/03/09 21:04:05 sthen Exp $
-
 Puffy artwork is (c) Theo de Raadt; he has approved use for this port.
 
 --- icons.c.orig	Fri Mar  7 00:30:25 2014
diff --git a/multimedia/minidlna/patches/patch-kqueue_c b/multimedia/minidlna/patches/patch-kqueue_c
index a42aa2fa1d5..e6565de360b 100644
--- a/multimedia/minidlna/patches/patch-kqueue_c
+++ b/multimedia/minidlna/patches/patch-kqueue_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-kqueue_c,v 1.1 2019/03/20 11:47:45 ajacoutot Exp $
-
 Index: kqueue.c
 --- kqueue.c.orig
 +++ kqueue.c
diff --git a/multimedia/minidlna/patches/patch-minidlna_c b/multimedia/minidlna/patches/patch-minidlna_c
index da4b4dc0fec..dbde4d46659 100644
--- a/multimedia/minidlna/patches/patch-minidlna_c
+++ b/multimedia/minidlna/patches/patch-minidlna_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-minidlna_c,v 1.11 2021/10/16 15:38:13 edd Exp $
-
 Ensure kqueue monitoring can be disabled.
 https://sourceforge.net/p/minidlna/bugs/337/
 
diff --git a/multimedia/minidlna/patches/patch-minidlna_conf b/multimedia/minidlna/patches/patch-minidlna_conf
index c618722c996..34088b2c2ce 100644
--- a/multimedia/minidlna/patches/patch-minidlna_conf
+++ b/multimedia/minidlna/patches/patch-minidlna_conf
@@ -1,5 +1,3 @@
-$OpenBSD: patch-minidlna_conf,v 1.8 2019/03/20 11:47:46 ajacoutot Exp $
-
 Index: minidlna.conf
 --- minidlna.conf.orig
 +++ minidlna.conf
diff --git a/multimedia/minidlna/patches/patch-minidlna_conf_5 b/multimedia/minidlna/patches/patch-minidlna_conf_5
index 4f2f3c00f83..01521389a06 100644
--- a/multimedia/minidlna/patches/patch-minidlna_conf_5
+++ b/multimedia/minidlna/patches/patch-minidlna_conf_5
@@ -1,5 +1,3 @@
-$OpenBSD: patch-minidlna_conf_5,v 1.1 2021/10/16 15:38:13 edd Exp $
-
 Silence a mandoc warning.
 
 Index: minidlna.conf.5
diff --git a/multimedia/minidlna/patches/patch-utils_c b/multimedia/minidlna/patches/patch-utils_c
index 0e9642a4091..b76b91872cb 100644
--- a/multimedia/minidlna/patches/patch-utils_c
+++ b/multimedia/minidlna/patches/patch-utils_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-utils_c,v 1.7 2017/08/29 11:42:22 sthen Exp $
-
 avoid mkdir /, from freebsd ports
 
 Index: utils.c
diff --git a/multimedia/minidlna/pkg/PLIST b/multimedia/minidlna/pkg/PLIST
index 22bf1ddeded..c6192e9df73 100644
--- a/multimedia/minidlna/pkg/PLIST
+++ b/multimedia/minidlna/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/03/20 11:47:46 ajacoutot Exp $
 @newgroup _minidlna:705
 @newuser _minidlna:705:_minidlna:daemon:minidlna user:/nonexistent:/sbin/nologin
 @extraunexec rm -rf /var/db/minidlna/*
diff --git a/multimedia/minidlna/pkg/README b/multimedia/minidlna/pkg/README
index a15a1fe38bf..fca86da4053 100644
--- a/multimedia/minidlna/pkg/README
+++ b/multimedia/minidlna/pkg/README
@@ -1,5 +1,3 @@
-$OpenBSD: README,v 1.2 2019/04/29 08:25:23 ajacoutot Exp $
-
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
diff --git a/multimedia/minidlna/pkg/minidlna.rc b/multimedia/minidlna/pkg/minidlna.rc
index eb485a4295e..d5a545b1c7f 100644
--- a/multimedia/minidlna/pkg/minidlna.rc
+++ b/multimedia/minidlna/pkg/minidlna.rc
@@ -1,6 +1,4 @@
 #!/bin/ksh
-#
-# $OpenBSD: minidlna.rc,v 1.4 2019/03/20 11:47:46 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/minidlnad"
 daemon_user="_minidlna"
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index e082f3c4c18..f2d9b9b8bac 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.48 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT=		tools to edit/modify/encode video streams
 
 DISTNAME=		mjpegtools-2.0.0
diff --git a/multimedia/mjpegtools/patches/patch-configure_ac b/multimedia/mjpegtools/patches/patch-configure_ac
index 454de6d57f5..4ba1a84c2a0 100644
--- a/multimedia/mjpegtools/patches/patch-configure_ac
+++ b/multimedia/mjpegtools/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.4 2017/05/24 09:26:35 espie Exp $
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/multimedia/mjpegtools/patches/patch-docs_mjpegtools_1 b/multimedia/mjpegtools/patches/patch-docs_mjpegtools_1
index 14e68528c23..d658f0d677c 100644
--- a/multimedia/mjpegtools/patches/patch-docs_mjpegtools_1
+++ b/multimedia/mjpegtools/patches/patch-docs_mjpegtools_1
@@ -1,5 +1,3 @@
-$OpenBSD: patch-docs_mjpegtools_1,v 1.1 2017/06/03 16:14:00 schwarze Exp $
-
 A manual page without SH NAME and DESCRIPTION is a really bad idea
 and cannot be expected to render readably.
 
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_Makefile_in b/multimedia/mjpegtools/patches/patch-lavtools_Makefile_in
index 48e9ff98c33..6202d954d18 100644
--- a/multimedia/mjpegtools/patches/patch-lavtools_Makefile_in
+++ b/multimedia/mjpegtools/patches/patch-lavtools_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lavtools_Makefile_in,v 1.4 2012/06/20 08:45:37 jasper Exp $
 --- lavtools/Makefile.in.orig	Sun Oct  9 17:31:35 2011
 +++ lavtools/Makefile.in	Sun Oct  9 17:31:52 2011
 @@ -445,7 +445,7 @@ liblavinclude_HEADERS = \
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_jpeg2yuv_c b/multimedia/mjpegtools/patches/patch-lavtools_jpeg2yuv_c
index 9a778054fd2..ba673b23790 100644
--- a/multimedia/mjpegtools/patches/patch-lavtools_jpeg2yuv_c
+++ b/multimedia/mjpegtools/patches/patch-lavtools_jpeg2yuv_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lavtools_jpeg2yuv_c,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: lavtools/jpeg2yuv.c
 --- lavtools/jpeg2yuv.c.orig
 +++ lavtools/jpeg2yuv.c
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_lav_io_c b/multimedia/mjpegtools/patches/patch-lavtools_lav_io_c
index f8be6215c8f..291b52e2eaf 100644
--- a/multimedia/mjpegtools/patches/patch-lavtools_lav_io_c
+++ b/multimedia/mjpegtools/patches/patch-lavtools_lav_io_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lavtools_lav_io_c,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: lavtools/lav_io.c
 --- lavtools/lav_io.c.orig
 +++ lavtools/lav_io.c
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_lavpipe_c b/multimedia/mjpegtools/patches/patch-lavtools_lavpipe_c
index c6c76262d4a..abc832e92ee 100644
--- a/multimedia/mjpegtools/patches/patch-lavtools_lavpipe_c
+++ b/multimedia/mjpegtools/patches/patch-lavtools_lavpipe_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lavtools_lavpipe_c,v 1.1 2018/04/25 20:55:22 naddy Exp $
-
 Index: lavtools/lavpipe.c
 --- lavtools/lavpipe.c.orig
 +++ lavtools/lavpipe.c
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_lavtrans_c b/multimedia/mjpegtools/patches/patch-lavtools_lavtrans_c
index 67e55b81c43..94c1cccc1d3 100644
--- a/multimedia/mjpegtools/patches/patch-lavtools_lavtrans_c
+++ b/multimedia/mjpegtools/patches/patch-lavtools_lavtrans_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lavtools_lavtrans_c,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: lavtools/lavtrans.c
 --- lavtools/lavtrans.c.orig
 +++ lavtools/lavtrans.c
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_liblavplay_c b/multimedia/mjpegtools/patches/patch-lavtools_liblavplay_c
index a70c4c9a1e0..d3ee3978c54 100644
--- a/multimedia/mjpegtools/patches/patch-lavtools_liblavplay_c
+++ b/multimedia/mjpegtools/patches/patch-lavtools_liblavplay_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-lavtools_liblavplay_c,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: lavtools/liblavplay.c
 --- lavtools/liblavplay.c.orig
 +++ lavtools/liblavplay.c
diff --git a/multimedia/mjpegtools/patches/patch-mpeg2enc_Makefile_in b/multimedia/mjpegtools/patches/patch-mpeg2enc_Makefile_in
index 64936ead718..374738984fe 100644
--- a/multimedia/mjpegtools/patches/patch-mpeg2enc_Makefile_in
+++ b/multimedia/mjpegtools/patches/patch-mpeg2enc_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mpeg2enc_Makefile_in,v 1.4 2012/06/20 08:45:37 jasper Exp $
 --- mpeg2enc/Makefile.in.orig	Sun Oct  9 17:32:51 2011
 +++ mpeg2enc/Makefile.in	Sun Oct  9 17:33:02 2011
 @@ -356,7 +356,7 @@ libmpeg2encpp_include_HEADERS = elemstrmwriter.hh enco
diff --git a/multimedia/mjpegtools/patches/patch-mpeg2enc_ontheflyratectlpass1_hh b/multimedia/mjpegtools/patches/patch-mpeg2enc_ontheflyratectlpass1_hh
index 7062929b54b..90b5f734926 100644
--- a/multimedia/mjpegtools/patches/patch-mpeg2enc_ontheflyratectlpass1_hh
+++ b/multimedia/mjpegtools/patches/patch-mpeg2enc_ontheflyratectlpass1_hh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mpeg2enc_ontheflyratectlpass1_hh,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: mpeg2enc/ontheflyratectlpass1.hh
 --- mpeg2enc/ontheflyratectlpass1.hh.orig
 +++ mpeg2enc/ontheflyratectlpass1.hh
diff --git a/multimedia/mjpegtools/patches/patch-mplex_Makefile_in b/multimedia/mjpegtools/patches/patch-mplex_Makefile_in
index a891a412f4b..c94d63471cc 100644
--- a/multimedia/mjpegtools/patches/patch-mplex_Makefile_in
+++ b/multimedia/mjpegtools/patches/patch-mplex_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mplex_Makefile_in,v 1.3 2012/06/20 08:45:37 jasper Exp $
 --- mplex/Makefile.in.orig	Sun Oct  9 17:32:35 2011
 +++ mplex/Makefile.in	Sun Oct  9 17:32:46 2011
 @@ -335,7 +335,7 @@ libmplex_include_HEADERS = \
diff --git a/multimedia/mjpegtools/patches/patch-utils_Makefile_in b/multimedia/mjpegtools/patches/patch-utils_Makefile_in
index 210423c33a3..0b6dd377976 100644
--- a/multimedia/mjpegtools/patches/patch-utils_Makefile_in
+++ b/multimedia/mjpegtools/patches/patch-utils_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-utils_Makefile_in,v 1.3 2012/06/20 08:45:37 jasper Exp $
 --- utils/Makefile.in.orig	Sun Oct  9 17:31:58 2011
 +++ utils/Makefile.in	Sun Oct  9 17:32:28 2011
 @@ -304,7 +304,7 @@ libmjpegutils_la_LIBADD = $(mmxsse_lib) $(altivec_lib)
diff --git a/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher_hh b/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher_hh
index c1abc382b20..6e2ab373bbb 100644
--- a/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher_hh
+++ b/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher_hh
@@ -1,5 +1,3 @@
-$OpenBSD: patch-y4mdenoise_MotionSearcher_hh,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: y4mdenoise/MotionSearcher.hh
 --- y4mdenoise/MotionSearcher.hh.orig
 +++ y4mdenoise/MotionSearcher.hh
diff --git a/multimedia/mjpegtools/patches/patch-y4mdenoise_main_c b/multimedia/mjpegtools/patches/patch-y4mdenoise_main_c
index d9bb72aaae9..d490576cbc0 100644
--- a/multimedia/mjpegtools/patches/patch-y4mdenoise_main_c
+++ b/multimedia/mjpegtools/patches/patch-y4mdenoise_main_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-y4mdenoise_main_c,v 1.1 2018/04/25 20:55:22 naddy Exp $
-
 Index: y4mdenoise/main.c
 --- y4mdenoise/main.c.orig
 +++ y4mdenoise/main.c
diff --git a/multimedia/mjpegtools/patches/patch-yuvdeinterlace_yuvdeinterlace_cc b/multimedia/mjpegtools/patches/patch-yuvdeinterlace_yuvdeinterlace_cc
index 5b71be5fc44..1ba43f23ccb 100644
--- a/multimedia/mjpegtools/patches/patch-yuvdeinterlace_yuvdeinterlace_cc
+++ b/multimedia/mjpegtools/patches/patch-yuvdeinterlace_yuvdeinterlace_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-yuvdeinterlace_yuvdeinterlace_cc,v 1.1 2018/04/25 20:55:22 naddy Exp $
-
 Index: yuvdeinterlace/yuvdeinterlace.cc
 --- yuvdeinterlace/yuvdeinterlace.cc.orig
 +++ yuvdeinterlace/yuvdeinterlace.cc
diff --git a/multimedia/mjpegtools/patches/patch-yuvdenoise_main_c b/multimedia/mjpegtools/patches/patch-yuvdenoise_main_c
index df2aa2f9fb8..8dc3f972db9 100644
--- a/multimedia/mjpegtools/patches/patch-yuvdenoise_main_c
+++ b/multimedia/mjpegtools/patches/patch-yuvdenoise_main_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-yuvdenoise_main_c,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: yuvdenoise/main.c
 --- yuvdenoise/main.c.orig
 +++ yuvdenoise/main.c
diff --git a/multimedia/mjpegtools/patches/patch-yuvfilters_yuvkineco_c b/multimedia/mjpegtools/patches/patch-yuvfilters_yuvkineco_c
index 966c63d9b98..3414faf431b 100644
--- a/multimedia/mjpegtools/patches/patch-yuvfilters_yuvkineco_c
+++ b/multimedia/mjpegtools/patches/patch-yuvfilters_yuvkineco_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-yuvfilters_yuvkineco_c,v 1.1 2017/05/24 09:26:35 espie Exp $
-
 Index: yuvfilters/yuvkineco.c
 --- yuvfilters/yuvkineco.c.orig
 +++ yuvfilters/yuvkineco.c
diff --git a/multimedia/mjpegtools/pkg/PFRAG.quicktime b/multimedia/mjpegtools/pkg/PFRAG.quicktime
index 34b99279f48..f8004c669f6 100644
--- a/multimedia/mjpegtools/pkg/PFRAG.quicktime
+++ b/multimedia/mjpegtools/pkg/PFRAG.quicktime
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.quicktime,v 1.2 2009/03/04 20:21:57 jasper Exp $
 @bin bin/qttoy4m
 @bin bin/y4mtoqt
diff --git a/multimedia/mjpegtools/pkg/PLIST b/multimedia/mjpegtools/pkg/PLIST
index 429a8bb6648..3ebeb9c6db1 100644
--- a/multimedia/mjpegtools/pkg/PLIST
+++ b/multimedia/mjpegtools/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.9 2015/03/19 12:12:20 naddy Exp $
 @conflict mplex-*
 %%quicktime%%
 bin/anytovcd.sh
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index c44f1a2413d..836a752ea2f 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.114 2022/02/13 08:01:03 rsadowski Exp $
-
 COMMENT=	create, alter and inspect Matroska files
 
 DISTNAME=	mkvtoolnix-65.0.0
diff --git a/multimedia/mkvtoolnix/patches/patch-Rakefile b/multimedia/mkvtoolnix/patches/patch-Rakefile
index 31e688bf842..59e40ea5daa 100644
--- a/multimedia/mkvtoolnix/patches/patch-Rakefile
+++ b/multimedia/mkvtoolnix/patches/patch-Rakefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Rakefile,v 1.9 2021/10/11 15:16:39 rsadowski Exp $
-
 `configure' defines LLVM_LLD, that can only be overridden with another path.
 Ensure that the default and working linker is used on all clang archs.
 
diff --git a/multimedia/mkvtoolnix/patches/patch-ac_qt5_m4 b/multimedia/mkvtoolnix/patches/patch-ac_qt5_m4
index eb8bd172180..ab7246fef52 100644
--- a/multimedia/mkvtoolnix/patches/patch-ac_qt5_m4
+++ b/multimedia/mkvtoolnix/patches/patch-ac_qt5_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-ac_qt5_m4,v 1.10 2021/10/04 05:48:53 rsadowski Exp $
-
 Workaround for OpenBSD's pkg-config.
 
 Index: ac/qt5.m4
diff --git a/multimedia/mkvtoolnix/patches/patch-src_common_os_h b/multimedia/mkvtoolnix/patches/patch-src_common_os_h
index 07690b86af6..d83810b63f2 100644
--- a/multimedia/mkvtoolnix/patches/patch-src_common_os_h
+++ b/multimedia/mkvtoolnix/patches/patch-src_common_os_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_common_os_h,v 1.3 2021/02/27 16:06:27 rsadowski Exp $
-
 Index: src/common/os.h
 --- src/common/os.h.orig
 +++ src/common/os.h
diff --git a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp
index 30033c43622..e87cf55687f 100644
--- a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp
+++ b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mkvtoolnix-gui_jobs_program_runner_cpp,v 1.2 2020/12/02 06:44:11 rsadowski Exp $
-
 Index: src/mkvtoolnix-gui/jobs/program_runner.cpp
 --- src/mkvtoolnix-gui/jobs/program_runner.cpp.orig
 +++ src/mkvtoolnix-gui/jobs/program_runner.cpp
diff --git a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
index c6acbc7b573..ed5453d0ee4 100644
--- a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
+++ b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_cpp,v 1.2 2020/12/02 06:44:11 rsadowski Exp $
-
 Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
 --- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp.orig
 +++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.cpp
diff --git a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
index db4521a5367..549d53366b9 100644
--- a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
+++ b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h,v 1.3 2020/12/02 06:44:11 rsadowski Exp $
-
 Index: src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
 --- src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h.orig
 +++ src/mkvtoolnix-gui/jobs/program_runner/unix_program_runner.h
diff --git a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_util_sleep_inhibitor_cpp b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_util_sleep_inhibitor_cpp
index 7e3b5e84d0c..055024e0265 100644
--- a/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_util_sleep_inhibitor_cpp
+++ b/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_util_sleep_inhibitor_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mkvtoolnix-gui_util_sleep_inhibitor_cpp,v 1.1 2018/12/14 10:00:57 rsadowski Exp $
-
 Index: src/mkvtoolnix-gui/util/sleep_inhibitor.cpp
 --- src/mkvtoolnix-gui/util/sleep_inhibitor.cpp.orig
 +++ src/mkvtoolnix-gui/util/sleep_inhibitor.cpp
diff --git a/multimedia/mkvtoolnix/pkg/PLIST b/multimedia/mkvtoolnix/pkg/PLIST
index 71a0c4431b8..da8454fb500 100644
--- a/multimedia/mkvtoolnix/pkg/PLIST
+++ b/multimedia/mkvtoolnix/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.18 2021/09/17 19:53:27 sthen Exp $
 @pkgpath multimedia/mkvtoolnix,no_x11
 @bin bin/mkvextract
 @bin bin/mkvinfo
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index f25e53d8ae2..a4fa31f8282 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2021/09/09 18:25:25 rsadowski Exp $
-
 COMMENT-main =		multimedia transformations framework
 COMMENT-gpl2 =		GPLv2-licensed modules for mlt
 VERSION =		6.26.1
diff --git a/multimedia/mlt/patches/patch-src_framework_Makefile b/multimedia/mlt/patches/patch-src_framework_Makefile
index 761255f234d..c637a4e9dc7 100644
--- a/multimedia/mlt/patches/patch-src_framework_Makefile
+++ b/multimedia/mlt/patches/patch-src_framework_Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_framework_Makefile,v 1.5 2020/08/24 14:09:54 rsadowski Exp $
 Index: src/framework/Makefile
 --- src/framework/Makefile.orig
 +++ src/framework/Makefile
diff --git a/multimedia/mlt/patches/patch-src_framework_mlt_property_c b/multimedia/mlt/patches/patch-src_framework_mlt_property_c
index 666b1e6da96..ada37ddfd5c 100644
--- a/multimedia/mlt/patches/patch-src_framework_mlt_property_c
+++ b/multimedia/mlt/patches/patch-src_framework_mlt_property_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_framework_mlt_property_c,v 1.5 2021/09/09 18:25:25 rsadowski Exp $
 note: if/when OpenBSD gets LC_NUMERIC locale support, the code should be
 revisited to use threads locale functions (see uselocale(3)), because a
 mutex is not enough to prevent unsupported usage of non thread-safe 
diff --git a/multimedia/mlt/patches/patch-src_mlt++_Makefile b/multimedia/mlt/patches/patch-src_mlt++_Makefile
index aa96e6c67b0..112ab6d8660 100644
--- a/multimedia/mlt/patches/patch-src_mlt++_Makefile
+++ b/multimedia/mlt/patches/patch-src_mlt++_Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_mlt++_Makefile,v 1.5 2020/08/24 14:09:54 rsadowski Exp $
 Index: src/mlt++/Makefile
 --- src/mlt++/Makefile.orig
 +++ src/mlt++/Makefile
diff --git a/multimedia/mlt/patches/patch-src_modules_qt_Makefile b/multimedia/mlt/patches/patch-src_modules_qt_Makefile
index cdc45e4494f..67f1d2d97a2 100644
--- a/multimedia/mlt/patches/patch-src_modules_qt_Makefile
+++ b/multimedia/mlt/patches/patch-src_modules_qt_Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_modules_qt_Makefile,v 1.5 2021/09/09 18:25:25 rsadowski Exp $
 XXX Dirty hack
 Index: src/modules/qt/Makefile
 --- src/modules/qt/Makefile.orig
diff --git a/multimedia/mlt/patches/patch-src_tests_test_properties_test_properties_cpp b/multimedia/mlt/patches/patch-src_tests_test_properties_test_properties_cpp
index 5372650c8bd..8ebbe96b790 100644
--- a/multimedia/mlt/patches/patch-src_tests_test_properties_test_properties_cpp
+++ b/multimedia/mlt/patches/patch-src_tests_test_properties_test_properties_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_tests_test_properties_test_properties_cpp,v 1.3 2018/07/29 15:05:35 rsadowski Exp $
 Index: src/tests/test_properties/test_properties.cpp
 --- src/tests/test_properties/test_properties.cpp.orig
 +++ src/tests/test_properties/test_properties.cpp
diff --git a/multimedia/mlt/pkg/PLIST-gpl2 b/multimedia/mlt/pkg/PLIST-gpl2
index 6dd1e468334..4d56033999b 100644
--- a/multimedia/mlt/pkg/PLIST-gpl2
+++ b/multimedia/mlt/pkg/PLIST-gpl2
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-gpl2,v 1.5 2020/08/24 14:09:54 rsadowski Exp $
 @so lib/mlt/libmltmotion_est.so
 @so lib/mlt/libmltnormalize.so
 @so lib/mlt/libmltplusgpl.so
diff --git a/multimedia/mlt/pkg/PLIST-main b/multimedia/mlt/pkg/PLIST-main
index caf08dff7b3..c0b399144ab 100644
--- a/multimedia/mlt/pkg/PLIST-main
+++ b/multimedia/mlt/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.12 2021/09/09 18:25:25 rsadowski Exp $
 @conflict freeze-<2.5p2
 @bin bin/melt
 include/mlt/
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index b60540dc4c0..31460791bbd 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2022/01/21 18:30:09 espie Exp $
-
 COMMENT-main =		multimedia transformations framework
 COMMENT-gpl2 =		GPLv2-licensed modules for mlt
 VERSION =		7.4.0
diff --git a/multimedia/mlt7/patches/patch-src_framework_mlt_property_c b/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
index fdfea81c4e1..383eb810523 100644
--- a/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
+++ b/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_framework_mlt_property_c,v 1.2 2021/12/18 06:53:38 espie Exp $
 note: if/when OpenBSD gets LC_NUMERIC locale support, the code should be
 revisited to use threads locale functions (see uselocale(3)), because a
 mutex is not enough to prevent unsupported usage of non thread-safe 
diff --git a/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt b/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
index 6a3dd949d78..e8a19cf55f2 100644
--- a/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
+++ b/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_modules_plusgpl_CMakeLists_txt,v 1.1.1.1 2021/10/16 18:08:17 rsadowski Exp $
-
 Index: src/modules/plusgpl/CMakeLists.txt
 --- src/modules/plusgpl/CMakeLists.txt.orig
 +++ src/modules/plusgpl/CMakeLists.txt
diff --git a/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt b/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
index bdac96d7e51..47245dc8504 100644
--- a/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
+++ b/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_modules_sdl_CMakeLists_txt,v 1.1 2022/01/21 18:30:09 espie Exp $
-
 Index: src/modules/sdl/CMakeLists.txt
 --- src/modules/sdl/CMakeLists.txt.orig
 +++ src/modules/sdl/CMakeLists.txt
diff --git a/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp b/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
index 48f4fac0a2a..8ebbe96b790 100644
--- a/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
+++ b/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_tests_test_properties_test_properties_cpp,v 1.1.1.1 2021/10/16 18:08:17 rsadowski Exp $
 Index: src/tests/test_properties/test_properties.cpp
 --- src/tests/test_properties/test_properties.cpp.orig
 +++ src/tests/test_properties/test_properties.cpp
diff --git a/multimedia/mlt7/pkg/PLIST-gpl2 b/multimedia/mlt7/pkg/PLIST-gpl2
index 7f5001983f0..89f37a43b1b 100644
--- a/multimedia/mlt7/pkg/PLIST-gpl2
+++ b/multimedia/mlt7/pkg/PLIST-gpl2
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-gpl2,v 1.1.1.1 2021/10/16 18:08:17 rsadowski Exp $
 @so lib/mlt-7/libmltnormalize.so
 @so lib/mlt-7/libmltplusgpl.so
 @so lib/mlt-7/libmltqt.so
diff --git a/multimedia/mlt7/pkg/PLIST-main b/multimedia/mlt7/pkg/PLIST-main
index b50f0742ac4..37d1f08b9a4 100644
--- a/multimedia/mlt7/pkg/PLIST-main
+++ b/multimedia/mlt7/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2021/12/18 06:53:38 espie Exp $
 @bin bin/melt-7
 include/mlt-7/
 include/mlt-7/framework/
diff --git a/multimedia/mpgtx/Makefile b/multimedia/mpgtx/Makefile
index f1405202749..daae97995d2 100644
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.12 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT=		command line MPEG audio/video/system file toolbox
 
 DISTNAME=		mpgtx-1.3.1
diff --git a/multimedia/mpgtx/patches/patch-configure b/multimedia/mpgtx/patches/patch-configure
index 15db0dbf5a9..0c621debd24 100644
--- a/multimedia/mpgtx/patches/patch-configure
+++ b/multimedia/mpgtx/patches/patch-configure
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2008/05/17 17:08:17 jasper Exp $
 --- configure.orig	Sun Jan  2 22:19:23 2005
 +++ configure	Thu May 15 22:24:51 2008
 @@ -9,7 +9,7 @@
diff --git a/multimedia/mpgtx/pkg/PLIST b/multimedia/mpgtx/pkg/PLIST
index 025b9435d4a..4dc0c4eff2f 100644
--- a/multimedia/mpgtx/pkg/PLIST
+++ b/multimedia/mpgtx/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/17 17:08:17 jasper Exp $
 bin/mpgcat
 bin/mpgdemux
 bin/mpginfo
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index a58fdad958f..b647950c847 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.80 2022/02/28 02:02:11 gsoares Exp $
-
 COMMENT =		movie player based on MPlayer/mplayer2
 
 GH_ACCOUNT =		mpv-player
diff --git a/multimedia/mpv/patches/patch-DOCS_man_ao_rst b/multimedia/mpv/patches/patch-DOCS_man_ao_rst
index 69f7e40d327..b2fb494c187 100644
--- a/multimedia/mpv/patches/patch-DOCS_man_ao_rst
+++ b/multimedia/mpv/patches/patch-DOCS_man_ao_rst
@@ -1,5 +1,3 @@
-$OpenBSD: patch-DOCS_man_ao_rst,v 1.2 2021/11/07 18:47:37 kn Exp $
-
 ao_sndio: add this audio output again
 
 https://github.com/mpv-player/mpv/pull/8314
diff --git a/multimedia/mpv/patches/patch-audio_out_ao_c b/multimedia/mpv/patches/patch-audio_out_ao_c
index 53eeef7b34c..2d4a8175772 100644
--- a/multimedia/mpv/patches/patch-audio_out_ao_c
+++ b/multimedia/mpv/patches/patch-audio_out_ao_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-audio_out_ao_c,v 1.3 2021/12/14 23:20:56 kn Exp $
-
 Another attempt to return ao_sndio to mpv
 
 https://github.com/mpv-player/mpv/pull/9298
diff --git a/multimedia/mpv/patches/patch-audio_out_ao_sndio_c b/multimedia/mpv/patches/patch-audio_out_ao_sndio_c
index bc506db49e4..bf49ef0b524 100644
--- a/multimedia/mpv/patches/patch-audio_out_ao_sndio_c
+++ b/multimedia/mpv/patches/patch-audio_out_ao_sndio_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-audio_out_ao_sndio_c,v 1.5 2022/01/29 12:30:14 kn Exp $
-
 Another attempt to return ao_sndio to mpv
 
 https://github.com/mpv-player/mpv/pull/9298
diff --git a/multimedia/mpv/patches/patch-libmpv_client_h b/multimedia/mpv/patches/patch-libmpv_client_h
index 9bdf1191a0c..bd7f8cdf3f1 100644
--- a/multimedia/mpv/patches/patch-libmpv_client_h
+++ b/multimedia/mpv/patches/patch-libmpv_client_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libmpv_client_h,v 1.6 2020/12/21 08:57:20 rsadowski Exp $
-
 Set shared library version.
 
 Index: libmpv/client.h
diff --git a/multimedia/mpv/patches/patch-osdep_timer-linux_c b/multimedia/mpv/patches/patch-osdep_timer-linux_c
index 5960129a814..329aa5f02ad 100644
--- a/multimedia/mpv/patches/patch-osdep_timer-linux_c
+++ b/multimedia/mpv/patches/patch-osdep_timer-linux_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-osdep_timer-linux_c,v 1.1 2018/06/25 16:43:01 sthen Exp $
-
 OpenBSD doesn't define _POSIX_TIMERS because we are missing some of the
 required clocks, but we do have enough for mpv.
 
diff --git a/multimedia/mpv/patches/patch-osdep_timer_c b/multimedia/mpv/patches/patch-osdep_timer_c
index a3e453c3390..8cd9f455e6b 100644
--- a/multimedia/mpv/patches/patch-osdep_timer_c
+++ b/multimedia/mpv/patches/patch-osdep_timer_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-osdep_timer_c,v 1.1 2018/06/25 16:43:01 sthen Exp $
-
 OpenBSD doesn't define _POSIX_TIMERS because we are missing some of the
 required clocks, but we do have enough for mpv.
 
diff --git a/multimedia/mpv/patches/patch-wscript b/multimedia/mpv/patches/patch-wscript
index 4424e4c0622..6b5933369a9 100644
--- a/multimedia/mpv/patches/patch-wscript
+++ b/multimedia/mpv/patches/patch-wscript
@@ -1,5 +1,3 @@
-$OpenBSD: patch-wscript,v 1.5 2021/12/14 23:20:56 kn Exp $
-
 Another attempt to return ao_sndio to mpv
 
 https://github.com/mpv-player/mpv/pull/9298
diff --git a/multimedia/mpv/patches/patch-wscript_build_py b/multimedia/mpv/patches/patch-wscript_build_py
index dec52ef8c33..15983bc7745 100644
--- a/multimedia/mpv/patches/patch-wscript_build_py
+++ b/multimedia/mpv/patches/patch-wscript_build_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-wscript_build_py,v 1.3 2021/12/14 23:20:56 kn Exp $
-
 Another attempt to return ao_sndio to mpv
 
 https://github.com/mpv-player/mpv/pull/9298
diff --git a/multimedia/mpv/pkg/PLIST b/multimedia/mpv/pkg/PLIST
index a9244a405b8..d705359bd13 100644
--- a/multimedia/mpv/pkg/PLIST
+++ b/multimedia/mpv/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.10 2020/12/21 08:57:20 rsadowski Exp $
 @bin bin/mpv
 include/mpv/
 include/mpv/client.h
diff --git a/multimedia/oggz/Makefile b/multimedia/oggz/Makefile
index 1f2d26146fc..bbcf3c58042 100644
--- a/multimedia/oggz/Makefile
+++ b/multimedia/oggz/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT =	inspect, edit and validate Ogg files
 
 V =		1.1.1
diff --git a/multimedia/oggz/patches/patch-configure_ac b/multimedia/oggz/patches/patch-configure_ac
index ae3852f473c..0c1383aff6d 100644
--- a/multimedia/oggz/patches/patch-configure_ac
+++ b/multimedia/oggz/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.1 2017/09/26 15:58:21 dcoppa Exp $
-
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/multimedia/oggz/patches/patch-doc_Makefile_in b/multimedia/oggz/patches/patch-doc_Makefile_in
index ce5ce0edf26..f36aeb7aac6 100644
--- a/multimedia/oggz/patches/patch-doc_Makefile_in
+++ b/multimedia/oggz/patches/patch-doc_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2010/11/05 12:54:51 eric Exp $
 --- doc/Makefile.in.orig	Thu Apr 29 03:39:46 2010
 +++ doc/Makefile.in	Wed Nov  3 11:48:35 2010
 @@ -478,12 +478,8 @@ html: oggz.1.html oggz-diff.1.html oggz-dump.1.html og
diff --git a/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_c b/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_c
index 18f4a047ded..6e811279910 100644
--- a/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_c
+++ b/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_tools_oggz-chop_httpdate_c,v 1.1.1.1 2010/11/05 12:54:51 eric Exp $
 --- src/tools/oggz-chop/httpdate.c.orig	Sat Jan 30 06:55:59 2010
 +++ src/tools/oggz-chop/httpdate.c	Wed Nov  3 10:07:10 2010
 @@ -60,7 +60,5 @@ httpdate_parse (char * s, int n)
diff --git a/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_test_c b/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_test_c
index 0202bebcfd6..570d32895bb 100644
--- a/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_test_c
+++ b/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_test_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_tools_oggz-chop_httpdate_test_c,v 1.1.1.1 2010/11/05 12:54:51 eric Exp $
 --- src/tools/oggz-chop/httpdate_test.c.orig	Sat Jan 30 06:55:59 2010
 +++ src/tools/oggz-chop/httpdate_test.c	Wed Nov  3 10:09:25 2010
 @@ -21,7 +21,6 @@ main (int argc, char * argv[])
diff --git a/multimedia/oggz/pkg/PLIST b/multimedia/oggz/pkg/PLIST
index d19d470ed2f..e3d2dc69bc6 100644
--- a/multimedia/oggz/pkg/PLIST
+++ b/multimedia/oggz/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:51 naddy Exp $
 @bin bin/oggz
 @bin bin/oggz-chop
 @bin bin/oggz-codecs
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 44a0ae8bf92..e53b48cb2a3 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT-main =		DVD ripper/converter
 COMMENT-dvdcpy =	copy selected info from DVD
 
diff --git a/multimedia/ogmrip/patches/patch-libogmdvd_ogmdvd-transport_c b/multimedia/ogmrip/patches/patch-libogmdvd_ogmdvd-transport_c
index 73f90ddbe9e..8e907035072 100644
--- a/multimedia/ogmrip/patches/patch-libogmdvd_ogmdvd-transport_c
+++ b/multimedia/ogmrip/patches/patch-libogmdvd_ogmdvd-transport_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libogmdvd_ogmdvd-transport_c,v 1.1.1.1 2012/06/26 11:46:06 pascal Exp $
-
 seems like the code for HAVE_SCSIREQ_T has not been tested/updated for a long
 time ...
 
diff --git a/multimedia/ogmrip/patches/patch-libogmrip_ogmrip-encoding_h b/multimedia/ogmrip/patches/patch-libogmrip_ogmrip-encoding_h
index d24b7c696f3..31bbdfc4111 100644
--- a/multimedia/ogmrip/patches/patch-libogmrip_ogmrip-encoding_h
+++ b/multimedia/ogmrip/patches/patch-libogmrip_ogmrip-encoding_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-libogmrip_ogmrip-encoding_h,v 1.1 2017/05/12 16:02:03 espie Exp $
 an enum is not an int. let (OGMRipTaskDetail)0  work
 
 Index: libogmrip/ogmrip-encoding.h
diff --git a/multimedia/ogmrip/pkg/PLIST-dvdcpy b/multimedia/ogmrip/pkg/PLIST-dvdcpy
index fb5a5163d39..c15c909dee7 100644
--- a/multimedia/ogmrip/pkg/PLIST-dvdcpy
+++ b/multimedia/ogmrip/pkg/PLIST-dvdcpy
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-dvdcpy,v 1.1 2013/01/11 22:20:12 sthen Exp $
 @conflict ogmrip-<0.13.8p1
 @pkgpath multimedia/dvdcpy
 @bin bin/dvdcpy
diff --git a/multimedia/ogmrip/pkg/PLIST-main b/multimedia/ogmrip/pkg/PLIST-main
index 15d5c50b2f4..fd521714b29 100644
--- a/multimedia/ogmrip/pkg/PLIST-main
+++ b/multimedia/ogmrip/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2018/06/27 21:03:58 espie Exp $
 @pkgpath multimedia/ogmrip
 @bin bin/avibox
 @bin bin/ogmrip
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 10d5807f0da..5a649e56652 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT=		ogg mux/demuxer
 DISTNAME=		ogmtools-1.5
 REVISION =		2
diff --git a/multimedia/ogmtools/pkg/PLIST b/multimedia/ogmtools/pkg/PLIST
index dd6676529f2..3742e1120a4 100644
--- a/multimedia/ogmtools/pkg/PLIST
+++ b/multimedia/ogmtools/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/16 11:15:36 espie Exp $
 bin/dvdxchap
 bin/ogmcat
 bin/ogmdemux
diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index 074423daf66..1da9b19268d 100644
--- a/multimedia/openh264/Makefile
+++ b/multimedia/openh264/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.4 2022/03/10 12:03:32 kn Exp $
-
 COMMENT =		Cisco implementation of H.264 codec
 GH_ACCOUNT =		cisco
 GH_PROJECT =		openh264
diff --git a/multimedia/openh264/patches/patch-codec_common_src_cpu_cpp b/multimedia/openh264/patches/patch-codec_common_src_cpu_cpp
index 75d30c13606..bac34389267 100644
--- a/multimedia/openh264/patches/patch-codec_common_src_cpu_cpp
+++ b/multimedia/openh264/patches/patch-codec_common_src_cpu_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-codec_common_src_cpu_cpp,v 1.2 2022/01/29 19:03:29 kn Exp $
-
 Index: codec/common/src/cpu.cpp
 --- codec/common/src/cpu.cpp.orig
 +++ codec/common/src/cpu.cpp
diff --git a/multimedia/p5-AMF-Connection/Makefile b/multimedia/p5-AMF-Connection/Makefile
index 75eafb18016..1270d8d36cf 100644
--- a/multimedia/p5-AMF-Connection/Makefile
+++ b/multimedia/p5-AMF-Connection/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2020/07/03 21:45:30 sthen Exp $
-
 COMMENT =	AMF client to connect to remote FLEX AIR service
 
 DISTNAME =	AMF-Connection-0.32
diff --git a/multimedia/p5-AMF-Connection/pkg/PLIST b/multimedia/p5-AMF-Connection/pkg/PLIST
index 14b3dbf2e71..e0061143446 100644
--- a/multimedia/p5-AMF-Connection/pkg/PLIST
+++ b/multimedia/p5-AMF-Connection/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/24 22:15:09 nigel Exp $
 ${P5SITE}/AMF/
 ${P5SITE}/AMF/Connection/
 ${P5SITE}/AMF/Connection.pm
diff --git a/multimedia/p5-Data-AMF/Makefile b/multimedia/p5-Data-AMF/Makefile
index 00db208fa06..cc66c7a2202 100644
--- a/multimedia/p5-Data-AMF/Makefile
+++ b/multimedia/p5-Data-AMF/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2020/07/03 21:45:30 sthen Exp $
-
 COMMENT =	serialize/deserialize Adobe Action Message Format data
 
 DISTNAME =	Data-AMF-0.09
diff --git a/multimedia/p5-Data-AMF/patches/patch-lib_Data_AMF_Formatter_AMF0_pm b/multimedia/p5-Data-AMF/patches/patch-lib_Data_AMF_Formatter_AMF0_pm
index 722c558a9dc..02281ff69f1 100644
--- a/multimedia/p5-Data-AMF/patches/patch-lib_Data_AMF_Formatter_AMF0_pm
+++ b/multimedia/p5-Data-AMF/patches/patch-lib_Data_AMF_Formatter_AMF0_pm
@@ -1,4 +1,3 @@
-$OpenBSD: patch-lib_Data_AMF_Formatter_AMF0_pm,v 1.1.1.1 2011/03/07 23:37:51 sthen Exp $
 --- lib/Data/AMF/Formatter/AMF0.pm.orig	Tue Aug 31 06:56:05 2010
 +++ lib/Data/AMF/Formatter/AMF0.pm	Wed Jan 19 17:39:44 2011
 @@ -14,8 +14,6 @@ has 'io' => (
diff --git a/multimedia/p5-Data-AMF/pkg/PLIST b/multimedia/p5-Data-AMF/pkg/PLIST
index 7a603af52a8..f8c49f5f701 100644
--- a/multimedia/p5-Data-AMF/pkg/PLIST
+++ b/multimedia/p5-Data-AMF/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/03/07 23:37:51 sthen Exp $
 ${P5SITE}/Data/
 ${P5SITE}/Data/AMF/
 ${P5SITE}/Data/AMF.pm
diff --git a/multimedia/p5-Mac-iTunes-Library/Makefile b/multimedia/p5-Mac-iTunes-Library/Makefile
index feb7982e6d5..391db4eb611 100644
--- a/multimedia/p5-Mac-iTunes-Library/Makefile
+++ b/multimedia/p5-Mac-iTunes-Library/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.4 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT =	representation of an iTunes Library
 
 MODULES =	cpan
diff --git a/multimedia/p5-Mac-iTunes-Library/pkg/PLIST b/multimedia/p5-Mac-iTunes-Library/pkg/PLIST
index 91b7eb29786..4bb71242a6d 100644
--- a/multimedia/p5-Mac-iTunes-Library/pkg/PLIST
+++ b/multimedia/p5-Mac-iTunes-Library/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2013/11/16 15:09:02 merdely Exp $
 ${P5SITE}/Mac/
 ${P5SITE}/Mac/iTunes/
 ${P5SITE}/Mac/iTunes/Library/
diff --git a/multimedia/p5-Storable-AMF/Makefile b/multimedia/p5-Storable-AMF/Makefile
index f35f4933265..7e50a2df07e 100644
--- a/multimedia/p5-Storable-AMF/Makefile
+++ b/multimedia/p5-Storable-AMF/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.11 2020/07/03 21:45:30 sthen Exp $
-
 COMMENT =	deserializer for Adobe Action Message Format
 
 DISTNAME =	Storable-AMF-1.23
diff --git a/multimedia/p5-Storable-AMF/pkg/PLIST b/multimedia/p5-Storable-AMF/pkg/PLIST
index f25d0776d00..ec42b167c52 100644
--- a/multimedia/p5-Storable-AMF/pkg/PLIST
+++ b/multimedia/p5-Storable-AMF/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/07/16 23:57:25 ajacoutot Exp $
 ${P5ARCH}/
 ${P5ARCH}/Storable/
 ${P5ARCH}/Storable/AMF/
diff --git a/multimedia/phonon-backend/Makefile b/multimedia/phonon-backend/Makefile
index 97b8333fcf9..23191de6451 100644
--- a/multimedia/phonon-backend/Makefile
+++ b/multimedia/phonon-backend/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2020/08/20 18:00:14 rsadowski Exp $
-
 SUBDIR =
 SUBDIR +=	gstreamer
 SUBDIR +=	vlc
diff --git a/multimedia/phonon-backend/Makefile.inc b/multimedia/phonon-backend/Makefile.inc
index 4dabfa6bdff..1c9f65c5eb3 100644
--- a/multimedia/phonon-backend/Makefile.inc
+++ b/multimedia/phonon-backend/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.8 2020/11/03 17:38:35 rsadowski Exp $
-
 CATEGORIES +=		multimedia
 
 # LGPL 2.1
diff --git a/multimedia/phonon-backend/gstreamer/Makefile b/multimedia/phonon-backend/gstreamer/Makefile
index 42d54ebd14c..c75e4730cf3 100644
--- a/multimedia/phonon-backend/gstreamer/Makefile
+++ b/multimedia/phonon-backend/gstreamer/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2021/03/15 06:28:04 rsadowski Exp $
-
 COMMENT =	GStreamer-based Phonon backend
 
 VERSION =	4.10.0
diff --git a/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt b/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
index b0e0bd4fed1..a184471de3f 100644
--- a/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
+++ b/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2020/08/20 18:00:14 rsadowski Exp $
-
 LibXml2 is not needed to compile the gstreamer backend for Phonon
 
 Index: CMakeLists.txt
diff --git a/multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt b/multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
index bb82ccee5fb..c86a661b8ae 100644
--- a/multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
+++ b/multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-gstreamer_CMakeLists_txt,v 1.5 2019/03/03 17:02:25 rsadowski Exp $
-
 LibXml2 is not needed to compile the gstreamer backend for Phonon
 
 Index: gstreamer/CMakeLists.txt
diff --git a/multimedia/phonon-backend/gstreamer/pkg/PLIST b/multimedia/phonon-backend/gstreamer/pkg/PLIST
index bbfc9241eaf..8dae8e02566 100644
--- a/multimedia/phonon-backend/gstreamer/pkg/PLIST
+++ b/multimedia/phonon-backend/gstreamer/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/08/20 18:00:14 rsadowski Exp $
 @conflict phonon-gstreamer-<4.10
 @conflict phonon-qt5-gstreamer-<4.10
 @conflict phonon-gstreamer-icons-*
diff --git a/multimedia/phonon-backend/vlc/Makefile b/multimedia/phonon-backend/vlc/Makefile
index 8b9713d3608..4e387ea69df 100644
--- a/multimedia/phonon-backend/vlc/Makefile
+++ b/multimedia/phonon-backend/vlc/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2021/03/15 06:28:05 rsadowski Exp $
-
 COMMENT =	VLC-based Phonon backend
 VERSION =	0.11.2
 DISTNAME =	phonon-backend-vlc-${VERSION}
diff --git a/multimedia/phonon-backend/vlc/pkg/PLIST b/multimedia/phonon-backend/vlc/pkg/PLIST
index 1e1d69ae2ce..f2e4b315d54 100644
--- a/multimedia/phonon-backend/vlc/pkg/PLIST
+++ b/multimedia/phonon-backend/vlc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2021/02/09 05:28:35 rsadowski Exp $
 @conflict phonon-vlc-<=0.10.3
 @conflict phonon-qt5-vlc-<0.11
 @pkgpath multimedia/phonon-backend/vlc,qt5
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 712999284be..d49a050f786 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.29 2020/08/20 18:00:14 rsadowski Exp $
-
 COMMENT =	multimedia layer for Qt5/KDE5
 
 CATEGORIES =	multimedia devel
diff --git a/multimedia/phonon/pkg/PLIST b/multimedia/phonon/pkg/PLIST
index 7a6201eb840..33f28270cb4 100644
--- a/multimedia/phonon/pkg/PLIST
+++ b/multimedia/phonon/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.9 2020/08/20 18:00:14 rsadowski Exp $
 @conflict phonon-<4.11.1
 @conflict phonon-qt5-<=4.10.3p0
 @pkgpath multimedia/phonon-qt5
diff --git a/multimedia/playerctl/Makefile b/multimedia/playerctl/Makefile
index 31bb55e8202..fd7ed928142 100644
--- a/multimedia/playerctl/Makefile
+++ b/multimedia/playerctl/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2022/01/16 09:09:06 kmos Exp $
-
 COMMENT =	MPRIS command-line controller and library
 
 GH_ACCOUNT =		altdesktop
diff --git a/multimedia/playerctl/pkg/PLIST b/multimedia/playerctl/pkg/PLIST
index 5b103cba1c8..28ff50a33d6 100644
--- a/multimedia/playerctl/pkg/PLIST
+++ b/multimedia/playerctl/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/12/04 17:05:08 kn Exp $
 @bin bin/playerctl
 @bin bin/playerctld
 include/playerctl/
diff --git a/multimedia/py-caption/Makefile b/multimedia/py-caption/Makefile
index 439d686e84e..4c8ca7f08c8 100644
--- a/multimedia/py-caption/Makefile
+++ b/multimedia/py-caption/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2022/03/04 09:57:51 sthen Exp $
-
 COMMENT=		closed caption converter
 
 MODPY_EGG_VERSION=	2.0.5
diff --git a/multimedia/py-casttube/Makefile b/multimedia/py-casttube/Makefile
index 00394d3c613..b9545db5321 100644
--- a/multimedia/py-casttube/Makefile
+++ b/multimedia/py-casttube/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.7 2021/11/02 00:01:38 sthen Exp $
-
 COMMENT=		interact with Youtube Chromecast api
 
 MODPY_EGG_VERSION=	0.2.1
diff --git a/multimedia/py-casttube/pkg/PLIST b/multimedia/py-casttube/pkg/PLIST
index cfd9f8e3af6..613c9e422fe 100644
--- a/multimedia/py-casttube/pkg/PLIST
+++ b/multimedia/py-casttube/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/04/09 19:10:39 ajacoutot Exp $
 @conflict ${MODPY_PY_PREFIX}casttube-*
 @pkgpath multimedia/py-casttube
 lib/python${MODPY_VERSION}/site-packages/casttube/
diff --git a/multimedia/py-chromecast/Makefile b/multimedia/py-chromecast/Makefile
index b275c0868e6..224b3e7c536 100644
--- a/multimedia/py-chromecast/Makefile
+++ b/multimedia/py-chromecast/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.54 2022/03/01 19:32:46 ajacoutot Exp $
-
 COMMENT=		Python module to talk to Google Chromecast
 
 MODPY_EGG_VERSION=	10.3.0
diff --git a/multimedia/py-guessit/Makefile b/multimedia/py-guessit/Makefile
index 47f01b23fb1..b41d6dc9b0c 100644
--- a/multimedia/py-guessit/Makefile
+++ b/multimedia/py-guessit/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2021/11/14 15:19:03 sthen Exp $
-
 COMMENT =	guess information from video filenames
 
 MODPY_EGG_VERSION =	3.4.2
diff --git a/multimedia/py-guessit/patches/patch-guessit_test_test_api_py b/multimedia/py-guessit/patches/patch-guessit_test_test_api_py
index 5f538ef6d59..d56834868e0 100644
--- a/multimedia/py-guessit/patches/patch-guessit_test_test_api_py
+++ b/multimedia/py-guessit/patches/patch-guessit_test_test_api_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-guessit_test_test_api_py,v 1.1 2021/11/14 15:19:03 sthen Exp $
-
 cope with older py-test-mock
 
 Index: guessit/test/test_api.py
diff --git a/multimedia/py-guessit/pkg/PLIST b/multimedia/py-guessit/pkg/PLIST
index 6b4c45d290a..63ee5ecc58f 100644
--- a/multimedia/py-guessit/pkg/PLIST
+++ b/multimedia/py-guessit/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/11/14 20:49:06 sthen Exp $
 bin/guessit
 lib/python${MODPY_VERSION}/site-packages/guessit/
 lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/multimedia/py-pafy/Makefile b/multimedia/py-pafy/Makefile
index be94641965a..67f2885de46 100644
--- a/multimedia/py-pafy/Makefile
+++ b/multimedia/py-pafy/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2022/02/22 04:22:21 bket Exp $
-
 MODPY_EGG_VERSION =	0.5.5
 COMMENT =	download YouTube content and retrieve metadata
 DISTNAME =	pafy-${MODPY_EGG_VERSION}
diff --git a/multimedia/py-pafy/pkg/PLIST b/multimedia/py-pafy/pkg/PLIST
index 16bee891158..0c6bbb643a9 100644
--- a/multimedia/py-pafy/pkg/PLIST
+++ b/multimedia/py-pafy/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2022/02/22 04:22:21 bket Exp $
 @pkgpath multimedia/py-pafy
 bin/ytdl
 lib/python${MODPY_VERSION}/site-packages/pafy/
diff --git a/multimedia/qtav/Makefile b/multimedia/qtav/Makefile
index a69090d7c2e..a28b6c9c47d 100644
--- a/multimedia/qtav/Makefile
+++ b/multimedia/qtav/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2021/01/19 06:40:09 rsadowski Exp $
-
 COMMENT =	FFmpeg-based Qt multimedia framework
 
 GH_ACCOUNT =	wang-bin
diff --git a/multimedia/qtav/patches/patch-common_pri b/multimedia/qtav/patches/patch-common_pri
index b38a6e449cf..be61f08e0cb 100644
--- a/multimedia/qtav/patches/patch-common_pri
+++ b/multimedia/qtav/patches/patch-common_pri
@@ -1,4 +1,3 @@
-$OpenBSD: patch-common_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Fix dependency chains.
 Index: common.pri
 --- common.pri.orig
diff --git a/multimedia/qtav/patches/patch-config_tests_xv_xv_pro b/multimedia/qtav/patches/patch-config_tests_xv_xv_pro
index 4e65cca6052..cdbd0816b78 100644
--- a/multimedia/qtav/patches/patch-config_tests_xv_xv_pro
+++ b/multimedia/qtav/patches/patch-config_tests_xv_xv_pro
@@ -1,4 +1,3 @@
-$OpenBSD: patch-config_tests_xv_xv_pro,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Allow Xv to be found.
 --- config.tests/xv/xv.pro.orig	Thu Jan 12 22:33:39 2017
 +++ config.tests/xv/xv.pro	Fri Jan 13 14:13:21 2017
diff --git a/multimedia/qtav/patches/patch-deploy_pri b/multimedia/qtav/patches/patch-deploy_pri
index d329135fc6b..e93e43f40e8 100644
--- a/multimedia/qtav/patches/patch-deploy_pri
+++ b/multimedia/qtav/patches/patch-deploy_pri
@@ -1,4 +1,3 @@
-$OpenBSD: patch-deploy_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Fix installation paths.
 Index: deploy.pri
 --- deploy.pri.orig
diff --git a/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_pro b/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_pro
index ace9e3d0f67..f0b3f4a7a2a 100644
--- a/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_pro
+++ b/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_pro
@@ -1,5 +1,3 @@
-$OpenBSD: patch-examples_QMLPlayer_QMLPlayer_pro,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: examples/QMLPlayer/QMLPlayer.pro
 --- examples/QMLPlayer/QMLPlayer.pro.orig
 +++ examples/QMLPlayer/QMLPlayer.pro
diff --git a/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_sdk_pro b/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_sdk_pro
index 8318ce43b54..19322c40277 100644
--- a/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_sdk_pro
+++ b/multimedia/qtav/patches/patch-examples_QMLPlayer_QMLPlayer_sdk_pro
@@ -1,5 +1,3 @@
-$OpenBSD: patch-examples_QMLPlayer_QMLPlayer_sdk_pro,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: examples/QMLPlayer/QMLPlayer_sdk.pro
 --- examples/QMLPlayer/QMLPlayer_sdk.pro.orig
 +++ examples/QMLPlayer/QMLPlayer_sdk.pro
diff --git a/multimedia/qtav/patches/patch-examples_QMLPlayer_qtquick2applicationviewer_qtquick2applicationviewer_pri b/multimedia/qtav/patches/patch-examples_QMLPlayer_qtquick2applicationviewer_qtquick2applicationviewer_pri
index e3bd76091ae..aa0ccc6afb9 100644
--- a/multimedia/qtav/patches/patch-examples_QMLPlayer_qtquick2applicationviewer_qtquick2applicationviewer_pri
+++ b/multimedia/qtav/patches/patch-examples_QMLPlayer_qtquick2applicationviewer_qtquick2applicationviewer_pri
@@ -1,5 +1,3 @@
-$OpenBSD: patch-examples_QMLPlayer_qtquick2applicationviewer_qtquick2applicationviewer_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: examples/QMLPlayer/qtquick2applicationviewer/qtquick2applicationviewer.pri
 --- examples/QMLPlayer/qtquick2applicationviewer/qtquick2applicationviewer.pri.orig
 +++ examples/QMLPlayer/qtquick2applicationviewer/qtquick2applicationviewer.pri
diff --git a/multimedia/qtav/patches/patch-examples_common_libcommon_pri b/multimedia/qtav/patches/patch-examples_common_libcommon_pri
index f7b6abde237..110fd03e399 100644
--- a/multimedia/qtav/patches/patch-examples_common_libcommon_pri
+++ b/multimedia/qtav/patches/patch-examples_common_libcommon_pri
@@ -1,4 +1,3 @@
-$OpenBSD: patch-examples_common_libcommon_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Fix installation paths.
 Index: examples/common/libcommon.pri
 --- examples/common/libcommon.pri.orig
diff --git a/multimedia/qtav/patches/patch-qml_SGVideoNode_cpp b/multimedia/qtav/patches/patch-qml_SGVideoNode_cpp
index 43b1caca45e..834c057c5b5 100644
--- a/multimedia/qtav/patches/patch-qml_SGVideoNode_cpp
+++ b/multimedia/qtav/patches/patch-qml_SGVideoNode_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-qml_SGVideoNode_cpp,v 1.1 2021/01/19 06:40:09 rsadowski Exp $
-
 Index: qml/SGVideoNode.cpp
 --- qml/SGVideoNode.cpp.orig
 +++ qml/SGVideoNode.cpp
diff --git a/multimedia/qtav/patches/patch-qml_libQmlAV_pri b/multimedia/qtav/patches/patch-qml_libQmlAV_pri
index e82f6aaea94..b8229f8e056 100644
--- a/multimedia/qtav/patches/patch-qml_libQmlAV_pri
+++ b/multimedia/qtav/patches/patch-qml_libQmlAV_pri
@@ -1,4 +1,3 @@
-$OpenBSD: patch-qml_libQmlAV_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Fix installation paths.
 Index: qml/libQmlAV.pri
 --- qml/libQmlAV.pri.orig
diff --git a/multimedia/qtav/patches/patch-src_AVMuxer_cpp b/multimedia/qtav/patches/patch-src_AVMuxer_cpp
index 25fc9f957c3..290704b771b 100644
--- a/multimedia/qtav/patches/patch-src_AVMuxer_cpp
+++ b/multimedia/qtav/patches/patch-src_AVMuxer_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_AVMuxer_cpp,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: src/AVMuxer.cpp
 --- src/AVMuxer.cpp.orig
 +++ src/AVMuxer.cpp
diff --git a/multimedia/qtav/patches/patch-src_QtAV_FilterContext_h b/multimedia/qtav/patches/patch-src_QtAV_FilterContext_h
index d5565433771..31c072cd191 100644
--- a/multimedia/qtav/patches/patch-src_QtAV_FilterContext_h
+++ b/multimedia/qtav/patches/patch-src_QtAV_FilterContext_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_QtAV_FilterContext_h,v 1.2 2021/01/19 06:40:09 rsadowski Exp $
-
 Index: src/QtAV/FilterContext.h
 --- src/QtAV/FilterContext.h.orig
 +++ src/QtAV/FilterContext.h
diff --git a/multimedia/qtav/patches/patch-src_QtAV_private_AVCompat_h b/multimedia/qtav/patches/patch-src_QtAV_private_AVCompat_h
index 65e44407804..e99965800d5 100644
--- a/multimedia/qtav/patches/patch-src_QtAV_private_AVCompat_h
+++ b/multimedia/qtav/patches/patch-src_QtAV_private_AVCompat_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_QtAV_private_AVCompat_h,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: src/QtAV/private/AVCompat.h
 --- src/QtAV/private/AVCompat.h.orig
 +++ src/QtAV/private/AVCompat.h
diff --git a/multimedia/qtav/patches/patch-src_codec_audio_AudioEncoderFFmpeg_cpp b/multimedia/qtav/patches/patch-src_codec_audio_AudioEncoderFFmpeg_cpp
index 29e5e7a1381..4b28eb6074a 100644
--- a/multimedia/qtav/patches/patch-src_codec_audio_AudioEncoderFFmpeg_cpp
+++ b/multimedia/qtav/patches/patch-src_codec_audio_AudioEncoderFFmpeg_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_codec_audio_AudioEncoderFFmpeg_cpp,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: src/codec/audio/AudioEncoderFFmpeg.cpp
 --- src/codec/audio/AudioEncoderFFmpeg.cpp.orig
 +++ src/codec/audio/AudioEncoderFFmpeg.cpp
diff --git a/multimedia/qtav/patches/patch-src_codec_video_SurfaceInteropCUDA_cpp b/multimedia/qtav/patches/patch-src_codec_video_SurfaceInteropCUDA_cpp
index 6770b0ea220..ebc5aef8bd8 100644
--- a/multimedia/qtav/patches/patch-src_codec_video_SurfaceInteropCUDA_cpp
+++ b/multimedia/qtav/patches/patch-src_codec_video_SurfaceInteropCUDA_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_codec_video_SurfaceInteropCUDA_cpp,v 1.1 2019/07/15 21:50:18 cwen Exp $
-
 ports-gcc fix for:
 converting to 'bool' from 'std::nullptr_t' requires direct-initialization
 
diff --git a/multimedia/qtav/patches/patch-src_codec_video_VideoEncoderFFmpeg_cpp b/multimedia/qtav/patches/patch-src_codec_video_VideoEncoderFFmpeg_cpp
index 8804b9460ca..34f96c3ec7f 100644
--- a/multimedia/qtav/patches/patch-src_codec_video_VideoEncoderFFmpeg_cpp
+++ b/multimedia/qtav/patches/patch-src_codec_video_VideoEncoderFFmpeg_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_codec_video_VideoEncoderFFmpeg_cpp,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: src/codec/video/VideoEncoderFFmpeg.cpp
 --- src/codec/video/VideoEncoderFFmpeg.cpp.orig
 +++ src/codec/video/VideoEncoderFFmpeg.cpp
diff --git a/multimedia/qtav/patches/patch-src_filter_LibAVFilter_cpp b/multimedia/qtav/patches/patch-src_filter_LibAVFilter_cpp
index 81c8240d065..89a237bdca1 100644
--- a/multimedia/qtav/patches/patch-src_filter_LibAVFilter_cpp
+++ b/multimedia/qtav/patches/patch-src_filter_LibAVFilter_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_filter_LibAVFilter_cpp,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: src/filter/LibAVFilter.cpp
 --- src/filter/LibAVFilter.cpp.orig
 +++ src/filter/LibAVFilter.cpp
diff --git a/multimedia/qtav/patches/patch-src_libQtAV_pri b/multimedia/qtav/patches/patch-src_libQtAV_pri
index 5083f289102..43f9cf2a5cf 100644
--- a/multimedia/qtav/patches/patch-src_libQtAV_pri
+++ b/multimedia/qtav/patches/patch-src_libQtAV_pri
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_libQtAV_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Fix installation paths.
 Index: src/libQtAV.pri
 --- src/libQtAV.pri.orig
diff --git a/multimedia/qtav/patches/patch-src_libQtAV_pro b/multimedia/qtav/patches/patch-src_libQtAV_pro
index ab52ba36406..67784162d95 100644
--- a/multimedia/qtav/patches/patch-src_libQtAV_pro
+++ b/multimedia/qtav/patches/patch-src_libQtAV_pro
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_libQtAV_pro,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 The Unix world is slightly larger than Linux and OS X.
 Index: src/libQtAV.pro
 --- src/libQtAV.pro.orig
diff --git a/multimedia/qtav/patches/patch-src_subtitle_SubtitleProcessorFFmpeg_cpp b/multimedia/qtav/patches/patch-src_subtitle_SubtitleProcessorFFmpeg_cpp
index 7074a4d6713..0c2c780d088 100644
--- a/multimedia/qtav/patches/patch-src_subtitle_SubtitleProcessorFFmpeg_cpp
+++ b/multimedia/qtav/patches/patch-src_subtitle_SubtitleProcessorFFmpeg_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_subtitle_SubtitleProcessorFFmpeg_cpp,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: src/subtitle/SubtitleProcessorFFmpeg.cpp
 --- src/subtitle/SubtitleProcessorFFmpeg.cpp.orig
 +++ src/subtitle/SubtitleProcessorFFmpeg.cpp
diff --git a/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pri b/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pri
index c0007b07372..3a8d25979e6 100644
--- a/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pri
+++ b/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pri
@@ -1,4 +1,3 @@
-$OpenBSD: patch-widgets_libQtAVWidgets_pri,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
 Fix installation paths.
 Index: widgets/libQtAVWidgets.pri
 --- widgets/libQtAVWidgets.pri.orig
diff --git a/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pro b/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pro
index 7bbeb68a2d9..99d622d1c63 100644
--- a/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pro
+++ b/multimedia/qtav/patches/patch-widgets_libQtAVWidgets_pro
@@ -1,5 +1,3 @@
-$OpenBSD: patch-widgets_libQtAVWidgets_pro,v 1.1.1.1 2019/05/02 12:26:15 rsadowski Exp $
-
 Index: widgets/libQtAVWidgets.pro
 --- widgets/libQtAVWidgets.pro.orig
 +++ widgets/libQtAVWidgets.pro
diff --git a/multimedia/qtav/pkg/PLIST b/multimedia/qtav/pkg/PLIST
index 67c679c2ece..ac61fe81151 100644
--- a/multimedia/qtav/pkg/PLIST
+++ b/multimedia/qtav/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/01/19 06:40:09 rsadowski Exp $
 include/X11/qt5/QtAV/
 include/X11/qt5/QtAV/${QT5_VERSION}/
 include/X11/qt5/QtAV/${QT5_VERSION}/QtAV/
diff --git a/multimedia/regionset/Makefile b/multimedia/regionset/Makefile
index ada9d4546cc..5f6b4b9ac49 100644
--- a/multimedia/regionset/Makefile
+++ b/multimedia/regionset/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/12 20:47:57 sthen Exp $
-
 COMMENT=	set region on dvd drives
 
 DISTNAME=	regionset-0.2
diff --git a/multimedia/regionset/patches/patch-Makefile b/multimedia/regionset/patches/patch-Makefile
index 10db3ad8533..970a680aee2 100644
--- a/multimedia/regionset/patches/patch-Makefile
+++ b/multimedia/regionset/patches/patch-Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2008/01/03 19:30:16 oga Exp $
 --- Makefile.orig	Thu Oct 30 12:29:49 2003
 +++ Makefile	Thu Jan  3 16:13:02 2008
 @@ -6,14 +6,14 @@
diff --git a/multimedia/regionset/patches/patch-README b/multimedia/regionset/patches/patch-README
index 60d9aec0f9f..f88444dd5f2 100644
--- a/multimedia/regionset/patches/patch-README
+++ b/multimedia/regionset/patches/patch-README
@@ -1,4 +1,3 @@
-$OpenBSD: patch-README,v 1.2 2015/07/19 01:36:18 ajacoutot Exp $
 --- README.orig	Mon Dec 31 03:32:43 2012
 +++ README	Sun Jul 19 03:33:23 2015
 @@ -54,7 +54,7 @@ The more, there absolutely definitively and in any cas
diff --git a/multimedia/regionset/patches/patch-dvd_udf_c b/multimedia/regionset/patches/patch-dvd_udf_c
index a6f16fa80ca..f3cdf8325c4 100644
--- a/multimedia/regionset/patches/patch-dvd_udf_c
+++ b/multimedia/regionset/patches/patch-dvd_udf_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-dvd_udf_c,v 1.1.1.1 2008/01/03 19:30:16 oga Exp $
 --- dvd_udf.c.orig	Thu Jan  3 02:58:08 2008
 +++ dvd_udf.c	Thu Jan  3 02:58:37 2008
 @@ -38,7 +38,7 @@
diff --git a/multimedia/regionset/patches/patch-regionset_c b/multimedia/regionset/patches/patch-regionset_c
index a03da475590..ff22209a2a6 100644
--- a/multimedia/regionset/patches/patch-regionset_c
+++ b/multimedia/regionset/patches/patch-regionset_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-regionset_c,v 1.2 2015/07/19 01:36:18 ajacoutot Exp $
 --- regionset.c.orig	Mon Dec 31 03:19:17 2012
 +++ regionset.c	Sun Jul 19 03:34:44 2015
 @@ -27,7 +27,7 @@
diff --git a/multimedia/regionset/pkg/PLIST b/multimedia/regionset/pkg/PLIST
index f419848e07e..1f67b99e592 100644
--- a/multimedia/regionset/pkg/PLIST
+++ b/multimedia/regionset/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/07/19 01:36:18 ajacoutot Exp $
 @bin bin/regionset
 share/doc/regionset/
 share/doc/regionset/README
diff --git a/multimedia/sfml/Makefile b/multimedia/sfml/Makefile
index 74ee2a4ce3a..cdad0576f1f 100644
--- a/multimedia/sfml/Makefile
+++ b/multimedia/sfml/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2022/01/01 12:28:46 pascal Exp $
-
 COMMENT =		simple and fast multimedia library
 
 V =			2.5.1
diff --git a/multimedia/sfml/patches/patch-cmake_Config_cmake b/multimedia/sfml/patches/patch-cmake_Config_cmake
index e92cae59632..5884553e9d2 100644
--- a/multimedia/sfml/patches/patch-cmake_Config_cmake
+++ b/multimedia/sfml/patches/patch-cmake_Config_cmake
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cmake_Config_cmake,v 1.3 2021/12/30 19:12:40 pascal Exp $
-
 Index: cmake/Config.cmake
 --- cmake/Config.cmake.orig
 +++ cmake/Config.cmake
diff --git a/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in b/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in
index bb8df3db5aa..9c4e4cb59db 100644
--- a/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in
+++ b/multimedia/sfml/patches/patch-cmake_SFMLConfigDependencies_cmake_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-cmake_SFMLConfigDependencies_cmake_in,v 1.1 2022/01/01 12:28:46 pascal Exp $
-
 Index: cmake/SFMLConfigDependencies.cmake.in
 --- cmake/SFMLConfigDependencies.cmake.in.orig
 +++ cmake/SFMLConfigDependencies.cmake.in
diff --git a/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp b/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp
index f9de988d773..48844af6d59 100644
--- a/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp
+++ b/multimedia/sfml/patches/patch-src_SFML_Window_Unix_WindowImplX11_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_SFML_Window_Unix_WindowImplX11_cpp,v 1.2 2021/12/30 19:12:40 pascal Exp $
-
 Index: src/SFML/Window/Unix/WindowImplX11.cpp
 --- src/SFML/Window/Unix/WindowImplX11.cpp.orig
 +++ src/SFML/Window/Unix/WindowImplX11.cpp
diff --git a/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in b/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in
index 8f444c2d9de..1ec6de3eda1 100644
--- a/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in
+++ b/multimedia/sfml/patches/patch-tools_pkg-config_sfml-window_pc_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-tools_pkg-config_sfml-window_pc_in,v 1.1 2022/01/01 12:28:46 pascal Exp $
-
 Index: tools/pkg-config/sfml-window.pc.in
 --- tools/pkg-config/sfml-window.pc.in.orig
 +++ tools/pkg-config/sfml-window.pc.in
diff --git a/multimedia/sfml/pkg/PLIST b/multimedia/sfml/pkg/PLIST
index 6470a301554..f7d16814a20 100644
--- a/multimedia/sfml/pkg/PLIST
+++ b/multimedia/sfml/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/12/30 19:12:40 pascal Exp $
 include/SFML/
 include/SFML/Audio/
 include/SFML/Audio.hpp
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 474fe2c5dab..d10157d281d 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2021/12/18 06:53:38 espie Exp $
-
 USE_WXNEEDED =	Yes
 COMMENT =	video editor
 
diff --git a/multimedia/shotcut/patches/patch-src_mainwindow_cpp b/multimedia/shotcut/patches/patch-src_mainwindow_cpp
index 10fe0d56d88..2b77c2a757f 100644
--- a/multimedia/shotcut/patches/patch-src_mainwindow_cpp
+++ b/multimedia/shotcut/patches/patch-src_mainwindow_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_mainwindow_cpp,v 1.4 2021/12/18 06:53:38 espie Exp $
-
 Index: src/mainwindow.cpp
 --- src/mainwindow.cpp.orig
 +++ src/mainwindow.cpp
diff --git a/multimedia/shotcut/patches/patch-src_src_pro b/multimedia/shotcut/patches/patch-src_src_pro
index 74679f72dca..ddb37b9b9cc 100644
--- a/multimedia/shotcut/patches/patch-src_src_pro
+++ b/multimedia/shotcut/patches/patch-src_src_pro
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_src_pro,v 1.5 2021/12/18 06:53:38 espie Exp $
-
 Index: src/src.pro
 --- src/src.pro.orig
 +++ src/src.pro
diff --git a/multimedia/shotcut/patches/patch-src_util_cpp b/multimedia/shotcut/patches/patch-src_util_cpp
index 8b43853a689..623d4647f40 100644
--- a/multimedia/shotcut/patches/patch-src_util_cpp
+++ b/multimedia/shotcut/patches/patch-src_util_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_util_cpp,v 1.2 2021/12/18 06:53:38 espie Exp $
-
 Index: src/util.cpp
 --- src/util.cpp.orig
 +++ src/util.cpp
diff --git a/multimedia/shotcut/pkg/PLIST b/multimedia/shotcut/pkg/PLIST
index eb6d86dab08..a83b8dc1d9b 100644
--- a/multimedia/shotcut/pkg/PLIST
+++ b/multimedia/shotcut/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/12/18 06:53:38 espie Exp $
 @bin bin/shotcut
 @man man/man1/shotcut.1
 share/applications/org.shotcut.Shotcut.desktop
diff --git a/multimedia/shrip/Makefile b/multimedia/shrip/Makefile
index da5c6f8e611..53489c6dcc7 100644
--- a/multimedia/shrip/Makefile
+++ b/multimedia/shrip/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:47:58 sthen Exp $
-
 COMMENT =		shell client for ogmrip
 
 DISTNAME =		shrip-0.6.0
diff --git a/multimedia/shrip/patches/patch-configure b/multimedia/shrip/patches/patch-configure
index 951622afd42..7b7dd076f97 100644
--- a/multimedia/shrip/patches/patch-configure
+++ b/multimedia/shrip/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.1 2019/11/01 17:39:06 ajacoutot Exp $
-
 Fix build with glib2 >= 2.62 (-Werror).
 
 Index: configure
diff --git a/multimedia/shrip/patches/patch-shrip_conf b/multimedia/shrip/patches/patch-shrip_conf
index d2809e2a175..bffd1be581d 100644
--- a/multimedia/shrip/patches/patch-shrip_conf
+++ b/multimedia/shrip/patches/patch-shrip_conf
@@ -1,4 +1,3 @@
-$OpenBSD: patch-shrip_conf,v 1.1.1.1 2013/03/09 13:33:47 pascal Exp $
 --- shrip.conf.orig	Thu Jan 10 11:21:04 2013
 +++ shrip.conf	Thu Jan 10 11:21:26 2013
 @@ -1,5 +1,5 @@
diff --git a/multimedia/shrip/patches/patch-src_shrip-ccheck_c b/multimedia/shrip/patches/patch-src_shrip-ccheck_c
index ac573cb7e60..3ab92611ea4 100644
--- a/multimedia/shrip/patches/patch-src_shrip-ccheck_c
+++ b/multimedia/shrip/patches/patch-src_shrip-ccheck_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_shrip-ccheck_c,v 1.1 2013/03/27 18:03:57 ajacoutot Exp $
-
 Fix build with glib2>=2.36.0
 
 --- src/shrip-ccheck.c.orig	Wed Mar 27 18:11:50 2013
diff --git a/multimedia/shrip/patches/patch-src_shrip-encode_c b/multimedia/shrip/patches/patch-src_shrip-encode_c
index 6872d481ec4..b767c0d4197 100644
--- a/multimedia/shrip/patches/patch-src_shrip-encode_c
+++ b/multimedia/shrip/patches/patch-src_shrip-encode_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_shrip-encode_c,v 1.1 2013/03/27 18:03:57 ajacoutot Exp $
-
 Fix build with glib2>=2.36.0
 
 --- src/shrip-encode.c.orig	Wed Mar 27 18:11:39 2013
diff --git a/multimedia/shrip/patches/patch-src_shrip-xchap_c b/multimedia/shrip/patches/patch-src_shrip-xchap_c
index 5d596237f27..a138ec435ee 100644
--- a/multimedia/shrip/patches/patch-src_shrip-xchap_c
+++ b/multimedia/shrip/patches/patch-src_shrip-xchap_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_shrip-xchap_c,v 1.1 2013/03/27 18:03:57 ajacoutot Exp $
-
 Fix build with glib2>=2.36.0
 
 --- src/shrip-xchap.c.orig	Wed Mar 27 18:11:46 2013
diff --git a/multimedia/shrip/patches/patch-src_shrip_1 b/multimedia/shrip/patches/patch-src_shrip_1
index b94cbc37e84..b7d571c520f 100644
--- a/multimedia/shrip/patches/patch-src_shrip_1
+++ b/multimedia/shrip/patches/patch-src_shrip_1
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_shrip_1,v 1.1.1.1 2013/03/09 13:33:47 pascal Exp $
 --- src/shrip.1.orig	Thu Jan 10 11:03:49 2013
 +++ src/shrip.1	Thu Jan 10 11:04:38 2013
 @@ -209,7 +209,7 @@ Use a deblocking filter.
diff --git a/multimedia/shrip/pkg/PLIST b/multimedia/shrip/pkg/PLIST
index 07bae940ba6..b474f7b796f 100644
--- a/multimedia/shrip/pkg/PLIST
+++ b/multimedia/shrip/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/03/13 17:12:45 pascal Exp $
 @bin bin/shrip
 @man man/man1/shrip.1
 share/examples/shrip/
diff --git a/multimedia/streamdvd/Makefile b/multimedia/streamdvd/Makefile
index 7fd338cbea1..46e79bab904 100755
--- a/multimedia/streamdvd/Makefile
+++ b/multimedia/streamdvd/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.17 2019/07/12 20:47:58 sthen Exp $
-
 COMMENT=	fast tool to backup video DVDs 'on the fly'
 
 DISTNAME=	streamdvd-0.4
diff --git a/multimedia/streamdvd/patches/patch-Makefile b/multimedia/streamdvd/patches/patch-Makefile
index 778ef68ec27..2b1670e064a 100644
--- a/multimedia/streamdvd/patches/patch-Makefile
+++ b/multimedia/streamdvd/patches/patch-Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.3 2017/05/13 00:15:38 espie Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/multimedia/streamdvd/patches/patch-mplex_inputstrm_cpp b/multimedia/streamdvd/patches/patch-mplex_inputstrm_cpp
index faab8be851f..a4137e7a26e 100644
--- a/multimedia/streamdvd/patches/patch-mplex_inputstrm_cpp
+++ b/multimedia/streamdvd/patches/patch-mplex_inputstrm_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mplex_inputstrm_cpp,v 1.1 2018/11/30 21:05:32 naddy Exp $
-
 Index: mplex/inputstrm.cpp
 --- mplex/inputstrm.cpp.orig
 +++ mplex/inputstrm.cpp
diff --git a/multimedia/streamdvd/patches/patch-mplex_lpcmstrm_in_cpp b/multimedia/streamdvd/patches/patch-mplex_lpcmstrm_in_cpp
index 631317349db..3f3ecdead7e 100644
--- a/multimedia/streamdvd/patches/patch-mplex_lpcmstrm_in_cpp
+++ b/multimedia/streamdvd/patches/patch-mplex_lpcmstrm_in_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mplex_lpcmstrm_in_cpp,v 1.1 2017/05/13 00:15:38 espie Exp $
-
 Index: mplex/lpcmstrm_in.cpp
 --- mplex/lpcmstrm_in.cpp.orig
 +++ mplex/lpcmstrm_in.cpp
diff --git a/multimedia/streamdvd/patches/patch-mplex_mplex_cpp b/multimedia/streamdvd/patches/patch-mplex_mplex_cpp
index 04d718c4dd4..b858ea313b4 100644
--- a/multimedia/streamdvd/patches/patch-mplex_mplex_cpp
+++ b/multimedia/streamdvd/patches/patch-mplex_mplex_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mplex_mplex_cpp,v 1.1 2017/05/13 00:15:38 espie Exp $
-
 Index: mplex/mplex.cpp
 --- mplex/mplex.cpp.orig
 +++ mplex/mplex.cpp
diff --git a/multimedia/streamdvd/patches/patch-mplex_multiplexor_cpp b/multimedia/streamdvd/patches/patch-mplex_multiplexor_cpp
index 57db8201560..3186f3d7cd0 100644
--- a/multimedia/streamdvd/patches/patch-mplex_multiplexor_cpp
+++ b/multimedia/streamdvd/patches/patch-mplex_multiplexor_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mplex_multiplexor_cpp,v 1.1 2018/11/30 21:05:32 naddy Exp $
-
 Index: mplex/multiplexor.cpp
 --- mplex/multiplexor.cpp.orig
 +++ mplex/multiplexor.cpp
diff --git a/multimedia/streamdvd/patches/patch-mplex_padstrm_cpp b/multimedia/streamdvd/patches/patch-mplex_padstrm_cpp
index dc5d7b13033..e9adeb58c80 100644
--- a/multimedia/streamdvd/patches/patch-mplex_padstrm_cpp
+++ b/multimedia/streamdvd/patches/patch-mplex_padstrm_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mplex_padstrm_cpp,v 1.1 2018/11/30 21:05:32 naddy Exp $
-
 Index: mplex/padstrm.cpp
 --- mplex/padstrm.cpp.orig
 +++ mplex/padstrm.cpp
diff --git a/multimedia/streamdvd/patches/patch-mplex_zalphastrm_hpp b/multimedia/streamdvd/patches/patch-mplex_zalphastrm_hpp
index a597fcc7019..d308647f9c4 100644
--- a/multimedia/streamdvd/patches/patch-mplex_zalphastrm_hpp
+++ b/multimedia/streamdvd/patches/patch-mplex_zalphastrm_hpp
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mplex_zalphastrm_hpp,v 1.1 2010/05/22 14:15:16 espie Exp $
 --- mplex/zalphastrm.hpp.orig	Sat May 22 16:13:57 2010
 +++ mplex/zalphastrm.hpp	Sat May 22 16:14:06 2010
 @@ -45,7 +45,7 @@ class ZAlphaStream : public VideoStream (protected)
diff --git a/multimedia/streamdvd/patches/patch-mplex_zalphastrm_in_cpp b/multimedia/streamdvd/patches/patch-mplex_zalphastrm_in_cpp
index 573bfd68076..95be6f46066 100644
--- a/multimedia/streamdvd/patches/patch-mplex_zalphastrm_in_cpp
+++ b/multimedia/streamdvd/patches/patch-mplex_zalphastrm_in_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-mplex_zalphastrm_in_cpp,v 1.1 2018/11/30 21:05:32 naddy Exp $
-
 Index: mplex/zalphastrm_in.cpp
 --- mplex/zalphastrm_in.cpp.orig
 +++ mplex/zalphastrm_in.cpp
diff --git a/multimedia/streamdvd/pkg/PLIST b/multimedia/streamdvd/pkg/PLIST
index b90559a8496..a705063749f 100644
--- a/multimedia/streamdvd/pkg/PLIST
+++ b/multimedia/streamdvd/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/05/03 06:51:25 ajacoutot Exp $
 @bin bin/streamanalyze
 @bin bin/streamdvd
 share/doc/streamdvd/
diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile
index 4d7485e12b5..5be66151b37 100644
--- a/multimedia/streamlink/Makefile
+++ b/multimedia/streamlink/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.31 2021/11/02 00:01:38 sthen Exp $
-
 MODPY_EGG_VERSION =	2.0.0
 COMMENT =	pipe video streams into a video player
 DISTNAME =	streamlink-${MODPY_EGG_VERSION}
diff --git a/multimedia/streamlink/patches/patch-setup_py b/multimedia/streamlink/patches/patch-setup_py
index c27abb1d2d7..96f0ce35bfa 100644
--- a/multimedia/streamlink/patches/patch-setup_py
+++ b/multimedia/streamlink/patches/patch-setup_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-setup_py,v 1.5 2021/02/13 15:48:52 bcallah Exp $
-
 Use dependencies we already have in the ports tree.
 
 Index: setup.py
diff --git a/multimedia/streamlink/pkg/PLIST b/multimedia/streamlink/pkg/PLIST
index ef777254aa6..e6fff687fdd 100644
--- a/multimedia/streamlink/pkg/PLIST
+++ b/multimedia/streamlink/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.19 2021/02/13 15:48:52 bcallah Exp $
 bin/streamlink
 lib/python${MODPY_VERSION}/site-packages/streamlink/
 lib/python${MODPY_VERSION}/site-packages/streamlink-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/multimedia/subrip/Makefile b/multimedia/subrip/Makefile
index eab4a31d10b..c4abd55586c 100644
--- a/multimedia/subrip/Makefile
+++ b/multimedia/subrip/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:47:58 sthen Exp $
-
 COMMENT=	extract subtitles from dvds
 DISTNAME=	ogmrip-0.10.0
 PKGNAME=	subrip-0.10.0
diff --git a/multimedia/subrip/files/srttool.1 b/multimedia/subrip/files/srttool.1
index e97889b64b7..78189095ace 100644
--- a/multimedia/subrip/files/srttool.1
+++ b/multimedia/subrip/files/srttool.1
@@ -1,4 +1,3 @@
-.\"	$OpenBSD: srttool.1,v 1.1.1.1 2007/01/22 13:55:42 espie Exp $
 .\"	Public domain
 .Dd January 20, 2007
 .Dt SRTTOOL 1
diff --git a/multimedia/subrip/files/sub2pgm.1 b/multimedia/subrip/files/sub2pgm.1
index f1288c45496..88ea1613b17 100644
--- a/multimedia/subrip/files/sub2pgm.1
+++ b/multimedia/subrip/files/sub2pgm.1
@@ -1,4 +1,3 @@
-.\"	$OpenBSD: sub2pgm.1,v 1.1.1.1 2007/01/22 13:55:42 espie Exp $
 .\"	Public domain
 .Dd January 20, 2007
 .Dt SUB2PGM 1
diff --git a/multimedia/subrip/files/subrip b/multimedia/subrip/files/subrip
index 31626deb652..f791bc223a5 100644
--- a/multimedia/subrip/files/subrip
+++ b/multimedia/subrip/files/subrip
@@ -1,5 +1,4 @@
 #! /bin/sh
-# $OpenBSD: subrip,v 1.2 2007/01/22 17:43:10 espie Exp $
 #
 # Copyright (c) 2007 Marc Espie <espie@openbsd.org>
 # 
diff --git a/multimedia/subrip/files/subrip.1 b/multimedia/subrip/files/subrip.1
index 5d129a73f57..76e79937dc3 100644
--- a/multimedia/subrip/files/subrip.1
+++ b/multimedia/subrip/files/subrip.1
@@ -1,4 +1,3 @@
-.\"	$OpenBSD: subrip.1,v 1.2 2007/01/22 17:43:10 espie Exp $
 .\"	Public domain
 .Dd January 20, 2007
 .Dt SUBRIP 1
diff --git a/multimedia/subrip/patches/patch-mp_msg_c b/multimedia/subrip/patches/patch-mp_msg_c
index 7f6a2d2d827..a6554f55ef4 100644
--- a/multimedia/subrip/patches/patch-mp_msg_c
+++ b/multimedia/subrip/patches/patch-mp_msg_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-mp_msg_c,v 1.1.1.1 2007/01/22 13:55:42 espie Exp $
 --- mp_msg.c.orig	Thu Jan 18 12:31:44 2007
 +++ mp_msg.c	Thu Jan 18 12:32:51 2007
 @@ -7,10 +7,15 @@
diff --git a/multimedia/subrip/patches/patch-srttool_c b/multimedia/subrip/patches/patch-srttool_c
index 3d96041c600..c00c61b5563 100644
--- a/multimedia/subrip/patches/patch-srttool_c
+++ b/multimedia/subrip/patches/patch-srttool_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-srttool_c,v 1.1.1.1 2007/01/22 13:55:42 espie Exp $
 --- srttool.c.orig	Mon Jan 22 14:47:45 2007
 +++ srttool.c	Mon Jan 22 14:48:32 2007
 @@ -70,8 +70,7 @@ usage (void)
diff --git a/multimedia/subrip/patches/patch-subrip_c b/multimedia/subrip/patches/patch-subrip_c
index 64c8dd1a92d..53e7cffc5fd 100644
--- a/multimedia/subrip/patches/patch-subrip_c
+++ b/multimedia/subrip/patches/patch-subrip_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-subrip_c,v 1.1.1.1 2007/01/22 13:55:42 espie Exp $
 --- subrip.c.orig	Thu Jan 18 12:30:28 2007
 +++ subrip.c	Thu Jan 18 12:31:41 2007
 @@ -16,6 +16,7 @@ static spudec_handle_t *spudec;
diff --git a/multimedia/subrip/patches/patch-vobsub_c b/multimedia/subrip/patches/patch-vobsub_c
index fb2bcff8208..113ff6d59a3 100644
--- a/multimedia/subrip/patches/patch-vobsub_c
+++ b/multimedia/subrip/patches/patch-vobsub_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-vobsub_c,v 1.1 2012/03/21 23:50:19 fgsch Exp $
 --- vobsub.c.orig	Fri Mar 16 23:54:43 2012
 +++ vobsub.c	Fri Mar 16 23:54:53 2012
 @@ -25,6 +25,7 @@ extern int vobsub_id;
diff --git a/multimedia/subrip/pkg/PLIST b/multimedia/subrip/pkg/PLIST
index 5cd21d75014..c9fee306064 100644
--- a/multimedia/subrip/pkg/PLIST
+++ b/multimedia/subrip/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/22 13:55:42 espie Exp $
 bin/srttool
 bin/sub2pgm
 bin/subrip
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index caafec68270..5422c5c5455 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2019/07/12 20:47:58 sthen Exp $
-
 COMMENT=	subtitle ripper, used with transcode
 
 DISTNAME=	subtitleripper-0.3-4
diff --git a/multimedia/subtitleripper/patches/patch-Makefile b/multimedia/subtitleripper/patches/patch-Makefile
index 3d8ac8c3566..b5151183019 100644
--- a/multimedia/subtitleripper/patches/patch-Makefile
+++ b/multimedia/subtitleripper/patches/patch-Makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.4 2016/04/26 18:06:26 jca Exp $
 --- Makefile.orig	Mon Dec  8 10:28:02 2003
 +++ Makefile	Tue Apr 26 15:54:05 2016
 @@ -3,13 +3,13 @@
diff --git a/multimedia/subtitleripper/pkg/PLIST b/multimedia/subtitleripper/pkg/PLIST
index f658a38555f..3703b27c230 100644
--- a/multimedia/subtitleripper/pkg/PLIST
+++ b/multimedia/subtitleripper/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/29 17:07:49 ajacoutot Exp $
 @conflict subrip-*
 bin/srttool
 bin/subtitle2pgm
diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
index e4c3cede389..6b0a4cd57e5 100644
--- a/multimedia/svt-av1/Makefile
+++ b/multimedia/svt-av1/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.6 2022/03/04 22:18:31 sthen Exp $
-
 ONLY_FOR_ARCHS=	${LP64_ARCHS}
 
 COMMENT=	scalable AV1 encoder/decoder
diff --git a/multimedia/svt-av1/pkg/PLIST b/multimedia/svt-av1/pkg/PLIST
index 6fb105d8218..ff8fb6ec620 100644
--- a/multimedia/svt-av1/pkg/PLIST
+++ b/multimedia/svt-av1/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2022/02/15 17:24:11 sthen Exp $
 @bin bin/SvtAv1DecApp
 @bin bin/SvtAv1EncApp
 include/svt-av1/
diff --git a/multimedia/synfig/Makefile b/multimedia/synfig/Makefile
index b211a8b8ce7..3fc17d7af4d 100644
--- a/multimedia/synfig/Makefile
+++ b/multimedia/synfig/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.35 2021/08/31 07:30:29 ajacoutot Exp $
-
 BROKEN-powerpc =	segfault in multi-threaded mode, synfigstudio can't be built
 BROKEN-powerpc64 =	segfault in multi-threaded mode, synfigstudio can't be built
 
diff --git a/multimedia/synfig/patches/patch-configure_ac b/multimedia/synfig/patches/patch-configure_ac
index 6a78e6a5471..12a440b1364 100644
--- a/multimedia/synfig/patches/patch-configure_ac
+++ b/multimedia/synfig/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.2 2017/12/07 22:42:50 rsadowski Exp $
-
 Don't override CXXFLAGS optimisation levels.
 
 Index: configure.ac
diff --git a/multimedia/synfig/patches/patch-src_synfig_filesystem_cpp b/multimedia/synfig/patches/patch-src_synfig_filesystem_cpp
index 4e36834e60c..cc5f9dbb3a2 100644
--- a/multimedia/synfig/patches/patch-src_synfig_filesystem_cpp
+++ b/multimedia/synfig/patches/patch-src_synfig_filesystem_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_synfig_filesystem_cpp,v 1.1 2020/04/23 04:55:46 cwen Exp $
-
 Fix segfaults during the build of multimedia/synfigstudio, from
 https://github.com/synfig/synfig/issues/822
 
diff --git a/multimedia/synfig/patches/patch-src_synfig_transform_cpp b/multimedia/synfig/patches/patch-src_synfig_transform_cpp
index 4a1ff950a70..40144d9cfb0 100644
--- a/multimedia/synfig/patches/patch-src_synfig_transform_cpp
+++ b/multimedia/synfig/patches/patch-src_synfig_transform_cpp
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_synfig_transform_cpp,v 1.1 2017/05/24 21:27:45 espie Exp $
-
 Index: src/synfig/transform.cpp
 --- src/synfig/transform.cpp.orig
 +++ src/synfig/transform.cpp
diff --git a/multimedia/synfig/pkg/PLIST b/multimedia/synfig/pkg/PLIST
index 0f792d7dbed..1e58ff5ceaa 100644
--- a/multimedia/synfig/pkg/PLIST
+++ b/multimedia/synfig/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/06/22 04:31:21 rsadowski Exp $
 @bin bin/synfig
 bin/synfig-config
 include/synfig-${API_V}/
diff --git a/multimedia/synfigstudio/Makefile b/multimedia/synfigstudio/Makefile
index 92c0b5ab872..32380b13beb 100644
--- a/multimedia/synfigstudio/Makefile
+++ b/multimedia/synfigstudio/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.28 2021/08/31 07:30:29 ajacoutot Exp $
-
 COMMENT =		2D animation software studio
 BROKEN-alpha =		[keyframe_lock_past_on_icon.png] Bus error (core dumped)
 BROKEN-hppa =		Illegal instruction (core dumped)
diff --git a/multimedia/synfigstudio/pkg/PLIST b/multimedia/synfigstudio/pkg/PLIST
index e7d1be1d112..06c1670b82d 100644
--- a/multimedia/synfigstudio/pkg/PLIST
+++ b/multimedia/synfigstudio/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2021/05/23 19:46:43 sthen Exp $
 @bin bin/synfigstudio
 include/synfigapp-${API_V}/
 include/synfigapp-${API_V}/synfigapp/
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 15b69e3f07a..3d0fdaf717b 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.78 2021/02/02 21:11:14 naddy Exp $
-
 COMMENT=	video stream processing tools
 
 DISTNAME=	transcode-1.1.7
diff --git a/multimedia/transcode/patches/patch-Makefile_am b/multimedia/transcode/patches/patch-Makefile_am
index ea2a90fc071..69afc94c926 100644
--- a/multimedia/transcode/patches/patch-Makefile_am
+++ b/multimedia/transcode/patches/patch-Makefile_am
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_am,v 1.1 2010/01/11 08:49:27 jakemsr Exp $
 --- Makefile.am.orig	Thu Dec 24 22:43:57 2009
 +++ Makefile.am	Thu Dec 24 22:44:09 2009
 @@ -24,7 +24,6 @@ SUBDIRS = \
diff --git a/multimedia/transcode/patches/patch-acinclude_m4 b/multimedia/transcode/patches/patch-acinclude_m4
index 3fe9c19f930..6a4503a97e5 100644
--- a/multimedia/transcode/patches/patch-acinclude_m4
+++ b/multimedia/transcode/patches/patch-acinclude_m4
@@ -1,4 +1,3 @@
-$OpenBSD: patch-acinclude_m4,v 1.2 2012/05/03 06:06:59 ajacoutot Exp $
 --- acinclude.m4.orig	Sat Nov 19 11:50:27 2011
 +++ acinclude.m4	Sun Apr 29 00:25:46 2012
 @@ -284,6 +284,38 @@ fi
diff --git a/multimedia/transcode/patches/patch-avilib_avidump_c b/multimedia/transcode/patches/patch-avilib_avidump_c
index 6103b9fd0a4..4996e255c3d 100644
--- a/multimedia/transcode/patches/patch-avilib_avidump_c
+++ b/multimedia/transcode/patches/patch-avilib_avidump_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-avilib_avidump_c,v 1.1 2012/05/03 06:06:59 ajacoutot Exp $
 --- avilib/avidump.c.orig	Sat Nov 19 11:50:27 2011
 +++ avilib/avidump.c	Mon Apr 30 04:36:10 2012
 @@ -320,7 +320,7 @@ static void dump_vals(int fd, int count, struct VAL *n
diff --git a/multimedia/transcode/patches/patch-configure_in b/multimedia/transcode/patches/patch-configure_in
index b7c980dc9df..c332aa36326 100644
--- a/multimedia/transcode/patches/patch-configure_in
+++ b/multimedia/transcode/patches/patch-configure_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-configure_in,v 1.7 2014/11/19 09:36:53 brad Exp $
 --- configure.in.orig	Sat Nov 19 11:50:27 2011
 +++ configure.in	Thu Oct 30 23:03:22 2014
 @@ -721,6 +721,12 @@ TC_CHECK_SUNAU(AC_DEFINE([HAVE_SUNAU], 1, [Have Sun st
diff --git a/multimedia/transcode/patches/patch-encode_encode_lavc_c b/multimedia/transcode/patches/patch-encode_encode_lavc_c
index b378ea44850..c1d07aa23e0 100644
--- a/multimedia/transcode/patches/patch-encode_encode_lavc_c
+++ b/multimedia/transcode/patches/patch-encode_encode_lavc_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-encode_encode_lavc_c,v 1.1 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: encode/encode_lavc.c
diff --git a/multimedia/transcode/patches/patch-export_aud_aux_c b/multimedia/transcode/patches/patch-export_aud_aux_c
index d91d6d6b91c..2a2e1829e07 100644
--- a/multimedia/transcode/patches/patch-export_aud_aux_c
+++ b/multimedia/transcode/patches/patch-export_aud_aux_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-export_aud_aux_c,v 1.8 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: export/aud_aux.c
diff --git a/multimedia/transcode/patches/patch-export_export_ffmpeg_c b/multimedia/transcode/patches/patch-export_export_ffmpeg_c
index 05b12d1ebaf..6ecbfcd915b 100644
--- a/multimedia/transcode/patches/patch-export_export_ffmpeg_c
+++ b/multimedia/transcode/patches/patch-export_export_ffmpeg_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-export_export_ffmpeg_c,v 1.9 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: export/export_ffmpeg.c
diff --git a/multimedia/transcode/patches/patch-export_ffmpeg_cfg_c b/multimedia/transcode/patches/patch-export_ffmpeg_cfg_c
index 6f2cc05fa6f..89b11a9883f 100644
--- a/multimedia/transcode/patches/patch-export_ffmpeg_cfg_c
+++ b/multimedia/transcode/patches/patch-export_ffmpeg_cfg_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-export_ffmpeg_cfg_c,v 1.4 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: export/ffmpeg_cfg.c
diff --git a/multimedia/transcode/patches/patch-filter_filter_pp_c b/multimedia/transcode/patches/patch-filter_filter_pp_c
index 92ae702f873..9f647b553c5 100644
--- a/multimedia/transcode/patches/patch-filter_filter_pp_c
+++ b/multimedia/transcode/patches/patch-filter_filter_pp_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-filter_filter_pp_c,v 1.1 2012/05/03 06:06:59 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 --- filter/filter_pp.c.orig	Sun Apr 29 01:04:14 2012
diff --git a/multimedia/transcode/patches/patch-filter_filter_resample_c b/multimedia/transcode/patches/patch-filter_filter_resample_c
index e4b543a8615..868a2c4e54b 100644
--- a/multimedia/transcode/patches/patch-filter_filter_resample_c
+++ b/multimedia/transcode/patches/patch-filter_filter_resample_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-filter_filter_resample_c,v 1.3 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: filter/filter_resample.c
diff --git a/multimedia/transcode/patches/patch-filter_subtitler_load_font_c b/multimedia/transcode/patches/patch-filter_subtitler_load_font_c
index d9611bb703f..a8c9794a5d1 100644
--- a/multimedia/transcode/patches/patch-filter_subtitler_load_font_c
+++ b/multimedia/transcode/patches/patch-filter_subtitler_load_font_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-filter_subtitler_load_font_c,v 1.1 2014/01/09 22:42:33 naddy Exp $
 --- filter/subtitler/load_font.c.orig	Sat Nov 19 17:50:27 2011
 +++ filter/subtitler/load_font.c	Thu Jan  9 23:36:51 2014
 @@ -47,8 +47,7 @@ Artur Zaprzala <zybi@fanthom.irc.pl>
diff --git a/multimedia/transcode/patches/patch-filter_yuvdenoise_motion_c b/multimedia/transcode/patches/patch-filter_yuvdenoise_motion_c
index 5439f076d97..d1c0859b17c 100644
--- a/multimedia/transcode/patches/patch-filter_yuvdenoise_motion_c
+++ b/multimedia/transcode/patches/patch-filter_yuvdenoise_motion_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-filter_yuvdenoise_motion_c,v 1.1 2017/09/01 14:13:45 sthen Exp $
-
 add newlines to fix inline asm with clang
 
 Index: filter/yuvdenoise/motion.c
diff --git a/multimedia/transcode/patches/patch-import_Makefile_am b/multimedia/transcode/patches/patch-import_Makefile_am
index 290ac3b3c69..118b22a4b17 100644
--- a/multimedia/transcode/patches/patch-import_Makefile_am
+++ b/multimedia/transcode/patches/patch-import_Makefile_am
@@ -1,4 +1,3 @@
-$OpenBSD: patch-import_Makefile_am,v 1.1 2010/01/11 08:49:27 jakemsr Exp $
 --- import/Makefile.am.orig	Thu Dec 24 22:21:38 2009
 +++ import/Makefile.am	Thu Dec 24 22:23:52 2009
 @@ -59,6 +59,10 @@ if HAVE_SUNAU
diff --git a/multimedia/transcode/patches/patch-import_decode_lavc_c b/multimedia/transcode/patches/patch-import_decode_lavc_c
index 667e9a6f8a6..165f2de9565 100644
--- a/multimedia/transcode/patches/patch-import_decode_lavc_c
+++ b/multimedia/transcode/patches/patch-import_decode_lavc_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_decode_lavc_c,v 1.6 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: import/decode_lavc.c
diff --git a/multimedia/transcode/patches/patch-import_demux_pass_c b/multimedia/transcode/patches/patch-import_demux_pass_c
index c86fdc71bab..dadade5806f 100644
--- a/multimedia/transcode/patches/patch-import_demux_pass_c
+++ b/multimedia/transcode/patches/patch-import_demux_pass_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_demux_pass_c,v 1.1 2021/02/02 21:11:14 naddy Exp $
-
 fix for -fno-common
 
 Index: import/demux_pass.c
diff --git a/multimedia/transcode/patches/patch-import_extract_ac3_c b/multimedia/transcode/patches/patch-import_extract_ac3_c
index 014e00231c1..bcdb7af9aa5 100644
--- a/multimedia/transcode/patches/patch-import_extract_ac3_c
+++ b/multimedia/transcode/patches/patch-import_extract_ac3_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_extract_ac3_c,v 1.3 2021/02/02 21:11:14 naddy Exp $
-
 fix for -fno-common
 
 Index: import/extract_ac3.c
diff --git a/multimedia/transcode/patches/patch-import_extract_mp3_c b/multimedia/transcode/patches/patch-import_extract_mp3_c
index d3aa780cd1e..f07b5c8eb75 100644
--- a/multimedia/transcode/patches/patch-import_extract_mp3_c
+++ b/multimedia/transcode/patches/patch-import_extract_mp3_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_extract_mp3_c,v 1.1 2021/02/02 21:11:14 naddy Exp $
-
 fix for -fno-common
 
 Index: import/extract_mp3.c
diff --git a/multimedia/transcode/patches/patch-import_extract_pcm_c b/multimedia/transcode/patches/patch-import_extract_pcm_c
index a101943ba27..5e2ac1a7a69 100644
--- a/multimedia/transcode/patches/patch-import_extract_pcm_c
+++ b/multimedia/transcode/patches/patch-import_extract_pcm_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_extract_pcm_c,v 1.1 2021/02/02 21:11:14 naddy Exp $
-
 fix for -fno-common
 
 Index: import/extract_pcm.c
diff --git a/multimedia/transcode/patches/patch-import_import_ffmpeg_c b/multimedia/transcode/patches/patch-import_import_ffmpeg_c
index b741fcd2e96..5e7627e87a9 100644
--- a/multimedia/transcode/patches/patch-import_import_ffmpeg_c
+++ b/multimedia/transcode/patches/patch-import_import_ffmpeg_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_import_ffmpeg_c,v 1.5 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: import/import_ffmpeg.c
diff --git a/multimedia/transcode/patches/patch-import_probe_ffmpeg_c b/multimedia/transcode/patches/patch-import_probe_ffmpeg_c
index b3b6d8b0b84..9ba09f91e7f 100644
--- a/multimedia/transcode/patches/patch-import_probe_ffmpeg_c
+++ b/multimedia/transcode/patches/patch-import_probe_ffmpeg_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-import_probe_ffmpeg_c,v 1.4 2019/02/18 10:05:39 ajacoutot Exp $
-
 Update for newer FFmpeg API.
 
 Index: import/probe_ffmpeg.c
diff --git a/multimedia/transcode/patches/patch-libtc_tcavcodec_h b/multimedia/transcode/patches/patch-libtc_tcavcodec_h
index 9d0dae448f3..d65d5625c65 100644
--- a/multimedia/transcode/patches/patch-libtc_tcavcodec_h
+++ b/multimedia/transcode/patches/patch-libtc_tcavcodec_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libtc_tcavcodec_h,v 1.2 2013/01/26 12:47:44 brad Exp $
-
 Update for newer FFmpeg API.
 
 --- libtc/tcavcodec.h.orig	Fri Jan 18 02:54:38 2013
diff --git a/multimedia/transcode/patches/patch-libtc_tcglob_c b/multimedia/transcode/patches/patch-libtc_tcglob_c
index d8e785ccc96..9a8185ba15f 100644
--- a/multimedia/transcode/patches/patch-libtc_tcglob_c
+++ b/multimedia/transcode/patches/patch-libtc_tcglob_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-libtc_tcglob_c,v 1.1 2010/01/11 08:49:27 jakemsr Exp $
-
 don't try to access tcg->glob.gl_pathv[-1]
 
 --- libtc/tcglob.c.orig	Wed Jan  6 00:58:04 2010
diff --git a/multimedia/transcode/patches/patch-src_transcode_c b/multimedia/transcode/patches/patch-src_transcode_c
index 34486ababce..e4942d58093 100644
--- a/multimedia/transcode/patches/patch-src_transcode_c
+++ b/multimedia/transcode/patches/patch-src_transcode_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_transcode_c,v 1.1 2010/01/11 08:49:27 jakemsr Exp $
-
 audio input name isn't necessarily a file
 
 --- src/transcode.c.orig	Wed Jan  6 01:12:40 2010
diff --git a/multimedia/transcode/pkg/PFRAG.i386 b/multimedia/transcode/pkg/PFRAG.i386
index abc8df0dd30..169afd7e167 100644
--- a/multimedia/transcode/pkg/PFRAG.i386
+++ b/multimedia/transcode/pkg/PFRAG.i386
@@ -1,2 +1 @@
-@comment $OpenBSD: PFRAG.i386,v 1.5 2013/01/19 08:42:35 brad Exp $
 lib/transcode/filter_tomsmocomp.so
diff --git a/multimedia/transcode/pkg/PFRAG.lzo b/multimedia/transcode/pkg/PFRAG.lzo
index 081eb99f475..a8cc124da65 100644
--- a/multimedia/transcode/pkg/PFRAG.lzo
+++ b/multimedia/transcode/pkg/PFRAG.lzo
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.lzo,v 1.4 2013/01/19 08:42:35 brad Exp $
 lib/transcode/export_lzo.so
 lib/transcode/import_lzo.so
diff --git a/multimedia/transcode/pkg/PFRAG.mjpegtools b/multimedia/transcode/pkg/PFRAG.mjpegtools
index e2a895f8edf..7374e559097 100644
--- a/multimedia/transcode/pkg/PFRAG.mjpegtools
+++ b/multimedia/transcode/pkg/PFRAG.mjpegtools
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.mjpegtools,v 1.5 2013/01/19 08:42:35 brad Exp $
 lib/transcode/export_mp2enc.so
 lib/transcode/export_mpeg2enc.so
 lib/transcode/export_yuv4mpeg.so
diff --git a/multimedia/transcode/pkg/PLIST b/multimedia/transcode/pkg/PLIST
index 79d76690457..8ba62d76403 100644
--- a/multimedia/transcode/pkg/PLIST
+++ b/multimedia/transcode/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/05/05 11:51:37 brad Exp $
 @pkgpath multimedia/transcode,quicktime
 %%i386%%
 %%lzo%%
diff --git a/multimedia/upplay/Makefile b/multimedia/upplay/Makefile
index d98789cabdb..60393a1fee5 100644
--- a/multimedia/upplay/Makefile
+++ b/multimedia/upplay/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.5 2020/11/09 05:22:57 rsadowski Exp $
-
 COMMENT =		UPnP audio control point
 
 DISTNAME =		upplay-1.3.3
diff --git a/multimedia/upplay/patches/patch-upplay_pro b/multimedia/upplay/patches/patch-upplay_pro
index 6aa37543f11..3ca7d2754d9 100644
--- a/multimedia/upplay/patches/patch-upplay_pro
+++ b/multimedia/upplay/patches/patch-upplay_pro
@@ -1,5 +1,3 @@
-$OpenBSD: patch-upplay_pro,v 1.3 2020/11/09 05:22:57 rsadowski Exp $
-
 Index: upplay.pro
 --- upplay.pro.orig
 +++ upplay.pro
diff --git a/multimedia/upplay/pkg/PLIST b/multimedia/upplay/pkg/PLIST
index 2fd928d82a7..bf0f2ed9197 100644
--- a/multimedia/upplay/pkg/PLIST
+++ b/multimedia/upplay/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/01/04 14:44:11 pascal Exp $
 @bin bin/upplay
 share/applications/upplay.desktop
 share/icons/hicolor/48x48/apps/upplay.png
diff --git a/multimedia/vitunes/Makefile b/multimedia/vitunes/Makefile
index 4f46080bfc7..836a6dbebc6 100755
--- a/multimedia/vitunes/Makefile
+++ b/multimedia/vitunes/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/12 20:47:58 sthen Exp $
-
 COMMENT =		curses media indexer and player for vi users
 
 DISTNAME =		vitunes-2.3
diff --git a/multimedia/vitunes/patches/patch-e_commands_c b/multimedia/vitunes/patches/patch-e_commands_c
index 9bde6e0744f..1d36ef27cb6 100644
--- a/multimedia/vitunes/patches/patch-e_commands_c
+++ b/multimedia/vitunes/patches/patch-e_commands_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-e_commands_c,v 1.1 2018/04/25 12:44:10 naddy Exp $
-
 Index: e_commands.c
 --- e_commands.c.orig
 +++ e_commands.c
diff --git a/multimedia/vitunes/patches/patch-vitunes_c b/multimedia/vitunes/patches/patch-vitunes_c
index 81a158edc37..81f9ecdcf18 100644
--- a/multimedia/vitunes/patches/patch-vitunes_c
+++ b/multimedia/vitunes/patches/patch-vitunes_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-vitunes_c,v 1.1 2012/06/25 14:20:01 pascal Exp $
 --- vitunes.c.orig	Sat Jun 23 13:30:24 2012
 +++ vitunes.c	Sat Jun 23 13:31:18 2012
 @@ -168,13 +168,13 @@ main(int argc, char *argv[])
diff --git a/multimedia/vitunes/pkg/PLIST b/multimedia/vitunes/pkg/PLIST
index d57f467ac05..44169de2257 100644
--- a/multimedia/vitunes/pkg/PLIST
+++ b/multimedia/vitunes/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/31 10:11:11 laurent Exp $
 @bin bin/vitunes
 @man man/man1/vitunes.1
diff --git a/multimedia/webvfx/Makefile b/multimedia/webvfx/Makefile
index 6052817bf27..f2dbed35925 100644
--- a/multimedia/webvfx/Makefile
+++ b/multimedia/webvfx/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2020/05/20 15:16:26 tracey Exp $
-
 USE_WXNEEDED =	Yes
 COMMENT =	video effects library
 
diff --git a/multimedia/webvfx/pkg/PLIST b/multimedia/webvfx/pkg/PLIST
index 9e88f630b6e..0cb49ac0d0a 100644
--- a/multimedia/webvfx/pkg/PLIST
+++ b/multimedia/webvfx/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/05/20 15:16:26 tracey Exp $
 @bin bin/webvfx_browser
 @bin bin/webvfx_render
 @bin bin/webvfx_viewer
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 7c052ebf5d5..bb9dbb2e5a1 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.61 2022/02/15 17:22:35 sthen Exp $
-
 COMMENT=	free H.264/MPEG-4 AVC encoder
 
 DISTNAME=	x264-20220205
diff --git a/multimedia/x264/patches/patch-Makefile b/multimedia/x264/patches/patch-Makefile
index 28539a70e84..d55fee73df9 100644
--- a/multimedia/x264/patches/patch-Makefile
+++ b/multimedia/x264/patches/patch-Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-Makefile,v 1.21 2022/02/15 17:22:35 sthen Exp $
-
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
diff --git a/multimedia/x264/patches/patch-common_osdep_h b/multimedia/x264/patches/patch-common_osdep_h
index 176c3af0b33..1a203b86293 100644
--- a/multimedia/x264/patches/patch-common_osdep_h
+++ b/multimedia/x264/patches/patch-common_osdep_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-common_osdep_h,v 1.14 2021/04/28 04:03:24 rsadowski Exp $
-
 Enable the use of __sync_fetch_and_add().
 
 Index: common/osdep.h
diff --git a/multimedia/x264/patches/patch-configure b/multimedia/x264/patches/patch-configure
index 0e6f7d951af..ca72f0045d0 100644
--- a/multimedia/x264/patches/patch-configure
+++ b/multimedia/x264/patches/patch-configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure,v 1.30 2022/02/15 17:22:35 sthen Exp $
-
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/multimedia/x264/pkg/PLIST b/multimedia/x264/pkg/PLIST
index be611d6d17e..0272ce54484 100644
--- a/multimedia/x264/pkg/PLIST
+++ b/multimedia/x264/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2021/04/28 04:03:24 rsadowski Exp $
 @bin bin/x264
 include/x264.h
 include/x264_config.h
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 0fadca80fa4..792a1897829 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.53 2022/03/04 22:17:39 sthen Exp $
-
 COMMENT=	free H.265/HEVC encoder
 
 VER=		3.5
diff --git a/multimedia/x265/patches/patch-source_CMakeLists_txt b/multimedia/x265/patches/patch-source_CMakeLists_txt
index 49d069ebce7..3f72464d86f 100644
--- a/multimedia/x265/patches/patch-source_CMakeLists_txt
+++ b/multimedia/x265/patches/patch-source_CMakeLists_txt
@@ -1,5 +1,3 @@
-$OpenBSD: patch-source_CMakeLists_txt,v 1.6 2021/04/27 04:42:09 rsadowski Exp $
-
 Index: source/CMakeLists.txt
 --- source/CMakeLists.txt.orig
 +++ source/CMakeLists.txt
diff --git a/multimedia/x265/patches/patch-source_common_aarch64_asm_S b/multimedia/x265/patches/patch-source_common_aarch64_asm_S
index e536a29c8e3..f9c69c2b4f0 100644
--- a/multimedia/x265/patches/patch-source_common_aarch64_asm_S
+++ b/multimedia/x265/patches/patch-source_common_aarch64_asm_S
@@ -1,5 +1,3 @@
-$OpenBSD: patch-source_common_aarch64_asm_S,v 1.1 2022/03/04 22:17:39 sthen Exp $
-
 - fix the compiling errors on MAC
   0983cffc501e5279e7d9e9b2241b506cb332efcb
 - fix clang compile errors on linux
diff --git a/multimedia/x265/patches/patch-source_test_checkasm-a_asm b/multimedia/x265/patches/patch-source_test_checkasm-a_asm
index ea010f1cbd8..a70535149d3 100644
--- a/multimedia/x265/patches/patch-source_test_checkasm-a_asm
+++ b/multimedia/x265/patches/patch-source_test_checkasm-a_asm
@@ -1,5 +1,3 @@
-$OpenBSD: patch-source_test_checkasm-a_asm,v 1.4 2019/08/17 08:26:24 ajacoutot Exp $
-
 Index: source/test/checkasm-a.asm
 --- source/test/checkasm-a.asm.orig
 +++ source/test/checkasm-a.asm
diff --git a/multimedia/x265/patches/patch-source_test_testharness_h b/multimedia/x265/patches/patch-source_test_testharness_h
index a0eafca687b..719fc19232a 100644
--- a/multimedia/x265/patches/patch-source_test_testharness_h
+++ b/multimedia/x265/patches/patch-source_test_testharness_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-source_test_testharness_h,v 1.1 2022/03/04 22:17:39 sthen Exp $
-
 fix the compiling errors on MAC
 0983cffc501e5279e7d9e9b2241b506cb332efcb
 
diff --git a/multimedia/x265/pkg/PLIST b/multimedia/x265/pkg/PLIST
index cf10a9ea9a0..6e1ad09c21c 100644
--- a/multimedia/x265/pkg/PLIST
+++ b/multimedia/x265/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/02/24 18:41:19 ajacoutot Exp $
 @bin bin/x265
 include/x265.h
 include/x265_config.h
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 1823fc7351b..a3239be4faf 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.150 2022/02/24 15:05:40 sthen Exp $
-
 COMMENT=	multimedia decoding library
 
 DISTNAME=	xine-lib-1.2.11
diff --git a/multimedia/xine-lib/patches/patch-configure_ac b/multimedia/xine-lib/patches/patch-configure_ac
index 4eb6709dde3..ef0dbca7f52 100644
--- a/multimedia/xine-lib/patches/patch-configure_ac
+++ b/multimedia/xine-lib/patches/patch-configure_ac
@@ -1,5 +1,3 @@
-$OpenBSD: patch-configure_ac,v 1.23 2021/01/23 09:27:49 ajacoutot Exp $
-
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
diff --git a/multimedia/xine-lib/patches/patch-m4_decoders_m4 b/multimedia/xine-lib/patches/patch-m4_decoders_m4
index 8511ac84bae..ad46fb455a4 100644
--- a/multimedia/xine-lib/patches/patch-m4_decoders_m4
+++ b/multimedia/xine-lib/patches/patch-m4_decoders_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-m4_decoders_m4,v 1.7 2021/01/23 09:27:49 ajacoutot Exp $
-
 Index: m4/decoders.m4
 --- m4/decoders.m4.orig
 +++ m4/decoders.m4
diff --git a/multimedia/xine-lib/patches/patch-m4_input_m4 b/multimedia/xine-lib/patches/patch-m4_input_m4
index 125b61156cf..d44502e0dc9 100644
--- a/multimedia/xine-lib/patches/patch-m4_input_m4
+++ b/multimedia/xine-lib/patches/patch-m4_input_m4
@@ -1,5 +1,3 @@
-$OpenBSD: patch-m4_input_m4,v 1.4 2021/01/23 09:27:49 ajacoutot Exp $
-
 Don't pick up GnuTLS over OpenSSL.
 
 Index: m4/input.m4
diff --git a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_demux_avformat_c b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_demux_avformat_c
index 95939e7f4ea..41204cabfb0 100644
--- a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_demux_avformat_c
+++ b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_demux_avformat_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_combined_ffmpeg_demux_avformat_c,v 1.1 2022/01/25 18:10:36 sthen Exp $
-
 - ffmpeg 4 compatibility attempt.
   4e5ad7ebed6111ba9e1ea2eab4a6b94477b066a8
 - Fix avformat.
diff --git a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_audio_decoder_c b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_audio_decoder_c
index b3d53df2227..3371e1e54db 100644
--- a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_audio_decoder_c
+++ b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_audio_decoder_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_combined_ffmpeg_ff_audio_decoder_c,v 1.13 2022/02/24 15:05:40 sthen Exp $
-
 - ffmpeg 4 compatibility attempt.
   4e5ad7ebed6111ba9e1ea2eab4a6b94477b066a8
 - ff_audio_decoder: enable parser for AC3.
diff --git a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_video_decoder_c b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_video_decoder_c
index 2f52843ff7e..3d7fb915fa8 100644
--- a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_video_decoder_c
+++ b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ff_video_decoder_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_combined_ffmpeg_ff_video_decoder_c,v 1.24 2022/01/25 18:10:36 sthen Exp $
-
 - ffmpeg 4 compatibility attempt.
   4e5ad7ebed6111ba9e1ea2eab4a6b94477b066a8
 - Fix video failure after temporary video out jam.
diff --git a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ffmpeg_compat_h b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ffmpeg_compat_h
index 0bf80d7e43e..2b3a2a3e27e 100644
--- a/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ffmpeg_compat_h
+++ b/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_ffmpeg_compat_h
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_combined_ffmpeg_ffmpeg_compat_h,v 1.7 2022/01/25 18:10:36 sthen Exp $
-
 ffmpeg 4 compatibility attempt.
 4e5ad7ebed6111ba9e1ea2eab4a6b94477b066a8
 
diff --git a/multimedia/xine-lib/patches/patch-src_demuxers_demux_ac3_c b/multimedia/xine-lib/patches/patch-src_demuxers_demux_ac3_c
index f9ae5c4a3c5..311b3561f0e 100644
--- a/multimedia/xine-lib/patches/patch-src_demuxers_demux_ac3_c
+++ b/multimedia/xine-lib/patches/patch-src_demuxers_demux_ac3_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_demuxers_demux_ac3_c,v 1.1 2022/02/24 15:05:40 sthen Exp $
-
 - demux_ac3: fix framing
   e8696b746454e1e089e93b1f2267eba5db3e6daf
 - Split function
diff --git a/multimedia/xine-lib/patches/patch-src_post_Makefile_in b/multimedia/xine-lib/patches/patch-src_post_Makefile_in
index 7f01fbfb10f..4b894d3de7f 100644
--- a/multimedia/xine-lib/patches/patch-src_post_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_post_Makefile_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_post_Makefile_in,v 1.1 2019/12/25 15:50:45 ajacoutot Exp $
-
 Index: src/post/Makefile.in
 --- src/post/Makefile.in.orig
 +++ src/post/Makefile.in
diff --git a/multimedia/xine-lib/patches/patch-src_xine-utils_cpu_accel_c b/multimedia/xine-lib/patches/patch-src_xine-utils_cpu_accel_c
index dd677db84ad..05bbb1e9e3f 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-utils_cpu_accel_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-utils_cpu_accel_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_xine-utils_cpu_accel_c,v 1.5 2021/04/08 08:46:54 sthen Exp $
-
 Make use of HW_NCPUONLINE.
 
 Index: src/xine-utils/cpu_accel.c
diff --git a/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c b/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c
index 046a0e3becc..14b732eab44 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_xine-utils_memcpy_c,v 1.7 2021/01/23 09:27:49 ajacoutot Exp $
-
 Make use of clock_gettime().
 
 Index: src/xine-utils/memcpy.c
diff --git a/multimedia/xine-lib/patches/patch-src_xine-utils_ppcasm_string_S b/multimedia/xine-lib/patches/patch-src_xine-utils_ppcasm_string_S
index 0110c72fae3..0e44fdb5a98 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-utils_ppcasm_string_S
+++ b/multimedia/xine-lib/patches/patch-src_xine-utils_ppcasm_string_S
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_xine-utils_ppcasm_string_S,v 1.1 2020/04/27 20:00:11 cwen Exp $
-
 Index: src/xine-utils/ppcasm_string.S
 --- src/xine-utils/ppcasm_string.S.orig
 +++ src/xine-utils/ppcasm_string.S
diff --git a/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c b/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c
index 1adb2debc63..7b31db2fad2 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_xine-utils_utils_c,v 1.8 2018/02/10 15:29:24 ajacoutot Exp $
-
 Make use of clock_gettime() on OpenBSD. Until we have per-process
 timers and can enable _POSIX_TIMERS in unistd.h.
 
diff --git a/multimedia/xine-lib/pkg/PLIST b/multimedia/xine-lib/pkg/PLIST
index e79490e4d82..3170bf67ac0 100644
--- a/multimedia/xine-lib/pkg/PLIST
+++ b/multimedia/xine-lib/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.28 2021/01/23 09:27:50 ajacoutot Exp $
 @conflict xine-lib-arts-*
 @conflict xine-lib-esd-*
 @conflict xine-lib-jack-*
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index f9474f49a95..253f8acef3e 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.51 2022/02/26 21:25:42 sthen Exp $
-
 COMMENT=	multimedia player
 
 DISTNAME=	xine-ui-0.99.13
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_backend_x11_c b/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_backend_x11_c
index 97a785c7845..13301128585 100644
--- a/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_backend_x11_c
+++ b/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_backend_x11_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src_xitk_xine-toolkit_backend_x11_c,v 1.1 2022/02/26 21:25:42 sthen Exp $
-
 Remove malloc.h include
 3ea5f5a563782e4f2f5230e9d8e3a658229536a4
 
diff --git a/multimedia/xine-ui/pkg/PLIST b/multimedia/xine-ui/pkg/PLIST
index 9989485bb26..88606afbf7d 100644
--- a/multimedia/xine-ui/pkg/PLIST
+++ b/multimedia/xine-ui/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.14 2022/02/26 21:25:42 sthen Exp $
 @comment bin/fbxine
 @bin bin/xine
 bin/xine-bugreport
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index ac481b78d20..fc8b2f5dd74 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.24 2020/11/17 05:56:08 rsadowski Exp $
-
 COMMENT=	ISO MPEG-4 compliant video codec
 
 DISTNAME=	xvidcore-1.3.7
diff --git a/multimedia/xvidcore/patches/patch-build_generic_Makefile b/multimedia/xvidcore/patches/patch-build_generic_Makefile
index 3d35682dc16..7bfbb4e630c 100644
--- a/multimedia/xvidcore/patches/patch-build_generic_Makefile
+++ b/multimedia/xvidcore/patches/patch-build_generic_Makefile
@@ -1,5 +1,3 @@
-$OpenBSD: patch-build_generic_Makefile,v 1.6 2019/06/02 08:31:02 ajacoutot Exp $
-
 Index: build/generic/Makefile
 --- build/generic/Makefile.orig
 +++ build/generic/Makefile
diff --git a/multimedia/xvidcore/patches/patch-build_generic_configure b/multimedia/xvidcore/patches/patch-build_generic_configure
index 55fd73eb838..c242ce50fde 100644
--- a/multimedia/xvidcore/patches/patch-build_generic_configure
+++ b/multimedia/xvidcore/patches/patch-build_generic_configure
@@ -1,5 +1,3 @@
-$OpenBSD: patch-build_generic_configure,v 1.10 2019/06/02 08:31:02 ajacoutot Exp $
-
 Index: build/generic/configure
 --- build/generic/configure.orig
 +++ build/generic/configure
diff --git a/multimedia/xvidcore/pkg/PLIST b/multimedia/xvidcore/pkg/PLIST
index f83835fb564..e7ce1b2ca5b 100644
--- a/multimedia/xvidcore/pkg/PLIST
+++ b/multimedia/xvidcore/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2020/11/17 05:56:08 rsadowski Exp $
 include/xvid.h
 @static-lib lib/libxvidcore.a
 @lib lib/libxvidcore.so.${LIBxvidcore_VERSION}
diff --git a/multimedia/yle-dl/Makefile b/multimedia/yle-dl/Makefile
index 58061095daa..4784cd34c78 100644
--- a/multimedia/yle-dl/Makefile
+++ b/multimedia/yle-dl/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.31 2021/11/02 00:01:38 sthen Exp $
-
 GH_ACCOUNT =		aajanki
 GH_PROJECT =		yle-dl
 GH_TAGNAME =		20210808
diff --git a/multimedia/yle-dl/pkg/PLIST b/multimedia/yle-dl/pkg/PLIST
index 10afb825498..6a29a3bc6e7 100644
--- a/multimedia/yle-dl/pkg/PLIST
+++ b/multimedia/yle-dl/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.11 2021/09/14 19:53:00 fcambus Exp $
 bin/yle-dl
 lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO