diff --git a/biology/AcePerl/Makefile b/biology/AcePerl/Makefile
index 4eb6510e11a..2ea9b8dd21a 100644
--- a/biology/AcePerl/Makefile
+++ b/biology/AcePerl/Makefile
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile,v 1.22 2020/07/03 21:44:31 sthen Exp $
-
 COMMENT=	perl interface to the ACEDB database
 
 DISTNAME=	AcePerl-1.92
diff --git a/biology/AcePerl/patches/patch-Makefile_PL b/biology/AcePerl/patches/patch-Makefile_PL
index 017e3a0d226..d494882122e 100644
--- a/biology/AcePerl/patches/patch-Makefile_PL
+++ b/biology/AcePerl/patches/patch-Makefile_PL
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_PL,v 1.2 2008/09/23 20:57:20 jasper Exp $
 --- Makefile.PL.orig	Mon Sep 22 10:22:31 2008
 +++ Makefile.PL	Mon Sep 22 10:35:24 2008
 @@ -10,7 +10,7 @@ while (!$choice) {
diff --git a/biology/AcePerl/pkg/PFRAG.opt b/biology/AcePerl/pkg/PFRAG.opt
index 0dc63d10c96..900c91f2291 100644
--- a/biology/AcePerl/pkg/PFRAG.opt
+++ b/biology/AcePerl/pkg/PFRAG.opt
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.opt,v 1.2 2014/06/14 10:34:44 sthen Exp $
 ${P5ACE}/Ace/Freesubs.pm
 ${P5ACE}/auto/Ace/Freesubs/
 @comment ${P5ACE}/auto/Ace/Freesubs/Freesubs.bs
diff --git a/biology/AcePerl/pkg/PLIST b/biology/AcePerl/pkg/PLIST
index 44743a57cdd..b763157d1da 100644
--- a/biology/AcePerl/pkg/PLIST
+++ b/biology/AcePerl/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2010/12/18 00:19:51 jasper Exp $
 bin/ace.pl
 ${P5ACE}/Ace/
 ${P5ACE}/Ace.pm
diff --git a/biology/bioperl/Makefile b/biology/bioperl/Makefile
index b8659d8024c..59d1e647654 100644
--- a/biology/bioperl/Makefile
+++ b/biology/bioperl/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.23 2021/02/07 14:49:43 benoit Exp $
-
 COMMENT=	perl tools for bioinformatics
 
 DISTNAME=	BioPerl-1.7.8
diff --git a/biology/bioperl/pkg/PLIST b/biology/bioperl/pkg/PLIST
index e22a5f3e387..097160db9d9 100644
--- a/biology/bioperl/pkg/PLIST
+++ b/biology/bioperl/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.7 2021/02/07 14:49:43 benoit Exp $
 bin/bp_aacomp
 bin/bp_bioflat_index
 bin/bp_biogetseq
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 3e559880f62..939deb84619 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.16 2020/01/26 11:14:30 jasper Exp $
-
 PORTROACH=	ignore:1
 
 COMMENT=	European Molecular Biology Open Software Suite
diff --git a/biology/emboss/pkg/PLIST b/biology/emboss/pkg/PLIST
index 20e2fd64d5f..e422c0facd6 100644
--- a/biology/emboss/pkg/PLIST
+++ b/biology/emboss/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/11/11 17:35:11 jca Exp $
 include/ajacd.h
 include/ajalign.h
 include/ajarch.h
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index a4f7a50071b..fb3f679a9ac 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2019/07/12 20:43:43 sthen Exp $
-
 COMMENT =	profile HMMs for biological sequence analysis
 
 V =		3.1b2
diff --git a/biology/hmmer/pkg/PFRAG.amd64 b/biology/hmmer/pkg/PFRAG.amd64
index 0b07191f119..181d4e12dd8 100644
--- a/biology/hmmer/pkg/PFRAG.amd64
+++ b/biology/hmmer/pkg/PFRAG.amd64
@@ -1,2 +1 @@
-@comment $OpenBSD: PFRAG.amd64,v 1.1 2016/11/25 20:42:57 sthen Exp $
 include/impl_sse.h
diff --git a/biology/hmmer/pkg/PLIST b/biology/hmmer/pkg/PLIST
index b910b4123f6..a7c3ea6741c 100644
--- a/biology/hmmer/pkg/PLIST
+++ b/biology/hmmer/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/11/25 20:42:57 sthen Exp $
 @bin bin/alimask
 @bin bin/hmmalign
 @bin bin/hmmbuild
diff --git a/biology/p5-Bio-ASN1-EntrezGene/Makefile b/biology/p5-Bio-ASN1-EntrezGene/Makefile
index 2a6a36100ac..6e77cd7d721 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/Makefile
+++ b/biology/p5-Bio-ASN1-EntrezGene/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2020/08/25 23:54:01 cwen Exp $
-
 COMMENT =		regular expression-based parser for NCBI Entrez Gene
 
 DISTNAME =		Bio-ASN1-EntrezGene-1.73
diff --git a/biology/p5-Bio-ASN1-EntrezGene/pkg/PLIST b/biology/p5-Bio-ASN1-EntrezGene/pkg/PLIST
index 95a9c0d5899..4c6813efdd1 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/pkg/PLIST
+++ b/biology/p5-Bio-ASN1-EntrezGene/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/08/25 23:54:02 cwen Exp $
 @conflict bioperl-<1.7
 ${P5SITE}/Bio/ASN1/
 ${P5SITE}/Bio/ASN1/EntrezGene/
diff --git a/biology/p5-Bio-Cluster/Makefile b/biology/p5-Bio-Cluster/Makefile
index 6dfd2818ad7..cd9dcf172be 100644
--- a/biology/p5-Bio-Cluster/Makefile
+++ b/biology/p5-Bio-Cluster/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/08/25 23:43:06 cwen Exp $
-
 COMMENT =		cluster modules for BioPerl
 
 DISTNAME =		Bio-Cluster-1.7.3
diff --git a/biology/p5-Bio-Cluster/pkg/PLIST b/biology/p5-Bio-Cluster/pkg/PLIST
index c18eded7f3d..4285f96a1ec 100644
--- a/biology/p5-Bio-Cluster/pkg/PLIST
+++ b/biology/p5-Bio-Cluster/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/08/25 23:43:06 cwen Exp $
 @conflict bioperl-<1.7
 ${P5SITE}/Bio/
 ${P5SITE}/Bio/Cluster/
diff --git a/biology/p5-Bio-DB-EMBL/Makefile b/biology/p5-Bio-DB-EMBL/Makefile
index 2e13970e589..fcdda28d469 100644
--- a/biology/p5-Bio-DB-EMBL/Makefile
+++ b/biology/p5-Bio-DB-EMBL/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/08/25 23:37:52 cwen Exp $
-
 COMMENT =		database object interface for EMBL entry retrieval
 
 DISTNAME =		Bio-DB-EMBL-1.7.4
diff --git a/biology/p5-Bio-DB-EMBL/pkg/PLIST b/biology/p5-Bio-DB-EMBL/pkg/PLIST
index 3ecd79164cd..ba59a4e3ffc 100644
--- a/biology/p5-Bio-DB-EMBL/pkg/PLIST
+++ b/biology/p5-Bio-DB-EMBL/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/08/25 23:37:52 cwen Exp $
 @conflict bioperl-<1.7
 ${P5SITE}/Bio/DB/EMBL.pm
 @man man/man3p/Bio::DB::EMBL.3p
diff --git a/biology/p5-Bio-DB-NCBIHelper/Makefile b/biology/p5-Bio-DB-NCBIHelper/Makefile
index 256be6fdcb8..cd15cceb8d1 100644
--- a/biology/p5-Bio-DB-NCBIHelper/Makefile
+++ b/biology/p5-Bio-DB-NCBIHelper/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2021/07/12 09:01:59 benoit Exp $
-
 COMMENT =		collection of routines useful for queries to NCBI databases
 
 DISTNAME =		Bio-DB-NCBIHelper-1.7.7
diff --git a/biology/p5-Bio-DB-NCBIHelper/pkg/PLIST b/biology/p5-Bio-DB-NCBIHelper/pkg/PLIST
index d066ad2df11..dae73093699 100644
--- a/biology/p5-Bio-DB-NCBIHelper/pkg/PLIST
+++ b/biology/p5-Bio-DB-NCBIHelper/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/08/25 23:39:36 cwen Exp $
 @conflict bioperl-<1.7
 bin/bp_biofetch_genbank_proxy
 bin/bp_download_query_genbank
diff --git a/biology/p5-Bio-Variation/Makefile b/biology/p5-Bio-Variation/Makefile
index cd7fdfdd60d..6aa08f8362f 100644
--- a/biology/p5-Bio-Variation/Makefile
+++ b/biology/p5-Bio-Variation/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/08/25 23:41:26 cwen Exp $
-
 COMMENT =		bioperl variation-related functionality
 
 DISTNAME =		Bio-Variation-1.7.5
diff --git a/biology/p5-Bio-Variation/pkg/PLIST b/biology/p5-Bio-Variation/pkg/PLIST
index 6305bf7b50c..7b7b8835014 100644
--- a/biology/p5-Bio-Variation/pkg/PLIST
+++ b/biology/p5-Bio-Variation/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/08/25 23:41:26 cwen Exp $
 @conflict bioperl-<1.7
 bin/bp_flanks
 ${P5SITE}/Bio/Variation/
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index 61298fd1a83..59ea702c9d3 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.34 2021/11/02 00:00:14 sthen Exp $
-
 COMMENT =		Python tools for computational molecular biology
 
 MODPY_EGG_VERSION =	1.79
diff --git a/biology/py-biopython/patches/patch-Tests_run_tests_py b/biology/py-biopython/patches/patch-Tests_run_tests_py
index 2dc2fe14d69..5a749925b07 100644
--- a/biology/py-biopython/patches/patch-Tests_run_tests_py
+++ b/biology/py-biopython/patches/patch-Tests_run_tests_py
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Tests_run_tests_py,v 1.5 2020/10/25 18:12:58 martin Exp $
 Index: Tests/run_tests.py
 --- Tests/run_tests.py.orig
 +++ Tests/run_tests.py
diff --git a/biology/py-biopython/pkg/PLIST b/biology/py-biopython/pkg/PLIST
index 889d95af855..82ce4352daa 100644
--- a/biology/py-biopython/pkg/PLIST
+++ b/biology/py-biopython/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.12 2021/06/23 10:46:49 martin Exp $
 lib/python${MODPY_VERSION}/
 lib/python${MODPY_VERSION}/site-packages/
 lib/python${MODPY_VERSION}/site-packages/Bio/